Changeset 0d3ff9a in mainline

Timestamp:

2006-02-23T00:35:31Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

b6fba84

Parents:

769e8c1

Message:

Init stack base fix
Removing commented code

Files:

• arch/ia64/src/start.S (modified) (5 diffs)
• contrib/arch/ia64/vmaxlma.c (modified) (1 diff)

arch/ia64/src/start.S

@@ -78 +78 @@
         itr.i itr[r0]=r10
 
-#       mov cr.ifa=r0
-#       movl r10=(KERNEL_PAGE_WIDTH<<PS_SHIFT)
-#       mov cr.itir=r10
         movl r10=(KERNEL_TRANSLATION_D)
         itr.d dtr[r0]=r10
@@ -99 +96 @@
         mov cr.ipsr=r10
         mov cr.ifs=r0
-#       movl r8=(paging_start+VRN_KERNEL<<VRN_SHIFT)
         movl r8=paging_start
         mov cr.iip=r8
@@ -135 +131 @@
         movl r8=(VRN_KERNEL<<VRN_SHIFT)
         mov ar.bspstore = r8
-#       mov ar.bspstore = r0
         loadrs
 
         .explicit
         # initialize memory stack to some sane value
-#       movl r12 = stack0       ;;
-        movl r12 = stack0       + (VRN_KERNEL<<VRN_SHIFT);;
+        movl r12 = stack0;;
         
         add r12 = - 16, r12     /* allocate a scratch area on the stack */
@@ -148 +142 @@
         movl r1 = _hardcoded_load_address       ;;
 
-#       movl r1 = _hardcoded_load_address + (VRN_KERNEL<<VRN_SHIFT) ;;
         
 
@@ -172 +165 @@
         br.call.sptk.many b0=b1
 
-#       br.call.sptk.many b0=main_bsp
 
 0:

contrib/arch/ia64/vmaxlma.c

@@ -60 +60 @@
                 error("map failed");
                 
-        /*vma = elf[ELF_VMA];*/
         lma = elf[ELF_LMA];
         elf[ELF_VMA] = lma;
-        entry = elf[ELF_ENTRY];
-        entry &= ((~0LL)>>3);
+        entry = lma;
         elf[ELF_ENTRY] = entry;
-        elf[ELF_ENTRY] = 0x100000;
-        /*elf[ELF_LMA] = vma;*/
         
         if (munmap(elf, LENGTH) == -1)