psp bugfixes, refactoring, stuff

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

diff --git a/Pico/Debug.c b/Pico/Debug.c
index 6962a6a..1c22122 100644 (file)
--- a/Pico/Debug.c
+++ b/Pico/Debug.c
@@ -137,8 +137,8 @@ int CM_compareRun(int cyc)
 \r
     // compare PC\r
     m68ki_cpu.pc&=~1;\r
-    if ( SekPc != (m68ki_cpu.pc&0xffffff) ) {\r
-      dprintf("PC: %06x vs %06x", SekPc, m68ki_cpu.pc&0xffffff);\r
+    if (SekPc != m68ki_cpu.pc) {\r
+      dprintf("PC: %06x vs %06x", SekPc, m68ki_cpu.pc);\r
       err=1;\r
     }\r
 \r

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 38c8233..4d6f940 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -137,7 +137,7 @@ int PicoReset(int hard)
   Pico.m.pal=pal;\r
   Pico.video.status = 0x3408 | pal; // always set bits | vblank | pal\r
 \r
-  sound_reset(); // pal must be known here\r
+  PsndReset(); // pal must be known here\r
 \r
   if (PicoMCD & 1) {\r
     PicoResetMCD(hard);\r
@@ -255,17 +255,17 @@ static __inline void getSamples(int y)
 \r
   if(y == 224) {\r
     if(emustatus & 2)\r
-         curr_pos += sound_render(curr_pos, PsndLen-PsndLen/2);\r
-    else curr_pos  = sound_render(0, PsndLen);\r
+         curr_pos += PsndRender(curr_pos, PsndLen-PsndLen/2);\r
+    else curr_pos  = PsndRender(0, PsndLen);\r
     if (emustatus&1) emustatus|=2; else emustatus&=~2;\r
     if (PicoWriteSound) PicoWriteSound(curr_pos);\r
     // clear sound buffer\r
-    sound_clear();\r
+    PsndClear();\r
   }\r
   else if(emustatus & 3) {\r
     emustatus|= 2;\r
     emustatus&=~1;\r
-    curr_pos = sound_render(0, PsndLen/2);\r
+    curr_pos = PsndRender(0, PsndLen/2);\r
   }\r
 }\r
 \r
@@ -293,7 +293,7 @@ static void PicoRunZ80Simple(int line_from, int line_to)
   if (PicoOpt&1) {\r
     // we have ym2612 enabled, so we have to run Z80 in lines, so we could update DAC and timers\r
     for (line = line_from; line < line_to; line++) {\r
-      sound_timers_and_dac(line);\r
+      Psnd_timers_and_dac(line);\r
       if ((line == 224 || line == line_sample) && PsndOut) getSamples(line);\r
       if (line == 32 && PsndOut) emustatus &= ~1;\r
       if (line >= line_from_r && line < line_to_r)\r
@@ -397,10 +397,10 @@ static int PicoFrameSimple(void)
 \r
   // here we render sound if ym2612 is disabled\r
   if (!(PicoOpt&1) && PsndOut) {\r
-    int len = sound_render(0, PsndLen);\r
+    int len = PsndRender(0, PsndLen);\r
     if (PicoWriteSound) PicoWriteSound(len);\r
     // clear sound buffer\r
-    sound_clear();\r
+    PsndClear();\r
   }\r
 \r
   // a gap between flags set and vint\r

diff --git a/Pico/Pico.h b/Pico/Pico.h
index b337f8d..3b7f62b 100644 (file)
--- a/Pico/Pico.h
+++ b/Pico/Pico.h
@@ -130,7 +130,7 @@ extern void (*PicoPrepareCram)();    // prepares PicoCramHigh for renderer to us
 // sound.c\r
 extern int PsndRate,PsndLen;\r
 extern short *PsndOut;\r
-void sound_rerate(int preserve_state);\r
+void PsndRerate(int preserve_state);\r
 \r
 // Utils.c\r
 extern int PicuAnd;\r

diff --git a/Pico/PicoFrameHints.c b/Pico/PicoFrameHints.c
index 91959d8..b5cef7d 100644 (file)
--- a/Pico/PicoFrameHints.c
+++ b/Pico/PicoFrameHints.c
@@ -130,7 +130,7 @@ static int PicoFrameHints(void)
       PicoLine(y);
 
     if(PicoOpt&1)
-      sound_timers_and_dac(y);
+      Psnd_timers_and_dac(y);
 
 #ifndef PICO_CD
     // get samples from sound chips
@@ -192,7 +192,7 @@ static int PicoFrameHints(void)
     z80_int();
 
   if (PicoOpt&1)
-    sound_timers_and_dac(y);
+    Psnd_timers_and_dac(y);
 
   // get samples from sound chips
 #ifndef PICO_CD
@@ -223,7 +223,7 @@ static int PicoFrameHints(void)
 #endif
 
     if(PicoOpt&1)
-      sound_timers_and_dac(y);
+      Psnd_timers_and_dac(y);
 
     // Run scanline:
     if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index c086d7a..9aead10 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -392,10 +392,10 @@ PICO_INTERNAL_ASM void wram_1M_to_2M(unsigned char *m);
 PICO_INTERNAL void PicoCDBufferRead(void *dest, int lba);\r
 \r
 // sound/sound.c\r
-PICO_INTERNAL void sound_reset(void);\r
-PICO_INTERNAL void sound_timers_and_dac(int raster);\r
-PICO_INTERNAL int  sound_render(int offset, int length);\r
-PICO_INTERNAL void sound_clear(void);\r
+PICO_INTERNAL void PsndReset(void);\r
+PICO_INTERNAL void Psnd_timers_and_dac(int raster);\r
+PICO_INTERNAL int  PsndRender(int offset, int length);\r
+PICO_INTERNAL void PsndClear(void);\r
 // z80 functionality wrappers\r
 PICO_INTERNAL void z80_init(void);\r
 PICO_INTERNAL void z80_resetCycles(void);\r

diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c
index 1ffd44b..def0a41 100644 (file)
--- a/Pico/cd/Pico.c
+++ b/Pico/cd/Pico.c
@@ -235,10 +235,10 @@ static __inline void update_chips(void)
 
 static __inline void getSamples(int y)
 {
-  int len = sound_render(0, PsndLen);
+  int len = PsndRender(0, PsndLen);
   if (PicoWriteSound) PicoWriteSound(len);
   // clear sound buffer
-  sound_clear();
+  PsndClear();
 }
 
 

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index 9950084..5f9836b 100644 (file)
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -101,7 +101,7 @@ static void dac_recalculate(void)
 }\r
 \r
 \r
-PICO_INTERNAL void sound_reset(void)\r
+PICO_INTERNAL void PsndReset(void)\r
 {\r
   void *ym2612_regs;\r
 \r
@@ -110,12 +110,12 @@ PICO_INTERNAL void sound_reset(void)
   memset(ym2612_regs, 0, 0x200+4);\r
   z80startCycle = z80stopCycle = 0;\r
 \r
-  sound_rerate(0);\r
+  PsndRerate(0);\r
 }\r
 \r
 \r
 // to be called after changing sound rate or chips\r
-void sound_rerate(int preserve_state)\r
+void PsndRerate(int preserve_state)\r
 {\r
   void *state = NULL;\r
   int target_fps = Pico.m.pal ? 50 : 60;\r
@@ -163,12 +163,12 @@ void sound_rerate(int preserve_state)
   // clear all buffers\r
   memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4);\r
   if (PsndOut)\r
-    sound_clear();\r
+    PsndClear();\r
 }\r
 \r
 \r
 // This is called once per raster (aka line), but not necessarily for every line\r
-PICO_INTERNAL void sound_timers_and_dac(int raster)\r
+PICO_INTERNAL void Psnd_timers_and_dac(int raster)\r
 {\r
   int pos, len;\r
   int do_dac = PsndOut && (PicoOpt&1) && *ym2612_dacen;\r
@@ -216,7 +216,7 @@ PICO_INTERNAL void sound_timers_and_dac(int raster)
 }\r
 \r
 \r
-PICO_INTERNAL void sound_clear(void)\r
+PICO_INTERNAL void PsndClear(void)\r
 {\r
   int len = PsndLen;\r
   if (PsndLen_exc_add) len++;\r
@@ -225,7 +225,7 @@ PICO_INTERNAL void sound_clear(void)
 }\r
 \r
 \r
-PICO_INTERNAL int sound_render(int offset, int length)\r
+PICO_INTERNAL int PsndRender(int offset, int length)\r
 {\r
   int  buf32_updated = 0;\r
   int *buf32 = PsndBuffer+offset;\r
@@ -316,23 +316,26 @@ static unsigned int DrZ80_rebaseSP(unsigned short a)
   return drZ80.Z80SP_BASE + a;\r
 }\r
 \r
-static unsigned char DrZ80_in(unsigned short p)\r
+static void DrZ80_irq_callback()\r
 {\r
-  elprintf(EL_ANOMALY, "Z80 port %04x read", p);\r
-  return 0xff;\r
+  drZ80.Z80_IRQ = 0; // lower irq when accepted\r
 }\r
+#endif\r
 \r
-static void DrZ80_out(unsigned short p,unsigned char d)\r
+#if defined(_USE_DRZ80) || defined(_USE_CZ80)\r
+static unsigned char z80_in(unsigned short p)\r
 {\r
-  elprintf(EL_ANOMALY, "Z80 port %04x write %02x", p, d);\r
+  elprintf(EL_ANOMALY, "Z80 port %04x read", p);\r
+  return 0xff;\r
 }\r
 \r
-static void DrZ80_irq_callback()\r
+static void z80_out(unsigned short p,unsigned char d)\r
 {\r
-  drZ80.Z80_IRQ = 0; // lower irq when accepted\r
+  elprintf(EL_ANOMALY, "Z80 port %04x write %02x", p, d);\r
 }\r
 #endif\r
 \r
+\r
 // z80 functionality wrappers\r
 PICO_INTERNAL void z80_init(void)\r
 {\r
@@ -361,8 +364,8 @@ PICO_INTERNAL void z80_init(void)
   drZ80.z80_read16  =z80_read16;\r
   drZ80.z80_write8  =z80_write;\r
   drZ80.z80_write16 =z80_write16;\r
-  drZ80.z80_in      =DrZ80_in;\r
-  drZ80.z80_out     =DrZ80_out;\r
+  drZ80.z80_in      =z80_in;\r
+  drZ80.z80_out     =z80_out;\r
   drZ80.z80_irq_callback=DrZ80_irq_callback;\r
 \r
 #elif defined(_USE_CZ80)\r
@@ -372,6 +375,8 @@ PICO_INTERNAL void z80_init(void)
   Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (UINT32)Pico.zram - 0x2000); // mirror\r
   Cz80_Set_ReadB(&CZ80, (UINT8 (*)(UINT32 address))z80_read);\r
   Cz80_Set_WriteB(&CZ80, z80_write);\r
+  Cz80_Set_INPort(&CZ80, z80_in);\r
+  Cz80_Set_OUTPort(&CZ80, z80_out);\r
 #endif\r
 }\r
 \r

