diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
| commit | 5d8f37ad78fc66901af50c762029a501561f3b23 (patch) | |
| tree | 206790f8f21000850a98c4f9590a79e779106278 /gen-icount.h | |
| parent | cd059b15f2c7df69f4a087bd66900eb172e41d1c (diff) | |
| download | external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.zip external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.gz external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.bz2 | |
Merge upstream QEMU 10.0.50 into the Android source tree.
This change integrates many changes from the upstream QEMU sources.
Its main purpose is to enable correct ARMv6 and ARMv7 support to the
Android emulator. Due to the nature of the upstream code base, this
unfortunately also required changes to many other parts of the source.
Note that to ensure easier integrations in the future, some source files
and directories that have heavy Android-specific customization have been
renamed with an -android suffix. The original files are still there for
easier integration tracking, but *never* compiled. For example:
net.c net-android.c
qemu-char.c qemu-char-android.c
slirp/ slirp-android/
etc...
Tested on linux-x86, darwin-x86 and windows host machines.
Diffstat (limited to 'gen-icount.h')
| -rw-r--r-- | gen-icount.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gen-icount.h b/gen-icount.h index 61545f1..d4524d6 100644 --- a/gen-icount.h +++ b/gen-icount.h @@ -5,7 +5,7 @@ static int icount_label; static inline void gen_icount_start(void) { - TCGv count; + TCGv_i32 count; if (!use_icount) return; @@ -15,7 +15,7 @@ static inline void gen_icount_start(void) count needs to live over the conditional branch. To workaround this we allow the target to supply a convenient register temporary. */ #ifndef ICOUNT_TEMP - count = tcg_temp_local_new(TCG_TYPE_I32); + count = tcg_temp_local_new_i32(); #else count = ICOUNT_TEMP; #endif @@ -27,7 +27,7 @@ static inline void gen_icount_start(void) tcg_gen_brcondi_i32(TCG_COND_LT, count, 0, icount_label); tcg_gen_st16_i32(count, cpu_env, offsetof(CPUState, icount_decr.u16.low)); #ifndef ICOUNT_TEMP - tcg_temp_free(count); + tcg_temp_free_i32(count); #endif } @@ -42,15 +42,14 @@ static void gen_icount_end(TranslationBlock *tb, int num_insns) static void inline gen_io_start(void) { - TCGv tmp = tcg_const_i32(1); + TCGv_i32 tmp = tcg_const_i32(1); tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUState, can_do_io)); - tcg_temp_free(tmp); + tcg_temp_free_i32(tmp); } static inline void gen_io_end(void) { - TCGv tmp = tcg_const_i32(0); + TCGv_i32 tmp = tcg_const_i32(0); tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUState, can_do_io)); - tcg_temp_free(tmp); + tcg_temp_free_i32(tmp); } - |