[PATCH 06/14] x86emu: Fix -Wshadow warnings
Adam Jackson
ajax at redhat.com
Fri Dec 13 15:05:44 PST 2013
The variable(s) being shadowed are u16 or u16 *. For the 32-bit paths,
change the variable name too; for the 16-bit paths, just use the outer
scope's variable.
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
hw/xfree86/x86emu/ops.c | 108 +++++++++++++++++++-----------------------------
1 file changed, 42 insertions(+), 66 deletions(-)
diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c
index 8af1df4..78a871e 100644
--- a/hw/xfree86/x86emu/ops.c
+++ b/hw/xfree86/x86emu/ops.c
@@ -11705,16 +11705,14 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
switch (rh) {
case 0: /* inc word ptr ... */
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 destval;
+ u32 destval32;
- destval = fetch_data_long(destoffset);
+ destval32 = fetch_data_long(destoffset);
TRACE_AND_STEP();
- destval = inc_long(destval);
- store_data_long(destoffset, destval);
+ destval32 = inc_long(destval32);
+ store_data_long(destoffset, destval32);
}
else {
- u16 destval;
-
destval = fetch_data_word(destoffset);
TRACE_AND_STEP();
destval = inc_word(destval);
@@ -11723,16 +11721,14 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
break;
case 1: /* dec word ptr ... */
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 destval;
+ u32 destval32;
- destval = fetch_data_long(destoffset);
+ destval32 = fetch_data_long(destoffset);
TRACE_AND_STEP();
- destval = dec_long(destval);
- store_data_long(destoffset, destval);
+ destval32 = dec_long(destval32);
+ store_data_long(destoffset, destval32);
}
else {
- u16 destval;
-
destval = fetch_data_word(destoffset);
TRACE_AND_STEP();
destval = dec_word(destval);
@@ -11768,15 +11764,13 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
break;
case 6: /* push word ptr ... */
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 destval;
+ u32 destval32;
- destval = fetch_data_long(destoffset);
+ destval32 = fetch_data_long(destoffset);
TRACE_AND_STEP();
- push_long(destval);
+ push_long(destval32);
}
else {
- u16 destval;
-
destval = fetch_data_word(destoffset);
TRACE_AND_STEP();
push_word(destval);
@@ -11790,16 +11784,14 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
switch (rh) {
case 0:
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 destval;
+ u32 destval32;
- destval = fetch_data_long(destoffset);
+ destval32 = fetch_data_long(destoffset);
TRACE_AND_STEP();
- destval = inc_long(destval);
- store_data_long(destoffset, destval);
+ destval32 = inc_long(destval32);
+ store_data_long(destoffset, destval32);
}
else {
- u16 destval;
-
destval = fetch_data_word(destoffset);
TRACE_AND_STEP();
destval = inc_word(destval);
@@ -11808,16 +11800,14 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
break;
case 1:
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 destval;
+ u32 destval32;
- destval = fetch_data_long(destoffset);
+ destval32 = fetch_data_long(destoffset);
TRACE_AND_STEP();
- destval = dec_long(destval);
- store_data_long(destoffset, destval);
+ destval32 = dec_long(destval32);
+ store_data_long(destoffset, destval32);
}
else {
- u16 destval;
-
destval = fetch_data_word(destoffset);
TRACE_AND_STEP();
destval = dec_word(destval);
@@ -11853,15 +11843,13 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
break;
case 6: /* push word ptr ... */
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 destval;
+ u32 destval32;
- destval = fetch_data_long(destoffset);
+ destval32 = fetch_data_long(destoffset);
TRACE_AND_STEP();
- push_long(destval);
+ push_long(destval32);
}
else {
- u16 destval;
-
destval = fetch_data_word(destoffset);
TRACE_AND_STEP();
push_word(destval);
@@ -11875,16 +11863,14 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
switch (rh) {
case 0:
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 destval;
+ u32 destval32;
- destval = fetch_data_long(destoffset);
+ destval32 = fetch_data_long(destoffset);
TRACE_AND_STEP();
- destval = inc_long(destval);
- store_data_long(destoffset, destval);
+ destval32 = inc_long(destval32);
+ store_data_long(destoffset, destval32);
}
else {
- u16 destval;
-
destval = fetch_data_word(destoffset);
TRACE_AND_STEP();
destval = inc_word(destval);
@@ -11893,16 +11879,14 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
break;
case 1:
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 destval;
+ u32 destval32;
- destval = fetch_data_long(destoffset);
+ destval32 = fetch_data_long(destoffset);
TRACE_AND_STEP();
- destval = dec_long(destval);
- store_data_long(destoffset, destval);
+ destval32 = dec_long(destval32);
+ store_data_long(destoffset, destval32);
}
else {
- u16 destval;
-
destval = fetch_data_word(destoffset);
TRACE_AND_STEP();
destval = dec_word(destval);
@@ -11938,15 +11922,13 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
break;
case 6: /* push word ptr ... */
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 destval;
+ u32 destval32;
- destval = fetch_data_long(destoffset);
+ destval32 = fetch_data_long(destoffset);
TRACE_AND_STEP();
- push_long(destval);
+ push_long(destval32);
}
else {
- u16 destval;
-
destval = fetch_data_word(destoffset);
TRACE_AND_STEP();
push_word(destval);
@@ -11958,16 +11940,14 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
switch (rh) {
case 0:
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 *destreg;
+ u32 *destreg32;
- destreg = DECODE_RM_LONG_REGISTER(rl);
+ destreg32 = DECODE_RM_LONG_REGISTER(rl);
DECODE_PRINTF("\n");
TRACE_AND_STEP();
- *destreg = inc_long(*destreg);
+ *destreg32 = inc_long(*destreg32);
}
else {
- u16 *destreg;
-
destreg = DECODE_RM_WORD_REGISTER(rl);
DECODE_PRINTF("\n");
TRACE_AND_STEP();
@@ -11976,16 +11956,14 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
break;
case 1:
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 *destreg;
+ u32 *destreg32;
- destreg = DECODE_RM_LONG_REGISTER(rl);
+ destreg32 = DECODE_RM_LONG_REGISTER(rl);
DECODE_PRINTF("\n");
TRACE_AND_STEP();
- *destreg = dec_long(*destreg);
+ *destreg32 = dec_long(*destreg32);
}
else {
- u16 *destreg;
-
destreg = DECODE_RM_WORD_REGISTER(rl);
DECODE_PRINTF("\n");
TRACE_AND_STEP();
@@ -12018,16 +11996,14 @@ x86emuOp_opcFF_word_RM(u8 X86EMU_UNUSED(op1))
break;
case 6:
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
- u32 *destreg;
+ u32 *destreg32;
- destreg = DECODE_RM_LONG_REGISTER(rl);
+ destreg32 = DECODE_RM_LONG_REGISTER(rl);
DECODE_PRINTF("\n");
TRACE_AND_STEP();
- push_long(*destreg);
+ push_long(*destreg32);
}
else {
- u16 *destreg;
-
destreg = DECODE_RM_WORD_REGISTER(rl);
DECODE_PRINTF("\n");
TRACE_AND_STEP();
--
1.8.4.2
More information about the xorg-devel
mailing list