From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JxIuw-0004GN-N5 for qemu-devel@nongnu.org; Sat, 17 May 2008 05:41:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JxIuu-0004F1-6E for qemu-devel@nongnu.org; Sat, 17 May 2008 05:41:29 -0400 Received: from [199.232.76.173] (port=44970 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JxIus-0004EN-Ju for qemu-devel@nongnu.org; Sat, 17 May 2008 05:41:26 -0400 Received: from savannah.gnu.org ([199.232.41.3]:33429 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JxIus-0007dE-D1 for qemu-devel@nongnu.org; Sat, 17 May 2008 05:41:26 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1JxIum-0001m5-Ti for qemu-devel@nongnu.org; Sat, 17 May 2008 09:41:21 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1JxIuj-0001ll-U8 for qemu-devel@nongnu.org; Sat, 17 May 2008 09:41:18 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Sat, 17 May 2008 09:41:18 +0000 Subject: [Qemu-devel] [4466] Fix qemu_ld/st branches, constification, use orcc for tst synthetic op Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 4466 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4466 Author: blueswir1 Date: 2008-05-17 09:41:14 +0000 (Sat, 17 May 2008) Log Message: ----------- Fix qemu_ld/st branches, constification, use orcc for tst synthetic op Modified Paths: -------------- trunk/tcg/sparc/tcg-target.c Modified: trunk/tcg/sparc/tcg-target.c =================================================================== --- trunk/tcg/sparc/tcg-target.c 2008-05-17 07:38:10 UTC (rev 4465) +++ trunk/tcg/sparc/tcg-target.c 2008-05-17 09:41:14 UTC (rev 4466) @@ -198,8 +198,8 @@ #define ARITH_ADD (INSN_OP(2) | INSN_OP3(0x00)) #define ARITH_AND (INSN_OP(2) | INSN_OP3(0x01)) -#define ARITH_ANDCC (INSN_OP(2) | INSN_OP3(0x11)) #define ARITH_OR (INSN_OP(2) | INSN_OP3(0x02)) +#define ARITH_ORCC (INSN_OP(2) | INSN_OP3(0x12)) #define ARITH_XOR (INSN_OP(2) | INSN_OP3(0x03)) #define ARITH_SUB (INSN_OP(2) | INSN_OP3(0x04)) #define ARITH_SUBCC (INSN_OP(2) | INSN_OP3(0x14)) @@ -387,8 +387,8 @@ int label_index) { if (const_arg2 && arg2 == 0) - /* andcc r, r, %g0 */ - tcg_out_arith(s, TCG_REG_G0, arg1, arg1, ARITH_ANDCC); + /* orcc r, r, %g0 */ + tcg_out_arith(s, TCG_REG_G0, TCG_REG_G0, arg1, ARITH_ORCC); else /* subcc r1, r2, %g0 */ tcg_out_arith(s, TCG_REG_G0, arg1, arg2, ARITH_SUBCC); @@ -418,14 +418,14 @@ extern void __stq_mmu(void); -static void *qemu_ld_helpers[4] = { +static const void * const qemu_ld_helpers[4] = { __ldb_mmu, __ldw_mmu, __ldl_mmu, __ldq_mmu, }; -static void *qemu_st_helpers[4] = { +static const void * const qemu_st_helpers[4] = { __stb_mmu, __stw_mmu, __stl_mmu, @@ -531,7 +531,7 @@ tcg_out32(s, 0); /* label1: */ - *label1_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) | + *label1_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) | INSN_OFF22((unsigned long)label1_ptr - (unsigned long)s->code_ptr)); @@ -599,7 +599,7 @@ #if defined(CONFIG_SOFTMMU) /* label2: */ - *label2_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) | + *label2_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) | INSN_OFF22((unsigned long)label2_ptr - (unsigned long)s->code_ptr)); #endif @@ -703,7 +703,7 @@ tcg_out32(s, 0); /* label1: */ - *label1_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) | + *label1_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) | INSN_OFF22((unsigned long)label1_ptr - (unsigned long)s->code_ptr)); @@ -753,7 +753,7 @@ #if defined(CONFIG_SOFTMMU) /* label2: */ - *label2_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) | + *label2_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) | INSN_OFF22((unsigned long)label2_ptr - (unsigned long)s->code_ptr)); #endif