From patchwork Tue May 3 19:48:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 568990 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp9794374map; Tue, 3 May 2022 13:27:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlOPLWys6IZ67ofiiGcjvY2xMehfO62hFLAVPHs62ldpqs2rinw6kUtntMV5adXu3khU7h X-Received: by 2002:a05:622a:1195:b0:2f3:adaa:4b80 with SMTP id m21-20020a05622a119500b002f3adaa4b80mr4998720qtk.194.1651609643240; Tue, 03 May 2022 13:27:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651609643; cv=none; d=google.com; s=arc-20160816; b=X+8BvNuS913i7WYClPF3JBOWHWn+o20CG+w2+R6xyA95pYelBTYKrZHPLALNjAo08Z 0ZB+klUVm57s0e7j+XGZBouFn3ckGXFaP6+eDB1sit9fFPmn2ccAbXXLKmjJWaHQkAfG /VJw2DQxkXCoanm9mt9+rdmOwL53tvM+cLVLYX0ru4XkIHM1qxx4/2ruMFVqmrTdheVF p0bHJoNHYjsBl1L8uHn2xpiXjNepQ1TQiz6YvrdOLU6ZOISX+ga5J8/x8wM2GwTwZoaR zgRf6RBxzhmPXWjAlkk9oJeLIhOP/nLtB7zKJVlye45zGir2rjPc3ukJegWm+8spi6gC 185w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=imisZyWOU+HOiAHcCce7P36gJQd/+JzsQTknZrdoLJI=; b=Vk4/d3CH+K2zYcXgTKFYFZmrceTqWPXjKKDaFtTnNXUeEhX2PCLBJ2TNRHqKVEZShc jdFs49uIii7WC9vf9jIrZcEVg3gvgHd1XB+1gbHANOSeNKmglO1NxJbToqonZvYhSxyl Z+kNnF5S/EojtxvY3tiKCrkqkP4zHF0re641YKBZqVzaCE5MhDkYjU/mJ0a7UPcEHRXw d6Kmg1mFQc8iHVXi8i6NBNY00dEB78brk5k2VevbAVz/HInq36lX3t2eLPWhHIVeQOa5 o9ufDkMU2cSiHCZ3bwLL7fLAUf+zuV714afv4/l+IMxH1oZNqYWy5q7+lw18bSlfhu0M 5SJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eAi0YPW0; 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=pass (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 n12-20020ac85a0c000000b002f36efe240csi3207158qta.237.2022.05.03.13.27.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 May 2022 13:27:23 -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=pass header.i=@linaro.org header.s=google header.b=eAi0YPW0; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlz7C-0002LB-Po for patch@linaro.org; Tue, 03 May 2022 16:27:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlyZS-0007i5-F5 for qemu-devel@nongnu.org; Tue, 03 May 2022 15:52:31 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:41745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlyZQ-00067g-RR for qemu-devel@nongnu.org; Tue, 03 May 2022 15:52:30 -0400 Received: by mail-pg1-x536.google.com with SMTP id t13so14802932pgn.8 for ; Tue, 03 May 2022 12:52:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=imisZyWOU+HOiAHcCce7P36gJQd/+JzsQTknZrdoLJI=; b=eAi0YPW01H5a0onB+LHOge9T2anERQQxVGLvF+6xcK9X3Vno8tfitnCe63mixRDxiB bq6mvX9THRspYp2MDfwAnlKiAQ75hD86P274d7+EzBLsBsKkGsBOe3SnJLuZ1q2uTuXq n/v5a1SuyKayplF0ozD+IQRc8q63SYaigcUf8djkplkD8n8248XBSSl+mudUbIGKNHbs 7AG08Ie/4XKdCpULyPVJU2+HfpvTV4R2mPlJx+7unjtrGRpkleS+RloU/NBFreCrS3o5 OUlGmS53NOjlmc8BjSJ2wvClYOUoXqjV5Jzm6ktQU15kigCI7IqonWrPEdqqI0cimXf+ DCOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=imisZyWOU+HOiAHcCce7P36gJQd/+JzsQTknZrdoLJI=; b=BdZD3hLRdizjS51j4iv7IvizYvdBujuQ0Yoaspu+/FOzg0uWXD9lvOUtftO16/hjEV wKcjZj0vtkk7EFCpUnJXpp9oWeo6jjTMxR4D3Pcc87N+7ux3nIQ0d3dNi8zkdG2DwtxQ 1bR8+4BWTpAGyv9CIqI7iS1qFqXWhzOlZpI0Oxln/iLbYG5rKJWQhqMXmJDNFIwW8vLj S70WzAA/elH0C5QzFJEA3qAF4khJFolAADgtvF0qAjJKIGnr2UGlC5kEbdW8/2tyo0Kl PzHj5swNeeXzxVOGZBjTpX3JuPqaXxQt3a90pzeC4l8Ze5cuvDsZkiIDakoTsVQGq5VR 14vA== X-Gm-Message-State: AOAM532rZN52L6aaM6H62SNAiDzrkAhbyCe8HFrE2J/FtJ0YSHjK9r6W OXJ+0CEp+nzVhAwLgLlMRIZpSaYsXiOr3g== X-Received: by 2002:a63:2b05:0:b0:3c2:3ed1:5fa9 with SMTP id r5-20020a632b05000000b003c23ed15fa9mr7681135pgr.220.1651607547367; Tue, 03 May 2022 12:52:27 -0700 (PDT) Received: from stoup.. ([71.212.142.129]) by smtp.gmail.com with ESMTPSA id fz16-20020a17090b025000b001dbe11be891sm1692286pjb.44.2022.05.03.12.52.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 12:52:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 42/74] semihosting: Use console_in_gf for SYS_READC Date: Tue, 3 May 2022 12:48:11 -0700 Message-Id: <20220503194843.1379101-43-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220503194843.1379101-1-richard.henderson@linaro.org> References: <20220503194843.1379101-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- semihosting/arm-compat-semi.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index d60f7ed6a4..34d635006d 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -293,6 +293,22 @@ common_semi_flen_fstat_cb(CPUState *cs, uint64_t ret, int err) common_semi_cb(cs, ret, err); } +static void +common_semi_readc_cb(CPUState *cs, uint64_t ret, int err) +{ + if (!err) { + CPUArchState *env G_GNUC_UNUSED = cs->env_ptr; + uint8_t ch; + + if (get_user_u8(ch, common_semi_stack_bottom(cs) - 1)) { + ret = -1, err = EFAULT; + } else { + ret = ch; + } + } + common_semi_cb(cs, ret, err); +} + #define SHFB_MAGIC_0 0x53 #define SHFB_MAGIC_1 0x48 #define SHFB_MAGIC_2 0x46 @@ -418,15 +434,8 @@ void do_common_semihosting(CPUState *cs) break; case TARGET_SYS_READC: - { - uint8_t ch; - int ret = qemu_semihosting_console_read(cs, &ch, 1); - if (ret == 1) { - common_semi_cb(cs, ch, 0); - } else { - common_semi_cb(cs, -1, EIO); - } - } + semihost_sys_read_gf(cs, common_semi_readc_cb, &console_in_gf, + common_semi_stack_bottom(cs) - 1, 1); break; case TARGET_SYS_ISERROR: