tcg-i386: Split out tlb load function.

[qemu.git] / dyngen-exec.h

diff --git a/dyngen-exec.h b/dyngen-exec.h
index a74164684763f8c17d2cafecbfc3f4a9a7c86470..0700a2d9bb20717dba5b8093e993c61dc10cb767 100644 (file)
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public

- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.

  */
 #if !defined(__DYNGEN_EXEC_H__)
 #define __DYNGEN_EXEC_H__
  */
 #if !defined(__DYNGEN_EXEC_H__)
 #define __DYNGEN_EXEC_H__


@@ -31,58 +30,16 @@
    point because host CPU registers are used as global variables. Some
    host headers do not allow that. */
 #include <stddef.h>
    point because host CPU registers are used as global variables. Some
    host headers do not allow that. */
 #include <stddef.h>

+#include <stdint.h>

 
 #ifdef __OpenBSD__
 #include <sys/types.h>
 
 #ifdef __OpenBSD__
 #include <sys/types.h>

-#else
-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__)) && !(defined(__APPLE__) && defined(__x86_64__))
-/* XXX may be done for all 64 bits targets ? */
-#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64)
-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
-   with /usr/include/sys/int_types.h, line 75 */
-#ifndef __sun__
-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__)) && !(defined(__APPLE__) && defined(__x86_64__))
-#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(_ARCH_PPC64)
-typedef signed long int64_t;
-#else
-typedef signed long long int64_t;
-#endif
-#endif

 #endif
 
 /* XXX: This may be wrong for 64-bit ILP32 hosts.  */
 typedef void * host_reg_t;
 
 #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)
-#define INT64_MIN              (-(int64_t)(9223372036854775807)-1)
-#define INT8_MAX               (127)
-#define INT16_MAX              (32767)
-#define INT32_MAX              (2147483647)
-#define INT64_MAX              ((int64_t)(9223372036854775807))
-#define UINT8_MAX              (255)
-#define UINT16_MAX             (65535)
-#define UINT32_MAX             (4294967295U)
-#define UINT64_MAX             ((uint64_t)(18446744073709551615))
-
-#ifdef HOST_BSD
+#ifdef CONFIG_BSD

 typedef struct __sFILE FILE;
 #else
 typedef struct FILE FILE;
 typedef struct __sFILE FILE;
 #else
 typedef struct FILE FILE;


@@ -90,67 +47,39 @@ typedef struct FILE FILE;
 extern int fprintf(FILE *, const char *, ...);
 extern int fputs(const char *, FILE *);
 extern int printf(const char *, ...);
 extern int fprintf(FILE *, const char *, ...);
 extern int fputs(const char *, FILE *);
 extern int printf(const char *, ...);

-#undef NULL
-#define NULL 0

 
 #if defined(__i386__)
 #define AREG0 "ebp"
 
 #if defined(__i386__)
 #define AREG0 "ebp"

-#define AREG1 "ebx"
-#define AREG2 "esi"

 #elif defined(__x86_64__)
 #define AREG0 "r14"
 #elif defined(__x86_64__)
 #define AREG0 "r14"

-#define AREG1 "r15"
-#define AREG2 "r12"

 #elif defined(_ARCH_PPC)
 #define AREG0 "r27"
 #elif defined(_ARCH_PPC)
 #define AREG0 "r27"

-#define AREG1 "r24"
-#define AREG2 "r25"

 #elif defined(__arm__)
 #define AREG0 "r7"
 #elif defined(__arm__)
 #define AREG0 "r7"

-#define AREG1 "r4"
-#define AREG2 "r5"

 #elif defined(__hppa__)
 #define AREG0 "r17"
 #elif defined(__hppa__)
 #define AREG0 "r17"

-#define AREG1 "r14"
-#define AREG2 "r15"

 #elif defined(__mips__)
 #elif defined(__mips__)

-#define AREG0 "fp"
-#define AREG1 "s0"
-#define AREG2 "s1"
+#define AREG0 "s0"

 #elif defined(__sparc__)
 #elif defined(__sparc__)

-#ifdef HOST_SOLARIS
+#ifdef CONFIG_SOLARIS

 #define AREG0 "g2"
 #define AREG0 "g2"

-#define AREG1 "g3"
-#define AREG2 "g4"

 #else
 #ifdef __sparc_v9__
 #define AREG0 "g5"
 #else
 #ifdef __sparc_v9__
 #define AREG0 "g5"

-#define AREG1 "g6"
-#define AREG2 "g7"

 #else
 #define AREG0 "g6"
 #else
 #define AREG0 "g6"

-#define AREG1 "g1"
-#define AREG2 "g2"

 #endif
 #endif
 #elif defined(__s390__)
 #define AREG0 "r10"
 #endif
 #endif
 #elif defined(__s390__)
 #define AREG0 "r10"

-#define AREG1 "r7"
-#define AREG2 "r8"

 #elif defined(__alpha__)
 /* Note $15 is the frame pointer, so anything in op-i386.c that would
    require a frame pointer, like alloca, would probably loose.  */
 #define AREG0 "$15"
 #elif defined(__alpha__)
 /* Note $15 is the frame pointer, so anything in op-i386.c that would
    require a frame pointer, like alloca, would probably loose.  */
 #define AREG0 "$15"

-#define AREG1 "$9"
-#define AREG2 "$10"

 #elif defined(__mc68000)
 #define AREG0 "%a5"
 #elif defined(__mc68000)
 #define AREG0 "%a5"

-#define AREG1 "%a4"
-#define AREG2 "%d7"

 #elif defined(__ia64__)
 #define AREG0 "r7"
 #elif defined(__ia64__)
 #define AREG0 "r7"

-#define AREG1 "r4"
-#define AREG2 "r5"

 #else
 #error unsupported CPU
 #endif
 #else
 #error unsupported CPU
 #endif


@@ -162,7 +91,7 @@ extern int printf(const char *, ...);
 
 /* The return address may point to the start of the next instruction.
    Subtracting one gets us the call instruction itself.  */
 
 /* The return address may point to the start of the next instruction.
    Subtracting one gets us the call instruction itself.  */

-#if defined(__s390__)
+#if defined(__s390__) && !defined(__s390x__)

 # 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.
 # 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.