summaryrefslogtreecommitdiffstats
path: root/tcg
diff options
context:
space:
mode:
authorLluís Vilanova <vilanova@ac.upc.edu>2016-02-25 17:43:21 +0100
committerTimothy Pearson <tpearson@raptorengineering.com>2019-11-29 19:49:12 -0600
commitf605019b16b7c1e0117cd8c30cc10485d0d679ff (patch)
treea37b1ec5c7978e55b908befa6ea6622b87197313 /tcg
parent51cda9ce1457df8ac06d771f094e43de96775895 (diff)
downloadhqemu-f605019b16b7c1e0117cd8c30cc10485d0d679ff.zip
hqemu-f605019b16b7c1e0117cd8c30cc10485d0d679ff.tar.gz
tcg: Move definition of type TCGv
The target-dependant type TCGv must be defined in "tcg/tcg.h" before including the tracing helper wrappers in "tcg/tcg-op.h". It also makes more sense to define it here, where other TCG types are defined too. Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> Message-id: 145641860129.30295.17554707227384022653.stgit@localhost Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tcg')
-rw-r--r--tcg/tcg-op.h2
-rw-r--r--tcg/tcg.h7
2 files changed, 7 insertions, 2 deletions
diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h
index 17d31df..9617875 100644
--- a/tcg/tcg-op.h
+++ b/tcg/tcg-op.h
@@ -767,7 +767,6 @@ static inline void tcg_gen_exit_tb(uintptr_t val)
void tcg_gen_goto_tb(unsigned idx);
#if TARGET_LONG_BITS == 32
-#define TCGv TCGv_i32
#define tcg_temp_new() tcg_temp_new_i32()
#define tcg_global_reg_new tcg_global_reg_new_i32
#define tcg_global_mem_new tcg_global_mem_new_i32
@@ -779,7 +778,6 @@ void tcg_gen_goto_tb(unsigned idx);
#define tcg_gen_qemu_ld_tl tcg_gen_qemu_ld_i32
#define tcg_gen_qemu_st_tl tcg_gen_qemu_st_i32
#else
-#define TCGv TCGv_i64
#define tcg_temp_new() tcg_temp_new_i64()
#define tcg_global_reg_new tcg_global_reg_new_i64
#define tcg_global_mem_new tcg_global_mem_new_i64
diff --git a/tcg/tcg.h b/tcg/tcg.h
index f232397..f27060f 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -310,6 +310,13 @@ typedef struct TCGv_i32_d *TCGv_i32;
typedef struct TCGv_i64_d *TCGv_i64;
typedef struct TCGv_ptr_d *TCGv_ptr;
typedef TCGv_ptr TCGv_env;
+#if TARGET_LONG_BITS == 32
+#define TCGv TCGv_i32
+#elif TARGET_LONG_BITS == 64
+#define TCGv TCGv_i64
+#else
+#error Unhandled TARGET_LONG_BITS value
+#endif
static inline TCGv_i32 QEMU_ARTIFICIAL MAKE_TCGV_I32(intptr_t i)
{
OpenPOWER on IntegriCloud