[v2,41/42] target/riscv: Remove ifndef CONFIG_USER_ONLY from cpu_cfg.h

Commit Message

Richard Henderson March 18, 2025, 9:32 p.m. UTC

While RISCVCPUConfig.satp_mode is unused for user-only,
this header is used from disas/riscv.h, whose users are
only built once.  The savings of 4 bytes isn't worth it.

Reviewed-by: Pierrick Bouvier <[e-mail]>
Signed-off-by: Richard Henderson <[e-mail]>
---
 target/riscv/cpu_cfg.h | 2 --
 1 file changed, 2 deletions(-)

Comments

Alistair Francis March 19, 2025, 1:41 a.m. UTC | #1

On Wed, Mar 19, 2025 at 7:39 AM Richard Henderson
<[e-mail]> wrote:
>
> While RISCVCPUConfig.satp_mode is unused for user-only,
> this header is used from disas/riscv.h, whose users are
> only built once.  The savings of 4 bytes isn't worth it.
>
> Reviewed-by: Pierrick Bouvier <[e-mail]>
> Signed-off-by: Richard Henderson <[e-mail]>

Reviewed-by: Alistair Francis <[e-mail]>

Alistair

> ---
>  target/riscv/cpu_cfg.h | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/target/riscv/cpu_cfg.h b/target/riscv/cpu_cfg.h
> index 8a843482cc..cfe371b829 100644
> --- a/target/riscv/cpu_cfg.h
> +++ b/target/riscv/cpu_cfg.h
> @@ -196,9 +196,7 @@ struct RISCVCPUConfig {
>
>      bool short_isa_string;
>
> -#ifndef CONFIG_USER_ONLY
>      RISCVSATPMap satp_mode;
> -#endif
>  };
>
>  typedef struct RISCVCPUConfig RISCVCPUConfig;
> --
> 2.43.0
>
>

Patch

diff --git a/target/riscv/cpu_cfg.h b/target/riscv/cpu_cfg.h
index 8a843482cc..cfe371b829 100644
--- a/target/riscv/cpu_cfg.h
+++ b/target/riscv/cpu_cfg.h
@@ -196,9 +196,7 @@  struct RISCVCPUConfig {
 
     bool short_isa_string;
 
-#ifndef CONFIG_USER_ONLY
     RISCVSATPMap satp_mode;
-#endif
 };
 
 typedef struct RISCVCPUConfig RISCVCPUConfig;