From patchwork Sat Feb 20 10:45:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jay Foad X-Patchwork-Id: 45915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BCFA1B7CE2 for ; Sat, 20 Feb 2010 21:49:02 +1100 (EST) Received: from localhost ([127.0.0.1]:33819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nimrx-0008GR-AP for incoming@patchwork.ozlabs.org; Sat, 20 Feb 2010 05:47:29 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nimq3-0008B1-Cp for qemu-devel@nongnu.org; Sat, 20 Feb 2010 05:45:31 -0500 Received: from [199.232.76.173] (port=50942 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nimq2-0008AL-GJ for qemu-devel@nongnu.org; Sat, 20 Feb 2010 05:45:30 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nimq1-0006y9-Qn for qemu-devel@nongnu.org; Sat, 20 Feb 2010 05:45:30 -0500 Received: from mail-bw0-f218.google.com ([209.85.218.218]:63475) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nimq1-0006xy-HQ for qemu-devel@nongnu.org; Sat, 20 Feb 2010 05:45:29 -0500 Received: by bwz10 with SMTP id 10so656965bwz.2 for ; Sat, 20 Feb 2010 02:45:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=wknFskknC7wuEFBmqAECM569V6Mazp3zCP6uegYCdCI=; b=WNpXwhURzH9GEZOrEfwewSnc8FQoVuzr2v53VbJM0Tl3RyZSRvFACA3/zlzxqMYday FtJn3bGfT6fON0ta0MdvppOHIHOAyOaChAOsEAOOmf2pv8t1DKezR43yEAAqGKEdsNA1 X142wjeFSwEcP5rhU4HItVJ3weqtiQmGtavkg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=pj7G4KT5j8TZmj/3CkY2mgAP0dchHKYEKTlLQHK/Tv31Nwdtdiz6/vjgTvn7V+Kl4R sCbtOFdqj5QpZ680aTU9ePUxJWSMuMJ/l2S7hYWRNezVj85uL+4BoBnp4DmnHhsZVTFY 2HoOVuiED3kcyrvstmCuQCCSd6q1vyJ/frFLY= MIME-Version: 1.0 Received: by 10.204.33.211 with SMTP id i19mr1586901bkd.127.1266662728253; Sat, 20 Feb 2010 02:45:28 -0800 (PST) Date: Sat, 20 Feb 2010 10:45:23 +0000 Message-ID: From: Jay Foad To: qemu-devel@nongnu.org X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH v2] target-sparc: fix --enable-debug build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use 32-bit arithmetic for the address offset calculation to fix a build failure on 32-bit hosts. Signed-off-by: Jay Foad --- target-sparc/translate.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 7e9f0cf..b7d2a32 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -1663,27 +1663,27 @@ static inline TCGv get_src2(unsigned int insn, TCGv def) #ifdef TARGET_SPARC64 static inline void gen_load_trap_state_at_tl(TCGv_ptr r_tsptr, TCGv_ptr cpu_env) { - TCGv r_tl = tcg_temp_new(); + TCGv_i32 r_tl = tcg_temp_new_i32(); /* load env->tl into r_tl */ - { - TCGv_i32 r_tl_tmp = tcg_temp_new_i32(); - tcg_gen_ld_i32(r_tl_tmp, cpu_env, offsetof(CPUSPARCState, tl)); - tcg_gen_ext_i32_tl(r_tl, r_tl_tmp); - tcg_temp_free_i32(r_tl_tmp); - } + tcg_gen_ld_i32(r_tl, cpu_env, offsetof(CPUSPARCState, tl)); /* tl = [0 ... MAXTL_MASK] where MAXTL_MASK must be power of 2 */ - tcg_gen_andi_tl(r_tl, r_tl, MAXTL_MASK); + tcg_gen_andi_i32(r_tl, r_tl, MAXTL_MASK); /* calculate offset to current trap state from env->ts, reuse r_tl */ - tcg_gen_muli_tl(r_tl, r_tl, sizeof (trap_state)); + tcg_gen_muli_i32(r_tl, r_tl, sizeof (trap_state)); tcg_gen_addi_ptr(r_tsptr, cpu_env, offsetof(CPUState, ts)); /* tsptr = env->ts[env->tl & MAXTL_MASK] */ - tcg_gen_add_ptr(r_tsptr, r_tsptr, r_tl); + { + TCGv_ptr r_tl_tmp = tcg_temp_new_ptr(); + tcg_gen_ext_i32_ptr(r_tl_tmp, r_tl); + tcg_gen_add_ptr(r_tsptr, r_tsptr, r_tl_tmp); + tcg_temp_free_i32(r_tl_tmp); + } - tcg_temp_free(r_tl); + tcg_temp_free_i32(r_tl); } #endif