From patchwork Tue May 14 15:52:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 164218 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2794948ili; Tue, 14 May 2019 08:56:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxO7BymqLCc0sV3HdQYHqvEKuzz1P8aKMOoGySrpnpydb9F26KezcSHE1BOurEYFOhvor/p X-Received: by 2002:a17:906:4e56:: with SMTP id g22mr21168247ejw.51.1557849384692; Tue, 14 May 2019 08:56:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557849384; cv=none; d=google.com; s=arc-20160816; b=QY3r+noWHTTyr941T2IkjtwqjwO0zUdaJhFrrDi2s0IM84nV3kjYrnU7/bYU98LPGz W0MOpEp3z9zarMYXWgjs+jE6ydQajwT2G2dflD5CBz9k2goPi323hcFQ9BOvwsH8+pml dh1WfwwFGLRThTQbGa6Mcd6STV3iaIVCxyNaJwAmoe5A343rk0eyqRWNzDZFBZy0Vduk 0Ue8TnhBQNn7LgzU3X8LQuZCTBXWC4YZG5FsZjVCXY6pwBjgxVytoN027f24tPeWzGbl Dh5vii9FuiEXrN27JZKLeBOKwSsCKpIyur9D8lhIc1p0ycS36eR8wvmc7MHtyC61iYAf BGYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=3N082WaIffsJbYXIZ0a/9GfiR46w16xaqgWtZJxN1co=; b=TwllqLpK3TO1mmM9MKP5kHbXQQjOpD1fQH+/bLL4ahxlcisUJuNh1LEm0urIyiDt5o jXqi9povDrC4WH4OdyiEy5MdIzTs/0Mqc0zfFzxFOGCM0uOpvUs64WFBF0c7WX/flY/R nHPREgNx2aPXMnk2TCugCtptjfYh2SoeuIPBtps6xLgRxYci74YK87gz3XGmfoG/MW0f L4zMDP5HizMKpuDE5kKOElEiDZLP2GfwvJoONK+EnkLavX815OroFpjAvQ5K7mYLvXsI 382yAhpsN6fAnVlM3c1jvhy5X0zo+EYXr7qiIEGp2Cygn11VCShDpDr5fcEZ/fOfjc/7 cSVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TWm6ndFP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a11si4550571ejn.259.2019.05.14.08.56.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 May 2019 08:56:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TWm6ndFP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:50218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQZmw-0007Uf-TC for patch@linaro.org; Tue, 14 May 2019 11:56:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQZjp-0004mA-QZ for qemu-devel@nongnu.org; Tue, 14 May 2019 11:53:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQZjo-0006EP-HC for qemu-devel@nongnu.org; Tue, 14 May 2019 11:53:09 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:39284) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hQZjo-0006Cw-AS for qemu-devel@nongnu.org; Tue, 14 May 2019 11:53:08 -0400 Received: by mail-wm1-x343.google.com with SMTP id n25so3320466wmk.4 for ; Tue, 14 May 2019 08:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3N082WaIffsJbYXIZ0a/9GfiR46w16xaqgWtZJxN1co=; b=TWm6ndFPJjrhVd500ZU3j6de33SOsREWIeUSOAwFl7svBlfqtCC5IlKv25kowmtJyN IeuQmMftUaJ00eblCmL5OCQYtn1xxUz6CtM2FilQ7FEI6bFOSeiN2sbXapAjL3K3OuJv 7qOS5903Yuu/bMfUee7i3w7SAVg1o2Pl/Ixw3sFXyZR3rpOLn1ScrUNjhfSehhUGnVTG XBj8LVQlqgatf06DtMSlxwStQHfrCzlfwKeJcbmGdHR8IUykxWK2dvVaZEyN32GhbUIT KJoqpsGL7YU4fbC8QVJeFpgJ8Zjw4VeKR2Ay0jzxIMRXe+WGgKDzp6ohKkTYUfsu6G+U EI7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3N082WaIffsJbYXIZ0a/9GfiR46w16xaqgWtZJxN1co=; b=L6Dxw2vXWWZ6oLFVxhKfG2xMPFJrx5L0MdOuGt0yJAj79fJ+1yYBsGBspm/rQrZgpf P/ZDcU8tdztOO3ZICicaoG5RZ3zoqMDn3mbMgZpFuegtu75217YmAuKuUFbSTI2s903p JBeX32IuLNVbiVyg7ICR6LnYlBMwbdzFhhdARHyPZMoOAeF9F/1LH5K0LTVZgAKAQB/X bCjl549rA7FPiwelAEMHyfn0yXI8UIrFjRpzzevNUFV/eU1PmnvvXsT6//rLNYpMu1Nt PoN/Mm+VcyxGuknkjr7b9eWC8Ec+FYKf9krbQiNQTtkIimfHZe1APOQtGRUqcUTImPPM dgmg== X-Gm-Message-State: APjAAAVqKK/zY1kvJQAW3gxwgniu+zQfW5TUi0CHaBPcFPTr4ZDuxalm je4Sn8igvunNYsXH9eGq/3iRJ5BlRwk= X-Received: by 2002:a1c:7d04:: with SMTP id y4mr18978347wmc.123.1557849187283; Tue, 14 May 2019 08:53:07 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j9sm6786562wrr.90.2019.05.14.08.53.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 May 2019 08:53:05 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8F7AF1FF93; Tue, 14 May 2019 16:53:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 14 May 2019 16:52:56 +0100 Message-Id: <20190514155301.16123-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190514155301.16123-1-alex.bennee@linaro.org> References: <20190514155301.16123-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [RFC PATCH 06/11] target/arm: use the common interface for WRITE0/WRITEC in arm-semi X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Riku Voipio , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now we have a common semihosting console interface use that for our string output. However ARM is currently unique in also supporting semihosting for linux-user so we need to replicate the API in linux-user. If other architectures gain this support we can move the file later. Signed-off-by: Alex Bennée --- linux-user/Makefile.objs | 2 ++ linux-user/arm/semihost.c | 24 ++++++++++++++++++++++++ target/arm/arm-semi.c | 31 ++++++------------------------- 3 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 linux-user/arm/semihost.c -- 2.20.1 diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs index 769b8d83362..285c5dfa17a 100644 --- a/linux-user/Makefile.objs +++ b/linux-user/Makefile.objs @@ -6,4 +6,6 @@ obj-y = main.o syscall.o strace.o mmap.o signal.o \ obj-$(TARGET_HAS_BFLT) += flatload.o obj-$(TARGET_I386) += vm86.o obj-$(TARGET_ARM) += arm/nwfpe/ +obj-$(TARGET_ARM) += arm/semihost.o +obj-$(TARGET_AARCH64) += arm/semihost.o obj-$(TARGET_M68K) += m68k-sim.o diff --git a/linux-user/arm/semihost.c b/linux-user/arm/semihost.c new file mode 100644 index 00000000000..9554102a855 --- /dev/null +++ b/linux-user/arm/semihost.c @@ -0,0 +1,24 @@ +/* + * 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" + +int qemu_semihosting_console_out(CPUArchState *env, target_ulong addr, int len) +{ + void *s = lock_user_string(addr); + len = write(STDERR_FILENO, s, len ? len : strlen(s)); + unlock_user(s, addr, 0); + return len; +} diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c index 9e5a414dd89..253c66b172a 100644 --- a/target/arm/arm-semi.c +++ b/target/arm/arm-semi.c @@ -27,6 +27,7 @@ #include "cpu.h" #include "hw/semihosting/semihost.h" +#include "hw/semihosting/console.h" #ifdef CONFIG_USER_ONLY #include "qemu.h" @@ -314,32 +315,12 @@ target_ulong do_arm_semihosting(CPUARMState *env) return set_swi_errno(ts, close(arg0)); } case TARGET_SYS_WRITEC: - { - char c; - - if (get_user_u8(c, args)) - /* FIXME - should this error code be -TARGET_EFAULT ? */ - return (uint32_t)-1; - /* Write to debug console. stderr is near enough. */ - if (use_gdb_syscalls()) { - return arm_gdb_syscall(cpu, arm_semi_cb, "write,2,%x,1", args); - } else { - return write(STDERR_FILENO, &c, 1); - } - } + { + qemu_semihosting_console_out(env, args, 1); + return 0xdeadbeef; + } case TARGET_SYS_WRITE0: - if (!(s = lock_user_string(args))) - /* FIXME - should this error code be -TARGET_EFAULT ? */ - return (uint32_t)-1; - len = strlen(s); - if (use_gdb_syscalls()) { - return arm_gdb_syscall(cpu, arm_semi_cb, "write,2,%x,%x", - args, len); - } else { - ret = write(STDERR_FILENO, s, len); - } - unlock_user(s, args, 0); - return ret; + return qemu_semihosting_console_out(env, args, 0); case TARGET_SYS_WRITE: GET_ARG(0); GET_ARG(1);