From patchwork Wed Oct 26 16:35:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 687283 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t3xxR4yH0z9s9c for ; Thu, 27 Oct 2016 04:35:23 +1100 (AEDT) Received: from localhost ([::1]:36347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzS6i-0002IY-MZ for incoming@patchwork.ozlabs.org; Wed, 26 Oct 2016 13:35:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzRBh-0002T5-Kk for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:36:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzRBe-00054x-2Q for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:36:25 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:52205) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzRBd-00054a-P5 for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:36:21 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003) with ESMTPSA (Nemesis) id 0LZjFg-1ckcxV2qC4-00lVxn; Wed, 26 Oct 2016 18:36:13 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 26 Oct 2016 18:35:54 +0200 Message-Id: <1477499766-11722-5-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477499766-11722-1-git-send-email-laurent@vivier.eu> References: <1477499766-11722-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:DK9Ad6F1FfEnc0XEEMVcO2Q8JYHOh+V9RR0IhpCSW0TOz/OS1Ka FNfYcWIAC1UfLWYgWSGtsdSZOS227sGuCHMMUChGRmrITF6ZT0otVz0RR8TW+OEUSOyFk+e 5pJJs6LjuH7cbTK5wyN1niKqPbElzTW2Mb5JQrmXxC71QXn97Y/sOzjKxvguvQrFbE6XGQX skCTeZ8F7SnhWdMc/PisA== X-UI-Out-Filterresults: notjunk:1; V01:K0:bvCLE99OjYk=:rWnRTjoajWHNk+dKTk35hV wIAF5F4qxdBJE97udrnl5OFmKiAZfrsSFLrz5Um0KIaCKtLInAbmth14vNiqCpXe7gPYrDxqj ICSdYIg8viqUur0H0h6w4iatJ4iW7ChqG8Vzdv59qDuj+D2bqM3g/6epnOx2UIroGaWKiGbIo cDHhycy/mro6z/Tw6HW4YEVcQrbNHhSFeJw6mHWzl7AZuQzha5nson8cAItgQxMznPezPOYRC GZZq2+WJAcwgLwBjNnhxj7xNmdji1658MMAHbF910J4r3i+ZL8/jsSpmjOcf1y7F3c4Fzz61b A26jxsR8jzKRjCdiPep5P9+GcnanP6sRU6Eypl6PUI5zsH1aRcp8v3fZyXPbVziu17Wv+JOni maZky+TH0xxU+A9qMKONeR8W5PDAllvYH5zzDVIS3qVEdvVj6pqy8ahtHnh08i3s+vcVJ9VrR C5WadZA+ULvRDoZhGONT/db1FfDgR70tP++ArYMIm0dxtmjJGt0w5xZ4fcwkv4Hqauym7P3Yx u+yVpzoCKjbZVCJC+W+Q2A5LD2jtPvNl8ou390q8mnFVOD6Zy8rc3K3EzrzECkTLXOfSo2zSx TcJQKCLRYSp3I49j2Re/vxj8nwRq+7Br/I3kQq3P9g2Q0uDnx+MsjL/cWDbv7/rcQQ9gq+g+X WpoFVPTCIAhi0sY9mFRS2Z46SSSgaDk21/5+pH0+Qz+Q4J0qeesh/JJRmK1tACqg8JrQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PATCH 04/16] target-m68k: add scc/dbcc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , gerg@uclinux.org, schwab@linux-m68k.org, agraf@suse.de, Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Laurent Vivier --- target-m68k/translate.c | 65 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 20 deletions(-) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index a07b6f5..05efd29 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(&c); } -DISAS_INSN(scc) -{ - DisasCompare c; - int cond; - TCGv reg, tmp; - - cond = (insn >> 8) & 0xf; - gen_cc_cond(&c, s, cond); - - tmp = tcg_temp_new(); - tcg_gen_setcond_i32(c.tcond, tmp, c.v1, c.v2); - free_cond(&c); - - 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,48 @@ 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(&c, s, cond); + + tmp = tcg_temp_new(); + tcg_gen_setcond_i32(c.tcond, tmp, c.v1, c.v2); + free_cond(&c); + + tcg_gen_neg_i32(tmp, tmp); + DEST_EA(env, insn, OS_BYTE, tmp, NULL); + tcg_temp_free(tmp); +} + +DISAS_INSN(dbcc) +{ + TCGLabel *l1; + TCGv reg; + TCGv tmp; + int16_t offset; + uint32_t base; + + reg = DREG(insn, 0); + base = s->pc; + offset = (int16_t)read_im16(env, s); + l1 = gen_new_label(); + gen_jmpcc(s, (insn >> 8) & 0xf, l1); + + tmp = tcg_temp_new(); + tcg_gen_ext16s_i32(tmp, reg); + tcg_gen_addi_i32(tmp, tmp, -1); + gen_partset_reg(OS_WORD, reg, tmp); + tcg_gen_brcondi_i32(TCG_COND_EQ, tmp, -1, l1); + gen_jmp_tb(s, 1, base + offset); + gen_set_label(l1); + gen_jmp_tb(s, 0, s->pc); +} + DISAS_INSN(undef_mac) { gen_exception(s, s->pc - 2, EXCP_LINEA); @@ -3144,7 +3167,9 @@ 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(dbcc, 50c8, f0f8, M68000); INSN(addsubq, 5080, f1c0, CF_ISA_A); INSN(tpf, 51f8, fff8, CF_ISA_A);