f375e62ad9
Fix libvirt + seccomp combo (bz #855162) Fix scsi hotplug crash (bz #879657) Fix QOM refcount crash (bz #881486)
167 lines
4.4 KiB
Diff
167 lines
4.4 KiB
Diff
From e63a3c6c70c9933320c6d8b23c3ea4cf4724d316 Mon Sep 17 00:00:00 2001
|
|
From: Aurelien Jarno <aurelien@aurel32.net>
|
|
Date: Fri, 21 Sep 2012 18:20:25 +0200
|
|
Subject: [PATCH] tcg/mips: kill warnings in user mode
|
|
|
|
Recent versions of GCC emit warnings when compiling user mode targets.
|
|
Kill them by reordering a bit the #ifdef.
|
|
|
|
Reviewed-by: Richard Henderson <rth@twiddle.net>
|
|
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
tcg/mips/tcg-target.c | 84 ++++++++++++++++++++++++++-------------------------
|
|
1 file changed, 43 insertions(+), 41 deletions(-)
|
|
|
|
diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
|
|
index 9293745..a09c0d6 100644
|
|
--- a/tcg/mips/tcg-target.c
|
|
+++ b/tcg/mips/tcg-target.c
|
|
@@ -842,18 +842,16 @@ static const void * const qemu_st_helpers[4] = {
|
|
static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,
|
|
int opc)
|
|
{
|
|
- int addr_regl, addr_meml;
|
|
- int data_regl, data_regh, data_reg1, data_reg2;
|
|
- int mem_index, s_bits;
|
|
+ int addr_regl, data_regl, data_regh, data_reg1, data_reg2;
|
|
#if defined(CONFIG_SOFTMMU)
|
|
void *label1_ptr, *label2_ptr;
|
|
int arg_num;
|
|
-#endif
|
|
-#if TARGET_LONG_BITS == 64
|
|
-# if defined(CONFIG_SOFTMMU)
|
|
+ int mem_index, s_bits;
|
|
+ int addr_meml;
|
|
+# if TARGET_LONG_BITS == 64
|
|
uint8_t *label3_ptr;
|
|
-# endif
|
|
int addr_regh, addr_memh;
|
|
+# endif
|
|
#endif
|
|
data_regl = *args++;
|
|
if (opc == 3)
|
|
@@ -861,11 +859,22 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,
|
|
else
|
|
data_regh = 0;
|
|
addr_regl = *args++;
|
|
-#if TARGET_LONG_BITS == 64
|
|
+#if defined(CONFIG_SOFTMMU)
|
|
+# if TARGET_LONG_BITS == 64
|
|
addr_regh = *args++;
|
|
-#endif
|
|
+# if defined(TCG_TARGET_WORDS_BIGENDIAN)
|
|
+ addr_memh = 0;
|
|
+ addr_meml = 4;
|
|
+# else
|
|
+ addr_memh = 4;
|
|
+ addr_meml = 0;
|
|
+# endif
|
|
+# else
|
|
+ addr_meml = 0;
|
|
+# endif
|
|
mem_index = *args;
|
|
s_bits = opc & 3;
|
|
+#endif
|
|
|
|
if (opc == 3) {
|
|
#if defined(TCG_TARGET_WORDS_BIGENDIAN)
|
|
@@ -879,18 +888,6 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,
|
|
data_reg1 = data_regl;
|
|
data_reg2 = 0;
|
|
}
|
|
-#if TARGET_LONG_BITS == 64
|
|
-# if defined(TCG_TARGET_WORDS_BIGENDIAN)
|
|
- addr_memh = 0;
|
|
- addr_meml = 4;
|
|
-# else
|
|
- addr_memh = 4;
|
|
- addr_meml = 0;
|
|
-# endif
|
|
-#else
|
|
- addr_meml = 0;
|
|
-#endif
|
|
-
|
|
#if defined(CONFIG_SOFTMMU)
|
|
tcg_out_opc_sa(s, OPC_SRL, TCG_REG_A0, addr_regl, TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS);
|
|
tcg_out_opc_imm(s, OPC_ANDI, TCG_REG_A0, TCG_REG_A0, (CPU_TLB_SIZE - 1) << CPU_TLB_ENTRY_BITS);
|
|
@@ -1029,50 +1026,55 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args,
|
|
static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args,
|
|
int opc)
|
|
{
|
|
- int addr_regl, addr_meml;
|
|
- int data_regl, data_regh, data_reg1, data_reg2;
|
|
- int mem_index, s_bits;
|
|
+ int addr_regl, data_regl, data_regh, data_reg1, data_reg2;
|
|
#if defined(CONFIG_SOFTMMU)
|
|
uint8_t *label1_ptr, *label2_ptr;
|
|
int arg_num;
|
|
+ int mem_index, s_bits;
|
|
+ int addr_meml;
|
|
#endif
|
|
#if TARGET_LONG_BITS == 64
|
|
# if defined(CONFIG_SOFTMMU)
|
|
uint8_t *label3_ptr;
|
|
-# endif
|
|
int addr_regh, addr_memh;
|
|
+# endif
|
|
#endif
|
|
-
|
|
data_regl = *args++;
|
|
if (opc == 3) {
|
|
data_regh = *args++;
|
|
-#if defined(TCG_TARGET_WORDS_BIGENDIAN)
|
|
- data_reg1 = data_regh;
|
|
- data_reg2 = data_regl;
|
|
-#else
|
|
- data_reg1 = data_regl;
|
|
- data_reg2 = data_regh;
|
|
-#endif
|
|
} else {
|
|
- data_reg1 = data_regl;
|
|
- data_reg2 = 0;
|
|
data_regh = 0;
|
|
}
|
|
addr_regl = *args++;
|
|
-#if TARGET_LONG_BITS == 64
|
|
+#if defined(CONFIG_SOFTMMU)
|
|
+# if TARGET_LONG_BITS == 64
|
|
addr_regh = *args++;
|
|
-# if defined(TCG_TARGET_WORDS_BIGENDIAN)
|
|
+# if defined(TCG_TARGET_WORDS_BIGENDIAN)
|
|
addr_memh = 0;
|
|
addr_meml = 4;
|
|
-# else
|
|
+# else
|
|
addr_memh = 4;
|
|
addr_meml = 0;
|
|
-# endif
|
|
-#else
|
|
+# endif
|
|
+# else
|
|
addr_meml = 0;
|
|
-#endif
|
|
+# endif
|
|
mem_index = *args;
|
|
s_bits = opc;
|
|
+#endif
|
|
+
|
|
+ if (opc == 3) {
|
|
+#if defined(TCG_TARGET_WORDS_BIGENDIAN)
|
|
+ data_reg1 = data_regh;
|
|
+ data_reg2 = data_regl;
|
|
+#else
|
|
+ data_reg1 = data_regl;
|
|
+ data_reg2 = data_regh;
|
|
+#endif
|
|
+ } else {
|
|
+ data_reg1 = data_regl;
|
|
+ data_reg2 = 0;
|
|
+ }
|
|
|
|
#if defined(CONFIG_SOFTMMU)
|
|
tcg_out_opc_sa(s, OPC_SRL, TCG_REG_A0, addr_regl, TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS);
|
|
--
|
|
1.8.0.2
|
|
|