From: Laurent Vivier <laurent@vivier.eu>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>, qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, "Thomas Huth" <thuth@redhat.com>,
"Guan Xuetao" <gxt@mprc.pku.edu.cn>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Richard Henderson" <rth@twiddle.net>
Subject: Re: [PATCH 3/3] target/unicore32: Prefer qemu_semihosting_log_out() over curses
Date: Tue, 9 Jun 2020 19:42:59 +0200 [thread overview]
Message-ID: <865c1389-4444-11e3-b156-256407a326d7@vivier.eu> (raw)
In-Reply-To: <20200603123754.19059-4-f4bug@amsat.org>
Le 03/06/2020 à 14:37, Philippe Mathieu-Daudé a écrit :
> Use the common API for semihosting logging.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> default-configs/unicore32-softmmu.mak | 1 +
> target/unicore32/helper.c | 57 +++------------------------
> 2 files changed, 6 insertions(+), 52 deletions(-)
>
> diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/unicore32-softmmu.mak
> index 0bfce48c6d..899288e3d7 100644
> --- a/default-configs/unicore32-softmmu.mak
> +++ b/default-configs/unicore32-softmmu.mak
> @@ -3,3 +3,4 @@
> # Boards:
> #
> CONFIG_PUV3=y
> +CONFIG_SEMIHOSTING=y
> diff --git a/target/unicore32/helper.c b/target/unicore32/helper.c
> index 00371a7da6..54c26871fe 100644
> --- a/target/unicore32/helper.c
> +++ b/target/unicore32/helper.c
> @@ -14,9 +14,7 @@
> #include "cpu.h"
> #include "exec/exec-all.h"
> #include "exec/helper-proto.h"
> -#ifndef CONFIG_USER_ONLY
> -#include "ui/console.h"
> -#endif
> +#include "hw/semihosting/console.h"
>
> #undef DEBUG_UC32
>
> @@ -161,58 +159,13 @@ uint32_t helper_cp0_get(CPUUniCore32State *env, uint32_t creg, uint32_t cop)
> return 0;
> }
>
> -#ifdef CONFIG_CURSES
> -
> -/* KEY_EVENT is defined in wincon.h and in curses.h. Avoid redefinition. */
> -#undef KEY_EVENT
> -#include <curses.h>
> -#undef KEY_EVENT
> -
> -/*
> - * FIXME:
> - * 1. curses windows will be blank when switching back
> - * 2. backspace is not handled yet
> - */
> -static void putc_on_screen(unsigned char ch)
> +void helper_cp1_putc(target_ulong regval)
> {
> - static WINDOW *localwin;
> - static int init;
> + const char c = regval;
>
> - if (!init) {
> - /* Assume 80 * 30 screen to minimize the implementation */
> - localwin = newwin(30, 80, 0, 0);
> - scrollok(localwin, TRUE);
> - init = TRUE;
> - }
> -
> - if (isprint(ch)) {
> - wprintw(localwin, "%c", ch);
> - } else {
> - switch (ch) {
> - case '\n':
> - wprintw(localwin, "%c", ch);
> - break;
> - case '\r':
> - /* If '\r' is put before '\n', the curses window will destroy the
> - * last print line. And meanwhile, '\n' implifies '\r' inside. */
> - break;
> - default: /* Not handled, so just print it hex code */
> - wprintw(localwin, "-- 0x%x --", ch);
> - }
> - }
> -
> - wrefresh(localwin);
> + qemu_semihosting_log_out(&c, sizeof(c));
> }
> -#else
> -#define putc_on_screen(c) do { } while (0)
> -#endif
> -
> -void helper_cp1_putc(target_ulong x)
> -{
> - putc_on_screen((unsigned char)x); /* Output to screen */
> - DPRINTF("%c", x); /* Output to stdout */
> -}
> -#endif
> +#endif /* !CONFIG_USER_ONLY */
>
> bool uc32_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
> {
>
Applied to my trivial-patches branch.
Thanks,
Laurent
prev parent reply other threads:[~2020-06-09 17:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 12:37 [PATCH 0/3] target/unicore32: Semihosting cleanup Philippe Mathieu-Daudé
2020-06-03 12:37 ` [PATCH 1/3] target/unicore32: Remove unused headers Philippe Mathieu-Daudé
2020-06-03 16:15 ` Richard Henderson
2020-06-09 17:35 ` Laurent Vivier
2020-06-03 12:37 ` [PATCH 2/3] target/unicore32: Replace DPRINTF() by qemu_log_mask(GUEST_ERROR) Philippe Mathieu-Daudé
2020-06-03 16:17 ` Richard Henderson
2020-06-09 17:38 ` Laurent Vivier
2020-06-03 12:37 ` [PATCH 3/3] target/unicore32: Prefer qemu_semihosting_log_out() over curses Philippe Mathieu-Daudé
2020-06-03 16:18 ` Richard Henderson
2020-06-09 17:42 ` Laurent Vivier [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=865c1389-4444-11e3-b156-256407a326d7@vivier.eu \
--to=laurent@vivier.eu \
--cc=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=gxt@mprc.pku.edu.cn \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).