From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EWQjh-0008Tx-AE
	for qemu-devel@nongnu.org; Sun, 30 Oct 2005 22:53:29 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EWQjf-0008S2-C7
	for qemu-devel@nongnu.org; Sun, 30 Oct 2005 22:53:28 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EWQjf-0008Rz-7j
	for qemu-devel@nongnu.org; Sun, 30 Oct 2005 22:53:27 -0500
Received: from [65.74.133.11] (helo=mail.codesourcery.com)
	by monty-python.gnu.org with esmtp
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.34) id 1EWQjf-00087k-BA
	for qemu-devel@nongnu.org; Sun, 30 Oct 2005 22:53:27 -0500
From: Paul Brook <paul@codesourcery.com>
Date: Mon, 31 Oct 2005 04:53:20 +0100
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_xUZZDV6Y2zsWVtz"
Message-Id: <200510310353.21463.paul@codesourcery.com>
Subject: [Qemu-devel] [patch] softmmu vs. softfloat
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

--Boundary-00=_xUZZDV6Y2zsWVtz
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

The attached patch fixes softmmu_header.h to use "float32" and "float64" from 
softfloat.h instead of native "float" and "double".

Paul


--Boundary-00=_xUZZDV6Y2zsWVtz
Content-Type: text/x-diff; charset="us-ascii"; name="patch.qemu_softfloat_mmu"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
	filename="patch.qemu_softfloat_mmu"

Index: softmmu_header.h
===================================================================
RCS file: /cvsroot/qemu/qemu/softmmu_header.h,v
retrieving revision 1.9
diff -u -p -r1.9 softmmu_header.h
--- softmmu_header.h	2 Jul 2005 14:56:31 -0000	1.9
+++ softmmu_header.h	31 Oct 2005 03:44:50 -0000
@@ -304,20 +312,20 @@ static inline void glue(glue(st, SUFFIX)
 #endif
 
 #if DATA_SIZE == 8
-static inline double glue(ldfq, MEMSUFFIX)(target_ulong ptr)
+static inline float64 glue(ldfq, MEMSUFFIX)(target_ulong ptr)
 {
     union {
-        double d;
+        float64 d;
         uint64_t i;
     } u;
     u.i = glue(ldq, MEMSUFFIX)(ptr);
     return u.d;
 }
 
-static inline void glue(stfq, MEMSUFFIX)(target_ulong ptr, double v)
+static inline void glue(stfq, MEMSUFFIX)(target_ulong ptr, float64 v)
 {
     union {
-        double d;
+        float64 d;
         uint64_t i;
     } u;
     u.d = v;
@@ -326,20 +334,20 @@ static inline void glue(stfq, MEMSUFFIX)
 #endif /* DATA_SIZE == 8 */
 
 #if DATA_SIZE == 4
-static inline float glue(ldfl, MEMSUFFIX)(target_ulong ptr)
+static inline float32 glue(ldfl, MEMSUFFIX)(target_ulong ptr)
 {
     union {
-        float f;
+        float32 f;
         uint32_t i;
     } u;
     u.i = glue(ldl, MEMSUFFIX)(ptr);
     return u.f;
 }
 
-static inline void glue(stfl, MEMSUFFIX)(target_ulong ptr, float v)
+static inline void glue(stfl, MEMSUFFIX)(target_ulong ptr, float32 v)
 {
     union {
-        float f;
+        float32 f;
         uint32_t i;
     } u;
     u.f = v;

--Boundary-00=_xUZZDV6Y2zsWVtz--