From nobody Tue Feb 10 05:46:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 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=1607298044; cv=none; d=zohomail.com; s=zohoarc; b=Xg0USSwMpnV39dbtg0aesPbN8ah6zXh5WhdOCTtgBWfC43yde+jRfVie89WJMLZh9jxS2X++cLNAcWW5YGdqzWEFmIv+qmwXvbdhLfHzQ46l8V3ZO9h2IJtYRNisL3rjGykkPd70NzAx5vCeBWuaMs2iHDNp+5KQqNarsmTqHJM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298044; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=B/NrR5V+/HZCdWuAnYAqhfTZDaNUhGvFBTcglSmrBsA=; b=SryKR7RosS184nt44uG2EZRAyIWmJpUQjJPtVKJnfeD5IpuQ5abp4YKK6b3S/0VIyCIswiht8jNmRHUQeD+5FncqmdtuVPA5K50ltg+XDB9MIGXAuQ7646vjCheueCxeVuG7cLs+p0Vnt4OD8dVRpNGiwEHfKYCaCAWf8EprcMA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1607298044817843.3193970353323; Sun, 6 Dec 2020 15:40:44 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id y17so1609194wrr.10 for ; Sun, 06 Dec 2020 15:40:44 -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 n10sm12603481wrv.77.2020.12.06.15.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:42 -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=B/NrR5V+/HZCdWuAnYAqhfTZDaNUhGvFBTcglSmrBsA=; b=m4z3WWoyk+Rg3BjX02RHRMctF6LXJkoNf3ztaE25+iOXC9vzlk5ns3EEXqsXAFIleR HcOahTgCJFR6V6F0LhW7mG9nwgsYYPBcwgHruLbE4h0Om005WfLjbM54R8ntvbLJfxep oJb2JFQMDn607DTV0uDAvPe7H8A74HIiBu7XZxsxYfTDQbB7DtY7I1hKezTnb7qnoFY5 GyB36yDYuaP1V5BhCwU2rGqWKD10FlXUoyu54XfXWWeXiuYIjhWb7TrvK6VFWqz6DPih YiHl66Z2/hp9/Z8bM18m8sNGbJB377p6Ek3mwICiNHoarz/Pqa9UvHACAuTO2988L0uQ M/uw== 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=B/NrR5V+/HZCdWuAnYAqhfTZDaNUhGvFBTcglSmrBsA=; b=ImR7GEJTZDvGscB2+9F9xSr0FcOYcQLfrhj23GU8b2Ee1e95eci7gTeKX3/gtn9f/k c3h4FFuLj3j9QmqZIKKGi1i6+0AWX9V/JSrGAwBZxZyuJUgAd3cJwdCzc9rNj7EOqXux w11CPKVpB2Wmwt2O5I3WkakCzjGCDRg4gvdFI6hGJ/Fko3s9glERVH0V85/MQmRfzxbg N+QsiXvGMNKmukKTAcCbclGQIXsSWRgQoD9hefdS4dh517mk2cwoR2zywcxVIMOsqBRD tt/SNVZmXn5azpm8IPDwmqq/qVvTfOdjYnzytV0Y3uTcDG8yqkAoLGn6WawgPxKKyHjO fEHg== X-Gm-Message-State: AOAM533Zvo2/odmdTFurNBXMkkxW/p+ROrgNRbOYKCvUJcD4SD0fOpvC zu7GyTXVAUoWYDNXAAbJh/Y= X-Google-Smtp-Source: ABdhPJwmEAy9N8jHYAPoMpDouYPkT9Pj6b8gyMnw9VTr/7xAEcomMuXXl66GctcoGDdBkCySGNDXGQ== X-Received: by 2002:adf:b74d:: with SMTP id n13mr16913334wre.101.1607298043036; Sun, 06 Dec 2020 15:40:43 -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: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 10/19] target/mips: Add !CONFIG_USER_ONLY comment after #endif Date: Mon, 7 Dec 2020 00:39:40 +0100 Message-Id: <20201206233949.3783184-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-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) To help understand ifdef'ry, add comment after #endif. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/helper.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/target/mips/helper.c b/target/mips/helper.c index bb962a3e8cc..6d33809fb8b 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -455,7 +455,8 @@ void cpu_mips_store_cause(CPUMIPSState *env, target_ulo= ng val) } } } -#endif + +#endif /* !CONFIG_USER_ONLY */ =20 static void raise_mmu_exception(CPUMIPSState *env, target_ulong address, int rw, int tlb_error) @@ -537,6 +538,7 @@ static void raise_mmu_exception(CPUMIPSState *env, targ= et_ulong address, } =20 #if !defined(CONFIG_USER_ONLY) + hwaddr mips_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) { MIPSCPU *cpu =3D MIPS_CPU(cs); @@ -550,9 +552,7 @@ hwaddr mips_cpu_get_phys_page_debug(CPUState *cs, vaddr= addr) } return phys_addr; } -#endif =20 -#if !defined(CONFIG_USER_ONLY) #if !defined(TARGET_MIPS64) =20 /* @@ -886,7 +886,7 @@ refill: return true; } #endif -#endif +#endif /* !CONFIG_USER_ONLY */ =20 bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, @@ -1017,7 +1017,7 @@ static const char * const excp_names[EXCP_LAST + 1] = =3D { [EXCP_MSADIS] =3D "MSA disabled", [EXCP_MSAFPE] =3D "MSA floating point", }; -#endif +#endif /* !CONFIG_USER_ONLY */ =20 target_ulong exception_resume_pc(CPUMIPSState *env) { @@ -1080,7 +1080,8 @@ static inline void set_badinstr_registers(CPUMIPSStat= e *env) env->CP0_BadInstrP =3D cpu_ldl_code(env, env->active_tc.PC - 4); } } -#endif + +#endif /* !CONFIG_USER_ONLY */ =20 void mips_cpu_do_interrupt(CPUState *cs) { @@ -1480,7 +1481,7 @@ void r4k_invalidate_tlb(CPUMIPSState *env, int idx, i= nt use_extra) } } } -#endif +#endif /* !CONFIG_USER_ONLY */ =20 void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env, uint32_t exception, --=20 2.26.2