:: commit df22413384c93808b63d9740b91ee216ebfe71b8

mintsuki <mintsuki@protonmail.com> — 2024-08-01 03:51

parents: 645b12507e

protos/limine: Fix broken comparison introduced in f6c8097c784535d746ddcbc6ece27c533af3c281

diff --git a/common/protos/limine.c b/common/protos/limine.c
index 8dc92ba3..82c0519f 100644
--- a/common/protos/limine.c
+++ b/common/protos/limine.c
@@ -578,38 +578,38 @@ noreturn void limine_load(char *config, char *cmdline) {
         max_supported_paging_mode = PAGING_MODE_X86_64_5LVL;
     }
     min_supported_paging_mode = PAGING_MODE_X86_64_4LVL;
-    if (hhdm_span_top >= ((uint64_t)1 << paging_mode_va_bits(min_supported_paging_mode)) - 2) {
+    if (hhdm_span_top >= (uint64_t)1 << (paging_mode_va_bits(min_supported_paging_mode) - 2)) {
         min_supported_paging_mode = PAGING_MODE_X86_64_5LVL;
         if (min_supported_paging_mode > max_supported_paging_mode) {
             goto hhdm_fail;
         }
     }
-    if (hhdm_span_top >= ((uint64_t)1 << paging_mode_va_bits(min_supported_paging_mode)) - 2) {
+    if (hhdm_span_top >= (uint64_t)1 << (paging_mode_va_bits(min_supported_paging_mode) - 2)) {
         goto hhdm_fail;
     }
 #elif defined (__aarch64__)
     max_supported_paging_mode = PAGING_MODE_AARCH64_4LVL;
     min_supported_paging_mode = PAGING_MODE_AARCH64_4LVL;
-    if (hhdm_span_top >= ((uint64_t)1 << paging_mode_va_bits(min_supported_paging_mode)) - 2) {
+    if (hhdm_span_top >= (uint64_t)1 << (paging_mode_va_bits(min_supported_paging_mode) - 2)) {
         goto hhdm_fail;
     }
     // TODO(qookie): aarch64 also has optional 5 level paging when using 4K pages
 #elif defined (__riscv64)
     max_supported_paging_mode = vmm_max_paging_mode();
     min_supported_paging_mode = PAGING_MODE_RISCV_SV39;
-    if (hhdm_span_top >= ((uint64_t)1 << paging_mode_va_bits(min_supported_paging_mode)) - 2) {
+    if (hhdm_span_top >= (uint64_t)1 << (paging_mode_va_bits(min_supported_paging_mode) - 2)) {
         min_supported_paging_mode = PAGING_MODE_RISCV_SV48;
         if (min_supported_paging_mode > max_supported_paging_mode) {
             goto hhdm_fail;
         }
     }
-    if (hhdm_span_top >= ((uint64_t)1 << paging_mode_va_bits(min_supported_paging_mode)) - 2) {
+    if (hhdm_span_top >= (uint64_t)1 << (paging_mode_va_bits(min_supported_paging_mode) - 2)) {
         min_supported_paging_mode = PAGING_MODE_RISCV_SV57;
         if (min_supported_paging_mode > max_supported_paging_mode) {
             goto hhdm_fail;
         }
     }
-    if (hhdm_span_top >= ((uint64_t)1 << paging_mode_va_bits(min_supported_paging_mode)) - 2) {
+    if (hhdm_span_top >= (uint64_t)1 << (paging_mode_va_bits(min_supported_paging_mode) - 2)) {
         goto hhdm_fail;
     }
 #else
tab: 248 wrap: offon