diff options
| author | Peter Maydell | 2016-08-08 11:39:18 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-08-08 11:39:18 +0200 |
| commit | cf5198d58088e3b416fe517b3946e5120b342761 (patch) | |
| tree | 9d90c54eca81527f3f423e2daf7b29eccc32a35e /include/qemu/log.h | |
| parent | tests: Rename qtests which have names ending "error" (diff) | |
| parent | tcg: Lower indirect registers in a separate pass (diff) | |
| download | qemu-cf5198d58088e3b416fe517b3946e5120b342761.tar.gz qemu-cf5198d58088e3b416fe517b3946e5120b342761.tar.xz qemu-cf5198d58088e3b416fe517b3946e5120b342761.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20160805' into staging
indirect register lowering
# gpg: Signature made Fri 05 Aug 2016 17:34:53 BST
# gpg: using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B
* remotes/rth/tags/pull-tcg-20160805:
tcg: Lower indirect registers in a separate pass
tcg: Require liveness analysis
tcg: Include liveness info in the dumps
tcg: Compress dead_temps and mem_temps into a single array
tcg: Fold life data into TCGOp
tcg: Reorg TCGOp chaining
tcg: Compress liveness data to 16 bits
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/log.h')
| -rw-r--r-- | include/qemu/log.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/qemu/log.h b/include/qemu/log.h index 8bec6b4039..00bf37fc0f 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -42,6 +42,7 @@ static inline bool qemu_log_separate(void) #define CPU_LOG_TB_NOCHAIN (1 << 13) #define CPU_LOG_PAGE (1 << 14) #define LOG_TRACE (1 << 15) +#define CPU_LOG_TB_OP_IND (1 << 16) /* Returns true if a bit is set in the current loglevel mask */ @@ -54,7 +55,7 @@ static inline bool qemu_loglevel_mask(int mask) /* main logging function */ -void GCC_FMT_ATTR(1, 2) qemu_log(const char *fmt, ...); +int GCC_FMT_ATTR(1, 2) qemu_log(const char *fmt, ...); /* vfprintf-like logging function */ |