Merge remote-tracking branch 'upstream/master'

Author: ethanaobrien

.github/workflows/ci.yml

@@ -24,6 +24,11 @@ jobs:
         submodules: true
     - name: make
       run: LDFLAGS=-Wl,--no-undefined make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.libretro
+    - name: artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: Libretro-linux
+        path: picodrive_libretro.so
 
   build-win32:
     runs-on: ubuntu-latest

Makefile

@@ -183,7 +183,7 @@ else
 LDFLAGS += -lEGL -lGLESv2 # on raspi GLESv1_CM is included in GLESv2
 endif
 OBJS += platform/linux/emu.o platform/linux/blit.o # FIXME
-OBJS += platform/common/plat_sdl.o platform/common/input_sdlkbd.o
+OBJS += platform/common/plat_sdl.o platform/common/inputmap_kbd.o
 OBJS += platform/libpicofe/plat_sdl.o platform/libpicofe/in_sdl.o
 OBJS += platform/libpicofe/linux/plat.o
 USE_FRONTEND = 1
@@ -298,7 +298,7 @@ ifeq "$(USE_FRONTEND)" "1"
 
 # common
 OBJS += platform/common/main.o platform/common/emu.o platform/common/upscale.o \
-	platform/common/menu_pico.o platform/common/config_file.o
+	platform/common/menu_pico.o platform/common/keyboard.o platform/common/config_file.o
 
 # libpicofe
 OBJS += platform/libpicofe/input.o platform/libpicofe/readpng.o \

Makefile.libretro

@@ -661,7 +661,7 @@ SHARED ?= -shared
 LDFLAGS += $(SHARED) $(fpic)
 
 ifeq ($(ARCH),)
-ARCH = $(shell $(CC) -dumpmachine | awk -F '-' '{print $$1}')
+ARCH = $(shell $(CC) $(CFLAGS) -dumpmachine | awk -F '-' '{print $$1}')
 endif
 PLATFORM = libretro
 NO_CONFIG_MAK = yes

README.md

@@ -29,8 +29,40 @@ Further instructions can be found in `platform/base_readme.txt`.
 PicoDrive can use Storyware pages and pad overlays in png format in the same
 directory as the cartridge image. The selected page is displayed automatically
 if the pen is used on the storyware or pad. Details about how to correctly name
-the pages can be found in the *How to run Sega Pico games* section in
-`platform/base_readme.txt`.
+the pages can be found in `platform/base_readme.txt`.
+
+### Sega Pico Pen and Sega Mouse
+
+On all platforms with physical mouse support, PicoDrive can use real mouse
+input to emulate a Sega Mouse or the Pico Pen. A physical mouse can be operated
+in either a captured or uncaptured state, selectable via the `Capture mouse` hotkey.
+Mouse mode can be activated by setting `mouse` as the input device for one
+of the pads. It depends on the game as to which pad should be used for mouse
+input. More information is located in `platform/base_readme.txt`.
+
+### Sega Pico and SC-3000 Keyboards
+
+PicoDrive provides support for the Pico and SC-3000 keyboards. This can be
+enabled in the `Controls` configuration menu. Once enabled, keyboard input may
+be activated via the `Keyboard` emulator hotkey.
+
+Both physical keyboard support and a virtual keyboard overlay are available.
+Physical keyboards are assigned a default key mapping corresponding to an
+American PC layout, but the mapping can be redefined in the `Controls`
+configuration menu. Note that only 'unmodified' physical key presses (e.g.
+`a`, `1` etc) can be mapped to emulated keyboard input; special characters
+entered via modifier/meta keys (e.g. `Ctrl`, `Shift` etc) will not work.
+Additional information may be found in `platform/base_readme.txt`.
+
+### Sega SC-3000 Cassette Drive
+
+In addition to keyboard support, PicoDrive emulates the SC-3000 cassette tape
+drive which may be used in conjunction with BASIC cartridges. Tape emulation
+includes an automatic start/stop feature, where the tape is only advanced when
+it is accessed by the SC-3000; manual pausing of the tape is unnecessary for
+multi-part loading or saving.
+
+PicoDrive supports tape files in `WAV` and `bitstream` format.
 
 ### Gallery
 

cpu/sh2/compiler.c

@@ -5678,7 +5678,7 @@ static void sh2_smc_rm_blocks(u32 a, int len, int tcache_id, int free)
 
   if (!removed) {
     if (len <= 4)
-      dbg(2, "rm_blocks called @%08x, no work?", _a);
+      dbg(2, "rm_blocks called @%08x, no work?", a);
     return;
   }
 
@@ -5902,6 +5902,9 @@ static void bcache_stats(void)
 
 void sh2_drc_flush_all(void)
 {
+  if (block_tables[0] == NULL)
+    return;
+
   backtrace();
   state_dump();
   block_stats();

pico/32x/32x.c

@@ -120,13 +120,16 @@ void Pico32xStartup(void)
     sh2_init(&ssh2, 1, &msh2);
     ssh2.irq_callback = sh2_irq_cb;
   }
+
   PicoMemSetup32x();
   p32x_pwm_ctl_changed();
   p32x_timers_recalc();
 
+  Pico32x.regs[0] |= P32XS_ADEN;
+
   Pico32x.sh2_regs[0] = P32XS2_ADEN;
   if (Pico.m.ncart_in)
