higher half worked

Author: wangjild

.gitignore

@@ -5,3 +5,4 @@ opt
 disk.img
 *.swp
 tools/bochs*
+kernel.map

arch/i386/page.c

@@ -1,28 +1,43 @@
 #include <sys/type.h>
 #include <arch/i386/page.h>
 
-pg_t g_pgdir[PG_DIR_SIZE] __pgdir;
-pg_t g_pg0[PG_TBL_SIZE] __pgtbl;
+pgdir_t g_pgdir __pgdir;
+pgtbl_t g_pgtbl[1] __pgtbl;
 
-#define hh2phys(viraddr) (((void*) viraddr) + 0x0 - KERNEL_OFFSET)
+#define set_page_dir(i, pg_tbl_addr, attr) { \
+    g_pgdir.item[i] = (pg_t) ((uint32_t) pg_tbl_addr & 0xFFFFF000) | (attr & 0x00000FFF); \
+}
+
+#define set_page_tbl(i, j, phy_addr, attr) { \
+    g_pgtbl[i].item[j] = (pg_t) ((uint32_t) phy_addr & 0xFFFFF000) | (attr & 0x00000FFF); \
+}
+
+#define fill_page_tbl(idx, phy_addr_start, attr) { \
+    int tbli = 0; int start = (phy_addr_start & 0xFFFFF000); \
+    while (tbli < PG_TBL_SIZE) { \
+        set_page_tbl(idx, tbli, start + (tbli << __PG_OFFSET__), attr); \
+        ++tbli; \
+    } \
+}
+
+#define enable_paging(pgdir_base) { \
+    __asm__ __volatile__ ( \
+        "movl %0, %%eax\n\t" \
+        "movl %%eax, %%cr3\n\t" \
+        "movl %%cr0, %%eax\n\t" \
+        "orl  $0x80000000, %%eax\n\t" \
+        "movl %%eax, %%cr0\n\t" :: "a"(pgdir_base) \
+    ); \
+}
 
 void setup_paging(void) {
-    void *pgdirptr = hh2phys(g_pgdir);
-    void *pg0ptr = hh2phys(g_pg0);
-    int k;
-    for(k = 0; k < PG_TBL_SIZE; ++k) {
-        g_pg0[k] = (uint32_t) (k * (1<<__PG_OFFSET__)) | 0x3;
-        g_pgdir[k] = (uint32_t) 0;
-    }
-
-    g_pgdir[0] = (uint32_t) pg0ptr | 0x03;
-    g_pgdir[KERNEL_DIR_SIDX] = (uint32_t) pg0ptr | 0x03;
-
-    __asm__ __volatile__ ( 
-        "movl %0, %%eax\n\t" 
-        "movl %%eax, %%cr3\n\t" 
-        "movl %%cr0, %%eax\n\t" 
-        "orl  $0x80000000, %%eax\n\t" 
-        "movl %%eax, %%cr0\n\t" :: "m"(pgdirptr)
-    ); 
+    memset(&g_pgdir, 0, sizeof(pgdir_t));
+    
+    set_page_dir(0, logic2phys(&g_pgtbl[0]), 0x3);
+    set_page_dir(KERNEL_DIR_SIDX, logic2phys(&g_pgtbl[0]), 0x3);
+
+    fill_page_tbl(0, 0x0, 0x03); 
+    /* pg0 0 - 4M */
+
+    enable_paging(logic2phys(&g_pgdir));
 }

arch/i386/page.h

@@ -37,8 +37,15 @@ typedef uint32_t pg_t;
 
 #define __PG_OFFSET__   12
 
-extern pg_t  g_pgdir[PG_DIR_SIZE] __pgdir;
-extern pg_t  g_pg0[PG_TBL_SIZE] __pgtbl; // max 4G
+typedef struct pgdir {
+    pg_t item[PG_DIR_SIZE];
+}pgdir_t;
+
+typedef pgdir_t pgtbl_t;
+extern pgdir_t  g_pgdir __pgdir;
+extern pgtbl_t  g_pgtbl[1] __pgtbl; // max 4G
+
+#define logic2phys(viraddr) ((void*) viraddr) + 0x0 - KERNEL_OFFSET
 
 #define KERNEL_DIR_SIDX   (KERNEL_OFFSET >> 22)
 #define KERNEL_DIR_EIDX   PG_DIR_SIZE

boot/i386/loader.asm

@@ -1,4 +1,4 @@
-%include "boot/i386/gdt.asm"
+;%include "boot/i386/gdt.asm"
 
 global	loader
 extern	kernel_main