aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-04-15 23:06:29 -0400
committerbunnei <bunneidev@gmail.com>2020-04-17 00:59:36 -0400
commit92caa003a8fabf177f012a4f59ac4e123cbb4e98 (patch)
treefd3c250905c8ae155e80292ffd4b9e8d5662db27 /src
parent6f3266e98b7fd1afcf37aa31cde0eda97662ab48 (diff)
core: device_memory: Remove incorrect usage of constexpr.
Diffstat (limited to 'src')
-rw-r--r--src/core/device_memory.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/device_memory.h b/src/core/device_memory.h
index cc7bda0709..ff66e202d6 100644
--- a/src/core/device_memory.h
+++ b/src/core/device_memory.h
@@ -28,12 +28,16 @@ public:
~DeviceMemory();
template <typename T>
- constexpr PAddr GetPhysicalAddr(T* ptr) {
+ PAddr GetPhysicalAddr(const T* ptr) const {
return (reinterpret_cast<uintptr_t>(ptr) - reinterpret_cast<uintptr_t>(buffer.data())) +
DramMemoryMap::Base;
}
- constexpr u8* GetPointer(PAddr addr) {
+ u8* GetPointer(PAddr addr) {
+ return buffer.data() + (addr - DramMemoryMap::Base);
+ }
+
+ const u8* GetPointer(PAddr addr) const {
return buffer.data() + (addr - DramMemoryMap::Base);
}