From patchwork Mon Jun 5 16:52:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9766963 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 5183C60353 for ; Mon, 5 Jun 2017 17:06:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BFAA251F4 for ; Mon, 5 Jun 2017 17:06:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30C2027F10; Mon, 5 Jun 2017 17:06:13 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 574DF27F8F for ; Mon, 5 Jun 2017 17:06:11 +0000 (UTC) Received: from localhost ([::1]:34408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHvSE-0000TE-DS for patchwork-qemu-devel@patchwork.kernel.org; Mon, 05 Jun 2017 13:06:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHvFQ-0004V9-CE for qemu-devel@nongnu.org; Mon, 05 Jun 2017 12:52:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHvFO-0003oQ-T0 for qemu-devel@nongnu.org; Mon, 05 Jun 2017 12:52:56 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:36145) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHvFO-0003oL-N8 for qemu-devel@nongnu.org; Mon, 05 Jun 2017 12:52:54 -0400 Received: by mail-qt0-x244.google.com with SMTP id s33so9907132qtg.3 for ; Mon, 05 Jun 2017 09:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=MuWmv/lxrHLMyfOux0hUkLhdKTgFjvlmSLigNGRqFmQ=; b=Lt16TSUPLTnhbWLhVCEoUMgT1K7JK/jiLL/NMEtl4ntBLnCY0DHuAmmkezbhrMkTaM 08y6JMUfM16bOkq/4+q69MxJX7UcN3MuN7Pf+oT0B3vVLbhV4hJWGAA5q65Aq0F4qGsk 7/GJWVyBVzhEd9rxbTU2zMYGTCP29ZxwFDDiggfJLWq4P/VgeEmkOzPY4Xrhl2S6fiiH 4C/M0DlNdkjHSs8Fsi8CFBwi4JE8Jk3NHYmdy9sSXT/I5/zwCJkgDE7hQ4CKXs8nhLti XxqJRbnN5Mflu5PXmBmGfLQzNFVHc9CsoXfgJM1+X78wqM6w/8zuUp+bMqtTLYE001/n 10bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=MuWmv/lxrHLMyfOux0hUkLhdKTgFjvlmSLigNGRqFmQ=; b=aSkKJhVaPAi0FhR0yqARsl2Q+gT5VW82IbblirMHG0650qc4niVQDmvP4qCilFkzSm 4GpXnpWriyc5hCujn1toyKEzt+AyETeBaPoeKqinPeNX1c1QSvsTdU9EsLAC5eF4V6ys c6CpG+etOTOsFy7igPCKtbwn3EtQEsjyBKQsYJcPg3+IHsrxvfRSvUl5yb1JikPmpSvX yxUxK0HnFGzlvhVSwDaNM1jHAC6R4ZITOcg22KXhSxxYVBTp4LYih9DDj2dwLqqmVAjs xXgUbsP1uPvzlqJfY2l0yOlwiaNVocoyuLtfY7cTmK2xj/pDdoqCDmsKbjM/xcq9QIhH Hc/g== X-Gm-Message-State: AODbwcDWLonP30+aOfBrvg/w9XCdU7Et7rCHXO0L+AXleMeVgQ8w3eZx AfvQNIQ3eJLgNO8qj1Q= X-Received: by 10.200.40.87 with SMTP id 23mr26920740qtr.37.1496681573952; Mon, 05 Jun 2017 09:52:53 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id c6sm1637044qtb.56.2017.06.05.09.52.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Jun 2017 09:52:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 5 Jun 2017 09:52:19 -0700 Message-Id: <20170605165233.4135-13-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170605165233.4135-1-rth@twiddle.net> References: <20170605165233.4135-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PULL 12/26] tcg/ppc: Implement goto_ptr 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.h | 2 +- tcg/ppc/tcg-target.inc.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h index a9aa974..5f4a40a 100644 --- a/tcg/ppc/tcg-target.h +++ b/tcg/ppc/tcg-target.h @@ -82,7 +82,7 @@ extern bool have_isa_3_00; #define TCG_TARGET_HAS_muls2_i32 0 #define TCG_TARGET_HAS_muluh_i32 1 #define TCG_TARGET_HAS_mulsh_i32 1 -#define TCG_TARGET_HAS_goto_ptr 0 +#define TCG_TARGET_HAS_goto_ptr 1 #if TCG_TARGET_REG_BITS == 64 #define TCG_TARGET_HAS_add2_i32 0 diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c index 64f67d2..8d50f18 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc.c @@ -1932,6 +1932,7 @@ static void tcg_target_qemu_prologue(TCGContext *s) /* Epilogue */ tcg_debug_assert(tb_ret_addr == s->code_ptr); + s->code_gen_epilogue = tb_ret_addr; tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_R0, TCG_REG_R1, FRAME_SIZE+LR_OFFSET); for (i = 0; i < ARRAY_SIZE(tcg_target_callee_save_regs); ++i) { @@ -1986,6 +1987,11 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, #endif s->tb_jmp_reset_offset[args[0]] = tcg_current_code_size(s); break; + case INDEX_op_goto_ptr: + tcg_out32(s, MTSPR | RS(args[0]) | CTR); + tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R3, 0); + tcg_out32(s, BCCTR | BO_ALWAYS); + break; case INDEX_op_br: { TCGLabel *l = arg_label(args[0]); @@ -2555,6 +2561,7 @@ static const TCGTargetOpDef ppc_op_defs[] = { { INDEX_op_exit_tb, { } }, { INDEX_op_goto_tb, { } }, { INDEX_op_br, { } }, + { INDEX_op_goto_ptr, { "r" } }, { INDEX_op_ld8u_i32, { "r", "r" } }, { INDEX_op_ld8s_i32, { "r", "r" } },