summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorYeongkyoon Lee <yeongkyoon.lee@samsung.com>2013-03-22 21:50:17 +0900
committerAurelien Jarno <aurelien@aurel32.net>2013-03-22 21:38:21 +0100
commit52ae646d4a3ebdcdcc973492c6a56f2c49b6578f (patch)
tree614737fa3eeddbd255cda8d7ad5fa18012e81a63
parent3f08ffb4a4741d147634761dc053ed386243a0de (diff)
downloadfocaccia-qemu-52ae646d4a3ebdcdcc973492c6a56f2c49b6578f.tar.gz
focaccia-qemu-52ae646d4a3ebdcdcc973492c6a56f2c49b6578f.zip
tcg: Fix occasional TCG broken problem when ldst optimization enabled
is_tcg_gen_code() checks the upper limit of TCG generated code range wrong, so
that TCG could get broken occasionally only when CONFIG_QEMU_LDST_OPTIMIZATION
enabled. The reason is code_gen_buffer_max_size does not cover the upper range
up to (TCG_MAX_OP_SIZE * OPC_BUF_SIZE), thus code_gen_buffer_max_size should be
modified to code_gen_buffer_size.

CC: qemu-stable@nongnu.org
Signed-off-by: Yeongkyoon Lee <yeongkyoon.lee@samsung.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-rw-r--r--translate-all.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/translate-all.c b/translate-all.c
index 1f3237e60e..a98c646d92 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -1308,11 +1308,11 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc,
 /* check whether the given addr is in TCG generated code buffer or not */
 bool is_tcg_gen_code(uintptr_t tc_ptr)
 {
-    /* This can be called during code generation, code_gen_buffer_max_size
+    /* This can be called during code generation, code_gen_buffer_size
        is used instead of code_gen_ptr for upper boundary checking */
     return (tc_ptr >= (uintptr_t)tcg_ctx.code_gen_buffer &&
             tc_ptr < (uintptr_t)(tcg_ctx.code_gen_buffer +
-                    tcg_ctx.code_gen_buffer_max_size));
+                    tcg_ctx.code_gen_buffer_size));
 }
 #endif