Changes in / [fc14438:49ace23] in mainline


Ignore:
Files:
4 edited

Legend:

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

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

    rfc14438 r49ace23  
    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 #
    5849kernel_image_start:
    5950        .auto
     
    166157        loadrs
    167158       
    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
     159        # Initialize memory stack to some sane value
     160        movl r12 = stack0 ;;
     161        add r12 = -16, r12  /* allocate a scratch area on the stack */
    174162       
    175163        # Initialize gp (Global Pointer) register
    176         movl gp = kernel_image_start
     164        movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
     165        or r20 = r20, r1 ;;
     166        movl r1 = kernel_image_start
    177167       
    178         #       
    179         # Initialize bootinfo on BSP.
    180         #
    181         movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
    182         or r20 = r20, r2 ;;
     168        /*
     169         * Initialize bootinfo on BSP.
     170         */
    183171        addl r21 = @gprel(bootinfo), gp ;;
    184172        st8 [r21] = r20
  • uspace/lib/c/arch/ia64/src/entry.s

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

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