diff --git a/cpu/fame/famec.c b/cpu/fame/famec.c
index 3dcb8b1..76965fa 100644 (file)
--- a/cpu/fame/famec.c
+++ b/cpu/fame/famec.c
@@ -26,6 +26,7 @@
 #define FAMEC_ADR_BITS  24\r
 // #define FAMEC_FETCHBITS 8\r
 #define FAMEC_DATABITS  8\r
+#define FAMEC_32BIT_PC\r
 \r
 #define USE_CYCLONE_TIMING\r
 #define USE_CYCLONE_TIMING_DIV\r
@@ -289,15 +290,22 @@ static u32 flag_I;
 #define GET_PC                  \\r
        (u32)PC - BasePC;\r
 \r
+\r
+#ifndef FAMEC_32BIT_PC\r
+\r
 #define SET_PC(A)               \\r
     BasePC = g_m68kcontext->Fetch[((A) >> M68K_FETCHSFT) & M68K_FETCHMASK];    \\r
    /*  BasePC -= (A) & 0xFF000000; */   \\r
     PC = (u16*)(((A) & M68K_ADR_MASK) + BasePC);\r
 \r
-#define SET_PC_BASE(P,B,A)               \\r
-    (B) = g_m68kcontext->Fetch[((A) >> M68K_FETCHSFT) & M68K_FETCHMASK];    \\r
-   /* (B) -= (A) & 0xFF000000; */ \\r
-    (P) = (u16*)(((A) & M68K_ADR_MASK) + (B));\r
+#else\r
+\r
+#define SET_PC(A)               \\r
+    BasePC = g_m68kcontext->Fetch[((A) >> M68K_FETCHSFT) & M68K_FETCHMASK];    \\r
+    BasePC -= (A) & 0xFF000000;    \\r
+    PC = (u16*)((A) + BasePC);\r
+\r
+#endif\r
 \r
 \r
 #define PRE_IO                  \\r
