gcc 4.2 warning fixes

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@501 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/cpu/Cyclone/Main.cpp b/cpu/Cyclone/Main.cpp
index 4cfc774..2c87ea0 100644 (file)
--- a/cpu/Cyclone/Main.cpp
+++ b/cpu/Cyclone/Main.cpp
@@ -6,8 +6,8 @@ static FILE *AsmFile=NULL;
 static int CycloneVer=0x0099; // Version number of library\r
 int *CyJump=NULL; // Jump table\r
 int ms=USE_MS_SYNTAX; // If non-zero, output in Microsoft ARMASM format\r
-char *Narm[4]={ "b", "h","",""}; // Normal ARM Extensions for operand sizes 0,1,2\r
-char *Sarm[4]={"sb","sh","",""}; // Sign-extend ARM Extensions for operand sizes 0,1,2\r
+const char * const Narm[4]={ "b", "h","",""}; // Normal ARM Extensions for operand sizes 0,1,2\r
+const char * const Sarm[4]={"sb","sh","",""}; // Sign-extend ARM Extensions for operand sizes 0,1,2\r
 int Cycles; // Current cycles for opcode\r
 int pc_dirty; // something changed PC during processing\r
 int arm_op_count;\r
@@ -83,7 +83,7 @@ static void ChangeTAS(int norm)
 #endif\r
 \r
 #if EMULATE_ADDRESS_ERRORS_JUMP || EMULATE_ADDRESS_ERRORS_IO\r
