Changeset 44 for trunk/hal/x86_64/hal_boot.h

Timestamp:

Jun 23, 2017, 9:57:35 AM (7 years ago)

Author:

max@…

Message:

Update. We need to use two separate arrays: one for the heap and one for
the kimg. The size of a heap entry is configurable, but that of the kimg
is not (fixed by mcmodel).

As a result, we also need to use two XPTRs: XPTR_HEAP and XPTR_KIMG. For
now we only declare XPTR_KIMG, and are not using it yet.

File:

• trunk/hal/x86_64/hal_boot.h (modified) (1 diff)

trunk/hal/x86_64/hal_boot.h

@@ -130 +130 @@
 #define NPDPG   (PAGE_SIZE / sizeof (pt_entry_t))
 
-#define CLUSTERS_BASE_VA        0xffff800000000000
+/* -------------------------------------------------------------------------- */
 
 /*
- * These parameters are configurable.
+ * There are two arrays: one for the heap, one for the kernel image. They are
+ * separated by 64TB of VA, which is more than enough to avoid collision.
  */
-#define CLUSTER_VA_SIZE 0x100000000 /* 4GB */
-#define CLUSTER_PA_SIZE 0x200000000 /* 8GB */
+#define CLUSTERS_HEAP_BASE_VA   0xffff800000000000
+#define CLUSTERS_KIMG_BASE_VA   0xffffc00000000000
 
-#define CLUSTER_MIN_VA(n)       (CLUSTERS_BASE_VA + n * CLUSTER_VA_SIZE)
-#define CLUSTER_MAX_VA(n)       (CLUSTER_MIN_VA(n) + CLUSTER_VA_SIZE)
+/* These parameters are configurable. */
+#define CLUSTER_HEAP_VA_SIZE    0x100000000 /* 4GB */
+#define CLUSTER_HEAP_PA_SIZE    0x200000000 /* 8GB */
 
+/* These parameters are *not* configurable. */
+#define CLUSTER_KIMG_VA_SIZE    0x80000000  /* 2GB */
+
+/* Macros to get the heap/kimg ranges for a cluster */
+#define CLUSTER_HEAP_MIN_VA(n) \
+        (CLUSTERS_HEAP_BASE_VA + n * CLUSTER_HEAP_VA_SIZE)
+#define CLUSTER_HEAP_MAX_VA(n) \
+        (CLUSTER_HEAP_MIN_VA(n) + CLUSTER_HEAP_VA_SIZE)
+#define CLUSTER_KIMG_MIN_VA(n) \
+        (CLUSTERS_KIMG_BASE_VA + n * CLUSTER_KIMG_VA_SIZE)
+#define CLUSTER_KIMG_MAX_VA(n) \
+        (CLUSTER_KIMG_MIN_VA(n) + CLUSTER_KIMG_VA_SIZE)
+