From patchwork Thu Oct 27 00:42:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 687418 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 3t47ns399yz9t1C for ; Thu, 27 Oct 2016 11:59:29 +1100 (AEDT) Received: from localhost ([::1]:38302 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzZ2U-0005bD-1u for incoming@patchwork.ozlabs.org; Wed, 26 Oct 2016 20:59:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzYmd-0001Go-8c for qemu-devel@nongnu.org; Wed, 26 Oct 2016 20:43:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzYmc-0000yx-9g for qemu-devel@nongnu.org; Wed, 26 Oct 2016 20:43:03 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:60420) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzYmc-0000y7-0u for qemu-devel@nongnu.org; Wed, 26 Oct 2016 20:43:02 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005) with ESMTPSA (Nemesis) id 0MHcm8-1c2qZI1ZAS-003Nbw; Thu, 27 Oct 2016 02:42:40 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 27 Oct 2016 02:42:23 +0200 Message-Id: <1477528950-8115-11-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477528950-8115-1-git-send-email-laurent@vivier.eu> References: <1477528950-8115-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:COgqf9To7LSJjwb4k5h7cyACawSi4aeqI92OXJjRT1tIiR3m5xz Ox0MKgYJUdMBWq+7Et5bslxrTBHUdLGLI3mJm15ViLGROqtXfaID9wX4Zvi5FWilMOQ0Q3P rMdDD+CjtW3cMeP1TQWGCiAFox2uhEmdxE7CaHVJAPYGz+7CkbhwRqyjgBBeViBqf6MDpaK 9AsInCoXf7ZfOn2NxfqMA== X-UI-Out-Filterresults: notjunk:1; V01:K0:n7n3r/hMoSc=:B66RG+9vJCu3o10VL2Grpi S80xStiqC+9+bmAI+VuB18+7i6CJpJ/iZf938+Sf1qFxe4Sv83ZjfsZ4Nb7P+YwdcVDGKp8h+ j6eM79tfmD836zJUADueRqgku5LGyXqde8X5U0uoNA/AP8XCeUBJhuA1uKFIQXDZAlAAi9Ffa /aeb30lBPh+Ea4rm68w07m1jtxc1xp7wnuTuY0GD2hG8ru0nEexHga0NH+xE+3hGcCsTgjBcJ IgCbW7ME4mTL4d+WCZUFR/uzpt1MHE8tK3xZNnBGd5ZdNFB9kCfUpsToJnNtSxaG0AZywd1WE ZnDcQl1SSkVfsA6igQXDaJZSquIDDMgAq5nOu8IrN00O+O98Wf3VlglReXSL7m3NHdZ1bdTPS R8uCyV+7Sax0Vj4jOSaX5aFpk8XMklEEpZkNu8v6zUHRO3ykZvE0icakUZYrFwyGGmt45iKwZ EI9EW7XRR9JqR6wEPWvBZN60PDRCYhqj45caMrCdzFMz11RFZWSw/2n5IHN/xj2GrlRzMysK/ z/U2pDt6EYaKxBVSrrqejPFKXbTuzVyYtDPUIedaXz4sSEw54PkP2Ar7IzNSF1LJ5HRXQTc2U 71dPN2MrT/qCCYdptVDj7W9c+QNCtqSXtISGLuTEebjOvinTDjtraxTOJx8zBR8eq1Q9M3H9s bvI/xIME6/y8k4tBJJItNSPaTD5VjfUas01yv91kVJ8mJhj252GVy5EJozJdjw9pE970= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v2 10/17] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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)