diff options
| author | Peter Maydell | 2015-03-16 10:42:40 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-16 10:42:40 +0100 |
| commit | a8f1b43cb023333098a3ebc2630ce2c3db7f7af6 (patch) | |
| tree | 051e8e211fb02d8ff2feead68df562859a4a3632 /include | |
| parent | user-exec.c: fix build on NetBSD/sparc64 and NetBSD/arm (diff) | |
| parent | tcg: Complete handling of ALWAYS and NEVER (diff) | |
| download | qemu-a8f1b43cb023333098a3ebc2630ce2c3db7f7af6.tar.gz qemu-a8f1b43cb023333098a3ebc2630ce2c3db7f7af6.tar.xz qemu-a8f1b43cb023333098a3ebc2630ce2c3db7f7af6.zip | |
Merge remote-tracking branch 'remotes/rth/tags/tcg-pull-20150313' into staging
Pool TCG data, and ALWAYS/NEVER fix
# gpg: Signature made Fri Mar 13 20:09:09 2015 GMT using RSA key ID 4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
* remotes/rth/tags/tcg-pull-20150313:
tcg: Complete handling of ALWAYS and NEVER
tcg: Use tcg_malloc to allocate TCGLabel
tcg: Change generator-side labels to a pointer
tcg: Change translator-side labels to a pointer
tcg-ia64: Use tcg_malloc to allocate TCGLabelQemuLdst
tcg: Use tcg_malloc to allocate TCGLabelQemuLdst
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/gen-icount.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index 6e5b01239b..05d89d358f 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -6,8 +6,8 @@ /* Helpers for instruction counting code generation. */ static TCGArg *icount_arg; -static int icount_label; -static int exitreq_label; +static TCGLabel *icount_label; +static TCGLabel *exitreq_label; static inline void gen_tb_start(TranslationBlock *tb) { |