On 9/4/20 9:08 PM, Richard Henderson wrote:
> This struct was previously unnamed, and defined in MicroBlazeCPU.
> Pull it out to its own typedef so that we can reuse it.
>
> Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> target/microblaze/cpu.h | 55 ++++++++++++++++++++++-------------------
> 1 file changed, 29 insertions(+), 26 deletions(-)
>
> diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h
> index 20c2979396..59d2a079c4 100644
> --- a/target/microblaze/cpu.h
> +++ b/target/microblaze/cpu.h
> @@ -291,6 +291,34 @@ struct CPUMBState {
> } pvr;
> };
>
> +/*
> + * Microblaze Configuration Settings
> + */
> +typedef struct {
> + bool stackprot;
> + uint32_t base_vectors;
> + uint8_t addr_size;
> + uint8_t use_fpu;
> + uint8_t use_hw_mul;
> + bool use_barrel;
> + bool use_div;
> + bool use_msr_instr;
> + bool use_pcmp_instr;
> + bool use_mmu;
> + bool dcache_writeback;
> + bool endi;
> + bool dopb_bus_exception;
> + bool iopb_bus_exception;
> + bool illegal_opcode_exception;
> + bool opcode_0_illegal;
> + bool div_zero_exception;
> + bool unaligned_exceptions;
> + uint8_t pvr_user1;
> + uint32_t pvr_user2;
> + char *version;
> + uint8_t pvr;
> +} MicroBlazeCPUConfig;
> +
> /**
> * MicroBlazeCPU:
> * @env: #CPUMBState
> @@ -305,32 +333,7 @@ struct MicroBlazeCPU {
>
> CPUNegativeOffsetState neg;
> CPUMBState env;
> -
> - /* Microblaze Configuration Settings */
> - struct {
> - bool stackprot;
> - uint32_t base_vectors;
> - uint8_t addr_size;
> - uint8_t use_fpu;
> - uint8_t use_hw_mul;
> - bool use_barrel;
> - bool use_div;
> - bool use_msr_instr;
> - bool use_pcmp_instr;
> - bool use_mmu;
> - bool dcache_writeback;
> - bool endi;
> - bool dopb_bus_exception;
> - bool iopb_bus_exception;
> - bool illegal_opcode_exception;
> - bool opcode_0_illegal;
> - bool div_zero_exception;
> - bool unaligned_exceptions;
> - uint8_t pvr_user1;
> - uint32_t pvr_user2;
> - char *version;
> - uint8_t pvr;
> - } cfg;
> + MicroBlazeCPUConfig cfg;
> };
>
>
>
