Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset fc14438 in mainline


Ignore:
Timestamp:
2010-07-01T18:33:34Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
master
Children:
64bbf13
Parents:
49ace23 (diff), fe7abd0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge progress from lp:~jakub/helenos/ia64-revival.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/ia64/src/asm.S

    r49ace23 rfc14438  
    113113jump_to_kernel:
    114114        alloc loc0 = ar.pfs, 1, 1, 0, 0
    115         mov r1 = in0 ;;                 # Pass bootinfo address
     115        mov r2 = in0 ;;                 # Pass bootinfo address
    116116        movl r8 = KERNEL_ADDRESS;;
    117117        mov b1 = r8 ;;
  • kernel/arch/ia64/src/start.S

    r49ace23 rfc14438  
    4747
    4848stack0:
     49
     50#
     51# Kernel entry point.
     52#
     53# This is where we are passed control from the boot code.
     54# Register contents:
     55#
     56#       r2      Address of the boot code's bootinfo structure.
     57#
    4958kernel_image_start:
    5059        .auto
     
    157166        loadrs
    158167       
    159         # Initialize memory stack to some sane value
    160         movl r12 = stack0 ;;
    161         add r12 = -16, r12  /* allocate a scratch area on the stack */
     168        #
     169        # Initialize memory stack to some sane value and allocate a scratch are
     170        # on it.
     171        #
     172        movl sp = stack0 ;;
     173        add sp = -16, sp
    162174       
    163175        # Initialize gp (Global Pointer) register
     176        movl gp = kernel_image_start
     177       
     178        #       
     179        # Initialize bootinfo on BSP.
     180        #
    164181        movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
    165         or r20 = r20, r1 ;;
    166         movl r1 = kernel_image_start
    167        
    168         /*
    169          * Initialize bootinfo on BSP.
    170          */
     182        or r20 = r20, r2 ;;
    171183        addl r21 = @gprel(bootinfo), gp ;;
    172184        st8 [r21] = r20
  • uspace/lib/c/arch/ia64/src/entry.s

    r49ace23 rfc14438  
    3939__entry:
    4040        alloc loc0 = ar.pfs, 0, 1, 2, 0
    41         movl r1 = _gp
     41        movl gp = _gp
    4242
    4343        # Pass PCB pointer as the first argument to __main
  • uspace/lib/c/arch/ia64/src/thread_entry.s

    r49ace23 rfc14438  
    3737        alloc loc0 = ar.pfs, 0, 1, 1, 0
    3838
    39         movl r1 = _gp
     39        movl gp = _gp
    4040       
    4141        #
Note: See TracChangeset for help on using the changeset viewer.