From patchwork Fri Mar 25 19:52:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 554038 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp5788597mag; Fri, 25 Mar 2022 12:54:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6CKsc847ulgLO9DR1RWqG3CR9hQ8ZumIPGnqkpNunQakIl49IxfSllhvqJJ28/mzM0sFu X-Received: by 2002:a05:6902:3cc:b0:628:73aa:9c7f with SMTP id g12-20020a05690203cc00b0062873aa9c7fmr11734961ybs.632.1648238054736; Fri, 25 Mar 2022 12:54:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648238054; cv=none; d=google.com; s=arc-20160816; b=DTR0V0q/Y6ewDJ2DB3w5HH3Xaf7NyYP6e4tzaic1/YSvMHmxpSW+AFq8MrGxsVt36l 1xc88HXSQ2L30tvrSpdm01lB+U8Haic+qZtCMfmNQGoHCk2wc4VWGzYQOLEvd5O28MtB 9do32YYkrrFh+hYGKpxzNmKj+5BAyMng4UiuZ0ue0Y5DjEgzatMZkeRmQl53+MRC0lL9 DUp+MJuJMqzJCaccb2V9cFhrFt9jPHv1wvnu2lMH9lSDqfrrt5N/8T34X8QmycNciHtT 3DBO07iUardfgblO2xKn0alp7zyTIVhkUtG57CF/aRgZ6mGmHjPOR3yCpwDTxR1FFa6S eULw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=JqvjDBxg6dzVMRz9GXbJw/AGrIZfs63ojgJ9mrqtjWE=; b=VV0pbmRzuIoyWFfus1qhJHEHrku8u6DDk53aANsrJAGM/lLYfDZ/ZxHDReUnjih8uF DIghw1sDRyCuyp6TigIylMlkmluiW7HuwiJ48dahfttHX1toQMJFcmlExLOWUpdz8RN5 NoHxlqgJXoIX4Q5KRtnbL8b02pe4n/7wcgFlOP/Onqu7YkPR2scxS7yWfZCJu6D11TT6 Jab6GKSz2fsRJoSYSQq62PF+zHG6BUYVB2/9ImzwtYn7lwJ2x5RjZkstb6KZY+7HOa0h yMQkJjTlh54m7uz49pj0eWbZAa9T56fAExOMjN2y52Yh3qPsJVImNtoc+PWydta/DfaU aRNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XHblN35y; 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 a63-20020a0df142000000b002e5bb9dcac1si3881532ywf.330.2022.03.25.12.54.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Mar 2022 12:54:14 -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=XHblN35y; 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 ([::1]:43398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXq0k-0001vq-5d for patch@linaro.org; Fri, 25 Mar 2022 15:54:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXpzV-0001tT-FY for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:52:57 -0400 Received: from [2607:f8b0:4864:20::229] (port=33315 helo=mail-oi1-x229.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXpzT-0008Nd-Jb for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:52:57 -0400 Received: by mail-oi1-x229.google.com with SMTP id k10so9327360oia.0 for ; Fri, 25 Mar 2022 12:52:55 -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=JqvjDBxg6dzVMRz9GXbJw/AGrIZfs63ojgJ9mrqtjWE=; b=XHblN35yV8+mkc3csOP4IMsoAtFAprFbgLeKz8KDplBxB0ymUqKLdkb50JGhtnkNMk X8S3gpV9qYmqKvi5dZhCPwzXxvK2d4hiGxGg3vw1SJUmvqSfS0zjFQmzX+cULFW+voto dQ66bdmVpbBCaL7c8Sdh9JR+LEOKc6BE7p1f8d+UbgoVds0oenbZLlpCd0BEARVzKLak XpkinMIQifnhIse3XkMQ/lm6qyqGZpWKktMRgx3l8oqGcTRx+XtNZNU/wuSYD9O5lgu3 WqJMZYTgAvjVFAi1IknkMur4R4RpJY8WJFXzPT8+69PHPHhzXPOJi1S+Q7pZvQT5RQCp zfFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JqvjDBxg6dzVMRz9GXbJw/AGrIZfs63ojgJ9mrqtjWE=; b=4j9+/Aazm1EzYrwCYP0oKn+w92h4g+fIVoSh6e4oVVz5aRCZAGliixSFHv6UbGo8rP zAMKPofyGnWrXcoxsOxroUdzZy8XKpyFwYbct92fnpUgyhI3s9odleu3kczgOE8TTrTm 2vQWKrp8imygh+EdQzO4A9vxoF2717ip3u3uFc7t7IVP0iwEk/xfm0zMIh2Y4cqHzAeJ m50TjCZ46oZMZ9o2HuWF5CuCi7GzUYzSWywBkE77KWJXL6UWET6uW3+pQh59c7SZfWbL lJXlZHhhyG57MyfSgWf5a1YCVKogXcf1XXOXYN4Ew0MO/fcMCDFtOSoE+AlynHDQSa1U pNfg== X-Gm-Message-State: AOAM533VQMJ/kOTgvqTrgEucExkWP03jYSln2TgvgBZt6xLKEz5PpDKi Uxfqte68GT/72dgn66BbIMnvPAaUycUTUijChEI= X-Received: by 2002:aca:2806:0:b0:2d9:e8c4:7ce2 with SMTP id 6-20020aca2806000000b002d9e8c47ce2mr10875836oix.37.1648237974336; Fri, 25 Mar 2022 12:52:54 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id ep36-20020a056870a9a400b000de98fe4869sm2153730oab.35.2022.03.25.12.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 12:52:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 1/8] linux-user/nios2: Hoist pc advance to the top of EXCP_TRAP Date: Fri, 25 Mar 2022 13:52:43 -0600 Message-Id: <20220325195250.386071-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220325195250.386071-1-richard.henderson@linaro.org> References: <20220325195250.386071-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::229 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::229; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x229.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Note that this advance *should* be done by the translator, as that's the pc value that's supposed to be generated by hardware. However, that's a much larger change across sysemu as well. In the meantime, produce the correct PC for any signals raised by the trap instruction. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/nios2/cpu_loop.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index 1e93ef34e6..2768ae61dd 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -40,6 +40,12 @@ void cpu_loop(CPUNios2State *env) break; case EXCP_TRAP: + /* + * TODO: This advance should be done in the translator, as + * hardware produces an advanced pc as part of all exceptions. + */ + env->regs[R_PC] += 4; + switch (env->error_code) { case 0: qemu_log_mask(CPU_LOG_INT, "\nSyscall\n"); @@ -56,7 +62,6 @@ void cpu_loop(CPUNios2State *env) env->regs[2] = abs(ret); /* Return value is 0..4096 */ env->regs[7] = ret > 0xfffff000u; - env->regs[R_PC] += 4; break; case 1: @@ -99,7 +104,6 @@ void cpu_loop(CPUNios2State *env) o = env->regs[5]; n = env->regs[6]; env->regs[2] = qatomic_cmpxchg(h, o, n) - o; - env->regs[R_PC] += 4; } break; } From patchwork Fri Mar 25 19:52:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 554042 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp5790575mag; Fri, 25 Mar 2022 12:56:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgBGR+SavYGQhdRvYBWKYNB/UaYtny5xJaMSPYMmisWPlxz99UfY6ALVDnWE+A0rXTOHdm X-Received: by 2002:a25:2548:0:b0:633:8a67:dec with SMTP id l69-20020a252548000000b006338a670decmr11746676ybl.411.1648238210038; Fri, 25 Mar 2022 12:56:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648238210; cv=none; d=google.com; s=arc-20160816; b=nrWjuBarMObWlDz/CyLef3Kalf8nrIQBgb9ansPfCNk8e/R20io3QwH/pyh0m4EanA 6FYRY9h9gsgL2SJWZa07WtRQyWr2RXZQ2vacxV+o1LQPyHHXe/jX0pOG/2xr7v22dPn/ AV4ICiiMdu/uM7t21Y6/Hun1aMqnnEdOveY0mTIomSOAkMIZwN/9zQS+ZY6/VlO6ijqj OgcByGmBy32awpfqk2qRN49aAk6CruezHS8yhoEHSagEin44LacTiTLXysz/4P71oI9z 3hmpWsC6BRSrAVJvwIllYVFbw7DcvDJNy7MqoZGyyhyNeOgHv836xnKNOlFVVZGw9uZ0 gY/g== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=h84Ot6YbttCAVb4FAH99rqg1sJS9c+ZhMv9JcX0XF9Q=; b=mNGWXVvLtRC2hc1lP9/6Roypvnq2AQvoQNPZNNo9bSE2qOlKNn/vy5krbpMGGm8/Pq jjWuydjhRe/eLLjdcrurlleYBEMOWNiQbUxPhzyiG4Gh7ha+JD9qtHi+eXftgSqLpKAL 188tpe8vupEG0s1cFSCkExmHGsOVn3DZtIhliilbrXrVrTLPvT5PrnebceaVx6LuRvuA wcUuruMpEDhP1vLyS+p/HNPBww1AN7SM5FFJ15WTftSPsiey3V0UZiNJ0mvoRgiUpVze xk2d1al1EqVoNqxElYuGv5cKzwxE6CME23nrLtEOVyYRdn/if8gklocsxywu69oxW9FE P6fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CERlubgB; 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 o206-20020a8173d7000000b002e5bb9dc99esi4433296ywc.39.2022.03.25.12.56.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Mar 2022 12:56:50 -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=CERlubgB; 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 ([::1]:51834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXq3F-0007d7-I8 for patch@linaro.org; Fri, 25 Mar 2022 15:56:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXpzX-0001tz-UA for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:01 -0400 Received: from [2001:4860:4864:20::2d] (port=39517 helo=mail-oa1-x2d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXpzU-0008Nl-Ga for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:52:58 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-deb9295679so1867059fac.6 for ; Fri, 25 Mar 2022 12:52:56 -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=h84Ot6YbttCAVb4FAH99rqg1sJS9c+ZhMv9JcX0XF9Q=; b=CERlubgB5yLilj4KTod5YACYRlOduGiMt609oOuXSvcI0xg7ehgOwdV+QDo3eEoFDE CVodq+RizfzLT5hbVRYuwDYh8ELmJftBr7XslaIicbtSnrTD8B2Ht/l7S/TbwbH036VK +AjzfhkAuhXJZlMwwo9XlHURaJWWWS4StuQol2D3FGNr5dgbN4lV9uxX+phQVUzJqTLS mUf2cJXVPk6llLL92crfBjE9TiHie1/2XhBjdOpi7OEGoToA7x1PT+FXPCqmonoaaSLA kkAiLFN+yORJItE3ptG+zu624GbJJAzKRoAjSCDRbwXUT9353pkcjLwvvfadWdE/Cjf9 Pxrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h84Ot6YbttCAVb4FAH99rqg1sJS9c+ZhMv9JcX0XF9Q=; b=mkZ2upssMrtCsT4DxMBseN568i5hOcCX995NM+qJFCzfIIgLg3vzCYRECIRnpnYPS8 dAeK/XYpL3rT/tl7mgY5IqrJTcQTEU3D/ApuADvpd2EqrjoM8xxIr+6IgwMIarHcDRd1 EviZJyCJIMu5Z0fvgdbGhcVdv6OUfE/1IPZVz3UY85DsRAUOCdg1xQEvsIigb1iZ2gt6 JN5OsPmQxUxNe2FwKRfVNIzmi0Zc6c4TeskO9j4k0R5R2I2SBi7vWy/1VclSvBnMcxqQ DmJlpGHdfqroCKNb+1fSaAaxIaf+qDIaNxEO8tM3/T7eu2ZL2xAjdxARATGo45NzOXN5 kkJg== X-Gm-Message-State: AOAM533IKiS51klNJn0hrqksx7gH1h12LjjFot5rV99ikWQBNkXVnxZi 7CLt6tPCxg9K6qIvqKLeqEQndBbJyPhxcDhQo4I= X-Received: by 2002:a05:6870:f71d:b0:dd:a49b:60bd with SMTP id ej29-20020a056870f71d00b000dda49b60bdmr5680018oab.217.1648237975261; Fri, 25 Mar 2022 12:52:55 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id ep36-20020a056870a9a400b000de98fe4869sm2153730oab.35.2022.03.25.12.52.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 12:52:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 2/8] linux-user/nios2: Fix clone child return Date: Fri, 25 Mar 2022 13:52:44 -0600 Message-Id: <20220325195250.386071-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220325195250.386071-1-richard.henderson@linaro.org> References: <20220325195250.386071-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2d (failed) Received-SPF: pass client-ip=2001:4860:4864:20::2d; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The child side of clone needs to set the secondary syscall return value, r7, to indicate syscall success. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/nios2/target_cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-user/nios2/target_cpu.h b/linux-user/nios2/target_cpu.h index 2d2008f002..830b4c0741 100644 --- a/linux-user/nios2/target_cpu.h +++ b/linux-user/nios2/target_cpu.h @@ -27,6 +27,7 @@ static inline void cpu_clone_regs_child(CPUNios2State *env, target_ulong newsp, env->regs[R_SP] = newsp; } env->regs[R_RET0] = 0; + env->regs[7] = 0; } static inline void cpu_clone_regs_parent(CPUNios2State *env, unsigned flags) From patchwork Fri Mar 25 19:52:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 554041 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp5790569mag; Fri, 25 Mar 2022 12:56:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1vKBiDWcKaZF0vDzDf1cnv2dTVy9aP1RiYynb1VDqFHK1znCAL0ol2rcvHHdrLWwD1aoX X-Received: by 2002:a81:1950:0:b0:2e5:9647:419b with SMTP id 77-20020a811950000000b002e59647419bmr12693826ywz.273.1648238209563; Fri, 25 Mar 2022 12:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648238209; cv=none; d=google.com; s=arc-20160816; b=lFsPYxHYPekLk4iu08Zj3O5OjY2EGtHnJUtqfAC+okDWr+fczInO/CJEdpDUTNny0E boDdtZvF7v23xTXV7pxrqf1WpO/gBCchdwk6lLSkaLOitE7T2bjl2zg1UwkgYXyHvPX2 y6evLDvMQbdTTtT+j1taP5prM632sGobpATmwi6nrNIiNpsPAAEtYFmmpU4L0Hb4A2Tp RZHGXzrM+IE6PYbsgapzvTPIpkLQHVox1YrgG5j0ckYdTERW35OH9X8kgjodjV3aM/Iz 6aaW101QUNi+ST4gcY5NvVSFKiTMps/Az6xZ7Zz6GqnjTt/2W4CG9N54SGGTa3OqQ1ye fAfg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Pd5+yLliVhBXIEFxiOo2I5aLF4BKy2rSqhZkhW/VVIE=; b=rPKzSGxSOmSDdU7Cxkpe+d1ebVlvsz3UK/nYwiVZZxEeCv7GJuICYkAEOhk0Jp9SZ3 m6ya5cu0WPt7oO+0lacYO2lNCTWpGIQi/80WPnZIGSMU/qlA5Pg09gs4TnNH7nawgJSi XLoemiDFhEX8TDm9aWld7sirqLFPudXlGHrr/4QgMjqIeC6myENp1r2T5jjqDy7JhXOB q0cJENorS11tJO8S8aBQKXXa8Bx49u+yTh+9peHkoch2xqL21WkbuuAOGUB2Bp5pCNjU RN2jaPpQlJkaZf7QBzWpoAWESNcxNakerFaI3mpT0UBzO44dkCVNJkUbS9CjamLUDhPw tWug== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HqTOEex1; 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 t77-20020a818350000000b002e6bbb897d7si4086863ywf.131.2022.03.25.12.56.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Mar 2022 12:56:49 -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=HqTOEex1; 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 ([::1]:51836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXq3F-0007d8-3d for patch@linaro.org; Fri, 25 Mar 2022 15:56:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXpzX-0001u0-Uo for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:01 -0400 Received: from [2001:4860:4864:20::32] (port=40227 helo=mail-oa1-x32.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXpzV-0008Nq-Dz for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:52:58 -0400 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-d6e29fb3d7so9130865fac.7 for ; Fri, 25 Mar 2022 12:52:57 -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=Pd5+yLliVhBXIEFxiOo2I5aLF4BKy2rSqhZkhW/VVIE=; b=HqTOEex19f9eg2CPws+PeKIo8oI/qdODhxVQd0l4iiSE+7I+Mc6+eFDjM6mdWhWJRi 4V4ncuhjzw60bcDG+TM7/XJP3miKO8qa1v/lxKa7DpHzxZIXSfY0VsmSlp/NAjzTq3OX u3j7aVoW/Z6oQcm9oW3sfE2AUMAOWPGl1nTAIvkx7s6cVEy1kb8qMc5roKYC8hL/cDUX rFPH85PXJ+PLV6D0Y9zrPu/A06vsUniNHumJ0F3Ptyw7Hrkr6QX+J7/fGzw7qrqX3Ljr ulJygk4WugjZ5cS5BiNSHU3DVC61kNwtD12HMkl+867bVKUrniHbuUVBlDNoUH1r71E8 zfXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pd5+yLliVhBXIEFxiOo2I5aLF4BKy2rSqhZkhW/VVIE=; b=I49erSgg8SaE8PVEh6stqpbJVnWsEbDJmHlPTkTyaxA88Sm/+kP3cZ9Rx2WnES2a8H M/8az5jR31mcwYyDBxVz5UNZqazq0M08CLKsWDL+Jf4Hv+otr2CKi+kQEtCfDPI54XLO ThGFOogcQyTIFV8L3a07WEtHexVOhA9LL5zJqNd64BErPXHIcGXd5PMHFVwNcUJ6Et+s t0crvbTh4wPqNfuQ+CSIueWTs1mF51eK5Jje1wNrRyQFeHEJ/5KhnkDP3C00y2QSR9LM 4hSxeiDeHI0tBxHvv+VJJsjm/QT4qz5057Fy5Ij8MfTELdAkgaxHWVwC5q5a7b6hDQZM Ezsg== X-Gm-Message-State: AOAM531YfbB6ts/5XqvQ97CocM7RyUojgUS4s/u9HB9iFw7R75S2aqUq pQu2rEELINjNTkReT9oYtCfmr/Fy1dOb4dLibuY= X-Received: by 2002:a05:6870:15d3:b0:da:c49f:9113 with SMTP id k19-20020a05687015d300b000dac49f9113mr5721188oad.91.1648237976347; Fri, 25 Mar 2022 12:52:56 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id ep36-20020a056870a9a400b000de98fe4869sm2153730oab.35.2022.03.25.12.52.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 12:52:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 3/8] linux-user/nios2: Drop syscall 0 "workaround" Date: Fri, 25 Mar 2022 13:52:45 -0600 Message-Id: <20220325195250.386071-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220325195250.386071-1-richard.henderson@linaro.org> References: <20220325195250.386071-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::32 (failed) Received-SPF: pass client-ip=2001:4860:4864:20::32; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x32.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Syscall 0 is __NR_io_setup for this target; there is nothing to work around. Reviewed-by: Peter Maydell Fixes: a0a839b65b6 ("nios2: Add usermode binaries emulation") Signed-off-by: Richard Henderson --- linux-user/nios2/cpu_loop.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index 2768ae61dd..a285781fc5 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -55,10 +55,6 @@ void cpu_loop(CPUNios2State *env) env->regs[7], env->regs[8], env->regs[9], 0, 0); - if (env->regs[2] == 0) { /* FIXME: syscall 0 workaround */ - ret = 0; - } - env->regs[2] = abs(ret); /* Return value is 0..4096 */ env->regs[7] = ret > 0xfffff000u; From patchwork Fri Mar 25 19:52:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 554039 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp5788797mag; Fri, 25 Mar 2022 12:54:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzD1MhSssXwetFc+tHZqPy76lXsLXplIBdrGpw7NNUlqZocxdATMJhZPPsj8HL99kSr3H5T X-Received: by 2002:a0d:d143:0:b0:2db:dfa5:e376 with SMTP id t64-20020a0dd143000000b002dbdfa5e376mr13156733ywd.218.1648238070550; Fri, 25 Mar 2022 12:54:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648238070; cv=none; d=google.com; s=arc-20160816; b=QQq1eZCahFsqzjWhr1dOZTvBsECaLl1PbRYHptWy0nvADLSrlr0+RmkMT4IYIkSfza 0ZbYGmlDlDo0H2daDKBSQUw2g2ckZafUhPT05Gmd6HI2rcVQEH7R65UMeod0r6j9pTQr T4Ulj+9wwukAdKJ0IKIsxwAL9HRsFLpFgncOHxpqIfZsuF4CAOaAkiyrSb9y+eUXrNF+ J9zvKJ0m0b5bYkSMfBTP5PBgMy6OmP62Xtoi/H00a/1rw9rkEsXwzj4w14QQrGwZQR2y A5NfyX9gmK7mZ61+/NzqPTn5nSBxGU8wWmqlLVbvEv0qHfQiB1//njUoWeix2WK7xkYL 9qrA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=26hq51RiROI5XzJelEXkN2uWQhOSPbaaTZ3h8qaX6EQ=; b=S0ajDVbPwTdiGQpCKxRz2m6SjUA6bu/viQNPuyMBWbSaJX1+nxrG0b7H4eXSCzRkNp BcuUTWMxHd3Q7qZT2XKCedyWj2TORHX5HER/JCOCai8s6VzNLAZDHpnw2LdMiCIsnxVG L5nBfU/O4KY3D8lYfORoc++mI6ZfoP+WF2KEyHcvtvjWGOLqDdMjmRXtAJKD831/i0F1 VZow4CJhWo7uK1cRKjoILAbBj6GUB7vvDwkNQ11wPvoMuRu/90BnvHcoo5wCDwXt04O/ kXIzNLLSVS5Q6zsia6U49vVtAWaVKWPOwGNgoarLJYUvHf1nMypVhOK6v/IoP+T9ey8K UXUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=L5xudmR0; 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 83-20020a250156000000b006371ee363e0si3793101ybb.517.2022.03.25.12.54.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Mar 2022 12:54:30 -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=L5xudmR0; 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 ([::1]:43706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXq10-00029s-2o for patch@linaro.org; Fri, 25 Mar 2022 15:54:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXpza-0001uC-DC for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:03 -0400 Received: from [2001:4860:4864:20::29] (port=43468 helo=mail-oa1-x29.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXpzX-0008O7-Mv for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:00 -0400 Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-de2cb87f6aso9098566fac.10 for ; Fri, 25 Mar 2022 12:52:58 -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=26hq51RiROI5XzJelEXkN2uWQhOSPbaaTZ3h8qaX6EQ=; b=L5xudmR0FjiOaJa4wSjP1tapPrafWWRJ2Y/zLdRsOXhmGPcVVwM3e6WIET4ruMNHZa YmICMkImo2tEY1ljbyndyuvr4DmmxZ++CRsS2hHklm9yKO1J0exPDwt2jSGEoTld2VT+ cCtDyPsceKdROUX5BVSL98PJVvC6dPuHbUHw63XWQmAIJms7MhgLAse5FU/5kpT6FXDd bmVOXSrZSRRkKRyvhpyVfZ3PGh1d2rsoLpitGaRTS4xHLaBLx2vbssqQHs5A9oF52SAE TdYfQF24VngwVHhLDs1g/Oa03eTdn4q0eLrE7iJMcbMo7B2hhsgfLkGh9VRtYvn9bSPx 7WKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=26hq51RiROI5XzJelEXkN2uWQhOSPbaaTZ3h8qaX6EQ=; b=z4uvNITgXCUlTKvJ7iwdfdF9nGSJV+iAExKKwcaUzIA9XFaYH4obSU8aMogecOUqTS dQx+KjhpIdwELMc/9P8JXoJXqdqlytNh+87LeelT8Veom40OfgCQz+HwexH74mcY7ubG riw/OWpYWGhaFdCgWJmCAHEmTjrtbZLGShoAMdLgBUCZAY0nwC5Blh46r0dRha1rfKTu +bHpphSj+iVfgLu9HYI26o4fixlbPe1AikWBnAsLT8fdptcmlj91KTtfTSSvpInDrAaQ w4DTqCVodA6dh0BYD59vHkRJn+twT0UmzskNYvfS2fd+mtylJ50jO7Mw+SJf/fco5Gs4 svIA== X-Gm-Message-State: AOAM533iYdQ4K6LJn79XiZqgC1VUzLPO4238BTjzNUVSYYeX40b45ZbI exObyup2kJiuxqGgJp40FhI63/vlGEQUmuYrHv4= X-Received: by 2002:a05:6870:5a7:b0:d9:b303:38b with SMTP id m39-20020a05687005a700b000d9b303038bmr9805589oap.1.1648237977749; Fri, 25 Mar 2022 12:52:57 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id ep36-20020a056870a9a400b000de98fe4869sm2153730oab.35.2022.03.25.12.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 12:52:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 4/8] linux-user/nios2: Adjust error return Date: Fri, 25 Mar 2022 13:52:46 -0600 Message-Id: <20220325195250.386071-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220325195250.386071-1-richard.henderson@linaro.org> References: <20220325195250.386071-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::29 (failed) Received-SPF: pass client-ip=2001:4860:4864:20::29; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x29.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Follow the kernel assembly, which considers all negative return values to be errors. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/nios2/cpu_loop.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index a285781fc5..969460df58 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -55,9 +55,14 @@ void cpu_loop(CPUNios2State *env) env->regs[7], env->regs[8], env->regs[9], 0, 0); + /* + * See the code after translate_rc_and_ret: all negative + * values are errors (aided by userspace restricted to 2G), + * errno is returned positive in r2, and error indication + * is a boolean in r7. + */ env->regs[2] = abs(ret); - /* Return value is 0..4096 */ - env->regs[7] = ret > 0xfffff000u; + env->regs[7] = ret < 0; break; case 1: From patchwork Fri Mar 25 19:52:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 554037 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp5788580mag; Fri, 25 Mar 2022 12:54:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxr87yMy8xcd8zDRMtO/ODjbVPS7mGxnEZngZhTF133/jE/IGbrCYDNwsSmwhfrKiyk7OXP X-Received: by 2002:a25:9845:0:b0:628:99a6:55ed with SMTP id k5-20020a259845000000b0062899a655edmr11621958ybo.221.1648238053106; Fri, 25 Mar 2022 12:54:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648238053; cv=none; d=google.com; s=arc-20160816; b=hR5cw8uRNyuFGLTXUnpW1RXndHQYS6leUZ+4iotICJFiGcx5CK4Emha5X2TAA7sPYH sgHrgin64pjRfo+JmU8hyAxpo9W2VyTiFjCv3Ma+TsBngSfSnlN5DUoesJHFBdTm86Lx gG/wWsT76bFRVPZo6QiS7NLILhAsiDsw+66y+UfwMhtlfy5U95OtsdOCF7XCScPV2G8G SYnxVVgiSHrrHtnWR40zgT6ndCyC7IoJECTNqtAGtrD5DeghRWpL4G9FGCkBsri8QvrT GRi8PaLuvWoVSN3aMGImzfI7AGxICzRrMxChfnSHssKvDNIZClaJAKpP+Sc2Otjtn6va hd1g== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=nsjNufQ73Pa+Yv0ODGLjHkWTidw02PpY5LiPgXHEvoE=; b=BE4Er2Glb5VR6NrdPvSg7LhsE3m2PSRuWshK6HFZ8WnmUY+D06KTBzDjDHDn0evNhN qnrVmpnvjQa5zprS2y9d+R3cgiTd/1CBEftp3nP4Ngb79CXpdAqZ7VY3o9ugch54dvhJ nQWGMaXcRsi+EE85tOPK/lOS9Kxtsdek7JvSMk0wDeB6/lRufLh43vYyxsf9wheYBviY gPMkVKGKn7mkikxvEQhgxqn960w+x6XKYj6orRSyaP8cnDkRhQoP4X/2JOkm9Q60oZnI LgZVGL4s0KyyUzpJxRxwvn9B7Au9HTJAFwzmo9whzy59eiqYKlzMuwIrohrGHSin+2Sx ZuuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=elqumhUp; 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 v205-20020a2561d6000000b0063399404446si3790079ybb.176.2022.03.25.12.54.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Mar 2022 12:54:13 -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=elqumhUp; 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 ([::1]:43428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXq0i-0001wd-K9 for patch@linaro.org; Fri, 25 Mar 2022 15:54:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXpza-0001uD-A7 for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:03 -0400 Received: from [2001:4860:4864:20::2b] (port=45600 helo=mail-oa1-x2b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXpzY-0008OG-Ap for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:01 -0400 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-d6ca46da48so9092514fac.12 for ; Fri, 25 Mar 2022 12:52:59 -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=nsjNufQ73Pa+Yv0ODGLjHkWTidw02PpY5LiPgXHEvoE=; b=elqumhUpXJ3g3PG+T759/CvPjF+4G0nr7XI6+SSY/NP6tGkBr4tHDatdG/K5GtPWOL OVJ+A5s+5UfT34BCfSPPG1uvs1muHS1lzDG/7S0jM9AGlTLG0AYzZvU9pWxyiBs3mbv7 pcN/cVMLQrCJ68DBmfOYAY9jKyLAH+Bg93I0KGbAuKVbitca9tDoE5ISuJ9qkcK8FtuJ ZOGl3WHARRIm2X4qSmtyzs+7Yd1o4j8EA/ENWjNaNmGPM+wSHI2sNe5sQ+QWx3eGqLlS zujQR02NtSa+7hGkVLDyXfADAq3ma5nT0toxnrpKpZIB4fCveC8lzKrarT4ysUe0l5dU 9pTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nsjNufQ73Pa+Yv0ODGLjHkWTidw02PpY5LiPgXHEvoE=; b=J0jyiYEa4+U1nVl4Nxgda/vFd5LWfSKM4BwsgDOZ4kQZ1QPkghSaWtw9+TvuUh8xvQ kKzHhAUmEOIU3xu5R73eanLnL6a/s5IPdyI6e+eOHLs5HxLd8L1v2KZyraGaZSOWiKSH iDB51wpQeT6ASSFfYH7J+3ZXqhwqMsHJadPzlbyDAURomh4qLBiH4dLgDjRq6u16XhZ4 8Fm0JdzB/Y5KjwPsNtuom+DIcqWj9bvuDr8PDQ3g0NyzJ5PmnCBxTRIorZg5rpOMO9Hu MVLwVk2sYRDuNPIl/YrThT5gZbcCBXDF6YMCWnBtvgclVdCaB+mVBwKWG9W2IFDiCx9Z 6WEg== X-Gm-Message-State: AOAM5306xwOjfO92a3xiOOEcI3vXT6vL6pGLESzozJrUO7MuynYdQ3V7 lm2scjC+DqwzKo/Sg1OrlXs7PivLAQ9DiPyE4IE= X-Received: by 2002:a05:6870:3324:b0:dd:fe5b:8d4f with SMTP id x36-20020a056870332400b000ddfe5b8d4fmr5834283oae.11.1648237978948; Fri, 25 Mar 2022 12:52:58 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id ep36-20020a056870a9a400b000de98fe4869sm2153730oab.35.2022.03.25.12.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 12:52:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 5/8] linux-user/nios2: Handle special qemu syscall return values Date: Fri, 25 Mar 2022 13:52:47 -0600 Message-Id: <20220325195250.386071-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220325195250.386071-1-richard.henderson@linaro.org> References: <20220325195250.386071-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:4860:4864:20::2b (failed) Received-SPF: pass client-ip=2001:4860:4864:20::2b; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Honor QEMU_ESIGRETURN and QEMU_ERESTARTSYS. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/nios2/cpu_loop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index 969460df58..dffe48b8e8 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -55,6 +55,14 @@ void cpu_loop(CPUNios2State *env) env->regs[7], env->regs[8], env->regs[9], 0, 0); + if (ret == -QEMU_ESIGRETURN) { + /* rt_sigreturn has set all state. */ + break; + } + if (ret == -QEMU_ERESTARTSYS) { + env->regs[R_PC] -= 4; + break; + } /* * See the code after translate_rc_and_ret: all negative * values are errors (aided by userspace restricted to 2G), From patchwork Fri Mar 25 19:52:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 554044 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp5792086mag; Fri, 25 Mar 2022 12:59:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQwHQAFd5aJuKlPDd1I+YfNeTRz25Rg5fDsiz5f72cusVayUNInq2gsCNVYXw+RMP9RIsh X-Received: by 2002:a05:620a:4542:b0:680:9cd2:fe61 with SMTP id u2-20020a05620a454200b006809cd2fe61mr8230676qkp.622.1648238347080; Fri, 25 Mar 2022 12:59:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648238347; cv=none; d=google.com; s=arc-20160816; b=0c/GAwxnhbuPHAVykReeMQEnQjebtEkTIL76stRpRUaz3aWqtpFOjhCKT5U/DwWqeA QccBRMElWkM7gcZnQb3IInvC7O460Ymzb68NwuxHoDIaS5sDxMuWXJNngKobS3wjSk7p 7SqR411BcVz6IJIw/iYGSXAXWDOHUbcwRLAwLYyCW+tPq1aq393Sejwc3MtyzqhRMda8 J24XG6TALObcr1DAkgcZxj+npVouyZuUQpoTu2VM//6xi/on6b6I7gXz16xCGkf4sEvP 4fFM3JyOBRzzAbBQBh2qdDjArsE8+lqGXfcyPE3CgmSEEO/1LjtAwLxlu0MftDUo2EYp VqMw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=TOJF6hs6MIWp7u5IOBbMVU2hqWWBLm4vep8AaaojE1I=; b=wfcFCY9HMBBEyOFk255VbHbRunnp5RnK8saWoUhrGk9EYpoBOLWC5xviazangI2sVA Ix2UvbJdUQ3P/SDQUIuqS5YXqsi+dC81EvwqaL7wdx/JTB4v0B5E2e1d71bOOc/G7ARZ EnSblynDkxbCsj1GePGRaYod/jZ/djqWmp6ct94aYCeesXsQdcwgtmepScsj/rQTn10q OpValyf9xW9QeF/TXROrE/re/tK6BtwRF3icdUO2buV12TLHRIMXROMF0DC7P/o4W3pj 44oXaYGr16bRJa8fAk2KMocnUTGPn6Vt+l65vJsaL33kEejPmhFotyR75ZFA6bgwN1KE Ubbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=D8zPgITM; 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 c19-20020ac86613000000b002e1fbf3c106si1896223qtp.759.2022.03.25.12.59.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Mar 2022 12:59:07 -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=D8zPgITM; 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 ([::1]:59008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXq5R-00043w-Ku for patch@linaro.org; Fri, 25 Mar 2022 15:59:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXpzc-0001vr-S5 for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:05 -0400 Received: from [2607:f8b0:4864:20::235] (port=33327 helo=mail-oi1-x235.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXpza-0008OZ-1C for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:04 -0400 Received: by mail-oi1-x235.google.com with SMTP id k10so9327648oia.0 for ; Fri, 25 Mar 2022 12:53:01 -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=TOJF6hs6MIWp7u5IOBbMVU2hqWWBLm4vep8AaaojE1I=; b=D8zPgITMMggSQkSh3x6FJ9KuRhzjYSZOO7AEEiIpYcIaX6JvTUSK7p8svOrwkPDV8l KCOrwS+PkhF3FY/ctb/UWfM2Y4CvSiByBYVbvMq5uL7HM1Hh9tQ9y8s4SLygB98OkQRx 7kSZKAsVVHmjZQ5PSgT8NJ4k+ZOzaliVifp3LDmQXVloXQGWTlJ4ZHEc/fpJrmz7fOb+ Vsv/tzBbROlfV1p5kZmjgbW5uEj7W0x4IY7JEhd7rV2WBs7SnN49kmXDaw+0rroc9e1/ v8yE79PigHH+55sFHI5ECH9PHEcKRQdI9sghEyyx+NeSPnZQWr1NEkh6WVhAJc9wD7Ka msDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TOJF6hs6MIWp7u5IOBbMVU2hqWWBLm4vep8AaaojE1I=; b=H0jjLYf+BN6y3C+MIRu7qH3vDtEWUBzktmfF/IXFLMVsp01W9s5m1FNJGX5lGdZzXT 5fAlDMHfi6AJtm7XS6qdLmid4UnZypvcZiMFhF3FiH0nR3Ae2d7LYxG+FyiSevUwz0hk TZEObk5d1R4CUBgqeEGQPy8pWmFZ6QbZiRi7aKBEMWmLSNlvNC0Oe887Lbqgak4EIl+b KajWFLm3NqstomxJ5ZLkynTQV1WTpd8CE9yvwyctw9p7VlQXcW/iItVV+m2wnMBx02nQ pyFAPy/KUnDzax7I1sWoWwZofeITazwBqRaLIBGNJLxmztbpStY/1QcSFZ0YfMiJhL1Z 0auw== X-Gm-Message-State: AOAM530rfXla5ZMc/RZVlPqISW26WsgcWZkJG9AlDBdBNaI1UgD/u6bN BIAIq8qH+49g66fPV/nBAjCzMMdWmLAiprYeOoQ= X-Received: by 2002:a05:6808:113:b0:2ed:22b3:fe57 with SMTP id b19-20020a056808011300b002ed22b3fe57mr6422643oie.164.1648237980181; Fri, 25 Mar 2022 12:53:00 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id ep36-20020a056870a9a400b000de98fe4869sm2153730oab.35.2022.03.25.12.52.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 12:52:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 6/8] linux-user/nios2: Remove do_sigreturn Date: Fri, 25 Mar 2022 13:52:48 -0600 Message-Id: <20220325195250.386071-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220325195250.386071-1-richard.henderson@linaro.org> References: <20220325195250.386071-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::235 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::235; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x235.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There is no sigreturn syscall, only rt_sigreturn. This function is unused. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/nios2/signal.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/linux-user/nios2/signal.c b/linux-user/nios2/signal.c index 517cd39270..133bc05673 100644 --- a/linux-user/nios2/signal.c +++ b/linux-user/nios2/signal.c @@ -185,13 +185,6 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, unlock_user_struct(frame, frame_addr, 1); } -long do_sigreturn(CPUNios2State *env) -{ - trace_user_do_sigreturn(env, 0); - qemu_log_mask(LOG_UNIMP, "do_sigreturn: not implemented\n"); - return -TARGET_ENOSYS; -} - long do_rt_sigreturn(CPUNios2State *env) { /* Verify, can we follow the stack back */ From patchwork Fri Mar 25 19:52:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 554043 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp5791546mag; Fri, 25 Mar 2022 12:58:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/sUphzpO6cZHXYeR+ig9VKFFQLwemc+CwomjA0AZs5Los8ja3ObTOacrTqoUgRzONuM5p X-Received: by 2002:a37:9c3:0:b0:67d:4eba:e4fa with SMTP id 186-20020a3709c3000000b0067d4ebae4famr8217161qkj.300.1648238287826; Fri, 25 Mar 2022 12:58:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648238287; cv=none; d=google.com; s=arc-20160816; b=nj1tYLjXsaGFDD5bnAtWOOpJk/BExhJx9IfrL6cFAXLRUq4w7Vg1LOj3Ad/ndQp2/J IZLS8h/dAavb9+hHiE0C083Dxyv5forHsTa6d0E1bDVyx1T/UrRtGzkuNW0W0rtWiEQi ykWQKVxRu7wjVAyYuzpNJtBp3oOvrPpPG8FZ92qcDgSysURQ5qBTjzkxj8ghhKE2OsUY CLdeQS8VU/QoSu5mDEszu18rSpsx+1B2zUhGPmRt5Magl/Zwe2u+j3nUWqXZrz0OvYzy 7XXB4ofbkHMl5HOkWVyGDedc13qTmTZZkxlgP9zBUe4DUJg2kxQXeE1rEkca5LZu0fva u+Nw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=xYuWaRD3BVfH07lx10ciC+hnANbY9oKSD0sVPEBlcEQ=; b=t32E5uc/S2VncNS+hs5ZAqRPwcN3UF4jf0WP3+gxDpXA3AkImUi4mi7Ox2Ve9X00oB Isnsvm7+H8qiUuqatWtK/sm9BNmy3Y9blMgRGpT1QZyDHenE5xGIB4Le0WZer9KRcv5e hAxG7qU8OvR/Kc2UqYbwOx8OaYfYOPV0qZZa5YoRQ/VWW28WANGE3vr+mJ8FZZQSBEA5 zrGrPEslX4GDDRNQ4+b6TZLFDhpofIXSdsfTfy5anQT+SIrRYqMZ6/KQOwHIV8+xj0ST 56hQbQwdCVG7ocUuNFjh8wyTG91gZNzsa++fSENdHZeez4FePRuEe+K+v1HCIA7RogjX ZbaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pZSGMNLP; 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 l206-20020a37a2d7000000b0067ecda965ecsi1633182qke.163.2022.03.25.12.58.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Mar 2022 12:58:07 -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=pZSGMNLP; 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 ([::1]:55882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXq4V-0001xS-BK for patch@linaro.org; Fri, 25 Mar 2022 15:58:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXpzd-0001vs-13 for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:05 -0400 Received: from [2607:f8b0:4864:20::22f] (port=37609 helo=mail-oi1-x22f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXpza-0008Oq-Ib for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:04 -0400 Received: by mail-oi1-x22f.google.com with SMTP id q129so9304906oif.4 for ; Fri, 25 Mar 2022 12:53:02 -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=xYuWaRD3BVfH07lx10ciC+hnANbY9oKSD0sVPEBlcEQ=; b=pZSGMNLP/tWoXcVpzbBHlBPWZJJehBhdxlrrGpISpY0187NYlN5l0fv46kHe9VZfcc iCkAYCf816U1HhY9AeoQNidQPbq0mPO+Wb1tcF/3g1oMvlO9N66F6vFWxg69KvXhBonB CYekMQNgzYsq9JM+eTF0eImCbmZcJ1am3pcEVeDIBSz/KL7sgCJN5qzIgLz2pXeQvpeE 1FofhVrSZQHmujqw+t/7zfpvZ25tUtZ7K4XLcBlRPlTpZOGf0N/HhdCURaezj7S++6Ee BKBATZ83BUvg3ieXS3nRYPwaxeyNawjvZoUDildX0dJPRRbIyejgNHISHJrdCs81FeQX 3Ctw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xYuWaRD3BVfH07lx10ciC+hnANbY9oKSD0sVPEBlcEQ=; b=TKN7U00MPkBQC7yhExH6MqjKzyWsyBHM7pMGO4vLZtA8CK7UeOr81aCoo6eh0/Ek68 nKjjy2KKrr8ct/gkrDYnzTMvOCCS/+9C8nxHT5qEg3qI1HbYe3JEXrd9iusSwCi55u0u +SGe2b9dFrBdMr18uaT0GEE3lP426M14X6/o0/pbUADDN+KVfXchKmwuiwoNSM8aN8vs 1Usr6K3dlprj45vnIXGLvBUtfEkqPjnwl4Wt1YsIfMuG7flB1PMaptQNl8utrrngup/C JXNjQM/2fNm5oeZcKpc7qjxe/YLr3Mf9bFnkNiIypFJSv7OEaxYDYr0rW+19ATxletqf 4hsw== X-Gm-Message-State: AOAM531LhxAzYbuR3n4t4xgGA85RN7xBnU1cVJ3tVJ0Z1QI3ZTKCEy5O MryiRo9CXRviMkm+sBPxDxJx5zx0DvVepqYd/to= X-Received: by 2002:aca:6704:0:b0:2ef:2e32:b67 with SMTP id z4-20020aca6704000000b002ef2e320b67mr6068921oix.155.1648237981160; Fri, 25 Mar 2022 12:53:01 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id ep36-20020a056870a9a400b000de98fe4869sm2153730oab.35.2022.03.25.12.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 12:53:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 7/8] linux-user/nios2: Use QEMU_ESIGRETURN from do_rt_sigreturn Date: Fri, 25 Mar 2022 13:52:49 -0600 Message-Id: <20220325195250.386071-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220325195250.386071-1-richard.henderson@linaro.org> References: <20220325195250.386071-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::22f (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::22f; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Drop the kernel-specific "pr2" code structure and use the qemu-specific error return value. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/nios2/signal.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/linux-user/nios2/signal.c b/linux-user/nios2/signal.c index 133bc05673..9aa525e723 100644 --- a/linux-user/nios2/signal.c +++ b/linux-user/nios2/signal.c @@ -77,8 +77,7 @@ static void rt_setup_ucontext(struct target_ucontext *uc, CPUNios2State *env) __put_user(env->regs[R_SP], &gregs[28]); } -static int rt_restore_ucontext(CPUNios2State *env, struct target_ucontext *uc, - int *pr2) +static int rt_restore_ucontext(CPUNios2State *env, struct target_ucontext *uc) { int temp; unsigned long *gregs = uc->tuc_mcontext.gregs; @@ -128,8 +127,6 @@ static int rt_restore_ucontext(CPUNios2State *env, struct target_ucontext *uc, __get_user(env->regs[R_SP], &gregs[28]); target_restore_altstack(&uc->tuc_stack, env); - - *pr2 = env->regs[2]; return 0; } @@ -191,7 +188,6 @@ long do_rt_sigreturn(CPUNios2State *env) abi_ulong frame_addr = env->regs[R_SP]; struct target_rt_sigframe *frame; sigset_t set; - int rval; if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) { goto badframe; @@ -200,15 +196,15 @@ long do_rt_sigreturn(CPUNios2State *env) target_to_host_sigset(&set, &frame->uc.tuc_sigmask); set_sigmask(&set); - if (rt_restore_ucontext(env, &frame->uc, &rval)) { + if (rt_restore_ucontext(env, &frame->uc)) { goto badframe; } unlock_user_struct(frame, frame_addr, 0); - return rval; + return -QEMU_ESIGRETURN; badframe: unlock_user_struct(frame, frame_addr, 0); force_sig(TARGET_SIGSEGV); - return 0; + return -QEMU_ESIGRETURN; } From patchwork Fri Mar 25 19:52:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 554045 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp5794562mag; Fri, 25 Mar 2022 13:02:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzghcjxHFzeiU2JIrmyhmtFVaU0q82PWf4soZArknBhNazi+DXJ89BBJbBW0j0C/F3aXmw X-Received: by 2002:a05:6102:505:b0:325:6163:5ba7 with SMTP id l5-20020a056102050500b0032561635ba7mr4572814vsa.80.1648238530443; Fri, 25 Mar 2022 13:02:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648238530; cv=none; d=google.com; s=arc-20160816; b=JoiIowHelDEZ2mdGW5aKPYHLMN6+kHjsgMA4pY5QXBoDq9sG3sqpBrVHPyULO65ijU YZVXxbxb6vVgGKyMUGuQT6OikOlk3PgK8SlBU7h3Y5yFPD5int9dRrPprGee5IsSJsTp IxfBYHbwjGybkEw4mX2k2dOTBij295gsyaeWafzpVD+Alz95O/g1I54sTDtAJ/Hj0Sf8 KC49oEBKqNm5mwA6aofFsMvUlToNy88QfKsSkagtFmhny5VE+4PGDQgEaOufQJ4cXpuB FRCg6gVKOU6nxyOc/lp4vJPIZRgYplzzEjayJ9H/Ri4HWwlUdnVcogaSwhk/qduh/pDz kSsw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=b49/gyL3nhPHdkIknNEuvRr52AV4Z59e2KtiOdvbnJc=; b=OoCuY09kPDiYCiHUvSqVOfEZ9509mXknD27kfgQFmTKVIo9dzDOyPBE67dgqgF8B1n zqOEMZCPFI3y7iN74BflmSE39wNCJo569YU3EKVO06PNQeQcSXUEKoTDfsnNneIlom/H ckgft4EY2BBVZ19Cf+eACukGjnfpJzUTRB0fXM1ZtuBbH0xgIkU+IhwVJ3ivJ9ytEtB4 LwGt4TL6rP0cTzTeC7F4hL2+6iTko7vzdzWX64GoKkEktkzQsZylqshnvaqYOamgpJpi oD8Q6zYNFjARTb6CzYF/0hFhP1dKtcxTxY/Si6mXObXY7F87/3S6pnrntfe8Htcid9bo JfFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=geOAeSHx; 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 h9-20020a1f2109000000b0033e8317028bsi425959vkh.245.2022.03.25.13.02.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Mar 2022 13:02:10 -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=geOAeSHx; 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 ([::1]:36970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXq8Q-0008Lf-1M for patch@linaro.org; Fri, 25 Mar 2022 16:02:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXpze-0001wV-9h for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:07 -0400 Received: from [2607:f8b0:4864:20::229] (port=41820 helo=mail-oi1-x229.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXpzb-0008P8-JH for qemu-devel@nongnu.org; Fri, 25 Mar 2022 15:53:05 -0400 Received: by mail-oi1-x229.google.com with SMTP id e189so9284383oia.8 for ; Fri, 25 Mar 2022 12:53:03 -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=b49/gyL3nhPHdkIknNEuvRr52AV4Z59e2KtiOdvbnJc=; b=geOAeSHxOhYUQsQGhYgNOr1wdRY7ShbbFxdZm5weFgvGhnW+8vswopZoU3Tu+X8c0T 66V0x9f6viS1rSXT17BeC9fNOD/8wJhSpMGl8kKeBy7TH/z2ZTi/13PXZPlz1Lz7aU1g 6fAfvcTU3d7h1qlgSaQAM0rcqdosjGfPP/avx9E7trcDjd9UIFTwYMjMvgMusVrfF29B GbTaoQ+kXL7M+bUExdBsL2SVVgsj3t2y8rwEoR/p7Z0tuDbKAFuy0OKvJfUwE54l5ZQK D/fhozq1RCEdnegw71fyA5tLGbzSM/ED+ybVj1dbwlB5tkpHX9I8WzJ1uRYt6KKg5bjy xpYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b49/gyL3nhPHdkIknNEuvRr52AV4Z59e2KtiOdvbnJc=; b=ffvvqnrfzPLXGm1/imDEpGHrohkbY92/khPrlhs/5HtSZOBLh85onXVPoP8tewsW+k CC89aWCngyT+l5lG1w6XDWPuYOEVsDJD6vwZbMk41iN6lJBTNa0CgYdyDh3Q9bPmsuj1 Qfhkx8Nw+VzONWijGXIEH9dQAI3xfaUNjjLGY1qlizKSzALmrj3weQjsVrRwxGZQj4WY Mwspyayk7L5F4zuEb3i2jprNiXz8FK8Dl13xL5alWwSD/0M/a6NZ5OYbrhH/YCJVmEUp OYQjDbqo/yrCQhXMLpRA+5ElVFhUTJUtXNlFvRgW8S8mwF5L/Cg6GhigCguB/BMRTxkb 0N3A== X-Gm-Message-State: AOAM530li1205zoFx2U+JCN9XzRibDWgKWUGsHFQvfRvq0SLmw5vyrZX fz+C/yZ6bVSNvI5GjuTjtVFMex6fudb4Y0PL5jM= X-Received: by 2002:a05:6808:2114:b0:2da:1bae:5197 with SMTP id r20-20020a056808211400b002da1bae5197mr10320213oiw.17.1648237982346; Fri, 25 Mar 2022 12:53:02 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id ep36-20020a056870a9a400b000de98fe4869sm2153730oab.35.2022.03.25.12.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 12:53:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 8/8] tests/tcg/nios2: Re-enable linux-user tests Date: Fri, 25 Mar 2022 13:52:50 -0600 Message-Id: <20220325195250.386071-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220325195250.386071-1-richard.henderson@linaro.org> References: <20220325195250.386071-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::229 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::229; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x229.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: peter.maydell@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now that signal handling has been fixed, re-enable tests. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tests/tcg/nios2/Makefile.target | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 tests/tcg/nios2/Makefile.target diff --git a/tests/tcg/nios2/Makefile.target b/tests/tcg/nios2/Makefile.target deleted file mode 100644 index b38e2352b7..0000000000 --- a/tests/tcg/nios2/Makefile.target +++ /dev/null @@ -1,11 +0,0 @@ -# nios2 specific test tweaks - -# Currently nios2 signal handling is broken -run-signals: signals - $(call skip-test, $<, "BROKEN") -run-plugin-signals-with-%: - $(call skip-test, $<, "BROKEN") -run-linux-test: linux-test - $(call skip-test, $<, "BROKEN") -run-plugin-linux-test-with-%: - $(call skip-test, $<, "BROKEN")