Changeset 3d2d2fc2 in mainline

Timestamp:

2006-02-06T17:56:31Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7febdde5

Parents:

9b9f195

Message:

Fixed uspace address constants.

Location:

arch/mips32

Files:

• Makefile.inc (modified) (3 diffs)
• src/mips32.c (modified) (1 diff)

arch/mips32/Makefile.inc

@@ -42 +42 @@
 
 KERNEL_LOAD_ADDRESS = 0x80100000
-INIT_ADDRESS = 0x80110000
+INIT_ADDRESS = 0x20000000
 INIT_SIZE = 65536
-MIPS_USPACE_ADDR = 0x20000000
 
 CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
 
-DEFS += -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE} -DMIPS_USPACE_ADDR=$(MIPS_USPACE_ADDR)
+DEFS += -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
 
 ## Compile with hierarchical page tables support.
@@ -80 +79 @@
         BFD = ecoff-littlemips
         CFLAGS += -DHAVE_FPU -mips3
-        MIPS_USPACE_ADDR = 0x1800000
+        INIT_ADDRESS = 0x1800000
 endif
 ifeq ($(MIPS_MACHINE),bgxemul)
@@ -88 +87 @@
         TOOLCHAIN_DIR = /usr/local/mips/bin
         CFLAGS += -EB -DBIG_ENDIAN -DHAVE_FPU -mips3
-        MIPS_USPACE_ADDR = 0x1800000
+        INIT_ADDRESS = 0x1800000
 endif
 ifeq ($(MIPS_MACHINE),simics)

arch/mips32/src/mips32.c

@@ -96 +96 @@
         arc_print_memory_map();
         arc_print_devices();
-
-        /* Setup usermode...*/
-        config.init_addr = MIPS_USPACE_ADDR;
-        config.init_size = FRAME_SIZE;
 }
 
 void arch_post_mm_init(void)
 {
+        /* Setup usermode...*/
+        config.init_addr = INIT_ADDRESS;
+        config.init_size = INIT_SIZE;
 }