Changeset cfdeedc in mainline for boot/arch/ia64

Timestamp:

2018-10-21T23:12:23Z (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:

bf05c74

Parents:

d59718e

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-21 22:53:48)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-21 23:12:23)

Message:

Keep kernel in ELF format

By keeping kernel in an ELF file (instead of converting it to
a flat binary), we can use the information it contains, like
symbol table and debug info.

We can also later implement more advanced functionality, like
loading kernel at multiple discontiguous blocks, or loading
a position-independent kernel at a randomized address.

Currently the functionality is quite restricted, to keep changes
to a minimum. Code in boot/generic/src/kernel.c validates that
the kernel image was built with the same addresses as the boot
loader uses, giving an extra level of sanity checking compared
to a flat binary.

Location:

boot/arch/ia64

Files:

• Makefile.inc (modified) (1 diff)
• include/arch/arch.h (modified) (1 diff)
• src/main.c (modified) (2 diffs)

boot/arch/ia64/Makefile.inc

@@ -61 +61 @@
         generic/src/tar.c \
         generic/src/gzip.c \
+        generic/src/kernel.c \
         generic/src/payload.c
 

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

@@ -36 +36 @@
 #define LOADER_ADDRESS  0x4400000
 #define KERNEL_ADDRESS  0x4800000
+#define KERNEL_VADDRESS 0xe000000004800000
 
 #define STACK_SIZE                   8192

boot/arch/ia64/src/main.c

@@ -44 +44 @@
 #include <errno.h>
 #include <payload.h>
+#include <kernel.h>
 
 #define DEFAULT_MEMORY_BASE             0x4000000ULL
@@ -182 +183 @@
             (uintptr_t) kernel_start, NULL);
 
-        printf("Booting the kernel ...\n");
-        jump_to_kernel(&bootinfo, kernel_start);
+        uintptr_t entry = check_kernel(kernel_start);
+
+        // FIXME: kernel's entry point is linked at a different address than
+        //        where it is run from.
+        entry = entry - KERNEL_VADDRESS + KERNEL_ADDRESS;
+
+        printf("Booting the kernel at %p...\n", (void *) entry);
+        jump_to_kernel(&bootinfo, (void *) entry);
 }