Changeset 37

Timestamp:

Jun 22, 2017, 2:36:05 PM (7 years ago)

Author:

alain

Message:

Adapt to paso/doble AMD machine.

File:

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

trunk/hal/i386/hal_types.h

@@ -154 +154 @@
  * - ptr : pointer in the virtual space of a single cluster.
  *
- * In Intel 64 bits, the kernel virtual space has 256 Tbytes per cluster
+ * In Intel 64 bits, the kernel virtual space has 4 Gbytes per cluster
  * - the cxy field occupies bits[63:48]
  * - the ptr field occupies bits[47:0]
@@ -162 +162 @@
  * - lpa : local physical address inside cluster.
  *
- * 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]
+ * In INTEL 64 bits, the physical space has 8 Gbytes per cluster.
+ * - the cxy field occupies bits[35:33]
+ * - the lpa field occupies bits[32:0]
  **************************************************************************/
 
@@ -183 +183 @@
 typedef uint64_t               vpn_t;          // Virtual Page number
 
+
+
 #define XPTR_NULL              0
 
-#define PTR_MASK               0x0000FFFFFFFFFFFFULL
-
-#define GET_CXY(xp)            ((cxy_t)((xp) >> 48))
+#define PTR_MASK               0x00000000FFFFFFFFULL
+
+#define PTR_SHIFT              32
+
+#define GET_CXY(xp)            ((cxy_t)((xp) >> 32))
 
 #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 XPTR(cxy,ptr)          (((uint64_t)(cxy) << PTR_SHIFT) | (((uint64_t)(ptr)) & PTR_MASK))
+
+
+
+#define LPA_MASK               0X00000001FFFFFFFFULL
+
+#define LPA_SHIFT              33
+
+#define CXY_FROM_PADDR(paddr)  ((cxy_t)((paddr) >> LPA_SHIFT)) 
 
 #define LPA_FROM_PADDR(paddr)  (lpa_t)((paddr & LPA_MASK)
 
-#define PADDR(cxy,lad)         (((uint64_t)(cxy) << 48) | (((uint64_t)(ptr)) & LPA_MASK))
+#define PADDR(cxy,lad)         (((uint64_t)(cxy) << LPA_SHIFT) | (((uint64_t)(ptr)) & LPA_MASK))