fix warnings and deps

also change how CONFIG_FILE is specified (should not be quoted)

diff --git a/Disa/Disa.c b/Disa/Disa.c
index 562929b..259fcfa 100644 (file)
--- a/Disa/Disa.c
+++ b/Disa/Disa.c
@@ -743,10 +743,9 @@ static int DisaCmpEor(int op)
 static int DisaCmpm(int op)\r
 {\r
   // Cmpm  1011ddd1 xx001sss\r
-  int type=0,size=0,dea=0,sea=0;\r
+  int size=0,dea=0,sea=0;\r
   char deat[64]="",seat[64]="";\r
 \r
-  type=(op>>12)&5;\r
   dea =(op>> 9)&7; dea|=8;\r
   size=(op>> 6)&3; if (size>=3) return 1;\r
   sea  = op&0x3f;\r

diff --git a/Ea.cpp b/Ea.cpp
index 77c282b..606e8f4 100644 (file)
--- a/Ea.cpp
+++ b/Ea.cpp
@@ -141,10 +141,8 @@ static int EaCalcReg(int r,int ea,int mask,int forceor,int shift,int noshift=0)
 int EaCalc(int a,int mask,int ea,int size,int top,int sign_extend)\r
 {\r
   char text[32]="";\r
-  int func=0;\r
 \r
   DisaPc=2; DisaGetEa(text,ea,size); // Get text version of the effective address\r
-  func=0x68+(size<<2); // Get correct read handler\r
 \r
   if (ea<0x10)\r
   {\r

diff --git a/Makefile b/Makefile
index 703cf35..8b7a5fd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CFLAGS += -Wall -ggdb
 ifdef CONFIG_FILE
-CFLAGS += -DCONFIG_FILE=$(CONFIG_FILE)
+CFLAGS += -DCONFIG_FILE="\"$(CONFIG_FILE)\""
 endif
 CXXFLAGS += $(CFLAGS)
 
@@ -16,3 +16,8 @@ cyclone_gen: $(OBJS)
 
 clean:
        $(RM) $(OBJS) cyclone_gen Cyclone.s
+
+$(OBJS): app.h config.h Cyclone.h
+ifdef CONFIG_FILE
+$(OBJS): $(CONFIG_FILE)
+endif