Add missing softfloat helpers.

[qemu] / dyngen-exec.h

diff --git a/dyngen-exec.h b/dyngen-exec.h
index 0478ade..bf40353 100644 (file)
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -35,12 +35,15 @@
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
+// Linux/Sparc64 defines uint64_t
+#if !(defined (__sparc_v9__) && defined(__linux__))
 /* XXX may be done for all 64 bits targets ? */
 #if defined (__x86_64__) || defined(__ia64)
 typedef unsigned long uint64_t;
 #else
 typedef unsigned long long uint64_t;
 #endif
+#endif
 
 /* if Solaris/__sun__, don't typedef int8_t, as it will be typedef'd
    prior to this and will cause an error in compliation, conflicting
@@ -50,11 +53,17 @@ typedef signed char int8_t;
 #endif
 typedef signed short int16_t;
 typedef signed int int32_t;
+// Linux/Sparc64 defines int64_t
+#if !(defined (__sparc_v9__) && defined(__linux__))
 #if defined (__x86_64__) || defined(__ia64)
 typedef signed long int64_t;
 #else
 typedef signed long long int64_t;
 #endif
+#endif
+
+/* XXX: This may be wrong for 64-bit ILP32 hosts.  */
+typedef void * host_reg_t;
 
 #define INT8_MIN               (-128)
 #define INT16_MIN              (-32767-1)
@@ -82,12 +91,12 @@ extern int printf(const char *, ...);
 #define AREG3 "edi"
 #endif
 #ifdef __x86_64__
-#define AREG0 "rbp"
-#define AREG1 "rbx"
+#define AREG0 "r14"
+#define AREG1 "r15"
 #define AREG2 "r12"
 #define AREG3 "r13"
-//#define AREG4 "r14"
-//#define AREG5 "r15"
+//#define AREG4 "rbp"
+//#define AREG5 "rbx"
 #endif
 #ifdef __powerpc__
 #define AREG0 "r27"
@@ -128,6 +137,12 @@ extern int printf(const char *, ...);
 #define AREG3 "g5"
 #define AREG4 "g6"
 #else
+#ifdef __sparc_v9__
+#define AREG0 "g1"
+#define AREG1 "g4"
+#define AREG2 "g5"
+#define AREG3 "g7"
+#else
 #define AREG0 "g6"
 #define AREG1 "g1"
 #define AREG2 "g2"
@@ -141,6 +156,7 @@ extern int printf(const char *, ...);
 #define AREG10 "l6"
 #define AREG11 "l7"
 #endif
+#endif
 #define USE_FP_CONVERT
 #endif
 #ifdef __s390__
@@ -175,7 +191,7 @@ extern int printf(const char *, ...);
 #endif
 
 /* force GCC to generate only one epilog at the end of the function */
-#define FORCE_RET() asm volatile ("");
+#define FORCE_RET() __asm__ __volatile__("" : : : "memory");
 
 #ifndef OPPROTO
 #define OPPROTO