summaryrefslogtreecommitdiff
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/memory.cpp')
-rw-r--r--src/core/memory.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index c3f4829d7..b88aa5c40 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -120,9 +120,9 @@ struct Memory::Impl {
120 if ((addr & 1) == 0) { 120 if ((addr & 1) == 0) {
121 return Read<u16_le>(addr); 121 return Read<u16_le>(addr);
122 } else { 122 } else {
123 const u8 a{Read<u8>(addr)}; 123 const u32 a{Read<u8>(addr)};
124 const u8 b{Read<u8>(addr + sizeof(u8))}; 124 const u32 b{Read<u8>(addr + sizeof(u8))};
125 return (static_cast<u16>(b) << 8) | a; 125 return static_cast<u16>((b << 8) | a);
126 } 126 }
127 } 127 }
128 128
@@ -130,9 +130,9 @@ struct Memory::Impl {
130 if ((addr & 3) == 0) { 130 if ((addr & 3) == 0) {
131 return Read<u32_le>(addr); 131 return Read<u32_le>(addr);
132 } else { 132 } else {
133 const u16 a{Read16(addr)}; 133 const u32 a{Read16(addr)};
134 const u16 b{Read16(addr + sizeof(u16))}; 134 const u32 b{Read16(addr + sizeof(u16))};
135 return (static_cast<u32>(b) << 16) | a; 135 return (b << 16) | a;
136 } 136 }
137 } 137 }
138 138