From nobody Tue Feb 10 18:54:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1615497210; cv=none; d=zohomail.com; s=zohoarc; b=ZKvBd03v7zh7+nArBclvQ4SUJuZsS9eIFq0IES/dXJGY9Mky8PFK4vS6br9yZ2u/VbKv01BaqwYflN5eyNQSnW4DGQuBCioc78RXgNoXqLpWL4AmgxApVt7NF2VGypKKMtmjAz5Ck32JIPVq2JnEXV/gHqbYtyjjN85e8jDmeyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615497210; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vkltsa6ZSjbcstfoblKkNPNsJl33zFe7s81r6Z0MiW8=; b=IAsEumE65CjebFWdYDFGRhRPhRXAZjtYu4Laz6QDkb5N2nVhxNVMWY0T6nN58KEVeWiO+nXws7y8xEXeW0kvwHbL/5tnGuqn6zsaABy3XVJ1s4STXcypLqs6mChegHq1B8gFvnjzj5wk+ObtQu3oiLWInczI3MH7VRFAa8I7wD4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615497210194739.4038470496275; Thu, 11 Mar 2021 13:13:30 -0800 (PST) Received: from localhost ([::1]:42040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKSca-0002FL-WF for importer@patchew.org; Thu, 11 Mar 2021 16:13:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKSYy-0006bb-49 for qemu-devel@nongnu.org; Thu, 11 Mar 2021 16:09:44 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:51903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKSYv-0004xX-Nn for qemu-devel@nongnu.org; Thu, 11 Mar 2021 16:09:43 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1McY0J-1lshO3336b-00czBV; Thu, 11 Mar 2021 22:09:38 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/9] target/m68k: implement rtr instruction Date: Thu, 11 Mar 2021 22:09:26 +0100 Message-Id: <20210311210934.1935587-2-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210311210934.1935587-1-laurent@vivier.eu> References: <20210311210934.1935587-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:dLwuW91EHnI+SPKPMwSFv2b8hryoWJFSd8qaDOclf4lQA/cuaoB 6nCCiJ9Us5/RBKUofkLJbgfXkQaWACwokZ17H9fzBjMYDxjPIpyaRWZ7VsiB2BmKaRWnhnD bN7+0YyAsjR38+XTZBuKj9yQGBICltw8s9f9DHmauZ3iaE8dBJ6JL74LjIM3HkwYTrOYT1a iwtTWh+rugvyUBKvZsgdg== X-UI-Out-Filterresults: notjunk:1;V03:K0:r2kmfd/yGKE=:DE2Mz97Q3gMwKe0+MbgLh+ /gQO2EPP8wDwi+5QpAZu5172N+M5DPx7OSGGNTq6WxqZIkm+U/4pNHbFeNCgBv9gYXB0tX2kG 5I2cF/43PXTNCssAC0k54wYKChAXdn5T9ouOqKOtKqHaM96ApBFx1pggRRHOCOaI1/T0UZzKa sSaGdGGRzI8RpdkqZ5g0wH1QCVvNKQPXMlCOewDvu5uvYuCQyOTgQFNfzpSJWoGrQkPhBtryU Vb1TqaGOexc2OZnXxW8n4/7YeoDp3b+fkjMozTMS03i29fZTP25YiIaL7vFeL4LAcuIRGd1qw ogz47orK/SMfrs/5DD38ddhcPHkWNJrLHE0sgREdkG2ELBcBHkM+B1NICxNqB2YdCGF7JxnuL XGTgsr/HHnQZROCE1a4aXj4EXFarMZgCClu2GC6LiG6r5l4R+3rUSfZI9D2aECF8rNszwqS5f p496MaYqCw== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=212.227.17.10; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Mark Cave-Ayland , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This is needed to boot MacOS ROM. Pull the condition code and the program counter from the stack. Operation: (SP) -> CCR SP + 2 -> SP (SP) -> PC SP + 4 -> SP This operation is not privileged. Reported-by: Mark Cave-Ayland Tested-by: Mark Cave-Ayland Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Message-Id: <20210307212552.523552-1-laurent@vivier.eu> --- target/m68k/translate.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index ac936ebe8f14..200018ae6a63 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -2969,6 +2969,25 @@ DISAS_INSN(rtd) gen_jmp(s, tmp); } =20 +DISAS_INSN(rtr) +{ + TCGv tmp; + TCGv ccr; + TCGv sp; + + sp =3D tcg_temp_new(); + ccr =3D gen_load(s, OS_WORD, QREG_SP, 0, IS_USER(s)); + tcg_gen_addi_i32(sp, QREG_SP, 2); + tmp =3D gen_load(s, OS_LONG, sp, 0, IS_USER(s)); + tcg_gen_addi_i32(QREG_SP, sp, 4); + tcg_temp_free(sp); + + gen_set_sr(s, ccr, true); + tcg_temp_free(ccr); + + gen_jmp(s, tmp); +} + DISAS_INSN(rts) { TCGv tmp; @@ -6015,6 +6034,7 @@ void register_m68k_insns (CPUM68KState *env) BASE(nop, 4e71, ffff); INSN(rtd, 4e74, ffff, RTD); BASE(rts, 4e75, ffff); + INSN(rtr, 4e77, ffff, M68000); BASE(jump, 4e80, ffc0); BASE(jump, 4ec0, ffc0); INSN(addsubq, 5000, f080, M68000); --=20 2.29.2