@@ -717,7 +725,10 @@ static FAMEC_EXTRA_INLINE void execute_exception(s32 vect)
                /* adjust SR */\r
                flag_S = M68K_SR_S;\r
 \r
-               newPC&=M68K_ADR_MASK&~1; // don't crash on games with bad vector tables\r
+#ifndef FAMEC_32BIT_PC\r
+               newPC&=M68K_ADR_MASK\r
+#endif\r
+               newPC&=~1; // don't crash on games with bad vector tables\r
 \r
                SET_PC(newPC)\r
 \r

diff --git a/cpu/fame/famec_opcodes.h b/cpu/fame/famec_opcodes.h
index 759c00f..eeb3c2b 100644 (file)
--- a/cpu/fame/famec_opcodes.h
+++ b/cpu/fame/famec_opcodes.h
@@ -30046,7 +30046,11 @@ OPCODE(0x90D0)
        res = dst - src;
        AREG((Opcode >> 9) & 7) = res;
        POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(12)
+#else
 RET(10)
+#endif
 }
 
 // SUBA
@@ -30063,7 +30067,11 @@ OPCODE(0x90D8)
        res = dst - src;
        AREG((Opcode >> 9) & 7) = res;
        POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(12)
+#else
 RET(10)
+#endif
 }
 
 // SUBA
