From patchwork Wed Mar 8 13:28:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 660436 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp329072wrb; Wed, 8 Mar 2023 05:32:56 -0800 (PST) X-Google-Smtp-Source: AK7set/1xBH7wW0X8QeLWYxAXeZUJSf4zDMY3GP5VOY8H52Go28MaY748LNv76rvmciy2j69eGzz X-Received: by 2002:a05:622a:1709:b0:3b9:a4c8:d57a with SMTP id h9-20020a05622a170900b003b9a4c8d57amr31729936qtk.32.1678282376647; Wed, 08 Mar 2023 05:32:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678282376; cv=none; d=google.com; s=arc-20160816; b=TsVQRWo/tOHgw/yqTIVb+2/m1DrBdQc2aNZlQORkWC3x8q5OduuN/lmnp1B41VbcUG eRXZ7w3BHJZZtHixZ9jCQJwvgov+X8dt7u48Z4pTZtEhJkRizoRL5RYiKJdG18KIGIf2 0ovrqI6rcJKh/gSNfvu3fnnSpxbeMKllWL55wANC5doI6GkN/nksnloWFJ2w4hWlxd3/ kT0trCvDrCngChXPmxHdZzUWa5k1M18Hr87G2a2AqQZ0TJ3Au1gAJdr3lZDlpwqFtlpb XZZaEC/0mnyorcK04iI9vYFU+JVegPh3TrDAz2Y9HjH4c8CVFzZ0eSR+IUmD0bmxLaxR 5kbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:ui-outboundreport :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=kYhgU1CbUiQJqXtuQjz1qbd8hMdyjcTAwobHrJwwGRY=; b=uoWuiWs7fguP8bcdoUr83zKS9VhKqMQjbYNyI7llPmgDwHYQ+EY529pGLIZOzJwKK7 khhfP17QWrp42T/7SnraWBM/z3uDJWHTQNli0OxEN2HnrGBhjI1wAdKxnSzbNQTl0ogH SDrWxMIK7Vfhehb3bB5ekjErAfBMQx2Ygp8PymyaAh/b4YlUK+v1f6mnsnTw1RFOEJBn ZdMrY8LjsJeKWU6UZDuzj7zkxYt+lOuFfyYpe7taW75BKHOeBHzd0N3m4CtmBEA9AwiX cwerQOkpznnBofOkEtRNWw/iFVJHWa3m3LfkvLGxvVTvjLo2aDFk5Bi95k1LquYoVkK2 7v0Q== 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 h22-20020a05620a245600b00738e6f037d4si13336597qkn.757.2023.03.08.05.32.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Mar 2023 05:32:56 -0800 (PST) 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZtsX-0003ai-Vg; Wed, 08 Mar 2023 08:30:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZtr1-0001k6-W3 for qemu-devel@nongnu.org; Wed, 08 Mar 2023 08:29:19 -0500 Received: from mout.kundenserver.de ([217.72.192.75]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZtqw-00066B-On for qemu-devel@nongnu.org; Wed, 08 Mar 2023 08:29:12 -0500 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MNLVU-1puKQI2xIY-00OqsA; Wed, 08 Mar 2023 14:29:08 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Richard Henderson , Laurent Vivier Subject: [PULL 15/28] linux-user/sparc: Tidy syscall error return Date: Wed, 8 Mar 2023 14:28:44 +0100 Message-Id: <20230308132857.161793-16-laurent@vivier.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230308132857.161793-1-laurent@vivier.eu> References: <20230308132857.161793-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:1zYLFWVGtO4rrkiHHvdEeDaaS+AIk46JYu54xrsxI0kzDl8u0Fm Gz5zu1pwF6Hgjsz4vpTfI553Vf9kYOOx1/qth+iqgPhNKQzq69iP2skqhmEGs3ZOViyNO+m lb3kA4eySiHBWNLH9fPTXVmZEnltXwH4tRx5iWpY18v2AatH/qlFiVoFg9HuXcIgVoQOYwU VD6yeMcLwugqZlvwsWZ5w== UI-OutboundReport: notjunk:1;M01:P0:3AF6ejRiUeM=;UQDz40gRA8/+ZM6eb4RbUivwTpj vLeIhz5Hd4hWzLppNPQDdIZMBoHxP0fJWA1mj0s0iQWlDCa02uhPOfMXAJi06MdRXc7aAVVt2 uY1AWLVZoIMAbiAKZ2ZUW6DoKmXoQcL6Wld5RLnM0gR9+szKf/6lpz+26G7DkV2LHYKKiVbIj 5AqOKwJeaf84NowBGgyRBRV6GEPcmmQkRBhQHTrf+LSvPPAk4wI8pXrwGB0DaoEBfGABR1Pw0 E6Eyv2DUpxapyWE0Qvy8vwNUFoLUh0JKlSjIb5rSwr5QpEKyE+1j19GwTbk+TU2q7J2NUasmP 0S54R/zbvGumY3XkirK1Kof/Q31pX6a0yHkOD+5PW3Z1WaXcDV42CiXdMK1o224i9LEMukj6e CCcA7ECcBCsMoKIM39fyXTUrC0F4eDESxfgzfDAuK1UN4mkSYHTncGvDNhxQwgzGpaAEHdfst AO7NtUoO/542+luMQWuh91XptQ4JtXAVRN9veKNy1kfZhrxa9qqlenK77BbzehbWuEf7/yhay XQ2UYPIOR7rlqNY9XBqdHlsxwxCxPFEaZRwKR9sOJUrCVNTzpTFqdow9gzJWGEcomUaVk0N1o cCqg2ZMwkYnVsVju0CPPGRgo3DazAn4mAj0hEU0u5RRubZP8VOBJnXQzJ3ASslxWcmp4fCtUT IczCl/vBFAWlHJpj5cz/LBM4g4zPXKMiEkkF1ciqEg== Received-SPF: none client-ip=217.72.192.75; 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_H2=-0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Reduce ifdefs with #define syscall_cc. Signed-off-by: Richard Henderson Message-Id: <20230216054516.1267305-4-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/sparc/cpu_loop.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c index d31ea057dba1..051a292ce520 100644 --- a/linux-user/sparc/cpu_loop.c +++ b/linux-user/sparc/cpu_loop.c @@ -149,10 +149,13 @@ static void flush_windows(CPUSPARCState *env) #endif } +/* Avoid ifdefs below for the abi32 and abi64 paths. */ #ifdef TARGET_ABI32 #define TARGET_TT_SYSCALL (TT_TRAP + 0x10) /* t_linux */ +#define syscall_cc psr #else #define TARGET_TT_SYSCALL (TT_TRAP + 0x6d) /* tl0_linux64 */ +#define syscall_cc xcc #endif void cpu_loop (CPUSPARCState *env) @@ -183,18 +186,10 @@ void cpu_loop (CPUSPARCState *env) break; } if ((abi_ulong)ret >= (abi_ulong)(-515)) { -#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) - env->xcc |= PSR_CARRY; -#else - env->psr |= PSR_CARRY; -#endif + env->syscall_cc |= PSR_CARRY; ret = -ret; } else { -#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) - env->xcc &= ~PSR_CARRY; -#else - env->psr &= ~PSR_CARRY; -#endif + env->syscall_cc &= ~PSR_CARRY; } env->regwptr[0] = ret; /* next instruction */