Commit c7a856b4 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Laurent Vivier
Browse files

target/unicore32: Prefer qemu_semihosting_log_out() over curses 



Use the common API for semihosting logging.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20200603123754.19059-4-f4bug@amsat.org>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 7a7b6632

default-configs/unicore32-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ 
# Boards:

#

CONFIG_PUV3=y

CONFIG_SEMIHOSTING=y

target/unicore32/helper.c

+5 −52
Original line number Diff line number Diff line
@@ -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);

    qemu_semihosting_log_out(&c, sizeof(c));

}

    }



    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 */

}

#endif

#endif /* !CONFIG_USER_ONLY */



bool uc32_cpu_exec_interrupt(CPUState *cs, int interrupt_request)

{