Get the memory size from the gxemul mp device. Don't dump the environment if

it is not present.

3 files changed, 66 insertions, 7 deletions

diff --git a/sys/mips/gxemul/files.gxemul b/sys/mips/gxemul/files.gxemul
index 12b7670..45b2e03 100644
--- a/sys/mips/gxemul/files.gxemul
+++ b/sys/mips/gxemul/files.gxemul
@@ -3,3 +3,6 @@ dev/gxemul/cons/gxemul_cons.c		optional gxemul_cons
 mips/gxemul/gxemul_machdep.c		standard
 mips/mips/intr_machdep.c		standard
 mips/mips/tick.c			standard
+
+dev/gxemul/disk/gxemul_disk.c		optional gxemul_disk
+dev/gxemul/ether/gxemul_ether.c		optional gxemul_ether
diff --git a/sys/mips/gxemul/gxemul_machdep.c b/sys/mips/gxemul/gxemul_machdep.c
index 78c9d80..41745b2 100644
--- a/sys/mips/gxemul/gxemul_machdep.c
+++ b/sys/mips/gxemul/gxemul_machdep.c
@@ -62,6 +62,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/pmap.h>
 #include <machine/trap.h>
 
+#include <mips/gxemul/mpreg.h>
+
 extern int	*edata;
 extern int	*end;
 
@@ -123,7 +125,6 @@ platform_start(__register_t a0, __register_t a1,  __register_t a2,
 	int argc = a0;
 	char **argv = (char **)a1;
 	char **envp = (char **)a2;
-	unsigned int memsize = a3;
 	int i;
 
 	/* clear the BSS and SBSS segments */
@@ -152,14 +153,16 @@ platform_start(__register_t a0, __register_t a1,  __register_t a2,
 			printf("%s ", argv[i]);
 		printf("\n");
 
-		printf("envp:\n");
-		for (i = 0; envp[i]; i += 2)
-			printf("\t%s = %s\n", envp[i], envp[i+1]);
-
-		printf("memsize = %08x\n", memsize);
+		if (envp != NULL) {
+			printf("envp:\n");
+			for (i = 0; envp[i]; i += 2)
+				printf("\t%s = %s\n", envp[i], envp[i+1]);
+		} else {
+			printf("no envp.\n");
+		}
 	}
 
-	realmem = btoc(memsize);
+	realmem = btoc(GXEMUL_MP_DEV_READ(GXEMUL_MP_DEV_MEMORY));
 	mips_init();
 
 	mips_timer_init_params(platform_counter_freq, 0);
diff --git a/sys/mips/gxemul/mpreg.h b/sys/mips/gxemul/mpreg.h
new file mode 100644
index 0000000..7e6780a
--- /dev/null
+++ b/sys/mips/gxemul/mpreg.h
@@ -0,0 +1,53 @@
+/*-
+ * Copyright (c) 2004-2012 Juli Mallett <jmallett@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef	_MIPS_GXEMUL_MPREG_H_
+#define	_MIPS_GXEMUL_MPREG_H_
+
+#define	GXEMUL_MP_DEV_BASE	0x11000000
+
+#define	GXEMUL_MP_DEV_WHOAMI	0x0000
+#define	GXEMUL_MP_DEV_NCPUS	0x0010
+#define	GXEMUL_MP_DEV_START	0x0020
+#define	GXEMUL_MP_DEV_STARTADDR	0x0030
+#define	GXEMUL_MP_DEV_STACK	0x0070
+#define	GXEMUL_MP_DEV_MEMORY	0x0090
+#define	GXEMUL_MP_DEV_IPI_ONE	0x00a0
+#define	GXEMUL_MP_DEV_IPI_MANY	0x00b0
+#define	GXEMUL_MP_DEV_IPI_READ	0x00c0
+
+#define	GXEMUL_MP_DEV_FUNCTION(f)					\
+	(volatile uint64_t *)MIPS_PHYS_TO_DIRECT_UNCACHED(GXEMUL_MP_DEV_BASE + (f))
+#define	GXEMUL_MP_DEV_READ(f)						\
+	(volatile uint64_t)*GXEMUL_MP_DEV_FUNCTION(f)
+#define	GXEMUL_MP_DEV_WRITE(f, v)					\
+	*GXEMUL_MP_DEV_FUNCTION(f) = (v)
+
+#define	GXEMUL_MP_DEV_IPI_INTERRUPT	(6)
+
+#endif /* !_MIPS_GXEMUL_MPREG_H */