merged Yukang changes

Author: ckkMicrosoft

kernel/kalloc.rs

@@ -32,6 +32,7 @@ struct KmemT {
 
 
 static mut kmem : KmemT = KmemT{ lock: DUMMY_LOCK, use_lock: 0} ;
+static mut end : Address = 0;
 
 pub fn kinit1(vstart: Address, vend: Address) {
 	unsafe {
@@ -50,6 +51,10 @@ fn free_range(vstart: Address, vend: Address) {
 	//	asm!("mov $0 , %rbx" : /* no outputs */ : "r"(address) : "eax");
 	//}
 
+	unsafe {
+	end = vstart;
+	}
+
 	loop {
 		kfree(address);
 		address = address + PG_SIZE;
@@ -59,25 +64,25 @@ fn free_range(vstart: Address, vend: Address) {
 	}
 }
 
-fn kfree(a : Address){
-/*
-	struct run *r;
-
-	if((uintp)v % PGSIZE || v < end || v2p(v) >= PHYSTOP)
-		panic("kfree");
-
-	// Fill with junk to catch dangling refs.
-	memset(v, 1, PGSIZE);
-
-	if(kmem.use_lock)
-		acquire(&kmem.lock);
-	r = (struct run*)v;
-	r->next = kmem.freelist;
-	kmem.freelist = r;
-	if(kmem.use_lock)
-		release(&kmem.lock);
+fn kfree(v : Address) {
 
+	//struct run *r;
 
-
-		*/
+//	if(v % PG_SIZE || v < end || v2p(v) >= PHYSTOP)
+//		panic("kfree");
+//
+//	// Fill with junk to catch dangling refs.
+//	memset(v, 1, PGSIZE);
+//
+//	if(kmem.use_lock)
+//		acquire(&kmem.lock);
+//	r = (struct run*)v;
+//	r->next = kmem.freelist;
+//	kmem.freelist = r;
+//	if(kmem.use_lock)
+//		release(&kmem.lock);
+//
+//
+//
+//		*/
 }

kernel/memlayout.rs

@@ -23,6 +23,7 @@
 use super::mmu::Address;
 
 pub const KERBASE : Address = 0xFFFFFFFF80000000;
+pub const PHYSTOP : Address = 0xE000000;
 
 //TODO - in C this is a macro - need to figure out the right thing in RUST
 pub fn P2V(address : Address) -> Address {