Merge branch 'dev'

diff --cc pico/32x/sh2soc.c
index 373dd47,04d3374..62423d1
--- 1/pico/32x/sh2soc.c
--- 2/pico/32x/sh2soc.c
+++ b/pico/32x/sh2soc.c
@@@ -294,13 -358,16 +358,16 @@@ void REGPARM(3) sh2_peripheral_write16(
    r[(a / 2) ^ 1] = d;
  }
  
 -void sh2_peripheral_write32(u32 a, u32 d, SH2 *sh2)
 +void REGPARM(3) sh2_peripheral_write32(u32 a, u32 d, SH2 *sh2)
  {
    u32 *r = sh2->peri_regs;
-   elprintf(EL_32XP, "%csh2 peri w32 [%08x] %08x @%06x",
-     sh2->is_slave ? 's' : 'm', a, d, sh2_pc(sh2));
+   u32 old;
+ 
+   elprintf_sh2(sh2, EL_32XP, "peri w32 [%08x] %08x @%06x",
+     a, d, sh2_pc(sh2));
  
    a &= 0x1fc;
+   old = r[a / 4];
    r[a / 4] = d;
  
    switch (a) {

diff --cc pico/pico_int.h
Simple merge

diff --cc platform/common/mp3.c
Simple merge

diff --cc platform/libretro.c
Simple merge