From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NiXzm-0007OW-HK for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:54:34 -0500 Received: from [199.232.76.173] (port=58621 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NiXzm-0007Ni-2C for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:54:34 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NiXzl-0007cv-Fg for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:54:33 -0500 Received: from mail-bw0-f218.google.com ([209.85.218.218]:39305) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NiXzk-0007c9-LL for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:54:32 -0500 Received: by bwz10 with SMTP id 10so352371bwz.2 for ; Fri, 19 Feb 2010 10:54:30 -0800 (PST) MIME-Version: 1.0 Date: Fri, 19 Feb 2010 18:24:13 +0000 Message-ID: From: Jay Foad Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] target-sparc: fix --enable-debug build List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org On Linux/x86, configuring with --enable-debug, I get: =A0CC =A0 =A0sparc64-linux-user/translate.o /home/foad/git/qemu/target-sparc/translate.c: In function =91gen_load_trap_state_at_tl=92: /home/foad/git/qemu/target-sparc/translate.c:1684: error: incompatible type for argument 3 of =91tcg_gen_add_i32=92 /home/foad/git/qemu/tcg/tcg-op.h:422: note: expected =91TCGv_i32=92 but argument is of type =91TCGv_i64=92 make[1]: *** [translate.o] Error 1 Does this look like a reasonable fix? Signed-off-by: Jay Foad --- 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 =3D tcg_temp_new(); + TCGv_i32 r_tl =3D tcg_temp_new_i32(); /* load env->tl into r_tl */ - { - TCGv_i32 r_tl_tmp =3D 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 =3D [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 =3D env->ts[env->tl & MAXTL_MASK] */ - tcg_gen_add_ptr(r_tsptr, r_tsptr, r_tl); + { + TCGv_ptr r_tl_tmp =3D 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