From patchwork Wed Jun 7 09:30:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 772300 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 3wjNbc4ckMz9sNS for ; Wed, 7 Jun 2017 19:31:24 +1000 (AEST) Received: from localhost ([::1]:42252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIXJC-0002pq-97 for incoming@patchwork.ozlabs.org; Wed, 07 Jun 2017 05:31:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIXIT-0002oD-CQ for qemu-devel@nongnu.org; Wed, 07 Jun 2017 05:30:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIXIO-0003PC-Cv for qemu-devel@nongnu.org; Wed, 07 Jun 2017 05:30:37 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:52140) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIXIO-0003OY-20 for qemu-devel@nongnu.org; Wed, 07 Jun 2017 05:30:32 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M1od8-1eAmZr2D6o-00toYK; Wed, 07 Jun 2017 11:30:29 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 7 Jun 2017 11:30:27 +0200 Message-Id: <20170607093027.14086-2-laurent@vivier.eu> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170607093027.14086-1-laurent@vivier.eu> References: <20170607093027.14086-1-laurent@vivier.eu> X-Provags-ID: V03:K0:7Nbhf9rAGmA1rLYWj0meQzNQwuhTP12DY+reyLV10kXnaFyVPde xXfy02FGCSlSF1BzoCXMWhB5HluvyLOd21HSKJ0IlJw4wICXpqOAU12gIHjdFiYchIJzMIw n5Su68LUwWr42OnOmXHv/6nfoLMwgQAlr1CA26ua9DoNPDzZwd0PbOl6SbopIqxfzyAxyXV rbMO5qu41dEUyJlVmpdyg== X-UI-Out-Filterresults: notjunk:1; V01:K0:2nIvVfV9NUI=:Wtj0tG/a0JwHu/Y/+mOMii S0uR+J0EJ44HuD5AkO54jCjbyrPejpiNghd22vxqIMuzNGqISggyQ7PS0qNnteTAWe3r3R96E dt5XihkWJnmN4nniX2hrHLHut6YB7j0tnN7iHSeRW1O93B/2hrLHqAbOnlqg2RTuXSt/eLa66 5CSi8Qs49LB6x9wvSfw59vFwQRBr87uYJTx8mPXdPn77Ei+0SXyK7b3We4xL1b9pU2FUjxZb7 l9XdKAOIS9mRJMb0ZUDDOozADzYqDZxJY7XFNM4npmJeI8Kvc+i/DSbGC27qP+UIwl9S5E9X5 KoCbWTVpPFQ8s33HhKaD/yyJHhpuajZyNRzkTQItxowxSRzYzmZ/r5qR79yNlSirInWUrfuvd Or4Q8Z6+oo7yXOslpDL1KNSNuKC76Zw+VEu20ztFU8oXdvFA0cBxhmWGrfm83Qn7TVEbHwXLD HYO4a8EQ6HlkLacLiYNmjqqfTwYI++7bNl4FH1ZlbtaqnxrCEORtR4Qx/fhCyfE+7sEE78LmP FZZKLP0V3a2YT0w3sugAE+Qi64QdsJytQnJ7irBWE4TYrMNXQNPIbt+MI3kMS1ZgbEkQEEQal QNhKxwUMhNeaSg6D6NhTedG3/eQxdnEUhmyek2WmL14Epc/jIMf4qUc8oG6+V2iCuDxeGr+62 uSdXJYA6+rTTtiIBx+PuMOh9jVaAjE+z3u2gyTt+hB5HSU74MUjHIc6dH+MdMTd2lsfU= 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 1/1] target/m68k: implement rtd 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add "Return and Deallocate" (rtd) instruction. RTD #d (SP) -> PC SP + 4 + d -> SP Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Tested-By: John Paul Adrian Glaubitz Message-Id: <20170605100014.22981-1-laurent@vivier.eu> --- target/m68k/cpu.c | 2 ++ target/m68k/cpu.h | 1 + target/m68k/translate.c | 11 +++++++++++ 3 files changed, 14 insertions(+) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index fa10b6e..f068922 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -130,6 +130,7 @@ static void m68020_cpu_initfn(Object *obj) m68k_set_feature(env, M68K_FEATURE_FPU); m68k_set_feature(env, M68K_FEATURE_CAS); m68k_set_feature(env, M68K_FEATURE_BKPT); + m68k_set_feature(env, M68K_FEATURE_RTD); } #define m68030_cpu_initfn m68020_cpu_initfn #define m68040_cpu_initfn m68020_cpu_initfn @@ -151,6 +152,7 @@ static void m68060_cpu_initfn(Object *obj) m68k_set_feature(env, M68K_FEATURE_FPU); m68k_set_feature(env, M68K_FEATURE_CAS); m68k_set_feature(env, M68K_FEATURE_BKPT); + m68k_set_feature(env, M68K_FEATURE_RTD); } static void m5208_cpu_initfn(Object *obj) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 8095822..384ec5d 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -251,6 +251,7 @@ enum m68k_features { M68K_FEATURE_FPU, M68K_FEATURE_CAS, M68K_FEATURE_BKPT, + M68K_FEATURE_RTD, }; static inline int m68k_feature(CPUM68KState *env, int feature) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 9f60fbc..ad4d4ef 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -2483,6 +2483,16 @@ DISAS_INSN(nop) { } +DISAS_INSN(rtd) +{ + TCGv tmp; + int16_t offset = read_im16(env, s); + + tmp = gen_load(s, OS_LONG, QREG_SP, 0); + tcg_gen_addi_i32(QREG_SP, QREG_SP, offset + 4); + gen_jmp(s, tmp); +} + DISAS_INSN(rts) { TCGv tmp; @@ -4904,6 +4914,7 @@ void register_m68k_insns (CPUM68KState *env) BASE(nop, 4e71, ffff); BASE(stop, 4e72, ffff); BASE(rte, 4e73, ffff); + INSN(rtd, 4e74, ffff, RTD); BASE(rts, 4e75, ffff); INSN(movec, 4e7b, ffff, CF_ISA_A); BASE(jump, 4e80, ffc0);