qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Michael Tokarev" <mjt@tls.msk.ru>,
	"Laurent Vivier" <laurent@vivier.eu>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL v2 14/16] target/unicore32: Prefer qemu_semihosting_log_out() over curses
Date: Wed, 10 Jun 2020 15:10:09 +0200	[thread overview]
Message-ID: <20200610131011.1941209-15-laurent@vivier.eu> (raw)
In-Reply-To: <20200610131011.1941209-1-laurent@vivier.eu>

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Use the common API for semihosting logging.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200603123754.19059-4-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 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 0bfce48c6da7..899288e3d715 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 00371a7da660..54c26871feab 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;
-
-    if (!init) {
-        /* Assume 80 * 30 screen to minimize the implementation */
-        localwin = newwin(30, 80, 0, 0);
-        scrollok(localwin, TRUE);
-        init = TRUE;
-    }
+    const char c = regval;
 
-    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);
-}
-#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 */
+    qemu_semihosting_log_out(&c, sizeof(c));
 }
-#endif
+#endif /* !CONFIG_USER_ONLY */
 
 bool uc32_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
 {
-- 
2.26.2



  parent reply	other threads:[~2020-06-10 13:14 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-10 13:09 [PULL v2 00/16] Trivial branch for 5.1 patches Laurent Vivier
2020-06-10 13:09 ` [PULL v2 01/16] Fix parameter type in vhost migration log path Laurent Vivier
2020-06-10 13:09 ` [PULL v2 02/16] net: Do not include a newline in the id of -nic devices Laurent Vivier
2020-06-10 13:09 ` [PULL v2 03/16] .mailmap: Update Fred Konrad email address Laurent Vivier
2020-06-10 13:09 ` [PULL v2 04/16] hw/unicore32/puv3: Use qemu_log_mask(ERROR) instead of debug printf() Laurent Vivier
2020-06-10 13:10 ` [PULL v2 05/16] hw/isa/apm: Convert debug printf()s to trace events Laurent Vivier
2020-06-10 13:10 ` [PULL v2 06/16] hw/misc/auxbus: Use qemu_log_mask(UNIMP) instead of debug printf Laurent Vivier
2020-06-10 13:10 ` [PULL v2 07/16] qemu-img: Fix doc typo for 'bitmap' subcommand Laurent Vivier
2020-06-10 13:10 ` [PULL v2 08/16] hw/arm/aspeed: Correct DRAM container region size Laurent Vivier
2020-06-10 13:10 ` [PULL v2 09/16] hw/hppa/dino: Use the IEC binary prefix definitions Laurent Vivier
2020-06-10 13:10 ` [PULL v2 10/16] hw/i386/xen/xen-hvm: " Laurent Vivier
2020-06-10 13:10 ` [PULL v2 11/16] target/i386/cpu: " Laurent Vivier
2020-06-10 13:10 ` [PULL v2 12/16] target/unicore32: Remove unused headers Laurent Vivier
2020-06-10 13:10 ` [PULL v2 13/16] target/unicore32: Replace DPRINTF() by qemu_log_mask(GUEST_ERROR) Laurent Vivier
2020-06-10 13:10 ` Laurent Vivier [this message]
2020-06-10 13:10 ` [PULL v2 15/16] hw/openrisc/openrisc_sim: Add assertion to silence GCC warning Laurent Vivier
2020-06-10 13:10 ` [PULL v2 16/16] semihosting: remove the pthread include which seems unused Laurent Vivier
2020-06-11 20:19 ` [PULL v2 00/16] Trivial branch for 5.1 patches Peter Maydell

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=20200610131011.1941209-15-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=f4bug@amsat.org \
    --cc=mjt@tls.msk.ru \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /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).