Changeset 383 for trunk

Timestamp:

Aug 16, 2017, 11:13:27 AM (7 years ago)

Author:

max@…

Message:

Use constant flags.

Location:

trunk/hal

Files:

• generic/hal_gpt.h (modified) (1 diff)
• x86_64/core/hal_gpt.c (modified) (2 diffs)

trunk/hal/generic/hal_gpt.h

@@ -45 +45 @@
 
 /****************************************************************************************
- * These global variables define the masks for the Generic Page Table Entry attributes.
- * The actual values must be defined in the implementation (hal_gpt.c file).
+ * These macros define the masks for the Generic Page Table Entry attributes.
  ***************************************************************************************/
 
-extern uint32_t  GPT_MAPPED;         /*! PTE is mapped                                 */
-extern uint32_t  GPT_SMALL;          /*! PTE is a small page                           */
-extern uint32_t  GPT_READABLE;       /*! PTE is readable                               */
-extern uint32_t  GPT_WRITABLE;       /*! PTE is writable                               */
-extern uint32_t  GPT_EXECUTABLE;     /*! PTE is executable                             */
-extern uint32_t  GPT_CACHABLE;       /*! PTE can be cached                             */
-extern uint32_t  GPT_USER;           /*! PTE is user accessible                        */
-extern uint32_t  GPT_DIRTY;          /*! PTE has been "recently" written               */
-extern uint32_t  GPT_ACCESSED;       /*! PTE has been "recently" accessed              */
-extern uint32_t  GPT_GLOBAL;         /*! PTE is kept in TLB at context switch          */
-extern uint32_t  GPT_COW;            /*! PTE must be copied on write                   */
-extern uint32_t  GPT_SWAP;           /*! PTE swapped on disk (not implemented yet)     */
-extern uint32_t  GPT_LOCKED;         /*! PTE is protected against concurrent access    */
+#define GPT_MAPPED      0x0000  /*! PTE is mapped                                 */
+#define GPT_SMALL       0x0001  /*! PTE is a small page                           */
+#define GPT_READABLE    0x0002  /*! PTE is readable                               */
+#define GPT_WRITABLE    0x0004  /*! PTE is writable                               */
+#define GPT_EXECUTABLE  0x0008  /*! PTE is executable                             */
+#define GPT_CACHABLE    0x0010  /*! PTE can be cached                             */
+#define GPT_USER        0x0020  /*! PTE is user accessible                        */
+#define GPT_DIRTY       0x0040  /*! PTE has been "recently" written               */
+#define GPT_ACCESSED    0x0080  /*! PTE has been "recently" accessed              */
+#define GPT_GLOBAL      0x0100  /*! PTE is kept in TLB at context switch          */
+#define GPT_COW         0x0200  /*! PTE must be copied on write                   */
+#define GPT_SWAP        0x0400  /*! PTE swapped on disk (not implemented yet)     */
+#define GPT_LOCKED      0x0800  /*! PTE is protected against concurrent access    */
 
 /****************************************************************************************

trunk/hal/x86_64/core/hal_gpt.c

@@ -236 +236 @@
 /* -------------------------------------------------------------------------- */
 
-/****************************************************************************************
- * These global variables defines the masks for the Generic Page Table Entry attributes,
- * and must be defined in all GPT implementation.
- ***************************************************************************************/
-
-uint32_t GPT_MAPPED;
-uint32_t GPT_SMALL;
-uint32_t GPT_READABLE;
-uint32_t GPT_WRITABLE;
-uint32_t GPT_EXECUTABLE;
-uint32_t GPT_CACHABLE;
-uint32_t GPT_USER;
-uint32_t GPT_DIRTY;
-uint32_t GPT_ACCESSED;
-uint32_t GPT_GLOBAL;
-uint32_t GPT_COW;
-uint32_t GPT_SWAP;
-uint32_t GPT_LOCKED;
-
 error_t hal_gpt_create(gpt_t *gpt)
 {
@@ -298 +279 @@
         gpt->page = GET_PTR(page_xp);
 
-        /* initialize PTE entries attributes masks */
-        GPT_MAPPED     = PG_V;
-        GPT_SMALL      = 0;
-        GPT_READABLE   = PG_V;
-        GPT_WRITABLE   = PG_RW;
-        GPT_EXECUTABLE = 0;
-        GPT_CACHABLE   = 0;
-        GPT_USER       = PG_u;
-        GPT_DIRTY      = 0;
-        GPT_ACCESSED   = 0;
-        GPT_GLOBAL     = PG_G;
-        GPT_COW        = 0;
-        GPT_SWAP       = 0;
-        GPT_LOCKED     = 0;
 
         return 0;