From nobody Tue Oct 28 12:15:21 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514936761091736.22854004313; Tue, 2 Jan 2018 15:46:01 -0800 (PST) Received: from localhost ([::1]:59615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWFq-0002RF-3d for importer@patchew.org; Tue, 02 Jan 2018 18:45:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWWBO-00074V-RA for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWWBN-00038B-TS for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:22 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:53129) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWWBN-00037Z-It for qemu-devel@nongnu.org; Tue, 02 Jan 2018 18:41:21 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LtS7s-1ew3r90LdU-010wKH; Wed, 03 Jan 2018 00:41:19 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 3 Jan 2018 00:40:59 +0100 Message-Id: <20180102234108.32713-9-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180102234108.32713-1-laurent@vivier.eu> References: <20180102234108.32713-1-laurent@vivier.eu> X-Provags-ID: V03:K0:zuKwPvlEBHfagrZW8JphfEMMeb1wukY9vtzXQIXTy9IkZ0fDh4y SOqR42vfx1VvtrGY24adcjNDZkdlTDhNhs17iEAA6/Ir6rtRNQW4jWyqASyzfJAwVQQ/9Ap rO2RATNclMVjNoS8RB5n8ULHKYEieS3Ey9f+4Kg/xGbTxyie8Le1p3YFnkF5bhZs2E1VfyS eXV1Pyg89PvukLMNmELBA== X-UI-Out-Filterresults: notjunk:1;V01:K0:jDN3z3nuLYs=:0oDj4qxm0Ipy/mABbyahao hOQOMtkh0/JzrMmh7HxQvu1wDrwFrK10yHBetRJX1L3DQ0KZO3cx69RAX1G0q4KqTdjAo788B tZp1KBolaBWHphIgG43g59kYRU/kVmkii5F19HqDsKJOlZQxiTtOCRgWmTQsBC1yFmU6zB+AO E9a9MetevOONTdF3oEOV33VvFIkN/0d4Zjn9cFRvIHZZsC0QDtEBuDKc1jiW5dDINCyruXxhz BpKs6SMeO1MLrYtBOD39QLFZ0+qzh3Gq2HB0m+KO4AHQpVDoOgyYlGHmYB/k0il7xEVhgmBF9 RZ13+G27uC6ZnJQfnY2+NT+GDEjhrZkx1DKZ2ZOSYN8oMhqkOEzacrsLosyZitfugBiXHfmv8 robSx7lBNTVcQm4w7ik1iZ6af/zVpDSHlPk+ucNTuWHUAffTrjbrDfGbPejg8ToV7Toqq/j/c oU/i87SP+PEQknZTTvl9eA5JfukebVj4r2fMBlHNcGJTmFyb2VRf2V9WRXxUAyxO+Q/h8hxPz fkIhMVh6Hk/Q8YzD5AT23A5DrpzHmBAzWVKwDoU970aJv+GPCU68u7U3cBL7GIVlbrp48rdBH tVtyUQIGQ5e4M4IPT7HMLYxmbdziNRZ8DEAFQwYnts5FDDMoUkkze85HiW98aegZSKgrAfy3x RItSf/LQLVcNHydyWA5Zzm0KnAHwlhw1jMeVWiLo+CCy8G1H+pzE/eJBr6Ohl+Na/6FewutCY sJbEDr9iyalRw9aV05X4/OKX/U6olYKMKzRyPw== 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 v6 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 , Richard Henderson , 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 Reviewed-by: Richard Henderson --- Notes: v6: split move16 in two functions target/m68k/cpu.c | 10 ++++++- target/m68k/cpu.h | 1 + target/m68k/translate.c | 72 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 82 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 68396bdd70..2ac4ab191e 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -306,6 +306,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 62e955abc7..662a518f16 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -4278,6 +4278,76 @@ DISAS_INSN(chk2) s->cc_op_synced =3D 1; } =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_reg) +{ + int index =3D IS_USER(s); + 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); +} + +DISAS_INSN(move16_mem) +{ + int index =3D IS_USER(s); + TCGv reg, addr; + + reg =3D AREG(insn, 0); + addr =3D tcg_const_i32(read_im32(env, s)); + + if ((insn >> 3) & 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 (((insn >> 3) & 2) =3D=3D 0) { + /* (Ay)+ */ + tcg_gen_addi_i32(reg, reg, 16); + } +} + static TCGv gen_get_sr(DisasContext *s) { TCGv ccr; @@ -5579,6 +5649,8 @@ 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_mem, f600, ffe0, M68040); + INSN(move16_reg, f620, fff8, M68040); INSN(wddata, fb00, ff00, CF_ISA_A); INSN(wdebug, fbc0, ffc0, CF_ISA_A); #undef INSN --=20 2.14.3