From patchwork Sat Jan 1 14:48:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 77143 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 5FABE1007D2 for ; Sun, 2 Jan 2011 01:56:56 +1100 (EST) Received: from localhost ([127.0.0.1]:46624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZ2t3-0008Cw-NO for incoming@patchwork.ozlabs.org; Sat, 01 Jan 2011 09:56:53 -0500 Received: from [140.186.70.92] (port=44386 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZ2s9-0008B2-AE for qemu-devel@nongnu.org; Sat, 01 Jan 2011 09:56:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZ2s3-0006sA-Uu for qemu-devel@nongnu.org; Sat, 01 Jan 2011 09:55:57 -0500 Received: from adelie.canonical.com ([91.189.90.139]:53812) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZ2s3-0006rS-MG for qemu-devel@nongnu.org; Sat, 01 Jan 2011 09:55:51 -0500 Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1PZ2s1-0000GT-1o for ; Sat, 01 Jan 2011 14:55:49 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 3EFEC2E80AC for ; Sat, 1 Jan 2011 14:55:48 +0000 (UTC) MIME-Version: 1.0 Date: Sat, 01 Jan 2011 14:48:22 -0000 From: Aurelien Jarno To: qemu-devel@nongnu.org X-Launchpad-Bug: product=qemu; status=Fix Committed; importance=Undecided; assignee=None; X-Launchpad-Bug-Private: no X-Launchpad-Bug-Security-Vulnerability: no X-Launchpad-Bug-Commenters: htmldeveloper X-Launchpad-Bug-Reporter: htmldeveloper@gmail.com (htmldeveloper) X-Launchpad-Bug-Modifier: Aurelien Jarno (aurel32) References: <20100616061249.20761.35585.malonedeb@wampee.canonical.com> Message-Id: <20110101144822.30469.18223.launchpad@wampee.canonical.com> X-Launchpad-Message-Rationale: Subscriber (QEMU) @qemu-devel-ml Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="12138"; Instance="initZopeless config overlay" X-Launchpad-Hash: a41ec30450b6031dd41795941c239498b703a2c5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [Bug 594944] Re: --enable-debug error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Reply-To: Bug 594944 <594944@bugs.launchpad.net> 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 ** Changed in: qemu Status: New => Fix Committed diff -Nurp target-sparc/translate.c.orig target-sparc/translate.c --- target-sparc/translate.c.orig 2010-06-16 13:58:26.395527708 +0800 +++ target-sparc/translate.c 2010-06-16 14:09:18.683573175 +0800 @@ -1663,27 +1663,28 @@ static inline TCGv get_src2(unsigned int #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