| Message ID | 1539155198-5873-1-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] target/cris/translate: Get rid of qemu_log_separate() | expand |
On 10/10/2018 09:06, Thomas Huth wrote: > The gen_BUG() function calls already cpu_abort(), which prints the > information to stderr and the log already. So instead of additionally > printing the dc->pc via fprintf() and qemu_log here, too, we can > simply pass this information to cpu_abort() instead. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > v2: Use "pc=" instead of "dc->pc=" in the string as suggested by Phil Thanks. Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > target/cris/translate.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/target/cris/translate.c b/target/cris/translate.c > index 4ae1c04..11b2c11 100644 > --- a/target/cris/translate.c > +++ b/target/cris/translate.c > @@ -137,11 +137,7 @@ typedef struct DisasContext { > > static void gen_BUG(DisasContext *dc, const char *file, int line) > { > - fprintf(stderr, "BUG: pc=%x %s %d\n", dc->pc, file, line); > - if (qemu_log_separate()) { > - qemu_log("BUG: pc=%x %s %d\n", dc->pc, file, line); > - } > - cpu_abort(CPU(dc->cpu), "%s:%d\n", file, line); > + cpu_abort(CPU(dc->cpu), "%s:%d pc=%x\n", file, line, dc->pc); > } > > static const char *regnames_v32[] = >
diff --git a/target/cris/translate.c b/target/cris/translate.c index 4ae1c04..11b2c11 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -137,11 +137,7 @@ typedef struct DisasContext { static void gen_BUG(DisasContext *dc, const char *file, int line) { - fprintf(stderr, "BUG: pc=%x %s %d\n", dc->pc, file, line); - if (qemu_log_separate()) { - qemu_log("BUG: pc=%x %s %d\n", dc->pc, file, line); - } - cpu_abort(CPU(dc->cpu), "%s:%d\n", file, line); + cpu_abort(CPU(dc->cpu), "%s:%d pc=%x\n", file, line, dc->pc); } static const char *regnames_v32[] =
The gen_BUG() function calls already cpu_abort(), which prints the information to stderr and the log already. So instead of additionally printing the dc->pc via fprintf() and qemu_log here, too, we can simply pass this information to cpu_abort() instead. Signed-off-by: Thomas Huth <thuth@redhat.com> --- v2: Use "pc=" instead of "dc->pc=" in the string as suggested by Phil target/cris/translate.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)