Changeset de6b301 in mainline for arch/ia32

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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/ia32

Files:

• Makefile.inc (modified) (1 diff)
• include/elf.h (modified) (1 diff)
• include/types.h (modified) (1 diff)
• src/userspace.c (modified) (2 diffs)

arch/ia32/Makefile.inc

@@ -43 +43 @@
 endif
 
-DEFS += -D_CPU=${IA32_CPU}
+DEFS += -D_CPU=${IA32_CPU} -D__32_BITS__
 
 ## Accepted CPUs

arch/ia32/include/elf.h

@@ -30 +30 @@
 #define __ia32_ELF_H__
 
-#include <elf32.h>
-
 #define ELF_MACHINE             EM_386
 #define ELF_DATA_ENCODING       ELFDATA2LSB
 #define ELF_CLASS               ELFCLASS32
 
-/*
- * Main ELF loader function
- */
-#define elf_load(header, as) elf32_load(header, as)
-
 #endif

arch/ia32/include/types.h

@@ -33 +33 @@
 
 typedef signed char __s8;
+typedef signed short __s16;
+typedef signed long __s32;
+typedef signed long long __s64;
 
 typedef unsigned char __u8;
 typedef unsigned short __u16;
 typedef unsigned long __u32;
-typedef long long __u64;
+typedef unsigned long long __u64;
 
 typedef __u32 __address;

arch/ia32/src/userspace.c

@@ -40 +40 @@
  *
  */
-void userspace(void)
+void userspace(__address entry)
 {
         ipl_t ipl;
@@ -61 +61 @@
                 "iret"
                 : 
-                : "i" (selector(UDATA_DES) | PL_USER), "r" (USTACK_ADDRESS+(THREAD_STACK_SIZE)), "r" (ipl), "i" (selector(UTEXT_DES) | PL_USER), "i" (UTEXT_ADDRESS)
+                : "i" (selector(UDATA_DES) | PL_USER), "r" (USTACK_ADDRESS+(THREAD_STACK_SIZE)), "r" (ipl), "i" (selector(UTEXT_DES) | PL_USER), "r" (entry)
                 : "eax");