[v1] target/avr: Increase page size

[PATCH 04/17] target/avr: Remove OFFSET_CPU_REGISTERS

Posted by Richard Henderson 10 months, 3 weeks ago

This define isn't really used.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/avr/cpu.h    | 2 --
 target/avr/helper.c | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/target/avr/cpu.h b/target/avr/cpu.h
index 06f5ae4d1b..84a8f5cc8c 100644
--- a/target/avr/cpu.h
+++ b/target/avr/cpu.h
@@ -60,8 +60,6 @@
 #define OFFSET_CODE 0x00000000
 /* CPU registers, IO registers, and SRAM */
 #define OFFSET_DATA 0x00800000
-/* CPU registers specifically, these are mapped at the start of data */
-#define OFFSET_CPU_REGISTERS OFFSET_DATA
 /*
  * IO registers, including status register, stack pointer, and memory
  * mapped peripherals, mapped just after CPU registers
diff --git a/target/avr/helper.c b/target/avr/helper.c
index 3412312ad5..e5bf16c6b7 100644
--- a/target/avr/helper.c
+++ b/target/avr/helper.c
@@ -340,8 +340,7 @@ void helper_fullwr(CPUAVRState *env, uint32_t data, uint32_t addr)
     env->fullacc = false;
 
     /* Following logic assumes this: */
-    assert(OFFSET_CPU_REGISTERS == OFFSET_DATA);
-    assert(OFFSET_IO_REGISTERS == OFFSET_CPU_REGISTERS +
+    assert(OFFSET_IO_REGISTERS == OFFSET_DATA +
                                   NUMBER_OF_CPU_REGISTERS);
 
     if (addr < NUMBER_OF_CPU_REGISTERS) {
-- 
2.43.0

Re: [PATCH 04/17] target/avr: Remove OFFSET_CPU_REGISTERS

Posted by Pierrick Bouvier 10 months, 3 weeks ago

On 3/23/25 10:37, Richard Henderson wrote:
> This define isn't really used.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   target/avr/cpu.h    | 2 --
>   target/avr/helper.c | 3 +--
>   2 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/target/avr/cpu.h b/target/avr/cpu.h
> index 06f5ae4d1b..84a8f5cc8c 100644
> --- a/target/avr/cpu.h
> +++ b/target/avr/cpu.h
> @@ -60,8 +60,6 @@
>   #define OFFSET_CODE 0x00000000
>   /* CPU registers, IO registers, and SRAM */
>   #define OFFSET_DATA 0x00800000
> -/* CPU registers specifically, these are mapped at the start of data */
> -#define OFFSET_CPU_REGISTERS OFFSET_DATA
>   /*
>    * IO registers, including status register, stack pointer, and memory
>    * mapped peripherals, mapped just after CPU registers
> diff --git a/target/avr/helper.c b/target/avr/helper.c
> index 3412312ad5..e5bf16c6b7 100644
> --- a/target/avr/helper.c
> +++ b/target/avr/helper.c
> @@ -340,8 +340,7 @@ void helper_fullwr(CPUAVRState *env, uint32_t data, uint32_t addr)
>       env->fullacc = false;
>   
>       /* Following logic assumes this: */
> -    assert(OFFSET_CPU_REGISTERS == OFFSET_DATA);
> -    assert(OFFSET_IO_REGISTERS == OFFSET_CPU_REGISTERS +
> +    assert(OFFSET_IO_REGISTERS == OFFSET_DATA +
>                                     NUMBER_OF_CPU_REGISTERS);
>   
>       if (addr < NUMBER_OF_CPU_REGISTERS) {

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH 04/17] target/avr: Remove OFFSET_CPU_REGISTERS

Posted by Philippe Mathieu-Daudé 10 months, 3 weeks ago

On 23/3/25 18:37, Richard Henderson wrote:
> This define isn't really used.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   target/avr/cpu.h    | 2 --
>   target/avr/helper.c | 3 +--
>   2 files changed, 1 insertion(+), 4 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>