From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L9Jk3-0003PA-ES
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 08:32:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L9Jk3-0003Oq-1B
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 08:32:11 -0500
Received: from [199.232.76.173] (port=56116 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L9Jk2-0003Om-RI
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 08:32:10 -0500
Received: from savannah.gnu.org ([199.232.41.3]:44619 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 <INVALID.NOREPLY@gnu.org>)
	id 1L9Jk2-0008LG-Hw
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 08:32:10 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L9Jk1-0007Bq-VU
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 13:32:10 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1L9Jk1-0007Bl-KR
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 13:32:09 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1L9Jk1-0007Bl-KR@cvs.savannah.gnu.org>
Date: Sun, 07 Dec 2008 13:32:09 +0000
Subject: [Qemu-devel] [5908] Patch holes in ARM translation (Laurent
	Desnogues).
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5908
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5908
Author:   balrog
Date:     2008-12-07 13:32:09 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
Patch holes in ARM translation (Laurent Desnogues).

 - gen_set_CF_bit31:  use the right value to set carry flag
 - shifter_out_im:  remove a spurious semi-colon
 - add a break for VSHRN, VRSHRN, VQSHRN, VQRSHRN
   size 2 case
 - sbfx, ubfx are v6t2 instructions

The correct cps user mode behaviour is unclear so it's left out from the
commit until ARM decides it.

Signed-off-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>

Modified Paths:
--------------
    trunk/target-arm/translate.c

Modified: trunk/target-arm/translate.c
===================================================================
--- trunk/target-arm/translate.c	2008-12-07 13:20:16 UTC (rev 5907)
+++ trunk/target-arm/translate.c	2008-12-07 13:32:09 UTC (rev 5908)
@@ -415,7 +415,7 @@
 {
     TCGv tmp = new_tmp();
     tcg_gen_shri_i32(tmp, var, 31);
-    gen_set_CF(var);
+    gen_set_CF(tmp);
     dead_tmp(tmp);
 }
 
@@ -490,7 +490,7 @@
         tcg_gen_andi_i32(tmp, var, 1);
     } else {
         tcg_gen_shri_i32(tmp, var, shift);
-        if (shift != 31);
+        if (shift != 31)
             tcg_gen_andi_i32(tmp, tmp, 1);
     }
     gen_set_CF(tmp);
@@ -4618,6 +4618,7 @@
                     imm = (uint32_t)shift;
                     tmp2 = tcg_const_i32(imm);
                     TCGV_UNUSED_I64(tmp64);
+                    break;
                 case 3:
                     tmp64 = tcg_const_i64(shift);
                     TCGV_UNUSED(tmp2);
@@ -6583,6 +6584,7 @@
                         break;
                     case 0x12: case 0x16: case 0x1a: case 0x1e: /* sbfx */
                     case 0x32: case 0x36: case 0x3a: case 0x3e: /* ubfx */
+                        ARCH(6T2);
                         tmp = load_reg(s, rm);
                         shift = (insn >> 7) & 0x1f;
                         i = ((insn >> 16) & 0x1f) + 1;