added panic function

Author: ckkashyap

kernel/console.rs

@@ -0,0 +1,28 @@
+// The MIT License (MIT)
+// 
+// Copyright (c) 2014 Kashyap
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+use super::uart::uart_put_str;
+
+pub fn panic(text: &str) {
+    uart_put_str(text);
+    loop {};
+}

kernel/kalloc.rs

@@ -22,7 +22,9 @@
 
 use super::spinlock::{Spinlock, DUMMY_LOCK, init_lock};
 use super::mmu::{Address, PG_SIZE, pg_roundup};
+use super::memlayout::{v2p,PHYSTOP};
 use super::uart::uart_put_str;
+use super::console::panic;
 
 struct KmemT {
     lock: Spinlock,
@@ -65,12 +67,20 @@ fn free_range(vstart: Address, vend: Address) {
 }
 
 fn kfree(v : Address) {
+    //struct run *r;
 
-	//struct run *r;
+    if ((v % PG_SIZE) > 0) || (v2p(v) >= PHYSTOP) {
+	panic("kfree");
+    }
+
+    unsafe {
+        if v < end {
+            panic("kfree");
+        }
+    }
+
+    
 
-//	if(v % PG_SIZE || v < end || v2p(v) >= PHYSTOP)
-//		panic("kfree");
-//
 //	// Fill with junk to catch dangling refs.
 //	memset(v, 1, PGSIZE);
 //

kernel/kernel.rs

@@ -39,6 +39,7 @@ mod spinlock;
 mod kalloc;
 mod mmu;
 mod memlayout;
+mod console;
 
 
 fn main (end : u64) {
@@ -59,6 +60,68 @@ pub extern "C" fn cmain(end : u64)  {
         //return 255;
 }
 
+
+
+// Dummy functions to take care of missing libc function
+#[no_mangle]
+pub extern "C" fn trunc()  {}
+#[no_mangle]
+pub extern "C" fn truncf()  {}
+#[no_mangle]
+pub extern "C" fn floor()  {}
+#[no_mangle]
+pub extern "C" fn floorf()  {}
+#[no_mangle]
+pub extern "C" fn pow()  {}
+#[no_mangle]
+pub extern "C" fn powf()  {}
+#[no_mangle]
+pub extern "C" fn fmod()  {}
+#[no_mangle]
+pub extern "C" fn fmodf()  {}
+#[no_mangle]
+pub extern "C" fn log10()  {}
+#[no_mangle]
+pub extern "C" fn log10f()  {}
+#[no_mangle]
+pub extern "C" fn memcpy()  {}
+#[no_mangle]
+pub extern "C" fn memcmp()  {}
+#[no_mangle]
+pub extern "C" fn log()  {}
+#[no_mangle]
+pub extern "C" fn logf()  {}
+#[no_mangle]
+pub extern "C" fn log2()  {}
+#[no_mangle]
+pub extern "C" fn log2f()  {}
+#[no_mangle]
+pub extern "C" fn round()  {}
+#[no_mangle]
+pub extern "C" fn roundf()  {}
+#[no_mangle]
+pub extern "C" fn exp()  {}
+#[no_mangle]
+pub extern "C" fn expf()  {}
+#[no_mangle]
+pub extern "C" fn exp2()  {}
+#[no_mangle]
+pub extern "C" fn exp2f()  {}
+#[no_mangle]
+pub extern "C" fn ceil()  {}
+#[no_mangle]
+pub extern "C" fn ceilf()  {}
+#[no_mangle]
+pub extern "C" fn fma()  {}
+#[no_mangle]
+pub extern "C" fn fmaf()  {}
+#[no_mangle]
+pub extern "C" fn __powisf2()  {}
+#[no_mangle]
+pub extern "C" fn __powidf2()  {}
+
+
+
 #[lang = "stack_exhausted"] extern fn stack_exhausted() { loop {} }
 #[lang = "eh_personality"] extern fn eh_personality() {loop {} }
 #[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} }

kernel/memlayout.rs

@@ -22,10 +22,14 @@
 
 use super::mmu::Address;
 
-pub const KERBASE : Address = 0xFFFFFFFF80000000;
+pub const KERNBASE : 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 {
-	address + KERBASE
+	address + KERNBASE
+}
+
+pub fn v2p(address : Address) -> Address {
+    address - KERNBASE
 }

staging/Makefile

@@ -6,15 +6,18 @@ ISO := os.iso
 
 all:
 	rm -rf temp
-	mkdir temp && cd temp && $(AR) x $(SOURCE_ROOT)/kernel/libkernel.a
-	$(LD) -m elf_x86_64 -nodefaultlibs -T $(SOURCE_ROOT)/boot/x86_64/kernel64.ld -o kernel.sys $(SOURCE_ROOT)/boot/x86_64/entry64.o $(SOURCE_ROOT)/boot/x86_64/main.o temp/kernel.o -b binary $(SOURCE_ROOT)/boot/x86_64/initcode $(SOURCE_ROOT)/boot/x86_64/entryother
+	mkdir temp
+	cd temp && $(AR) x $(SOURCE_ROOT)/kernel/libkernel.a
+	cd temp && $(AR) x $(SOURCE_ROOT)/kernel/libcompiler-rt.a
+	cd temp && $(AR) x $(SOURCE_ROOT)/kernel/libmorestack.a
+	cd temp && $(AR) x $(SOURCE_ROOT)/kernel/libcore.rlib
+	$(LD) -m elf_x86_64 -nodefaultlibs -T $(SOURCE_ROOT)/boot/x86_64/kernel64.ld -o kernel.sys $(SOURCE_ROOT)/boot/x86_64/entry64.o $(SOURCE_ROOT)/boot/x86_64/main.o temp/kernel.o temp/core-*.o temp/morestack*.o -b binary $(SOURCE_ROOT)/boot/x86_64/initcode $(SOURCE_ROOT)/boot/x86_64/entryother
 #$(LD) -nodefaultlibs -z max-page-size=0x1000 -Tlinker.ld -o kernel.sys --start-group $(OBJECTS) --end-group 
 
 
 iso:
 	cp kernel.sys iso/boot
 	grub-mkrescue -o $(ISO) iso
-	
 
 clean:
 	@rm -f $(ISO) iso/boot/kernel.sys kernel.sys