Skip to content

X
xv6-public
提交 15997d58 创建 作者: Robert Morris's avatar Robert Morris
浏览文件
操作

move the kernel to 0x80000000

上级 5c292b3d
隐藏空白字符变更
内嵌 并排
正在显示 包含 4 行增加 和 3 行删除
bootmain.c
浏览文件 @ 15997d58
...@@ -43,7 +43,7 @@ bootmain(void) ...@@ -43,7 +43,7 @@ bootmain(void)
// Call the entry point from the ELF header. // Call the entry point from the ELF header.
// Does not return! // Does not return!
entry = (void(*)(void))(elf->entry & 0xFFFFFF); entry = (void(*)(void))(elf->entry - KERNBASE);
entry(); entry();
} }
......
kernel.ld
浏览文件 @ 15997d58
...@@ -8,7 +8,8 @@ ENTRY(_start) ...@@ -8,7 +8,8 @@ ENTRY(_start)
SECTIONS SECTIONS
{ {
/* Load the kernel at this address: "." means the current address */ /* Load the kernel at this address: "." means the current address */
. = 0xF0100000; /* Must be equal to KERNLINK */
. = 0x80100000;
.text : AT(0x100000) { .text : AT(0x100000) {
*(.text .stub .text.* .gnu.linkonce.t.*) *(.text .stub .text.* .gnu.linkonce.t.*)
......
memlayout.h
浏览文件 @ 15997d58
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define DEVSPACE 0xFE000000 // Other devices are at high addresses #define DEVSPACE 0xFE000000 // Other devices are at high addresses
// Key addresses for address space layout (see kmap in vm.c for the layout) // Key addresses for address space layout (see kmap in vm.c for the layout)
#define KERNBASE 0xF0000000 // First kernel virtual address #define KERNBASE 0x80000000 // First kernel virtual address
#define KERNLINK (KERNBASE+EXTMEM) // Address where kernel is linked #define KERNLINK (KERNBASE+EXTMEM) // Address where kernel is linked
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论