From patchwork Thu Feb 2 00:51:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 649646 Delivered-To: patch@linaro.org Received: by 2002:a17:522:d8c:b0:4be:c3dc:14d8 with SMTP id d12csp609697pva; Wed, 1 Feb 2023 16:54:18 -0800 (PST) X-Google-Smtp-Source: AK7set9GOyFYnrn00KRXkTs5+joQTCpYEEFm/9EzFDmcp91cZPwTNtElMMQfr/f2qZznzXD7Fs5P X-Received: by 2002:ac8:4e47:0:b0:3b9:b817:e9a8 with SMTP id e7-20020ac84e47000000b003b9b817e9a8mr8329278qtw.27.1675299258500; Wed, 01 Feb 2023 16:54:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675299258; cv=none; d=google.com; s=arc-20160816; b=Or6ocNjaaMnEPRHgfD+hzYX9VSMJPbzP8DcjiucWl75oGg8F0py3x3QWZ29GOGuq74 xZtMsb6T8Lo9ic/KtZrZ/z+xPGUUwoHdc6fetia2DqqMuvYP9ytl0Pk7tS9xOQPyj9cz irpetK+r4vreEg7C9pJDZ5sNQZN/vrXToH4XYPXvy4ytV6odsiaOnOcravqiTOxjwXTo ypYVdEkWeQPEGgksvExTkZpkpSTq8Ts0OYpfr3tNrSZrHqKUw5AOBEusioWOUJux5y7w MW08Qaeue4WN6mAK7sJd+jIH+zwdk2ib7euaIHotwa+qKpNsYKtiDEH4YryPPmuuazjv +Gdw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JZR6v1mutzuyGZ2hYhsQ0hkbJ/my9Uu96+Z1L/w+T3g=; b=k6Ats8nWbo27dmh3BFvJLyGDWfGq00iEkdjlJKzn6gB1nBvwpXSFQ96KLjmTYVI3hj b5lBDtvwwhWwW+uSbyxpGCd/UIM9E8Os37Mmn16GFGA/CmlEjTSmoJXRqvDHtjkVwxS6 Rk9iPTZHHgRNxwO1ztmjHgZewGkc5U8+5CUo+ORLpWYDhEyBhNI+E+TJueeTP6qG2gJi eTIWl7tPw5XwMgiXDVCY5j5erefl4ErnTD51yvRdC3/ml6ZLRLZaqRtlBkW+WbYnp5Kw xDhWYEPB5tKVQCGaRtQopcVRKXsnsvkuyxGKu2jbctagav0Pkv7jPFn54q4EiniYX2Y5 +xUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=veDlFeYB; 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=pass (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 q20-20020a05622a04d400b003b6953fbb9asi11673628qtx.348.2023.02.01.16.54.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Feb 2023 16:54:18 -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; dkim=pass header.i=@linaro.org header.s=google header.b=veDlFeYB; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNNpq-0005zZ-6m; Wed, 01 Feb 2023 19:52:18 -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 1pNNpo-0005zQ-Fc for qemu-devel@nongnu.org; Wed, 01 Feb 2023 19:52:16 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNNpn-0000Ov-09 for qemu-devel@nongnu.org; Wed, 01 Feb 2023 19:52:16 -0500 Received: by mail-pl1-x630.google.com with SMTP id r8so304890pls.2 for ; Wed, 01 Feb 2023 16:52:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JZR6v1mutzuyGZ2hYhsQ0hkbJ/my9Uu96+Z1L/w+T3g=; b=veDlFeYBi1ccUlByKu9vxh9AcIEoYIbOME+Toqr+rMi1sjlIa0F+TbQSzJEUOsIszc myulYZAdmGljYQQLxvAZVlDuyShie7fHdqDdgjkvsKk6liUkoB3LkxC1hMM0bOgutAzc EOvWyzh1QamwS4fnKqn31AmW/zPn8+BYXLm4sQZp9zKVaFO74UOwGJzlrCk10zSSpitE 7vZ74MoSQunBnTIipn2Yd4lNddfTjLTIw7kBJjTYs1hvgwkgQ6Dnr+SrWMj91B9uA/wy yel21H/OEldnE9VrT9ptamANJA1SnW344jHqZp7qK0RM+WgP6EGw2WyDEbj0v2BauPAF rAQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JZR6v1mutzuyGZ2hYhsQ0hkbJ/my9Uu96+Z1L/w+T3g=; b=i5G/OK/VRp9nmtpYEPBNNyGJ2HJd6F5YNcfYg0DwjGBnK+Jn3VyRNRzkHmAZxEPh03 0h2ZxFjbL1/ZR5gRG4kRbfXcL84PYQ2bNbFUOyKPTrztM/+I03I6joYRXLrM+zGTFWLA dDRHg4WeJ9HPM9q+/gdhflU69V62ydiKtuCNLjmauhlJn3nxl7/quDfQGGwY7Ub95wI9 +1KFCgsTByjQlZJJoXiiw++Al4F9e7BchcJHsngD1H1J6fL2v0bRJuO5NMIf2fJNkaFa NPhLupc88dwkyU9fCOvitHwB//8HSkiuBPTrqk0e+h1mC6fTJkTP6uhvyL7cc5azFd5O UVSg== X-Gm-Message-State: AO0yUKW1aj20jifyFYLlE+acepoJjITqwHBkfH/bR02ZZ9tAs0e6mBPM Qlx/tDbXpbH4xzhlddJxD2C6dsOEt9cow5oW X-Received: by 2002:a17:902:c992:b0:198:9597:9934 with SMTP id g18-20020a170902c99200b0019895979934mr3488470plc.68.1675299133733; Wed, 01 Feb 2023 16:52:13 -0800 (PST) Received: from stoup.. (rrcs-173-197-98-118.west.biz.rr.com. [173.197.98.118]) by smtp.gmail.com with ESMTPSA id z3-20020a1709028f8300b00192cf87ed25sm12391334plo.35.2023.02.01.16.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 16:52:12 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, laurent@vivier.eu, iii@linux.ibm.com Subject: [PATCH 03/14] linux-user/sparc: Use TT_TRAP for flush windows Date: Wed, 1 Feb 2023 14:51:53 -1000 Message-Id: <20230202005204.2055899-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202005204.2055899-1-richard.henderson@linaro.org> References: <20230202005204.2055899-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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 The v9 and pre-v9 code can be unified with this macro. Signed-off-by: Richard Henderson --- linux-user/sparc/cpu_loop.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c index 18d5c24af1..a94bffc583 100644 --- a/linux-user/sparc/cpu_loop.c +++ b/linux-user/sparc/cpu_loop.c @@ -200,15 +200,14 @@ void cpu_loop (CPUSPARCState *env) env->pc = env->npc; env->npc = env->npc + 4; break; - case 0x83: /* flush windows */ -#ifdef TARGET_ABI32 - case 0x103: -#endif + + case TT_TRAP + 0x03: /* flush windows */ flush_windows(env); /* next instruction */ env->pc = env->npc; env->npc = env->npc + 4; break; + #ifndef TARGET_SPARC64 case TT_WIN_OVF: /* window overflow */ save_window(env);