Changeset 9e5938dc in mainline

Timestamp:

2006-03-05T13:30:31Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

bc314be8

Parents:

bd21922

Message:

ELF framework for all archs. SPARC V9 not tested to compile.

Files:

• Makefile (modified) (1 diff)
• arch/amd64/include/elf.h (added)
• arch/ia32/include/elf.h (modified) (1 diff)
• arch/ia64/include/elf.h (added)
• arch/mips32/include/elf.h (added)
• arch/ppc32/include/elf.h (added)
• arch/sparc64/include/elf.h (added)
• generic/include/elf32.h (modified) (1 diff)
• generic/include/elf64.h (added)
• generic/src/lib/elf32.c (modified) (2 diffs)
• generic/src/lib/elf64.c (added)

Makefile

@@ -122 +122 @@
         generic/src/lib/sort.c \
         generic/src/lib/elf32.c \
+        generic/src/lib/elf64.c \
         generic/src/debug/print.c \
         generic/src/debug/symtab.c \

arch/ia32/include/elf.h

@@ -32 +32 @@
 #include <elf32.h>
 
-#define CURRENT_ELF_MACHINE     EM_386
-#define CURRENT_ELF_DATA        ELFDATA2LSB
+#define ELF_MACHINE             EM_386
+#define ELF_DATA_ENCODING       ELFDATA2LSB
+#define ELF_CLASS               ELFCLASS32
 
 /*
  * Main ELF loader function
  */
-#defiine elf_load(__address header, as_t *as)   elf32_load(header, as)
+#define elf_load(header, as) elf32_load(header, as)
 
 #endif

generic/include/elf32.h

@@ -53 +53 @@
  */
 #define EM_NO           0       // No machine
-#define EM_M32          1       // AT&T WE 32100
 #define EM_SPARC        2       // SPARC
 #define EM_386          3       // i386
-#define EM_68K          4       // Motorola 68000
-#define EM_88K          5       // Motorola 88000
-#define EM_860          7       // i80860
 #define EM_MIPS         8       // MIPS RS3000
+#define EM_MIPS_RS3_LE  10      // MIPS RS3000 LE
+#define EM_PPC          20      // PPC32
+#define EM_PPC64        21      // PPC64
+#define EM_SPARCV9      43      // SPARC64
+#define EM_IA_64        50      // IA-64
+#define EM_X86_64       62      // AMD64/EMT64
 
 /**

generic/src/lib/elf32.c

@@ -27 +27 @@
  */
 
-#include <elf32.h>
+#include <elf.h>
 
 /** 32bit ELF loader
@@ -36 +36 @@
  */
 int elf32_load(__address header, as_t * as) {
-        return EE_UNSUPPORTED;
+        elf32_header_t * e_header;
+
+        e_header = (elf32_header_t *) header;
+        
+        /* Identify ELF */
+        if (    e_header->e_ident[EI_MAG0] != ELFMAG0 || e_header->e_ident[EI_MAG1] != ELFMAG1 || 
+                e_header->e_ident[EI_MAG2] != ELFMAG2 || e_header->e_ident[EI_MAG3] != ELFMAG3
+                ) {
+                return EE_INVALID;
+        }
+        
+        /* Identify ELF compatibility */
+        if (    e_header->e_ident[EI_DATA] != ELF_DATA_ENCODING || e_header->e_machine != ELF_MACHINE || 
+                e_header->e_ident[EI_VERSION] != EV_CURRENT || e_header->e_ident[EI_CLASS] != ELF_CLASS
+                ) {
+                return EE_UNSUPPORTED;
+        }
+        
+
+        return EE_UNSUPPORTED;  
 }