From nobody Mon Feb 9 07:17:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647792705; cv=none; d=zohomail.com; s=zohoarc; b=bCNBpaCaE3PM9Ee3ByPHovPM36v6X0mnwwG0nQf3ff1/abNGpoLYJHSwFTsn+HyyXGcp/IijxgyUSoh+lavLRZWXlgZwY1AosRAebEFEAo3a60SPKWmw3bF7UN88Kv6afxTkROmjftczIekoTPFimFI8lHOnsriX2CDSmJn9H5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647792705; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NqjSqqJYJqBZpZ7IPTgBDuMNo4UxguCJGEl833fSoDE=; b=fps02Jq+VOvEj9gi1lWVU3+7axbN+qyqOlQbsrKfVCj3pm3xBX8H+QgMarUZB7n8TsIR+y7Moylu49q9yLUZsH0wKQj4Kiuin73bCcqDgi6xVk6m8zn6sY0o7WE8KYfmg89wMI732evKwGyII/Jal8VHs9mOL0/m1y7G0fLCSsU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647792705183654.6491260422517; Sun, 20 Mar 2022 09:11:45 -0700 (PDT) Received: from localhost ([::1]:35582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVy9f-0001tC-FH for importer@patchew.org; Sun, 20 Mar 2022 12:11:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVxyh-0005Kr-Cq for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:25 -0400 Received: from [2607:f8b0:4864:20::629] (port=45956 helo=mail-pl1-x629.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVxye-00065m-C1 for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:22 -0400 Received: by mail-pl1-x629.google.com with SMTP id k6so3632805plg.12 for ; Sun, 20 Mar 2022 09:00:15 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j23-20020a17090ae61700b001c6bb352763sm6590099pjy.52.2022.03.20.09.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 09:00:13 -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=NqjSqqJYJqBZpZ7IPTgBDuMNo4UxguCJGEl833fSoDE=; b=BFbdpMLhpY0T/YtRsqnKhLGHE2V8iQ5NW2C9jdyKtnUrARhZAwDx0K72c1XEAD/mjz g2tQKFm/u0t5GNfdgltRiT15zjwPYeQLa91xC1b0r30R/oyw10+PPFoW0dwqC1gi3RIJ mElrS/dL55dvVOhK7u03Sy5kAvcv0A5cL8lPEcdAjp+kIQSCMPcno+xdRYDZz7dI3014 MegRXrQNC1yGM2PsdTDqvtvjZ8VKdP3J0F/kTdQv7t6jomaZe5QO09n0ygpXibY6F3oM J9OFOxg/8kov0zPNOwRk1n6xunODSU93caXoZVev9iVNNOKQ/DtKmK/+GQZnmZWvVwR9 0+Hw== 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=NqjSqqJYJqBZpZ7IPTgBDuMNo4UxguCJGEl833fSoDE=; b=eVLAmp9pcXAqnVS1swlgiCiljnlvTUiH5gNqDCJrcyaL5OdEFF1pxxVhSnjQP61ct8 KnQK9VpZP41KFfyRAFLTp8cCWG4YIs2EsF564tjEkh9JaWDfYuW6k1B35IZUpce9Y+s1 y78uPTj06KznwX6Jbd6Oyxg9g+FmWTfezWYOa/U0wuCgvxtCHpqEs/opzbV8CQZlzrJ8 VRFZ9EnnpNHBh3nLVqaerbp9C0mPWFmPwpabMDy8NWBK/IAHHJxq9qcZ3lfefjRdbFP2 5u4bvY04SHGv8Y75AmxajQ1Vq2qu5Kg3qXfpp6vRPTi6BxnIlb6v2Oun7767eAuwbxd8 ZxhQ== X-Gm-Message-State: AOAM533gUBxkZT2bcMeBH5IgMoC2wmcAN+h5yonyrA7Tti/mK/SF0oeb RtQ6/S0JS2Vj1XV6/sP2eNZd+r5G8KlihQ== X-Google-Smtp-Source: ABdhPJztefOcC4UbWryLsCrn/vJqKzG/3ij65HPUrvmR0c3G01I14zsvXthhZeXW4jzCzkzh3LqR+Q== X-Received: by 2002:a17:902:7fc2:b0:153:3c90:17b9 with SMTP id t2-20020a1709027fc200b001533c9017b9mr8955203plb.61.1647792013774; Sun, 20 Mar 2022 09:00:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/7] linux-user/nios2: Fix clone child return Date: Sun, 20 Mar 2022 09:00:03 -0700 Message-Id: <20220320160009.2665152-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220320160009.2665152-1-richard.henderson@linaro.org> References: <20220320160009.2665152-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::629 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.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: alex.bennee@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647792707380100001 Content-Type: text/plain; charset="utf-8" The child side of clone needs to set the secondary syscall return value, r7, to indicate syscall success. Advance the pc before do_syscall, so that the new thread does not re-execute the clone syscall. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/nios2/target_cpu.h | 1 + linux-user/nios2/cpu_loop.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) 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 *en= v, target_ulong newsp, env->regs[R_SP] =3D newsp; } env->regs[R_RET0] =3D 0; + env->regs[7] =3D 0; } =20 static inline void cpu_clone_regs_parent(CPUNios2State *env, unsigned flag= s) diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index 1e93ef34e6..a3acaa92ca 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -42,8 +42,7 @@ void cpu_loop(CPUNios2State *env) case EXCP_TRAP: switch (env->error_code) { case 0: - qemu_log_mask(CPU_LOG_INT, "\nSyscall\n"); - + env->regs[R_PC] +=3D 4; ret =3D do_syscall(env, env->regs[2], env->regs[4], env->regs[5], env->regs[6], env->regs[7], env->regs[8], env->regs[9], @@ -56,7 +55,6 @@ void cpu_loop(CPUNios2State *env) env->regs[2] =3D abs(ret); /* Return value is 0..4096 */ env->regs[7] =3D ret > 0xfffff000u; - env->regs[R_PC] +=3D 4; break; =20 case 1: --=20 2.25.1 From nobody Mon Feb 9 07:17:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647792530; cv=none; d=zohomail.com; s=zohoarc; b=GViaFa/tYcVDXGDK/lff+krhpYvYi66JkwP/W8hIi63omeiI0u0411Dbo08UNnZ3uZ15unzDbGJ4KN04HFzK4agvHu+xkO9tocLRD1CN8tOpky1dEeZmVh7WgxP9B1kQj6QoLhZia9vqrnEjOyDJbnExivIW3B6/fzb4fGZ7Xq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647792530; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1T8UqtoVKD4QHw3Ob4yOhcSZMQMSY9kekR+Tew5Lo84=; b=j+em9tPOJQCLXVwZadd5R7fvO+xErbkqd/Ix4/6vq03xphGBbGHmxBZnTg4KYsw3N0YjWOTzJ08wbtPcNnuLsNNh8+U8WP+iLDsSGJBFwuvHZAo1hKBwNsdjuj44fBk5wJS8ghOdvqGLrkpfk29BFoMz9HIpvp23HAVI7vqLkng= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647792530254258.5866167357368; Sun, 20 Mar 2022 09:08:50 -0700 (PDT) Received: from localhost ([::1]:57150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVy6q-0005m5-NR for importer@patchew.org; Sun, 20 Mar 2022 12:08:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVxyi-0005Ku-1E for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:27 -0400 Received: from [2607:f8b0:4864:20::636] (port=41781 helo=mail-pl1-x636.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVxye-000664-Cy for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:23 -0400 Received: by mail-pl1-x636.google.com with SMTP id j13so901464plj.8 for ; Sun, 20 Mar 2022 09:00:16 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j23-20020a17090ae61700b001c6bb352763sm6590099pjy.52.2022.03.20.09.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 09:00:14 -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=1T8UqtoVKD4QHw3Ob4yOhcSZMQMSY9kekR+Tew5Lo84=; b=q9iBdsM4EkbRro7Ic5JxuoOFhU41ia3MxslqdAMcbe6uJVTW2P1nMtP8Lb8aOIHfZV xHh/sj6qm/EqqigIp8kfFUQuKN4IBN1qbU2lFyXnXi4YgddSPGKrWzY95Tlc+xkqZNgm I1GckOyZ2VwJ48uPa1uglBYV8YYn6wCSDhwR4JCkkG9g3MebXaf3tK6jUmSjwun346dh mZ0Z7a8rLPWz8yvh9tQReKcSYdRo0w/0C5rL43LVoH73O45g5jPE7u5iFgTXdS918HzF s1EBusfaR60U+dv0+Xq+q/4Bg6bIzjO2Ivl3tytiREquz39Ho5iJeh8WqKKGzTGiRA9l Dxsg== 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=1T8UqtoVKD4QHw3Ob4yOhcSZMQMSY9kekR+Tew5Lo84=; b=jQR0OszJorXxrHEcP+kDRK/SYC9rLUNQMHeDBKH1SVHPaz4Bwbs+PVgKCLUlXPiVkI PJf4C/RX4VHnQtnzZ58TH29FD9+6ZPrGHWhwv9CfibKTp9JA4MtJ2eIMD+eRtOmd4HUt x/Fz+7aYyWGdZu1pHgZYscvyuJoF7fwuhIHauptnIqyqNLaeN+/2UB/eI8kqcVZiEAIA l7ur3vjb5/rNI1S4OO3KaKr3fm+9HwPdTuwv0O2QnHD1q/w0J28ULbJdcFUhirPgELcd kdFzxcOMNCV+wKphKd9i78ozIEUAj/OpXfYZrKjLAQ6s7Ck4tpKrf3v9bUTuaR2tlcd5 qfWg== X-Gm-Message-State: AOAM530SSQp/B2CANLk2J6heO2IyTkcDovfjIweoPnKRQrcCZcx/z3c+ JT2/17FTWLAwBNa9JokuJLxJFDfVe2K8gQ== X-Google-Smtp-Source: ABdhPJw2wwE6sDc36fmS+h/0yO3YbiweZcFgkQtzEmPDb2N0RD38LT5zVTT/+rBgP5eCPRfP0du0kQ== X-Received: by 2002:a17:90a:1197:b0:1bf:65ff:f542 with SMTP id e23-20020a17090a119700b001bf65fff542mr31718143pja.5.1647792015024; Sun, 20 Mar 2022 09:00:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/7] linux-user/nios2: Drop syscall 0 "workaround" Date: Sun, 20 Mar 2022 09:00:04 -0700 Message-Id: <20220320160009.2665152-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220320160009.2665152-1-richard.henderson@linaro.org> References: <20220320160009.2665152-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::636 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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: alex.bennee@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647792532099100001 Content-Type: text/plain; charset="utf-8" There's no documentation for what the problem was. Fixes: a0a839b65b6 ("nios2: Add usermode binaries emulation") Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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 a3acaa92ca..ac71f4ee47 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -48,10 +48,6 @@ void cpu_loop(CPUNios2State *env) env->regs[7], env->regs[8], env->regs[9], 0, 0); =20 - if (env->regs[2] =3D=3D 0) { /* FIXME: syscall 0 workar= ound */ - ret =3D 0; - } - env->regs[2] =3D abs(ret); /* Return value is 0..4096 */ env->regs[7] =3D ret > 0xfffff000u; --=20 2.25.1 From nobody Mon Feb 9 07:17:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647792315; cv=none; d=zohomail.com; s=zohoarc; b=jSrS4igPwmsEqcnirFgW+KvEVCOVO1+aq+rGVksKeYaMdsp7mJKAKX6oQV0Ha++P7ZA/kkN4BxakHvpMNDrPRUpQsG4av86iqsmtKUTouyByolCa2/s6KNq8v/fN8jC+8owHItzQaUDy9o4ZgR4hmBLZ0rHojSoa8xFl3xoQzBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647792315; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/vRQUrPXATR+Gi9ECEWVdt6AMeM9dbVbhXfJgx7mHpE=; b=PN1doRziWdZBAGn72LjfGY+KcRXK8FE6qI8Nq3jE9Vjqbl30Z4na8TfcBBahRvqIWa5EzWrDvTewsWc8wPaeHN8AVPEW4qpzT6ULQks/vNFuihktdFl3wthjPPYF0fiKsZq+h4DeFFXHqBKKPWSE+4fF8cT3QGLzpQGnZP8fG+M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647792315536590.3830384736106; Sun, 20 Mar 2022 09:05:15 -0700 (PDT) Received: from localhost ([::1]:48708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVy3N-0008VU-Rs for importer@patchew.org; Sun, 20 Mar 2022 12:05:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVxyi-0005Kw-IH for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:33 -0400 Received: from [2607:f8b0:4864:20::634] (port=43661 helo=mail-pl1-x634.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVxyf-00066B-UV for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:24 -0400 Received: by mail-pl1-x634.google.com with SMTP id w8so10782041pll.10 for ; Sun, 20 Mar 2022 09:00:17 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j23-20020a17090ae61700b001c6bb352763sm6590099pjy.52.2022.03.20.09.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 09:00:15 -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=/vRQUrPXATR+Gi9ECEWVdt6AMeM9dbVbhXfJgx7mHpE=; b=agP66jAeZwb9JxcRFnxSYUConelWk2rHu6N9AJ65hMtSLWeeyM113SxJW9QtSlDBC6 0/7qalmflCiwDji3qp49WecSGg6gX2gYsPAf8+kFCoDYp1lNZTuMEwo0mVj0CpfOKvlK UDB2VV1/bKCeDLM1RPYJWxj748p9WBbmfpNNUUF/zejoUplZx8WZHJAqacp+XjlZQ0PF lOCHA3WyLYGq8TtHthi3f6W5yYJ4XM0CGXt8Nma7yUmH9Dhwu9b/F9wN6n7daQUKV523 jcG9rfdWc/NWUcK87u/STNYDLjL21SGgbV0HFt/3s6vAq6552rhTO6dnZXjU2X7JFfu4 SKBQ== 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=/vRQUrPXATR+Gi9ECEWVdt6AMeM9dbVbhXfJgx7mHpE=; b=ye+q9gqfzHuqCSoNcWywl/Gy5W+FOy+PtGMiOaMUqIREcMGcUOzO0zpicIFFOWCgxS 8yDG1S2mFrOjCvI6OtT1Xp6wMr9Xtfoo8yzSOTuDJ5DhPisjh+CdRRa7HkD4ot28LssL AisdJwt99iislfZLJNeXaKwxjorFYud34tAfH8TUPqpjlh2vsFiXBofQAsHeZhgO7s6v jtGIopM8kPrXvWGlLkp+AURE5QMVzIzQTV/R3MFcBzaVsIKDrwdHQ1+PqFL4FXfv+yWR BaqirTMq8QkKULG7yY2qGTPHN5TOQDwSsZNsuOKeVQuGyr/377XxhUdTms+XPkkkVHwp mrGQ== X-Gm-Message-State: AOAM532R46cfn68cGhY4WrQnq/CqTPXGc7UgW9tvO8mFUp5Znff7EbID Le69ZzQcliPfaTCyks3lsdwgennp9HngEQ== X-Google-Smtp-Source: ABdhPJwtfT8nqxfsm4Z7ZrPHDNMH38Bl84G7xbKNtpHaIIbqYAhnc/IYIofRnkCaZjBDypuvKJCn3g== X-Received: by 2002:a17:90a:66c3:b0:1bc:cfab:86ec with SMTP id z3-20020a17090a66c300b001bccfab86ecmr32462181pjl.74.1647792016092; Sun, 20 Mar 2022 09:00:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/7] linux-user/nios2: Adjust error return Date: Sun, 20 Mar 2022 09:00:05 -0700 Message-Id: <20220320160009.2665152-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220320160009.2665152-1-richard.henderson@linaro.org> References: <20220320160009.2665152-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::634 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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: alex.bennee@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647792316432100001 Content-Type: text/plain; charset="utf-8" Follow syscall_set_return_value rather than the kernel assembly in setting the syscall return values. Only negate ret on error. Signed-off-by: Richard Henderson --- linux-user/nios2/cpu_loop.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c index ac71f4ee47..2ae94f4a95 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -48,9 +48,18 @@ void cpu_loop(CPUNios2State *env) env->regs[7], env->regs[8], env->regs[9], 0, 0); =20 - env->regs[2] =3D abs(ret); - /* Return value is 0..4096 */ - env->regs[7] =3D ret > 0xfffff000u; + /* + * See syscall_set_return_value. + * Use the QEMU traditional -515 error indication in + * preference to the < 0 indication used in entry.S. + */ + if (ret > (abi_ulong)-515) { + env->regs[2] =3D -ret; + env->regs[7] =3D 1; + } else { + env->regs[2] =3D ret; + env->regs[7] =3D 0; + } break; =20 case 1: --=20 2.25.1 From nobody Mon Feb 9 07:17:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647792341; cv=none; d=zohomail.com; s=zohoarc; b=OBjNBTQBLfu+U3ijglSu72wLtBjBghwsOHeWaw4xUZEfX4YFfM6V4JbyeO5lKqI8zsDphNohZdUyytqweKLNBlP0sWEDK7rh8xTedzxN5+iT6/tzMoYHUeeTDYB6L8ZMKQYRCDgT6B1/NiSTzhXXVbSGNHEEq3GbqM0F0KbTS+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647792341; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=psn5p0gK6p7KHbN3cFd3zZ4fpGBd9MmHd4e6lUYOqhY=; b=PH01GjFbrbLvzFsebfUUTSQhhIgawW8DPUaLykExebeKE0pBeH2rV7Z5x/PZX8ubLknVvcRp9oCMMNmUVZGemnbO6tkOYkgBqgRV75Di1K3Gzj6j3VE/ZSx5fGC0sX2i7drvZwCMPpsxWEU4zhpB2QaVUrXwaUnO50eQshqFtAA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647792341826411.4234157067135; Sun, 20 Mar 2022 09:05:41 -0700 (PDT) Received: from localhost ([::1]:49402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVy3o-0000Z9-MR for importer@patchew.org; Sun, 20 Mar 2022 12:05:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVxyi-0005L3-RQ for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:33 -0400 Received: from [2607:f8b0:4864:20::1031] (port=33794 helo=mail-pj1-x1031.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVxyf-00066F-VP for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:24 -0400 Received: by mail-pj1-x1031.google.com with SMTP id o68-20020a17090a0a4a00b001c686a48263so6004589pjo.1 for ; Sun, 20 Mar 2022 09:00:18 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j23-20020a17090ae61700b001c6bb352763sm6590099pjy.52.2022.03.20.09.00.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 09:00:16 -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=psn5p0gK6p7KHbN3cFd3zZ4fpGBd9MmHd4e6lUYOqhY=; b=yfF5jeyiGeNfNlAYAkPOMcSogvdBikfe2J6CDOXR40uYh453cNaDCE2F7p/mWbiIvi XxIIak/tfYCRq2MkF1z4zqTBDJADhOsWV4VnwU2lwld/4VogmIa85jb2Ji0JmAYHsxg5 LbslFjEffyqhHcTQqhlDQ1hmUPVhHoQKA880s7vDCqc5r/ZOFYkU6LEFj8IOyi3stMUg vC21HUhe51BXxOmAbaRcFvRFVtJyZx/qqEUE+9dnVUv5saRydAGplptxOGYfDYujjT9s kQPCvf9d3Zt8S++PzAjeu+74eeo9xcqJYxpdZpl9sVKEP1hvILvlMeBQQ2lx4Xb1eY7+ 1E2A== 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=psn5p0gK6p7KHbN3cFd3zZ4fpGBd9MmHd4e6lUYOqhY=; b=4bAmmntw9YfN7/9dHJ8wXYS6Xrcb6tQbGzr/IVwMhlUMGk8HZwTKQEwU5FHJYl6/TC 59QPKkZ027Rj5b/OpbwqP5SPU4cyfSN8SSZYdAN4kERRWcz70n1U0SyjMiQzsbx8Ljf3 7qV7YdnYpF/fO5S+KXDOkRV65TFXaCmIW5z58DlfMTXgbx05CTJtZbmXzQX/GlvqYzep hqoyMbhBOn0TeMtn5uzJ9BI+g7ICmwARPiO/Ir5L8iC4pcGoE9NDcccoCXuiLk4ZtPH/ 49SeOnwMJuw8k7VDSy8QV1uOkrPLDDnkDOAIL8tMFP4geB+z6lufKmoNkLqn4izAf32X jrrw== X-Gm-Message-State: AOAM531V8VbVYok+SUNFBwbDROgIabHuQ6KRiVXmB67XZCkXziAUSmR+ Y4yObd3fKVnMHiKD7MBkRlsFnijCNuwlxw== X-Google-Smtp-Source: ABdhPJwfu1lIkSy4sTwxV7LpkOXhJgUFwxdVn58AJJsjMyvbWvtbswTYK5ELQvzgMCKUpFsa6GsOeg== X-Received: by 2002:a17:902:cccc:b0:14e:e89c:c669 with SMTP id z12-20020a170902cccc00b0014ee89cc669mr9254784ple.58.1647792017023; Sun, 20 Mar 2022 09:00:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 4/7] linux-user/nios2: Handle special qemu syscall return values Date: Sun, 20 Mar 2022 09:00:06 -0700 Message-Id: <20220320160009.2665152-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220320160009.2665152-1-richard.henderson@linaro.org> References: <20220320160009.2665152-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1031 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.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: alex.bennee@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647792342829100001 Content-Type: text/plain; charset="utf-8" Honor QEMU_ESIGRETURN and QEMU_ERESTARTSYS. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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 2ae94f4a95..d12c3c2852 100644 --- a/linux-user/nios2/cpu_loop.c +++ b/linux-user/nios2/cpu_loop.c @@ -48,6 +48,14 @@ void cpu_loop(CPUNios2State *env) env->regs[7], env->regs[8], env->regs[9], 0, 0); =20 + if (ret =3D=3D -QEMU_ESIGRETURN) { + /* rt_sigreturn has set all state. */ + break; + } + if (ret =3D=3D -QEMU_ERESTARTSYS) { + env->regs[R_PC] -=3D 4; + break; + } /* * See syscall_set_return_value. * Use the QEMU traditional -515 error indication in --=20 2.25.1 From nobody Mon Feb 9 07:17:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647792541; cv=none; d=zohomail.com; s=zohoarc; b=hdmuNMtn52ycrnj8yPd4x+a1UNQ/s1f4+d7mG/42a5TUAkeucy5b5TKl3jnYaYUTDvxLLHq8vW5sk84wJsSgFOTubBo0hfuKKc80feX1RAe0fGulCD+GcTRhrqIy4OG2lonfZhqlQjBYq3qUsqRM7zFRgs1e2mTqWC24IJ3bnBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647792541; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ycCrVDHaX+NhN/QEfInARNi2pTX1RkKDreGfUOz6ZME=; b=Hc217vM+8FEIMD8h82uxfYMHywsIEoFRTncaU054zHQZgBC+LvJ1ZmKp3xaV0ubtGO9NyOPMR3yEruxKbZ+LaCELG8Dv6zfMBbYZ4Zlb5DPHloxwipXi23ZsiDRCAZ3fbyzW2I5UVGY28sH69XaPeD0A64BwdX8vqzbskWhlzTw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164779254181311.040996205676265; Sun, 20 Mar 2022 09:09:01 -0700 (PDT) Received: from localhost ([::1]:58012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVy72-0006QM-Qz for importer@patchew.org; Sun, 20 Mar 2022 12:09:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVxyi-0005Kt-5t for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:30 -0400 Received: from [2607:f8b0:4864:20::62c] (port=45959 helo=mail-pl1-x62c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVxye-00066J-DZ for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:23 -0400 Received: by mail-pl1-x62c.google.com with SMTP id k6so3632902plg.12 for ; Sun, 20 Mar 2022 09:00:19 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j23-20020a17090ae61700b001c6bb352763sm6590099pjy.52.2022.03.20.09.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 09:00:17 -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=ycCrVDHaX+NhN/QEfInARNi2pTX1RkKDreGfUOz6ZME=; b=F1eQcjsr8sK2HmVNUeJ6dmN7CZFMLm559lkYcFZThshh5z5eRdJDyQ8OqvSmdmzMr0 9edKWOHeNX75Q2jDpep/urW4EWZlEzw+RE36ngjctF1yWZqR+lLt0GBVTZqpwyNC7IU/ G2eZFjIqM7Mbx/3ynMPCihKsVihHGlle1jb0knDewDAY/KtFpfAFbHjJVgSHPZItn7fF HbMO5vEXdd33hPPw5K9yHVI0TwVsyB0bICaenhoYPsY7xPm/jjIAmQcY6AuGbzTNMrW4 RunUKOsM6VAjdz/xS1sMKpokbIpxpqb5bOLDHzLURlCyYfP7j3Q0cmpoL+y3ca7orzYp EQWA== 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=ycCrVDHaX+NhN/QEfInARNi2pTX1RkKDreGfUOz6ZME=; b=PteQcQY1pZ9Owf7HpV8Bp22b9e+07pF4SPYn5OTEhOIaOU+rcOmV9VfBzopf2/vL1G ip/VK/lyQidrCfNDKgZ3tg3CsMZ+TOnoFhGJLWvkL9IREuvQzx0TNdEyPw9kO55b9n6A LoxFPEgistcDM+rKP5p10KwoAB0dyxU3md35r0NoH+8rny8TqOBHbJC3dZPB1Y/VuHP5 SG6Y/U58/AxYcSZzpG+2AZs8oE9ReJcArv0Log+nM8n2B6i7nTDa5vHvSvRv21kkCbpI 65VvbQSKt+gtWLe0Tv/nStT2C2TsQP4FBOMgpY4EpH3VF7qBoIqmWbFXioIOGgj+efPc eLvA== X-Gm-Message-State: AOAM531VkpFT2qXkZiJpFm7SGN7/mI6uLtlBYAK6hbDNkA35FUuh+iSz tw186J9HTvlxdGGCoHM8Cztw3vCB37lTJw== X-Google-Smtp-Source: ABdhPJxELFw1JkCNHYQJBh11F7n7m+tji2JRi3Uua/uZl+5J+J6tCIKgXIEfvX4YOjAeSsqnkzPMjg== X-Received: by 2002:a17:902:720a:b0:151:d7d7:6ac0 with SMTP id ba10-20020a170902720a00b00151d7d76ac0mr8668143plb.128.1647792018128; Sun, 20 Mar 2022 09:00:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 5/7] linux-user/nios2: Remove do_sigreturn Date: Sun, 20 Mar 2022 09:00:07 -0700 Message-Id: <20220320160009.2665152-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220320160009.2665152-1-richard.henderson@linaro.org> References: <20220320160009.2665152-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.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: alex.bennee@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647792543873100001 Content-Type: text/plain; charset="utf-8" There is no sigreturn syscall, only rt_sigreturn. This function is unused. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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); } =20 -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 */ --=20 2.25.1 From nobody Mon Feb 9 07:17:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647792312; cv=none; d=zohomail.com; s=zohoarc; b=WwB/fxk+c7PQzsCWn/O93fOvD5pZja7Rv2UXVqHhbC5ZMonHoc+2zB6qdSKraKr+Mw+fenWyfaMe5IRrBV0fXQkgOFz1NHNMVPM/MKSshmV4lAbMtppATXHZiWKUPEIkwKG/1jk1LoY86J8kFr4sK1DaYoSrjnkD/3HuRYuhTUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647792312; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YYEa48pVwjRe//ZBdWWOscJh8NC2Ar8MiPWxZJD3GgU=; b=CHPwFbJ3JcHCVUj1eKLJap0SO4r0ovsgzzi2xt8jwS6uNV0D5fFoRTvRpeyV8BjJoqpYaKQuXgBZt7BjcKknpX0XssaXDyZ4B1gAmGZ14I/+YcqqHLxABjBq8rRq3IEnOaPTQiUsDtW98jcc5H2B7Lxuop8vUUXv3XkCrLKyRfk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647792312541663.553711078531; Sun, 20 Mar 2022 09:05:12 -0700 (PDT) Received: from localhost ([::1]:48546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVy3L-0008Oh-JX for importer@patchew.org; Sun, 20 Mar 2022 12:05:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVxyi-0005L1-LR for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:33 -0400 Received: from [2607:f8b0:4864:20::429] (port=37811 helo=mail-pf1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVxyf-00066R-Th for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:24 -0400 Received: by mail-pf1-x429.google.com with SMTP id t5so13589066pfg.4 for ; Sun, 20 Mar 2022 09:00:20 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j23-20020a17090ae61700b001c6bb352763sm6590099pjy.52.2022.03.20.09.00.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 09:00:18 -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=YYEa48pVwjRe//ZBdWWOscJh8NC2Ar8MiPWxZJD3GgU=; b=KpW2A/RYAGPEb/bPJifveVsgfBrdKIZdlEOq7KEZxcJ9fYzCx8c4Bn3WBjdYoCFQ5n 421v8h30gFE2gSyn7818yNQx4yKu9P/ZAl91NHV9ykifpSQXYY5VgYmKX+BKzbda/YUf rMWeryhjCwUJIHRh2J4N4sqoZCWEzdnmiscm8wCG8LaHsBu8ME7zUPsN4Q7xK5ENHxxq zCiNCqZfWzVwqUVNr5rL7aZzLwbc/NkeI3KonX3dRpnDPqk1SxMlRlU48Mo7VOAa3oGg 0QQ6iOD+mJJ05ezdM0wZjVEe4X7XgcFlWF96iDLHguCf85kmRub/wwiQNw0XxUR5fy1u CapQ== 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=YYEa48pVwjRe//ZBdWWOscJh8NC2Ar8MiPWxZJD3GgU=; b=7LIGpxspBRjxQ4y18pMpR8d56oF0JqJCyjLDYDvtu5/TdG7o2QceYmgyQhVQq6y+gf qgATMQ+FQWTnZFwUI3jGi7LvvoXUAQkBoEDLSmeIcfNwnP5m0uRM8Oi96D8p1JMmpL1E O/Yia4kEMrtToC8H0cG1lm1dAQZg7GWCekMjeQkGnYS3dfiWsjHW1gcyZMS1NMWidcar og25hwFJ/9oWLtkrlpueejNT79z1dKArSNCzoQMwOZDai/um9zG1xTqJQR/TjPifHKb5 AfTFFmZb1Zu8RpEDUZcU8gWMTP8TfknIx/umOn73I+N8VZu0aWXrhfqcMzj27aBLVsoF EG/Q== X-Gm-Message-State: AOAM533NZ/ThcUTt288GfTMIEv1YXpF5tvZAaOntENd4sf3iPZpmBR/q KZ6Oo5ATEXSzWWuG01bAwDIDVapJXYb5Fg== X-Google-Smtp-Source: ABdhPJzKhdC6RAJnIuAS2TqOmadt+QHdEgSt44IXB3vUf+UrTaK4fldbeVdR4I7JT60pogfAgPCRig== X-Received: by 2002:a05:6a00:1582:b0:4f7:63da:dfea with SMTP id u2-20020a056a00158200b004f763dadfeamr20092336pfk.27.1647792019175; Sun, 20 Mar 2022 09:00:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 6/7] linux-user/nios2: Use QEMU_ESIGRETURN from do_rt_sigreturn Date: Sun, 20 Mar 2022 09:00:08 -0700 Message-Id: <20220320160009.2665152-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220320160009.2665152-1-richard.henderson@linaro.org> References: <20220320160009.2665152-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::429 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.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: alex.bennee@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647792314307100003 Content-Type: text/plain; charset="utf-8" Drop the kernel-specific "pr2" code structure and use the qemu-specific error return value. Signed-off-by: Richard Henderson --- linux-user/nios2/signal.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/linux-user/nios2/signal.c b/linux-user/nios2/signal.c index 133bc05673..4442974001 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]); } =20 -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 =3D uc->tuc_mcontext.gregs; @@ -128,8 +127,6 @@ static int rt_restore_ucontext(CPUNios2State *env, stru= ct target_ucontext *uc, __get_user(env->regs[R_SP], &gregs[28]); =20 target_restore_altstack(&uc->tuc_stack, env); - - *pr2 =3D env->regs[2]; return 0; } =20 @@ -191,7 +188,6 @@ long do_rt_sigreturn(CPUNios2State *env) abi_ulong frame_addr =3D env->regs[R_SP]; struct target_rt_sigframe *frame; sigset_t set; - int rval; =20 if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) { goto badframe; @@ -200,12 +196,12 @@ long do_rt_sigreturn(CPUNios2State *env) target_to_host_sigset(&set, &frame->uc.tuc_sigmask); set_sigmask(&set); =20 - if (rt_restore_ucontext(env, &frame->uc, &rval)) { + if (rt_restore_ucontext(env, &frame->uc)) { goto badframe; } =20 unlock_user_struct(frame, frame_addr, 0); - return rval; + return -QEMU_ESIGRETURN; =20 badframe: unlock_user_struct(frame, frame_addr, 0); --=20 2.25.1 From nobody Mon Feb 9 07:17:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647792842; cv=none; d=zohomail.com; s=zohoarc; b=V2WRRYDE426kymNwZ+VCbCqHo859Jxfn9tqrNbua0gW4vksiH/ObZkEWm6v88xp55zguoan+pFLAjAh4/fNSd/Su5LOKt218pWKN4CZKZnyZ0pLrP5jYRnnDQcNFxRFhF4WhdBAKxhPOgURMgq2ALVX3QtDt/bwViW+/+yicJpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647792842; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KZBECJuFzSTuUllaWSNHHnhE+hoPlqid0qBz/DeJefU=; b=YwGizgD/KdAwTfLJazpakEGnyIyR8Fx4yp5M0t2sIDYEcujpoWh7ZQfpOQIaxwZ7GgZZ3lQfpp8k326S/sBDWiMa5bKfPZNPCl3rpapbtX5s0/bwYlCYMSDZL8J8YboyXh+bQzJuPQDb1RcWoa4d0IU12Sx0iBeTrCMkWnGhTsI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647792842804922.2179168520081; Sun, 20 Mar 2022 09:14:02 -0700 (PDT) Received: from localhost ([::1]:39316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVyBt-0004QH-ES for importer@patchew.org; Sun, 20 Mar 2022 12:14:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVxyj-0005L8-Af for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:33 -0400 Received: from [2607:f8b0:4864:20::102e] (port=52744 helo=mail-pj1-x102e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVxyf-00066Z-Uy for qemu-devel@nongnu.org; Sun, 20 Mar 2022 12:00:24 -0400 Received: by mail-pj1-x102e.google.com with SMTP id v4so11198476pjh.2 for ; Sun, 20 Mar 2022 09:00:21 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j23-20020a17090ae61700b001c6bb352763sm6590099pjy.52.2022.03.20.09.00.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 09:00:19 -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=KZBECJuFzSTuUllaWSNHHnhE+hoPlqid0qBz/DeJefU=; b=O+qkYok2WTe2y+ObCm7xx7AYQTVqg5ujkrnJqDwfC7xbrex+/cc/pDl5Gz6wdeS+D4 gHM6SYBEbVE7Lzmoe1R+H8rXQD62N31TQULShjIkRKJ8bIfCIu0qNnSR4d7MKBFrfV4M RWqbaoMTDOU8MLPgvK1Ujs8wo14ZWNiCdJ8e9rjVr/fpkIDI5XmOiu0TVi8kItERYTTf 1EN/Ka9okeygAvD1j9/pFfI5jS27GSMkh/v4pl+nL56D+lm/lJwzFcNVnx0gBdiYcv50 qCUePzczT+UT3e9Ma0rIfu54Ik3HYjPrlpnhOM31TRygG9ngUzIAEt8g8F0QIk2OiN3I pX5Q== 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=KZBECJuFzSTuUllaWSNHHnhE+hoPlqid0qBz/DeJefU=; b=d92H3inqcdUuqYM1bqjkbIUn1CdDNL1hTkkirNjYeLxFgmhiw0fueo5GLUaORgQXX4 zBI2zzuR8rXIi1qZYzcPLMEdVnT2QxDjCgyQEiZHRiPDcG0ExOCQN/7nb8PqFG06iHyH aXo5WukYewlkGJzN6VQYDRcyaX4BCFW9d/y8MiJDoM//kjMenqVp1KCuemjSb9uKlDJ5 UzppgxIxKWQXFXFaZgYaAVNA31XQ0H9xGYZJuqCj82W+XYrUWtjeRQyIRP+hQM3r2PCc jpYPmCb06VGHg6vXM368kMpPlbQ3BEaYWWN2y9pGu5dyPnOmSiRDROCNR3F0BCJumS9+ fAnw== X-Gm-Message-State: AOAM531o1SsDm7x0DzZ4RVQf56jJTX3R57C5/9j9f2endZXToc2j5DH/ 3T0eRsxVtz+IznPzUAhTFK8aaz1FxuXJ2g== X-Google-Smtp-Source: ABdhPJwfsArgpvCLGd7o6CxHdEir0VuFw1X+ijQgplhRB4yFAfn9OuLmLW0unufeJ028WsYSytUlJg== X-Received: by 2002:a17:903:1108:b0:151:9c42:7d1 with SMTP id n8-20020a170903110800b001519c4207d1mr9078334plh.54.1647792020138; Sun, 20 Mar 2022 09:00:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 7/7] tests/tcg/nios2: Re-enable linux-user tests Date: Sun, 20 Mar 2022 09:00:09 -0700 Message-Id: <20220320160009.2665152-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220320160009.2665152-1-richard.henderson@linaro.org> References: <20220320160009.2665152-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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: alex.bennee@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647792843900100001 Content-Type: text/plain; charset="utf-8" Now that signal handling has been fixed, re-enable tests. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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.tar= get 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") --=20 2.25.1