Merge pull request #22336 from hrydgard/misc-work

Code cleanup, add a dismissable reminder about the 32-bit version on a 64-bit OS.

Common/UI/ViewGroup.h

@@ -50,6 +50,11 @@ public:
 		views_.push_back(view);
 		return view;
 	}
+	template <class T>
+	T *Insert(int index, T *view) {
+		views_.insert(views_.begin() + index, view);
+		return view;
+	}
 
 	// Note: This deletes the old view, if found. Returns whether the view was found.
 	// If it fails, the newView is deleted.

Core/Config.cpp

@@ -239,6 +239,9 @@ static const ConfigSetting generalSettings[] = {
 	ConfigSetting("ShowDebuggerOnLoad", SETTING(g_Config, bShowDebuggerOnLoad), false, CfgFlag::DEFAULT),
 	ConfigSetting("ShowImDebugger", SETTING(g_Config, bShowImDebugger), false, CfgFlag::DONT_SAVE),
 	ConfigSetting("CheckForNewVersion", SETTING(g_Config, bCheckForNewVersion), true, CfgFlag::DEFAULT),
+#if PPSSPP_PLATFORM(WINDOWS) && PPSSPP_ARCH(X86)
+	ConfigSetting("Wow64WarningDismissed", SETTING(g_Config, bWow64WarningDismissed), false, CfgFlag::DEFAULT),
+#endif
 	ConfigSetting("Language", SETTING(g_Config, sLanguageIni), &DefaultLangRegion, CfgFlag::DEFAULT),
 	ConfigSetting("ForceLagSync2", SETTING(g_Config, bForceLagSync), false, CfgFlag::PER_GAME),
 	ConfigSetting("DiscordRichPresence", SETTING(g_Config, bDiscordRichPresence), false, CfgFlag::DEFAULT),

Core/Config.h

@@ -232,6 +232,7 @@ public:
 	bool bFastMemory;
 	int iCpuCore;
 	bool bCheckForNewVersion;
+	bool bWow64WarningDismissed;
 	bool bForceLagSync;
 	bool bFuncReplacements;
 	bool bHideSlowWarnings;

Core/HLE/sceGe.cpp

@@ -119,7 +119,7 @@ public:
 			dl->state = PSP_GE_DL_STATE_COMPLETED;
 		}
 
-		// The pause has been delivered now.  The firmware marks this the same way as sceGeBreak does, which
+		// The pause has been delivered now. It's marked the same way as sceGeBreak does, which
 		// is what lets sceGeContinue through again.
 		if (dl->signal == PSP_GE_SIGNAL_HANDLER_PAUSE && cmd == GE_CMD_FINISH) {
 			dl->signal = PSP_GE_SIGNAL_HANDLER_SUSPEND;
@@ -134,7 +134,6 @@ public:
 			currentMIPS->r[MIPS_REG_A1] = handler->handlerArg;
 			currentMIPS->r[MIPS_REG_A2] = sceKernelGetCompiledSdkVersion() <= 0x02000010 ? 0 : intrdata.pc + 4;
 			// RA is already taken care of in __RunOnePendingInterrupt
-
 			return true;
 		}
 
@@ -149,11 +148,10 @@ public:
 		ge_pending_cb.pop_front();
 		gpu->InterruptEnd(intrdata.listid);
 		// Seen in GoW.
-		if (subintr >= 0)
+		if (subintr >= 0) {
 			DEBUG_LOG(Log::sceGe, "Ignoring interrupt for display list %d, already been released.", intrdata.listid);
+		}
 
-		// Hm. This might be really tricky to get to behave the same in both modes. Here we are in __KernelReschedule, CoreTiming::Advance, ProcessEvents, GeExecuteInterrupt, ... .... __RunOnePendingInterrupt
-		// But not sure how much it will matter. The test pause2 hits here.
 		DLResult result = gpu->ProcessDLQueue();
 		_dbg_assert_(result != DLResult::DebugBreak);
 		return false;
