From nobody Tue Nov 18 04:24:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607890820; cv=none; d=zohomail.com; s=zohoarc; b=CssE/kL/ET68EjyyGu4hCep2bPRtcE4ozdRewBno7sLBDO8lWo0NtlCB24EaBJbaEU1uceE+N64+mSZFN1qC0GeZ0O+sMEGIIMUYIUPF9IaUvp8F6HR60bhBlmgO1TWpXXDkb+8+W0zzJtkvTSyyV4WiVfj1OP8c/6NWr1LSnqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607890820; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s6etg05C/BF399R/sCtLPATOdY8AkUS5HEwSvbkWAQM=; b=W2gEZTGizTiDf8tf8PoUGGVQcm1yKJRTqwZUv9Jg4P8tYICvJCjSOy156AJBLk1vfKLYYaboNu5vgPPC4LoNhOb2XNa6uFSBKhJTrVopnKZB7kaz3WhSXhnLF79OqKMhLyzcTgLWu7KOg4Ugsj+s2Q/Oqlge7hKi5Y8/h6JaQwo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1607890820696293.0128545063433; Sun, 13 Dec 2020 12:20:20 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id i9so14390443wrc.4 for ; Sun, 13 Dec 2020 12:20:20 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id x7sm19488199wmi.11.2020.12.13.12.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Dec 2020 12:20:18 -0800 (PST) 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=s6etg05C/BF399R/sCtLPATOdY8AkUS5HEwSvbkWAQM=; b=q4Prp5VDpN3rINMABx1tB5qHHGoJp9wExi3jL5uSHNsSREz9xmjlJpKgJLDEI0nRnb SEH5OLN2DDe1Uv+sCv4EFmTSzWAr62LWrJUCmGGhw4U/NciSZWU/xewdzor/2AQLvCA2 VK0sNiuweaJZ/Z66bF/qSabLa+jLFxy1NH9kJDRbtSwQ6/bVEhvBBclWGJhywWlaYLAm JA6mpkIMwqyOMXu9EO99W3KGya+i7RL/n9G2A59bifZZmi0I77DgpBuzLC4Inv6wsWwD YNzZKn82oQuaYqRuB55jAm80wN4awzHSd0CtpIwZn5en4Re0uwMungEGFH97Axt+iFji XXFw== 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=s6etg05C/BF399R/sCtLPATOdY8AkUS5HEwSvbkWAQM=; b=rHUxuVeVEdb2LVLNZCStDBAdIfn5G009RTUBvA/qZH6BUfC8WTs3nSpxrX7O0ootU2 +PS1NJFCKPAUL9C0OJzzez/sI2yzffrCdLSlq7doRY6SHNCYvDFyFCMKjFGb+pXb1ytB hf7+QYCQRqbz9v2E/NhXRTet6rlQp9xBpH63Mt1PNk7V+K/PjZwV+2t/5h4qWor/QdeQ De0+jtG2jOozqe2rxxnz9J+j32CkFilWTWkmt6e2ApzxxbyeVulRNYcJ16sbejnKmCsG ZvsKaD8ISNjkbWJheCHOw+49qGOX5TK1CsqD7r8SytYpo604m+O+pX3dbyjZPgPU4vm7 G4oQ== X-Gm-Message-State: AOAM5308m1Lc2UXOepj/VYSPY1GAdW3D0qJgWfC+A5sS9TcaKsgEROy5 Li3lMcQFLZ06+kVLiEtrdL4= X-Google-Smtp-Source: ABdhPJyZsyojoo5AMZgAvYJyhWWykvGk9uZc61cVzGwJ7TbpydQtRq7kaBJdz/R8v4Gzu5uT0JKT6A== X-Received: by 2002:adf:ded1:: with SMTP id i17mr23100083wrn.190.1607890818932; Sun, 13 Dec 2020 12:20:18 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Aurelien Jarno , Aleksandar Rikalo , kvm@vger.kernel.org, Jiaxun Yang , Huacai Chen , Paul Burton , Richard Henderson , Huacai Chen Subject: [PULL 06/26] target/mips: Do not include CP0 helpers in user-mode emulation Date: Sun, 13 Dec 2020 21:19:26 +0100 Message-Id: <20201213201946.236123-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201213201946.236123-1-f4bug@amsat.org> References: <20201213201946.236123-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) CP0 helpers are restricted to system-mode emulation. Do not intent do build cp0_helper.c in user-mode (this allows to simplify some #ifdef'ry). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Huacai Chen Message-Id: <20201109090422.2445166-3-f4bug@amsat.org> --- target/mips/cp0_helper.c | 4 ---- target/mips/meson.build | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/target/mips/cp0_helper.c b/target/mips/cp0_helper.c index e8b9343ec9c..caaaefcc8ad 100644 --- a/target/mips/cp0_helper.c +++ b/target/mips/cp0_helper.c @@ -32,7 +32,6 @@ #include "sysemu/kvm.h" =20 =20 -#ifndef CONFIG_USER_ONLY /* SMP helpers. */ static bool mips_vpe_is_wfi(MIPSCPU *c) { @@ -1667,10 +1666,8 @@ target_ulong helper_evpe(CPUMIPSState *env) } return prev; } -#endif /* !CONFIG_USER_ONLY */ =20 /* R6 Multi-threading */ -#ifndef CONFIG_USER_ONLY target_ulong helper_dvp(CPUMIPSState *env) { CPUState *other_cs =3D first_cpu; @@ -1709,4 +1706,3 @@ target_ulong helper_evp(CPUMIPSState *env) } return prev; } -#endif /* !CONFIG_USER_ONLY */ diff --git a/target/mips/meson.build b/target/mips/meson.build index fa1f024e782..681a5524c0e 100644 --- a/target/mips/meson.build +++ b/target/mips/meson.build @@ -1,6 +1,5 @@ mips_ss =3D ss.source_set() mips_ss.add(files( - 'cp0_helper.c', 'cpu.c', 'dsp_helper.c', 'fpu_helper.c', @@ -15,6 +14,7 @@ =20 mips_softmmu_ss =3D ss.source_set() mips_softmmu_ss.add(files( + 'cp0_helper.c', 'cp0_timer.c', 'machine.c', 'mips-semi.c', --=20 2.26.2