From patchwork Sat Mar 26 13:24:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 554357 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1248:0:0:0:0 with SMTP id z8csp6429072mag; Sat, 26 Mar 2022 06:37:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxF6ES3c/mrGLUtadgbijeGGIpvj5rx58gXZdLjX6MoxtXumbAfVzrm3GEvlE1verMo+80r X-Received: by 2002:a05:622a:24e:b0:2e2:139c:3f1b with SMTP id c14-20020a05622a024e00b002e2139c3f1bmr13655915qtx.209.1648301833252; Sat, 26 Mar 2022 06:37:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648301833; cv=none; d=google.com; s=arc-20160816; b=HI+mAhGfbVXqVF6ACLYc8wdKwOwDhaxthSSUqeZQSCe3zTc/SaMI4qG5VkD+M/bADd wkIbJpOv5GjpRRpqJwBGBKQaUbrlyk0eN6sOX791KFPJbk3MSMWV2CGDxCUfSvzHfWtr HT7H/o4zmNMgQ9rVgVSKeohOl/TUvuPIsRc/yIoFAH+CTynseDgPfTdcdxygFmeS4XUo yqIjNJFka5prW2gAkcfcVP1a/+RV0XTYUo9mer3bxlWT1Xegy888K0jGSGzObplVt8GG 9Og9lfdq/mHK08LSdcq0p7gHNMFj3niFL++BoIk0uADDmVtGfv7E3Xk/8leIcEgP1wvX /hKg== 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=vetMMn6l0zS4QEwpDeB3CBtpc4lig40ewuxYWBbReCG4m/elK+tI9HGEO4LFDGKkru pfanE33e/iA6AuhrjwAD2mNPX1Hv4dwvqXfAaMlPoPw6DHsbdsKD2yaqS4bBMFBMccsw UejJvYAnbRP/hOlHzlxKnfIQ4iBGtIWQZYHWbu1tFlffu8wZ7kOiMBNKAfeBQq21dOXX ARtoMz7++N8H2RkMIWVl3AbBf3zZ+co8MNzATN8fRDgyJlhYJWmAAY3aC6n4cb67lyVO mm5ofI5UwqwdeqwnD3uM8kzMxjO6DzZbiVe30Mu2A+5Tvh7GxwjTzkiybbnlZGEbFKfr THmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gZXGGyjY; 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 i22-20020a05620a249600b0067e4be238basi3749326qkn.255.2022.03.26.06.37.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 26 Mar 2022 06:37: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=gZXGGyjY; 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]:59132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY6bQ-0007Vq-QJ for patch@linaro.org; Sat, 26 Mar 2022 09:37:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY6QU-0006wr-UH for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:54 -0400 Received: from [2001:4860:4864:20::2d] (port=34141 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 1nY6QS-0005LY-36 for qemu-devel@nongnu.org; Sat, 26 Mar 2022 09:25:54 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-de3f2a19c8so10757408fac.1 for ; Sat, 26 Mar 2022 06:25:50 -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=gZXGGyjY/uBZ7z16FOHeILiIdWKrHwkBArJIoWSLSLA0NqQgF/zsENd0svLblWhm73 330M94R0bcsONJicGQ4KFP27BUH6dDzSjbvnGIWIRhb2KdcY7rQC2jgltRbdWTL+30IM HOpIdMRRUgAYZQd3ttNryHzboDPzL5UxHq3WFvP6y2ZZCydeS/ZZfyPUL1opYvsGe9dM QEgQGClnmB/oaCep8kaliPC2MPiT56EvzBoRFtZhHH9R76QgpAxj+sDtmzpu97t2Ifvd f2D9gtqPhaq4tHR/HlG3I6e9CngqjN6N3zU6cgu5EpEaGNXkA7zLnnRXNwSOKoRxVp5l Dp8Q== 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=YcQ4Ltty53zWZeS4swTPuHyA8KVrtSX4uuYdapPvCJ7BTYKP+mtF27Se814RdDOaIZ +VlxyTrNbn3iCW3XpxPahCkyzKMlvdjZYtwUIi4CCaFRNrWpHQPVWfLN8UD3m9MOgyIb VHQ/wdkX4Llwl3f8AxgPzpigPDblxwaLN6/xf4qkRZBADCUQ7zRsy4xrlUchgADCvVSO Mw/Id9pEzy1L/FIVebl73Vk6rsgoU6TUSg8coK8/R9xzc+RocoCSRxog3ftYLAWWVpqH DP4f7cTqCYwYmeouZNmo+TyiVju8K+aBUXHlC95IQKUtl0lNdqXGDifkQqEk75iNAVqs CU/w== X-Gm-Message-State: AOAM531Y0XEBPs9GWmGbq5dFfm9KtQolgmbewVkrAOYUgvt05K4Jpmrq khJhsdNYChBXxpqOeu9TPLRT8c+/I5WlHEdk X-Received: by 2002:a05:6870:4617:b0:de:7c85:37e6 with SMTP id z23-20020a056870461700b000de7c8537e6mr8046932oao.169.1648301149962; Sat, 26 Mar 2022 06:25:49 -0700 (PDT) Received: from localhost.localdomain (168.189-204-159.bestelclientes.com.mx. [189.204.159.168]) by smtp.gmail.com with ESMTPSA id n62-20020acaef41000000b002ef646e6690sm4610331oih.53.2022.03.26.06.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 06:25:49 -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: Sat, 26 Mar 2022 07:24:56 -0600 Message-Id: <20220326132534.543738-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220326132534.543738-1-richard.henderson@linaro.org> References: <20220326132534.543738-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 , alex.bennee@linaro.org 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),