@@ -294,8 +292,8 @@ bool __GeTriggerSync(GPUSyncType type, int id, u64 atTicks) {
 
 void __GeCancelRaisedInterrupts(bool interruptRunning) {
 	int count = __CancelRaisedInterrupts(PSP_GE_INTR);
-	// They're raised in the order they were triggered, so these are the oldest ones - after the one
-	// being handled right now, if any, which is still needed when its handler returns.
+	// They're raised in the order they were triggered. Hence these are the oldest ones - after the one
+	// being handled right now (if any) which is still needed when its handler returns.
 	auto it = ge_pending_cb.begin();
 	if (interruptRunning && it != ge_pending_cb.end())
 		++it;

Core/HLE/sceGe.h

@@ -53,8 +53,6 @@ void __GeShutdown();
 bool __GeTriggerSync(GPUSyncType waitType, int id, u64 atTicks);
 bool __GeTriggerInterrupt(int listid, u32 pc, u64 atTicks);
 // Forgets the GE interrupts that have been raised but not taken, as resetting the GE does.
-// Not the ones still to be raised: those are only late because we execute lists ahead of time,
-// and hardware would have delivered them long ago.
 void __GeCancelRaisedInterrupts(bool interruptRunning);
 void __GeWaitCurrentThread(GPUSyncType type, SceUID waitId, const char *reason);
 bool __GeTriggerWait(GPUSyncType type, SceUID waitId);

Core/HLE/sceUmd.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "Common/File/Path.h"
+class PointerWrap;
 
 enum pspUmdState { 
 	PSP_UMD_INIT        = 0x00,

Core/MIPS/ARM/ArmAsm.cpp

@@ -222,7 +222,7 @@ void ArmJit::GenerateFixedCode() {
 			// No block found, let's jit
 			SaveDowncount();
 			RestoreRoundingMode(true);
-			QuickCallFunction(R2, (void *)&MIPSComp::JitAt);
+			QuickCallFunctionR(R2, (void *)&MIPSComp::JitAt, CTXREG);
 			ApplyRoundingMode(true);
 			RestoreDowncount();
 

Core/MIPS/ARM64/Arm64Asm.cpp

@@ -264,7 +264,7 @@ void Arm64Jit::GenerateFixedCode(const JitOptions &jo) {
 			// Also, rounding mode gotta be irrelevant here..
 			SaveStaticRegisters();
 			RestoreRoundingMode(true);
-			QuickCallFunction(SCRATCH1_64, (void *)&MIPSComp::JitAt);
+			QuickCallFunctionR(SCRATCH1_64, (void *)&MIPSComp::JitAt, CTXREG);
 			ApplyRoundingMode(true);
 			LoadStaticRegisters();
 

Core/MIPS/ARM64/Arm64IRAsm.cpp

@@ -220,7 +220,7 @@ void Arm64JitBackend::GenerateFixedCode(MIPSState *mipsState) {
 			// No block found, let's jit.  We don't need to save static regs, they're all callee saved.
 			RestoreRoundingMode(true);
 			WriteDebugProfilerStatus(IRProfilerStatus::COMPILING);
-			QuickCallFunction(SCRATCH1_64, &MIPSComp::JitAt);
+			QuickCallFunctionR(SCRATCH1_64, &MIPSComp::JitAt, CTXREG);
 			WriteDebugProfilerStatus(IRProfilerStatus::IN_JIT);
 			ApplyRoundingMode(true);
 

Core/MIPS/JitCommon/JitCommon.cpp

@@ -58,10 +58,10 @@
 namespace MIPSComp {
 	JitInterface *jit;
 
-	void JitAt() {
+	void JitAt(MIPSState *mips) {
 		// TODO: We could probably check for a bad pc here, and fire an exception. Could spare us from some crashes.
 		// Although, we just tried to load from this address to check for a JIT block, and if we're here, that succeeded..
-		jit->Compile(currentMIPS->pc);
+		jit->Compile(mips->pc);
 	}
 
 	void DoDummyJitState(PointerWrap &p) {

Core/MIPS/JitCommon/JitCommon.h

@@ -38,7 +38,7 @@ class PointerWrap;
 class MIPSState;
 
 namespace MIPSComp {
-	void JitAt();
+	void JitAt(MIPSState *mips);
 
 	class MIPSFrontendInterface {
 	public:

Core/MIPS/LoongArch64/LoongArch64Asm.cpp

@@ -186,7 +186,7 @@ void LoongArch64JitBackend::GenerateFixedCode(MIPSState *mipsState) {
 	// No block found, let's jit.  We don't need to save static regs, they're all callee saved.
 	RestoreRoundingMode(true);
 	WriteDebugProfilerStatus(IRProfilerStatus::COMPILING);
-	QuickCallFunction(&MIPSComp::JitAt, R20);
+	QuickCallFunctionR(&MIPSComp::JitAt, CTXREG, R20);
 	WriteDebugProfilerStatus(IRProfilerStatus::IN_JIT);
 	ApplyRoundingMode(true);
 

Core/MIPS/RiscV/RiscVAsm.cpp

@@ -198,7 +198,7 @@ void RiscVJitBackend::GenerateFixedCode(MIPSState *mipsState) {
 	// No block found, let's jit.  We don't need to save static regs, they're all callee saved.
 	RestoreRoundingMode(true);
 	WriteDebugProfilerStatus(IRProfilerStatus::COMPILING);
-	QuickCallFunction(&MIPSComp::JitAt, X7);
+	QuickCallFunctionR(&MIPSComp::JitAt, CTXREG, X7);
 	WriteDebugProfilerStatus(IRProfilerStatus::IN_JIT);
 	ApplyRoundingMode(true);
 

Core/MIPS/x86/Asm.cpp

@@ -194,7 +194,8 @@ void Jit::GenerateFixedCode(JitOptions &jo) {
 
 			//Ok, no block, let's jit
 			RestoreRoundingMode(true);
-			ABI_CallFunction(&MIPSComp::JitAt);
+			LEA(PTRBITS, ECX, MDisp(CTXREG, -(s32)offsetof(MIPSState, f[0])));  // Adjust to get the real pointer.
+			ABI_CallFunctionR(reinterpret_cast<void *>(&MIPSComp::JitAt), ECX);
 			ApplyRoundingMode(true);
 			JMP(dispatcherNoCheck, true); // Let's just dispatch again, we'll enter the block since we know it's there.
 

Core/MIPS/x86/X64IRAsm.cpp

@@ -265,7 +265,8 @@ void X64JitBackend::GenerateFixedCode(MIPSState *mipsState) {
 			// No block found, let's jit.  We don't need to save static regs, they're all callee saved.
 			RestoreRoundingMode(true);
 			WriteDebugProfilerStatus(IRProfilerStatus::COMPILING);
-			ABI_CallFunction(&MIPSComp::JitAt);
+			LEA(PTRBITS, ECX, MDisp(CTXREG, -(s32)offsetof(MIPSState, f[0])));
+			ABI_CallFunctionR(reinterpret_cast<void *>(&MIPSComp::JitAt), ECX);
 			WriteDebugProfilerStatus(IRProfilerStatus::IN_JIT);
 			ApplyRoundingMode(true);
 			// Let's just dispatch again, we'll enter the block since we know it's there.

UI/MainScreen.cpp

@@ -21,7 +21,7 @@
 
 #include "ppsspp_config.h"
 
-#include "Common/System/Display.h"
+#include "Common/CPUDetect.h"
 #include "Common/System/System.h"
 #include "Common/UI/Root.h"
 #include "Common/UI/Context.h"
@@ -33,9 +33,6 @@
 #include "Common/StringUtils.h"
 #include "Core/System.h"
 #include "Core/Util/RecentFiles.h"
-#include "Core/Reporting.h"
-#include "Core/HLE/sceCtrl.h"
-#include "Core/ELF/PBPReader.h"
 #include "Core/ELF/ParamSFO.h"
 #include "Core/Util/GameManager.h"
 
@@ -362,6 +359,9 @@ void MainScreen::CreateViews() {
 
 	auto mm = GetI18NCategory(I18NCat::MAINMENU);
 
+	// Thie is the true root, leaves room for persistent notifications.
+	root_ = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
+
 	tabHolder_ = new TabHolder(ORIENT_HORIZONTAL, 64, TabHolderFlags::Default, nullptr, nullptr, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, 1.0f));
 	ViewGroup *leftColumn = tabHolder_;
 	tabHolder_->SetTag("MainScreenGames");
@@ -454,13 +454,13 @@ void MainScreen::CreateViews() {
 		CreateMainButtons(buttonGroup, vertical);
 		header->Add(buttonGroup);
 
-		LinearLayout *rootLayout = new LinearLayout(ORIENT_VERTICAL);
+		LinearLayout *rootLayout = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f));
 		rootLayout->SetSpacing(0.0f);
 
 		leftColumn->ReplaceLayoutParams(new LinearLayoutParams(1.0f));
 		rootLayout->Add(header);
 		rootLayout->Add(leftColumn);
-		root_ = rootLayout;
+		root_->Add(rootLayout);
 
 		// no space for a fullscreen button!
 	} else {
@@ -489,9 +489,10 @@ void MainScreen::CreateViews() {
 
 		rightColumn->Add(rightColumnItems);
 
-		root_ = new LinearLayout(ORIENT_HORIZONTAL);
-		root_->Add(leftColumn);
-		root_->Add(rightColumn);
+		LinearLayout *columns = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(1.0f));
+		columns->Add(leftColumn);
+		columns->Add(rightColumn);
+		root_->Add(columns);
 	}
 
 	if (focusButton) {
@@ -502,40 +503,56 @@ void MainScreen::CreateViews() {
 
 	root_->SetTag("mainroot");
 
-	if (!g_Config.sUpgradeMessage.empty()) {
-		auto di = GetI18NCategory(I18NCat::DIALOG);
+	const UI::Drawable dismissableBackground = screenManager()->getUIContext()->GetTheme().itemDownStyle.background;
+
+	auto CreateDismissableBar = [this, vertical, dismissableBackground](std::string_view message, std::string_view action, std::function<void()> onDismiss) {
 		Margins margins(0, 0);
-		if (vertical) {
-			margins.bottom = ITEM_HEIGHT;
-		}
-		UI::LinearLayout *upgradeBar = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, margins));
+		UI::LinearLayout *bar = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, margins));
 
 		UI::Margins textMargins(10, 5);
 		UI::Margins buttonMargins(5, 0);
-		UI::Drawable solid(0xFFbd9939);
-		upgradeBar->SetSpacing(5.0f);
-		upgradeBar->SetBG(solid);
-		std::string upgradeMessage(di->T("New version of PPSSPP available"));
-		if (!vertical) {
-			// The version only really fits in the horizontal layout.
-			upgradeMessage += ": " + g_Config.sUpgradeVersion;
+		UI::Drawable solid(dismissableBackground);
+		bar->SetSpacing(5.0f);
+		bar->SetBG(solid);
+
+		bar->Add(new TextView(message, FLAG_WRAP_TEXT, false, new LinearLayoutParams(1.0f, UI::Gravity::G_VCENTER, textMargins)));
+		if (!action.empty()) {
+			bar->Add(new Choice(action, new LinearLayoutParams(0.0f, UI::Gravity::G_VCENTER, buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade);
 		}
-		upgradeBar->Add(new TextView(upgradeMessage, new LinearLayoutParams(1.0f, UI::Gravity::G_VCENTER, textMargins)));
-		upgradeBar->Add(new Choice(di->T("Download"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade);
-		Choice *dismiss = upgradeBar->Add(new Choice("", ImageID("I_CROSS"), new LinearLayoutParams(buttonMargins)));
-		dismiss->OnClick.Add([this](UI::EventParams &e) {
-			g_Config.DismissUpgrade();
-			g_Config.Save("dismissupgrade");
+
+		Choice *dismiss = bar->Add(new Choice("", ImageID("I_CROSS"), new LinearLayoutParams(0.0f, UI::Gravity::G_VCENTER, buttonMargins)));
+		dismiss->OnClick.Add([this, onDismiss](UI::EventParams &e) {
+			onDismiss();
 			RecreateViews();
 		});
+		return bar;
+	};
 
-		// Slip in under root_
-		LinearLayout *newRoot = new LinearLayout(ORIENT_VERTICAL);
-		newRoot->Add(root_);
-		newRoot->Add(upgradeBar);
-		root_->ReplaceLayoutParams(new LinearLayoutParams(1.0));
-		root_ = newRoot;
+	if (!g_Config.sUpgradeMessage.empty()) {
+		auto di = GetI18NCategory(I18NCat::DIALOG);
+		std::string upgradeMessage(di->T("New version of PPSSPP available"));
+		// The version only really fits in the horizontal layout.
+		upgradeMessage += ": " + g_Config.sUpgradeVersion;
+		UI::LinearLayout *upgradeBar = CreateDismissableBar(upgradeMessage, di->T("Download"), [this]() {
+			g_Config.DismissUpgrade();
+			g_Config.Save("dismissupgrade");
+		});
+
+		// Slip in at the top.
+		root_->Insert(0, upgradeBar);
 	}
+
+#if PPSSPP_PLATFORM(WINDOWS) && PPSSPP_ARCH(X86)
+	if (cpu_info.OS64bit && !g_Config.bWow64WarningDismissed) {
+		auto di = GetI18NCategory(I18NCat::DIALOG);
+		std::string_view message = di->T("You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.");
+		UI::LinearLayout *upgradeBar = CreateDismissableBar(message, "", [this]() {
+			g_Config.bWow64WarningDismissed = true;
+			g_Config.Save("dismisswow64");
+		});
+		root_->Insert(0, upgradeBar);
+	}
+#endif
 }
 
 bool MainScreen::key(const KeyInput &key) {

assets/lang/ar_AE.ini

@@ -538,6 +538,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = عند الحف
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = ‎نعم
 You haven't saved your progress for %1. = لم تحفظ تقدمك منذ %1. # AI translated
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = أنت تشغّل إصدار 32 بت. استخدم PPSSPPWindows64.exe للحصول على أفضل أداء. # AI translated
 Zoom = ‎تقريب
 
 [Error]

assets/lang/az_AZ.ini

@@ -529,6 +529,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Qoruduğunuzda,
 When you save, it will not work on outdated PSP Firmware anymore = Qoruduğunuzda, o köhnə PSP sistem yazılımı üzərində artıq işləməyəcək
 Yes = Hə
 You haven't saved your progress for %1. = %1 irəliləyişinizi qorumamısınız.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Yaxınlıq
 
 [Error]

assets/lang/be_BY.ini

@@ -528,6 +528,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = When you save, i
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = Так
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Маштаб
 
 [Error]

assets/lang/bg_BG.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = When you save, i
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = Да
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Използвате 32-битната версия. За най-добра производителност използвайте PPSSPPWindows64.exe. # AI translated
 Zoom = Мащабиране
 
 [Error]

assets/lang/ca_ES.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Quant guardis, l
 When you save, it will not work on outdated PSP Firmware anymore = Quant guardis, no tornarà a funcionar a un firmware de PSP antic.
 Yes = Sí
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Estàs executant la versió de 32 bits. Usa PPSSPPWindows64.exe per obtenir el millor rendiment. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/cz_CZ.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Pokud uložíte,
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = Ano
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Používáte 32bitovou verzi. Pro nejlepší výkon použijte PPSSPPWindows64.exe. # AI translated
 Zoom = Přiblížení
 
 [Error]

assets/lang/da_DK.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Når du gemmer v
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = Ja
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Du kører 32-bit-versionen. Brug PPSSPPWindows64.exe for at få den bedste ydeevne. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/de_DE.ini

@@ -529,6 +529,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Wenn du speicher
 When you save, it will not work on outdated PSP Firmware anymore = Wenn du speicherst, wird es auf veralteter PSP-Firmware nicht mehr funktionieren
 Yes = Ja
 You haven't saved your progress for %1. = Du hast deinen Fortschritt für %1 nicht gespeichert
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Du verwendest die 32-Bit-Version. Nutze stattdessen PPSSPPWindows64.exe für beste Leistung. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/dr_ID.ini

@@ -528,6 +528,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = When you save, i
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = Iyo mane
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Zoom
 
 [Error]

assets/lang/en_US.ini

@@ -554,6 +554,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = When you save, i
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = Yes
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Zoom
 
 [Error]

assets/lang/es_ES.ini

@@ -531,6 +531,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Al guardar, se c
 When you save, it will not work on outdated PSP Firmware anymore = Cuando guardes, ya no funcionará con firmware de PSP desactualizado
 Yes = Sí
 You haven't saved your progress for %1. = No has guardado tu progreso para %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Estás usando la versión de 32 bits. Usa PPSSPPWindows64.exe para obtener el mejor rendimiento. # AI translated
 Zoom = Acercar
 
 [Error]

assets/lang/es_LA.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Cuando guardes,
 When you save, it will not work on outdated PSP Firmware anymore = Cuando guardes, la partida puede no funcionar en una PSP con firmware desactualizado.
 Yes = Sí
 You haven't saved your progress for %1. = No has guardado tu progreso para %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Estás usando la versión de 32 bits. Usa PPSSPPWindows64.exe para obtener el mejor rendimiento. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/fa_IR.ini

@@ -529,6 +529,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = When you save, i
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = ‎بله
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Zoom
 
 [Error]

assets/lang/fi_FI.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Kun tallennat, s
 When you save, it will not work on outdated PSP Firmware anymore = Kun tallennat, se ei enää toimi vanhentuneella PSP:n laiteohjelmistolla
 Yes = Kyllä
 You haven't saved your progress for %1. = Et ole tallentanut edistymistäsi pelissä %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Käytät 32-bittistä versiota. Käytä PPSSPPWindows64.exe-tiedostoa parhaan suorituskyvyn saavuttamiseksi. # AI translated
 Zoom = Zoomaus
 
 [Error]

assets/lang/fr_FR.ini

@@ -554,6 +554,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Si vous sauvegar
 When you save, it will not work on outdated PSP Firmware anymore = Si vous sauvegardez, le chargement ne sera plus possible sur une PSP avec un ancien firmware.
 Yes = Oui
 You haven't saved your progress for %1. = Vous n'avez pas enregistré votre progression pour %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Vous utilisez la version 32 bits. Utilisez plutôt PPSSPPWindows64.exe pour de meilleures performances. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/gl_ES.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Cando gardes, a
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = Sí
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Zoom
 
 [Error]

assets/lang/gr_EL.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Όταν απο
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = ΝΑΙ
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Εκτελείτε την έκδοση 32 bit. Για βέλτιστη απόδοση, χρησιμοποιήστε το PPSSPPWindows64.exe. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/he_IL.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = When you save, i
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = ןכ
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Zoom
 
 [Error]

assets/lang/he_IL_invert.ini

@@ -529,6 +529,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = When you save, i
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = ןכ
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Zoom
 
 [Error]

assets/lang/hr_HR.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Kada spremiš,u
 When you save, it will not work on outdated PSP Firmware anymore = Kada spremiš, neće uopće raditi na zastarjelom PSP firmwareu
 Yes = Da
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Zumiraj
 
 [Error]

assets/lang/hu_HU.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Ha mentesz, PSP-
 When you save, it will not work on outdated PSP Firmware anymore = Ha mentesz, már nem fog működni elavult PSP alapszoftveren
 Yes = Igen
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = A 32 bites verziót futtatja. A legjobb teljesítmény érdekében használja a PPSSPPWindows64.exe fájlt. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/id_ID.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Setelah anda men
 When you save, it will not work on outdated PSP Firmware anymore = Saat anda menyimpan, itu tidak akan berfungsi lagi pada firmware PSP yang sudah lawas
 Yes = Ya
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Anda menjalankan versi 32-bit. Gunakan PPSSPPWindows64.exe untuk performa terbaik. # AI translated
 Zoom = Perbesar
 
 [Error]

assets/lang/it_IT.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Salvando, sarà
 When you save, it will not work on outdated PSP Firmware anymore = Salvando, non sarà più possibile effettuare il caricamento su un vecchio firmware PSP.
 Yes = Sì
 You haven't saved your progress for %1. = Non hai salvato i tuoi progressi per %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Stai usando la versione a 32 bit. Usa PPSSPPWindows64.exe per prestazioni migliori. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/ja_JP.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = 保存すると
 When you save, it will not work on outdated PSP Firmware anymore = 保存すると、古いPSPファームウェアでは動作しなくなります
 Yes = はい
 You haven't saved your progress for %1. = %1 の進捗状況を保存していません
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = 32ビット版を実行しています。最高のパフォーマンスを得るには PPSSPPWindows64.exe を使用してください。 # AI translated
 Zoom = 拡大
 
 [Error]

assets/lang/jv_ID.ini

@@ -528,6 +528,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Nalika nyimpen,
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = He.eh
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Gede
 
 [Error]

assets/lang/km_KH.ini

@@ -525,6 +525,7 @@ When you save, it will load on a PSP, but not an older PPSSPP =នៅពេល
 When you save, it will not work on outdated PSP Firmware anymore =នៅពេលអ្នករក្សាទុក វានឹងមិនដំណើរការលើកម្មវិធីបង្កប់ PSP ហួសសម័យទៀតទេ
 Yes =បាទ
 You haven't saved your progress for %1. =អ្នកមិនទាន់បានរក្សាទុកដំណើរការរបស់អ្នកសម្រាប់ %1 ទេ។
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom =ពង្រីក
 
 [Error]

assets/lang/ko_KR.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = 저장하면 PSP
 When you save, it will not work on outdated PSP Firmware anymore = 저장하면 오래된 PSP 펌웨어에서는 더 이상 작동하지 않습니다.
 Yes = 예
 You haven't saved your progress for %1. = %1에 대한 진행 상황을 저장하지 않았습니다.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = 32비트 버전을 실행 중입니다. 최상의 성능을 위해 PPSSPPWindows64.exe를 사용하세요. # AI translated
 Zoom = 확대/축소
 
 [Error]

assets/lang/ku_SO.ini

@@ -542,6 +542,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = When you save, i
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = بەڵێ
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = نزیک کردنەوە
 
 [Error]

assets/lang/lo_LA.ini

@@ -528,6 +528,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = ເມື່ອ
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = ແມ່ນ
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = ຊູມ
 
 [Error]

assets/lang/lt-LT.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = When you save, i
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = Taip
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Zoom
 
 [Error]

assets/lang/ms_MY.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Apabila anda men
 When you save, it will not work on outdated PSP Firmware anymore = Apabila anda menyimpan, ia tidak akan berfungsi pada Perisian Tegar PSP lama lagi
 Yes = Ya
 You haven't saved your progress for %1. = Anda belum menyimpan kemajuan anda selama %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Zuum
 
 [Error]

assets/lang/nl_NL.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Als u opslaat ku
 When you save, it will not work on outdated PSP Firmware anymore = Als u opslaat, werkt deze niet meer op verouderde PSP-firmware.
 Yes = Ja
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Je gebruikt de 32-bitsversie. Gebruik PPSSPPWindows64.exe voor de beste prestaties. # AI translated
 Zoom = Vergroten
 
 [Error]

assets/lang/nn_NO.ini

@@ -554,6 +554,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Når du lagrar,
 When you save, it will not work on outdated PSP Firmware anymore = Når du lagrar, vil det ikkje lenger fungere på utdatert PSP-fastvare
 Yes = Ja
 You haven't saved your progress for %1. = Du har ikkje lagra framgangen din for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Zoom
 
 [Error]

assets/lang/no_NO.ini

@@ -554,6 +554,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Når du lagrer,
 When you save, it will not work on outdated PSP Firmware anymore = Når du lagrer, vil det ikke lenger fungere på utdatert PSP-fastvare
 Yes = Ja
 You haven't saved your progress for %1. = Du har ikke lagret fremgangen din for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Du kjører 32-bitersversjonen. Bruk PPSSPPWindows64.exe for best ytelse. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/pl_PL.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Jeśli zapiszesz
 When you save, it will not work on outdated PSP Firmware anymore = Jeśli zapiszesz, ten zapis nie zadziała już na starych wersjach firmware PSP.
 Yes = Tak
 You haven't saved your progress for %1. = Nie zapisałeś swojego postępu od %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Używasz wersji 32-bitowej. Użyj PPSSPPWindows64.exe, aby uzyskać najlepszą wydajność. # AI translated
 Zoom = Powiększ
 
 [Error]

assets/lang/pt_BR.ini

@@ -554,6 +554,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Quando você sal
 When you save, it will not work on outdated PSP Firmware anymore = Quando você salvar ele não funcionará mais num firmware de PSP desatualizado
 Yes = Sim
 You haven't saved your progress for %1. = Você não salvou seu progresso do %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Você está usando a versão de 32 bits. Use o PPSSPPWindows64.exe para obter o melhor desempenho. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/pt_PT.ini

@@ -554,6 +554,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Quando salvares,
 When you save, it will not work on outdated PSP Firmware anymore = Quando salvares, os dados não funcionarão mais numa PSP com o firmware desatualizado.
 Yes = Sim
 You haven't saved your progress for %1. = Não salvaste o teu progresso há %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Estás a usar a versão de 32 bits. Usa o PPSSPPWindows64.exe para obteres o melhor desempenho. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/ro_RO.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Când salvezi, v
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = Da
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Rulezi versiunea pe 32 de biți. Pentru cele mai bune performanțe, folosește PPSSPPWindows64.exe. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/ru_RU.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Когда вы
 When you save, it will not work on outdated PSP Firmware anymore = Когда вы сохранитесь, оно больше не будет работать на устаревших версиях прошивки PSP
 Yes = Да
 You haven't saved your progress for %1. = Вы не сохранили свой прогресс для %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Вы используете 32-битную версию. Для наилучшей производительности запустите PPSSPPWindows64.exe. # AI translated
 Zoom = Масштаб
 
 [Error]

assets/lang/sv_SE.ini

@@ -531,6 +531,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Efter sparning k
 When you save, it will not work on outdated PSP Firmware anymore = Efter sparning fungerar filen inte längre med föråldrad PSP-systemprogramvara
 Yes = Ja
 You haven't saved your progress for %1. = Du har inte sparat dina framsteg på %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Du kör 32-bitarsversionen. Använd PPSSPPWindows64.exe istället för bästa prestanda. # AI translated
 Zoom = Zooma
 
 [Error]

assets/lang/tg_PH.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Kapag iyong na-i
 When you save, it will not work on outdated PSP Firmware anymore = When you save, it will not work on outdated PSP firmware anymore
 Yes = Oo
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = Zoom
 
 [Error]

assets/lang/th_TH.ini

@@ -546,6 +546,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = เซฟเก
 When you save, it will not work on outdated PSP Firmware anymore = เซฟเกมของคุณนั้น ไม่สามารถนำไปใช้กับเครื่อง PSP ที่ใช้เฟิร์มแวร์รุ่นเก่าได้
 Yes = ใช่
 You haven't saved your progress for %1. = คุณยังไม่ได้บันทึกความคืบหน้าของเกมในช่วง %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance.
 Zoom = ขยาย
 
 [Error]

assets/lang/tr_TR.ini

@@ -532,6 +532,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Kayıt aldığı
 When you save, it will not work on outdated PSP Firmware anymore =  Kaydettiğinde artık eski PSP yazılımı üzerinde çalışmayacaktır.
 Yes = Evet
 You haven't saved your progress for %1. = %1 için ilerlemenizi kaydetmediniz.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = 32 bit sürümü çalıştırıyorsun. En iyi performans için PPSSPPWindows64.exe kullan. # AI translated
 Zoom = Yakınlaştır
 
 [Error]

assets/lang/uk_UA.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Коли ви з
 When you save, it will not work on outdated PSP Firmware anymore = Коли ви бережетесь, це більше не буде працювати на старих версіях прошивки PSP
 Yes = Так
 You haven't saved your progress for %1. = Ви не зберегли свій прогрес для %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Ви використовуєте 32-бітну версію. Для найкращої продуктивності запустіть PPSSPPWindows64.exe. # AI translated
 Zoom = Масштаб
 
 [Error]

assets/lang/vi_VN.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = Khi bạn save,
 When you save, it will not work on outdated PSP Firmware anymore = Khi bạn save, nó sẽ không hoạt động trên máy PSP đã lỗi thời.
 Yes = Có
 You haven't saved your progress for %1. = You haven't saved your progress for %1.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = Bạn đang chạy phiên bản 32-bit. Hãy dùng PPSSPPWindows64.exe để có hiệu năng tốt nhất. # AI translated
 Zoom = Zoom
 
 [Error]

assets/lang/zh_CN.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = 当您保存后
 When you save, it will not work on outdated PSP Firmware anymore = 当您保存后，它无法在过时的PSP固件上运行
 Yes = 是
 You haven't saved your progress for %1. = 您尚未保存 %1 的进度.
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = 您正在运行 32 位版本。为获得最佳性能，请改用 PPSSPPWindows64.exe。 # AI translated
 Zoom = 放大
 
 [Error]

assets/lang/zh_TW.ini

@@ -530,6 +530,7 @@ When you save, it will load on a PSP, but not an older PPSSPP = 在您儲存後
 When you save, it will not work on outdated PSP Firmware anymore = 在您儲存後，它將無法在已過期的 PSP 韌體上運作
 Yes = 是
 You haven't saved your progress for %1. = 您尚未儲存 %1 的進度。
+You're running the 32-bit version. Use PPSSPPWindows64.exe instead for best performance. = 您正在執行 32 位元版本。為獲得最佳效能，請改用 PPSSPPWindows64.exe。 # AI translated
 Zoom = 縮放
 
 [Error]

unittest/JitHarness.cpp

@@ -54,7 +54,7 @@ double ExecCPUTest(bool clearCache = true) {
 
 	if (MIPSComp::jit) {
 		currentMIPS->pc = PSP_GetUserMemoryBase();
-		MIPSComp::JitAt();
+		MIPSComp::JitAt(currentMIPS);
 	}
 
 	double st = time_now_d();