Changeset de6b301 in mainline for arch/mips32

Timestamp:

2006-03-12T18:27:33Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f972b89

Parents:

a82500ce

Message:

Basic support for loading ELF object files.
ia64, amd64, ia32 working.
mips32 requires some attention.

Location:

arch/mips32

Files:

• Makefile.inc (modified) (3 diffs)
• include/elf.h (modified) (2 diffs)
• src/mips32.c (modified) (2 diffs)

arch/mips32/Makefile.inc

@@ -42 +42 @@
 
 KERNEL_LOAD_ADDRESS = 0x80100000
-INIT_ADDRESS = 0x20000000
+INIT_ADDRESS = 0x81000000
 INIT_SIZE = 65536
 
 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}
+DEFS += -D__32_BITS__ -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
 
 ## Compile with hierarchical page tables support.
@@ -81 +81 @@
         BFD = ecoff-littlemips
         CFLAGS += -DARCH_HAS_FPU -mips3
-        INIT_ADDRESS = 0x1800000
+        INIT_ADDRESS = 0x81800000
 endif
 ifeq ($(MIPS_MACHINE),bgxemul)
@@ -89 +89 @@
         TOOLCHAIN_DIR = /usr/local/mips/bin
         CFLAGS += -EB -DBIG_ENDIAN -DARCH_HAS_FPU -mips3
-        INIT_ADDRESS = 0x1800000
+        INIT_ADDRESS = 0x81800000
 endif
 ifeq ($(MIPS_MACHINE),simics)

arch/mips32/include/elf.h

@@ -27 +27 @@
  */
 
-#ifndef __ia32_ELF_H__
-#define __ia32_ELF_H__
-
-#include <elf32.h>
+#ifndef __mips32_ELF_H__
+#define __mips32_ELF_H__
 
 #define ELF_MACHINE             EM_MIPS
@@ -36 +34 @@
 #define ELF_CLASS               ELFCLASS32
 
-/*
- * Main ELF loader function
- */
-#define elf_load(header, as) elf32_load(header, as)
-
 #endif

arch/mips32/src/mips32.c

@@ -119 +119 @@
 __address supervisor_sp __attribute__ ((section (".text")));
 
-void userspace(void)
+void userspace(__address entry)
 {
         /* EXL=1, UM=1, IE=1 */
@@ -125 +125 @@
                                               cp0_status_um_bit |
                                               cp0_status_ie_enabled_bit));
-        cp0_epc_write(UTEXT_ADDRESS);
+        cp0_epc_write(entry);
         userspace_asm(USTACK_ADDRESS+PAGE_SIZE);
         while (1)