提交 0a209d4b 编写于 作者: R Richard Henderson 提交者: Aurelien Jarno

tcg: Sanity check goto_tb input

Checking that we don't try for idx != [01] is trivial.  Checking
that we don't issue more than one of any index requires a tad
more data and some ifdefs protecting that new variable.
Signed-off-by: NRichard Henderson <rth@twiddle.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: NAurelien Jarno <aurelien@aurel32.net>
上级 717e7036
...@@ -2275,8 +2275,15 @@ static inline void tcg_gen_exit_tb(tcg_target_long val) ...@@ -2275,8 +2275,15 @@ static inline void tcg_gen_exit_tb(tcg_target_long val)
tcg_gen_op1i(INDEX_op_exit_tb, val); tcg_gen_op1i(INDEX_op_exit_tb, val);
} }
static inline void tcg_gen_goto_tb(int idx) static inline void tcg_gen_goto_tb(unsigned idx)
{ {
/* We only support two chained exits. */
tcg_debug_assert(idx <= 1);
#ifdef CONFIG_DEBUG_TCG
/* Verify that we havn't seen this numbered exit before. */
tcg_debug_assert((tcg_ctx.goto_tb_issue_mask & (1 << idx)) == 0);
tcg_ctx.goto_tb_issue_mask |= 1 << idx;
#endif
tcg_gen_op1i(INDEX_op_goto_tb, idx); tcg_gen_op1i(INDEX_op_goto_tb, idx);
} }
......
...@@ -298,6 +298,10 @@ void tcg_func_start(TCGContext *s) ...@@ -298,6 +298,10 @@ void tcg_func_start(TCGContext *s)
s->nb_labels = 0; s->nb_labels = 0;
s->current_frame_offset = s->frame_start; s->current_frame_offset = s->frame_start;
#ifdef CONFIG_DEBUG_TCG
s->goto_tb_issue_mask = 0;
#endif
gen_opc_ptr = gen_opc_buf; gen_opc_ptr = gen_opc_buf;
gen_opparam_ptr = gen_opparam_buf; gen_opparam_ptr = gen_opparam_buf;
} }
......
...@@ -390,6 +390,7 @@ struct TCGContext { ...@@ -390,6 +390,7 @@ struct TCGContext {
#ifdef CONFIG_DEBUG_TCG #ifdef CONFIG_DEBUG_TCG
int temps_in_use; int temps_in_use;
int goto_tb_issue_mask;
#endif #endif
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册