#include "user-internals.h"
#include <termios.h>
-int qemu_semihosting_console_outs(CPUArchState *env, target_ulong addr)
-{
- int len = target_strlen(addr);
- void *s;
- if (len < 0){
- qemu_log_mask(LOG_GUEST_ERROR,
- "%s: passed inaccessible address " TARGET_FMT_lx,
- __func__, addr);
- return 0;
- }
- s = lock_user(VERIFY_READ, addr, (long)(len + 1), 1);
- g_assert(s); /* target_strlen has already verified this will work */
- len = write(STDERR_FILENO, s, len);
- unlock_user(s, addr, 0);
- return len;
-}
-
-void qemu_semihosting_console_outc(CPUArchState *env, target_ulong addr)
-{
- char c;
-
- if (get_user_u8(c, addr)) {
- qemu_log_mask(LOG_GUEST_ERROR,
- "%s: passed inaccessible address " TARGET_FMT_lx,
- __func__, addr);
- } else {
- if (write(STDERR_FILENO, &c, 1) != 1) {
- qemu_log_mask(LOG_UNIMP, "%s: unexpected write to stdout failure",
- __func__);
- }
- }
-}
-
/*
* For linux-user we can safely block. However as we want to return as
* soon as a character is read we need to tweak the termio to disable
* program is expecting more normal behaviour. This is slow but
* nothing using semihosting console reading is expecting to be fast.
*/
-target_ulong qemu_semihosting_console_inc(CPUArchState *env)
+int qemu_semihosting_console_read(CPUState *cs, void *buf, int len)
{
- uint8_t c;
+ int ret;
struct termios old_tio, new_tio;
/* Disable line-buffering and echo */
tcgetattr(STDIN_FILENO, &old_tio);
new_tio = old_tio;
new_tio.c_lflag &= (~ICANON & ~ECHO);
+ new_tio.c_cc[VMIN] = 1;
+ new_tio.c_cc[VTIME] = 0;
tcsetattr(STDIN_FILENO, TCSANOW, &new_tio);
- c = getchar();
+ ret = fread(buf, 1, len, stdin);
/* restore config */
tcsetattr(STDIN_FILENO, TCSANOW, &old_tio);
- return (target_ulong) c;
+ return ret;
+}
+
+int qemu_semihosting_console_write(void *buf, int len)
+{
+ return fwrite(buf, 1, len, stderr);
}