Work around java exception seen in reporting. Buildfix.

This commit is contained in:
Henrik Rydgård committed 2026-02-18 01:34:56 +01:00
1 parent eef760e923
commit 505a72bb3f
3 files changed
+22 -17

No files matched your search

+2 -2
View File
@@ -259,10 +259,10 @@ void ArmJit::Compile(u32 em_address) {
b->DoIntegrityCheck(em_address, block_num, "BeforeFinalize");
blocks.FinalizeBlock(block_num, jo.enableBlocklink);
b->DoIntegrityCheck(em_address, block_num, "AfterFinalize");
_dbg_assert_(js.nextExit <= 2);
EndWrite();
_dbg_assert_(js.nextExit <= 2);
bool cleanSlate = false;
if (js.hasSetRounding && !js.lastSetRounding) {
+3 -2
View File
@@ -249,16 +249,16 @@ void Arm64Jit::Compile(u32 em_address) {
BeginWrite(JitBlockCache::MAX_BLOCK_INSTRUCTIONS * 16);
int block_num = blocks.AllocateBlock(em_address);
// To debug really wacky JIT issues, it can be a good idea to bisect the block number,
// and disable parts of the jit using jo.disableFlags for certain ranges of blocks.
int block_num = blocks.AllocateBlock(em_address);
JitBlock *b = blocks.GetBlock(block_num);
b->DoIntegrityCheck(em_address, block_num, "BeforeDoJit");
DoJit(em_address, b);
b->DoIntegrityCheck(em_address, block_num, "BeforeFinalize");
blocks.FinalizeBlock(em_address, block_num, jo.enableBlocklink);
blocks.FinalizeBlock(block_num, jo.enableBlocklink);
b->DoIntegrityCheck(em_address, block_num, "AfterFinalize");
EndWrite();
_dbg_assert_(js.nextExit <= 2);
@@ -283,6 +283,7 @@ void Arm64Jit::Compile(u32 em_address) {
// Let's try that one more time. We won't get back here because we toggled the value.
js.startDefaultPrefix = false;
// TODO ARM64: This crashes.
// TODO: Really? Need to fix that in such a case. Wonder what games are affected.
//cleanSlate = true;
}
@@ -1731,19 +1731,23 @@ public class PpssppActivity extends AppCompatActivity implements SensorEventList
// Note that these three do not require the VIBRATE Android
// permission.
if (surfView != null) {
switch (milliseconds) {
case -1:
surfView.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
break;
case -2:
surfView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
break;
case -3:
surfView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
break;
default:
// Requires the vibrate permission, which we don't have, so disabled.
break;
try {
switch (milliseconds) {
case -1:
surfView.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
break;
case -2:
surfView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
break;
case -3:
surfView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
break;
default:
// Requires the vibrate permission, which we don't have, so disabled.
break;
}
} catch (Exception e) {
// Ignore. Seen these in reporting but don't understand how.
}
} else {
Log.e(TAG, "Can't vibrate, no surface view");