Gallileo fixes, by Stefan Weil.

[qemu] / dyngen-exec.h

diff --git a/dyngen-exec.h b/dyngen-exec.h
index 2f38785..69c3cd9 100644 (file)
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -62,6 +62,9 @@ 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)
 #define INT32_MIN              (-2147483647-1)
@@ -75,8 +78,13 @@ typedef signed long long int64_t;
 #define UINT32_MAX             (4294967295U)
 #define UINT64_MAX             ((uint64_t)(18446744073709551615))
 
+#ifdef _BSD
+typedef struct __sFILE FILE;
+#else
 typedef struct FILE FILE;
+#endif
 extern int fprintf(FILE *, const char *, ...);
+extern int fputs(const char *, FILE *);
 extern int printf(const char *, ...);
 #undef NULL
 #define NULL 0
@@ -88,12 +96,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"