diff options
| -rw-r--r-- | target-sparc/helper.h | 1 | ||||
| -rw-r--r-- | target-sparc/op.c | 12 | ||||
| -rw-r--r-- | target-sparc/op_helper.c | 6 | ||||
| -rw-r--r-- | target-sparc/translate.c | 20 |
4 files changed, 27 insertions, 12 deletions
diff --git a/target-sparc/helper.h b/target-sparc/helper.h index 4bf363b29..39dac7467 100644 --- a/target-sparc/helper.h +++ b/target-sparc/helper.h @@ -37,6 +37,7 @@ void TCG_HELPER_PROTO helper_tick_set_limit(void *opaque, uint64_t limit); void TCG_HELPER_PROTO helper_trap(target_ulong nb_trap); void TCG_HELPER_PROTO helper_trapcc(target_ulong nb_trap, target_ulong do_trap); +void TCG_HELPER_PROTO helper_check_align(target_ulong addr, uint32_t align); void TCG_HELPER_PROTO helper_debug(void); void TCG_HELPER_PROTO helper_save(void); void TCG_HELPER_PROTO helper_restore(void); diff --git a/target-sparc/op.c b/target-sparc/op.c index cc4aa14ac..e06cd8138 100644 --- a/target-sparc/op.c +++ b/target-sparc/op.c @@ -36,15 +36,3 @@ #include "op_mem.h" #endif #endif - -#define CHECK_ALIGN_OP(align) \ - void OPPROTO op_check_align_T0_ ## align (void) \ - { \ - if (T0 & align) \ - raise_exception(TT_UNALIGNED); \ - FORCE_RET(); \ - } - -CHECK_ALIGN_OP(1) -CHECK_ALIGN_OP(3) -CHECK_ALIGN_OP(7) diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c index 6e64eb807..bc9bb179d 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -50,6 +50,12 @@ void helper_trapcc(target_ulong nb_trap, target_ulong do_trap) } } +void helper_check_align(target_ulong addr, uint32_t align) +{ + if (addr & align) + raise_exception(TT_UNALIGNED); +} + #define F_HELPER(name, p) void helper_f##name##p(void) #if defined(CONFIG_USER_ONLY) diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 69ce4cbff..eb1906d68 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -1664,6 +1664,26 @@ static inline void gen_clear_float_exceptions(void) tcg_gen_helper_0_0(helper_clear_float_exceptions); } +static inline void gen_check_align(TCGv r_addr, int align) +{ + tcg_gen_helper_0_2(helper_check_align, r_addr, tcg_const_i32(align)); +} + +static inline void gen_op_check_align_T0_1(void) +{ + gen_check_align(cpu_T[0], 1); +} + +static inline void gen_op_check_align_T0_3(void) +{ + gen_check_align(cpu_T[0], 3); +} + +static inline void gen_op_check_align_T0_7(void) +{ + gen_check_align(cpu_T[0], 7); +} + /* asi moves */ #ifdef TARGET_SPARC64 static inline TCGv gen_get_asi(int insn, TCGv r_addr) |