Changeset 34 for trunk

Timestamp:

Jun 22, 2017, 7:58:20 AM (8 years ago)

Author:

max@…

Message:

Update the types (from i386/).

File:

• trunk/hal/x86_64/hal_types.h (modified) (3 diffs)

trunk/hal/x86_64/hal_types.h

@@ -54 +54 @@
 
 typedef uint64_t                    vaddr_t; // XXX
+typedef uint64_t                 pt_entry_t; // XXX
 
 /***************************************************************************
@@ -144 +145 @@
 typedef struct cache_line_s
 {
-  union
-  {
-    uint32_t values[CONFIG_CACHE_LINE_SIZE>>2];
-    uint32_t value;
-  };
+        union
+        {
+                uint32_t values[CONFIG_CACHE_LINE_SIZE>>2];
+                uint32_t value;
+        };
 }
 __attribute__((packed)) cacheline_t;
 
-/***************************************************************************
- *  Address types and macros         !!!  hardware dependant  !!!
+#define CACHELINE_ALIGNED __attribute__((aligned(CONFIG_CACHE_LINE_SIZE)))
+
+/***************************************************************************
+ *  Address types and macros        !!! hardware dependent !!!
  ***************************************************************************
- * An extended pointer a 64 bits integer, structured in two fields :
+ * An extended pointer is a 64 bits integer, structured in two fields :
  * - cxy : cluster identifier.
  * - ptr : pointer in the virtual space of a single cluster.
  *
- * In TSAR (MIPS32), the kernel virtual space has 4 Gbytes per cluster
- * - the cxy field occupies bits[47:32]
- * - the ptr field occupies bits[31:0]
+ * In Intel 64 bits, the kernel virtual space has 256 Tbytes per cluster
+ * - the cxy field occupies bits[63:48]
+ * - the ptr field occupies bits[47:0]
  ***************************************************************************
  * A physical address is a 64 bits integer, structured in two fields :
@@ -167 +170 @@
  * - lpa : local physical address inside cluster.
  *
- * In TSAR (MIPS32), the physical space has 4Gbytes per cluster.
- * - the cxy field occupies bits[39:32]
- * - the lpa field occupies bits[31:0]
- **************************************************************************/
-
-typedef uint32_t               reg_t;         // core register
-
-typedef uint64_t               xptr_t;        // extended pointer
-
-typedef uint16_t               cxy_t;         // cluster identifier
-
-typedef uint64_t               paddr_t;       // global physical address
-
-typedef uint32_t               lpa_t;         // local physical address
-
-typedef uint64_t               intptr_t;      // local pointer stored as integer
-
-typedef uint32_t               ppn_t;         // Physical Page Number
-
-typedef uint32_t               vpn_t;         // Virtual Page number
+ * In Intel 64 bits, the physical space has 256 Gbytes per cluster.
+ * - the cxy field occupies bits[63:48]
+ * - the lpa field occupies bits[47:0]
+ **************************************************************************/
+
+typedef uint64_t               reg_t;         // core register
+
+typedef uint64_t               xptr_t;         // extended pointer
+
+typedef uint16_t               cxy_t;          // cluster identifier
+
+typedef uint64_t               paddr_t;        // global physical address (64 bits)
+
+typedef uint64_t               lpa_t;          // local physical address
+
+typedef uint64_t               intptr_t;       // local pointer stored as integer
+
+typedef uint64_t               ppn_t;          // Physical Page Number
+
+typedef uint64_t               vpn_t;          // Virtual Page number
 
 #define XPTR_NULL              0
 
-#define PTR_MASK               0x00000000FFFFFFFFULL
-
-#define GET_CXY(xp)            ((cxy_t)((xp) >> 32))
-
-#define GET_PTR(xp)            ((void*)(uint32_t)((xp) & PTR_MASK))
-
-#define XPTR(cxy,ptr)          (((uint64_t)(cxy) << 32) | (((uint32_t)(ptr)) & PTR_MASK))
-
-#define LPA_MASK               0x00000000FFFFFFFFULL
-
-#define CXY_FROM_PADDR(paddr)  ((cxy_t)((paddr) >> 32)) 
+#define PTR_MASK               0x0000FFFFFFFFFFFFULL
+
+#define GET_CXY(xp)            ((cxy_t)((xp) >> 48))
+
+#define GET_PTR(xp)            ((void*)((xp) & PTR_MASK))
+
+#define XPTR(cxy,ptr)          (((uint64_t)(cxy) << 48) | (((uint64_t)(ptr)) & PTR_MASK))
+
+#define LPA_MASK               0X0000FFFFFFFFFFFFULL
+
+#define CXY_FROM_PADDR(paddr)  ((cxy_t)((paddr) >> 48)) 
 
 #define LPA_FROM_PADDR(paddr)  (lpa_t)((paddr & LPA_MASK)
 
-#define PADDR(cxy,lpa)         (((uint64_t)(cxy) << 32) | (((uint64_t)(lpa)) & LPA_MASK))
-
-
+#define PADDR(cxy,lad)         (((uint64_t)(cxy) << 48) | (((uint64_t)(ptr)) & LPA_MASK))
 
 #endif  /* HAL_TYPES_H_ */