From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MAAmK-0002YI-Pe for qemu-devel@nongnu.org; Fri, 29 May 2009 18:42:21 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MAAmB-0002Sl-RK for qemu-devel@nongnu.org; Fri, 29 May 2009 18:42:16 -0400 Received: from [199.232.76.173] (port=44630 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MAAmB-0002SQ-Gy for qemu-devel@nongnu.org; Fri, 29 May 2009 18:42:11 -0400 Received: from smtp4-g21.free.fr ([212.27.42.4]:39665) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MAAmA-0007Ke-1R for qemu-devel@nongnu.org; Fri, 29 May 2009 18:42:10 -0400 From: Laurent Vivier Date: Sat, 30 May 2009 00:42:01 +0200 Message-Id: <1243636921-23054-18-git-send-email-laurent@vivier.eu> In-Reply-To: <1243636921-23054-17-git-send-email-laurent@vivier.eu> References: <1243636921-23054-1-git-send-email-laurent@vivier.eu> <1243636921-23054-2-git-send-email-laurent@vivier.eu> <1243636921-23054-3-git-send-email-laurent@vivier.eu> <1243636921-23054-4-git-send-email-laurent@vivier.eu> <1243636921-23054-5-git-send-email-laurent@vivier.eu> <1243636921-23054-6-git-send-email-laurent@vivier.eu> <1243636921-23054-7-git-send-email-laurent@vivier.eu> <1243636921-23054-8-git-send-email-laurent@vivier.eu> <1243636921-23054-9-git-send-email-laurent@vivier.eu> <1243636921-23054-10-git-send-email-laurent@vivier.eu> <1243636921-23054-11-git-send-email-laurent@vivier.eu> <1243636921-23054-12-git-send-email-laurent@vivier.eu> <1243636921-23054-13-git-send-email-laurent@vivier.eu> <1243636921-23054-14-git-send-email-laurent@vivier.eu> <1243636921-23054-15-git-send-email-laurent@vivier.eu> <1243636921-23054-16-git-send-email-laurent@vivier.eu> <1243636921-23054-17-git-send-email-laurent@vivier.eu> Subject: [Qemu-devel] [PATCH 17/17] m68k: add cas List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier This instruction is needed to execute commands like "ls" or "date" (from a debian lenny m68k). It define a new feaure, CAS, and attach this new instruction to it. Signed-off-by: Laurent Vivier --- target-m68k/cpu.h | 3 +- target-m68k/helper.c | 2 + target-m68k/translate.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletions(-) diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index 727a0b1..93956c3 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -209,7 +209,8 @@ enum m68k_features { M68K_FEATURE_QUAD_MULDIV, /* 64 bit multiply/divide. */ M68K_FEATURE_BCCL, /* Long conditional branches. */ M68K_FEATURE_BITFIELD, /* Bit field insns. */ - M68K_FEATURE_FPU + M68K_FEATURE_FPU, + M68K_FEATURE_CAS }; static inline int m68k_feature(CPUM68KState *env, int feature) diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 3ae0366..67e823a 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -162,6 +162,7 @@ static int cpu_m68k_set_model(CPUM68KState *env, const char *name) m68k_set_feature(env, M68K_FEATURE_SCALED_INDEX); m68k_set_feature(env, M68K_FEATURE_LONG_MULDIV); m68k_set_feature(env, M68K_FEATURE_FPU); + m68k_set_feature(env, M68K_FEATURE_CAS); case M68K_CPUID_M68000: m68k_set_feature(env, M68K_FEATURE_M68000); m68k_set_feature(env, M68K_FEATURE_USP); @@ -207,6 +208,7 @@ static int cpu_m68k_set_model(CPUM68KState *env, const char *name) m68k_set_feature(env, M68K_FEATURE_BITFIELD); m68k_set_feature(env, M68K_FEATURE_LONG_MULDIV); m68k_set_feature(env, M68K_FEATURE_QUAD_MULDIV); + m68k_set_feature(env, M68K_FEATURE_CAS); break; } diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 4c36b6a..4372975 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -1375,6 +1375,67 @@ DISAS_INSN(arith_im) } } +DISAS_INSN(cas) +{ + int opsize; + TCGv dest; + TCGv tmp; + TCGv cmp; + TCGv update; + TCGv addr; + TCGv res; + uint16_t ext; + int l1, l2; + + if ((insn & 0x3f) == 0x3c) { + /* CAS2: Not yet implemented */ + gen_exception(s, s->pc - 4, EXCP_UNSUPPORTED); + } + + switch((insn >> 9) & 3) { + case 1: + opsize = OS_BYTE; + break; + case 2: + opsize = OS_WORD; + break; + case 3: + opsize = OS_LONG; + break; + default: + abort(); + } + + ext = lduw_code(s->pc); + s->pc += 2; + addr = gen_lea(s, insn, opsize); + if (IS_NULL_QREG(addr)) { + gen_addr_fault(s); + return; + } + + cmp = DREG(ext, 0); + update = DREG(ext, 6); + tmp = gen_load(s, opsize, addr, 0); + dest = tcg_temp_local_new(); + tcg_gen_mov_i32(dest, tmp); + + res = tcg_temp_new(); + tcg_gen_sub_i32(res, dest, cmp); + gen_logic_cc(s, res); + + l1 = gen_new_label(); + l2 = gen_new_label(); + + gen_jmpcc(s, 6 /* !Z */, l1); + gen_store(s, opsize, addr, update); + tcg_gen_br(l2); + gen_set_label(l1); + tcg_gen_mov_i32(cmp, dest); + gen_set_label(l2); + tcg_temp_free(dest); +} + DISAS_INSN(byterev) { TCGv reg; @@ -3664,6 +3725,7 @@ void register_m68k_insns (CPUM68KState *env) INSN(bitop_im, 0840, ffc0, M68000); INSN(bitop_im, 0880, ffc0, CF_ISA_A); INSN(bitop_im, 0880, ffc0, M68000); + INSN(cas, 08c0, f9c0, CAS); INSN(bitop_im, 08c0, ffc0, CF_ISA_A); INSN(bitop_im, 08c0, ffc0, M68000); INSN(arith_im, 0a80, fff8, CF_ISA_A); -- 1.5.6.5