target-sh4: optimizations and cleanups
cover target-sh4: optimizations and cleanups
This patchset improves the SH4 emulation by using the lately added TCG instructions, namely add2, sub2 and movcond. For that the T, Q and M bits are split out from the SR register.
The last two patches are doing cleanup in the code.
Aurelien Jarno (8):
target-sh4: use bit number for SR constants
target-sh4: Split out T from SR
target-sh4: optimize addc using add2
target-sh4: optimize subc using sub2
target-sh4: optimize negc using add2 and sub2
target-sh4: split out Q and M from of SR and optimize div1
target-sh4: factorize fmov implementation
target-sh4: remove dead code
target-sh4/cpu.c | 3 +- target-sh4/cpu.h | 51 +++++--- target-sh4/gdbstub.c | 8 +- target-sh4/helper.c | 29 ++--- target-sh4/helper.h | 1 - target-sh4/op_helper.c | 148 +---------------------- target-sh4/translate.c | 316 +++++++++++++++++++++++++----------------------- 7 files changed, 226 insertions(+), 330 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/8 target-sh4: use bit number for SR constants
Use the bit number for SR constants instead of using a bit mask. This make possible to also use the constants for shifts.
--- target-sh4/cpu.c | 3 +- target-sh4/cpu.h | 30 +++++++++---------- target-sh4/gdbstub.c | 4 +-- target-sh4/helper.c | 27 ++++++++--------- target-sh4/op_helper.c | 26 ++++++++--------- target-sh4/translate.c | 75 +++++++++++++++++++++++++----------------------- 6 files changed, 85 insertions(+), 80 deletions(-)
target-sh4/cpu.c +2 -1
@@ -56,7 +56,8 @@ static void superh_cpu_reset(CPUState *s) env->fpscr =FPSCR_PR ;/* value for userspace according to the kernel */ set_float_rounding_mode (float_round_nearest_even, &env->fp_status);/* ?! */ #else - env->sr =SR_MD |SR_RB |SR_BL |SR_I3 |SR_I2 |SR_I1 |SR_I0 ; + env->sr = (1u <<SR_MD ) | (1u <<SR_RB ) | (1u <<SR_BL ) | + (1u <<SR_I3 ) | (1u <<SR_I2 ) | (1u <<SR_I1 ) | (1u <<SR_I0 ); env->fpscr =FPSCR_DN |FPSCR_RM_ZERO ;/* CPU reset value according to SH4 manual */ set_float_rounding_mode (float_round_to_zero, &env->fp_status);set_flush_to_zero (1 , &env->fp_status);
target-sh4/cpu.h +15 -15
@@ -48,18 +48,18 @@#define TARGET_PHYS_ADDR_SPACE_BITS 32#define TARGET_VIRT_ADDR_SPACE_BITS 32 -#define SR_MD (1 << 30) -#define SR_RB (1 << 29) -#define SR_BL (1 << 28) -#define SR_FD (1 << 15) -#define SR_M (1 << 9) -#define SR_Q (1 << 8) -#define SR_I3 (1 << 7) -#define SR_I2 (1 << 6) -#define SR_I1 (1 << 5) -#define SR_I0 (1 << 4) -#define SR_S (1 << 1) -#define SR_T (1 << 0) +#define SR_MD 30 +#define SR_RB 29 +#define SR_BL 28 +#define SR_FD 15 +#define SR_M 9 +#define SR_Q 8 +#define SR_I3 7 +#define SR_I2 6 +#define SR_I1 5 +#define SR_I0 4 +#define SR_S 1 +#define SR_T 0#define FPSCR_MASK (0x003fffff)#define FPSCR_FR (1 << 21)
@@ -242,7 +242,7 @@ static inline CPUSH4State *cpu_init(const char *cpu_model)#define MMU_USER_IDX 1static inline int cpu_mmu_index (CPUSH4State *env) { -return (env->sr &SR_MD ) ==0 ?1 :0 ; +return (env->sr & (1u <<SR_MD )) ==0 ?1 :0 ; }#include "exec/cpu-all.h"
@@ -347,8 +347,8 @@ static inline void cpu_get_tb_cpu_state(CPUSH4State *env, target_ulong *pc, *flags = (env->flags & (DELAY_SLOT |DELAY_SLOT_CONDITIONAL |DELAY_SLOT_TRUE |DELAY_SLOT_CLEARME ))/* Bits 0- 3 */ | (env->fpscr & (FPSCR_FR |FPSCR_SZ |FPSCR_PR ))/* Bits 19-21 */ - | (env->sr & (SR_MD |SR_RB ))/* Bits 29-30 */ - | (env->sr &SR_FD )/* Bit 15 */ + | (env->sr & ((1u <<SR_MD ) | (1u <<SR_RB )))/* Bits 29-30 */ + | (env->sr & (1u <<SR_FD ))/* Bit 15 */ | (env->movcal_backup ?TB_FLAG_PENDING_MOVCA :0 );/* Bit 4 */ }
target-sh4/gdbstub.c +2 -2
@@ -31,7 +31,7 @@ int superh_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)switch (n) { case 0 ... 7: -if ((env->sr & (SR_MD |SR_RB )) == (SR_MD |SR_RB )) { +if ((env->sr & (1u <<SR_MD )) && (env->sr & (1u <<SR_RB ))) {return gdb_get_regl (mem_buf, env->gregs[n +16 ]); }else {return gdb_get_regl (mem_buf, env->gregs[n]);
@@ -83,7 +83,7 @@ int superh_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)switch (n) { case 0 ... 7: -if ((env->sr & (SR_MD |SR_RB )) == (SR_MD |SR_RB )) { +if ((env->sr & (1u <<SR_MD )) && (env->sr & (1u <<SR_RB ))) { env->gregs[n +16 ] =ldl_p (mem_buf); }else { env->gregs[n] =ldl_p (mem_buf);
target-sh4/helper.c +14 -13
@@ -93,7 +93,7 @@ void superh_cpu_do_interrupt(CPUState *cs) do_exp = env->exception_index !=-1 ; do_irq = do_irq && (env->exception_index ==-1 ); -if (env->sr &SR_BL ) { +if (env->sr & (1u <<SR_BL )) {if (do_exp && env->exception_index !=0x1e0 ) { env->exception_index =0x000 ;/* masked exception -> reset */ }
@@ -165,7 +165,7 @@ void superh_cpu_do_interrupt(CPUState *cs) env->ssr = env->sr; env->spc = env->pc; env->sgr = env->gregs[15 ]; - env->sr |=SR_BL |SR_MD |SR_RB ; + env->sr |= (1u <<SR_BL ) | (1u <<SR_MD ) | (1u <<SR_RB );if (env->flags & (DELAY_SLOT |DELAY_SLOT_CONDITIONAL )) {/* Branch instruction should be executed again before delay slot. */
@@ -182,7 +182,7 @@ void superh_cpu_do_interrupt(CPUState *cs)case 0x000 :case 0x020 :case 0x140 : - env->sr &= ~SR_FD ; + env->sr &= ~(1u <<SR_FD ); env->sr |=0xf <<4 ;/* IMASK */ env->pc =0xa0000000 ;break ;
@@ -349,23 +349,24 @@ static int get_mmu_address(CPUSH4State * env, target_ulong * physical,int use_asid, n;tlb_t *matching =NULL ; - use_asid = (env->mmucr &MMUCR_SV ) ==0 || (env->sr &SR_MD ) ==0 ; + use_asid = !(env->mmucr &MMUCR_SV ) || !(env->sr & (1u <<SR_MD ));if (rw ==2 ) { n =find_itlb_entry (env, address, use_asid);if (n >=0 ) { matching = &env->itlb[n]; -if (!(env->sr &SR_MD ) && !(matching->pr &2 )) +if (!(env->sr & (1u <<SR_MD )) && !(matching->pr &2 )) { n =MMU_ITLB_VIOLATION ; -else + }else { *prot =PAGE_EXEC ; + } }else { n =find_utlb_entry (env, address, use_asid);if (n >=0 ) { n =copy_utlb_entry_itlb (env, n); matching = &env->itlb[n]; -if (!(env->sr &SR_MD ) && !(matching->pr &2 )) { - n =MMU_ITLB_VIOLATION ; +if (!(env->sr & (1u <<SR_MD )) && !(matching->pr &2 )) { + n =MMU_ITLB_VIOLATION ; }else { *prot =PAGE_READ |PAGE_EXEC ;if ((matching->pr &1 ) && matching->d) {
@@ -382,7 +383,7 @@ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, n =find_utlb_entry (env, address, use_asid);if (n >=0 ) { matching = &env->utlb[n]; -if (!(env->sr &SR_MD ) && !(matching->pr &2 )) { +if (!(env->sr & (1u <<SR_MD )) && !(matching->pr &2 )) { n = (rw ==1 ) ?MMU_DTLB_VIOLATION_WRITE :MMU_DTLB_VIOLATION_READ ; }else if ((rw ==1 ) && !(matching->pr &1 )) {
@@ -415,7 +416,7 @@ static int get_physical_address(CPUSH4State * env, target_ulong * physical,/* P1, P2 and P4 areas do not use translation */ if ((address >=0x80000000 && address <0xc0000000 ) || address >=0xe0000000 ) { -if (!(env->sr &SR_MD ) +if (!(env->sr & (1u <<SR_MD )) && (address <0xe0000000 || address >=0xe4000000 )) {/* Unauthorized access in user mode (only store queues are available) */ fprintf (stderr,"Unauthorized access\n" );
@@ -681,7 +682,7 @@ void cpu_sh4_write_mmaped_utlb_addr(CPUSH4State *s, hwaddr addr,uint8_t d = (uint8_t )((mem_value &0x00000200 ) >>9 );uint8_t v = (uint8_t )((mem_value &0x00000100 ) >>8 );uint8_t asid = (uint8_t )(mem_value &0x000000ff ); -int use_asid = (s->mmucr &MMUCR_SV ) ==0 || (s->sr &SR_MD ) ==0 ; +int use_asid = !(s->mmucr &MMUCR_SV ) || !(s->sr & (1u <<SR_MD ));if (associate) {int i;
@@ -807,10 +808,10 @@ void cpu_sh4_write_mmaped_utlb_data(CPUSH4State *s, hwaddr addr,int cpu_sh4_is_cached (CPUSH4State * env,target_ulong addr) {int n; -int use_asid = (env->mmucr &MMUCR_SV ) ==0 || (env->sr &SR_MD ) ==0 ; +int use_asid = !(env->mmucr &MMUCR_SV ) || !(env->sr & (1u <<SR_MD ));/* check area */ -if (env->sr &SR_MD ) { +if (env->sr & (1u <<SR_MD )) {/* For previledged mode, P2 and P4 area is not cachable. */ if ((0xA0000000 <= addr && addr <0xC0000000 ) ||0xE0000000 <= addr)return 0 ;
target-sh4/op_helper.c +13 -13
@@ -166,15 +166,15 @@ void helper_ocbi(CPUSH4State *env, uint32_t address) } } -#define T (env->sr & SR_T) -#define Q (env->sr & SR_Q ? 1 : 0) -#define M (env->sr & SR_M ? 1 : 0) -#define SETT env->sr |= SR_T -#define CLRT env->sr &= ~SR_T -#define SETQ env->sr |= SR_Q -#define CLRQ env->sr &= ~SR_Q -#define SETM env->sr |= SR_M -#define CLRM env->sr &= ~SR_M +#define T (env->sr & (1u << SR_T)) +#define Q (env->sr & (1u << SR_Q) ? 1 : 0) +#define M (env->sr & (1u << SR_M) ? 1 : 0) +#define SETT (env->sr |= (1u << SR_T)) +#define CLRT (env->sr &= ~(1u << SR_T)) +#define SETQ (env->sr |= (1u << SR_Q)) +#define CLRQ (env->sr &= ~(1u << SR_Q)) +#define SETM (env->sr |= (1u << SR_M)) +#define CLRM (env->sr &= ~(1u << SR_M))uint32_t helper_div1 (CPUSH4State *env,uint32_t arg0,uint32_t arg1) {
@@ -292,7 +292,7 @@ void helper_macl(CPUSH4State *env, uint32_t arg0, uint32_t arg1) res += (int64_t ) (int32_t ) arg0 *(int64_t ) (int32_t ) arg1; env->mach = (res >>32 ) &0xffffffff ; env->macl = res &0xffffffff ; -if (env->sr &SR_S ) { +if (env->sr & (1u <<SR_S )) {if (res <0 ) env->mach |=0xffff0000 ;else
@@ -308,7 +308,7 @@ void helper_macw(CPUSH4State *env, uint32_t arg0, uint32_t arg1) res += (int64_t ) (int16_t ) arg0 *(int64_t ) (int16_t ) arg1; env->mach = (res >>32 ) &0xffffffff ; env->macl = res &0xffffffff ; -if (env->sr &SR_S ) { +if (env->sr & (1u <<SR_S )) {if (res <-0x80000000 ) { env->mach =1 ; env->macl =0x80000000 ;
@@ -321,12 +321,12 @@ void helper_macw(CPUSH4State *env, uint32_t arg0, uint32_t arg1)static inline void set_t (CPUSH4State *env) { - env->sr |=SR_T ; + env->sr |= (1u <<SR_T ); }static inline void clr_t (CPUSH4State *env) { - env->sr &= ~SR_T ; + env->sr &= ~(1u <<SR_T ); }void helper_ld_fpscr (CPUSH4State *env,uint32_t val)
target-sh4/translate.c +39 -36
247 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 2/8 target-sh4: Split out T from SR
In reply to Aurelien JarnoIn preparation for more efficient setting of this field.
--- target-sh4/cpu.h | 14 +++- target-sh4/gdbstub.c | 4 +- target-sh4/helper.c | 2 +- target-sh4/op_helper.c | 32 ++------ target-sh4/translate.c | 205 ++++++++++++++++++++---------------------------- 5 files changed, 110 insertions(+), 147 deletions(-)
target-sh4/cpu.h +13 -1
@@ -139,7 +139,8 @@ typedef struct CPUSH4State {uint32_t flags;/* general execution flags */ uint32_t gregs[24 ];/* general registers */ float32 fregs[32 ];/* floating point registers */ -uint32_t sr;/* status register */ +uint32_t sr;/* status register (with T split out) */ +uint32_t sr_t;/* T bit of status register */ uint32_t ssr;/* saved status register */ uint32_t spc;/* saved program counter */ uint32_t gbr;/* global base register */
@@ -339,6 +340,17 @@ static inline int cpu_ptel_pr (uint32_t ptel)#define TB_FLAG_PENDING_MOVCA (1 << 4) +static inline target_ulong cpu_read_sr (CPUSH4State *env) +{ +return (env->sr & ~(1u <<SR_T )) | (env->sr_t <<SR_T ); +} + +static inline void cpu_write_sr (CPUSH4State *env,target_ulong sr) +{ + env->sr_t = sr & (1u <<SR_T ); + env->sr = sr & ~(1u <<SR_T ); +} +static inline void cpu_get_tb_cpu_state (CPUSH4State *env,target_ulong *pc,target_ulong *cs_base,int *flags) {
target-sh4/gdbstub.c +2 -2
@@ -51,7 +51,7 @@ int superh_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)case 21 :return gdb_get_regl (mem_buf, env->macl);case 22 : -return gdb_get_regl (mem_buf, env->sr); +return gdb_get_regl (mem_buf,cpu_read_sr (env));case 23 :return gdb_get_regl (mem_buf, env->fpul);case 24 :
@@ -111,7 +111,7 @@ int superh_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) env->macl =ldl_p (mem_buf);break ;case 22 : - env->sr =ldl_p (mem_buf); +cpu_write_sr (env,ldl_p (mem_buf));break ;case 23 : env->fpul =ldl_p (mem_buf);
target-sh4/helper.c +1 -1
@@ -162,7 +162,7 @@ void superh_cpu_do_interrupt(CPUState *cs)log_cpu_state (cs,0 ); } - env->ssr = env->sr; + env->ssr =cpu_read_sr (env); env->spc = env->pc; env->sgr = env->gregs[15 ]; env->sr |= (1u <<SR_BL ) | (1u <<SR_MD ) | (1u <<SR_RB );
target-sh4/op_helper.c +7 -25
@@ -166,11 +166,11 @@ void helper_ocbi(CPUSH4State *env, uint32_t address) } } -#define T (env->sr & (1u << SR_T)) +#define T (env->sr_t)#define Q (env->sr & (1u << SR_Q) ? 1 : 0)#define M (env->sr & (1u << SR_M) ? 1 : 0) -#define SETT (env->sr |= (1u << SR_T)) -#define CLRT (env->sr &= ~(1u << SR_T)) +#define SETT (env->sr_t = 1) +#define CLRT (env->sr_t = 0)#define SETQ (env->sr |= (1u << SR_Q))#define CLRQ (env->sr &= ~(1u << SR_Q))#define SETM (env->sr |= (1u << SR_M))
@@ -319,16 +319,6 @@ void helper_macw(CPUSH4State *env, uint32_t arg0, uint32_t arg1) } } -static inline void set_t (CPUSH4State *env) -{ - env->sr |= (1u <<SR_T ); -} - -static inline void clr_t (CPUSH4State *env) -{ - env->sr &= ~(1u <<SR_T ); -} -void helper_ld_fpscr (CPUSH4State *env,uint32_t val) { env->fpscr = val &FPSCR_MASK ;
@@ -413,10 +403,8 @@ void helper_fcmp_eq_FT(CPUSH4State *env, float32 t0, float32 t1) relation =float32_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) {update_fpscr (env,GETPC ()); - }else if (relation == float_relation_equal) { -set_t (env); }else { -clr_t (env); + env->sr_t = (relation == float_relation_equal); } }
@@ -428,10 +416,8 @@ void helper_fcmp_eq_DT(CPUSH4State *env, float64 t0, float64 t1) relation =float64_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) {update_fpscr (env,GETPC ()); - }else if (relation == float_relation_equal) { -set_t (env); }else { -clr_t (env); + env->sr_t = (relation == float_relation_equal); } }
@@ -443,10 +429,8 @@ void helper_fcmp_gt_FT(CPUSH4State *env, float32 t0, float32 t1) relation =float32_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) {update_fpscr (env,GETPC ()); - }else if (relation == float_relation_greater) { -set_t (env); }else { -clr_t (env); + env->sr_t = (relation == float_relation_greater); } }
@@ -458,10 +442,8 @@ void helper_fcmp_gt_DT(CPUSH4State *env, float64 t0, float64 t1) relation =float64_compare (t0, t1, &env->fp_status);if (unlikely (relation == float_relation_unordered)) {update_fpscr (env,GETPC ()); - }else if (relation == float_relation_greater) { -set_t (env); }else { -clr_t (env); + env->sr_t = (relation == float_relation_greater); } }
target-sh4/translate.c +87 -118
457 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 3/8 target-sh4: optimize addc using add2
In reply to Aurelien Jarno--- target-sh4/translate.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
target-sh4/translate.c +6 -8
@@ -639,17 +639,15 @@ static void _decode_opc(DisasContext * ctx)return ;case 0x300e :/* addc Rm,Rn */ { -TCGv t0, t1; - t0 =tcg_temp_new (); +TCGv t0, t1, t2; + t0 =tcg_const_tl (0 ); t1 =tcg_temp_new (); -tcg_gen_add_i32 (t0,REG (B7_4 ),REG (B11_8 )); -tcg_gen_add_i32 (t1, cpu_sr_t, t0); -tcg_gen_setcond_i32 (TCG_COND_GTU , cpu_sr_t,REG (B11_8 ), t0); -tcg_gen_setcond_i32 (TCG_COND_GTU , t0, t0, t1); -tcg_gen_or_i32 (cpu_sr_t, cpu_sr_t, t0); + t2 =tcg_temp_new (); +tcg_gen_add2_i32 (t1, t2,REG (B11_8 ), t0,REG (B7_4 ), t0); +tcg_gen_add2_i32 (REG (B11_8 ), cpu_sr_t, t1, t2, cpu_sr_t, t0);tcg_temp_free (t0); -tcg_gen_mov_i32 (REG (B11_8 ), t1);tcg_temp_free (t1); +tcg_temp_free (t2); }return ;case 0x300f :/* addv Rm,Rn */
Signature · 1 line
1.7.10.4
PATCH 4/8 target-sh4: optimize subc using sub2
In reply to Aurelien Jarno--- target-sh4/translate.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
target-sh4/translate.c +6 -9
@@ -882,18 +882,15 @@ static void _decode_opc(DisasContext * ctx)case 0x300a :/* subc Rm,Rn */ {TCGv t0, t1, t2; - t0 =tcg_temp_new (); + t0 =tcg_const_tl (0 ); t1 =tcg_temp_new (); -tcg_gen_sub_i32 (t1,REG (B11_8 ),REG (B7_4 )); -tcg_gen_sub_i32 (t0, t1, cpu_sr_t); t2 =tcg_temp_new (); -tcg_gen_setcond_i32 (TCG_COND_LTU , t2,REG (B11_8 ), t1); -tcg_gen_setcond_i32 (TCG_COND_LTU , t1, t1, t0); -tcg_gen_or_i32 (cpu_sr_t, t1, t2); -tcg_temp_free (t2); -tcg_temp_free (t1); -tcg_gen_mov_i32 (REG (B11_8 ), t0); +tcg_gen_sub2_i32 (t1, t2,REG (B11_8 ), t0,REG (B7_4 ), t0); +tcg_gen_sub2_i32 (REG (B11_8 ), cpu_sr_t, t1, t2, cpu_sr_t, t0); +tcg_gen_andi_i32 (cpu_sr_t, cpu_sr_t,1 );tcg_temp_free (t0); +tcg_temp_free (t1); +tcg_temp_free (t2); }return ;case 0x300b :/* subv Rm,Rn */
Signature · 1 line
1.7.10.4
PATCH 5/8 target-sh4: optimize negc using add2 and sub2
In reply to Aurelien Jarno--- target-sh4/translate.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
target-sh4/translate.c +6 -6
@@ -796,12 +796,12 @@ static void _decode_opc(DisasContext * ctx)return ;case 0x600a :/* negc Rm,Rn */ { -TCGv t0 =tcg_temp_new (); -tcg_gen_neg_i32 (t0,REG (B7_4 )); -tcg_gen_sub_i32 (REG (B11_8 ), t0, cpu_sr_t); -tcg_gen_setcondi_i32 (TCG_COND_GTU , cpu_sr_t, t0,0 ); -tcg_gen_setcond_i32 (TCG_COND_GTU , t0,REG (B11_8 ), t0); -tcg_gen_or_i32 (cpu_sr_t, cpu_sr_t, t0); +TCGv t0 =tcg_const_i32 (0 ); +tcg_gen_add2_i32 (REG (B11_8 ), cpu_sr_t, +REG (B7_4 ), t0, cpu_sr_t, t0); +tcg_gen_sub2_i32 (REG (B11_8 ), cpu_sr_t, + t0, t0,REG (B11_8 ), cpu_sr_t); +tcg_gen_andi_i32 (cpu_sr_t, cpu_sr_t,1 );tcg_temp_free (t0); }return ;
Signature · 1 line
1.7.10.4
PATCH 6/8 target-sh4: split out Q and M from of SR and optimize div1
In reply to Aurelien JarnoSplitting Q and M out of SR, it's possible to optimize div1 by using TCG code instead of an helper.
--- target-sh4/cpu.h | 13 ++++-- target-sh4/helper.h | 1 - target-sh4/op_helper.c | 118 ------------------------------------------------ target-sh4/translate.c | 67 +++++++++++++++++++++++---- 4 files changed, 68 insertions(+), 131 deletions(-)
target-sh4/cpu.h +10 -3
@@ -140,6 +140,8 @@ typedef struct CPUSH4State {uint32_t gregs[24 ];/* general registers */ float32 fregs[32 ];/* floating point registers */ uint32_t sr;/* status register (with T split out) */ +uint32_t sr_m;/* M bit of status register */ +uint32_t sr_q;/* Q bit of status register */ uint32_t sr_t;/* T bit of status register */ uint32_t ssr;/* saved status register */ uint32_t spc;/* saved program counter */
@@ -342,13 +344,18 @@ static inline int cpu_ptel_pr (uint32_t ptel)static inline target_ulong cpu_read_sr (CPUSH4State *env) { -return (env->sr & ~(1u <<SR_T )) | (env->sr_t <<SR_T ); +return (env->sr & ~((1u <<SR_M ) | (1u <<SR_Q ) | (1u <<SR_T ))) | + (env->sr_m <<SR_M ) | + (env->sr_q <<SR_Q ) | + (env->sr_t <<SR_T ); }static inline void cpu_write_sr (CPUSH4State *env,target_ulong sr) { - env->sr_t = sr & (1u <<SR_T ); - env->sr = sr & ~(1u <<SR_T ); + env->sr_m = (sr >>SR_M ) &1 ; + env->sr_q = (sr >>SR_Q ) &1 ; + env->sr_t = (sr >>SR_T ) &1 ; + env->sr = sr & ~((1u <<SR_M ) | (1u <<SR_Q ) | (1u <<SR_T )); } static inline void cpu_get_tb_cpu_state(CPUSH4State *env, target_ulong *pc,
target-sh4/helper.h +0 -1
@@ -13,7 +13,6 @@ DEF_HELPER_3(movcal, void, env, i32, i32) DEF_HELPER_1(discard_movcal_backup, void, env) DEF_HELPER_2(ocbi, void, env, i32) -DEF_HELPER_3(div1, i32, env, i32, i32) DEF_HELPER_3(macl, void, env, i32, i32)DEF_HELPER_3 (macw, void, env, i32, i32)
target-sh4/op_helper.c +0 -118
124 lines not on this page · raw message
target-sh4/translate.c +58 -9
107 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 7/8 target-sh4: factorize fmov implementation
In reply to Aurelien Jarno--- target-sh4/translate.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-)
target-sh4/translate.c +14 -17
@@ -1024,23 +1024,20 @@ static void _decode_opc(DisasContext * ctx)return ;case 0xf00b :/* fmov {F,D,X}Rm,@-Rn - FPSCR: Nothing */ CHECK_FPU_ENABLED - if (ctx->flags & FPSCR_SZ) { -TCGv addr =tcg_temp_new_i32 (); -int fr =XREG (B7_4 ); -tcg_gen_subi_i32 (addr,REG (B11_8 ),4 ); -tcg_gen_qemu_st32 (cpu_fregs[fr+1 ], addr, ctx->memidx); -tcg_gen_subi_i32 (addr, addr,4 ); -tcg_gen_qemu_st32 (cpu_fregs[fr ], addr, ctx->memidx); -tcg_gen_mov_i32 (REG (B11_8 ), addr); -tcg_temp_free (addr); - } else { -TCGv addr; - addr =tcg_temp_new_i32 (); -tcg_gen_subi_i32 (addr,REG (B11_8 ),4 ); -tcg_gen_qemu_st32 (cpu_fregs[FREG (B7_4 )], addr, ctx->memidx); -tcg_gen_mov_i32 (REG (B11_8 ), addr); -tcg_temp_free (addr); - } + { +const int fr =XREG (B7_4 ); +TCGv addr =tcg_temp_new_i32 (); +tcg_gen_subi_i32 (addr,REG (B11_8 ),4 ); +if (ctx->flags &FPSCR_SZ ) { +tcg_gen_qemu_st32 (cpu_fregs[fr+1 ], addr, ctx->memidx); +tcg_gen_subi_i32 (addr, addr,4 ); +tcg_gen_qemu_st32 (cpu_fregs[fr], addr, ctx->memidx); + }else { +tcg_gen_qemu_st32 (cpu_fregs[fr], addr, ctx->memidx); + } +tcg_gen_mov_i32 (REG (B11_8 ), addr); +tcg_temp_free (addr); + }return ;case 0xf006 :/* fmov @(R0,Rm),{F,D,X}Rm - FPSCR: Nothing */ CHECK_FPU_ENABLED
Signature · 1 line
1.7.10.4
Re: [Qemu-devel] [PATCH 7/8] target-sh4: factorize fmov implementation
Quoted 37 lines · Aurelien Jarno
Signed-off-by Aurelien Jarno <[email protected]>--- target-sh4/translate.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-)target-sh4/translate.c +7
-17@@ -1024,23 +1024,20 @@ static void _decode_opc(DisasContext * ctx)return ;case 0xf00b :/* fmov {F,D,X}Rm,@-Rn - FPSCR: Nothing */ CHECK_FPU_ENABLED - if (ctx->flags & FPSCR_SZ) { -TCGv addr =tcg_temp_new_i32 (); -int fr =XREG (B7_4 ); -tcg_gen_subi_i32 (addr,REG (B11_8 ),4 ); -tcg_gen_qemu_st32 (cpu_fregs[fr+1 ], addr, ctx->memidx); -tcg_gen_subi_i32 (addr, addr,4 ); -tcg_gen_qemu_st32 (cpu_fregs[fr ], addr, ctx->memidx); -tcg_gen_mov_i32 (REG (B11_8 ), addr); -tcg_temp_free (addr); - } else { -TCGv addr; - addr =tcg_temp_new_i32 (); -tcg_gen_subi_i32 (addr,REG (B11_8 ),4 ); -tcg_gen_qemu_st32 (cpu_fregs[FREG (B7_4 )], addr, ctx->memidx); -tcg_gen_mov_i32 (REG (B11_8 ), addr); -tcg_temp_free (addr); - } + { +const int fr =XREG (B7_4 ); +TCGv addr =tcg_temp_new_i32 (); +tcg_gen_subi_i32 (addr,REG (B11_8 ),4 ); +if (ctx->flags &FPSCR_SZ ) { +tcg_gen_qemu_st32 (cpu_fregs[fr+1 ], addr, ctx->memidx); +tcg_gen_subi_i32 (addr, addr,4 );
target-sh4/translate.c static void _decode_opc(DisasContext * ctx) · line 1043
Quoted 10 lines
target-sh4/translate.c +7
-0+tcg_gen_qemu_st32 (cpu_fregs[fr], addr, ctx->memidx); + }else { +tcg_gen_qemu_st32 (cpu_fregs[fr], addr, ctx->memidx); + } +tcg_gen_mov_i32 (REG (B11_8 ), addr); +tcg_temp_free (addr); + }return ;case 0xf006 :/* fmov @(R0,Rm),{F,D,X}Rm - FPSCR: Nothing */ CHECK_FPU_ENABLED
Isn't this going to conflict with the "update to new qemu ld/st ops" patch you posted earlier?
thanks
-- PMM
Re: [Qemu-devel] [PATCH 7/8] target-sh4: factorize fmov implementation
Quoted 43 lines · Peter Maydell
Quoted 42 lines · Aurelien Jarno
Signed-off-by Aurelien Jarno <[email protected]>--- target-sh4/translate.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-)target-sh4/translate.c +12
-17@@ -1024,23 +1024,20 @@ static void _decode_opc(DisasContext * ctx)return ;case 0xf00b :/* fmov {F,D,X}Rm,@-Rn - FPSCR: Nothing */ CHECK_FPU_ENABLED - if (ctx->flags & FPSCR_SZ) { -TCGv addr =tcg_temp_new_i32 (); -int fr =XREG (B7_4 ); -tcg_gen_subi_i32 (addr,REG (B11_8 ),4 ); -tcg_gen_qemu_st32 (cpu_fregs[fr+1 ], addr, ctx->memidx); -tcg_gen_subi_i32 (addr, addr,4 ); -tcg_gen_qemu_st32 (cpu_fregs[fr ], addr, ctx->memidx); -tcg_gen_mov_i32 (REG (B11_8 ), addr); -tcg_temp_free (addr); - } else { -TCGv addr; - addr =tcg_temp_new_i32 (); -tcg_gen_subi_i32 (addr,REG (B11_8 ),4 ); -tcg_gen_qemu_st32 (cpu_fregs[FREG (B7_4 )], addr, ctx->memidx); -tcg_gen_mov_i32 (REG (B11_8 ), addr); -tcg_temp_free (addr); - } + { +const int fr =XREG (B7_4 ); +TCGv addr =tcg_temp_new_i32 (); +tcg_gen_subi_i32 (addr,REG (B11_8 ),4 ); +if (ctx->flags &FPSCR_SZ ) { +tcg_gen_qemu_st32 (cpu_fregs[fr+1 ], addr, ctx->memidx); +tcg_gen_subi_i32 (addr, addr,4 ); +tcg_gen_qemu_st32 (cpu_fregs[fr], addr, ctx->memidx); + }else { +tcg_gen_qemu_st32 (cpu_fregs[fr], addr, ctx->memidx); + } +tcg_gen_mov_i32 (REG (B11_8 ), addr);
Quoted 8 lines
target-sh4/translate.c static void _decode_opc(DisasContext * ctx) · line 1043
Quoted 5 lines
target-sh4/translate.c +2
-0+tcg_temp_free (addr); + }return ;case 0xf006 :/* fmov @(R0,Rm),{F,D,X}Rm - FPSCR: Nothing */ CHECK_FPU_ENABLED Isn't this going to conflict with the "update to new qemu ld/st ops" patch you posted earlier?
They indeed conflicts, and I haven't realized that before as I developed them separately. This patchset was actually sitting for quite some time in my git. I'll post a new version soon.
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net
PATCH 8/8 target-sh4: remove dead code
In reply to Aurelien Jarno--- target-sh4/translate.c | 1 - 1 file changed, 1 deletion(-)
target-sh4/translate.c +0 -1
@@ -18,7 +18,6 @@*/ #define DEBUG_DISAS -//#define SH4_SINGLE_STEP #include "cpu.h" #include "disas/disas.h"
Signature · 1 line
1.7.10.4