Merge branch 'grumpycoders:main' into main

Author: johnbaumann

src/core/cdriso.cc

@@ -363,7 +363,7 @@ static int open_codec_context(int *stream_idx, AVFormatContext *fmt_ctx, enum AV
         stream_index = ret;
         st = fmt_ctx->streams[stream_index];
 
-        AVCodec *dec = avcodec_find_decoder(st->codecpar->codec_id);
+        const AVCodec *dec = avcodec_find_decoder(st->codecpar->codec_id);
         if (!dec) {
             PCSX::g_system->printf(_("Failed to find %s codec\n"), av_get_media_type_string(type));
             return AVERROR(EINVAL);
@@ -391,7 +391,7 @@ static int open_codec_context(int *stream_idx, AVFormatContext *fmt_ctx, enum AV
 static int decode_compressed_cdda_track(char *buf, char *src_filename, int *size) {
     AVFormatContext *fmt_ctx = NULL;
     AVCodecContext *audio_dec_ctx = NULL;
-    AVCodec *audio_codec = NULL;
+    const AVCodec *audio_codec = NULL;
     AVStream *audio_stream = NULL;
     int audio_stream_idx = -1;
     AVFrame *frame = NULL;

src/core/gpu.h

@@ -61,15 +61,13 @@ class GPU {
     virtual void save(SaveStates::GPU &gpu) = 0;
     virtual void load(const SaveStates::GPU &gpu) = 0;
 
-    virtual void keypressed(int key) {}
     virtual void displayText(char *pText) { PCSX::g_system->printf("%s\n", pText); }
     virtual void makeSnapshot(void) {}
     virtual void toggleDebug(void) {}
     virtual int32_t getScreenPic(unsigned char *pMem) { return -1; }
     virtual int32_t showScreenPic(unsigned char *pMem) { return -1; }
     virtual void clearDynarec(void (*callback)(void)) {}
-    virtual void hSync(int val) {}
-    virtual void vBlank(int val) {}
+    virtual void vBlank() {}
     virtual void visualVibration(uint32_t iSmall, uint32_t iBig) {}
     virtual void cursor(int player, int x, int y) {}
     virtual void addVertex(short sx, short sy, int64_t fx, int64_t fy, int64_t fz) {}

src/core/kernellog.cc

@@ -143,7 +143,7 @@ static const char *const A0names[] = {
     "memset", "memmove", "memcmp", "memchr", "rand",
     // 30
     "srand", "qsort", "strtod", "user_malloc", "user_free", "lsearch", "bsearch", "user_calloc", "user_realloc",
-    "user_initheap", nullptr, "getchar", "putchar", "gets", "puts", "printf",
+    "user_initheap", "abort", "getchar", "putchar", "gets", "puts", "printf",
     // 40
     "SystemErrorUnresolvedException", "loadExeHeader", "loadExe", "exec", "flushCache", "installKernelHandlers",
     "GPU_dw", "GPU_mem2vram", "GPU_send", "GPU_cw", "GPU_cwb", "GPU_sendPackets", "GPU_abort", "GPU_getStatus",
@@ -445,6 +445,10 @@ void PCSX::R3000Acpu::logA0KernelCall(uint32_t call) {
             g_system->log(LogClass::KERNEL, "0x%08x, %i)", n.a0, n.a1);
             break;
         }
+        case 0x3a: {
+            g_system->log(LogClass::KERNEL, "%i)", n.a0);
+            break;
+        }
         case 0x3b: {
             g_system->log(LogClass::KERNEL, ")");
             break;

src/core/pad.h

@@ -52,7 +52,7 @@ class Pads {
 
   private:
     EventBus::Listener m_listener;
-    int m_gamepadsMap[16];
+    int m_gamepadsMap[16] = {0};
 
     static const int GLFW_GAMEPAD_BUTTON_LEFT_TRIGGER = GLFW_GAMEPAD_BUTTON_LAST + 1;
     static const int GLFW_GAMEPAD_BUTTON_RIGHT_TRIGGER = GLFW_GAMEPAD_BUTTON_LAST + 2;

src/core/psxcounters.cc

@@ -187,11 +187,8 @@ void PCSX::Counters::psxRcntUpdate() {
     if (cycle - m_rcnts[3].cycleStart >= m_rcnts[3].cycle) {
         psxRcntReset(3);
 
-        PCSX::g_emulator->m_gpu->hSync(m_hSyncCount);
-
-        m_spuSyncCount++;
         m_hSyncCount++;
-
+        m_spuSyncCount++;
         // Update spu.
         if (m_spuSyncCount >= SpuUpdInterval[PCSX::g_emulator->settings.get<PCSX::Emulator::SettingVideo>()]) {
             m_spuSyncCount = 0;
@@ -206,24 +203,19 @@ void PCSX::Counters::psxRcntUpdate() {
         }
 #endif
 
-        // VSync irq.
+        // Trigger VBlank IRQ when VBlank starts
         if (m_hSyncCount == VBlankStart[PCSX::g_emulator->settings.get<PCSX::Emulator::SettingVideo>()]) {
-            PCSX::g_emulator->m_gpu->vBlank(1);
-
-            // For the best times. :D
-            // setIrq( 0x01 );
-        }
-
-        // Update lace. (calculated at psxHsyncCalculate() on init/defreeze)
-        if (m_hSyncCount >= m_HSyncTotal[PCSX::g_emulator->settings.get<PCSX::Emulator::SettingVideo>()]) {
-            m_hSyncCount = 0;
-
-            PCSX::g_emulator->m_gpu->vBlank(0);
+            PCSX::g_emulator->m_gpu->vBlank();
             setIrq(0x01);
-
+            
+            // Update lace. (calculated at psxHsyncCalculate() on init/defreeze)
             PCSX::g_emulator->m_gpu->updateLace();
             PCSX::g_emulator->vsync();
         }
+
+        if (m_hSyncCount >= m_HSyncTotal[PCSX::g_emulator->settings.get<PCSX::Emulator::SettingVideo>()]) {
+            m_hSyncCount = 0;   
+        }
     }
 }
 

src/core/psxemulator.cc

@@ -122,12 +122,6 @@ void PCSX::Emulator::vsync() {
     g_system->update(true);
     m_cheats->ApplyCheats();
 
-    if (m_vblank_count_hideafter) {
-        if (!(--m_vblank_count_hideafter)) {
-            PCSX::g_emulator->m_gpu->showScreenPic(NULL);
-        }
-    }
-
     if (m_config.RewindInterval > 0 && !(++m_rewind_counter % m_config.RewindInterval)) {
         // CreateRewindState();
     }

src/core/psxemulator.h

@@ -46,13 +46,7 @@
 
 #ifndef MAXPATHLEN
 #ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
+#include "support/windowswrapper.h"
 #endif
 #ifdef MAX_PATH
 #define MAXPATHLEN MAX_PATH
@@ -221,7 +215,6 @@ class Emulator {
 
     // It is safe if these overflow
     uint32_t m_rewind_counter = 0;
-    uint8_t m_vblank_count_hideafter = 0;
 
     // Used for overclocking
     // Make the timing events trigger faster as we are currently assuming everything

src/core/psxinterpreter.cc

@@ -343,10 +343,8 @@ inline void InterpretedCPU::doBranch(uint32_t target, bool fromLink) {
  * Format:  OP rt, rs, immediate                          *
  *********************************************************/
 void InterpretedCPU::psxADDI(uint32_t code) {
-    if (!_Rt_) return;
-
-    auto rs = _rRs_;
-    auto imm = _Imm_;
+    const auto rs = _rRs_;
+    const auto imm = _Imm_;
     uint32_t res = rs + imm;
 
     if (_Rt_ == 29) {
@@ -369,9 +367,12 @@ void InterpretedCPU::psxADDI(uint32_t code) {
         }
     }
 
-    maybeCancelDelayedLoad(_Rt_);
-    _rRt_ = res;
-}  // Rt = Rs + Im      (Exception on Integer Overflow)
+    if (_Rt_ != 0) {
+        maybeCancelDelayedLoad(_Rt_);
+        _rRt_ = res;
+    }
+}
+
 void InterpretedCPU::psxADDIU(uint32_t code) {
     if (!_Rt_) return;
     maybeCancelDelayedLoad(_Rt_);
@@ -437,10 +438,8 @@ void InterpretedCPU::psxSLTIU(uint32_t code) {
  * Format:  OP rd, rs, rt                                 *
  *********************************************************/
 void InterpretedCPU::psxADD(uint32_t code) {
-    if (!_Rd_) return;
-
-    auto rs = _rRs_;
-    auto rt = _rRt_;
+    const auto rs = _rRs_;
+    const auto rt = _rRt_;
     uint32_t res = rs + rt;
     if (_Rd_ == 29) {
         if ((_Rs_ == 29) || (_Rt_ == 29)) {
@@ -462,13 +461,16 @@ void InterpretedCPU::psxADD(uint32_t code) {
         }
     }
 
-    maybeCancelDelayedLoad(_Rd_);
-    _rRd_ = res;
-}  // Rd = Rs + Rt              (Exception on Integer Overflow)
+    if (_Rd_ != 0) {
+        maybeCancelDelayedLoad(_Rd_);
+        _rRd_ = res;
+    }
+}
+
 void InterpretedCPU::psxADDU(uint32_t code) {
     if (!_Rd_) return;
     maybeCancelDelayedLoad(_Rd_);
-    uint32_t res = _u32(_rRs_) + _u32(_rRt_);
+    uint32_t res = _rRs_ + _rRt_;
     if (_Rd_ == 29) {
         if ((_Rs_ == 29) || (_Rt_ == 29)) {
             PCSX::g_emulator->m_callStacks->offsetSP(_rRd_, res - _rRd_);
@@ -479,10 +481,8 @@ void InterpretedCPU::psxADDU(uint32_t code) {
     _rRd_ = res;
 }  // Rd = Rs + Rt
 void InterpretedCPU::psxSUB(uint32_t code) {
-    if (!_Rd_) return;
-
-    auto rs = _rRs_;
-    auto rt = _rRt_;
+    const auto rs = _rRs_;
+    const auto rt = _rRt_;
     uint32_t res = rs - rt;
     if (_Rd_ == 29) {
         if (_Rs_ == 29) {
@@ -503,13 +503,16 @@ void InterpretedCPU::psxSUB(uint32_t code) {
             return;
         }
     }
-    maybeCancelDelayedLoad(_Rd_);
-    _rRd_ = res;
+
+    if (_Rd_ != 0) {
+        maybeCancelDelayedLoad(_Rd_);
+        _rRd_ = res;
+    }
 }  // Rd = Rs - Rt              (Exception on Integer Overflow)
 void InterpretedCPU::psxSUBU(uint32_t code) {
     if (!_Rd_) return;
     maybeCancelDelayedLoad(_Rd_);
-    uint32_t res = _u32(_rRs_) - _u32(_rRt_);
+    uint32_t res = _rRs_ - _rRt_;
     if (_Rd_ == 29) {
         if (_Rs_ == 29) {
             PCSX::g_emulator->m_callStacks->offsetSP(_rRd_, res - _rRd_);

src/core/r3000a.cc

@@ -35,7 +35,7 @@
 
 int PCSX::R3000Acpu::psxInit() {
     g_system->printf(_("PCSX-Redux booting\n"));
-    g_system->printf(_("Copyright (C) 2019-2021 PCSX-Redux authors\n"));
+    g_system->printf(_("Copyright (C) 2019-2022 PCSX-Redux authors\n"));
     const auto& args = g_system->getArgs();
 
     if (args.get<bool>("interpreter"))

src/core/system.h

@@ -53,7 +53,9 @@ DstTP ClockCast(const SrcTP tp) {
 }
 
 namespace Events {
-struct SettingsLoaded {};
+struct SettingsLoaded {
+    bool safe = false;
+};
 struct Quitting {};
 struct LogMessage {
     LogClass logClass;