From patchwork Fri Jan 13 12:52:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 715031 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 3v0N2w3B60z9t0w for ; Fri, 13 Jan 2017 23:58:00 +1100 (AEDT) Received: from localhost ([::1]:40714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS1Qc-0002iL-3f for incoming@patchwork.ozlabs.org; Fri, 13 Jan 2017 07:57:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS1LF-00063n-Il for qemu-devel@nongnu.org; Fri, 13 Jan 2017 07:52:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cS1LC-0002Pd-FR for qemu-devel@nongnu.org; Fri, 13 Jan 2017 07:52:25 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:51908) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cS1LC-0002PA-5C for qemu-devel@nongnu.org; Fri, 13 Jan 2017 07:52:22 -0500 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MeShL-1c5gQO1s2J-00QCiZ; Fri, 13 Jan 2017 13:52:11 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 13 Jan 2017 13:52:03 +0100 Message-Id: <1484311923-28637-6-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484311923-28637-1-git-send-email-laurent@vivier.eu> References: <1484311923-28637-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:XYvMSLSmnwhwNpAK623IkYcYDN8nQx4jfISs8OQk2vtemQ1wySZ LbIp7AraEHZBIpoWlxDXSCS5jiXx+XmzVpJpDCooJaYnTOxZQLeSXLXF0+8kA8QO4tTQs1Z SYkzSr5uSfROtMYLMOBNzYRwlMpBwUIqGAyVALFqa1dT4dk+XC2rvF9hXS7Odu5XWj7Qw/m 5LjiC/68MkwYgE4RZbPqA== X-UI-Out-Filterresults: notjunk:1; V01:K0:nGpshHrKKvY=:ot+Kpo6G71AdfDOBx17LJo 0jN9ZWS91jJmIvlI3Gqj1U9N4TQO4jX/x8zdZ7WyAXC/8KqoqW4nfM8s9Zfi0BIIRBb/m/5pL fEP4HcxFj/dm/tbnwkWx3AsfcVyglh9+Xc2drn/IPd+nPvYR+5HNRA9BmkAtlOPE2AYdT4odo clu7Q2/EewDkuFPloBDYgr/8MJKfs/Y87I+hZkL5opv3PtGI0ipKlM0Df2ayXMr0XdBIFHpqC Sp4uxN1khy6ikBEQ2ZAaHoJC465MQUuoASP+sPvgfX8NmSwISlGQ+2u5cq2CJOX8RwZMZ9Lni RB5QQQ3vXNMgU7I2AVxxEAmHXgRlcZrEDnWtfwCXEbHTLvZuxPIqA/IbuQ2bbWjHemh4Mm22R M1MAv0prUKG5iIG+IxXxGrzPCUZLHgfJ14YA7HFOW304VbfiGeX6M7m9FMIUL9a+32J5iIbW8 0yPZnBpi44nZ/w4RN35JnhiOb08inozxQATqfqwgFw6yB2f4ORsrIT9gWkTbgpaiZx6mRxV3Q 6gOs59YGsixzCwj62OiVzWqgr1aHm5OBddGm1BcMsdjsy5cWtxy3EMd/0IETwA399wG1inAZ/ DRmHeOBNsPDBoLq7q2wHTWUGv9+3CYMfwzPQwgP+c+nkPXD6qZcu30R/O+/D9BWISd/lKR0pX czgu4eMVgPZtEF1nxpr1fNb+4N5QMtayR1/gFZJN3KYeZDnt1071Sqp4d9vvEyRS5KPg= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PATCH v2 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 --- 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..727c189 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_subi_i32(tmp, reg, 2); + } else { + tcg_gen_addi_i32(tmp, reg, opsize_bytes(opsize)); + } delay_set_areg(s, reg0, tmp, true); } return result;