some fixes for some configurations

[picodrive.git] / cpu / Cyclone / Main.cpp

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