Patchwork [for-1.4] target-cris: Build fix for debug output

login
register
mail settings
Submitter Andreas Färber
Date Jan. 27, 2013, 6:26 a.m.
Message ID <1359267965-19902-1-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/215969/
State New
Headers show

Comments

Andreas Färber - Jan. 27, 2013, 6:26 a.m.
Around r3361 (81fdc5f8d2d681da8d255baf0713144f8656bac9) env->debug1 used
to contain the address of an MMU fault. This is now written into
env->pregs[PR_EDA] instead.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 target-cris/op_helper.c |    2 +-
 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
Andreas Färber - Feb. 4, 2013, 1:42 p.m.
Am 27.01.2013 07:26, schrieb Andreas Färber:
> Around r3361 (81fdc5f8d2d681da8d255baf0713144f8656bac9) env->debug1 used
> to contain the address of an MMU fault. This is now written into
> env->pregs[PR_EDA] instead.
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  target-cris/op_helper.c |    2 +-
>  1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)

Ping! Resent as part of my debug output RFC already, and it missed rc0.

CC'ing qemu-trivial as it should be easily confirmable by comparing the
mentioned commit with today's MMU fault handler (helper.c iirc).

Andreas

> diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
> index 0f6a1ee..b580513 100644
> --- a/target-cris/op_helper.c
> +++ b/target-cris/op_helper.c
> @@ -60,7 +60,7 @@ void tlb_fill(CPUCRISState *env, target_ulong addr, int is_write, int mmu_idx,
>      int ret;
>  
>      D_LOG("%s pc=%x tpc=%x ra=%p\n", __func__,
> -          env->pc, env->debug1, (void *)retaddr);
> +          env->pc, env->pregs[PR_EDA], (void *)retaddr);
>      ret = cpu_cris_handle_mmu_fault(env, addr, is_write, mmu_idx);
>      if (unlikely(ret)) {
>          if (retaddr) {
Edgar Iglesias - Feb. 4, 2013, 3:14 p.m.
On Mon, Feb 04, 2013 at 02:42:55PM +0100, Andreas Färber wrote:
> Am 27.01.2013 07:26, schrieb Andreas Färber:
> > Around r3361 (81fdc5f8d2d681da8d255baf0713144f8656bac9) env->debug1 used
> > to contain the address of an MMU fault. This is now written into
> > env->pregs[PR_EDA] instead.
> > 
> > Signed-off-by: Andreas Färber <afaerber@suse.de>
> > ---
> >  target-cris/op_helper.c |    2 +-
> >  1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
> 
> Ping! Resent as part of my debug output RFC already, and it missed rc0.
> 
> CC'ing qemu-trivial as it should be easily confirmable by comparing the
> mentioned commit with today's MMU fault handler (helper.c iirc).


Applied, thanks.

Edgar

Patch

diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index 0f6a1ee..b580513 100644
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -60,7 +60,7 @@  void tlb_fill(CPUCRISState *env, target_ulong addr, int is_write, int mmu_idx,
     int ret;
 
     D_LOG("%s pc=%x tpc=%x ra=%p\n", __func__,
-          env->pc, env->debug1, (void *)retaddr);
+          env->pc, env->pregs[PR_EDA], (void *)retaddr);
     ret = cpu_cris_handle_mmu_fault(env, addr, is_write, mmu_idx);
     if (unlikely(ret)) {
         if (retaddr) {