Add support for two gamepads

Author: snesrev

smw.ini

@@ -66,6 +66,9 @@ Controls = Up, Down, Left, Right, Right Shift, Return, x, z, s, a, c, v
 # This one is suitable for AZERTY keyboards.
 #Controls = Up, Down, Left, Right, Right Shift, Return, x, w, s, q, c, v
 
+# For player 2
+#ControlsP2 = Shift+Up, Shift+Down, Shift+Left, Shift+Right, Shift+Right Shift, Shift+Return, Shift+x, Shift+z, Shift+s, Shift+a, Shift+c, Shift+v
+
 CheatLife = w
 CheatJump = Ctrl+q
 ClearKeyLog = k
@@ -90,7 +93,14 @@ LoadRef = 1,2,3,4,5,6,7,8,9,0,-,=,Backspace
 ReplayRef = Ctrl+1,Ctrl+2,Ctrl+3,Ctrl+4,Ctrl+5,Ctrl+6,Ctrl+7,Ctrl+8,Ctrl+9,Ctrl+0,Ctrl+-,Ctrl+=,Ctrl+Backspace
 
 [GamepadMap]
+# Whether the gamepads will be enabled. The game will not use them unless they're on.
+EnableGamepad1 = true
+EnableGamepad2 = true
+
 # Any keys used in KeyMap can be used also in this section.
+
 # The shoulder button is called L1/Lb and L2, and the thumbstick button is called L3
-Controls = DpadUp, DpadDown, DpadLeft, DpadRight, Back, Start, B, A, Y, X, Lb, Rb
+Controls =   DpadUp, DpadDown, DpadLeft, DpadRight, Back, Start, B, A, Y, X, Lb, Rb
 
+# For player 2.
+ControlsP2 = DpadUp, DpadDown, DpadLeft, DpadRight, Back, Start, B, A, Y, X, Lb, Rb

src/common_cpu_infra.c

@@ -32,7 +32,6 @@ static uint8 kPatchedCarrysOrg[1024];
 static void VerifySnapshotsEq(Snapshot *b, Snapshot *a, Snapshot *prev);
 static void MakeSnapshot(Snapshot *s);
 static void RestoreSnapshot(Snapshot *s);
