From patchwork Mon Oct 4 07:44:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 515166 Delivered-To: patch@linaro.org Received: by 2002:ac0:890a:0:0:0:0:0 with SMTP id 10csp1152581imy; Mon, 4 Oct 2021 01:02:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLSiLdru4C79NutAL78ZHT6RNZCQJTMwreDM7IGxn+I5PJimLe9dJbUDtdTRg29wfsOqwU X-Received: by 2002:ac8:435e:: with SMTP id a30mr11999078qtn.227.1633334552330; Mon, 04 Oct 2021 01:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633334552; cv=none; d=google.com; s=arc-20160816; b=dBh81/CrwsPuOP0YbbEThVMg6B1H3VWiOxId1JjR/kmL/IgSjIrwL8+D/dOrPJCn7c I7u4362RCeyYlGwOgR6FFwf+GOimUd0ISlA0kghi7Om5dWDLSdXt3GV8ZgEnf/vPii5V xpkUX47CBNF/asBP1I5OFmDJoomO5jqizBEM/vy6oXmALFjiWm8r163a+33M/JiX/8Y+ A1j99rckPrrex1sW6J5ugsNZjri0FuNpSb56cvF6LZv6nLyInTHv4dmAYjaVcZYrlmSa B/96/+wxki88mC79B5kwlZgxOAiXfCUJ7DxXx1CNYb463Fn4tTPn5TAHuoKC9MGkqKIQ Vayw== 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; bh=Yz5/5M3f+capwKMmjPdXDQ2HnTg4Hn5a3wFAvnOmErU=; b=rDyKbkn/MdlZArcCbJWnXndCIz/IIxe5MeXpJhI+hA+FTzYGGrvGVq0ZmLgTvYRNXY swoOtCSrzF4MFJennMRe+eUrFIMXuqpjwqYySVLl1UNx84J7HOWsOFZ+i7gXVXebYeou EKmFIvF0YPKWON1Fnt3VPyyPeKu50Rd8sEaRqP5FStkYSp3cl2Q9eUH0ojbDQ/dvSITN d5vMsU0KLFlResaY2ElOxJ/uiU8QE8ZO8/mdr34veFZFJHC8VgTJHuhST0Zw7+cg6Uth MyUPYzUq2mpY/FiLeOfbvALGfY6UO3JBEkmAKEPDnAK4sV8sALx3pWFs5+TrQAeKg7vj LCQg== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h10si10937531qko.232.2021.10.04.01.02.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Oct 2021 01:02:32 -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; 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" Received: from localhost ([::1]:40612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXIvf-0000yA-Qc for patch@linaro.org; Mon, 04 Oct 2021 04:02:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeP-0004Ia-VY for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:43 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:46667) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXIeL-0004rI-Pu for qemu-devel@nongnu.org; Mon, 04 Oct 2021 03:44:41 -0400 Received: from quad ([82.142.3.114]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MIyiY-1mD1wZ2Sew-00KOT4; Mon, 04 Oct 2021 09:44:33 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 18/26] linux-user/ppc: Simplify encode_trampoline Date: Mon, 4 Oct 2021 09:44:13 +0200 Message-Id: <20211004074421.3141222-19-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004074421.3141222-1-laurent@vivier.eu> References: <20211004074421.3141222-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:deIQL4aMLtFiJv9LRvDOHzDeVuluamEtc++PCU1i7nnpBLCSOwi 2CDVXC/K7ISYCacJElVCoSmUuPqRK0Bit4/Hj3gABM87kqx6BSC1IML2X7ue9H3AZRU4oac m0egFsd1TZXW0lQPH1qcZToXyX1EkvgUPf0u098uxKlUZy6YBDUwnGnZQjZrJNgfbCbP0iU SxqOFwYtSG1VTaCD0xG/Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:Pmn51ffgwOA=:bsE8F6YdstWAJZg57eG8zw yLXqSLbYJsfAmtejfBAYW5c7wNyLrdv0X6+lm+GDZKIx4VA0/3oKl+7RGGxBIShJ0bLkoTee7 Y0Y7zTv1TAC1l/5tGssnCFWr/LFyHkUZySrgxDTkJZpImZ2s0ZOM7wuQS/LbsT3qabgdi7pCr OBBVy22pXNbEAZDODHhqw+qLiD5+StZAzombd45u9hOn3cCmrTJTLh+uq59JMlvBAAy2EeAzT US+9o+d5Y8luiNmh6+mIx1Dub7YPxIuff1LddlivhLrv5tgoLFX9onB44G84FK8W5Ftdmv4kQ ewj57vy5nyF0m3kfrnVMbxBAJnTctDlaXxm4xP7c09aocOmwbyGJsEVQaWKo7wb/D7DhjMuKV S7gOx3dxkJyymdZBC2HPge0YS7McFKhdWxvpYd+/yvyuZTIz4FiaFduzt46EQctOOKf8rJh5I IUGQmUD5Mo5jqhfZa3BGUeUk3rVp15YI3dzPZ1DtjZYpQH6e8pLkcjwGInyD3iZgDMQGY75AY YDi1XcY1PvBZU0HoDb85hmPdbTJ0gaFOxgyzOkVbKdGEYTpfGXATvPapmojsAQnRdDHn0inoh 1KrQnW1dHPuZL/FmTk8UirBJQ+Jnku6nL36F4vKeRs+sk1IAWKUYpzvY9l4pnCdlPDoOgEQaS xAzDFIUjJhJbOBgHDBvGxTxMfRsMUY2LJPN6VzrBPXNNV9LX883N8dBCX5t1pZ8XZqFFWQhx8 h+Qj9Da15oh1FegDJBcTAxhfm8SqaQXMlY+BxA== Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The sigret parameter is never 0, and even if it was the encoding of the LI instruction would still work. Reported-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-Id: <20210929130553.121567-19-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/ppc/signal.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.31.1 diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c index e4d0dfa3bf75..77f37b9f0131 100644 --- a/linux-user/ppc/signal.c +++ b/linux-user/ppc/signal.c @@ -309,10 +309,8 @@ static void save_user_regs(CPUPPCState *env, struct target_mcontext *frame) static void encode_trampoline(int sigret, uint32_t *tramp) { /* Set up the sigreturn trampoline: li r0,sigret; sc. */ - if (sigret) { - __put_user(0x38000000 | sigret, &tramp[0]); - __put_user(0x44000002, &tramp[1]); - } + __put_user(0x38000000 | sigret, &tramp[0]); + __put_user(0x44000002, &tramp[1]); } static void restore_user_regs(CPUPPCState *env,