Move Arm to GOTO_TB
PATCH 1/1 Move Arm to GOTO_TB
The attached patch migrates the Arm target from JUMP_TB to GOTO_TB. The comment in exec-all.h indicates this is a Good Thing(tm), and it's a prerequisite for my hand coded generator.
Paul
Index: target-arm/op.c
===================================================================
RCS file: /cvsroot/qemu/qemu/target-arm/op.c,v
retrieving revision 1.14
op.c +4 -4
@@ -346,14 +346,14 @@ void OPPROTO op_test_le(void)FORCE_RET (); } -void OPPROTO op_jmp0(void) +void OPPROTO op_goto_tb0(void) { -JUMP_TB (op_jmp0,PARAM1 ,0 ,PARAM2 ); +GOTO_TB (op_goto_tb0,PARAM1 ,0 ); } -void OPPROTO op_jmp1(void) +void OPPROTO op_goto_tb1(void) { -JUMP_TB (op_jmp1,PARAM1 ,1 ,PARAM2 ); +GOTO_TB (op_goto_tb1,PARAM1 ,1 ); } void OPPROTO op_exit_tb(void)
Index: target-arm/translate.c
===================================================================
RCS file: /cvsroot/qemu/qemu/target-arm/translate.c,v retrieving revision 1.27
translate.c +22 -3
@@ -43,6 +43,12 @@ typedef struct DisasContext {#define DISAS_JUMP_NEXT 4 +#ifdef USE_DIRECT_JUMP +#define TBPARAM (x) +#else +#define TBPARAM (x) (long)(x) +#endif +/* XXX: move that elsewhere */ static uint16_t *gen_opc_ptr;static uint32_t *gen_opparam_ptr;
@@ -897,6 +903,18 @@ static int disas_vfp_insn(CPUState * envreturn 0 ; } +static inline gen_jmp_tb(long tb, int n, uint32_t dest) +{ +if (n ==0 ) +gen_op_goto_tb0 (TBPARAM (tb)); +else +gen_op_goto_tb1 (TBPARAM (tb)); +gen_op_movl_T0_im (dest); +gen_op_movl_r15_T0 (); +gen_op_movl_T0_im (tb + n); +gen_op_exit_tb (); +} +static inline void gen_jmp (DisasContext *s,uint32_t dest) {if (__builtin_expect (s->singlestep_enabled,0 )) {
@@ -906,7 +924,8 @@ static inline void gen_jmp (DisasContextgen_op_movl_T0_im (dest);gen_bx (s); }else { -gen_op_jmp0 ((long )s->tb, dest); +long tb = (long )s->tb; +gen_jmp_tb (tb,0 , dest); s->is_jmp =DISAS_TB_JUMP ; } }
@@ -2118,7 +2137,7 @@ static inline int gen_intermediate_code_ }else {switch (dc->is_jmp) {case DISAS_NEXT : -gen_op_jmp1 ((long )dc->tb, (long )dc->pc); +gen_jmp_tb ((long )dc->tb,1 , dc->pc);break ;default :case DISAS_JUMP :
@@ -2133,7 +2152,7 @@ static inline int gen_intermediate_code_ }if (dc->condjmp) {gen_set_label (dc->condlabel); -gen_op_jmp1 ((long )dc->tb, (long )dc->pc); +gen_jmp_tb ((long )dc->tb,1 , dc->pc); dc->condjmp =0 ; } }