From patchwork Sun Mar 25 22:27:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 148594 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BE429B6EF3 for ; Mon, 26 Mar 2012 09:29:51 +1100 (EST) Received: from localhost ([::1]:33044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBvwb-0005b4-Ht for incoming@patchwork.ozlabs.org; Sun, 25 Mar 2012 18:29:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBvvj-0003rB-5q for qemu-devel@nongnu.org; Sun, 25 Mar 2012 18:28:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SBvvh-0007x1-EQ for qemu-devel@nongnu.org; Sun, 25 Mar 2012 18:28:54 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:47227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBvvh-0007uQ-5n for qemu-devel@nongnu.org; Sun, 25 Mar 2012 18:28:53 -0400 Received: by mail-pb0-f45.google.com with SMTP id uo5so6347946pbc.4 for ; Sun, 25 Mar 2012 15:28:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Ap9mXoGWLj7YUe/+ykwg4xKLlgIgj/21uBs28LdwDWs=; b=c/OcwBZ1YZVCL7Zd+8iT0PdeVYG9IaiyZFET+0oviz40vvGRHauFC33czWk53IPTXT JgU4bvvsK4n0++vImg8k1Wby/+R8J4LOqIwhvDgoW5bANOnICEYRQR6D81IprVuvpFte e5rqLadvTpDfCAnrgXFFxwsmT4OkoBALG2KvMbBBkIQgUR7BCQe02v1nUWUyw3qDYxPB z66XNifyvGZaR2hlnWNEPk400RRuGc0zFayus8+c2sn2KwzHFPL8DY5BxWPdUVSdu/if HO/xKJCY8BU/fFa6yHY745wlH4NMNjAsADMLU6uCEti7xXFi0xII5Rf1pPZch5C1UAXL 8V6w== Received: by 10.68.226.225 with SMTP id rv1mr25607274pbc.149.1332714532325; Sun, 25 Mar 2012 15:28:52 -0700 (PDT) Received: from pebble.com ([173.160.232.49]) by mx.google.com with ESMTPS id l4sm11018797pbl.27.2012.03.25.15.28.51 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 25 Mar 2012 15:28:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 25 Mar 2012 15:27:52 -0700 Message-Id: <1332714477-30079-11-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1332714477-30079-1-git-send-email-rth@twiddle.net> References: <1332714477-30079-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Blue Swirl Subject: [Qemu-devel] [PATCH 10/15] tcg-sparc: Change AREG0 in generated code to %i0. 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 Signed-off-by: Richard Henderson --- tcg/sparc/tcg-target.c | 3 ++- tcg/sparc/tcg-target.h | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c index d45114f..dc36840 100644 --- a/tcg/sparc/tcg-target.c +++ b/tcg/sparc/tcg-target.c @@ -705,7 +705,8 @@ static void tcg_target_qemu_prologue(TCGContext *s) tcg_out32(s, JMPL | INSN_RD(TCG_REG_G0) | INSN_RS1(TCG_REG_I1) | INSN_RS2(TCG_REG_G0)); - tcg_out_mov(s, TCG_TYPE_PTR, TCG_AREG0, TCG_REG_I0); + /* delay slot */ + tcg_out_nop(s); } #if defined(CONFIG_SOFTMMU) diff --git a/tcg/sparc/tcg-target.h b/tcg/sparc/tcg-target.h index e69dfc8..31b98e2 100644 --- a/tcg/sparc/tcg-target.h +++ b/tcg/sparc/tcg-target.h @@ -128,14 +128,7 @@ typedef enum { #define TCG_TARGET_HAS_GUEST_BASE -/* Note: must be synced with dyngen-exec.h */ -#ifdef CONFIG_SOLARIS -#define TCG_AREG0 TCG_REG_G2 -#elif HOST_LONG_BITS == 64 -#define TCG_AREG0 TCG_REG_G5 -#else -#define TCG_AREG0 TCG_REG_G6 -#endif +#define TCG_AREG0 TCG_REG_I0 static inline void flush_icache_range(tcg_target_ulong start, tcg_target_ulong stop)