aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-11-23 13:54:41 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-11-23 13:54:41 +0000
commit68c61282fe8a02aa3bddfa7a9c2b7ad7e6177f69 (patch)
tree1401efac15b23075c07e5b8c8a0348d3694df499
parent541abd10a01da56c5f16582cd32d67114ec22a5c (diff)
parent644da9b39e477caa80bab69d2847dfcb468f0d33 (diff)
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20151123' into staging
Last minute fix. # gpg: Signature made Mon 23 Nov 2015 12:17:26 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/pull-tcg-20151123: tcg: Fix highwater check Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--tcg/tcg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 682af8a7c6..b20ed19879 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -2443,7 +2443,7 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
one operation beginning below the high water mark cannot overrun
the buffer completely. Thus we can test for overflow after
generating code without having to check during generation. */
- if (unlikely(s->code_gen_ptr > s->code_gen_highwater)) {
+ if (unlikely((void *)s->code_ptr > s->code_gen_highwater)) {
return -1;
}
}