diff options
author | Kevin Hartman <kevin@hart.mn> | 2015-02-22 02:20:08 +0100 |
---|---|---|
committer | Kevin Hartman <kevin@hart.mn> | 2015-02-22 02:25:31 +0100 |
commit | 05c098a9e77235069c2bbfc7f13aa5d5f8601d88 (patch) | |
tree | ff2e0d787c7d8f5a10c67c21d059a819afc21463 /src/core/mem_map_funcs.cpp | |
parent | Merge pull request #587 from archshift/assert (diff) | |
download | yuzu-05c098a9e77235069c2bbfc7f13aa5d5f8601d88.tar yuzu-05c098a9e77235069c2bbfc7f13aa5d5f8601d88.tar.gz yuzu-05c098a9e77235069c2bbfc7f13aa5d5f8601d88.tar.bz2 yuzu-05c098a9e77235069c2bbfc7f13aa5d5f8601d88.tar.lz yuzu-05c098a9e77235069c2bbfc7f13aa5d5f8601d88.tar.xz yuzu-05c098a9e77235069c2bbfc7f13aa5d5f8601d88.tar.zst yuzu-05c098a9e77235069c2bbfc7f13aa5d5f8601d88.zip |
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
-rw-r--r-- | src/core/mem_map_funcs.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 4f93c0e64..48f61db4e 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -236,30 +236,12 @@ u8 Read8(const VAddr addr) { u16 Read16(const VAddr addr) { u16_le data = 0; Read<u16_le>(data, addr); - - // Check for 16-bit unaligned memory reads... - if (addr & 1) { - // TODO(bunnei): Implement 16-bit unaligned memory reads - LOG_ERROR(HW_Memory, "16-bit unaligned memory reads are not implemented!"); - } - return (u16)data; } u32 Read32(const VAddr addr) { u32_le data = 0; Read<u32_le>(data, addr); - - // Check for 32-bit unaligned memory reads... - if (addr & 3) { - // ARM allows for unaligned memory reads, however older ARM architectures read out memory - // from unaligned addresses in a shifted way. Our ARM CPU core (SkyEye) corrects for this, - // so therefore expects the memory to be read out in this manner. - // TODO(bunnei): Determine if this is necessary - perhaps it is OK to remove this from both - // SkyEye and here? - int shift = (addr & 3) * 8; - data = (data << shift) | (data >> (32 - shift)); - } return (u32)data; } |