aboutsummaryrefslogtreecommitdiff
path: root/linux-user/arm
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2021-01-08 22:42:48 +0000
committerAlex Bennée <alex.bennee@linaro.org>2021-01-18 10:05:06 +0000
commit56b5170c87ee3e30221eea7425c2fc4f0cc7d4a3 (patch)
tree7d41a782437039530aa5e5c734785f88cd2bbffc /linux-user/arm
parent797920b952ea154a73049d171f5d5e3d6fb0bbea (diff)
semihosting: Move ARM semihosting code to shared directories
This commit renames two files which provide ARM semihosting support so that they can be shared by other architectures: 1. target/arm/arm-semi.c -> hw/semihosting/common-semi.c 2. linux-user/arm/semihost.c -> linux-user/semihost.c The build system was modified use a new config variable, CONFIG_ARM_COMPATIBLE_SEMIHOSTING, which has been added to the ARM softmmu and linux-user default configs. The contents of the source files has not been changed in this patch. Signed-off-by: Keith Packard <keithp@keithp.com> [AJB: rename arm-compat-semi, select SEMIHOSTING] Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20210107170717.2098982-2-keithp@keithp.com> Message-Id: <20210108224256.2321-13-alex.bennee@linaro.org>
Diffstat (limited to 'linux-user/arm')
-rw-r--r--linux-user/arm/meson.build3
-rw-r--r--linux-user/arm/semihost.c76
2 files changed, 0 insertions, 79 deletions
diff --git a/linux-user/arm/meson.build b/linux-user/arm/meson.build
index 432984b58e..5a93c925cf 100644
--- a/linux-user/arm/meson.build
+++ b/linux-user/arm/meson.build
@@ -1,6 +1,3 @@
-linux_user_ss.add(when: 'TARGET_AARCH64', if_true: files('semihost.c'))
-linux_user_ss.add(when: 'TARGET_ARM', if_true: files('semihost.c'))
-
subdir('nwfpe')
syscall_nr_generators += {
diff --git a/linux-user/arm/semihost.c b/linux-user/arm/semihost.c
deleted file mode 100644
index a1f0f6050e..0000000000
--- a/linux-user/arm/semihost.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * ARM Semihosting Console Support
- *
- * Copyright (c) 2019 Linaro Ltd
- *
- * Currently ARM is unique in having support for semihosting support
- * in linux-user. So for now we implement the common console API but
- * just for arm linux-user.
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-#include "qemu/osdep.h"
-#include "cpu.h"
-#include "hw/semihosting/console.h"
-#include "qemu.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
- * line buffering. We restore the old mode afterwards in case the
- * 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)
-{
- uint8_t c;
- 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);
- tcsetattr(STDIN_FILENO, TCSANOW, &new_tio);
-
- c = getchar();
-
- /* restore config */
- tcsetattr(STDIN_FILENO, TCSANOW, &old_tio);
-
- return (target_ulong) c;
-}