diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-10-30 20:49:44 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-10-30 20:49:44 +0000 |
| commit | 02aab46a362acd041006776e322a85a7753e4c14 (patch) | |
| tree | 917d9efb2974cc4dfaadd9b190611f2a5d143319 /target-sparc/op_helper.c | |
| parent | aab33094073678d459ccaac5c60ea7533e8d1d8e (diff) | |
| download | qemu-02aab46a362acd041006776e322a85a7753e4c14.tar.gz | |
endianness fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1588 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-sparc/op_helper.c')
| -rw-r--r-- | target-sparc/op_helper.c | 80 |
1 files changed, 54 insertions, 26 deletions
diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c index 468bbb6b43..e931f9a32e 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -256,11 +256,18 @@ void helper_ld_asi(int asi, int size, int sign) } break; case 0x20 ... 0x2f: /* MMU passthrough */ - cpu_physical_memory_read(T0, (void *) &ret, size); - if (size == 4) - tswap32s(&ret); - else if (size == 2) - tswap16s((uint16_t *)&ret); + switch(size) { + case 1: + ret = ldub_phys(T0); + break; + case 2: + ret = lduw_phys(T0 & ~1); + break; + default: + case 4: + ret = ldl_phys(T0 & ~3); + break; + } break; default: ret = 0; @@ -369,12 +376,18 @@ void helper_st_asi(int asi, int size, int sign) return; case 0x20 ... 0x2f: /* MMU passthrough */ { - uint32_t temp = T1; - if (size == 4) - tswap32s(&temp); - else if (size == 2) - tswap16s((uint16_t *)&temp); - cpu_physical_memory_write(T0, (void *) &temp, size); + switch(size) { + case 1: + stb_phys(T0, T1); + break; + case 2: + stw_phys(T0 & ~1, T1); + break; + case 4: + default: + stl_phys(T0 & ~3, T1); + break; + } } return; default: @@ -395,13 +408,21 @@ void helper_ld_asi(int asi, int size, int sign) case 0x14: // Bypass case 0x15: // Bypass, non-cacheable { - cpu_physical_memory_read(T0, (void *) &ret, size); - if (size == 8) - tswap64s(&ret); - if (size == 4) - tswap32s((uint32_t *)&ret); - else if (size == 2) - tswap16s((uint16_t *)&ret); + switch(size) { + case 1: + ret = ldub_phys(T0); + break; + case 2: + ret = lduw_phys(T0 & ~1); + break; + case 4: + ret = ldl_phys(T0 & ~3); + break; + default: + case 8: + ret = ldq_phys(T0 & ~7); + break; + } break; } case 0x04: // Nucleus @@ -503,14 +524,21 @@ void helper_st_asi(int asi, int size, int sign) case 0x14: // Bypass case 0x15: // Bypass, non-cacheable { - target_ulong temp = T1; - if (size == 8) - tswap64s(&temp); - else if (size == 4) - tswap32s((uint32_t *)&temp); - else if (size == 2) - tswap16s((uint16_t *)&temp); - cpu_physical_memory_write(T0, (void *) &temp, size); + switch(size) { + case 1: + stb_phys(T0, T1); + break; + case 2: + stw_phys(T0 & ~1, T1); + break; + case 4: + stl_phys(T0 & ~3, T1); + break; + case 8: + default: + stq_phys(T0 & ~7, T1); + break; + } } return; case 0x04: // Nucleus |