diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-06-22 11:58:25 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-07-12 20:29:08 +0000 |
| commit | a884da8a06806d55fa83c8011bb17d6838583f9b (patch) | |
| tree | 5b5da2e4617519f7187543ce26910a06812c40d3 | |
| parent | 06c46bbab04faa3b5a1c10756be7db4f09af1ffb (diff) | |
| download | focaccia-qemu-a884da8a06806d55fa83c8011bb17d6838583f9b.tar.gz focaccia-qemu-a884da8a06806d55fa83c8011bb17d6838583f9b.zip | |
exec.c: Fix calculation of code_gen_buffer_max_size
When calculating the point at which we should not try to put another TB into the code gen buffer, we have to allow not just for OPC_MAX_SIZE but OPC_BUF_SIZE. This is because the target translate.c will only stop when an instruction has put it past the OPC_MAX_SIZE limit, so we have to include the MAX_OP_PER_INSTR margin which that final insn might have used. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/exec.c b/exec.c index 9e6913e864..f1777e6239 100644 --- a/exec.c +++ b/exec.c @@ -555,8 +555,8 @@ static void code_gen_alloc(unsigned long tb_size) #endif #endif /* !USE_STATIC_CODE_GEN_BUFFER */ map_exec(code_gen_prologue, sizeof(code_gen_prologue)); - code_gen_buffer_max_size = code_gen_buffer_size - - (TCG_MAX_OP_SIZE * OPC_MAX_SIZE); + code_gen_buffer_max_size = code_gen_buffer_size - + (TCG_MAX_OP_SIZE * OPC_BUF_SIZE); code_gen_max_blocks = code_gen_buffer_size / CODE_GEN_AVG_BLOCK_SIZE; tbs = qemu_malloc(code_gen_max_blocks * sizeof(TranslationBlock)); } |