From patchwork Thu Apr 19 13:33:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153798 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 C66DDB6EEB for ; Fri, 20 Apr 2012 00:44:13 +1000 (EST) Received: from localhost ([::1]:44124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKrVO-0006Is-JR for incoming@patchwork.ozlabs.org; Thu, 19 Apr 2012 09:34:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKrUg-0004PQ-7d for qemu-devel@nongnu.org; Thu, 19 Apr 2012 09:34:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKrUZ-00007c-Dw for qemu-devel@nongnu.org; Thu, 19 Apr 2012 09:33:53 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:50602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKrUZ-00005a-6g for qemu-devel@nongnu.org; Thu, 19 Apr 2012 09:33:47 -0400 Received: by mail-iy0-f173.google.com with SMTP id j26so13899481iaf.4 for ; Thu, 19 Apr 2012 06:33:46 -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=th5yHdHqG6N9E73CIeon5aJA3rG4jStQEUQQgviqNOs=; b=h5WkOq8cNHwAy+eTwv1ymEhDt8/5KjZ+v77bj7hU4u4bLqB5bX45JysLTQEHjnJ73/ VFWcbxXca/PnhPOJFfCmk9bPGS7DwjphwxLng8Uthmyi9NG3BJWYQvReD7rFbj3VvdBE hV2s640fVg59K6rfLIbXvSwHgesyQ85KYuoi8V4IWV7tjCDpOW6LtzcRahBLryIp1FjT FDp46uHiBavM6/tnuatFgO33eY/3meO+JqDaya/jLOWL7VCuNGkknm5KcXwdv9S4rGaa T+/zZu08GxP5wk/yPUbnrF4rMbaxcdKip11UW5exaFhJznqE85fN96r7L7VSzyUacdBd c05Q== Received: by 10.50.77.136 with SMTP id s8mr2031116igw.56.1334842426436; Thu, 19 Apr 2012 06:33:46 -0700 (PDT) Received: from pebble.com ([12.236.175.36]) by mx.google.com with ESMTPS id b11sm6529633igq.7.2012.04.19.06.33.45 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 06:33:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 19 Apr 2012 08:33:09 -0500 Message-Id: <1334842395-31819-9-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.210.173 Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH 08/14] tcg-sparc: Do not use a global register for AREG0. 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 Use of "env" as a macro means constraining include file ordering a bit. Signed-off-by: Richard Henderson --- dyngen-exec.h | 17 +++++++---------- target-m68k/op_helper.c | 2 +- target-unicore32/op_helper.c | 2 +- target-xtensa/op_helper.c | 4 ++-- xtensa-semi.c | 4 ++-- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dyngen-exec.h b/dyngen-exec.h index 65fcb43..97fd32c 100644 --- a/dyngen-exec.h +++ b/dyngen-exec.h @@ -41,13 +41,8 @@ #elif defined(__mips__) #define AREG0 "s0" #elif defined(__sparc__) -#ifdef CONFIG_SOLARIS -#define AREG0 "g2" -#elif HOST_LONG_BITS == 64 -#define AREG0 "g5" -#else -#define AREG0 "g6" -#endif +/* Don't use a global register. Working around glibc clobbering these + global registers is more trouble than just using TLS. */ #elif defined(__s390__) #define AREG0 "r10" #elif defined(__alpha__) @@ -62,11 +57,13 @@ #error unsupported CPU #endif -#if defined(AREG0) +#ifdef AREG0 register CPUArchState *env asm(AREG0); #else -/* TODO: Try env = cpu_single_env. */ -extern CPUArchState *env; +/* Without a hard register, we can use the TLS variable instead. Note that + this macro interferes with the use of "env" in DEF_HELPER_N, thus targets + should always include "helper.h" before "dyngen-exec.h". */ +#define env cpu_single_env #endif #endif /* !CONFIG_TCG_PASS_AREG0 */ diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c index 1971a57..048c131 100644 --- a/target-m68k/op_helper.c +++ b/target-m68k/op_helper.c @@ -17,8 +17,8 @@ * License along with this library; if not, see . */ #include "cpu.h" -#include "dyngen-exec.h" #include "helpers.h" +#include "dyngen-exec.h" #if defined(CONFIG_USER_ONLY) diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c index b954c30..08dbc76 100644 --- a/target-unicore32/op_helper.c +++ b/target-unicore32/op_helper.c @@ -9,8 +9,8 @@ * later version. See the COPYING file in the top-level directory. */ #include "cpu.h" -#include "dyngen-exec.h" #include "helper.h" +#include "dyngen-exec.h" #define SIGNBIT (uint32_t)0x80000000 #define SIGNBIT64 ((uint64_t)1 << 63) diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c index 364dc19..d098be3 100644 --- a/target-xtensa/op_helper.c +++ b/target-xtensa/op_helper.c @@ -26,9 +26,9 @@ */ #include "cpu.h" -#include "dyngen-exec.h" -#include "helper.h" #include "host-utils.h" +#include "helper.h" +#include "dyngen-exec.h" static void do_unaligned_access(target_ulong addr, int is_write, int is_user, uintptr_t retaddr); diff --git a/xtensa-semi.c b/xtensa-semi.c index b7c8c34..42df6af 100644 --- a/xtensa-semi.c +++ b/xtensa-semi.c @@ -30,9 +30,9 @@ #include #include #include "cpu.h" -#include "dyngen-exec.h" -#include "helper.h" #include "qemu-log.h" +#include "helper.h" +#include "dyngen-exec.h" enum { TARGET_SYS_exit = 1,