Changeset 13337 in vbox for trunk/src/recompiler_new/dyngen-exec.h

Timestamp:

Oct 16, 2008 11:59:21 AM (16 years ago)

Author:

vboxsync

Message:

more recompiler work

File:

• trunk/src/recompiler_new/dyngen-exec.h (modified) (3 diffs)

trunk/src/recompiler_new/dyngen-exec.h

@@ -90 +90 @@
 #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
@@ -234 +239 @@
 #define tostring(s)     #s
 
-#ifdef __alpha__
+#if defined(__alpha__) || defined(__s390__)
 /* the symbols are considered non exported so a br immediate is generated */
 #define __hidden __attribute__((visibility("hidden")))
@@ -308 +313 @@
 #endif
 
+
+/* The return address may point to the start of the next instruction.
+   Subtracting one gets us the call instruction itself.  */
+#if defined(__s390__)
+# define GETPC() ((void*)(((unsigned long)__builtin_return_address(0) & 0x7fffffffUL) - 1))
+#elif defined(__arm__)
+/* Thumb return addresses have the low bit set, so we need to subtract two.
+   This is still safe in ARM mode because instructions are 4 bytes.  */
+# define GETPC() ((void *)((unsigned long)__builtin_return_address(0) - 2))
+#else
+# define GETPC() ((void *)((unsigned long)__builtin_return_address(0) - 1))
+#endif
 #endif /* !defined(__DYNGEN_EXEC_H__) */