From patchwork Thu Apr 19 13:33:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153774 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 0BA6BB7007 for ; Fri, 20 Apr 2012 00:16:02 +1000 (EST) Received: from localhost ([::1]:44934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKrVp-0006jY-Rr for incoming@patchwork.ozlabs.org; Thu, 19 Apr 2012 09:35:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKrUm-0004fy-82 for qemu-devel@nongnu.org; Thu, 19 Apr 2012 09:34:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKrUb-00008N-IT for qemu-devel@nongnu.org; Thu, 19 Apr 2012 09:33:59 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:46998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKrUb-00007t-7k for qemu-devel@nongnu.org; Thu, 19 Apr 2012 09:33:49 -0400 Received: by ghrr14 with SMTP id r14so5677979ghr.4 for ; Thu, 19 Apr 2012 06:33:47 -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=37Rg7ykJ/WJFvFTFcdfAWkJmZ2tk3c5NOiaWOt7ZjI4=; b=fh5DKZjErnBeXVkVDGTXR0egvmnLqiDgYrkRDNkarFDLD2niSL6wATl9MEfNQHOSU0 y9JnySrh3LFdyAtuODkzZ+eHsdEGNTb36ONN6uPrGrptPjucgu4c/3sZ8Rr/RTUOdClA CuaEJb2ouLZ239rFYmLTWQCN1ThA+4rxorxrl2NLZGr6PGNH+Iw7G2yfZsUwWvev+A/n xcv+qSXtF2UN0f/rQo1e9yr/1+p8VsGdw4duBsGAjFjFnyx/y7pW3Gmr5a8TTkl6pXJM yMnMYGsYnT+UvQkNJXvkmXaj8cA4qOoFl0QdXmygTMlcB62KCZ9HKZVsn42xMr/yi9mN oF4A== Received: by 10.50.180.135 with SMTP id do7mr2126668igc.56.1334842427318; Thu, 19 Apr 2012 06:33:47 -0700 (PDT) Received: from pebble.com ([12.236.175.36]) by mx.google.com with ESMTPS id b11sm6529633igq.7.2012.04.19.06.33.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 06:33:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 19 Apr 2012 08:33:10 -0500 Message-Id: <1334842395-31819-10-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1334842395-31819-1-git-send-email-rth@twiddle.net> References: <1334842395-31819-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.173 Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH 09/14] 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 c014ce0..ad040fb 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)