[for-1.4,07/19] target-sparc: Fix debug output for DEBUG_MMU

Submitted by Andreas Färber on Jan. 27, 2013, 1:32 p.m.

Details

Message ID 1359293537-8251-8-git-send-email-afaerber@suse.de
State New
Headers show

Commit Message

Andreas Färber Jan. 27, 2013, 1:32 p.m.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 target-sparc/ldst_helper.c |    2 +-
 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)

Comments

Andreas Färber Feb. 14, 2013, 3:46 p.m.
Blue,

Am 27.01.2013 14:32, schrieb Andreas Färber:
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  target-sparc/ldst_helper.c |    2 +-
>  1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
> 
> diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
> index cf1bddf..7decd66 100644
> --- a/target-sparc/ldst_helper.c
> +++ b/target-sparc/ldst_helper.c
> @@ -1850,7 +1850,7 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, target_ulong val,
>                  DPRINTF_MMU("LSU change: 0x%" PRIx64 " -> 0x%" PRIx64 "\n",
>                              oldreg, env->lsu);
>  #ifdef DEBUG_MMU
> -                dump_mmu(stdout, fprintf, env1);
> +                dump_mmu(stdout, fprintf, env);
>  #endif
>                  tlb_flush(env, 1);
>              }

This patch was not applied to master. Was that an oversight or is
something wrong with it? (Preparing a v2 series for 1.5.)

Andreas
Blue Swirl Feb. 14, 2013, 9:42 p.m.
On Thu, Feb 14, 2013 at 3:46 PM, Andreas Färber <afaerber@suse.de> wrote:
> Blue,
>
> Am 27.01.2013 14:32, schrieb Andreas Färber:
>> Signed-off-by: Andreas Färber <afaerber@suse.de>
>> ---
>>  target-sparc/ldst_helper.c |    2 +-
>>  1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
>>
>> diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
>> index cf1bddf..7decd66 100644
>> --- a/target-sparc/ldst_helper.c
>> +++ b/target-sparc/ldst_helper.c
>> @@ -1850,7 +1850,7 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, target_ulong val,
>>                  DPRINTF_MMU("LSU change: 0x%" PRIx64 " -> 0x%" PRIx64 "\n",
>>                              oldreg, env->lsu);
>>  #ifdef DEBUG_MMU
>> -                dump_mmu(stdout, fprintf, env1);
>> +                dump_mmu(stdout, fprintf, env);
>>  #endif
>>                  tlb_flush(env, 1);
>>              }
>
> This patch was not applied to master. Was that an oversight or is
> something wrong with it? (Preparing a v2 series for 1.5.)

Wasn't this a part of RFC series? What happened with the rest of the 19?

>
> Andreas
>
> --
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Andreas Färber Feb. 15, 2013, 12:24 a.m.
Am 14.02.2013 22:42, schrieb Blue Swirl:
> On Thu, Feb 14, 2013 at 3:46 PM, Andreas Färber <afaerber@suse.de> wrote:
>> Am 27.01.2013 14:32, schrieb Andreas Färber:
>>> Signed-off-by: Andreas Färber <afaerber@suse.de>
>>> ---
>>>  target-sparc/ldst_helper.c |    2 +-
>>>  1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
>>>
>>> diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
>>> index cf1bddf..7decd66 100644
>>> --- a/target-sparc/ldst_helper.c
>>> +++ b/target-sparc/ldst_helper.c
>>> @@ -1850,7 +1850,7 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, target_ulong val,
>>>                  DPRINTF_MMU("LSU change: 0x%" PRIx64 " -> 0x%" PRIx64 "\n",
>>>                              oldreg, env->lsu);
>>>  #ifdef DEBUG_MMU
>>> -                dump_mmu(stdout, fprintf, env1);
>>> +                dump_mmu(stdout, fprintf, env);
>>>  #endif
>>>                  tlb_flush(env, 1);
>>>              }
>>
>> This patch was not applied to master. Was that an oversight or is
>> something wrong with it? (Preparing a v2 series for 1.5.)
> 
> Wasn't this a part of RFC series? What happened with the rest of the 19?

This is a standalone bugfix, originally intended for 1.4 as indicated by
the subject.

cris, ppc and s390x bugfixes were applied through the maintainers during
Soft Freeze.

