core, add internal pad and mouse data to io save state

Author: irixxxx

pico/memory.c

@@ -618,9 +618,13 @@ int io_ports_pack(void *buf, size_t size)
   for (i = 0; i < ARRAY_SIZE(Pico.m.padDelay); i++)
     save_u8_(buf, &b, Pico.m.padDelay[i]);
   for (i = 0; i < ARRAY_SIZE(padTHLatency); i++) {
-    save_u32(buf, &b, padTHLatency[i]);
-    save_u32(buf, &b, padTLLatency[i]);
+    save_s32(buf, &b, padTHLatency[i]);
+    save_s32(buf, &b, padTLLatency[i]);
   }
+  for (i = 0; i < 4; i++)
+    save_u16(buf, &b, PicoIn.padInt[i]);
+  for (i = 0; i < 4; i++)
+    save_s32(buf, &b, PicoIn.mouseInt[i]);
   assert(b <= size);
   return b;
 }
@@ -634,9 +638,13 @@ void io_ports_unpack(const void *buf, size_t size)
   for (i = 0; i < ARRAY_SIZE(Pico.m.padDelay); i++)
     Pico.m.padDelay[i] = load_u8_(buf, &b);
   for (i = 0; i < ARRAY_SIZE(padTHLatency); i++) {
-    padTHLatency[i] = load_u32(buf, &b);
-    padTLLatency[i] = load_u32(buf, &b);
+    padTHLatency[i] = load_s32(buf, &b);
+    padTLLatency[i] = load_s32(buf, &b);
   }
+  for (i = 0; i < 4; i++)
+    PicoIn.padInt[i] = load_u16(buf, &b);
+  for (i = 0; i < 4; i++)
+    PicoIn.mouseInt[i] = load_s32(buf, &b);
   assert(b <= size);
 }
 

pico/pico.h

@@ -109,9 +109,18 @@ typedef struct PicoInterface
 {
 	unsigned int opt; // POPT_* bitfield
 
-	unsigned short pad[4];     // Joypads, format is MXYZ SACB RLDU
-	unsigned short padInt[4];  // internal copy
-	unsigned short AHW;        // active addon hardware: PAHW_* bitfield
+	unsigned short pad[4];         // Joypads, format is MXYZ SACB RLDU
+	unsigned short padInt[4];      // internal copy
+	unsigned short AHW;            // active addon hardware: PAHW_* bitfield
+
+	unsigned short kbd;            // SC-3000 or Pico Keyboard
+	int mouse[4];                  // x,y mouse coordinates
+	int mouseInt[4];               // internal copy
+
+	unsigned short quirks;         // game-specific quirks: PQUIRK_*
+	unsigned short overclockM68k;  // overclock the emulated 68k, in %
+
+	unsigned short filter;         // softscale filter type
 
 	unsigned short skipFrame;      // skip rendering frame, but still do sound (if enabled) and emulation stuff
 	unsigned short regionOverride; // override the region detection 0: auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
@@ -120,11 +129,6 @@ typedef struct PicoInterface
 	unsigned int mapper;           // mapper selection for SMS, 0 = auto
 	unsigned int tmsPalette;       // palette used by SMS in TMS graphic modes
 
-	unsigned short quirks;         // game-specific quirks: PQUIRK_*
-	unsigned short overclockM68k;  // overclock the emulated 68k, in %
-
-	unsigned short filter;         // softscale filter type
-
 	int sndRate;                   // rate in Hz
 	int sndFilterAlpha;            // Low pass sound filter alpha (Q16)
 	short *sndOut;                 // PCM output buffer
@@ -134,10 +138,6 @@ typedef struct PicoInterface
 
 	void (*mcdTrayOpen)(void);
 	void (*mcdTrayClose)(void);
-
-	int mouse[4];                  // x,y mouse coordinates
-	int mouseInt[4];               // internal copy
-	unsigned int kbd;              // SC-3000 or Pico Keyboard
 } PicoInterface;
 
 extern PicoInterface PicoIn;

pico/state.h

@@ -46,6 +46,14 @@ static inline void save_u32(u8 *buf, size_t *b, u32 u)
 	buf[(*b)++] = u >> 24;
 }
 
+static inline void save_s32(u8 *buf, size_t *b, s32 s)
+{
+	buf[(*b)++] = s;
+	buf[(*b)++] = s >> 8;
+	buf[(*b)++] = s >> 16;
+	buf[(*b)++] = s >> 24;
+}
+
 static inline u8 load_u8_(const u8 *buf, size_t *b)
 {
 	return buf[(*b)++];
@@ -76,3 +84,10 @@ static inline u32 load_u32(const u8 *buf, size_t *b)
 	(*b) += 4;
 	return r;
 }
+
+static inline s32 load_s32(const u8 *buf, size_t *b)
+{
+	s32 r = (buf[*b + 3] << 24) | (buf[*b + 2] << 16) | (buf[*b + 1] << 8) | buf[*b];
+	(*b) += 4;
+	return r;
+}