From bbba320911a86c0ee373f8297f80a2b82de22039 Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 5 Sep 2011 19:31:58 +0300
Subject: enable -Wall and fix warnings reported by it

---
 x86/Makefile   | 10 +++++++---
 x86/x86_emit.h | 12 ++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'x86')

diff --git a/x86/Makefile b/x86/Makefile
index c9bf680..c1d772b 100644
--- a/x86/Makefile
+++ b/x86/Makefile
@@ -15,7 +15,7 @@ BIN       ?= gpsp.exe
 # Platform specific definitions 
 
 VPATH      += ..
-CFLAGS     += -DPC_BUILD -m32
+CFLAGS     += -DPC_BUILD -Wall -m32
 INCLUDES   = -I${PREFIX}/include `sdl-config --cflags`
 LIBS       = -L${PREFIX}/lib `sdl-config --libs` -mconsole -lz -m32
 
@@ -23,15 +23,19 @@ LIBS       = -L${PREFIX}/lib `sdl-config --libs` -mconsole -lz -m32
 
 .SUFFIXES: .c .S
 
+all:	${BIN}
+
 %.o: %.c
 	${CC} ${CFLAGS} ${INCLUDES} -c -o $@ $<
 
 %.o: %.S
 	${CC} ${CFLAGS} -c -o $@ $<
 
-all:	${OBJS}
+cpu.o cpu_threaded.o: CFLAGS += -Wno-unused-variable -Wno-unused-label
+
+${BIN}:	${OBJS}
 	${CC} ${OBJS} ${LIBS} -o ${BIN}  
-	${STRIP} ${BIN}
+#	${STRIP} ${BIN}
 
 clean:
 	rm -f *.o ${BIN} 
diff --git a/x86/x86_emit.h b/x86/x86_emit.h
index 6f02d07..efdceb5 100644
--- a/x86/x86_emit.h
+++ b/x86/x86_emit.h
@@ -887,7 +887,7 @@ u32 function_cc execute_rrx(u32 value)
 #define collapse_flags()                                                      \
   reg[REG_CPSR] = (reg[REG_N_FLAG] << 31) | (reg[REG_Z_FLAG] << 30) |         \
    (reg[REG_C_FLAG] << 29) | (reg[REG_V_FLAG] << 28) |                        \
-   reg[REG_CPSR] & 0xFF                                                       \
+   (reg[REG_CPSR] & 0xFF)                                                     \
 
 // It should be okay to still generate result flags, spsr will overwrite them.
 // This is pretty infrequent (returning from interrupt handlers, et al) so
@@ -1200,7 +1200,7 @@ typedef enum
   generate_store_reg_pc_no_flags(a0, rd);                                     \
 }                                                                             \
 
-u32 function_cc execute_mul_flags(u32 dest)
+static void function_cc execute_mul_flags(u32 dest)
 {
   calculate_z_flag(dest);
   calculate_n_flag(dest);
@@ -1228,7 +1228,7 @@ u32 function_cc execute_mul_flags(u32 dest)
   arm_multiply_flags_##flags();                                               \
 }                                                                             \
 
-u32 function_cc execute_mul_long_flags(u32 dest_lo, u32 dest_hi)
+static void function_cc execute_mul_long_flags(u32 dest_lo, u32 dest_hi)
 {
   reg[REG_Z_FLAG] = (dest_lo == 0) & (dest_hi == 0);
   calculate_n_flag(dest_hi);
@@ -2045,7 +2045,7 @@ u32 function_cc execute_ror_imm_op(u32 value, u32 shift)
 
 #define thumb_conditional_branch(condition)                                   \
 {                                                                             \
-  condition_check_type condition_check;                                       \
+  condition_check_type condition_check = CONDITION_TRUE;                      \
   generate_cycle_update();                                                    \
   generate_condition_##condition(a0, a1);                                     \
   generate_conditional_branch_type(a0, a1);                                   \
@@ -2171,7 +2171,7 @@ data_proc_generate_logic_test_function(teq, rn ^ rm);
 data_proc_generate_sub_test_function(cmp, rn, rm);
 data_proc_generate_add_test_function(cmn, rn, rm);
 
-u32 function_cc execute_swi(u32 pc)
+static void function_cc execute_swi(u32 pc)
 {
   reg_mode[MODE_SUPERVISOR][6] = pc;
   collapse_flags();
@@ -2182,7 +2182,7 @@ u32 function_cc execute_swi(u32 pc)
 
 #define arm_conditional_block_header()                                        \
 {                                                                             \
-  condition_check_type condition_check;                                       \
+  condition_check_type condition_check = CONDITION_TRUE;                      \
   generate_condition(a0, a1);                                                 \
   generate_conditional_branch_type(a0, a1);                                   \
 }
-- 
cgit v1.2.3