From patchwork Tue Apr 29 16:52:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 343940 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 646A71400DE for ; Wed, 30 Apr 2014 02:57:08 +1000 (EST) Received: from localhost ([::1]:51327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfBL8-0000Tg-5c for incoming@patchwork.ozlabs.org; Tue, 29 Apr 2014 12:57:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfBHB-0000X4-Vf for qemu-devel@nongnu.org; Tue, 29 Apr 2014 12:53:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WfBH4-0001fA-Te for qemu-devel@nongnu.org; Tue, 29 Apr 2014 12:53:01 -0400 Received: from mail-qa0-x235.google.com ([2607:f8b0:400d:c00::235]:49264) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfBH4-0001ew-Oz for qemu-devel@nongnu.org; Tue, 29 Apr 2014 12:52:54 -0400 Received: by mail-qa0-f53.google.com with SMTP id i13so456531qae.40 for ; Tue, 29 Apr 2014 09:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=zqxvmdHRvNCxBtq3wV7CmtIe2+vWjvxFqEKfYll/JWw=; b=YjkYtiCCl4BNH5HFDuwjc4GZxgke/fVx361QDSjAEbroU+JqMCPg+lU3nohnxPV6+1 LUlRRT8X8DEQgL0z5TTzSi1lqa9TPUW+5ePG0bD9sPvFMYVm9NsQLNfcuCHyiIEqLV84 AjOT2raGBB0uiKoVnAP/MPtVgHxD+tgMTY8UKJR9fuDHIqRZU9HMFkgDRnoWAeZPvWNv Q4eGNNUFnNmCpobzXjNxcblYb5fLK8fyb7IvRIHzdsluBsWjgKV58hkv+yG+9UQKInt7 sSZ3BQBm3SqjHhQH/+6/qnVMvPzFttMhVF1/2PYlnKJM7P8b1LgVia4uwMgq9aJ+uQVf 9Egw== X-Received: by 10.224.160.142 with SMTP id n14mr44325419qax.17.1398790373999; Tue, 29 Apr 2014 09:52:53 -0700 (PDT) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id t5sm19120602qaj.34.2014.04.29.09.52.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Apr 2014 09:52:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 29 Apr 2014 09:52:08 -0700 Message-Id: <1398790333-29262-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1398790333-29262-1-git-send-email-rth@twiddle.net> References: <1398790333-29262-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::235 Subject: [Qemu-devel] [PATCH 05/10] tcg-sparc: Create tcg_out_call X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Rename the existing tcg_out_calli to tcg_out_call_nodelay. Signed-off-by: Richard Henderson --- tcg/sparc/tcg-target.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c index 22a98fb..4f8de1e 100644 --- a/tcg/sparc/tcg-target.c +++ b/tcg/sparc/tcg-target.c @@ -735,7 +735,7 @@ static void tcg_out_addsub2(TCGContext *s, TCGReg rl, TCGReg rh, tcg_out_mov(s, TCG_TYPE_I32, rl, tmp); } -static void tcg_out_calli(TCGContext *s, tcg_insn_unit *dest) +static void tcg_out_call_nodelay(TCGContext *s, tcg_insn_unit *dest) { ptrdiff_t disp = tcg_pcrel_diff(s, dest); @@ -748,6 +748,12 @@ static void tcg_out_calli(TCGContext *s, tcg_insn_unit *dest) } } +static void tcg_out_call(TCGContext *s, tcg_insn_unit *dest) +{ + tcg_out_call_nodelay(s, dest); + tcg_out_nop(s); +} + #ifdef CONFIG_SOFTMMU static tcg_insn_unit *qemu_ld_trampoline[16]; static tcg_insn_unit *qemu_st_trampoline[16]; @@ -803,7 +809,7 @@ static void build_trampolines(TCGContext *s) /* Set the env operand. */ tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_O0, TCG_AREG0); /* Tail call. */ - tcg_out_calli(s, qemu_ld_helpers[i]); + tcg_out_call_nodelay(s, qemu_ld_helpers[i]); tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_O7, ra); } @@ -850,7 +856,7 @@ static void build_trampolines(TCGContext *s) /* Set the env operand. */ tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_O0, TCG_AREG0); /* Tail call. */ - tcg_out_calli(s, qemu_st_helpers[i]); + tcg_out_call_nodelay(s, qemu_st_helpers[i]); tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_O7, ra); } } @@ -1030,7 +1036,7 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data, TCGReg addr, func = qemu_ld_trampoline[memop]; } assert(func != NULL); - tcg_out_calli(s, func); + tcg_out_call_nodelay(s, func); /* delay slot */ tcg_out_movi(s, TCG_TYPE_I32, param, memi); @@ -1107,7 +1113,7 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data, TCGReg addr, func = qemu_st_trampoline[memop]; assert(func != NULL); - tcg_out_calli(s, func); + tcg_out_call_nodelay(s, func); /* delay slot */ tcg_out_movi(s, TCG_TYPE_REG, param, memi); @@ -1163,12 +1169,12 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, break; case INDEX_op_call: if (const_args[0]) { - tcg_out_calli(s, (void *)(uintptr_t)a0); + tcg_out_call(s, (void *)(uintptr_t)a0); } else { tcg_out_arithi(s, TCG_REG_O7, a0, 0, JMPL); + /* delay slot */ + tcg_out_nop(s); } - /* delay slot */ - tcg_out_nop(s); break; case INDEX_op_br: tcg_out_bpcc(s, COND_A, BPCC_PT, a0);