The cris Coding Style cleanup is still pending, no feedback from Edgar
on whether it is okay or not yet (already 3x on the list).

The actual RFC patches based on those are being redone similar to the
tmp105 v3 patch I ping'ed, based on suggestions from Anthony and Alex.
I inserted a patch to add qemu_log_mask_vprintf() as prerequisite.

Andreas
Edgar Iglesias Feb. 16, 2013, 5:23 a.m.
Cleanup patch is ok with me.
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>

---
Sent from my phone
On Feb 15, 2013 12:24 AM, "Andreas Färber" <afaerber@suse.de> wrote:
>
> Am 14.02.2013 22:42, schrieb Blue Swirl:
> > On Thu, Feb 14, 2013 at 3:46 PM, Andreas Färber <afaerber@suse.de>
wrote:
> >> Am 27.01.2013 14:32, schrieb Andreas Färber:
> >>> Signed-off-by: Andreas Färber <afaerber@suse.de>
> >>> ---
> >>>  target-sparc/ldst_helper.c |    2 +-
> >>>  1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
> >>>
> >>> diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
> >>> index cf1bddf..7decd66 100644
> >>> --- a/target-sparc/ldst_helper.c
> >>> +++ b/target-sparc/ldst_helper.c
> >>> @@ -1850,7 +1850,7 @@ void helper_st_asi(CPUSPARCState *env,
target_ulong addr, target_ulong val,
> >>>                  DPRINTF_MMU("LSU change: 0x%" PRIx64 " -> 0x%"
PRIx64 "\n",
> >>>                              oldreg, env->lsu);
> >>>  #ifdef DEBUG_MMU
> >>> -                dump_mmu(stdout, fprintf, env1);
> >>> +                dump_mmu(stdout, fprintf, env);
> >>>  #endif
> >>>                  tlb_flush(env, 1);
> >>>              }
> >>
> >> This patch was not applied to master. Was that an oversight or is
> >> something wrong with it? (Preparing a v2 series for 1.5.)
> >
> > Wasn't this a part of RFC series? What happened with the rest of the 19?
>
> This is a standalone bugfix, originally intended for 1.4 as indicated by
> the subject.
>
> cris, ppc and s390x bugfixes were applied through the maintainers during
> Soft Freeze.
>
> The cris Coding Style cleanup is still pending, no feedback from Edgar
> on whether it is okay or not yet (already 3x on the list).
>
> The actual RFC patches based on those are being redone similar to the
> tmp105 v3 patch I ping'ed, based on suggestions from Anthony and Alex.
> I inserted a patch to add qemu_log_mask_vprintf() as prerequisite.
>
> Andreas
>
> --
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Blue Swirl Feb. 16, 2013, 5:02 p.m.
Thanks, applied.

On Sun, Jan 27, 2013 at 1:32 PM, Andreas Färber <afaerber@suse.de> wrote:
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  target-sparc/ldst_helper.c |    2 +-
>  1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
>
> diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
> index cf1bddf..7decd66 100644
> --- a/target-sparc/ldst_helper.c
> +++ b/target-sparc/ldst_helper.c
> @@ -1850,7 +1850,7 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, target_ulong val,
>                  DPRINTF_MMU("LSU change: 0x%" PRIx64 " -> 0x%" PRIx64 "\n",
>                              oldreg, env->lsu);
>  #ifdef DEBUG_MMU
> -                dump_mmu(stdout, fprintf, env1);
> +                dump_mmu(stdout, fprintf, env);
>  #endif
>                  tlb_flush(env, 1);
>              }
> --
> 1.7.10.4
>

Patch hide | download patch | download mbox

diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
index cf1bddf..7decd66 100644
--- a/target-sparc/ldst_helper.c
+++ b/target-sparc/ldst_helper.c
@@ -1850,7 +1850,7 @@  void helper_st_asi(CPUSPARCState *env, target_ulong addr, target_ulong val,
                 DPRINTF_MMU("LSU change: 0x%" PRIx64 " -> 0x%" PRIx64 "\n",
                             oldreg, env->lsu);
 #ifdef DEBUG_MMU
-                dump_mmu(stdout, fprintf, env1);
+                dump_mmu(stdout, fprintf, env);
 #endif
                 tlb_flush(env, 1);
             }