Changeset 8ca4b602 in mainline

Timestamp:

2018-10-17T16:58:28Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

09c6389

Parents:

e344422

Message:

Pass IA-64 kernel entry point from C code

Location:

boot/arch/ia64

Files:

• include/arch/asm.h (modified) (1 diff)
• src/asm.S (modified) (1 diff)
• src/main.c (modified) (1 diff)

boot/arch/ia64/include/arch/asm.h

@@ -31 +31 @@
 #define BOOT_ia64_ASM_H_
 
-extern void jump_to_kernel(void *) __attribute__((noreturn));
+extern void jump_to_kernel(void *, void *) __attribute__((noreturn));
 
 #endif

boot/arch/ia64/src/asm.S

@@ -38 +38 @@
 
 FUNCTION_BEGIN(jump_to_kernel)
-        alloc loc0 = ar.pfs, 1, 1, 0, 0
+        alloc loc0 = ar.pfs, 2, 1, 0, 0
         mov r2 = in0 ;;                 # Pass bootinfo address
-        movl r8 = KERNEL_ADDRESS;;
-        mov b1 = r8 ;;
+        mov b1 = in1 ;;                 # Entry point address
         br.call.sptk.many b0 = b1;;
 FUNCTION_END(jump_to_kernel)

boot/arch/ia64/src/main.c

@@ -183 +183 @@
 
         printf("Booting the kernel ...\n");
-        jump_to_kernel(&bootinfo);
+        jump_to_kernel(&bootinfo, kernel_start);
 }