[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 49/74] target/m68k: Make semihosting system only
From: |
Richard Henderson |
Subject: |
[PATCH v2 49/74] target/m68k: Make semihosting system only |
Date: |
Tue, 3 May 2022 12:48:18 -0700 |
While we had a call to do_m68k_semihosting in linux-user, it
wasn't actually reachable. We don't include DISAS_INSN(halt)
as an instruction unless system mode.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/m68k/cpu_loop.c | 5 -----
target/m68k/m68k-semi.c | 37 +------------------------------------
target/m68k/meson.build | 6 ++++--
3 files changed, 5 insertions(+), 43 deletions(-)
diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c
index d1bf8548b7..fa6aa112cb 100644
--- a/linux-user/m68k/cpu_loop.c
+++ b/linux-user/m68k/cpu_loop.c
@@ -36,11 +36,6 @@ void cpu_loop(CPUM68KState *env)
process_queued_cpu_work(cs);
switch(trapnr) {
- case EXCP_HALT_INSN:
- /* Semihosing syscall. */
- env->pc += 4;
- do_m68k_semihosting(env, env->dregs[0]);
- break;
case EXCP_ILLEGAL:
case EXCP_LINEA:
case EXCP_LINEF:
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 5b4c51957e..4b5621a101 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -21,13 +21,9 @@
#include "cpu.h"
#include "exec/gdbstub.h"
-#if defined(CONFIG_USER_ONLY)
-#include "qemu.h"
-#define SEMIHOSTING_HEAP_SIZE (128 * 1024 * 1024)
-#else
+#include "semihosting/guestfd.h"
#include "semihosting/softmmu-uaccess.h"
#include "hw/boards.h"
-#endif
#include "qemu/log.h"
#define HOSTED_EXIT 0
@@ -375,43 +371,12 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
}
break;
case HOSTED_INIT_SIM:
-#if defined(CONFIG_USER_ONLY)
- {
- CPUState *cs = env_cpu(env);
- TaskState *ts = cs->opaque;
- /* Allocate the heap using sbrk. */
- if (!ts->heap_limit) {
- abi_ulong ret;
- uint32_t size;
- uint32_t base;
-
- base = do_brk(0);
- size = SEMIHOSTING_HEAP_SIZE;
- /* Try a big heap, and reduce the size if that fails. */
- for (;;) {
- ret = do_brk(base + size);
- if (ret >= (base + size)) {
- break;
- }
- size >>= 1;
- }
- ts->heap_limit = base + size;
- }
- /*
- * This call may happen before we have writable memory, so return
- * values directly in registers.
- */
- env->dregs[1] = ts->heap_limit;
- env->aregs[7] = ts->stack_base;
- }
-#else
/*
* FIXME: This is wrong for boards where RAM does not start at
* address zero.
*/
env->dregs[1] = current_machine->ram_size;
env->aregs[7] = current_machine->ram_size;
-#endif
return;
default:
cpu_abort(env_cpu(env), "Unsupported semihosting syscall %d\n", nr);
diff --git a/target/m68k/meson.build b/target/m68k/meson.build
index 05cd9fbd1e..27d2d7ba87 100644
--- a/target/m68k/meson.build
+++ b/target/m68k/meson.build
@@ -4,14 +4,16 @@ m68k_ss.add(files(
'fpu_helper.c',
'gdbstub.c',
'helper.c',
- 'm68k-semi.c',
'op_helper.c',
'softfloat.c',
'translate.c',
))
m68k_softmmu_ss = ss.source_set()
-m68k_softmmu_ss.add(files('monitor.c'))
+m68k_softmmu_ss.add(files(
+ 'm68k-semi.c',
+ 'monitor.c'
+))
target_arch += {'m68k': m68k_ss}
target_softmmu_arch += {'m68k': m68k_softmmu_ss}
--
2.34.1
- [PATCH v2 40/74] semihosting: Add GuestFDConsole, (continued)
- [PATCH v2 40/74] semihosting: Add GuestFDConsole, Richard Henderson, 2022/05/03
- [PATCH v2 41/74] semihosting: Create qemu_semihosting_guestfd_init, Richard Henderson, 2022/05/03
- [PATCH v2 42/74] semihosting: Use console_in_gf for SYS_READC, Richard Henderson, 2022/05/03
- [PATCH v2 46/74] semihosting: Remove qemu_semihosting_console_outs, Richard Henderson, 2022/05/03
- [PATCH v2 43/74] semihosting: Use console_out_gf for SYS_WRITEC, Richard Henderson, 2022/05/03
- [PATCH v2 44/74] semihosting: Remove qemu_semihosting_console_outc, Richard Henderson, 2022/05/03
- [PATCH v2 47/74] semihosting: Create semihost_sys_poll_one, Richard Henderson, 2022/05/03
- [PATCH v2 45/74] semihosting: Use console_out_gf for SYS_WRITE0, Richard Henderson, 2022/05/03
- [PATCH v2 48/74] target/m68k: Eliminate m68k_semi_is_fseek, Richard Henderson, 2022/05/03
- [PATCH v2 55/74] target/mips: Add UHI errno values, Richard Henderson, 2022/05/03
- [PATCH v2 49/74] target/m68k: Make semihosting system only,
Richard Henderson <=
- [PATCH v2 52/74] target/nios2: Move nios2-semi.c to nios2_softmmu_ss, Richard Henderson, 2022/05/03
- [PATCH v2 50/74] target/m68k: Use semihosting/syscalls.h, Richard Henderson, 2022/05/03
- [PATCH v2 51/74] target/nios2: Eliminate nios2_semi_is_lseek, Richard Henderson, 2022/05/03
- [PATCH v2 57/74] target/mips: Drop link syscall from semihosting, Richard Henderson, 2022/05/03
- [PATCH v2 53/74] target/nios2: Use semihosting/syscalls.h, Richard Henderson, 2022/05/03
- [PATCH v2 54/74] target/mips: Use an exception for semihosting, Richard Henderson, 2022/05/03
- [PATCH v2 60/74] target/mips: Avoid qemu_semihosting_log_out for UHI_plog, Richard Henderson, 2022/05/03
- [PATCH v2 56/74] target/mips: Create report_fault for semihosting, Richard Henderson, 2022/05/03
- [PATCH v2 58/74] target/mips: Drop pread and pwrite syscalls from semihosting, Richard Henderson, 2022/05/03
- [PATCH v2 59/74] target/mips: Use semihosting/syscalls.h, Richard Henderson, 2022/05/03