-    Pico32x.sh2_regs[0] |= P32XS_nCART;
+    Pico32x.sh2_regs[0] |= P32XS2_nCART;
 
   if (!Pico.m.pal)
     Pico32x.vdp_regs[0] |= P32XV_nPAL;
@@ -141,7 +144,9 @@ void Pico32xStartup(void)
 
 void Pico32xShutdown(void)
 {
+  elprintf(EL_STATUS|EL_32X, "32X shutdown");
   Pico32x.sh2_regs[0] &= ~P32XS2_ADEN;
+  Pico32x.regs[0] &= ~P32XS_ADEN;
 
   rendstatus_old = -1;
 
@@ -243,34 +248,71 @@ void PicoReset32x(void)
   }
 }
 
-static void p32x_render_frame(void)
+static void Pico32xRenderSync(int lines)
 {
   if (Pico32xDrawMode != PDM32X_OFF && !PicoIn.skipFrame) {
-    int offs, lines;
+    int offs;
 
     pprof_start(draw);
 
-    offs = 8; lines = 224;
-    if (Pico.video.reg[1] & 8) {
+    offs = 8;
+    if (Pico.video.reg[1] & 8)
       offs = 0;
-      lines = 240;
-    }
 
     if ((Pico32x.vdp_regs[0] & P32XV_Mx) != 0 && // 32x not blanking
         (!(Pico.video.debug_p & PVD_KILL_32X)))
     {
       int md_bg = Pico.video.reg[7] & 0x3f;
 
-      // we draw full layer (not line-by-line)
-      PicoDraw32xLayer(offs, lines, md_bg);
+      // we draw lines up to the sync point (not line-by-line)
+      PicoDraw32xLayer(offs, lines-Pico32x.sync_line, md_bg);
     }
     else if (Pico32xDrawMode == PDM32X_BOTH)
-      PicoDraw32xLayerMdOnly(offs, lines);
+      PicoDraw32xLayerMdOnly(offs, lines-Pico32x.sync_line);
 
     pprof_end(draw);
   }
 }
 
+void Pico32xDrawSync(SH2 *sh2)
+{
+  // the fast renderer isn't operating on a line-by-line base
+  if (sh2 && !(PicoIn.opt & POPT_ALT_RENDERER)) {
+    unsigned int cycle = (sh2 ? sh2_cycles_done_m68k(sh2) : SekCyclesDone());
+    int line = ((cycle - Pico.t.m68c_frame_start) * (long long)((1LL<<32)/488.5)) >> 32;
+
+    if (Pico32x.sync_line < line && line < (Pico.video.reg[1] & 8 ? 240 : 224)) {
+      // make sure the MD image is also sync'ed to this line for merging
+      PicoDrawSync(line, 0, 0);
+
+      // pfff... need to save and restore some persistent data for MD renderer
+      void *dest = Pico.est.DrawLineDest;
+      int incr = Pico.est.DrawLineDestIncr;
+      Pico32xRenderSync(line);
+      Pico.est.DrawLineDest = dest;
+      Pico.est.DrawLineDestIncr = incr;
+    }
+
+    // remember line we sync'ed to
+    Pico32x.sync_line = line;
+  }
+}
+
+static void p32x_render_frame(void)
+{
+  if (Pico32xDrawMode != PDM32X_OFF && !PicoIn.skipFrame) {
+    int lines;
+
+    pprof_start(draw);
+
+    lines = 224;
+    if (Pico.video.reg[1] & 8)
+      lines = 240;
+
+    Pico32xRenderSync(lines);
+  }
+}
+
 static void p32x_start_blank(void)
 {
   // enter vblank
@@ -616,6 +658,7 @@ void PicoFrame32x(void)
     pcd_prepare_frame();
 
   PicoFrameStart();
+  Pico32x.sync_line = 0;
   if (Pico32xDrawMode != PDM32X_BOTH)
     Pico.est.rendstatus |= PDRAW_SYNC_NEEDED;
   PicoFrameHints();
@@ -654,14 +697,20 @@ void Pico32xStateLoaded(int is_early)
   p32x_timers_recalc();
   p32x_pwm_state_loaded();
   p32x_run_events(SekCyclesDone());
+
+  // TODO wakeup CPUs for now. poll detection stuff must go to the save state!
+  p32x_m68k_poll_event(0, -1);
+  p32x_sh2_poll_event(msh2.poll_addr, &msh2, SH2_IDLE_STATES, msh2.m68krcycles_done);
+  p32x_sh2_poll_event(ssh2.poll_addr, &ssh2, SH2_IDLE_STATES, ssh2.m68krcycles_done);
 }
 
 void Pico32xPrepare(void)
 {
+  // fallback in case it was missing in saved config
   if (msh2.mult_m68k_to_sh2 == 0 || msh2.mult_sh2_to_m68k == 0)
     Pico32xSetClocks(PICO_MSH2_HZ, 0);
   if (ssh2.mult_m68k_to_sh2 == 0 || ssh2.mult_sh2_to_m68k == 0)
-    Pico32xSetClocks(0, PICO_MSH2_HZ);
+    Pico32xSetClocks(0, PICO_SSH2_HZ);
 
   sh2_execute_prepare(&msh2, PicoIn.opt & POPT_EN_DRC);
   sh2_execute_prepare(&ssh2, PicoIn.opt & POPT_EN_DRC);