From 58c84ef68fc8275de4c88c039a8d7f3d2871966a Mon Sep 17 00:00:00 2001 From: lightningterror <18107717+lightningterror@users.noreply.github.com> Date: Fri, 22 Nov 2024 23:40:05 +0100 Subject: [PATCH] Vif: Replace some asserts with logs. The conditions need hardware testing. Use logs instead so the games don't crash and are still playable. --- pcsx2/arm64/Vif_Dynarec.cpp | 4 +++- pcsx2/arm64/Vif_UnpackNEON.cpp | 4 +++- pcsx2/x86/Vif_Dynarec.cpp | 4 +++- pcsx2/x86/Vif_UnpackSSE.cpp | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pcsx2/arm64/Vif_Dynarec.cpp b/pcsx2/arm64/Vif_Dynarec.cpp index ef620bd1d2e19..5328b3adc7e33 100644 --- a/pcsx2/arm64/Vif_Dynarec.cpp +++ b/pcsx2/arm64/Vif_Dynarec.cpp @@ -367,7 +367,9 @@ void VifUnpackNEON_Dynarec::ModUnpack(int upknum, bool PostOp) case 3: case 7: case 11: - pxFailRel(fmt::format("Vpu/Vif - Invalid Unpack! [{}]", upknum).c_str()); + // TODO: Needs hardware testing. + // Dynasty Warriors 5: Empire - Player 2 chose a character menu. + Console.Warning("Vpu/Vif: Invalid Unpack %d", upknum); break; } } diff --git a/pcsx2/arm64/Vif_UnpackNEON.cpp b/pcsx2/arm64/Vif_UnpackNEON.cpp index f4ca4465fbfb6..25af5561dcdc7 100644 --- a/pcsx2/arm64/Vif_UnpackNEON.cpp +++ b/pcsx2/arm64/Vif_UnpackNEON.cpp @@ -345,7 +345,9 @@ void VifUnpackNEON_Base::xUnpack(int upknum) const case 3: case 7: case 11: - pxFailRel(fmt::format("Vpu/Vif - Invalid Unpack! [{}]", upknum).c_str()); + // TODO: Needs hardware testing. + // Dynasty Warriors 5: Empire - Player 2 chose a character menu. + Console.Warning("Vpu/Vif: Invalid Unpack %d", upknum); break; } } diff --git a/pcsx2/x86/Vif_Dynarec.cpp b/pcsx2/x86/Vif_Dynarec.cpp index e1ecc729dc9ef..2226e58dcba96 100644 --- a/pcsx2/x86/Vif_Dynarec.cpp +++ b/pcsx2/x86/Vif_Dynarec.cpp @@ -213,7 +213,9 @@ void VifUnpackSSE_Dynarec::ModUnpack(int upknum, bool PostOp) case 3: case 7: case 11: - pxFailRel(fmt::format("Vpu/Vif - Invalid Unpack! [{}]", upknum).c_str()); + // TODO: Needs hardware testing. + // Dynasty Warriors 5: Empire - Player 2 chose a character menu. + Console.Warning("Vpu/Vif: Invalid Unpack %d", upknum); break; } } diff --git a/pcsx2/x86/Vif_UnpackSSE.cpp b/pcsx2/x86/Vif_UnpackSSE.cpp index f5fab2ec831e7..a59e02dbc4003 100644 --- a/pcsx2/x86/Vif_UnpackSSE.cpp +++ b/pcsx2/x86/Vif_UnpackSSE.cpp @@ -308,7 +308,9 @@ void VifUnpackSSE_Base::xUnpack(int upknum) const case 3: case 7: case 11: - pxFailRel(fmt::format("Vpu/Vif - Invalid Unpack! [{}]", upknum).c_str()); + // TODO: Needs hardware testing. + // Dynasty Warriors 5: Empire - Player 2 chose a character menu. + Console.Warning("Vpu/Vif: Invalid Unpack %d", upknum); break; } }