yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-24 22:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg: Respect highwater in tcg_out_tb_finalize

Browse source 
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.

Backports commit 23dceda62a3643f734b7aa474fa6052593ae1a70 from qemu
This commit is contained in:
Richard Henderson 2018-02-19 01:40:12 -05:00 committed by Lioncash
parent c9bf91049c
commit 8dbf46ca82
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
qemu/tcg/tcg-be-ldst.h
View file

@ -57,7 +57,7 @@ static inline void tcg_out_tb_init(TCGContext *s)
static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l); static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l);
static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l); static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l);
static void tcg_out_tb_finalize(TCGContext *s) static bool tcg_out_tb_finalize(TCGContext *s)
{ {
TCGLabelQemuLdst *lb = s->be->ldst_labels; TCGLabelQemuLdst *lb = s->be->ldst_labels;
int i, n = s->be->nb_ldst_labels; int i, n = s->be->nb_ldst_labels;
@ -69,7 +69,16 @@ static void tcg_out_tb_finalize(TCGContext *s)
} else { } else {
tcg_out_qemu_st_slow_path(s, lb + i); tcg_out_qemu_st_slow_path(s, lb + i);
} }
/* 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;
} }
/* /*

3
qemu/tcg/tcg-be-null.h
View file

@ -40,6 +40,7 @@ static inline void tcg_out_tb_init(TCGContext *s)
* Generate TB finalization at the end of block * Generate TB finalization at the end of block
*/ */
static inline void tcg_out_tb_finalize(TCGContext *s) static inline bool tcg_out_tb_finalize(TCGContext *s)
{ {
return true;
} }

6
qemu/tcg/tcg.c
View file

@ -107,7 +107,7 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *target);
static int tcg_target_const_match(tcg_target_long val, TCGType type, static int tcg_target_const_match(tcg_target_long val, TCGType type,
const TCGArgConstraint *arg_ct); const TCGArgConstraint *arg_ct);
static void tcg_out_tb_init(TCGContext *s); static void tcg_out_tb_init(TCGContext *s);
static void tcg_out_tb_finalize(TCGContext *s); static bool tcg_out_tb_finalize(TCGContext *s);
#if TCG_TARGET_INSN_UNIT_SIZE == 1 #if TCG_TARGET_INSN_UNIT_SIZE == 1
static QEMU_UNUSED_FUNC inline void tcg_out8(TCGContext *s, uint8_t v) static QEMU_UNUSED_FUNC inline void tcg_out8(TCGContext *s, uint8_t v)
@ -2497,7 +2497,9 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)
s->gen_insn_end_off[num_insns] = tcg_current_code_size(s); s->gen_insn_end_off[num_insns] = tcg_current_code_size(s);
/* Generate TB finalization at the end of block */ /* Generate TB finalization at the end of block */
tcg_out_tb_finalize(s); if (!tcg_out_tb_finalize(s)) {
return -1;
}
/* flush instruction cache */ /* flush instruction cache */
flush_icache_range((uintptr_t)s->code_buf, (uintptr_t)s->code_ptr); flush_icache_range((uintptr_t)s->code_buf, (uintptr_t)s->code_ptr);