1 files changed, 24 insertions, 17 deletions

diff --git a/arch/riscv/init/init.c b/arch/riscv/init/init.c
index cdcfbb7..69dbc0a 100644
--- a/arch/riscv/init/init.c
+++ b/arch/riscv/init/init.c
@@ -2,19 +2,20 @@
 #include <apos/init.h>
 #include <apos/sizes.h>
 #include <pages.h>
+#include <csr.h>
 #include <vmap.h>
 
 struct page_ret {
 	size_t left;
 	size_t num;
-	void *top;
+	size_t top;
 };
 
 extern void main(struct mm_pagearr_info *pageinfo);
 
-void __init init_zero(void *ptr, size_t bytes)
+void __init init_zero(size_t ptr, size_t bytes)
 {
-	char *byte_ptr = ptr;
+	char *byte_ptr = (char *)ptr;
 
 	/* Not entirely sure if it would be faster to use a larget type than
 	 * char, Linux seems to have memset16/32/64 but I guess I should check
@@ -24,7 +25,7 @@ void __init init_zero(void *ptr, size_t bytes)
 		*byte_ptr++ = 0;
 }
 
-struct page_ret __init init_pages(size_t ram_size, void *ram_top,
+struct page_ret __init init_pages(size_t ram_size, size_t ram_top,
 		size_t page_size, size_t struct_size)
 {
 	size_t num_pages = ram_size / page_size;
@@ -33,7 +34,7 @@ struct page_ret __init init_pages(size_t ram_size, void *ram_top,
 	struct page_ret pageret;
 	pageret.top = ram_top - size_pages;
 	pageret.num = num_pages;
-	pageret.left = ram_size - (size_pages * page_size);
+	pageret.left = ram_size - (num_pages * page_size);
 
 	init_zero(pageret.top, size_pages);
 
@@ -55,12 +56,13 @@ void __init init_enter_vm(unsigned long *root_page)
 {
 	asm volatile ("csrw 0x180, %0\n" "sfence.vma\n"
 			:
-			: "rK" (root_page)
+			: "rK" (SATP_MODE_39 | ((unsigned long)root_page >> 12))
 			: "memory");
 }
 
-void call_main()
+void __init call_main()
 {
+	while(1){};
 }
 
 void __init init(void *ram_base, void *ram_top, void *initrd, void *fdt, void *boot)
@@ -71,37 +73,42 @@ void __init init(void *ram_base, void *ram_top, void *initrd, void *fdt, void *b
 	struct page_ret pageret;
 
 	/* create crude page status map at the top of physical RAM */
-	pageret = init_pages(ram_size, ram_top,
+	pageret = init_pages(ram_size, (size_t)ram_top,
 			SZ_512G, sizeof(struct terapages));
+	pagearr.tera_top = (struct terapages *)pageret.top;
 	pagearr.tera_num = pageret.num;
-	pagearr.tera_top = pageret.top;
 	
 	pageret = init_pages(pageret.left, pageret.top,
 			SZ_1G, sizeof(struct gigapages));
+	pagearr.giga_top = (struct gigapages *)pageret.top;
 	pagearr.giga_num = pageret.num;
-	pagearr.giga_top = pageret.top;
 
 	pageret = init_pages(pageret.left, pageret.top,
 			SZ_2M, sizeof(struct megapages));
+	pagearr.mega_top = (struct megapages *)pageret.top;
 	pagearr.mega_num = pageret.num;
-	pagearr.mega_top = pageret.top;
 
 	pageret = init_pages(pageret.left, pageret.top,
 			SZ_4K, sizeof(struct kilopages));
+	pagearr.kilo_top = (struct kilopages *)pageret.top;
 	pagearr.kilo_num = pageret.num;
-	pagearr.kilo_top = pageret.top;
 
 	unsigned long *root_page = (unsigned long *)
 		(init_align_down((size_t)pagearr.kilo_top, SZ_4K) - SZ_4K);
 
+	unsigned long *mid_page = (unsigned long)root_page - SZ_4K;
+	unsigned long *bot_page = (unsigned long)mid_page - SZ_4K;
+
 	/* TODO: should init insert page data into the created arrays? */
+	unsigned long root_addr = (((unsigned long)boot >> 12) >> 18) & 0x1ff;
+	unsigned long mid_addr = (((unsigned long)boot >> 12) >> 9) & 0x1ff;
+	unsigned long bot_addr = (((unsigned long)boot >> 12) >> 0) & 0x1ff;
 
-	/* map .text.* into top part of RAM */
-	root_page[511] = ((unsigned long)&main & VM_AL) | VM_V | VM_R | VM_W | VM_X;
+	root_page[root_addr] = (((unsigned long)mid_page & ~0x3ff) >> 2) | VM_V;
+	mid_page[mid_addr] = ((unsigned long)bot_page & ~0x3ff) >> 2 | VM_V;
+	bot_page[bot_addr] = (((unsigned long)boot & ~0x3ff) >> 2) | VM_V | VM_R | VM_W | VM_X;
 
-	/* temporarily map .init.* so that our current physical address matches
-	 * the virtual address */
-	root_page[0] = 0 | VM_V | VM_R | VM_W | VM_X;
+	//root_page[0] = (((unsigned long)ram_base & ~0x3ff) >> 2) | VM_V | VM_R | VM_W | VM_X;
 
 	/* enter virtual memory */
 	init_enter_vm(root_page);