Use 1 32-bit word instead of 6.
Reviewed-by: Claudio Fontana <claudio.font...@huawei.com>
Signed-off-by: Richard Henderson <r...@twiddle.net>
---
tcg/tcg-be-ldst.h | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/tcg/tcg-be-ldst.h b/tcg/tcg-be-ldst.h
index 49b3de6..904eeda 100644
--- a/tcg/tcg-be-ldst.h
+++ b/tcg/tcg-be-ldst.h
@@ -23,14 +23,19 @@
#ifdef CONFIG_SOFTMMU
#define TCG_MAX_QEMU_LDST 640
+QEMU_BUILD_BUG_ON(TCG_TARGET_NB_REGS > 32);
+QEMU_BUILD_BUG_ON(NB_MMU_MODES > 8);
+
typedef struct TCGLabelQemuLdst {
- bool is_ld:1; /* qemu_ld: true, qemu_st: false */
- TCGMemOp opc:4;
- TCGReg addrlo_reg; /* reg index for low word of guest virtual addr */
- TCGReg addrhi_reg; /* reg index for high word of guest virtual addr */
- TCGReg datalo_reg; /* reg index for low word to be loaded or stored */
- TCGReg datahi_reg; /* reg index for high word to be loaded or stored
*/
- int mem_index; /* soft MMU memory index */
+ TCGMemOp opc : 4;
+ bool is_ld : 1; /* qemu_ld: true, qemu_st: false */
+ TCGReg addrlo_reg : 5; /* reg index for low word of guest virtual addr */
+ TCGReg addrhi_reg : 5; /* reg index for high word of guest virtual addr */
+ TCGReg datalo_reg : 5; /* reg index for low word to be loaded or stored */
+ TCGReg datahi_reg : 5; /* reg index for high word to be loaded or stored
*/
+ unsigned mem_index : 3; /* soft MMU memory index */
+ /* 4 bits unused in 32-bit word */
+
tcg_insn_unit *raddr; /* gen code addr of the next IR of qemu_ld/st IR */
tcg_insn_unit *label_ptr[2]; /* label pointers to be updated */
} TCGLabelQemuLdst;
--
1.9.3
