[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 38/49] semihosting: Pass CPUState to qemu_semihosting_console_
From: |
Richard Henderson |
Subject: |
[PATCH v3 38/49] semihosting: Pass CPUState to qemu_semihosting_console_inc |
Date: |
Fri, 20 May 2022 17:03:49 -0700 |
We don't need CPUArchState, and we do want the CPUState of the
thread performing the operation -- use this instead of current_cpu.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/console.h | 4 ++--
linux-user/semihost.c | 2 +-
semihosting/arm-compat-semi.c | 2 +-
semihosting/console.c | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/semihosting/console.h b/include/semihosting/console.h
index 4f6217bf10..afc961057c 100644
--- a/include/semihosting/console.h
+++ b/include/semihosting/console.h
@@ -39,7 +39,7 @@ void qemu_semihosting_console_outc(CPUArchState *env,
target_ulong c);
/**
* qemu_semihosting_console_inc:
- * @env: CPUArchState
+ * @: CPUState
*
* Receive single character from debug console. As this call may block
* if no data is available we suspend the CPU and will re-execute the
@@ -50,7 +50,7 @@ void qemu_semihosting_console_outc(CPUArchState *env,
target_ulong c);
*
* Returns: character read OR cpu_loop_exit!
*/
-target_ulong qemu_semihosting_console_inc(CPUArchState *env);
+target_ulong qemu_semihosting_console_inc(CPUState *cs);
/**
* qemu_semihosting_log_out:
diff --git a/linux-user/semihost.c b/linux-user/semihost.c
index 17f074ac56..f14c6ae21d 100644
--- a/linux-user/semihost.c
+++ b/linux-user/semihost.c
@@ -56,7 +56,7 @@ void qemu_semihosting_console_outc(CPUArchState *env,
target_ulong addr)
* 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)
+target_ulong qemu_semihosting_console_inc(CPUState *cs)
{
uint8_t c;
struct termios old_tio, new_tio;
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 3eb9d1c049..5d10a2b932 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -415,7 +415,7 @@ void do_common_semihosting(CPUState *cs)
break;
case TARGET_SYS_READC:
- ret = qemu_semihosting_console_inc(env);
+ ret = qemu_semihosting_console_inc(cs);
common_semi_set_ret(cs, ret);
break;
diff --git a/semihosting/console.c b/semihosting/console.c
index 3dd0ac60e2..7b896fe43b 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -144,17 +144,17 @@ static void console_read(void *opaque, const uint8_t
*buf, int size)
c->sleeping_cpus = NULL;
}
-target_ulong qemu_semihosting_console_inc(CPUArchState *env)
+target_ulong qemu_semihosting_console_inc(CPUState *cs)
{
uint8_t ch;
SemihostingConsole *c = &console;
+
g_assert(qemu_mutex_iothread_locked());
- g_assert(current_cpu);
if (fifo8_is_empty(&c->fifo)) {
- c->sleeping_cpus = g_slist_prepend(c->sleeping_cpus, current_cpu);
- current_cpu->halted = 1;
- current_cpu->exception_index = EXCP_HALTED;
- cpu_loop_exit(current_cpu);
+ c->sleeping_cpus = g_slist_prepend(c->sleeping_cpus, cs);
+ cs->halted = 1;
+ cs->exception_index = EXCP_HALTED;
+ cpu_loop_exit(cs);
/* never returns */
}
ch = fifo8_pop(&c->fifo);
--
2.34.1
- Re: [PATCH v3 13/49] semihosting: Move common-semi.h to include/semihosting/, (continued)
- [PATCH v3 24/49] semihosting: Split out semihost_sys_close, Richard Henderson, 2022/05/20
- [PATCH v3 16/49] include/exec: Define errno values in gdbstub.h, Richard Henderson, 2022/05/20
- [PATCH v3 12/49] semihosting: Return void from do_common_semihosting, Richard Henderson, 2022/05/20
- [PATCH v3 18/49] semihosting: Split is_64bit_semihosting per target, Richard Henderson, 2022/05/20
- [PATCH v3 26/49] semihosting: Split out semihost_sys_write, Richard Henderson, 2022/05/20
- [PATCH v3 39/49] semihosting: Expand qemu_semihosting_console_inc to read, Richard Henderson, 2022/05/20
- [PATCH v3 25/49] semihosting: Split out semihost_sys_read, Richard Henderson, 2022/05/20
- [PATCH v3 38/49] semihosting: Pass CPUState to qemu_semihosting_console_inc,
Richard Henderson <=
- [PATCH v3 32/49] semihosting: Split out semihost_sys_rename, Richard Henderson, 2022/05/20
- [PATCH v3 22/49] semihosting: Move GET_ARG/SET_ARG earlier in the file, Richard Henderson, 2022/05/20
- [PATCH v3 30/49] semihosting: Split out semihost_sys_flen, Richard Henderson, 2022/05/20
- [PATCH v3 15/49] include/exec: Move gdb_stat and gdb_timeval to gdbstub.h, Richard Henderson, 2022/05/20
- [PATCH v3 37/49] semihosting: Fix docs comment for qemu_semihosting_console_inc, Richard Henderson, 2022/05/20
- [PATCH v3 29/49] semihosting: Split out semihost_sys_isatty, Richard Henderson, 2022/05/20