Fix NB_MMU_MODES to 16

[PATCH 01/23] include/exec: Set default `NB_MMU_MODES` to 16

Posted by Anton Johansson via 2 years, 11 months ago

Signed-off-by: Anton Johansson <anjo@rev.ng>
---
 include/exec/cpu-defs.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
index be920d4208..69cd62c19b 100644
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -36,9 +36,6 @@
 #ifndef TARGET_LONG_BITS
 # error TARGET_LONG_BITS must be defined in cpu-param.h
 #endif
-#ifndef NB_MMU_MODES
-# error NB_MMU_MODES must be defined in cpu-param.h
-#endif
 #ifndef TARGET_PHYS_ADDR_SPACE_BITS
 # error TARGET_PHYS_ADDR_SPACE_BITS must be defined in cpu-param.h
 #endif
@@ -55,6 +52,14 @@
 # endif
 #endif
 
+/*
+ * Fix the maxiumum number of mmu modes to 16.  This is larger than all current
+ * targets, and also the maximum supported by the softmmu tlb api.
+ */
+#ifndef NB_MMU_MODES
+#define NB_MMU_MODES 16
+#endif
+
 #define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8)
 
 /* target_ulong is the type of a virtual address */
-- 
2.39.1

Re: [PATCH 01/23] include/exec: Set default `NB_MMU_MODES` to 16

Posted by Philippe Mathieu-Daudé 2 years, 11 months ago

On 6/3/23 18:52, Anton Johansson wrote:
> Signed-off-by: Anton Johansson <anjo@rev.ng>
> ---
>   include/exec/cpu-defs.h | 11 ++++++++---
>   1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
> index be920d4208..69cd62c19b 100644
> --- a/include/exec/cpu-defs.h
> +++ b/include/exec/cpu-defs.h
> @@ -36,9 +36,6 @@
>   #ifndef TARGET_LONG_BITS
>   # error TARGET_LONG_BITS must be defined in cpu-param.h
>   #endif
> -#ifndef NB_MMU_MODES
> -# error NB_MMU_MODES must be defined in cpu-param.h
> -#endif
>   #ifndef TARGET_PHYS_ADDR_SPACE_BITS
>   # error TARGET_PHYS_ADDR_SPACE_BITS must be defined in cpu-param.h
>   #endif
> @@ -55,6 +52,14 @@
>   # endif
>   #endif
>   
> +/*
> + * Fix the maxiumum number of mmu modes to 16.  This is larger than all current
> + * targets, and also the maximum supported by the softmmu tlb api.

Typo "maximum".

I'd keep "larger than all current targets, and also" for the commit 
description and not commit as comment in the code.

> + */
> +#ifndef NB_MMU_MODES
> +#define NB_MMU_MODES 16
> +#endif
> +
>   #define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8)
>   
>   /* target_ulong is the type of a virtual address */