From patchwork Tue Feb 7 00:59:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 724837 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 3vHR9N0Wbzz9s2P for ; Tue, 7 Feb 2017 12:10:48 +1100 (AEDT) Received: from localhost ([::1]:51373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cauIv-0004wj-I7 for incoming@patchwork.ozlabs.org; Mon, 06 Feb 2017 20:10:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cau8v-00056g-6H for qemu-devel@nongnu.org; Mon, 06 Feb 2017 20:00:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cau8q-00068G-Bw for qemu-devel@nongnu.org; Mon, 06 Feb 2017 20:00:25 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:63498) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cau8p-00067f-Vz for qemu-devel@nongnu.org; Mon, 06 Feb 2017 20:00:20 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MF8Xf-1cdNtD15Tf-00GJ4K; Tue, 07 Feb 2017 01:59:36 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 7 Feb 2017 01:59:18 +0100 Message-Id: <20170207005930.28327-5-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170207005930.28327-1-laurent@vivier.eu> References: <20170207005930.28327-1-laurent@vivier.eu> X-Provags-ID: V03:K0:DywDuBvKiCrPTI3ST4rM215/ZHZfmasu3HXIjz93XM6IMQXRqeK y2WUwr4oxxy83g+faoJrjEKebyjNbu4yPVbFQcfvQJa7AZDdqCLQ0D/3DsIW0t+1cqsHhDN K1BkXA9bDS1ioQNFiE/xULtc7OS1MErrMEkttFuHirwUTl3EQfLX4lVvt0ZyYrSl31ysLz5 7qxZHgCa+Dr2qXcJ+oL5Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:2slC5wln/HY=:hk4PS7nj02LF6X858k2qsZ 3c+d992Wut8K/X1WfDLMmqYPhTZobl0CvtTOgmUZf9jskUAqJe12Tvw2L1vxMwKJ532667Aqo BL3KFJeKfg1aMDwwUaEp8MS9CY+3j2wGiEz6+/HLI6q+zMmUF+h+w4IcyARzMGfpQf5T9t0vE ipumkNMh8grIBOuSv/zw/iaTfWQ0IDYDHp0QDrPV/Dz/hadG5V+sLaCkavJRPzI/vUPA7IvQ/ krTxOfIX9PA+vCay8+mcFwYCNNv1jBk8C9xNxiTO1R8nY+Y5RjLkvhqmGHUQFFWcTHV68FiwZ nmBp+3tqyiN3BjfB3Q2dO0C4YSf3MJ74BF+/QqMPePzWx8DBNqF6CUzNaOVfwWifJJHj+DELu VIhNl2UtRJSrT1Zr2lya6WgDYcsnyaI7twV+YISQ6tmuaDtSnXHemL6FDK/HM8B48cWMFov7l jn7WH1BSNbn/0hmARQU2IXrFGTc+AqLnVGs8QnouxTSXAGwn/Wj3pL0sbqyGxC375gjQ7rSvJ Xfa5b2aNEMAetPRAHfOO3SbZznf5cM3+R+KwYswMGootGOS94LbIrODgvwVGpzY2gOPqgOZDn jVM7cRydwKK8U07tySqESQwMwjEPiMyQYmY1pS4qQn8mK+wGb3L6IfLLtvW3sp7l0ghfwPLFb CksTc53dL4iVSTVnCRP4FmIm5cym62TOjDxrWotG11O945LwAj6TXTLUj+0u6xRhfJUU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v3 04/16] target-m68k: define ext_opsize 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 , Aurelien Jarno , 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 | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 9f60fbc..d9ba735 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -669,6 +669,21 @@ static inline int insn_opsize(int insn) } } +static inline int ext_opsize(int ext, int pos) +{ + switch ((ext >> pos) & 7) { + case 0: return OS_LONG; + case 1: return OS_SINGLE; + case 2: return OS_EXTENDED; + case 3: return OS_PACKED; + case 4: return OS_WORD; + case 5: return OS_DOUBLE; + case 6: return OS_BYTE; + default: + g_assert_not_reached(); + } +} + /* Assign value to a register. If the width is less than the register width only the low part of the register is set. */ static void gen_partset_reg(int opsize, TCGv reg, TCGv val) @@ -4101,20 +4116,19 @@ DISAS_INSN(fpu) tmp32 = tcg_temp_new_i32(); /* fmove */ /* ??? TODO: Proper behavior on overflow. */ - switch ((ext >> 10) & 7) { - case 0: - opsize = OS_LONG; + + opsize = ext_opsize(ext, 10); + switch (opsize) { + case OS_LONG: gen_helper_f64_to_i32(tmp32, cpu_env, src); break; - case 1: - opsize = OS_SINGLE; + case OS_SINGLE: gen_helper_f64_to_f32(tmp32, cpu_env, src); break; - case 4: - opsize = OS_WORD; + case OS_WORD: gen_helper_f64_to_i32(tmp32, cpu_env, src); break; - case 5: /* OS_DOUBLE */ + case OS_DOUBLE: tcg_gen_mov_i32(tmp32, AREG(insn, 0)); switch ((insn >> 3) & 7) { case 2: @@ -4143,8 +4157,7 @@ DISAS_INSN(fpu) } tcg_temp_free_i32(tmp32); return; - case 6: - opsize = OS_BYTE; + case OS_BYTE: gen_helper_f64_to_i32(tmp32, cpu_env, src); break; default: @@ -4217,15 +4230,7 @@ DISAS_INSN(fpu) } if (ext & (1 << 14)) { /* Source effective address. */ - switch ((ext >> 10) & 7) { - case 0: opsize = OS_LONG; break; - case 1: opsize = OS_SINGLE; break; - case 4: opsize = OS_WORD; break; - case 5: opsize = OS_DOUBLE; break; - case 6: opsize = OS_BYTE; break; - default: - goto undef; - } + opsize = ext_opsize(ext, 10); if (opsize == OS_DOUBLE) { tmp32 = tcg_temp_new_i32(); tcg_gen_mov_i32(tmp32, AREG(insn, 0));