From owner-svn-src-user@FreeBSD.ORG  Sat Dec 19 13:39:08 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 644611065672;
	Sat, 19 Dec 2009 13:39:08 +0000 (UTC)
	(envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 39B238FC1A;
	Sat, 19 Dec 2009 13:39:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBJDd8E9034706;
	Sat, 19 Dec 2009 13:39:08 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBJDd8qe034705;
	Sat, 19 Dec 2009 13:39:08 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <200912191339.nBJDd8qe034705@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Sat, 19 Dec 2009 13:39:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200730 - in user/nyan/pc98/sys/boot: common pc98
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Dec 2009 13:39:08 -0000

Author: nyan
Date: Sat Dec 19 13:39:07 2009
New Revision: 200730
URL: http://svn.freebsd.org/changeset/base/200730

Log:
  Don't use 15M-16M area on pc98.  It's reserved for some devices.

Modified:
  user/nyan/pc98/sys/boot/common/module.c
  user/nyan/pc98/sys/boot/pc98/Makefile.inc

Modified: user/nyan/pc98/sys/boot/common/module.c
==============================================================================
--- user/nyan/pc98/sys/boot/common/module.c	Sat Dec 19 12:06:12 2009	(r200729)
+++ user/nyan/pc98/sys/boot/common/module.c	Sat Dec 19 13:39:07 2009	(r200730)
@@ -313,6 +313,9 @@ file_loadraw(char *type, char *name)
     char			*cp;
     int				fd, got;
     vm_offset_t			laddr;
+#ifdef PC98
+    struct stat			st;
+#endif
 
     /* We can't load first */
     if ((file_findfile(NULL, NULL)) == NULL) {
@@ -334,6 +337,14 @@ file_loadraw(char *type, char *name)
 	return(CMD_ERROR);
     }
 
+#ifdef PC98
+    /* We cannot use 15M-16M area on pc98. */
+    if (loadaddr < 0x1000000 &&
+	fstat(fd, &st) == 0 &&
+	(st.st_size == -1 || loadaddr + st.st_size > 0xf00000))
+	loadaddr = 0x1000000;
+#endif
+
     laddr = loadaddr;
     for (;;) {
 	/* read in 4k chunks; size is not really important */
@@ -439,6 +450,14 @@ mod_loadkld(const char *kldname, int arg
 	;
 
     do {
+#ifdef PC98
+	/* We cannot use 15M-16M area on pc98. */
+	struct stat st;
+	if (loadaddr < 0x1000000 &&
+	    stat(filename, &st) == 0 &&
+	    (st.st_size == -1 || loadaddr + st.st_size > 0xf00000))
+	    loadaddr = 0x1000000;
+#endif
 	err = file_load(filename, loadaddr, &fp);
 	if (err)
 	    break;

Modified: user/nyan/pc98/sys/boot/pc98/Makefile.inc
==============================================================================
--- user/nyan/pc98/sys/boot/pc98/Makefile.inc	Sat Dec 19 12:06:12 2009	(r200729)
+++ user/nyan/pc98/sys/boot/pc98/Makefile.inc	Sat Dec 19 13:39:07 2009	(r200730)
@@ -7,7 +7,7 @@ BINDIR?=	/boot
 LOADER_ADDRESS?=0x100000
 CFLAGS+=	-ffreestanding -mpreferred-stack-boundary=2 \
 		-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
-		-Os
+		-Os -DPC98
 LDFLAGS+=	-nostdlib
 
 # BTX components