Merge pull request #1 from hrydgard/master

Merge from head

CMakeLists.txt

@@ -1013,22 +1013,26 @@ endif()
 # installs
 file(INSTALL ${NativeAssets} DESTINATION assets)
 
-# packaging and code signing
-if (IOS)
+# Fix CMake some Xcode settings.
+if(APPLE)
 	# Fix CMake breaking optimization settings.
 	set(CMAKE_CXX_FLAGS_DEBUG "-g -D_DEBUG")
 	set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -D_NDEBUG")
-	set(CMAKE_CXX_FLAGS_RELEASE "-O2 -D_NDEBUG")
+	set(CMAKE_CXX_FLAGS_RELEASE "-O3 -D_NDEBUG")
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -D_NDEBUG")
 	set(CMAKE_C_FLAGS_DEBUG "-g -D_DEBUG")
 	set(CMAKE_C_FLAGS_MINSIZEREL "-Os -D_NDEBUG")
-	set(CMAKE_C_FLAGS_RELEASE "-O2 -D_NDEBUG")
+	set(CMAKE_C_FLAGS_RELEASE "-O3 -D_NDEBUG")
 	set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -D_NDEBUG")
 
-	# These can be fast.
+	# These can be fast even for debug.
 	set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
+	set_target_properties(snappy PROPERTIES COMPILE_FLAGS "-O3")
 	set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
+endif()
 
+# packaging and code signing
+if(IOS)
 	add_dependencies(PPSSPP ${CoreLibName} GPU Common native)
 
 	file(GLOB IOSAssets ios/assets/*.png)

Core/Config.cpp

@@ -60,6 +60,7 @@ void Config::Load(const char *iniFileName)
 	general->Get("Recent", recentIsos);
 	general->Get("WindowX", &iWindowX, 40);
 	general->Get("WindowY", &iWindowY, 100);
+	general->Get("AutoSaveSymbolMap", &bAutoSaveSymbolMap, false);
 
 	if (recentIsos.size() > MAX_RECENT)
 		recentIsos.resize(MAX_RECENT);
@@ -139,6 +140,7 @@ void Config::Save()
 		general->Set("Recent", recentIsos);
 		general->Set("WindowX", iWindowX);
 		general->Set("WindowY", iWindowY);
+		general->Set("AutoSaveSymbolMap", bAutoSaveSymbolMap);
 
 		IniFile::Section *cpu = iniFile.GetOrCreateSection("CPU");
 		cpu->Set("Jit", bJit);

Core/Config.h

@@ -44,6 +44,7 @@ struct Config
 	bool bIgnoreBadMemAccess;
 	bool bFastMemory;
 	bool bJit;
+	bool bAutoSaveSymbolMap;
 	std::string sReportHost;
 	std::vector<std::string> recentIsos;
 

Core/Core.cpp

@@ -83,8 +83,7 @@ void Core_WaitInactive()
 
 void Core_WaitInactive(int milliseconds)
 {
-	while (!Core_IsInactive())
-		m_hInactiveEvent.wait_for(m_hInactiveMutex, milliseconds);
+	m_hInactiveEvent.wait_for(m_hInactiveMutex, milliseconds);
 }
 
 void UpdateScreenScale() {
@@ -104,17 +103,23 @@ void Core_RunLoop()
 		UpdateScreenScale();
 		{
 			{
-				lock_guard guard(input_state.lock);
 #ifdef _WIN32
+				lock_guard guard(input_state.lock);
+				input_state.pad_buttons = 0;
+				input_state.pad_lstick_x = 0;
+				input_state.pad_lstick_y = 0;
+				input_state.pad_rstick_x = 0;
+				input_state.pad_rstick_y = 0;
 				// Temporary hack.
 				if (GetAsyncKeyState(VK_ESCAPE)) {
 					input_state.pad_buttons |= PAD_BUTTON_MENU;
-				} else {
-					input_state.pad_buttons &= ~PAD_BUTTON_MENU;
 				}
+				host->PollControllers(input_state);
+				UpdateInputState(&input_state);
 #endif
 			}
 			NativeUpdate(input_state);
+			EndInputState(&input_state);
 		}
 		NativeRender();
 		// Simple throttling to not burn the GPU in the menu.

Core/Core.h

@@ -18,7 +18,7 @@
 #pragma once
 
 #include "Globals.h"
-#include "Core/Core.h"
+#include "Core/System.h"
 #include "Core/CoreParameter.h"
 
 // called from emu thread
@@ -37,4 +37,4 @@ bool Core_IsInactive();
 void Core_WaitInactive();
 void Core_WaitInactive(int milliseconds);
 
-void UpdateScreenScale();
+void UpdateScreenScale();

Core/CoreParameter.h

@@ -33,7 +33,7 @@ enum GPUCore {
 
 struct CoreParameter
 {
-	CoreParameter() : collectEmuLog(0) {}
+	CoreParameter() : collectEmuLog(0), unthrottle(false) {}
 	// 0 = Interpreter
 	// 1 = Jit
 	// 2 = JitIL
@@ -63,4 +63,7 @@ struct CoreParameter
 	// Actual pixel output resolution (for use by glViewport and the like)
 	int pixelWidth;
 	int pixelHeight;
+
+	// Can be modified at runtime.
+	bool unthrottle;
 };

Core/Dialog/PSPDialog.h

@@ -26,6 +26,9 @@ class PointerWrap;
 #define SCE_UTILITY_DIALOG_RESULT_CANCEL				1
 #define SCE_UTILITY_DIALOG_RESULT_ABORT					2
 
+const int SCE_ERROR_UTILITY_INVALID_STATUS = 0x80110001;
+const int SCE_ERROR_UTILITY_WRONG_TYPE     = 0x80110005;
+
 typedef struct
 {
 	unsigned int size;	/** Size of the structure */

Core/Dialog/PSPMsgDialog.cpp

@@ -230,6 +230,12 @@ int PSPMsgDialog::Update()
 	return 0;
 }
 
