From patchwork Sat Jan 14 09:07:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 9516845 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 82F8C607D6 for ; Sat, 14 Jan 2017 09:17:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 622E728585 for ; Sat, 14 Jan 2017 09:17:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54178285AE; Sat, 14 Jan 2017 09:17:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 16C3128585 for ; Sat, 14 Jan 2017 09:17:28 +0000 (UTC) Received: from localhost ([::1]:47095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSKSm-0002Sg-2X for patchwork-qemu-devel@patchwork.kernel.org; Sat, 14 Jan 2017 04:17:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSKJp-00033Q-JO for qemu-devel@nongnu.org; Sat, 14 Jan 2017 04:08:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cSKJm-00035t-Co for qemu-devel@nongnu.org; Sat, 14 Jan 2017 04:08:13 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:63559) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cSKJm-00034A-3H for qemu-devel@nongnu.org; Sat, 14 Jan 2017 04:08:10 -0500 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M6gB2-1cgRQ43ThE-00wVbM; Sat, 14 Jan 2017 10:08:09 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 14 Jan 2017 10:07:58 +0100 Message-Id: <1484384878-29179-10-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484384878-29179-1-git-send-email-laurent@vivier.eu> References: <1484384878-29179-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:Lu55Dj/jFAIbt1cbYJC5IERCdkYlhYvU3Nh3tScCR+k+6vnJ7Bu mDJKb3y5MC8Kl319GvRUX5+zqrAmY4N0bGHk18QIlhlBF95XBPW/R4a7HerRW/ZUx0xPost Lr3YE9XvQQt2HtkJBz1LGHo0bFOIE8LjJlWjiI5Gob7IsZt1V1STLZ6VLvPvUsAG5LOaIHe qgVlcBhXKPgSULhPKXmAg== X-UI-Out-Filterresults: notjunk:1; V01:K0:iwbqo1+rHbc=:8LKsDIa1PnaJ8ashXKskyg RcCtuSrZ8YwXq49ezH9nnOXywjva4ELkwBJ0QPD64ATyDw1brl3zX8kr+aJ1xI0WD/hTQYLB0 gzkSAC+iN9BaBsNOBEl2ISv04oUslfKI2m4EiLDiFJrIAfXtqYklh4Zvc5E0v5QiMNq3aOEl2 giOYBbGgM8q4J8JiCS5dq2ir0lAS9rbIdxLm5A3eYQ9QDgePqvWZiF9At/5Z6a1qAFyuZef7+ Z4Ba5FUfJEk5sfaENoO9zIx/8ejYDm0tLaHw4zzu69swUzPlDIsZHYbwSlDeR6DduqBN1xhIh eq/zxXUcb3FQXzvcor5tVFeVmjTezT0bzQHvluHhSvHWzw2Z7bp1U9icEwXhHciaXPFsE6YTH rJQef6finTHCG4ymfFk5WOq1RzrWCn4DjFQ3Y+UFGn/YpDvKTtLzqE7cpyDyxwgqpKXjex06w OHCTVmp3swycY9eLzAhco+o5dIHaH0g3ALiWQlTq0WGRqkJkjFK/6snUZr/8Gy/v89bRgEKLX MFAsM61yYb4lJIgpPpGh58AUaN4RFZ2y3EiXIIv2dHYFbv19Bdx+z2cI073Vtoz5Hx2A4jEfC 5PMrYbQeJOmNCe/3+gOyDxSUOaoTKynvuCX4cr6NwnTEcSVcbEaBPzp9mC69UuM0oHpvnnHN1 vUuzVes05jTq1NtmRsxy+SB+6woF8RNaD1aBXnFrFYHeB95EYYkxF85mnpP2SEjMMNtg= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PULL v2 9/9] 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: Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Message-Id: <1484332593-16782-6-git-send-email-laurent@vivier.eu> --- 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;