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

Changeset fe7abd0 in mainline


Ignore:
Timestamp:
2010-06-22T21:36:41Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
master
Children:
cefb126, fc14438
Parents:
1e3c2f1
Message:

Use r2 instead of gp to pass the bootinfo address. Group the code which belongs together and fix one RAW conflict.

Files:
2 edited

Legend:

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

    r1e3c2f1 rfe7abd0  
    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

    r1e3c2f1 rfe7abd0  
    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
     
    165174       
    166175        # Initialize gp (Global Pointer) register
    167         movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
    168         or r20 = r20, gp ;;
    169176        movl gp = kernel_image_start
    170177       
    171         /*
    172          * Initialize bootinfo on BSP.
    173          */
     178        #       
     179        # Initialize bootinfo on BSP.
     180        #
     181        movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
     182        or r20 = r20, r2 ;;
    174183        addl r21 = @gprel(bootinfo), gp ;;
    175184        st8 [r21] = r20
Note: See TracChangeset for help on using the changeset viewer.