+int PSPMsgDialog::Abort()
+{
+	// TODO: Probably not exactly the same?
+	return PSPDialog::Shutdown();
+}
+
 int PSPMsgDialog::Shutdown()
 {
 	return PSPDialog::Shutdown();

Core/Dialog/PSPMsgDialog.h

@@ -61,6 +61,7 @@ class PSPMsgDialog: public PSPDialog {
 	virtual int Update();
 	virtual int Shutdown();
 	virtual void DoState(PointerWrap &p);
+	int Abort();
 
 private :
 	void DisplayBack();

Core/Dialog/PSPOskDialog.cpp

@@ -65,7 +65,7 @@ int PSPOskDialog::Init(u32 oskPtr)
 	// Ignore if already running
 	if (status != SCE_UTILITY_STATUS_NONE && status != SCE_UTILITY_STATUS_SHUTDOWN)
 	{
-		return -1;
+		return SCE_ERROR_UTILITY_INVALID_STATUS;
 	}
 	status = SCE_UTILITY_STATUS_INITIALIZE;
 

Core/Dialog/PSPSaveDialog.cpp

@@ -40,7 +40,7 @@ int PSPSaveDialog::Init(int paramAddr)
 	if (status != SCE_UTILITY_STATUS_NONE && status != SCE_UTILITY_STATUS_SHUTDOWN)
 	{
 		ERROR_LOG(HLE,"A save request is already running !");
-		return 0;
+		return SCE_ERROR_UTILITY_INVALID_STATUS;
 	}
 
 	int size = Memory::Read_U32(paramAddr);
@@ -379,7 +379,7 @@ int PSPSaveDialog::Update()
 
 	if (status != SCE_UTILITY_STATUS_RUNNING)
 	{
-		return 0;
+		return SCE_ERROR_UTILITY_INVALID_STATUS;
 	}
 
 	if (!param.GetPspParam()) {
@@ -798,6 +798,9 @@ int PSPSaveDialog::Update()
 
 int PSPSaveDialog::Shutdown()
 {
+	if (status != SCE_UTILITY_STATUS_FINISHED)
+		return SCE_ERROR_UTILITY_INVALID_STATUS;
+
 	PSPDialog::Shutdown();
 	param.SetPspParam(0);
 

Core/HLE/sceDisplay.cpp

@@ -300,11 +300,8 @@ void DebugStats()
 
 // Let's collect all the throttling and frameskipping logic here.
 void DoFrameTiming(bool &throttle, bool &skipFrame) {
-#ifdef _WIN32
-	throttle = !GetAsyncKeyState(VK_TAB);
-#else
-	throttle = true;
-#endif
+	throttle = !PSP_CoreParameter().unthrottle;
+
 	skipFrame = false;
 	if (PSP_CoreParameter().headLess)
 		throttle = false;
@@ -444,9 +441,6 @@ void hleEnterVblank(u64 userdata, int cyclesLate) {
 
 void hleAfterFlip(u64 userdata, int cyclesLate)
 {
-	// This checks input on PC. Fine to do even if not calling BeginFrame.
-	host->BeginFrame();
-
 	gpu->BeginFrame();  // doesn't really matter if begin or end of frame.
 }
 

Core/HLE/sceKernelModule.cpp

@@ -391,6 +391,10 @@ Module *__KernelLoadELFFromPtr(const u8 *ptr, u32 loadAddress, std::string *erro
 			dontadd = true;
 		}
 	}
+	else if (host->AttemptLoadSymbolMap())
+	{
+		dontadd = true;
+	}
 
 	INFO_LOG(LOADER,"Module %s: %08x %08x %08x", modinfo->name, modinfo->gp, modinfo->libent,modinfo->libstub);