UIQ3 bugfixes, SVP drc indirect jumps, stuff

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 290dba4..8975fa2 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -76,8 +76,9 @@ PICO_INTERNAL u32 PicoCheckPc(u32 pc)
   pc&=~1;\r
   if ((pc<<8) == 0)\r
   {\r
-    printf("%i:%03i: game crash detected @ %06x\n", Pico.m.frame_count, Pico.m.scanline, SekPc);\r
-    return (int)Pico.rom + Pico.romsize; // common crash condition, can happen if acc timing is off\r
+    elprintf(EL_STATUS|EL_ANOMALY, "%i:%03i: game crash detected @ %06x\n",\r
+      Pico.m.frame_count, Pico.m.scanline, SekPc);\r
+    return (int)Pico.rom + Pico.romsize; // common crash condition, may happen with bad ROMs\r
   }\r
 \r
   PicoCpuCM68k.membase=PicoMemBase(pc&0x00ffffff);\r
@@ -105,7 +106,7 @@ PICO_INTERNAL_ASM void PicoMemReset(void)
 int PadRead(int i)\r
 {\r
   int pad,value,data_reg;\r
-  pad=~PicoPad[i]; // Get inverse of pad MXYZ SACB RLDU\r
+  pad=~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU\r
   data_reg=Pico.ioports[i+1];\r
 \r
   // orr the bits, which are set as output\r
@@ -345,7 +346,7 @@ PICO_INTERNAL_ASM u32 PicoRead8(u32 a)
   if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram\r
 \r
   if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead8(a); goto end; } // VDP\r
-  \r
+\r
   d=OtherRead16(a&~1, 8);\r
   if ((a&1)==0) d>>=8;\r
 \r
@@ -465,7 +466,7 @@ void PicoWrite16(u32 a,u16 d)
 \r
 static void PicoWrite32(u32 a,u32 d)\r
 {\r
-  elprintf(EL_IO, "w32: %06x, %08x", a&0xffffff, d);\r
+  elprintf(EL_IO, "w32: %06x, %08x @%06x", a&0xffffff, d, SekPc);\r
 #ifdef EMU_CORE_DEBUG\r
   lastwrite_cyc_d[lwp_cyc++&15] = d;\r
 #endif\r
@@ -700,7 +701,7 @@ static int get_scanline(int is_from_z80)
   return Pico.m.scanline;\r
 }\r
 \r
-/* probably not should be in this file, but it's near related code here */\r
+/* probably should not be in this file, but it's near related code here */\r
 void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new)\r
 {\r
   int xcycles = z80_cycles << 8;\r
@@ -719,12 +720,10 @@ void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new)
 \r
   if ((mode_old ^ mode_new) & 1) // turning on/off\r
   {\r
-    if (mode_old & 1) {\r
-      timer_a_offset = timer_a_next_oflow - xcycles;\r
+    if (mode_old & 1)\r
       timer_a_next_oflow = TIMER_NO_OFLOW;\r
-    }\r
     else\r
-      timer_a_next_oflow = xcycles + timer_a_offset;\r
+      timer_a_next_oflow = xcycles + timer_a_step;\r
   }\r
   if (mode_new & 1)\r
     elprintf(EL_YMTIMER, "timer a upd to %i @ %i", timer_a_next_oflow>>8, z80_cycles);\r
@@ -736,12 +735,10 @@ void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new)
 \r
   if ((mode_old ^ mode_new) & 2)\r
   {\r
-    if (mode_old & 2) {\r
-      timer_b_offset = timer_b_next_oflow - xcycles;\r
+    if (mode_old & 2)\r
       timer_b_next_oflow = TIMER_NO_OFLOW;\r
-    }\r
     else\r
-      timer_b_next_oflow = xcycles + timer_b_offset;\r
+      timer_b_next_oflow = xcycles + timer_b_step;\r
   }\r
   if (mode_new & 2)\r
     elprintf(EL_YMTIMER, "timer b upd to %i @ %i", timer_b_next_oflow>>8, z80_cycles);\r
@@ -792,8 +789,9 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80)
             ym2612.OPN.ST.TA = TAnew;\r
             //ym2612.OPN.ST.TAC = (1024-TAnew)*18;\r
             //ym2612.OPN.ST.TAT = 0;\r
-            timer_a_step = timer_a_offset = TIMER_A_TICK_ZCYCLES * (1024 - TAnew);\r
+            timer_a_step = TIMER_A_TICK_ZCYCLES * (1024 - TAnew);\r
             if (ym2612.OPN.ST.mode & 1) {\r
+              // this is not right, should really be done on overflow only\r
               int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
               timer_a_next_oflow = (cycles << 8) + timer_a_step;\r
             }\r
@@ -807,7 +805,7 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80)
             ym2612.OPN.ST.TB = d;\r
             //ym2612.OPN.ST.TBC = (256-d) * 288;\r
             //ym2612.OPN.ST.TBT  = 0;\r
-            timer_b_step = timer_b_offset = TIMER_B_TICK_ZCYCLES * (256 - d); // 262800\r
+            timer_b_step = TIMER_B_TICK_ZCYCLES * (256 - d); // 262800\r
             if (ym2612.OPN.ST.mode & 2) {\r
               int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
               timer_b_next_oflow = (cycles << 8) + timer_b_step;\r
@@ -966,11 +964,11 @@ void ym2612_unpack_state(void)
   tac = (1024 - ym2612.OPN.ST.TA) << 16;\r
   tbc = (256  - ym2612.OPN.ST.TB) << 16;\r
   if (ym2612.OPN.ST.mode & 1)\r
-    timer_a_next_oflow = (double)(tac - tat) / (double)tac * timer_a_step;\r
+    timer_a_next_oflow = (int)((double)(tac - tat) / (double)tac * timer_a_step);\r
   else\r
     timer_a_next_oflow = TIMER_NO_OFLOW;\r
   if (ym2612.OPN.ST.mode & 2)\r
-    timer_b_next_oflow = (double)(tbc - tbt) / (double)tbc * timer_b_step;\r
+    timer_b_next_oflow = (int)((double)(tbc - tbt) / (double)tbc * timer_b_step);\r
   else\r
     timer_b_next_oflow = TIMER_NO_OFLOW;\r
   elprintf(EL_YMTIMER, "load: %i/%i, timer_a_next_oflow %i", tat>>16, tac>>16, timer_a_next_oflow >> 8);\r
@@ -986,8 +984,7 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
 \r
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)\r
   {\r
-    if (PicoOpt&POPT_EN_FM) ret = ym2612_read_local_z80();\r
-    return ret;\r
+    return ym2612_read_local_z80();\r
   }\r
 \r
   if (a>=0x8000)\r