| Message ID | 20250323173730.3213964-14-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/avr: Increase page size | expand |
On 23/3/25 18:37, Richard Henderson wrote: > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/avr/cpu.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/target/avr/cpu.c b/target/avr/cpu.c > index e4011004b4..538fcbc215 100644 > --- a/target/avr/cpu.c > +++ b/target/avr/cpu.c > @@ -161,12 +161,14 @@ static void avr_cpu_realizefn(DeviceState *dev, Error **errp) > memory_region_init_io(&cpu->cpu_reg1, OBJECT(cpu), &avr_cpu_reg1, env, > "avr-cpu-reg1", 32); > memory_region_add_subregion(get_system_memory(), > - OFFSET_DATA, &cpu->cpu_reg1); > + OFFSET_DATA + cpu->offset_io, > + &cpu->cpu_reg1); > > memory_region_init_io(&cpu->cpu_reg2, OBJECT(cpu), &avr_cpu_reg2, env, > "avr-cpu-reg2", 8); > memory_region_add_subregion(get_system_memory(), > - OFFSET_DATA + 0x58, &cpu->cpu_reg2); > + OFFSET_DATA + cpu->offset_io + 0x58, > + &cpu->cpu_reg2); Always zero, but I agree it is clearer. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > }
On 23/3/25 22:35, Philippe Mathieu-Daudé wrote: > On 23/3/25 18:37, Richard Henderson wrote: >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >> --- >> target/avr/cpu.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/target/avr/cpu.c b/target/avr/cpu.c >> index e4011004b4..538fcbc215 100644 >> --- a/target/avr/cpu.c >> +++ b/target/avr/cpu.c >> @@ -161,12 +161,14 @@ static void avr_cpu_realizefn(DeviceState *dev, >> Error **errp) >> memory_region_init_io(&cpu->cpu_reg1, OBJECT(cpu), >> &avr_cpu_reg1, env, >> "avr-cpu-reg1", 32); >> memory_region_add_subregion(get_system_memory(), >> - OFFSET_DATA, &cpu->cpu_reg1); >> + OFFSET_DATA + cpu->offset_io, >> + &cpu->cpu_reg1); >> memory_region_init_io(&cpu->cpu_reg2, OBJECT(cpu), >> &avr_cpu_reg2, env, >> "avr-cpu-reg2", 8); >> memory_region_add_subregion(get_system_memory(), >> - OFFSET_DATA + 0x58, &cpu->cpu_reg2); >> + OFFSET_DATA + cpu->offset_io + 0x58, >> + &cpu->cpu_reg2); > > Always zero, but I agree it is clearer. I figured out the use after reading the following patch ;) > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > >> }
On 3/23/25 10:37, Richard Henderson wrote: > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/avr/cpu.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/target/avr/cpu.c b/target/avr/cpu.c > index e4011004b4..538fcbc215 100644 > --- a/target/avr/cpu.c > +++ b/target/avr/cpu.c > @@ -161,12 +161,14 @@ static void avr_cpu_realizefn(DeviceState *dev, Error **errp) > memory_region_init_io(&cpu->cpu_reg1, OBJECT(cpu), &avr_cpu_reg1, env, > "avr-cpu-reg1", 32); > memory_region_add_subregion(get_system_memory(), > - OFFSET_DATA, &cpu->cpu_reg1); > + OFFSET_DATA + cpu->offset_io, > + &cpu->cpu_reg1); > > memory_region_init_io(&cpu->cpu_reg2, OBJECT(cpu), &avr_cpu_reg2, env, > "avr-cpu-reg2", 8); > memory_region_add_subregion(get_system_memory(), > - OFFSET_DATA + 0x58, &cpu->cpu_reg2); > + OFFSET_DATA + cpu->offset_io + 0x58, > + &cpu->cpu_reg2); > } > > static void avr_cpu_set_int(void *opaque, int irq, int level) Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/target/avr/cpu.c b/target/avr/cpu.c index e4011004b4..538fcbc215 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -161,12 +161,14 @@ static void avr_cpu_realizefn(DeviceState *dev, Error **errp) memory_region_init_io(&cpu->cpu_reg1, OBJECT(cpu), &avr_cpu_reg1, env, "avr-cpu-reg1", 32); memory_region_add_subregion(get_system_memory(), - OFFSET_DATA, &cpu->cpu_reg1); + OFFSET_DATA + cpu->offset_io, + &cpu->cpu_reg1); memory_region_init_io(&cpu->cpu_reg2, OBJECT(cpu), &avr_cpu_reg2, env, "avr-cpu-reg2", 8); memory_region_add_subregion(get_system_memory(), - OFFSET_DATA + 0x58, &cpu->cpu_reg2); + OFFSET_DATA + cpu->offset_io + 0x58, + &cpu->cpu_reg2); } static void avr_cpu_set_int(void *opaque, int irq, int level)
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/avr/cpu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)