@@ -30080,7 +30088,11 @@ OPCODE(0x90E0)
        res = dst - src;
        AREG((Opcode >> 9) & 7) = res;
        POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(14)
+#else
 RET(12)
+#endif
 }
 
 // SUBA
@@ -30097,7 +30109,11 @@ OPCODE(0x90E8)
        res = dst - src;
        AREG((Opcode >> 9) & 7) = res;
        POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(16)
+#else
 RET(14)
+#endif
 }
 
 // SUBA
@@ -30114,7 +30130,11 @@ OPCODE(0x90F0)
        res = dst - src;
        AREG((Opcode >> 9) & 7) = res;
        POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(18)
+#else
 RET(16)
+#endif
 }
 
 // SUBA
@@ -30130,7 +30150,11 @@ OPCODE(0x90F8)
        res = dst - src;
        AREG((Opcode >> 9) & 7) = res;
        POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(16)
+#else
 RET(14)
+#endif
 }
 
 // SUBA
@@ -30146,7 +30170,11 @@ OPCODE(0x90F9)
        res = dst - src;
        AREG((Opcode >> 9) & 7) = res;
        POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(20)
+#else
 RET(18)
+#endif
 }
 
 // SUBA
@@ -30163,7 +30191,11 @@ OPCODE(0x90FA)
        res = dst - src;
        AREG((Opcode >> 9) & 7) = res;
        POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(16)
+#else
 RET(14)
+#endif
 }
 
 // SUBA
@@ -30180,7 +30212,11 @@ OPCODE(0x90FB)
        res = dst - src;
        AREG((Opcode >> 9) & 7) = res;
        POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(18)
+#else
 RET(16)
+#endif
 }
 
 // SUBA
@@ -30210,7 +30246,11 @@ OPCODE(0x90DF)
        res = dst - src;
        AREG((Opcode >> 9) & 7) = res;
        POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(12)
+#else
 RET(10)
+#endif
 }
 
 // SUBA
@@ -30227,7 +30267,11 @@ OPCODE(0x90E7)
        res = dst - src;
        AREG((Opcode >> 9) & 7) = res;
        POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(14)
+#else
 RET(12)
+#endif
 }
 
 // SUBA

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index cf9a13e..73c01dc 100644 (file)
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -593,7 +593,7 @@ void emu_Loop(void)
        {
                int ret, snd_excess_add, stereo;
                if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
-                       sound_rerate(Pico.m.frame_count ? 1 : 0);
+                       PsndRerate(Pico.m.frame_count ? 1 : 0);
                }
                stereo=(PicoOpt&8)>>3;
                snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 954d26f..41187c5 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -682,7 +682,7 @@ void emu_Loop(void)
                                Reset940(1, 2);\r
                                Pause940(1);\r
                        }\r
-                       sound_rerate(Pico.m.frame_count ? 1 : 0);\r
+                       PsndRerate(Pico.m.frame_count ? 1 : 0);\r
                }\r
                snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r
                printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",\r

diff --git a/platform/psp/data/bg32.bin b/platform/psp/data/bg32.bin
index e887b12..42f4473 100644 (file)
Binary files a/platform/psp/data/bg32.bin and b/platform/psp/data/bg32.bin differ

diff --git a/platform/psp/data/bg40.bin b/platform/psp/data/bg40.bin
index 73fe666..b54a557 100644 (file)
Binary files a/platform/psp/data/bg40.bin and b/platform/psp/data/bg40.bin differ

diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index 0ecbcc6..0db88ca 100644 (file)
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -142,6 +142,7 @@ void emu_setDefaultConfig(void)
        currentConfig.KeyBinds[13] = 1<<5;
        currentConfig.KeyBinds[15] = 1<<6;
        currentConfig.KeyBinds[ 3] = 1<<7;
+       currentConfig.KeyBinds[12] = 1<<26; // switch rnd
        currentConfig.KeyBinds[ 8] = 1<<27; // save state
        currentConfig.KeyBinds[ 9] = 1<<28; // load state
        currentConfig.PicoCDBuffers = 0;
@@ -538,7 +539,7 @@ static void sound_prepare(void)
        samples_made = samples_done = 0;
 
        if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
-               sound_rerate(Pico.m.frame_count ? 1 : 0);
+               PsndRerate(Pico.m.frame_count ? 1 : 0);
        }
        stereo=(PicoOpt&8)>>3;