Changeset de6b301 in mainline for arch/ia64

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/ia64

Files:

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

arch/ia64/Makefile.inc

@@ -46 +46 @@
 AFLAGS += -mconstant-gp
 
-DEFS += -DINIT_ADDRESS=$(INIT_ADDRESS) -DINIT_SIZE=$(INIT_SIZE)
+DEFS += -D__64_BITS__ -DINIT_ADDRESS=$(INIT_ADDRESS) -DINIT_SIZE=$(INIT_SIZE)
 
 ## Compile with page hash table support.

arch/ia64/include/elf.h

@@ -30 +30 @@
 #define __ia64_ELF_H__
 
-#include <elf64.h>
-
 #define ELF_MACHINE             EM_IA_64
 #define ELF_DATA_ENCODING       ELFDATA2LSB
 #define ELF_CLASS               ELFCLASS64
 
-/*
- * Main ELF loader function
- */
-#define elf_load(header, as) elf64_load(header, as)
-
 #endif

arch/ia64/src/ia64.c

@@ -67 +67 @@
 
 /** Enter userspace and never return. */
-void userspace(void)
+void userspace(__address entry)
 {
         psr_t psr;
@@ -84 +84 @@
         rsc.mode = 3;                           /* eager mode */
 
-        switch_to_userspace(UTEXT_ADDRESS, USTACK_ADDRESS+PAGE_SIZE-1, USTACK_ADDRESS, psr.value, rsc.value);
+        switch_to_userspace(entry, USTACK_ADDRESS+PAGE_SIZE-1, USTACK_ADDRESS, psr.value, rsc.value);
 
         while (1) {