Changeset 567807b1 in mainline for arch/ia32

Timestamp:

2006-05-24T17:03:29Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8d6bc2d5

Parents:

82da5f5

Message:

Modify the hierarchy of page fault handlers to pass access mode that caused the fault.
Architectures are required to pass either PF_ACCESS_READ, PF_ACCESS_WRITE or PF_ACCESS_EXEC
to as_page_fault(), depending on the cause of the fault.

Location:

arch/ia32

Files:

• include/interrupt.h (modified) (2 diffs)
• include/mm/page.h (modified) (2 diffs)
• src/interrupt.c (modified) (2 diffs)
• src/mm/page.c (modified) (2 diffs)

arch/ia32/include/interrupt.h

@@ -93 +93 @@
 extern void (* eoi_function)(void);
 
+extern void PRINT_INFO_ERRCODE(istate_t *istate);
 extern void null_interrupt(int n, istate_t *istate);
 extern void gp_fault(int n, istate_t *istate);
@@ -98 +99 @@
 extern void ss_fault(int n, istate_t *istate);
 extern void simd_fp_exception(int n, istate_t *istate);
-extern void page_fault(int n, istate_t *istate);
 extern void syscall(int n, istate_t *istate);
 extern void tlb_shootdown_ipi(int n, istate_t *istate);

arch/ia32/include/mm/page.h

@@ -91 +91 @@
 #include <typedefs.h>
 
+/* Page fault error codes. */
+
+/** When bit on this position is 0, the page fault was caused by a not-present page. */
+#define PFERR_CODE_P            (1<<0)
+
+/** When bit on this position is 1, the page fault was caused by a write. */
+#define PFERR_CODE_RW           (1<<1)
+
+/** When bit on this position is 1, the page fault was caused in user mode. */
+#define PFERR_CODE_US           (1<<2)
+
+/** When bit on this position is 1, a reserved bit was set in page directory. */ 
+#define PFERR_CODE_RSVD         (1<<3)  
+
 /** Page Table Entry. */
 struct page_specifier {
@@ -139 +153 @@
 
 extern void page_arch_init(void);
+extern void page_fault(int n, istate_t *istate);
 
 #endif /* __ASM__ */

arch/ia32/src/interrupt.c

@@ -55 +55 @@
 void (* eoi_function)(void) = NULL;
 
-static void PRINT_INFO_ERRCODE(istate_t *istate)
+void PRINT_INFO_ERRCODE(istate_t *istate)
 {
         char *symbol = get_symtab_entry(istate->eip);
@@ -140 +140 @@
 }
 
-void page_fault(int n, istate_t *istate)
-{
-        __address page;
-
-        page = read_cr2();
-        if (as_page_fault(page, istate) == AS_PF_FAULT) {
-                PRINT_INFO_ERRCODE(istate);
-                printf("page fault address: %#x\n", page);
-                panic("page fault\n");
-        }
-}
-
 void syscall(int n, istate_t *istate)
 {

arch/ia32/src/mm/page.c

@@ -44 +44 @@
 #include <interrupt.h>
 
-
 void page_arch_init(void)
 {
@@ -88 +87 @@
         return virtaddr;
 }
+
+void page_fault(int n, istate_t *istate)
+{
+        __address page;
+        pf_access_t access;
+        
+        page = read_cr2();
+                
+        if (istate->error_word & PFERR_CODE_RSVD)
+                panic("Reserved bit set in page directory.\n");
+
+        if (istate->error_word & PFERR_CODE_RW)
+                access = PF_ACCESS_WRITE;
+        else
+                access = PF_ACCESS_READ;
+
+        if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
+                PRINT_INFO_ERRCODE(istate);
+                printf("page fault address: %#x\n", page);
+                panic("page fault\n");
+        }
+}