diff options
Diffstat (limited to 'target-mips/op_mem.c')
| -rw-r--r-- | target-mips/op_mem.c | 287 |
1 files changed, 235 insertions, 52 deletions
diff --git a/target-mips/op_mem.c b/target-mips/op_mem.c index a15ad5a96..85872ca8f 100644 --- a/target-mips/op_mem.c +++ b/target-mips/op_mem.c @@ -22,88 +22,148 @@ void glue(op_lb, MEMSUFFIX) (void) { T0 = glue(ldsb, MEMSUFFIX)(T0); - RETURN(); + FORCE_RET(); } void glue(op_lbu, MEMSUFFIX) (void) { T0 = glue(ldub, MEMSUFFIX)(T0); - RETURN(); + FORCE_RET(); } void glue(op_sb, MEMSUFFIX) (void) { glue(stb, MEMSUFFIX)(T0, T1); - RETURN(); + FORCE_RET(); } void glue(op_lh, MEMSUFFIX) (void) { T0 = glue(ldsw, MEMSUFFIX)(T0); - RETURN(); + FORCE_RET(); } void glue(op_lhu, MEMSUFFIX) (void) { T0 = glue(lduw, MEMSUFFIX)(T0); - RETURN(); + FORCE_RET(); } void glue(op_sh, MEMSUFFIX) (void) { glue(stw, MEMSUFFIX)(T0, T1); - RETURN(); + FORCE_RET(); } void glue(op_lw, MEMSUFFIX) (void) { T0 = glue(ldl, MEMSUFFIX)(T0); - RETURN(); + FORCE_RET(); } void glue(op_lwu, MEMSUFFIX) (void) { T0 = (uint32_t)glue(ldl, MEMSUFFIX)(T0); - RETURN(); + FORCE_RET(); } void glue(op_sw, MEMSUFFIX) (void) { glue(stl, MEMSUFFIX)(T0, T1); - RETURN(); + FORCE_RET(); } /* "half" load and stores. We must do the memory access inline, or fault handling won't work. */ -/* XXX: This is broken, CP0_BADVADDR has the wrong (aligned) value. */ + +#ifdef TARGET_WORDS_BIGENDIAN +#define GET_LMASK(v) ((v) & 3) +#define GET_OFFSET(addr, offset) (addr + (offset)) +#else +#define GET_LMASK(v) (((v) & 3) ^ 3) +#define GET_OFFSET(addr, offset) (addr - (offset)) +#endif + void glue(op_lwl, MEMSUFFIX) (void) { - uint32_t tmp = glue(ldl, MEMSUFFIX)(T0 & ~3); - CALL_FROM_TB1(glue(do_lwl, MEMSUFFIX), tmp); - RETURN(); + target_ulong tmp; + + tmp = glue(ldub, MEMSUFFIX)(T0); + T1 = (T1 & 0x00FFFFFF) | (tmp << 24); + + if (GET_LMASK(T0) <= 2) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, 1)); + T1 = (T1 & 0xFF00FFFF) | (tmp << 16); + } + + if (GET_LMASK(T0) <= 1) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, 2)); + T1 = (T1 & 0xFFFF00FF) | (tmp << 8); + } + + if (GET_LMASK(T0) == 0) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, 3)); + T1 = (T1 & 0xFFFFFF00) | tmp; + } + T1 = (int32_t)T1; + FORCE_RET(); } void glue(op_lwr, MEMSUFFIX) (void) { - uint32_t tmp = glue(ldl, MEMSUFFIX)(T0 & ~3); - CALL_FROM_TB1(glue(do_lwr, MEMSUFFIX), tmp); - RETURN(); + target_ulong tmp; + + tmp = glue(ldub, MEMSUFFIX)(T0); + T1 = (T1 & 0xFFFFFF00) | tmp; + + if (GET_LMASK(T0) >= 1) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, -1)); + T1 = (T1 & 0xFFFF00FF) | (tmp << 8); + } + + if (GET_LMASK(T0) >= 2) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, -2)); + T1 = (T1 & 0xFF00FFFF) | (tmp << 16); + } + + if (GET_LMASK(T0) == 3) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, -3)); + T1 = (T1 & 0x00FFFFFF) | (tmp << 24); + } + T1 = (int32_t)T1; + FORCE_RET(); } void glue(op_swl, MEMSUFFIX) (void) { - uint32_t tmp = glue(ldl, MEMSUFFIX)(T0 & ~3); - tmp = CALL_FROM_TB1(glue(do_swl, MEMSUFFIX), tmp); - glue(stl, MEMSUFFIX)(T0 & ~3, tmp); - RETURN(); + glue(stb, MEMSUFFIX)(T0, (uint8_t)(T1 >> 24)); + + if (GET_LMASK(T0) <= 2) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, 1), (uint8_t)(T1 >> 16)); + + if (GET_LMASK(T0) <= 1) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, 2), (uint8_t)(T1 >> 8)); + + if (GET_LMASK(T0) == 0) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, 3), (uint8_t)T1); + + FORCE_RET(); } void glue(op_swr, MEMSUFFIX) (void) { - uint32_t tmp = glue(ldl, MEMSUFFIX)(T0 & ~3); - tmp = CALL_FROM_TB1(glue(do_swr, MEMSUFFIX), tmp); - glue(stl, MEMSUFFIX)(T0 & ~3, tmp); - RETURN(); + glue(stb, MEMSUFFIX)(T0, (uint8_t)T1); + + if (GET_LMASK(T0) >= 1) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, -1), (uint8_t)(T1 >> 8)); + + if (GET_LMASK(T0) >= 2) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, -2), (uint8_t)(T1 >> 16)); + + if (GET_LMASK(T0) == 3) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, -3), (uint8_t)(T1 >> 24)); + + FORCE_RET(); } void glue(op_ll, MEMSUFFIX) (void) @@ -111,7 +171,7 @@ void glue(op_ll, MEMSUFFIX) (void) T1 = T0; T0 = glue(ldl, MEMSUFFIX)(T0); env->CP0_LLAddr = T1; - RETURN(); + FORCE_RET(); } void glue(op_sc, MEMSUFFIX) (void) @@ -127,52 +187,175 @@ void glue(op_sc, MEMSUFFIX) (void) } else { T0 = 0; } - RETURN(); + FORCE_RET(); } -#if defined(TARGET_MIPSN32) || defined(TARGET_MIPS64) +#if defined(TARGET_MIPS64) void glue(op_ld, MEMSUFFIX) (void) { T0 = glue(ldq, MEMSUFFIX)(T0); - RETURN(); + FORCE_RET(); } void glue(op_sd, MEMSUFFIX) (void) { glue(stq, MEMSUFFIX)(T0, T1); - RETURN(); + FORCE_RET(); } /* "half" load and stores. We must do the memory access inline, or fault handling won't work. */ + +#ifdef TARGET_WORDS_BIGENDIAN +#define GET_LMASK64(v) ((v) & 7) +#else +#define GET_LMASK64(v) (((v) & 7) ^ 7) +#endif + void glue(op_ldl, MEMSUFFIX) (void) { - target_long tmp = glue(ldq, MEMSUFFIX)(T0 & ~7); - CALL_FROM_TB1(glue(do_ldl, MEMSUFFIX), tmp); - RETURN(); + uint64_t tmp; + + tmp = glue(ldub, MEMSUFFIX)(T0); + T1 = (T1 & 0x00FFFFFFFFFFFFFFULL) | (tmp << 56); + + if (GET_LMASK64(T0) <= 6) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, 1)); + T1 = (T1 & 0xFF00FFFFFFFFFFFFULL) | (tmp << 48); + } + + if (GET_LMASK64(T0) <= 5) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, 2)); + T1 = (T1 & 0xFFFF00FFFFFFFFFFULL) | (tmp << 40); + } + + if (GET_LMASK64(T0) <= 4) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, 3)); + T1 = (T1 & 0xFFFFFF00FFFFFFFFULL) | (tmp << 32); + } + + if (GET_LMASK64(T0) <= 3) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, 4)); + T1 = (T1 & 0xFFFFFFFF00FFFFFFULL) | (tmp << 24); + } + + if (GET_LMASK64(T0) <= 2) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, 5)); + T1 = (T1 & 0xFFFFFFFFFF00FFFFULL) | (tmp << 16); + } + + if (GET_LMASK64(T0) <= 1) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, 6)); + T1 = (T1 & 0xFFFFFFFFFFFF00FFULL) | (tmp << 8); + } + + if (GET_LMASK64(T0) == 0) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, 7)); + T1 = (T1 & 0xFFFFFFFFFFFFFF00ULL) | tmp; + } + + FORCE_RET(); } void glue(op_ldr, MEMSUFFIX) (void) { - target_long tmp = glue(ldq, MEMSUFFIX)(T0 & ~7); - CALL_FROM_TB1(glue(do_ldr, MEMSUFFIX), tmp); - RETURN(); + uint64_t tmp; + + tmp = glue(ldub, MEMSUFFIX)(T0); + T1 = (T1 & 0xFFFFFFFFFFFFFF00ULL) | tmp; + + if (GET_LMASK64(T0) >= 1) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, -1)); + T1 = (T1 & 0xFFFFFFFFFFFF00FFULL) | (tmp << 8); + } + + if (GET_LMASK64(T0) >= 2) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, -2)); + T1 = (T1 & 0xFFFFFFFFFF00FFFFULL) | (tmp << 16); + } + + if (GET_LMASK64(T0) >= 3) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, -3)); + T1 = (T1 & 0xFFFFFFFF00FFFFFFULL) | (tmp << 24); + } + + if (GET_LMASK64(T0) >= 4) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, -4)); + T1 = (T1 & 0xFFFFFF00FFFFFFFFULL) | (tmp << 32); + } + + if (GET_LMASK64(T0) >= 5) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, -5)); + T1 = (T1 & 0xFFFF00FFFFFFFFFFULL) | (tmp << 40); + } + + if (GET_LMASK64(T0) >= 6) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, -6)); + T1 = (T1 & 0xFF00FFFFFFFFFFFFULL) | (tmp << 48); + } + + if (GET_LMASK64(T0) == 7) { + tmp = glue(ldub, MEMSUFFIX)(GET_OFFSET(T0, -7)); + T1 = (T1 & 0x00FFFFFFFFFFFFFFULL) | (tmp << 56); + } + + FORCE_RET(); } void glue(op_sdl, MEMSUFFIX) (void) { - target_long tmp = glue(ldq, MEMSUFFIX)(T0 & ~7); - tmp = CALL_FROM_TB1(glue(do_sdl, MEMSUFFIX), tmp); - glue(stq, MEMSUFFIX)(T0 & ~7, tmp); - RETURN(); + glue(stb, MEMSUFFIX)(T0, (uint8_t)(T1 >> 56)); + + if (GET_LMASK64(T0) <= 6) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, 1), (uint8_t)(T1 >> 48)); + + if (GET_LMASK64(T0) <= 5) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, 2), (uint8_t)(T1 >> 40)); + + if (GET_LMASK64(T0) <= 4) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, 3), (uint8_t)(T1 >> 32)); + + if (GET_LMASK64(T0) <= 3) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, 4), (uint8_t)(T1 >> 24)); + + if (GET_LMASK64(T0) <= 2) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, 5), (uint8_t)(T1 >> 16)); + + if (GET_LMASK64(T0) <= 1) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, 6), (uint8_t)(T1 >> 8)); + + if (GET_LMASK64(T0) <= 0) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, 7), (uint8_t)T1); + + FORCE_RET(); } void glue(op_sdr, MEMSUFFIX) (void) { - target_long tmp = glue(ldq, MEMSUFFIX)(T0 & ~7); - tmp = CALL_FROM_TB1(glue(do_sdr, MEMSUFFIX), tmp); - glue(stq, MEMSUFFIX)(T0 & ~7, tmp); - RETURN(); + glue(stb, MEMSUFFIX)(T0, (uint8_t)T1); + + if (GET_LMASK64(T0) >= 1) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, -1), (uint8_t)(T1 >> 8)); + + if (GET_LMASK64(T0) >= 2) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, -2), (uint8_t)(T1 >> 16)); + + if (GET_LMASK64(T0) >= 3) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, -3), (uint8_t)(T1 >> 24)); + + if (GET_LMASK64(T0) >= 4) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, -4), (uint8_t)(T1 >> 32)); + + if (GET_LMASK64(T0) >= 5) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, -5), (uint8_t)(T1 >> 40)); + + if (GET_LMASK64(T0) >= 6) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, -6), (uint8_t)(T1 >> 48)); + + if (GET_LMASK64(T0) == 7) + glue(stb, MEMSUFFIX)(GET_OFFSET(T0, -7), (uint8_t)(T1 >> 56)); + + FORCE_RET(); } void glue(op_lld, MEMSUFFIX) (void) @@ -180,7 +363,7 @@ void glue(op_lld, MEMSUFFIX) (void) T1 = T0; T0 = glue(ldq, MEMSUFFIX)(T0); env->CP0_LLAddr = T1; - RETURN(); + FORCE_RET(); } void glue(op_scd, MEMSUFFIX) (void) @@ -196,37 +379,37 @@ void glue(op_scd, MEMSUFFIX) (void) } else { T0 = 0; } - RETURN(); + FORCE_RET(); } -#endif /* TARGET_MIPSN32 || TARGET_MIPS64 */ +#endif /* TARGET_MIPS64 */ void glue(op_lwc1, MEMSUFFIX) (void) { WT0 = glue(ldl, MEMSUFFIX)(T0); - RETURN(); + FORCE_RET(); } void glue(op_swc1, MEMSUFFIX) (void) { glue(stl, MEMSUFFIX)(T0, WT0); - RETURN(); + FORCE_RET(); } void glue(op_ldc1, MEMSUFFIX) (void) { DT0 = glue(ldq, MEMSUFFIX)(T0); - RETURN(); + FORCE_RET(); } void glue(op_sdc1, MEMSUFFIX) (void) { glue(stq, MEMSUFFIX)(T0, DT0); - RETURN(); + FORCE_RET(); } void glue(op_luxc1, MEMSUFFIX) (void) { DT0 = glue(ldq, MEMSUFFIX)(T0 & ~0x7); - RETURN(); + FORCE_RET(); } void glue(op_suxc1, MEMSUFFIX) (void) { glue(stq, MEMSUFFIX)(T0 & ~0x7, DT0); - RETURN(); + FORCE_RET(); } |