From nobody Tue Oct 28 12:14:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15148555783841003.3202524022288; Mon, 1 Jan 2018 17:12:58 -0800 (PST) Received: from localhost ([::1]:50739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWB8T-0002rl-Em for importer@patchew.org; Mon, 01 Jan 2018 20:12:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWB6K-0001WR-9O for qemu-devel@nongnu.org; Mon, 01 Jan 2018 20:10:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWB6H-00055B-0J for qemu-devel@nongnu.org; Mon, 01 Jan 2018 20:10:44 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:63807) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWB6G-00053B-JN for qemu-devel@nongnu.org; Mon, 01 Jan 2018 20:10:40 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Lghpm-1fJ0G02FAU-00oHkD; Tue, 02 Jan 2018 02:10:38 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 2 Jan 2018 02:10:23 +0100 Message-Id: <20180102011032.30056-9-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180102011032.30056-1-laurent@vivier.eu> References: <20180102011032.30056-1-laurent@vivier.eu> X-Provags-ID: V03:K0:KU0C8IFSXVmmYXXS2FqRY9cFh3iDeaM1SoXNGJUClhLI0cyT/Hq S5l2YivzEq2iPzLeL2ejwpt7HXJHu8PoieyHveDdYjcDQmtB6MzmGD9QmxuQh2iP0vLJK37 VdX6/aR5X391KX0bVKsgh4NMiZAs9ghptzRCuq7V0wBVG4MBTyy+vViN7dSwq3zYs8MFqx4 Eyg+3PZy4aHu+U+EFqrxA== X-UI-Out-Filterresults: notjunk:1;V01:K0:2TdgHXH0lvQ=:suyaGIvI3ioaxXLdeBmKvS kQzT60HI8CgaIhA4/ZKj/3wHJZ52UDwVrJWOUYTi0TX9cvRBTEDQM7KnmqgUVUqAPA6P13gPh 80g8tp66wHyAvJjhsdi5SXgRzjxkFTipqD8eFySWIBxhpBqEG2FeeE66j3Uor/pmr4YdjERtI hTt4SHh3ob41z35MFo34XOCPN4bM/H+ZETvAfCCnht2tpBf6OgMymPiHZsoRbDyMybuI5x5Ps KbxJBqwXLR5hPF7w2Nts0pHj61Hm6uSDIUbC+ACb9nt6Lsw7j9TQHGF1IeKla8bOJ/h5nFFtX 9PObfaiQexbQ6rb8cFSP3XrGVGsknTnpUmDVKMJu4UyZNTYoodyCWfdICL5ONRpDhnDsgSSHR /2Sbo1tSSodTC8mJF9Mj2xDgntkHQK3lS+riW/tISmgDV8m9uDAhywywRTa3xKpbsx02H5Llp 4aZxlQjfMl0bhTAC3PBH3lGbmkwLczTWYNuvaxhXtSsAfKWxzb2MZkkvNWmpK7f/e9Epm7VmI qL9L+skMnN9VIOxTfsJgfD87BXnPLXRbkp2des8A64xW5anuUJztfLz5akXCKXPrFZ/Y0MpN5 GKk3fIa6XPLjR188nu8pFl3mnHGAvGhsd4kSyXg3qyiM0BBd91CpxOvF1qsJSFxZD2h6wGTHT BVp1aph/TJbqsCJfxE9WAhTb35iNg4afF8WGRGXRbDB6vD1dtSNkYxA8dFROAb240cdfZs757 +eNkk9IvBENutZatr2yZIZ7TZsa7AQMViNwxlg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PATCH v5 08/17] target/m68k: add move16 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: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" move16 moves the source line to the destination line. Lines are aligned to 16-byte boundaries and are 16 bytes long. Signed-off-by: Laurent Vivier --- target/m68k/cpu.c | 10 ++++++- target/m68k/cpu.h | 1 + target/m68k/translate.c | 73 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 83 insertions(+), 1 deletion(-) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 57ffcb2114..1936efd170 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -137,7 +137,15 @@ static void m68020_cpu_initfn(Object *obj) m68k_set_feature(env, M68K_FEATURE_CHK2); } #define m68030_cpu_initfn m68020_cpu_initfn -#define m68040_cpu_initfn m68020_cpu_initfn + +static void m68040_cpu_initfn(Object *obj) +{ + M68kCPU *cpu =3D M68K_CPU(obj); + CPUM68KState *env =3D &cpu->env; + + m68020_cpu_initfn(obj); + m68k_set_feature(env, M68K_FEATURE_M68040); +} =20 static void m68060_cpu_initfn(Object *obj) { diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 42c358d1a7..c21e36d1af 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -305,6 +305,7 @@ enum m68k_features { M68K_FEATURE_BKPT, M68K_FEATURE_RTD, M68K_FEATURE_CHK2, + M68K_FEATURE_M68040, /* instructions specific to MC68040 */ }; =20 static inline int m68k_feature(CPUM68KState *env, int feature) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 6ef4c3a53c..9f13299bcf 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4337,6 +4337,78 @@ DISAS_INSN(chk2) gen_set_label(l1); } =20 +static void m68k_copy_line(TCGv dst, TCGv src, int index) +{ + TCGv addr; + TCGv_i64 t0, t1; + + addr =3D tcg_temp_new(); + + t0 =3D tcg_temp_new_i64(); + t1 =3D tcg_temp_new_i64(); + + tcg_gen_andi_i32(addr, src, ~15); + tcg_gen_qemu_ld64(t0, addr, index); + tcg_gen_addi_i32(addr, addr, 8); + tcg_gen_qemu_ld64(t1, addr, index); + + tcg_gen_andi_i32(addr, dst, ~15); + tcg_gen_qemu_st64(t0, addr, index); + tcg_gen_addi_i32(addr, addr, 8); + tcg_gen_qemu_st64(t1, addr, index); + + tcg_temp_free_i64(t0); + tcg_temp_free_i64(t1); + tcg_temp_free(addr); +} + +DISAS_INSN(move16) +{ + int index =3D IS_USER(s); + uint16_t mode; + + mode =3D (insn >> 3) & 7; + + if (mode & 4) { + TCGv tmp; + uint16_t ext; + + ext =3D read_im16(env, s); + if ((ext & (1 << 15)) =3D=3D 0) { + gen_exception(s, s->insn_pc, EXCP_ILLEGAL); + } + + m68k_copy_line(AREG(ext, 12), AREG(insn, 0), index); + + /* Ax can be Ay, so save Ay before incrementing Ax */ + tmp =3D tcg_temp_new(); + tcg_gen_mov_i32(tmp, AREG(ext, 12)); + tcg_gen_addi_i32(AREG(insn, 0), AREG(insn, 0), 16); + tcg_gen_addi_i32(AREG(ext, 12), tmp, 16); + tcg_temp_free(tmp); + } else { + TCGv reg, addr; + + reg =3D AREG(insn, 0); + addr =3D tcg_const_i32(read_im32(env, s)); + + if (mode & 1) { + /* MOVE16 (xxx).L, (Ay) */ + m68k_copy_line(reg, addr, index); + } else { + /* MOVE16 (Ay), (xxx).L */ + m68k_copy_line(addr, reg, index); + } + + tcg_temp_free(addr); + + if ((mode & 2) =3D=3D 0) { + /* (Ay)+ */ + tcg_gen_addi_i32(reg, reg, 16); + } + } +} + static TCGv gen_get_sr(DisasContext *s) { TCGv ccr; @@ -5638,6 +5710,7 @@ void register_m68k_insns (CPUM68KState *env) INSN(fsave, f300, ffc0, FPU); INSN(intouch, f340, ffc0, CF_ISA_A); INSN(cpushl, f428, ff38, CF_ISA_A); + INSN(move16, f600, ffc0, M68040); INSN(wddata, fb00, ff00, CF_ISA_A); INSN(wdebug, fbc0, ffc0, CF_ISA_A); #undef INSN --=20 2.14.3