From patchwork Fri Oct 28 08:48:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 9401611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8D00A601C0 for ; Fri, 28 Oct 2016 08:51:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 850F42A684 for ; Fri, 28 Oct 2016 08:51:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 799B02A688; Fri, 28 Oct 2016 08:51:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0C8F82A684 for ; Fri, 28 Oct 2016 08:51:15 +0000 (UTC) Received: from localhost ([::1]:47532 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c02sc-000793-6F for patchwork-qemu-devel@patchwork.kernel.org; Fri, 28 Oct 2016 04:51:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c02qT-0005hL-7q for qemu-devel@nongnu.org; Fri, 28 Oct 2016 04:49:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c02qP-00038h-6b for qemu-devel@nongnu.org; Fri, 28 Oct 2016 04:49:01 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:60418) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c02qO-00036e-Sr for qemu-devel@nongnu.org; Fri, 28 Oct 2016 04:48:57 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0Lst7y-1d1Xc712j4-012VsN; Fri, 28 Oct 2016 10:48:45 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 28 Oct 2016 10:48:24 +0200 Message-Id: <1477644512-21716-11-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:JfLheNVeO1kegMXvRQCSIQSRT2MROZiqT0l1xO0YVj2Pz+19VzI p8KoWr1NCrixifQul9xrHUzr9UI/lcPYrji1bnz3CUXdaFCefd0h6QFvb9oRkq9/x6q1WZg ctz8JIYBmaOjnSbHg+cdoAbplKDK5gWJdz3YyTrRnsmAK0pnG/+e6XPt0odxQdVaVg41M5l Q67gspb1JeCwYoRU2z/nw== X-UI-Out-Filterresults: notjunk:1; V01:K0:JZHIZS25lEc=:Vn4jfljeQOt2jUwDWn/FZf PCTPI38jkMq9ccmqsa/gfaW9zVqleQJEwN168Enpg+nMlGgU7s3wRgmG4M8SEqEI0PhIIKeep cleHraShmqRaUIYeUTCCNt1TYKskS9/I8z6EXNTg2+rslolmzMzB4206ghp5g5OI5znSf5QI6 MZYo8tyehVTLtxmYLG2g4f1sTvJ0CZ7q31bDhE4A5/LqBMSkLTzwj1x8H+mMQUE+FcOe3WUFC qOZJEgvSQo0pwSEamdHnfhWPUGcrngCFdIIDhTia+45b0/isa8kzhUeh5V9a/0eGki2TaQYfT QnVtdGbiZYUIErWmc7uCG3noXmLlln4TlpwjQioAaLcp5rKoFc4tAteCiPaPgVtYOeWv72PgX sdGO8htx5W+JnM3DidW13+hhUMkbv2Qgdd7OAx34OiEwa6nUs/ppirbn7BzfhM8XcYHhYM+NS LIw5mQmEzP88cWSKMeQBdpr80IrVOU28WiawMk9qdpZInrUN3xQNhpmfZCbaGhvnHaVtcJY4j e1kP73w2alKO5WzMaBu0Dk2ZYTGEczI1PfNkQLznbX3jQEAqG5HvXvwwV3D6+4gANHOSIbUHU LbbRTFH6h7KijFt9T/FVZ/+fi6dWpnlGwI7eQ9SjbInTOLMBt3cyX0wZDVst0GznmLfwGM5zR Prcw4RMZAxukKFM5U8H9MHXbqVsWSoClX5D7Uz7wiuHjhvBMggdRdVIqcJQso28OfKBw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PULL 10/18] target-m68k: and can manage word and byte 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target-m68k/translate.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index a6aaf5e..3f7db83 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -2179,19 +2179,23 @@ DISAS_INSN(and) TCGv reg; TCGv dest; TCGv addr; + int opsize; - reg = DREG(insn, 9); dest = tcg_temp_new(); + + opsize = insn_opsize(insn); + reg = DREG(insn, 9); if (insn & 0x100) { - SRC_EA(env, src, OS_LONG, 0, &addr); + SRC_EA(env, src, opsize, 0, &addr); tcg_gen_and_i32(dest, src, reg); - DEST_EA(env, insn, OS_LONG, dest, &addr); + DEST_EA(env, insn, opsize, dest, &addr); } else { - SRC_EA(env, src, OS_LONG, 0, NULL); + SRC_EA(env, src, opsize, 0, NULL); tcg_gen_and_i32(dest, src, reg); - tcg_gen_mov_i32(reg, dest); + gen_partset_reg(opsize, reg, dest); } - gen_logic_cc(s, dest, OS_LONG); + tcg_temp_free(dest); + gen_logic_cc(s, dest, opsize); } DISAS_INSN(adda)