From patchwork Fri Jan 13 18:36:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 715201 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 3v0WcZ2Cnyz9vDw for ; Sat, 14 Jan 2017 05:39:10 +1100 (AEDT) Received: from localhost ([::1]:44678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS6kl-0002Ab-TH for incoming@patchwork.ozlabs.org; Fri, 13 Jan 2017 13:39:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS6id-00005l-3z for qemu-devel@nongnu.org; Fri, 13 Jan 2017 13:36:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cS6iZ-0008HL-2m for qemu-devel@nongnu.org; Fri, 13 Jan 2017 13:36:55 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:54595) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cS6iY-0008Gk-OP for qemu-devel@nongnu.org; Fri, 13 Jan 2017 13:36:51 -0500 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M09s4-1cinga02BQ-00uKWe; Fri, 13 Jan 2017 19:36:40 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 13 Jan 2017 19:36:33 +0100 Message-Id: <1484332593-16782-6-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484332593-16782-1-git-send-email-laurent@vivier.eu> References: <1484332593-16782-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:KiJVGNozRWS4MmNoytwZkuo9uquF4a1UJmcygH3TPSQk5S4XLFJ 1j/GOGgBtOpUzQ2Oq2+4Be/ddfL/CoDp28XL3gF0aWr7aXLdUE6CqLO1JrIRivA+zXnrsc2 EuXMT7z6zKewdFXoE9MlKCa+/EramfF5OEmvNyAla9XqSxuq4iuNnrXG/2TMJiu76VaSy3+ u7DD+6y0hRXVu4IN5F9SQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:DbQgupGwPAI=:vGBL0QSalrEqzvkpRSOcEF jCF8fQZ/dV0m+D7/eSare2BYI3k+XGzIUcRBxUNA643e0o/yuysOe4Ht7CRSx89P1MtfrDhdi xmanE+Qv+Vz5vyAE7BmL18US8fU6qzGDoJpiYhUGSLl9BRFudtD8m4lk5pmW/nCi3a14/PG+A nHt4AOvo72to4w+ywOPqMLW5V9NCDB14d+lodmFSdNzHFqrJ/bV84QuC+hjKnINZBqrHu+XY4 uKdKKTDkvXLDZvkTCxOVh2xePGcjgUBjoBEGW8rvk3QF2Xko+D+dZWtydtcU1ua/IZZQTuDhq Uv0RXlSNSm5jMQ31MTxsVSqujERJ/YxKlTs8nOQiKNcRnVlWVc/D9YOv4OrDmxo8L9CowIMla gbumuiLl5yiO0VVjd+nA6KHTxF4E2lt/4skZDXmZ4Qx2h0MKE8Q8k0hmI3ZVUFDy1sw3wCinz nWGrqc8AmTfwES+OLHRPlZBuWekGGqr+f/IKgaKbZg6l9wKiso5YFzum+TgA/c9QqwXmJ8Q9p Num9dScJj2bwre0SA72lLSg+SIPXcJlHbp1GuDvztgMojcMeSboYZ1QCMAtMumM1KnG6gj7XP kkbs9jPmxkI20X+lF/5dU51AASGW9UGoTprh849MW/5VD09dqV79/+DEscEMmLgFn4dhTq0YV s70mrd5bbQmZaAA/gGY5nUeh/Wi5yKPb9NH0xklfnVArWEMn6Widn4bYVFezRJyMIZK4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PATCH v3 5/5] target-m68k: increment/decrement with SP 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 , rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" On 680x0 family only. Address Register indirect With postincrement: When using the stack pointer (A7) with byte size data, the register is incremented by two. Address Register indirect With predecrement: When using the stack pointer (A7) with byte size data, the register is decremented by two. Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- target/m68k/translate.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index cf5d8dd..9f60fbc 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -725,7 +725,12 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s, } reg = get_areg(s, reg0); tmp = tcg_temp_new(); - tcg_gen_subi_i32(tmp, reg, opsize_bytes(opsize)); + if (reg0 == 7 && opsize == OS_BYTE && + m68k_feature(s->env, M68K_FEATURE_M68000)) { + tcg_gen_subi_i32(tmp, reg, 2); + } else { + tcg_gen_subi_i32(tmp, reg, opsize_bytes(opsize)); + } return tmp; case 5: /* Indirect displacement. */ reg = get_areg(s, reg0); @@ -801,7 +806,12 @@ static TCGv gen_ea_mode(CPUM68KState *env, DisasContext *s, int mode, int reg0, result = gen_ldst(s, opsize, reg, val, what); if (what == EA_STORE || !addrp) { TCGv tmp = tcg_temp_new(); - tcg_gen_addi_i32(tmp, reg, opsize_bytes(opsize)); + if (reg0 == 7 && opsize == OS_BYTE && + m68k_feature(s->env, M68K_FEATURE_M68000)) { + tcg_gen_addi_i32(tmp, reg, 2); + } else { + tcg_gen_addi_i32(tmp, reg, opsize_bytes(opsize)); + } delay_set_areg(s, reg0, tmp, true); } return result;