From nobody Thu Mar 28 18:06:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1618763551; cv=none; d=zohomail.com; s=zohoarc; b=gCjbVvqsJMKch97I6prvjDtPilJSTbKZPSfnS91YSxbr71hQjmJT/+K35AjufifLH6b6vFbRXcU2MQnrofEIYSr+s1oUrf1CIP9kI0KVxFFyI4lEJwggf+QOWPfq1uwVt7aeaKA5jCEmtG607N3V/4mJmaVwHlz2d4i9XQAG/SQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618763551; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=px3eEb7r/QydV4xXtYEkw/2gg3rnb7J0yUIfpZsnplo=; b=Ppfl73I+86TmW869af0Rf59QCI2ZIMEgyU5s0IQndTk8L+RbhTlGd0ekkC4mwBfLOpcJb3W7E2iRTE7+EDYRrlpDWurho922kf76VWT9NBUq3hTMo3/IS3RGQgdtkkUYqTE/Y99fmlVNdyujgtgSf+5XkhxT4AOXahUtAutsun4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1618763551064938.2697386430372; Sun, 18 Apr 2021 09:32:31 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id k26so15087252wrc.8 for ; Sun, 18 Apr 2021 09:32:30 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id x15sm16745248wmi.41.2021.04.18.09.32.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 09:32:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=px3eEb7r/QydV4xXtYEkw/2gg3rnb7J0yUIfpZsnplo=; b=SDrWDHJk0+n7wVibndFg0LiF6Ze20QlBsNYTwNa9bdNBZwHV+VNIHQFP7aCPKpYJ0p VpqvBzSqmzj5mZtU8oGDY5nR1qCCfQNocp7Rf5z9StRk9m5V+SSdfLUSO6cprSgqPKfY RUJGGn2Ff6isk8W+BjQTj0Mrct/5U2ufQTVaOICFz25PdDUzpXxlE+lglbL4+/HDUcGF S07roY4cBRGTmfQM8sBjLWIhZMKDWv9xU2q+7nWOpZ+t9Vr4y1oUGjOTt6J/Z65A+6Ii h7pmrXU+y/OnnmBVehWI14tv7PtgqzudUIBMpkTtZehKEJO2/u0uW0PfxRAt9g7Vktyb xDUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=px3eEb7r/QydV4xXtYEkw/2gg3rnb7J0yUIfpZsnplo=; b=SvPduJYHXHqmb/lZXFuKCl9e6uzSjarp9Aih2Mns4WlnRHubKVKWvvHnedtG5aHyCa yGFTb8aI1cgcyxd2Ej5M0tcNX7PKQ0emiaVEorq2t1mGiSMyOU24rj5emNDkPS9nqP82 VrULxoEEFQDCnwBqgk9Jz3TjqVWDAttKxptB7pdsBDe5NTH8Q1kOwOvIOJi0OYkXxwBS g/kyRD5H90HLJ8Tu6wJCeuMlXWfqN9ESMWpl+n+JTQHUNT9jzquMTtMMdRH2o10NLtmr 9ojOm6JrPx6MDXv8kYkMQVcIWlX/UtqxspJmGEmvWN5zL/BKhYTEAJxeeL7CSQWK2QoD xBfA== X-Gm-Message-State: AOAM531EKT9GVL9M7KEDq59TveV0GBz04WhR2c7yokigH114rvtbLN/x s4dvhgoq3rz8Z1j3lTS61w8= X-Google-Smtp-Source: ABdhPJxVB23JiM/U2RfbR9Q/MHrm029AmF3kX+cWl82uWO03kTXpepiPb1dyYp6qg3D8Sbmgj0I2fg== X-Received: by 2002:a5d:6909:: with SMTP id t9mr9756395wru.69.1618763549253; Sun, 18 Apr 2021 09:32:29 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Huacai Chen , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Richard Henderson , Aurelien Jarno Subject: [PATCH 11/26] target/mips: Move cpu_signal_handler definition around Date: Sun, 18 Apr 2021 18:31:19 +0200 Message-Id: <20210418163134.1133100-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418163134.1133100-1-f4bug@amsat.org> References: <20210418163134.1133100-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We have 2 blocks guarded with #ifdef for sysemu, which are simply separated by the cpu_signal_handler definition. To simplify the following commits which involve various changes in internal.h, first join the sysemu-guarded blocks. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/internal.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index b3427fcc517..294560c9d2f 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -151,14 +151,13 @@ void mips_cpu_do_transaction_failed(CPUState *cs, hwa= ddr physaddr, MemTxResult response, uintptr_t retadd= r); hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, MMUAccessType access_type); -#endif + +extern const VMStateDescription vmstate_mips_cpu; + +#endif /* !CONFIG_USER_ONLY */ =20 #define cpu_signal_handler cpu_mips_signal_handler =20 -#ifndef CONFIG_USER_ONLY -extern const VMStateDescription vmstate_mips_cpu; -#endif - static inline bool cpu_mips_hw_interrupts_enabled(CPUMIPSState *env) { return (env->CP0_Status & (1 << CP0St_IE)) && --=20 2.26.3