aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/src/memory/cpu
diff options
context:
space:
mode:
authorFabian Imhof <fabian.imhof@ost.ch>2025-02-27 09:21:43 +0100
committerFabian Imhof <fabian.imhof@ost.ch>2025-02-27 09:21:43 +0100
commit3fb836101a2032e93f7b82c924ce208d7377a5ea (patch)
tree52f9aa1f5316b9938e74f43637c0641803fda01a /arch/x86_64/src/memory/cpu
parentcd42c21f2460751428b3e1b4ae07ea0b924967bc (diff)
parent2f1f0fa8b0dc1893219be68ab8bf653b5d6349fb (diff)
downloadteachos-3fb836101a2032e93f7b82c924ce208d7377a5ea.tar.xz
teachos-3fb836101a2032e93f7b82c924ce208d7377a5ea.zip
Merge branch 'feat_new_delete_override' into 'develop_ba'
new delete override See merge request teachos/kernel!4
Diffstat (limited to 'arch/x86_64/src/memory/cpu')
-rw-r--r--arch/x86_64/src/memory/cpu/control_register.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86_64/src/memory/cpu/control_register.cpp b/arch/x86_64/src/memory/cpu/control_register.cpp
index 298874f..7ee88b5 100644
--- a/arch/x86_64/src/memory/cpu/control_register.cpp
+++ b/arch/x86_64/src/memory/cpu/control_register.cpp
@@ -1,6 +1,6 @@
#include "arch/memory/cpu/control_register.hpp"
-#include "arch/exception_handling/assert.hpp"
+#include "arch/exception_handling/panic.hpp"
#include <type_traits>
@@ -24,8 +24,7 @@ namespace teachos::arch::memory::cpu
asm volatile("mov %%cr4, %[output]" : [output] "=r"(current_value));
break;
default:
- exception_handling::assert(false,
- "[Control Register] Attempted to read non-existent or reserved control register");
+ exception_handling::panic("[Control Register] Attempted to read non-existent or reserved control register");
break;
}
return current_value;
@@ -60,8 +59,7 @@ namespace teachos::arch::memory::cpu
: "memory");
break;
default:
- exception_handling::assert(false,
- "[Control Register] Attempted to write non-existent or reserved control register");
+ exception_handling::panic("[Control Register] Attempted to write non-existent or reserved control register");
break;
}
}