From 4cacbf212fdfe42ded7ecd023b1d213ddcf30774 Mon Sep 17 00:00:00 2001 From: "Emilio G. Cota" Date: Fri, 23 Feb 2018 13:35:30 -0500 Subject: [PATCH] translate-all: add missing fold of tb_ctx into tcg_ctx Since 5e5f07e08 "TCG: Move translation block variables to new context inside tcg_ctx: tb_ctx" on Feb 1 2013, compilation of usermode + TB_DEBUG_CHECK has been broken. Fix it. Backports commit 7e6bd36d61129feb7f667cb09ffec1b7b54b971c from qemu --- qemu/translate-all.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qemu/translate-all.c b/qemu/translate-all.c index 58129451..7dde730e 100644 --- a/qemu/translate-all.c +++ b/qemu/translate-all.c @@ -942,7 +942,8 @@ static void tb_invalidate_check(target_ulong address) address &= TARGET_PAGE_MASK; for (i = 0; i < CODE_GEN_PHYS_HASH_SIZE; i++) { - for (tb = tb_ctx.tb_phys_hash[i]; tb != NULL; tb = tb->phys_hash_next) { + for (tb = tcg_ctx->tb_ctx.tb_phys_hash[i]; tb != NULL; + tb = tb->phys_hash_next) { if (!(address + TARGET_PAGE_SIZE <= tb->pc || address >= tb->pc + tb->size)) { printf("ERROR invalidate: address=" TARGET_FMT_lx