From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KNYbz-0004xu-4I for qemu-devel@nongnu.org; Mon, 28 Jul 2008 15:42:27 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KNYbx-0004x0-Cs for qemu-devel@nongnu.org; Mon, 28 Jul 2008 15:42:26 -0400 Received: from [199.232.76.173] (port=46700 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KNYbx-0004wt-9V for qemu-devel@nongnu.org; Mon, 28 Jul 2008 15:42:25 -0400 Received: from savannah.gnu.org ([199.232.41.3]:44055 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 1KNYbw-00005R-Pw for qemu-devel@nongnu.org; Mon, 28 Jul 2008 15:42:24 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1KNYbw-0004yH-95 for qemu-devel@nongnu.org; Mon, 28 Jul 2008 19:42:24 +0000 Received: from malc by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1KNYbw-0004yD-40 for qemu-devel@nongnu.org; Mon, 28 Jul 2008 19:42:24 +0000 MIME-Version: 1.0 Errors-To: malc Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: malc Message-Id: Date: Mon, 28 Jul 2008 19:42:24 +0000 Subject: [Qemu-devel] [4960] Set the L field of CMP[L][I] when dealing with 64 bit quantities 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: 4960 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4960 Author: malc Date: 2008-07-28 19:42:23 +0000 (Mon, 28 Jul 2008) Log Message: ----------- Set the L field of CMP[L][I] when dealing with 64 bit quantities This (along with previous 2 commits) makes X86_64 work on ppc64 too. Modified Paths: -------------- trunk/tcg/ppc64/tcg-target.c Modified: trunk/tcg/ppc64/tcg-target.c =================================================================== --- trunk/tcg/ppc64/tcg-target.c 2008-07-28 19:42:20 UTC (rev 4959) +++ trunk/tcg/ppc64/tcg-target.c 2008-07-28 19:42:23 UTC (rev 4960) @@ -34,8 +34,10 @@ #if TARGET_LONG_BITS == 32 #define LD_ADDR LWZU +#define CMP_L 0 #else #define LD_ADDR LDU +#define CMP_L (1<<21) #endif static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { @@ -588,7 +590,7 @@ tcg_out_tlb_read (s, r0, r1, r2, addr_reg, s_bits, offsetof (CPUState, tlb_table[mem_index][0].addr_read)); - tcg_out32 (s, CMP | BF (7) | RA (r2) | RB (r1)); + tcg_out32 (s, CMP | BF (7) | RA (r2) | RB (r1) | CMP_L); label1_ptr = s->code_ptr; #ifdef FAST_PATH @@ -715,7 +717,7 @@ tcg_out_tlb_read (s, r0, r1, r2, addr_reg, opc, offsetof (CPUState, tlb_table[mem_index][0].addr_write)); - tcg_out32 (s, CMP | BF (7) | RA (r2) | RB (r1)); + tcg_out32 (s, CMP | BF (7) | RA (r2) | RB (r1) | CMP_L); label1_ptr = s->code_ptr; #ifdef FAST_PATH @@ -882,7 +884,7 @@ } static void tcg_out_cmp (TCGContext *s, int cond, TCGArg arg1, TCGArg arg2, - int const_arg2, int cr) + int const_arg2, int cr, int arch64) { int imm; uint32_t op; @@ -939,7 +941,7 @@ default: tcg_abort (); } - op |= BF (cr); + op |= BF (cr) | (arch64 << 21); if (imm) tcg_out32 (s, op | RA (arg1) | (arg2 & 0xffff)); @@ -971,9 +973,9 @@ static void tcg_out_brcond (TCGContext *s, int cond, TCGArg arg1, TCGArg arg2, int const_arg2, - int label_index) + int label_index, int arch64) { - tcg_out_cmp (s, cond, arg1, arg2, const_arg2, 7); + tcg_out_cmp (s, cond, arg1, arg2, const_arg2, 7, arch64); tcg_out_bc (s, tcg_to_bc[cond], label_index); } @@ -1245,8 +1247,11 @@ break; case INDEX_op_brcond_i32: + tcg_out_brcond (s, args[2], args[0], args[1], const_args[1], args[3], 0); + break; + case INDEX_op_brcond_i64: - tcg_out_brcond (s, args[2], args[0], args[1], const_args[1], args[3]); + tcg_out_brcond (s, args[2], args[0], args[1], const_args[1], args[3], 1); break; case INDEX_op_neg_i32: