From patchwork Fri Oct 28 08:48:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 688294 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 3t4yK00DXFz9t0Z for ; Fri, 28 Oct 2016 19:55:48 +1100 (AEDT) Received: from localhost ([::1]:47562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c02wz-0002vt-GX for incoming@patchwork.ozlabs.org; Fri, 28 Oct 2016 04:55:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c02qd-0005qd-1U for qemu-devel@nongnu.org; Fri, 28 Oct 2016 04:49:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c02qc-0003FN-A4 for qemu-devel@nongnu.org; Fri, 28 Oct 2016 04:49:11 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:52160) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c02qc-0003Ew-0R for qemu-devel@nongnu.org; Fri, 28 Oct 2016 04:49:10 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0LfsQF-1cfBPO1bsR-00pdrS; Fri, 28 Oct 2016 10:48:49 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 28 Oct 2016 10:48:30 +0200 Message-Id: <1477644512-21716-17-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477644512-21716-1-git-send-email-laurent@vivier.eu> References: <1477644512-21716-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:zZGn3vFqxJ/2d9oYW6l7fu42CpHcDQjXnSYiXthqp8pdthUqBEG onTVPjtaYwRfKP0qO2ypy5b7H2CEz/b+Pvhosfkm8EdAYZI3PEi08qnh3pogOC02JBwUgLh SaaV/w0Iq2hMLefCDlPX9OTj4Afc86/1QB03kNuuJbgew9kVtqB5D9yoj0uw3dw16hm2krA boz1y7EyciwBhov2sZY4A== X-UI-Out-Filterresults: notjunk:1; V01:K0:XHBEipvY5Ho=:KvJmNAUx0i2rJjqY5NaXAo jpOKCF0vAX3/T53p6NHN0OvGbinH3O9p6VMmjrfvEFV2DcyVXRqQnaz7dloT++wB43cOG/DqT vBEGgbWwT9LC73ncEAbI+vcJEV1ZziXDFFezjLhpgYZDu3MPY71LUC3/j1Sgty+gliD2iD2ck 16IipBOHQgYsh3XTMhjDVqibYkp9IsuYWLgtmSbUAYcr1AMzgW86XVCSwEV5MRZGxmHC13gYk WVwq/2NsFmBfld5OoZH44a1YIAyPYpdpzjMfjbrJJr+IjuUg6CxT612QtyG/PnN44qeJPrJ5A Yla9nUCfMehwUAlz0stR9PnGeHTEgd6Ue0114JwAPyhZmPyxLe9HJQLJIPmFbBXJoXc9Yv7uF Zt0wLwpwkOcQWnTQbh9MFHJe6ywT+XGIsZEk454d6dezxVF3O+U/1lhm0fGm0UPd5Lj7t+PDx WQ9yP/FZD9SJWp6QmR3Subq/42lqFUFphxfPOR/Sv3n3slUlj36VnxmZbfxeZTMwD7nQN3Hjh 61BgSkEQ1RB+RHKL2dPdT0JAd9lj+G2tdvoN4yripNEMfy/RpfEUDq0IGKZqprtlUqjJWqkjk wJ/YSkpqV7HK3GPAl5ret6CDltXiC5bDUWt2DWzLBDxNrYYd7ShO54oynauyNBjpXHa2uHHUJ /iD9BlGosJyodp58RI3GLSSsR5lFdAaXV0gBBOBLsxsRuM/+Bd2Plx6Kn+Ph4QMc5+xI= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 16/18] target-m68k: cmp manages word and bytes operands 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 Reviewed-by: Richard Henderson --- target-m68k/translate.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 0448569..57ac2e5 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -582,6 +582,13 @@ static void gen_logic_cc(DisasContext *s, TCGv val, int opsize) set_cc_op(s, CC_OP_LOGIC); } +static void gen_update_cc_cmp(DisasContext *s, TCGv dest, TCGv src, int opsize) +{ + tcg_gen_mov_i32(QREG_CC_N, dest); + tcg_gen_mov_i32(QREG_CC_V, src); + set_cc_op(s, CC_OP_CMPB + opsize); +} + static void gen_update_cc_add(TCGv dest, TCGv src, int opsize) { gen_ext(QREG_CC_N, dest, opsize, 1); @@ -2132,10 +2139,9 @@ DISAS_INSN(cmp) int opsize; opsize = insn_opsize(insn); - SRC_EA(env, src, opsize, -1, NULL); - reg = DREG(insn, 9); - gen_update_cc_add(reg, src, OS_LONG); - set_cc_op(s, CC_OP_CMPL); + SRC_EA(env, src, opsize, 1, NULL); + reg = gen_extend(DREG(insn, 9), opsize, 1); + gen_update_cc_cmp(s, reg, src, opsize); } DISAS_INSN(cmpa) @@ -2151,8 +2157,7 @@ DISAS_INSN(cmpa) } SRC_EA(env, src, opsize, 1, NULL); reg = AREG(insn, 9); - gen_update_cc_add(reg, src, OS_LONG); - set_cc_op(s, CC_OP_CMPL); + gen_update_cc_cmp(s, reg, src, opsize); } DISAS_INSN(eor)