From patchwork Mon Jun 5 10:00:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 771179 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 3wh9Lk4hGcz9s76 for ; Mon, 5 Jun 2017 20:01:02 +1000 (AEST) Received: from localhost ([::1]:60560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHoom-0007S1-Fz for incoming@patchwork.ozlabs.org; Mon, 05 Jun 2017 06:01:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHooS-0007Rk-V2 for qemu-devel@nongnu.org; Mon, 05 Jun 2017 06:00:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHooP-0005tl-TA for qemu-devel@nongnu.org; Mon, 05 Jun 2017 06:00:41 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:60222) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHooP-0005rI-Ed for qemu-devel@nongnu.org; Mon, 05 Jun 2017 06:00:37 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LmPUU-1drhWf1MPa-00Zzdp; Mon, 05 Jun 2017 12:00:31 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 5 Jun 2017 12:00:14 +0200 Message-Id: <20170605100014.22981-1-laurent@vivier.eu> X-Mailer: git-send-email 2.9.4 X-Provags-ID: V03:K0:QP10EEkNLP2fprtGPKlNA2YwrIOoCV2suprMgGROgKFbycA3cla uW5q9w4Da1frM2Uzk2ce6k6FR4b4mThrsqaINTgMjdScNvY0t+j8i9JcagAFn/50EGWt8+d kLH66IthYk/bP6mR6WxqB4StotqIm4O/GIk0JNSTaKDiCdt2wJY2GDiHgzSmB1k6+sgHbcx xOtsQFH9ICe+TXR4UC94Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:IBdVFshOKug=:hmN8Cu51b68l0tfcYSMuu8 0zCFz2JgdNMpSV16g9hk82u8VviEV4NdY4La16qk7iDeF01G7I6qzrWiEJqAYGqpP2Lqhi1DF JdQqkQUw5oPWeL9hTQE6vRJehRU0yKdlIOMOhhlo3XHDvwClRSQ8I0+aay6IjnJvwPPB75Hal cuO0yomIyJZgknFtkhz1NBGqilZlk4Lak/8RMVZBrGuCKRS3/PT0Pd9pbz2vOWueRo0XfXaKT olQzHqLiMLy1Jk+r2UCevpARMzMrIfnDgDSlab/2EBzwMtLg6nUJrSHRfJSScn9rUpSuYVBz0 jbSceBkOHKw1xSfq8gtsBxNOzbFyctCgvdgmLM65KwwxrVeAMR8PM8fWPaVcJ06i/ahMC01DO j/aEIjFpn5ytcMFguN/imbDRNZkxMwDnwa2oCc2KFYJxdyBNSgNE65JiOcQtkrHLgjFn5E91U DkNQ0ozBMzvYJs5LZYcXGXwqKT9LHPa1Cz57D3omvgYuHNDU43V1B99B0MSBBc9sk9b5jvDlx IfV6zMWJP+jVYMSXs3gwj983WFnx/ZUZH/QpAaxQXDHcmNC3NfzAB7AMrlPGm/iHFhm7FAoMD 3dNlToUb6SUmbhncrD6GW3CAmbTkV+vhosSXCzCDBOVH44mtZSSJ6cR2GGsGetA0B+WAsMPV+ HrshR0nAbJlMinoEPTia/PVvx5veK4tKpwxGPKLS0MBcDswbImC4x2EMqxmp6kN1GF3Y= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH] 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 , Richard Henderson 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 --- 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);