From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zp1Ad-0000fV-MN for qemu-devel@nongnu.org; Wed, 21 Oct 2015 17:43:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zp1Ac-0001Nl-OJ for qemu-devel@nongnu.org; Wed, 21 Oct 2015 17:43:43 -0400 Received: from mail-qg0-x22b.google.com ([2607:f8b0:400d:c04::22b]:36800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zp1Ac-0001Nh-Kg for qemu-devel@nongnu.org; Wed, 21 Oct 2015 17:43:42 -0400 Received: by qgad10 with SMTP id d10so40178363qga.3 for ; Wed, 21 Oct 2015 14:43:42 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Wed, 21 Oct 2015 11:42:50 -1000 Message-Id: <1445463779-5823-2-git-send-email-rth@twiddle.net> In-Reply-To: <1445463779-5823-1-git-send-email-rth@twiddle.net> References: <1445463779-5823-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 01/10] tcg/ppc: Adjust exit_tb for change in prologue placement List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Changing the prologue to the beginning of the code_gen_buffer changes the direction of the "return" branch. Need to change the logic to match. Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c index 92ef719..fd7a3e0 100644 --- a/tcg/ppc/tcg-target.c +++ b/tcg/ppc/tcg-target.c @@ -1855,12 +1855,10 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, if (USE_REG_RA) { ptrdiff_t disp = tcg_pcrel_diff(s, tb_ret_addr); - /* If we can use a direct branch, otherwise use the value in RA. - Note that the direct branch is always forward. If it's in - range now, it'll still be in range after the movi. Don't - bother about the 20 bytes where the test here fails but it - would succeed below. */ - if (!in_range_b(disp)) { + /* Use a direct branch if we can, otherwise use the value in RA. + Note that the direct branch is always backward, thus we need + to account for the possibility of 5 insns from the movi. */ + if (!in_range_b(disp - 20)) { tcg_out32(s, MTSPR | RS(TCG_REG_RA) | CTR); tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R3, args[0]); tcg_out32(s, BCCTR | BO_ALWAYS); -- 2.4.3