Message ID | 20230206121714.85084-4-philmd@linaro.org |
---|---|
State | New |
Headers | show |
Series | target/arm: Housekeeping around NVIC | expand |
On 2/6/23 02:17, Philippe Mathieu-Daudé wrote: > Although the 'eabi' field is only used in user emulation where > CPU reset doesn't occur, it doesn't belong to the area to reset. > Move it after the 'end_reset_fields' for consistency. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > target/arm/cpu.h | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index 7bc97fece9..bbbcf2e153 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -721,11 +721,6 @@ typedef struct CPUArchState { > ARMVectorReg zarray[ARM_MAX_VQ * 16]; > #endif > > -#if defined(CONFIG_USER_ONLY) > - /* For usermode syscall translation. */ > - int eabi; > -#endif > - > struct CPUBreakpoint *cpu_breakpoint[16]; > struct CPUWatchpoint *cpu_watchpoint[16]; > > @@ -772,6 +767,10 @@ typedef struct CPUArchState { > uint32_t ctrl; > } sau; > > +#if defined(CONFIG_USER_ONLY) > + /* For usermode syscall translation. */ > + int eabi; > +#endif As a follow-up, this could be bool. And thus this might pack better just before tagged_addr_enable. Other than placement, Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 7bc97fece9..bbbcf2e153 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -721,11 +721,6 @@ typedef struct CPUArchState { ARMVectorReg zarray[ARM_MAX_VQ * 16]; #endif -#if defined(CONFIG_USER_ONLY) - /* For usermode syscall translation. */ - int eabi; -#endif - struct CPUBreakpoint *cpu_breakpoint[16]; struct CPUWatchpoint *cpu_watchpoint[16]; @@ -772,6 +767,10 @@ typedef struct CPUArchState { uint32_t ctrl; } sau; +#if defined(CONFIG_USER_ONLY) + /* For usermode syscall translation. */ + int eabi; +#endif void *nvic; const struct arm_boot_info *boot_info; /* Store GICv3CPUState to access from this struct */
Although the 'eabi' field is only used in user emulation where CPU reset doesn't occur, it doesn't belong to the area to reset. Move it after the 'end_reset_fields' for consistency. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/arm/cpu.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)