target-arm: Move call to disas_vfp_insn out of disas_coproc_insn.
PATCH 1/2 target-arm: Move call to disas_vfp_insn out of disas_coproc_insn.
Floating point is an extension to the instruction set rather than a coprocessor, so call it directly from the ARM and Thumb decode functions.
Signed-off-by Will Newton <[email protected]>
--- target-arm/translate.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
target-arm/translate.c +17 -5
@@ -6299,9 +6299,6 @@ static int disas_coproc_insn(CPUARMState * env, DisasContext *s, uint32_t insn)return disas_dsp_insn (env, s, insn); }return 1 ; -case 10 : -case 11 : -return disas_vfp_insn (env, s, insn);default :break ; }
@@ -6756,6 +6753,11 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s) goto illegal_op;return ; } +if ((insn &0x0f000e10 ) ==0x0e000a00 ) { +/* VFP. */ +if (disas_vfp_insn (env, s, insn)) + goto illegal_op; + }if (((insn &0x0f30f000 ) ==0x0510f000 ) || ((insn &0x0f30f010 ) ==0x0710f000 )) {if ((insn & (1 <<22 )) ==0 ) {
@@ -8036,9 +8038,15 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)case 0xc :case 0xd :case 0xe : -/* Coprocessor. */ -if (disas_coproc_insn (env, s, insn)) +if (((insn >>8 ) &0xe ) ==10 ) { +/* VFP. */ +if (disas_vfp_insn (env, s, insn)) { + goto illegal_op; + } + }else if (disas_coproc_insn (env, s, insn)) { +/* Coprocessor. */ goto illegal_op; + }break ;case 0xf :/* swi */
@@ -8768,6 +8776,10 @@ static int disas_thumb2_insn(CPUARMState *env, DisasContext *s, uint16_t insn_hw insn = (insn &0xe2ffffff ) | ((insn & (1 <<28 )) >>4 ) | (1 <<28 );if (disas_neon_data_insn (env, s, insn)) goto illegal_op; + }else if (((insn >>8 ) &0xe ) ==10 ) { +if (disas_vfp_insn (env, s, insn)) { + goto illegal_op; + } }else {if (insn & (1 <<28 )) goto illegal_op;
Signature · 1 line
1.8.1.4