Changeset 45 for trunk/hal/x86_64/hal_gpt.c

Timestamp:

Jun 23, 2017, 11:55:08 AM (7 years ago)

Author:

max@…

Message:

Add some code for LAPIC; far from complete, but a good start.

File:

• trunk/hal/x86_64/hal_gpt.c (modified) (2 diffs)

trunk/hal/x86_64/hal_gpt.c

@@ -65 +65 @@
 }
 
+/*
+ * Reset the bootstrap VA we've used in cluster0 so far. After this
+ * function, cluster0's heap is empty.
+ */
+void hal_gpt_bootstrap_reset()
+{
+        size_t npages = (va_avail - CLUSTER_HEAP_MIN_VA(0)) / PAGE_SIZE;
+        hal_gpt_leave_range(CLUSTER_HEAP_MIN_VA(0), npages);
+}
+
+
 void hal_gpt_enter(vaddr_t va, paddr_t pa)
 {
-        XASSERT((va % PAGE_SIZE == 0));
-        XASSERT((pa % PAGE_SIZE == 0));
+        XASSERT(va % PAGE_SIZE == 0);
+        XASSERT(pa % PAGE_SIZE == 0);
+        XASSERT(va == tmpva || PTE_BASE[pl1_i(va)] == 0);
         PTE_BASE[pl1_i(va)] = (pa & PG_FRAME) | PG_V | PG_KW | PG_NX;
 }
@@ -77 +89 @@
         for (i = 0; i < n; i++) {
                 hal_gpt_enter(va + i * PAGE_SIZE, pa + i * PAGE_SIZE);
+                invlpg(va + i * PAGE_SIZE);
+        }
+}
+
+void hal_gpt_leave(vaddr_t va)
+{
+        XASSERT(va % PAGE_SIZE == 0);
+        XASSERT(PTE_BASE[pl1_i(va)] != 0);
+        PTE_BASE[pl1_i(va)] = 0;
+}
+
+void hal_gpt_leave_range(vaddr_t va, size_t n)
+{
+        size_t i;
+        for (i = 0; i < n; i++) {
+                hal_gpt_leave(va + i * PAGE_SIZE);
                 invlpg(va + i * PAGE_SIZE);
         }