From: Richard Henderson <richard.henderson@linaro.org>
Date: Fri, 4 Sep 2020 17:53:03 +0000 (-0700)
Subject: target/microblaze: Reorg MicroBlazeCPUConfig to minimize holes
X-Git-Tag: v5.2.0-rc0~128^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0b2d16a09374464450c47f280fc10df70a5de72;p=thirdparty%2Fqemu.git

target/microblaze: Reorg MicroBlazeCPUConfig to minimize holes

Sort the elements by type and size, removing a number of holes
and reducing the size of the entire struct.

Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h
index 59d2a079c44..4d53345f23d 100644
--- a/target/microblaze/cpu.h
+++ b/target/microblaze/cpu.h
@@ -293,13 +293,22 @@ struct CPUMBState {
 
 /*
  * Microblaze Configuration Settings
+ *
+ * Note that the structure is sorted by type and size to minimize holes.
  */
 typedef struct {
-    bool stackprot;
+    char *version;
+
     uint32_t base_vectors;
+    uint32_t pvr_user2;
+
     uint8_t addr_size;
     uint8_t use_fpu;
     uint8_t use_hw_mul;
+    uint8_t pvr_user1;
+    uint8_t pvr;
+
+    bool stackprot;
     bool use_barrel;
     bool use_div;
     bool use_msr_instr;
@@ -313,10 +322,6 @@ typedef struct {
     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;
 
 /**