mem: PDE/PTEの構造体宣言をヘッダーファイルへ移動

cupnes · Dec 21, 2015 · a2b3585 · a2b3585
1 parent 3e8b196
commit a2b3585
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/kernel/include/memory.h b/kernel/include/memory.h
@@ -1,6 +1,27 @@
 #ifndef __MEMORY_H__
 #define __MEMORY_H__
 
+struct page_directory_entry {
+	union {
+		struct {
+			unsigned int all;
+		};
+		struct {
+			unsigned int p: 1, r_w: 1, u_s: 1, pwt: 1, pcd: 1, a: 1, reserved: 1, ps: 1, g: 1, usable: 3, pt_base: 20;
+		};
+	};
+};
+struct page_table_entry {
+	union {
+		struct {
+			unsigned int all;
+		};
+		struct {
+			unsigned int p: 1, r_w: 1, u_s: 1, pwt: 1, pcd: 1, a: 1, d: 1, pat: 1, g: 1, usable: 3, page_base: 20;
+		};
+	};
+};
+
 void mem_init(void);
 void mem_page_start(void);
 

diff --git a/kernel/memory.c b/kernel/memory.c
@@ -4,26 +4,8 @@
 
 void mem_init(void)
 {
-	struct page_directory_entry {
-		union {
-			struct {
-				unsigned int all;
-			};
-			struct {
-				unsigned int p: 1, r_w: 1, u_s: 1, pwt: 1, pcd: 1, a: 1, reserved: 1, ps: 1, g: 1, usable: 3, pt_base: 20;
-			};
-		};
-	} *pde;
-	struct page_table_entry {
-		union {
-			struct {
-				unsigned int all;
-			};
-			struct {
-				unsigned int p: 1, r_w: 1, u_s: 1, pwt: 1, pcd: 1, a: 1, d: 1, pat: 1, g: 1, usable: 3, page_base: 20;
-			};
-		};
-	} *pte;
+	struct page_directory_entry *pde;
+	struct page_table_entry *pte;
 	unsigned int paging_base_addr;
 	unsigned int i;
 	unsigned int cr4;