Re: [Qemu-devel] [PATCH v2 04/17] target-m68k: add addressing modes to scc

[Richard Henderson]

On 10/26/2016 05:42 PM, Laurent Vivier wrote:

Signed-off-by: Laurent Vivier 
---
 target-m68k/translate.c | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)


Reviewed-by: Richard Henderson 


r~

[Qemu-devel] [PATCH v2 04/17] target-m68k: add addressing modes to scc

[Laurent Vivier]

Signed-off-by: Laurent Vivier 
---
 target-m68k/translate.c | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index b407623..e595673 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -1008,25 +1008,6 @@ static void gen_jmpcc(DisasContext *s, int cond, 
TCGLabel *l1)
   free_cond();
 }
 
-DISAS_INSN(scc)
-{
-DisasCompare c;
-int cond;
-TCGv reg, tmp;
-
-cond = (insn >> 8) & 0xf;
-gen_cc_cond(, s, cond);
-
-tmp = tcg_temp_new();
-tcg_gen_setcond_i32(c.tcond, tmp, c.v1, c.v2);
-free_cond();
-
-reg = DREG(insn, 0);
-tcg_gen_neg_i32(tmp, tmp);
-tcg_gen_deposit_i32(reg, reg, tmp, 0, 8);
-tcg_temp_free(tmp);
-}
-
 /* Force a TB lookup after an instruction that changes the CPU state.  */
 static void gen_lookup_tb(DisasContext *s)
 {
@@ -1106,6 +1087,24 @@ static void gen_jmp_tb(DisasContext *s, int n, uint32_t 
dest)
 s->is_jmp = DISAS_TB_JUMP;
 }
 
+DISAS_INSN(scc)
+{
+DisasCompare c;
+int cond;
+TCGv tmp;
+
+cond = (insn >> 8) & 0xf;
+gen_cc_cond(, s, cond);
+
+tmp = tcg_temp_new();
+tcg_gen_setcond_i32(c.tcond, tmp, c.v1, c.v2);
+free_cond();
+
+tcg_gen_neg_i32(tmp, tmp);
+DEST_EA(env, insn, OS_BYTE, tmp, NULL);
+tcg_temp_free(tmp);
+}
+
 DISAS_INSN(undef_mac)
 {
 gen_exception(s, s->pc - 2, EXCP_LINEA);
@@ -3136,7 +3135,8 @@ void register_m68k_insns (CPUM68KState *env)
 INSN(jump,  4ec0, ffc0, M68000);
 INSN(addsubq,   5000, f080, M68000);
 INSN(addsubq,   5080, f0c0, M68000);
-INSN(scc,   50c0, f0f8, CF_ISA_A);
+INSN(scc,   50c0, f0f8, CF_ISA_A); /* Scc.B Dx   */
+INSN(scc,   50c0, f0c0, M68000);   /* Scc.B  */
 INSN(addsubq,   5080, f1c0, CF_ISA_A);
 INSN(tpf,   51f8, fff8, CF_ISA_A);
 
-- 
2.7.4