Changes in / [6688cc1:c35aabe] in mainline

Location:

kernel

Files:

• arch/ia64/_link.ld.in (modified) (3 diffs)
• arch/ia64/src/ivt.S (modified) (1 diff)
• arch/ia64/src/start.S (modified) (1 diff)
• generic/include/main/main.h (modified) (1 diff)
• generic/src/main/main.c (modified) (1 diff)

kernel/arch/ia64/_link.ld.in

@@ -7 +7 @@
  */
 
-#define LOAD_ADDRESS_V  0xe000000004404000
-#define LOAD_ADDRESS_P  0x0000000004404000
-
 ENTRY(kernel_image_start)
 
 SECTIONS {
-        .image LOAD_ADDRESS_V: AT (LOAD_ADDRESS_P) {
+        .image 0xe000000004404000: AT (0x0000000004404000) { 
                 ktext_start = .;
                 *(K_TEXT_START);
@@ -24 +21 @@
                 *(.opd)
                 *(.data .data.*)
-                hardcoded_load_address = .;
-                QUAD(LOAD_ADDRESS_V);
-                hardcoded_ktext_size = .;
-                QUAD(ktext_end - ktext_start);
-                hardcoded_kdata_size = .;
-                QUAD(kdata_end - kdata_start);
                 *(.got .got.*)
                 *(.sdata)
@@ -47 +38 @@
         }
 
+        _hardcoded_ktext_size = ktext_end - ktext_start;
+        _hardcoded_kdata_size = kdata_end - kdata_start;
+        _hardcoded_load_address = 0xe000000004404000;
+
 }

kernel/arch/ia64/src/ivt.S

@@ -391 +391 @@
 
     /* 10. call handler */
-        movl r1 = kernel_image_start
+        movl r1 = _hardcoded_load_address
     
         mov b1 = loc2

kernel/arch/ia64/src/start.S

@@ -186 +186 @@
         movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
         or r20 = r20, r1 ;;
-        movl r1 = kernel_image_start
+        movl r1 = _hardcoded_load_address
         
         /*
-         * Initialize bootinfo on BSP.
+         * Initialize hardcoded_* variables. Do only BSP
          */
-(p3)    addl r21 = @gprel(bootinfo), gp ;;
+(p3)    movl r14 = _hardcoded_ktext_size
+(p3)    movl r15 = _hardcoded_kdata_size
+(p3)    movl r16 = _hardcoded_load_address ;;
+(p3)    addl r17 = @gprel(hardcoded_ktext_size), gp
+(p3)    addl r18 = @gprel(hardcoded_kdata_size), gp
+(p3)    addl r19 = @gprel(hardcoded_load_address), gp
+(p3)    addl r21 = @gprel(bootinfo), gp
+                ;;
+(p3)    st8 [r17] = r14
+(p3)    st8 [r18] = r15
+(p3)    st8 [r19] = r16
 (p3)    st8 [r21] = r20
         

kernel/generic/include/main/main.h

@@ -38 +38 @@
 #include <arch/types.h>
 
-extern size_t hardcoded_kdata_size;
-extern size_t hardcoded_ktext_size;
-extern uintptr_t hardcoded_load_address;
 extern uintptr_t stack_safe;
 

kernel/generic/src/main/main.c

@@ -101 +101 @@
 context_t ctx;
 
+/*
+ * These 'hardcoded' variables will be intialized by
+ * the linker or the low level assembler code with
+ * appropriate sizes and addresses.
+ */
+
+/** Virtual address of where the kernel is loaded. */
+uintptr_t hardcoded_load_address = 0;
+/** Size of the kernel code in bytes. */
+size_t hardcoded_ktext_size = 0;
+/** Size of the kernel data in bytes. */
+size_t hardcoded_kdata_size = 0;
 /** Lowest safe stack virtual address. */
 uintptr_t stack_safe = 0;