-static void AddressErrorWrapper(char rw, char *dataprg, int iw)\r
+static void AddressErrorWrapper(char rw, const char *dataprg, int iw)\r
 {\r
   ot("ExceptionAddressError_%c_%s%s\n", rw, dataprg, ms?"":":");\r
   ot("  ldr r1,[r7,#0x44]\n");\r
@@ -1096,7 +1096,7 @@ static void PrintJumpTable()
 static int CycloneMake()\r
 {\r
   int i;\r
-  char *name="Cyclone.s";\r
+  const char *name="Cyclone.s";\r
   const char *globl=ms?"export":".global";\r
   \r
   // Open the assembly file\r
@@ -1131,6 +1131,10 @@ static int CycloneMake()
   ot("  %s CycloneDoInterrupt\n",globl);\r
   ot("  %s CycloneDoTrace\n",globl);\r
   ot("  %s CycloneJumpTab\n",globl);\r
+  ot("  %s Op____\n",globl);\r
+  ot("  %s Op6001\n",globl);\r
+  ot("  %s Op6601\n",globl);\r
+  ot("  %s Op6701\n",globl);\r
 #endif\r
   ot("\n");\r
   ot(ms?"CycloneVer dcd 0x":"CycloneVer: .long 0x");\r

diff --git a/cpu/Cyclone/OpArith.cpp b/cpu/Cyclone/OpArith.cpp
index b20f6cc..c05f5fd 100644 (file)
--- a/cpu/Cyclone/OpArith.cpp
+++ b/cpu/Cyclone/OpArith.cpp
@@ -8,7 +8,7 @@ int OpArith(int op)
   int type=0,size=0;\r
   int sea=0,tea=0;\r
   int use=0;\r
-  char *shiftstr="";\r
+  const char *shiftstr="";\r
 \r
   // Get source and target EA\r
   type=(op>>9)&7; if (type==4 || type>=7) return 1;\r
@@ -144,8 +144,8 @@ int OpArithReg(int op)
 {\r
   int use=0;\r
   int type=0,size=0,dir=0,rea=0,ea=0;\r
-  char *asl="";\r
-  char *strop=0;\r
+  const char *asl="";\r
+  const char *strop=0;\r
 \r
   type=(op>>12)&5;\r
   rea =(op>> 9)&7;\r
@@ -534,7 +534,7 @@ int OpAritha(int op)
 {\r
   int use=0;\r
   int type=0,size=0,sea=0,dea=0;\r
-  char *asr="";\r
+  const char *asr="";\r
 \r
   // Suba/Cmpa/Adda/(invalid):\r
   type=(op>>13)&3; if (type>=3) return 1;\r
@@ -591,7 +591,7 @@ int OpAddx(int op)
 {\r
   int use=0;\r
   int type=0,size=0,dea=0,sea=0,mem=0;\r
-  char *asl="";\r
+  const char *asl="";\r
 \r
   type=(op>>14)&1;\r
   dea =(op>> 9)&7;\r
@@ -668,7 +668,7 @@ int OpCmpEor(int op)
 {\r
   int rea=0,eor=0;\r
   int size=0,ea=0,use=0;\r
-  char *asl="";\r
+  const char *asl="";\r
 \r
   // Get EA and register EA\r
   rea=(op>>9)&7;\r
@@ -725,7 +725,7 @@ int OpCmpEor(int op)
 int OpCmpm(int op)\r
 {\r
   int size=0,sea=0,dea=0,use=0;\r
-  char *asl="";\r
+  const char *asl="";\r
 \r
   // get size, get EAs\r
   size=(op>>6)&3; if (size>=3) return 1;\r

diff --git a/cpu/Cyclone/OpBranch.cpp b/cpu/Cyclone/OpBranch.cpp
index ce5ae70..061fe01 100644 (file)
--- a/cpu/Cyclone/OpBranch.cpp
+++ b/cpu/Cyclone/OpBranch.cpp
@@ -288,7 +288,7 @@ int OpJsr(int op)
 // --------------------- Opcodes 0x50c8+ ---------------------\r
 \r
 // ARM version of 68000 condition codes:\r
-static char *Cond[16]=\r
+static const char * const Cond[16]=\r
 {\r
   "",  "",  "hi","ls","cc","cs","ne","eq",\r
   "vc","vs","pl","mi","ge","lt","gt","le"\r
@@ -402,7 +402,7 @@ int OpBranch(int op)
   int size=0,use=0,checkpc=0;\r
   int offset=0;\r
   int cc=0;\r
-  char *asr_r11="";\r
+  const char *asr_r11="";\r
 \r
   offset=(char)(op&0xff);\r
   cc=(op>>8)&15;\r

diff --git a/cpu/Cyclone/OpLogic.cpp b/cpu/Cyclone/OpLogic.cpp
index 912d94b..b3e14a9 100644 (file)
--- a/cpu/Cyclone/OpLogic.cpp
+++ b/cpu/Cyclone/OpLogic.cpp
@@ -301,7 +301,7 @@ int OpSet(int op)
 {\r
   int cc=0,ea=0;\r
   int size=0,use=0,changed_cycles=0;\r
-  char *cond[16]=\r
+  static const char * const cond[16]=\r
   {\r
     "al","", "hi","ls","cc","cs","ne","eq",\r
     "vc","vs","pl","mi","ge","lt","gt","le"\r

diff --git a/cpu/Cyclone/app.h b/cpu/Cyclone/app.h
index cb36fd7..5e468c7 100644 (file)
--- a/cpu/Cyclone/app.h
+++ b/cpu/Cyclone/app.h
@@ -33,8 +33,8 @@ int EaAn(int ea);
 // Main.cpp\r
 extern int *CyJump;   // Jump table\r
 extern int  ms;       // If non-zero, output in Microsoft ARMASM format\r
-extern char *Narm[4]; // Normal ARM Extensions for operand sizes 0,1,2\r
-extern char *Sarm[4]; // Sign-extend ARM Extensions for operand sizes 0,1,2\r
+extern const char * const Narm[4]; // Normal ARM Extensions for operand sizes 0,1,2\r
+extern const char * const Sarm[4]; // Sign-extend ARM Extensions for operand sizes 0,1,2\r
 extern int  Cycles;   // Current cycles for opcode\r
 extern int  pc_dirty; // something changed PC during processing\r
 extern int  arm_op_count; // for stats\r