Skip to contentSkip to conversation

HPPA tcg fixes

PATCH In review Sven Schnelle 3 participants 7 messages Sep 13, 2019

lore
Share & tools
lore
#0 lore raw

cover HPPA tcg fixes

Hi Richard,

here are two patches for HPPA tcg. QEMU was crashing with a tcg assert because dead temporaries where used. This could be observed at the end· of a HP-UX 11.11 installation, or by running the STARBASE X11 demos in HP-UX 10.20.

Thanks,
Sven

Sven Schnelle (2):
target/hppa: prevent trashing of temporary in trans_mtctl() target/hppa: prevent trashing of temporary in do_depw_sar()

 target/hppa/translate.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
Signature · 1 line
2.23.0.rc1
#1 lore raw

PATCH 1/2 target/hppa: prevent trashing of temporary in trans_mtctl()

nullify_over() calls brcond which destroys all temporaries.

---
 target/hppa/translate.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
target/hppa/translate.c +4 -1
index 53e17d8963..b12525d535 100644
@@ -2214,10 +2214,11 @@ static bool trans_mtsp(DisasContext *ctx, arg_mtsp *a)
 static bool trans_mtctl(DisasContext *ctx, arg_mtctl *a)
 {
     unsigned ctl = a->t;
-    TCGv_reg reg = load_gpr(ctx, a->r);
+    TCGv_reg reg;
     TCGv_reg tmp;
 
     if (ctl == CR_SAR) {
+        reg = load_gpr(ctx, a->r);
         tmp = tcg_temp_new();
         tcg_gen_andi_reg(tmp, reg, TARGET_REGISTER_BITS - 1);
         save_or_nullify(ctx, cpu_sar, tmp);
@@ -2232,6 +2233,8 @@ static bool trans_mtctl(DisasContext *ctx, arg_mtctl *a)
 
 #ifndef CONFIG_USER_ONLY
     nullify_over(ctx);
+    reg = load_gpr(ctx, a->r);
+
     switch (ctl) {
     case CR_IT:
         gen_helper_write_interval_timer(cpu_env, reg);
Signature · 1 line
2.23.0.rc1
#2 lore raw

PATCH 2/2 target/hppa: prevent trashing of temporary in do_depw_sar()

In reply to Sven Schnelle

nullify_over() calls brcond which destroys all temporaries.

---
 target/hppa/translate.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
target/hppa/translate.c +6 -4
index b12525d535..c1b2822f60 100644
@@ -3404,10 +3404,6 @@ static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c,
     TCGv_reg mask, tmp, shift, dest;
     unsigned msb = 1U << (len - 1);
 
-    if (c) {
-        nullify_over(ctx);
-    }
-
     dest = dest_gpr(ctx, rt);
     shift = tcg_temp_new();
     tmp = tcg_temp_new();
@@ -3440,11 +3436,17 @@ static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c,
 
 static bool trans_depw_sar(DisasContext *ctx, arg_depw_sar *a)
 {
+    if (a->c) {
+        nullify_over(ctx);
+    }
     return do_depw_sar(ctx, a->t, a->c, a->nz, a->clen, load_gpr(ctx, a->r));
 }
 
 static bool trans_depwi_sar(DisasContext *ctx, arg_depwi_sar *a)
 {
+    if (a->c) {
+        nullify_over(ctx);
+    }
     return do_depw_sar(ctx, a->t, a->c, a->nz, a->clen, load_const(ctx, a->i));
 }
 
Signature · 1 line
2.23.0.rc1
#3 lore raw

Re: [Qemu-devel] [PATCH 2/2] target/hppa: prevent trashing of temporary in do_depw_sar()

Hi Sven,

Quoted 27 lines · Sven Schnelle

nullify_over() calls brcond which destroys all temporaries.

---
 target/hppa/translate.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
target/hppa/translate.c +1 -4
index b12525d535..c1b2822f60 100644
@@ -3404,10 +3404,6 @@ static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c,
     TCGv_reg mask, tmp, shift, dest;
     unsigned msb = 1U << (len - 1);
 
-    if (c) {
-        nullify_over(ctx);
-    }
-
     dest = dest_gpr(ctx, rt);
     shift = tcg_temp_new();
     tmp = tcg_temp_new();
@@ -3440,11 +3436,17 @@ static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c,
 
 static bool trans_depw_sar(DisasContext *ctx, arg_depw_sar *a)
 {
+    if (a->c) {

target/hppa/translate.c static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c, · line 3449

Quoted 10 lines
target/hppa/translate.c +5 -0
+        nullify_over(ctx);
+    }
     return do_depw_sar(ctx, a->t, a->c, a->nz, a->clen, load_gpr(ctx, a->r));
 }
 
 static bool trans_depwi_sar(DisasContext *ctx, arg_depwi_sar *a)
 {
+    if (a->c) {
+        nullify_over(ctx);
+    }

I don't see how this patch helps or change anything, isn't it the same? You clean in the caller rather than the callee.

Quoted 4 lines
target/hppa/translate.c +0 -0
     return do_depw_sar(ctx, a->t, a->c, a->nz, a->clen, load_const(ctx, a->i));
 }
 
#4 lore raw

Re: [Qemu-devel] [PATCH 2/2] target/hppa: prevent trashing of temporary in do_depw_sar()

Hi Philippe,

Quoted 35 lines · Philippe Mathieu-Daudé

Hi Sven,

Quoted 32 lines · Sven Schnelle

nullify_over() calls brcond which destroys all temporaries.

---
 target/hppa/translate.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
target/hppa/translate.c +3 -4
index b12525d535..c1b2822f60 100644
@@ -3404,10 +3404,6 @@ static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c,
     TCGv_reg mask, tmp, shift, dest;
     unsigned msb = 1U << (len - 1);
 
-    if (c) {
-        nullify_over(ctx);
-    }
-
     dest = dest_gpr(ctx, rt);
     shift = tcg_temp_new();
     tmp = tcg_temp_new();
@@ -3440,11 +3436,17 @@ static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c,
 
 static bool trans_depw_sar(DisasContext *ctx, arg_depw_sar *a)
 {
+    if (a->c) {
+        nullify_over(ctx);
+    }
     return do_depw_sar(ctx, a->t, a->c, a->nz, a->clen, load_gpr(ctx, a->r));
 }
 
Quoted 8 lines

target/hppa/translate.c static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c, · line 3449

Quoted 5 lines
target/hppa/translate.c +3 -0
 static bool trans_depwi_sar(DisasContext *ctx, arg_depwi_sar *a)
 {
+    if (a->c) {
+        nullify_over(ctx);
+    }

I don't see how this patch helps or change anything, isn't it the same? You clean in the caller rather than the callee.

The Problem is that load_gpr()/load_const() allocate a temporary, which gets destroyed in do_depw_sar() when nullify_over() is called. If we move the nullify_over() before doing the load_gpr()/load_const() this doesn't happen.

Quoted 4 lines

target/hppa/translate.c static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c, · line 3452

Quoted 4 lines
target/hppa/translate.c +0 -0
     return do_depw_sar(ctx, a->t, a->c, a->nz, a->clen, load_const(ctx, a->i));
 }
 

Regards
Sven

#5 lore raw

Re: [Qemu-devel] [PATCH 2/2] target/hppa: prevent trashing of temporary in do_depw_sar()

Quoted 47 lines · Sven Schnelle

Hi Philippe,

Quoted 35 lines · Philippe Mathieu-Daudé

Hi Sven,

Quoted 32 lines · Sven Schnelle

nullify_over() calls brcond which destroys all temporaries.

---
 target/hppa/translate.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
target/hppa/translate.c +3 -4
index b12525d535..c1b2822f60 100644
@@ -3404,10 +3404,6 @@ static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c,
     TCGv_reg mask, tmp, shift, dest;
     unsigned msb = 1U << (len - 1);
 
-    if (c) {
-        nullify_over(ctx);
-    }
-
     dest = dest_gpr(ctx, rt);
     shift = tcg_temp_new();
     tmp = tcg_temp_new();
@@ -3440,11 +3436,17 @@ static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c,
 
 static bool trans_depw_sar(DisasContext *ctx, arg_depw_sar *a)
 {
+    if (a->c) {
+        nullify_over(ctx);
+    }
     return do_depw_sar(ctx, a->t, a->c, a->nz, a->clen, load_gpr(ctx, a->r));
 }
 
Quoted 8 lines

target/hppa/translate.c static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c, · line 3449

Quoted 5 lines
target/hppa/translate.c +3 -0
 static bool trans_depwi_sar(DisasContext *ctx, arg_depwi_sar *a)
 {
+    if (a->c) {
+        nullify_over(ctx);
+    }

I don't see how this patch helps or change anything, isn't it the same? You clean in the caller rather than the callee.

Quoted 4 lines

The Problem is that load_gpr()/load_const() allocate a temporary, which gets destroyed in do_depw_sar() when nullify_over() is called. If we move the nullify_over() before doing the load_gpr()/load_const() this doesn't happen.

Ah! The 'val' argument... I missed that, thanks!

Maybe we can add a comment to make it clearer:

   if (a->c) {
       /*
        * nullify here to not free the load_gpr() arg before
        * calling depw_sar.
        */
       nullify_over(ctx);
   }
   return do_depw_sar(ctx, a->t, a->c, a->nz, a->clen, load_gpr(ctx, a->r));

(also in the other function).

Quoted 8 lines
Quoted 4 lines

target/hppa/translate.c static bool do_depw_sar(DisasContext *ctx, unsigned rt, unsigned c, · line 3452

Quoted 4 lines
target/hppa/translate.c +0 -0
     return do_depw_sar(ctx, a->t, a->c, a->nz, a->clen, load_const(ctx, a->i));
 }
 

Regards
Sven

#6 lore raw
In reply to Sven Schnelle
Quoted 6 lines · Sven Schnelle

Sven Schnelle (2):
target/hppa: prevent trashing of temporary in trans_mtctl() target/hppa: prevent trashing of temporary in do_depw_sar()

 target/hppa/translate.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Thanks, queued.

r~