diff options
Diffstat (limited to 'src/devices/cpu/arm7/arm7.cpp')
-rw-r--r-- | src/devices/cpu/arm7/arm7.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp index 6538e573935..7a3a7ba30db 100644 --- a/src/devices/cpu/arm7/arm7.cpp +++ b/src/devices/cpu/arm7/arm7.cpp @@ -1417,9 +1417,9 @@ uint32_t arm946es_cpu_device::arm7_cpu_read32(uint32_t addr) return result; } -uint16_t arm946es_cpu_device::arm7_cpu_read16(uint32_t addr) +uint32_t arm946es_cpu_device::arm7_cpu_read16(uint32_t addr) { - uint16_t result; + uint32_t result; if ((addr >= cp15_itcm_base) && (addr <= cp15_itcm_end)) { @@ -1438,7 +1438,7 @@ uint16_t arm946es_cpu_device::arm7_cpu_read16(uint32_t addr) if (addr & 1) { - result = ((result >> 8) & 0xff) | ((result & 0xff) << 8); + result = ((result >> 8) & 0xff) | ((result & 0xff) << 24); } return result; @@ -1567,9 +1567,9 @@ uint32_t arm7_cpu_device::arm7_cpu_read32(uint32_t addr) return result; } -uint16_t arm7_cpu_device::arm7_cpu_read16(uint32_t addr) +uint32_t arm7_cpu_device::arm7_cpu_read16(uint32_t addr) { - uint16_t result; + uint32_t result; if( COPRO_CTRL & COPRO_CTRL_MMU_EN ) { @@ -1583,7 +1583,7 @@ uint16_t arm7_cpu_device::arm7_cpu_read16(uint32_t addr) if (addr & 1) { - result = ((result >> 8) & 0xff) | ((result & 0xff) << 8); + result = ((result >> 8) & 0xff) | ((result & 0xff) << 24); } return result; |