greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move the kernel to 0x80000000

Browse source
This commit is contained in:
Robert Morris 2011-08-31 09:48:52 -04:00
parent 5c292b3d71
commit 15997d5849
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootmain.c
View file

@ -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();
} }

3
kernel.ld
View file

@ -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.*)

2
memlayout.h
View file

@ -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__