Changeset 686 for trunk/hal/x86_64

Timestamp:

Jan 13, 2021, 12:47:53 AM (4 years ago)

Author:

alain

Message:

cosmetic

Location:

trunk/hal/x86_64/core

Files:

• hal_context.c (modified) (1 diff)
• hal_exception.c (modified) (1 diff)
• hal_gpt.c (modified) (5 diffs)
• hal_ppm.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_context.c

@@ -109 +109 @@
         /* Switch the VM space */
         if (newproc != oldproc) {
-                lcr3((uint64_t)newproc->vmm.gpt.ppn << CONFIG_PPM_PAGE_SHIFT);
+                lcr3((uint64_t)newproc->vmm.gpt.ppn << CONFIG_PPM_PAGE_ORDER);
         }
 

trunk/hal/x86_64/core/hal_exception.c

@@ -95 +95 @@
 
                         error = vmm_handle_page_fault(process,
-                            bad_vaddr >> CONFIG_PPM_PAGE_SHIFT);
+                            bad_vaddr >> CONFIG_PPM_PAGE_ORDER);
 
                         x86_printf("VA=%Z ERROR=%Z\n", bad_vaddr, (uint64_t)error);

trunk/hal/x86_64/core/hal_gpt.c

@@ -301 +301 @@
         L4dst = (pt_entry_t *)ppm_page2base(page_xp);
         memcpy(&L4dst[256], &L4src[256], 256 * sizeof(pt_entry_t));
-        L4dst[L4_SLOT_PTE] = (ppm_page2ppn(page_xp) << CONFIG_PPM_PAGE_SHIFT) |
+        L4dst[L4_SLOT_PTE] = (ppm_page2ppn(page_xp) << CONFIG_PPM_PAGE_ORDER) |
             PG_V | PG_KW | PG_NX;
 
@@ -324 +324 @@
 error_t hal_gpt_set_pte(gpt_t *gpt, vpn_t vpn, uint32_t attr, ppn_t ppn)
 {
-        vaddr_t va = vpn << CONFIG_PPM_PAGE_SHIFT;
+        vaddr_t va = vpn << CONFIG_PPM_PAGE_ORDER;
         paddr_t pa;
         kmem_req_t req;
@@ -384 +384 @@
         }
 
-        pa = ppn << CONFIG_PPM_PAGE_SHIFT;
+        pa = ppn << CONFIG_PPM_PAGE_ORDER;
         L1_BASE[pl1_i(va)] = pa | hal_gpt_attr_to_pte(attr);
 
@@ -392 +392 @@
 void hal_gpt_get_pte(gpt_t *gpt, vpn_t vpn, uint32_t *attr, ppn_t *ppn)
 {
-        vaddr_t va = vpn << CONFIG_PPM_PAGE_SHIFT;
+        vaddr_t va = vpn << CONFIG_PPM_PAGE_ORDER;
 
         *attr = 0;
@@ -408 +408 @@
                 /* large page */
                 *attr = hal_gpt_pte_to_attr(&L2_BASE[pl2_i(va)]);
-                *ppn = (L2_BASE[pl2_i(va)] & PG_2MFRAME) >> CONFIG_PPM_PAGE_SHIFT;
+                *ppn = (L2_BASE[pl2_i(va)] & PG_2MFRAME) >> CONFIG_PPM_PAGE_ORDER;
         } else {
                 /* small page */
                 *attr = hal_gpt_pte_to_attr(&L1_BASE[pl1_i(va)]);
-                *ppn = (L1_BASE[pl1_i(va)] & PG_FRAME) >> CONFIG_PPM_PAGE_SHIFT;
+                *ppn = (L1_BASE[pl1_i(va)] & PG_FRAME) >> CONFIG_PPM_PAGE_ORDER;
         }
 

trunk/hal/x86_64/core/hal_ppm.c

@@ -68 +68 @@
 
         // compute number of pages required to store page descriptor array
-        uint32_t pages_tbl_nr = bytes >> CONFIG_PPM_PAGE_SHIFT;
+        uint32_t pages_tbl_nr = bytes >> CONFIG_PPM_PAGE_ORDER;
 
         // compute total number of reserved pages (kernel code & pages_tbl[])