page working!!!

Author: wangjild

Makefile

@@ -1,6 +1,6 @@
 ARCH=i386
 
-CFLAGS=-I . -I ./include -I ./include/boot -fno-builtin
+CFLAGS=-I . -I ./include -I ./include/boot -fno-builtin -g
 
 cobj = lib/kstdlib.o lib/kstdio.o src/kernel.o src/protect.o src/irpts.o arch/$(ARCH)/page.o
 asmobj = boot/$(ARCH)/loader.o arch/$(ARCH)/irpts.o

arch/i386/page.c

@@ -13,10 +13,11 @@ pgtbl_t g_pgtbl[2] __pgtbl;
 }
 
 #define fill_page_tbl(idx, phy_addr_start, attr) { \
-    int i = 0; int start = (phy_addr_start & 0xFFFFF000); \
-    while (i < PG_TBL_SIZE) { \
-        set_page_tbl(idx, i, start + (i << __PG_OFFSET__), attr); \
-        ++i; \
+    int tbli = 0; int start = (phy_addr_start & 0xFFFFF000); \
+    printk("phy_addr_start:%x\n", start); \
+    while (tbli < PG_TBL_SIZE) { \
+        set_page_tbl(idx, tbli, start + (tbli << __PG_OFFSET__), attr); \
+        ++tbli; \
     } \
 }
 
@@ -40,7 +41,7 @@ void setup_paging(void) {
     }
 
     i = 0;
-    for (; i < 4; ++i) {
+    for (; i < 2; ++i) {
         fill_page_tbl(i, PHY_ADDR_START + i << (__PG_OFFSET__ + 10), 0x07); /* pg0 0K - 4K */
     }
 

linker.ld

@@ -17,10 +17,10 @@ SECTIONS{
 		ebss = . ;
 	}
 
-    .pgdir.data   ALIGN   (0x04) : {
+    .pgdir.data   ALIGN   (0x01000) : {
         *(.pgdir.data)
     }
-    .pgtbl.data   ALIGN   (0x04) : {
+    .pgtbl.data   ALIGN   (0x01000) : {
         *(.pgtbl.data)
     }
 	_end = . ;

src/kernel.c

@@ -144,7 +144,7 @@ kernel_main (unsigned long addr, unsigned long magic)
 
 
     setup_gdt();
+    setup_idt();
     setup_paging();
     printk("Hello CatOS!\n");
-    setup_idt();
 }

tools/Makefile

@@ -2,9 +2,5 @@ PREFIX=opt/
 bochs:
 	PWD=`pwd`
 	cd bochs-2.4.5 && \
-	LDFLAGS='-lpthread'  ./configure --enable-debugger --enable-logging --enable-disasm --prefix=/usr/ --with-x11 --with-term && \
-<<<<<<< HEAD
-	make -j 4 && make install
-=======
+	LDFLAGS='-lpthread'  ./configure --enable-logging --enable-disasm --prefix=/usr/ --with-x11 --with-term --enable-debugger && \
 	make -j 4 && sudo make install
->>>>>>> 800ef0fd84f9b93949b8b128372172ece42332c6