Imbus/xv6-riscv-kernel
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch back to #define for PHYSTOP. Using the E820 to retrieve the memory map is too complicated (must be done in 16-bit real-mode, probably enlarged bootblock beyond 512 bytes, and a #define requires less explanation).

Browse source
This commit is contained in:
Frans Kaashoek 2011-08-16 20:23:17 -04:00
parent c3dcf47966
commit 5f069dcf2f
3 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kalloc.c
View file

@ -19,7 +19,6 @@ struct {
} kmem;
extern char end[]; // first address after kernel loaded from ELF file
extern uint maxpa; // Maximum physical address
static char *newend;
// simple page allocator to get off the ground during entry
@ -51,7 +50,7 @@ kinit(void)
initlock(&kmem.lock, "kmem");
p = (char*)PGROUNDUP((uint)newend);
for(; p + PGSIZE <= (char*)p2v(maxpa); p += PGSIZE)
for(; p + PGSIZE <= (char*)p2v(PHYSTOP); p += PGSIZE)
kfree(p);
}
@ -65,7 +64,7 @@ kfree(char *v)
{
struct run *r;
if((uint)v % PGSIZE || v < end || v2p(v) >= maxpa)
if((uint)v % PGSIZE || v < end || v2p(v) >= PHYSTOP)
panic("kfree");
// Fill with junk to catch dangling refs.