some fixes for some configurations

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

diff --git a/cpu/Cyclone/Main.cpp b/cpu/Cyclone/Main.cpp
index 1d0318c..e4f7107 100644 (file)
--- a/cpu/Cyclone/Main.cpp
+++ b/cpu/Cyclone/Main.cpp
@@ -32,7 +32,7 @@ void ltorg()
   else    ot("  .ltorg\n");\r
 }\r
 \r
-#if CYCLONE_FOR_GENESIS\r
+#if (CYCLONE_FOR_GENESIS == 2)\r
 // r12=ptr to tas in table, trashes r0,r1\r
 static void ChangeTAS(int norm)\r
 {\r
@@ -186,7 +186,7 @@ static void PrintFramework()
   ot("CycloneEnd%s\n", ms?"":":");\r
   ot("  sub r4,r4,#2\n");\r
   ot("CycloneEndNoBack%s\n", ms?"":":");\r
-#ifdef CYCLONE_FOR_PICODRIVE\r
+#if (CYCLONE_FOR_GENESIS == 2)\r
   ot("  ldr r1,[r7,#0x54]\n");\r
   ot("  mov r9,r9,lsr #28\n");\r
   ot("  tst r1,r1\n");\r
@@ -306,7 +306,7 @@ static void PrintFramework()
 \r
   if (ms) ot("CycloneSetRealTAS\n");\r
   else    ot("CycloneSetRealTAS:\n");\r
-#if CYCLONE_FOR_GENESIS\r
+#if (CYCLONE_FOR_GENESIS == 2)\r
   ot("  ldr r12,=CycloneJumpTab\n");\r
   ot("  tst r0,r0\n");\r
   ot("  add r12,r12,#0x4a00*4\n");\r
@@ -691,7 +691,7 @@ static int CycloneMake()
     ot("  .global CycloneGetSr\n");\r
     ot("  .global CycloneSetRealTAS\n");\r
     ot("  .global CycloneVer\n");\r
-#ifdef CYCLONE_FOR_PICODRIVE\r
+#if (CYCLONE_FOR_GENESIS == 2)\r
     ot("  .global CycloneDoInterrupt\n");\r
     ot("  .global CycloneJumpTab\n");\r
 #endif\r

diff --git a/cpu/Cyclone/OpLogic.cpp b/cpu/Cyclone/OpLogic.cpp
index 2a0c819..b6eb075 100644 (file)
--- a/cpu/Cyclone/OpLogic.cpp
+++ b/cpu/Cyclone/OpLogic.cpp
@@ -148,7 +148,7 @@ int OpNeg(int op)
   OpStart(op,ea);   Cycles=size<2?4:6;\r
   if(ea >= 0x10) {\r
     Cycles*=2;\r
-#ifdef CYCLONE_FOR_GENESIS\r
+#if CYCLONE_FOR_GENESIS\r
     // This is same as in Starscream core, CLR uses only 6 cycles for memory EAs.\r
     // May be this is similar case as with TAS opcode, but this time the dummy\r
     // read is ignored somehow? Without this hack Fatal Rewind hangs even in Gens.\r
@@ -672,7 +672,7 @@ int OpTas(int op, int gen_special)
 \r
   OpEnd();\r
 \r
-#if CYCLONE_FOR_GENESIS\r
+#if (CYCLONE_FOR_GENESIS == 2)\r
   if (!gen_special && ea >= 0x10) {\r
     OpTas(op, 1);\r
   }\r

diff --git a/cpu/Cyclone/config.h b/cpu/Cyclone/config.h
index ded00b1..a7f6a75 100644 (file)
--- a/cpu/Cyclone/config.h
+++ b/cpu/Cyclone/config.h
@@ -18,7 +18,7 @@
  * the write-back phase. That will be emulated, if this option is enabled.\r
  * This option also alters timing slightly.\r
  */\r
-#define CYCLONE_FOR_GENESIS       1\r
+#define CYCLONE_FOR_GENESIS       2\r
 \r
 /*\r
  * This option compresses Cyclone's jumptable. Because of this the executable\r
@@ -35,7 +35,7 @@
  * Using 0xff000000 means that only 24 least significant bits should be used.\r
  * Set to 0 if you want to mask unused address bits in the memory handlers yourself.\r
  */\r
-#define MEMHANDLERS_ADDR_MASK     0xff000000\r
+#define MEMHANDLERS_ADDR_MASK     0\r
 \r
 /*\r
  * Cyclone keeps the 4 least significant bits of SR, PC+membase and it's cycle\r

diff --git a/cpu/Cyclone/proj/Makefile.linux b/cpu/Cyclone/proj/Makefile
similarity index 95%
rename from cpu/Cyclone/proj/Makefile.linux
rename to cpu/Cyclone/proj/Makefile
index 159bb66..e9da743 100644 (file)
--- a/cpu/Cyclone/proj/Makefile.linux
+++ b/cpu/Cyclone/proj/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -Wall -DCYCLONE_FOR_PICODRIVE
+CFLAGS = -Wall
 
 all : cyclone.s