diff mbox

[01/10] translate-all: add missing fold of tb_ctx into tcg_ctx

Message ID 1459834253-8291-2-git-send-email-cota@braap.org
State New
Headers show

Commit Message

Emilio Cota April 5, 2016, 5:30 a.m. UTC
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.

Signed-off-by: Emilio G. Cota <cota@braap.org>
---
 translate-all.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Paolo Bonzini April 5, 2016, 8:49 a.m. UTC | #1
On 05/04/2016 07:30, Emilio G. Cota wrote:
> 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.
> 
> Signed-off-by: Emilio G. Cota <cota@braap.org>
> ---
>  translate-all.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/translate-all.c b/translate-all.c
> index b4df1ec..8329ea6 100644
> --- a/translate-all.c
> +++ b/translate-all.c
> @@ -861,7 +861,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
> 

Thanks, queued for 2.6.

Paolo
diff mbox

Patch

diff --git a/translate-all.c b/translate-all.c
index b4df1ec..8329ea6 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -861,7 +861,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