Changes in kernel/arch/abs32le/include/mm/page.h [50fda24:dc0b964] in mainline

File:

• kernel/arch/abs32le/include/mm/page.h (modified) (5 diffs)

kernel/arch/abs32le/include/mm/page.h

@@ -37 +37 @@
 
 #include <arch/mm/frame.h>
+#include <trace.h>
 
 #define PAGE_WIDTH  FRAME_WIDTH
@@ -43 +44 @@
 #ifdef KERNEL
 
-#ifndef __ASM__
-        #define KA2PA(x)  (((uintptr_t) (x)) - 0x80000000)
-        #define PA2KA(x)  (((uintptr_t) (x)) + 0x80000000)
-#else
-        #define KA2PA(x)  ((x) - 0x80000000)
-        #define PA2KA(x)  ((x) + 0x80000000)
-#endif
+#define KA2PA(x)  (((uintptr_t) (x)) - UINT32_C(0x80000000))
+#define PA2KA(x)  (((uintptr_t) (x)) + UINT32_C(0x80000000))
 
 /*
@@ -69 +65 @@
 
 /* Macros calculating indices for each level. */
-#define PTL0_INDEX_ARCH(vaddr)  (((vaddr) >> 22) & 0x3ff)
+#define PTL0_INDEX_ARCH(vaddr)  (((vaddr) >> 22) & 0x3ffU)
 #define PTL1_INDEX_ARCH(vaddr)  0
 #define PTL2_INDEX_ARCH(vaddr)  0
-#define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 12) & 0x3ff)
+#define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 12) & 0x3ffU)
 
 /* Get PTE address accessors for each level. */
@@ -122 +118 @@
 #define PTE_EXECUTABLE_ARCH(p)  1
 
-#ifndef __ASM__
-
 #include <mm/mm.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
 #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. */
 typedef struct {
-        unsigned present : 1;
-        unsigned writeable : 1;
-        unsigned uaccessible : 1;
-        unsigned page_write_through : 1;
-        unsigned page_cache_disable : 1;
-        unsigned accessed : 1;
-        unsigned dirty : 1;
-        unsigned pat : 1;
-        unsigned global : 1;
-        unsigned soft_valid : 1;        /**< Valid content even if the present bit is not set. */
-        unsigned avl : 2;
-        unsigned frame_address : 20;
-} __attribute__ ((packed)) pte_t;
+        unsigned int present : 1;
+        unsigned int writeable : 1;
+        unsigned int uaccessible : 1;
+        unsigned int page_write_through : 1;
+        unsigned int page_cache_disable : 1;
+        unsigned int accessed : 1;
+        unsigned int dirty : 1;
+        unsigned int pat : 1;
+        unsigned int global : 1;
+        
+        /** Valid content even if the present bit is not set. */
+        unsigned int soft_valid : 1;
+        unsigned int avl : 2;
+        unsigned int frame_address : 20;
+} __attribute__((packed)) pte_t;
 
-static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+    REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
 {
         pte_t *p = &pt[i];
         
-        return ((!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT |
-            (!p->present) << PAGE_PRESENT_SHIFT |
-            p->uaccessible << PAGE_USER_SHIFT |
-            1 << PAGE_READ_SHIFT |
-            p->writeable << PAGE_WRITE_SHIFT |
-            1 << PAGE_EXEC_SHIFT |
-            p->global << PAGE_GLOBAL_SHIFT);
+        return (
+            ((unsigned int) (!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
+            ((unsigned int) (!p->present) << PAGE_PRESENT_SHIFT) |
+            ((unsigned int) p->uaccessible << PAGE_USER_SHIFT) |
+            (1 << PAGE_READ_SHIFT) |
+            ((unsigned int) p->writeable << PAGE_WRITE_SHIFT) |
+            (1 << PAGE_EXEC_SHIFT) |
+            ((unsigned int) p->global << PAGE_GLOBAL_SHIFT)
+        );
 }
 
-static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+    WRITES(ARRAY_RANGE(pt, PTL0_ENTRIES_ARCH))
+    REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
 {
         pte_t *p = &pt[i];
@@ -192 +176 @@
 
 extern void page_arch_init(void);
-extern void page_fault(int n, istate_t *istate);
-
-#endif /* __ASM__ */
+extern void page_fault(unsigned int, istate_t *);
 
 #endif /* KERNEL */