diff options
| author | Richard Henderson <rth@twiddle.net> | 2015-12-02 13:59:59 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2016-02-09 10:19:32 +1100 |
| commit | 23dceda62a3643f734b7aa474fa6052593ae1a70 (patch) | |
| tree | 2d87c66e824a2fcd02556700ae3a3df6b0a5d296 /tcg/ia64 | |
| parent | e4a096b1cd4350eeca5dcdc391ab333d2083d7fd (diff) | |
| download | qemu-23dceda62a3643f734b7aa474fa6052593ae1a70.tar.gz qemu-23dceda62a3643f734b7aa474fa6052593ae1a70.tar.bz2 qemu-23dceda62a3643f734b7aa474fa6052593ae1a70.zip | |
tcg: Respect highwater in tcg_out_tb_finalize
Undo the workaround at b17a6d3390f87620735f7efb03bb1c96682ff449.
If there are lots of memory operations in a TB, the slow path code
can exceed the highwater reservation. Add a check within the loop.
Tested-by: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'tcg/ia64')
| -rw-r--r-- | tcg/ia64/tcg-target.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tcg/ia64/tcg-target.c b/tcg/ia64/tcg-target.c index 647e9a6f29..62d654943c 100644 --- a/tcg/ia64/tcg-target.c +++ b/tcg/ia64/tcg-target.c @@ -1572,7 +1572,7 @@ static void add_qemu_ldst_label(TCGContext *s, bool is_ld, TCGMemOp opc, be->labels = l; } -static void tcg_out_tb_finalize(TCGContext *s) +static bool tcg_out_tb_finalize(TCGContext *s) { static const void * const helpers[8] = { helper_ret_stb_mmu, @@ -1620,7 +1620,16 @@ static void tcg_out_tb_finalize(TCGContext *s) } reloc_pcrel21b_slot2(l->label_ptr, dest); + + /* Test for (pending) buffer overflow. The assumption is that any + 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((void *)s->code_ptr > s->code_gen_highwater)) { + return false; + } } + return true; } static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args) |