-static void RtlRunFrameCompare(uint16 input, int run_what);
 
 uint8_t *SnesRomPtr(uint32 v) {
   return (uint8 *)RomPtr(v);
@@ -252,8 +251,6 @@ Snes *SnesInit(const uint8 *data, int data_size) {
   g_dma = g_snes->dma;
   g_use_my_apu_code = (g_runmode != RM_THEIRS);
 
-  RtlSetupEmuCallbacks(NULL, &RtlRunFrameCompare, NULL);
-
   if (data_size != 0 && g_runmode != RM_MINE) {
     bool loaded = snes_loadRom(g_snes, data, data_size);
     if (!loaded) {
@@ -362,9 +359,7 @@ void RunOneFrameOfGame_Both(void) {
     g_got_mismatch_count--;
 }
 
-static void RtlRunFrameCompare(uint16 input, int run_what) {
-  g_snes->input1->currentState = input;
-
+void RtlRunFrameCompare() {
   g_use_my_apu_code = (g_runmode != RM_THEIRS);
 
   if (g_runmode == RM_THEIRS) {

src/common_cpu_infra.h

@@ -21,6 +21,8 @@ typedef void CpuInfraInitializeFunc(void);
 typedef void RunOneFrameOfGameFunc(void);
 typedef void FixSnapshotForCompareFunc(Snapshot *b, Snapshot *a);
 
+void RtlRunFrameCompare(void);
+
 typedef struct RtlGameInfo {
   const char *title;
   uint8 game_id;

src/common_rtl.c

@@ -26,30 +26,6 @@ Ppu *g_ppu, *g_my_ppu;
 Dma *g_dma;
 bool g_custom_music;
 
-static uint8 *g_rtl_memory_ptr;
-static RunFrameFunc *g_rtl_runframe;
-static SyncAllFunc *g_rtl_syncall;
-
-void RtlSetupEmuCallbacks(uint8 *emu_ram, RunFrameFunc *func, SyncAllFunc *sync_all) {
-  g_rtl_memory_ptr = emu_ram;
-  g_rtl_runframe = func;
-  g_rtl_syncall = sync_all;
-}
-
-static void RtlSynchronizeWholeState(void) {
-  if (g_rtl_syncall)
-    g_rtl_syncall();
-}
-
-// |ptr| must be a pointer into g_ram, will synchronize the RAM memory with the
-// emulator.
-static void RtlSyncMemoryRegion(void *ptr, size_t n) {
-  uint8 *data = (uint8 *)ptr;
-  assert(data >= g_ram && data < g_ram + 0x20000);
-  if (g_rtl_memory_ptr)
-    memcpy(g_rtl_memory_ptr + (data - g_ram), data, n);
-}
-
 void ByteArray_AppendVl(ByteArray *arr, uint32 v) {
   for (; v >= 255; v -= 255)
     ByteArray_AppendByte(arr, 255);
@@ -81,15 +57,14 @@ void loadFunc(SaveLoadInfo *sli, void *data, size_t data_size) {
 static void LoadSnesState(SaveLoadInfo *sli) {
   // Do the actual loading
   snes_saveload(g_snes, sli);
-  RtlSynchronizeWholeState();
 }
 
 static void SaveSnesState(SaveLoadInfo *sli) {
   snes_saveload(g_snes, sli);
 }
 
 typedef struct StateRecorder {
-  uint16 last_inputs;
+  uint32 last_inputs;
   uint32 frames_since_last;
   uint32 total_frames;
 
@@ -100,6 +75,7 @@ typedef struct StateRecorder {
   uint32 snapshot_flags;
   uint8 replay_cmd;
   bool replay_mode;
+  uint8 cur_player;
 
   ByteArray log;
   ByteArray base_snapshot;
@@ -122,25 +98,31 @@ void StateRecorder_RecordCmd(StateRecorder *sr, uint8 cmd) {
     ByteArray_AppendVl(&sr->log, frames - x);
 }
 
-void StateRecorder_Record(StateRecorder *sr, uint16 inputs) {
-  uint16 diff = inputs ^ sr->last_inputs;
-  if (diff != 0) {
-    sr->last_inputs = inputs;
-    //    printf("0x%.4x %d: ", diff, sr->frames_since_last);
-    //    size_t lb = sr->log.size;
-    for (int i = 0; i < 12; i++) {
-      if ((diff >> i) & 1)
-        StateRecorder_RecordCmd(sr, i << 4);
+static void StateRecorder_RecordKeyDiff(StateRecorder *sr, uint32 diff) {
+  for (int i = 0; diff; i++, diff >>= 1) {
+    if (diff & 1) {
+      int player = (i >= 12);
+      i -= player * 12;
+      if (player != sr->cur_player) {
+        sr->cur_player = player;
+        ByteArray_AppendByte(&sr->log, 0xfc + player);
+      }
+      StateRecorder_RecordCmd(sr, i << 4);
     }
-    //    while (lb < sr->log.size)
-    //      printf("%.2x ", sr->log.data[lb++]);
-    //    printf("\n");
   }
+}
+
+void StateRecorder_Record(StateRecorder *sr, uint32 inputs) {
+  uint32 diff = (inputs ^ sr->last_inputs) & 0xffffff;
+  sr->last_inputs = inputs;
+  if (diff)
+    StateRecorder_RecordKeyDiff(sr, diff);
   sr->frames_since_last++;
   sr->total_frames++;
 }
 
-void StateRecorder_RecordPatchByte(StateRecorder *sr, uint32 addr, const uint8 *value, int num) {
+void StateRecorder_RecordPatchByte(StateRecorder *sr, const uint8 *value, int num) {
+  uint32 addr = value - g_ram;
   assert(addr < 0x20000);
 
   //  printf("%d: PatchByte(0x%x, 0x%x. %d): ", sr->frames_since_last, addr, *value, num);
@@ -174,8 +156,6 @@ void RtlReset(int mode) {
   RtlRestoreMusicAfterLoad_Locked(true);
   RtlApuUnlock();
 
-  RtlSynchronizeWholeState();
-
   if ((mode & 2) == 0)
     StateRecorder_Init(&state_recorder);
 }
@@ -216,6 +196,7 @@ void StateRecorder_Load(StateRecorder *sr, FILE *f, bool replay_mode) {
   sr->snapshot_flags = hdr[9];
   sr->replay_next_cmd_at = 0;
   sr->replay_mode = replay_mode;
+  sr->cur_player = 0;
   if (replay_mode) {
     sr->frames_since_last = 0;
     sr->last_inputs = 0;
@@ -269,6 +250,12 @@ void StateRecorder_Save(StateRecorder *sr, FILE *f, bool saving_with_bug) {
   assert(sr->base_snapshot.size == 0 ||
     sr->base_snapshot.size == savest.array.size || sr->base_snapshot.size == g_sram_size);
 
+  // Before saving, reset the cur player
+  if (sr->cur_player) {
+    sr->cur_player = 0;
+    ByteArray_AppendVl(&sr->log, 0xfc);
+  }
+
   hdr[0] = 2;
   hdr[1] = sr->total_frames;
   hdr[2] = (uint32)sr->log.size;
@@ -305,12 +292,9 @@ void StateRecorder_ClearKeyLog(StateRecorder *sr) {
   memset(&sr->log, 0, sizeof(sr->log));
   // If there are currently any active inputs, record them initially at timestamp 0.
   sr->frames_since_last = 0;
-  if (sr->last_inputs) {
-    for (int i = 0; i < 12; i++) {
-      if ((sr->last_inputs >> i) & 1)
-        StateRecorder_RecordCmd(sr, i << 4);
-    }
-  }
+  sr->cur_player = 0;
+  StateRecorder_RecordKeyDiff(sr, sr->last_inputs);
+    
   if (sr->replay_mode) {
     // When clearing the key log while in replay mode, we want to keep
     // replaying but discarding all key history up until this point.
@@ -340,7 +324,7 @@ uint16 StateRecorder_ReadNextReplayState(StateRecorder *sr) {
       // Apply next command
       sr->frames_since_last = 0;
       if (sr->replay_cmd < 0xc0) {
-        sr->last_inputs ^= 1 << (sr->replay_cmd >> 4);
+        sr->last_inputs ^= 1 << ((sr->replay_cmd >> 4) + sr->cur_player * 12);
       } else if (sr->replay_cmd < 0xd0) {
         int nb = 1 + ((sr->replay_cmd >> 2) & 3);
         uint8 t;
@@ -352,7 +336,6 @@ uint16 StateRecorder_ReadNextReplayState(StateRecorder *sr) {
         addr |= sr->log.data[replay_pos++];
         do {
           g_ram[addr & 0x1ffff] = sr->log.data[replay_pos++];
-          RtlSyncMemoryRegion(&g_ram[addr & 0x1ffff], 1);
         } while (addr++, --nb);
       } else {
         assert(0);
@@ -365,7 +348,20 @@ uint16 StateRecorder_ReadNextReplayState(StateRecorder *sr) {
       break;
     }
     // Read the next one
-    uint8 cmd = sr->log.data[replay_pos++], t;
+    uint8 cmd, t;
+
+    for (;;) {
+      cmd = sr->log.data[replay_pos++];
+      if (cmd < 0xfc)
+        break;
+      switch (cmd) {
+      case 0xfc: 
+      case 0xfd: sr->cur_player = cmd - 0xfc; break;
+      default:
+        assert(0);
+      }
+    }
+
     int mask = (cmd < 0xc0) ? 0xf : 0x1;
     int frames = cmd & mask;
     if (frames == mask) do {
@@ -400,7 +396,8 @@ void RtlStopReplay(void) {
   StateRecorder_StopReplay(&state_recorder);
 }
 
-bool RtlRunFrame(int inputs) {
+bool RtlRunFrame(uint32 inputs) {
+
   if (g_did_finish_level_hook) {
     if (game_id == kGameID_SMW && !state_recorder.replay_mode && g_config.save_playthrough) {
       SmwSavePlaythroughSnapshot();
@@ -414,6 +411,9 @@ bool RtlRunFrame(int inputs) {
   // Avoid up/down and left/right from being pressed at the same time
   if ((inputs & 0x30) == 0x30) inputs ^= 0x30;
   if ((inputs & 0xc0) == 0xc0) inputs ^= 0xc0;
+  // Player2
+  if ((inputs & 0x30000) == 0x30000) inputs ^= 0x30000;
+  if ((inputs & 0xc0000) == 0xc0000) inputs ^= 0xc0000;
 
   bool is_replay = state_recorder.replay_mode;
 
@@ -433,12 +433,21 @@ bool RtlRunFrame(int inputs) {
       uint8 apui02 = RtlApuReadReg(2);
       if (apui02 != g_ram[kSmwRam_APUI02]) {
         g_ram[kSmwRam_APUI02] = apui02;
-        StateRecorder_RecordPatchByte(&state_recorder, kSmwRam_APUI02, &apui02, 1);
+        StateRecorder_RecordPatchByte(&state_recorder, &g_ram[kSmwRam_APUI02], 1);
+      }
+      // Whether controllers are plugged in.
+      uint32 new_my_flags = inputs >> 30;
+      if (new_my_flags != g_ram[kSmwRam_my_flags]) {
+        assert(new_my_flags <= 255);
+        g_ram[kSmwRam_my_flags] = new_my_flags;
+        StateRecorder_RecordPatchByte(&state_recorder, &g_ram[kSmwRam_my_flags], 1);
       }
     }
   }
+  g_snes->input1_currentState = inputs & 0xfff;
+  g_snes->input2_currentState = (inputs >> 12) & 0xfff;
 
-  g_rtl_runframe(inputs, 0);
+  RtlRunFrameCompare();
 
   snes_frame_counter++;
 
@@ -462,7 +471,6 @@ static void RtlLoadFromFile(FILE *f, bool replay) {
   ppu_copy(g_my_ppu, g_snes->ppu);
 
   RtlApuUnlock();
-  RtlSynchronizeWholeState();
 }
 
 static const char *const kBugSaves[] = {
@@ -789,7 +797,6 @@ void RtlReadSram(void) {
     if (fread(g_sram, 1, g_sram_size, f) != g_sram_size)
       fprintf(stderr, "Error reading %s\n", filename);
     fclose(f);
-    RtlSynchronizeWholeState();
     ByteArray_Resize(&state_recorder.base_snapshot, g_sram_size);
     memcpy(state_recorder.base_snapshot.data, g_sram, g_sram_size);
   }

src/common_rtl.h

@@ -15,6 +15,7 @@ enum {
   kCurrentBugFixCounter = 1,
 
   kSmwRam_APUI02 = 0x18c5,
+  kSmwRam_my_flags = 0x19C7C,
 };
 
 typedef struct SimpleHdma {
@@ -103,12 +104,7 @@ uint8 ReadReg(uint16 reg);
 uint8_t *IndirPtr(LongPtr ptr, uint16 offs);
 void IndirWriteByte(LongPtr ptr, uint16 offs, uint8 value);
 
-
-typedef void RunFrameFunc(uint16 input, int run_what);
-typedef void SyncAllFunc();
-
 void RtlReset(int mode);
-void RtlSetupEmuCallbacks(uint8 *emu_ram, RunFrameFunc *func, SyncAllFunc *sync_all);
 void RtlClearKeyLog();
 void RtlStopReplay();
 
@@ -127,7 +123,7 @@ void RtlSetUploadingApu(bool uploading);
 void RtlApuUpload(const uint8 *p);
 void RtlRenderAudio(int16 *audio_buffer, int samples, int channels);
 void RtlPushApuState();
-bool RtlRunFrame(int inputs);
+bool RtlRunFrame(uint32 inputs);
 void RtlReadSram();
 void RtlWriteSram();
 void RtlSaveSnapshot(const char *filename, bool saving_with_bug);