From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JlEIf-0000zJ-Q0
	for qemu-devel@nongnu.org; Sun, 13 Apr 2008 22:20:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JlEIf-0000xy-41
	for qemu-devel@nongnu.org; Sun, 13 Apr 2008 22:20:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JlEIe-0000xe-Ps
	for qemu-devel@nongnu.org; Sun, 13 Apr 2008 22:20:04 -0400
Received: from savannah.gnu.org ([199.232.41.3] 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 <balrogg@gmail.com>) id 1JlEIe-0007y0-Td
	for qemu-devel@nongnu.org; Sun, 13 Apr 2008 22:20:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <balrogg@gmail.com>) id 1JlEIa-0004c8-Ug
	for qemu-devel@nongnu.org; Mon, 14 Apr 2008 02:20:01 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1JlEIZ-0004bo-Kw
	for qemu-devel@nongnu.org; Mon, 14 Apr 2008 02:20:00 +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: <E1JlEIZ-0004bo-Kw@cvs.savannah.gnu.org>
Date: Mon, 14 Apr 2008 02:19:59 +0000
Subject: [Qemu-devel] [4210] Fix ARM VFP related segfaults.
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: 4210
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4210
Author:   balrog
Date:     2008-04-14 02:19:57 +0000 (Mon, 14 Apr 2008)

Log Message:
-----------
Fix ARM VFP related segfaults.

The fconst change is partly a guess.
VFP_OP1 is still unused.
An ARMv6 target still won't boot.

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

Modified: trunk/target-arm/translate.c
===================================================================
--- trunk/target-arm/translate.c	2008-04-13 16:08:44 UTC (rev 4209)
+++ trunk/target-arm/translate.c	2008-04-14 02:19:57 UTC (rev 4210)
@@ -1009,7 +1009,7 @@
         gen_helper_vfp_##name##s(cpu_F0s, cpu_F0s, cpu_F1s, cpu_env); \
 }
 
-#define VFP_OP1i(name)                               \
+#define VFP_OP1(name)                               \
 static inline void gen_vfp_##name(int dp, int arg)  \
 {                                                   \
     if (dp)                                         \
@@ -1068,9 +1068,9 @@
 static inline void gen_vfp_F1_ld0(int dp)
 {
     if (dp)
-        tcg_gen_movi_i64(cpu_F0d, 0);
+        tcg_gen_movi_i64(cpu_F1d, 0);
     else
-        tcg_gen_movi_i32(cpu_F0s, 0);
+        tcg_gen_movi_i32(cpu_F1s, 0);
 }
 
 static inline void gen_vfp_uito(int dp)
@@ -3117,7 +3117,7 @@
                         else
                             i |= 0x800;
                         n |= i << 19;
-                        tcg_gen_movi_i32(cpu_F0d, ((uint64_t)n) << 32);
+                        tcg_gen_movi_i32(cpu_F0s, n);
                     }
                     break;
                 case 15: /* extension space */