Minor fixups

rpcs3/Emu/Cell/PPUFunction.h

@@ -9,7 +9,7 @@ using ppu_function_t = bool(*)(ppu_thread&);
 	const auto old_f = ppu.current_function;\
 	if (!old_f) ppu.last_function = #func;\
 	ppu.current_function = #func;\
-	ppu.syscall_r3 = ppu.gpr[3];\
+	std::memcpy(ppu.syscall_args, ppu.gpr + 3, sizeof(ppu.syscall_args)); \
 	ppu_func_detail::do_call(ppu, func);\
 	ppu.current_function = old_f;\
 	ppu.cia += 4;\

rpcs3/Emu/Cell/PPUThread.cpp

@@ -432,7 +432,9 @@ std::string ppu_thread::dump() const
 		ret += "Current function: ";
 		ret += _func;
 		ret += '\n';
-		fmt::append(ret, "syscall r3: 0x%llx\n", syscall_r3);
+
+		for (u32 i = 3; i <= 6; i++)
+			fmt::append(ret, " ** GPR[%d] = 0x%llx\n", i, syscall_args[i - 3]);
 	}
 	else if (is_paused())
 	{

rpcs3/Emu/Cell/PPUThread.h

@@ -189,7 +189,7 @@ class ppu_thread : public cpu_thread
 	cmd64 cmd_get(u32 index) { return cmd_queue[cmd_queue.peek() + index].load(); }
 
 	u64 start_time{0}; // Sleep start timepoint
-	u64 syscall_r3{0}; // Save r3 before syscalls
+	alignas(64) u64 syscall_args[4]{0}; // Last syscall arguments stored
 	const char* current_function{}; // Current function name for diagnosis, optimized for speed.
 	const char* last_function{}; // Sticky copy of current_function, is not cleared on function return
 

rpcs3/rpcs3qt/game_compatibility.cpp

@@ -7,6 +7,12 @@
 #include <QJsonDocument>
 #include <QThread>
 
+#define NOMINMAX
+#ifndef CURL_STATICLIB
+#define CURL_STATICLIB
+#endif
+#include <curl/curl.h>
+
 LOG_CHANNEL(compat_log, "Compat");
 
 constexpr auto qstr = QString::fromStdString;
@@ -69,7 +75,7 @@ size_t game_compatibility::update_buffer(char* data, size_t size)
 	}
 
 	Q_EMIT signal_buffer_update(static_cast<int>(new_size), max);
-	
+
 	return size;
 }
 

rpcs3/rpcs3qt/game_compatibility.h

@@ -5,10 +5,6 @@
 #include <QPainter>
 #include <QJsonObject>
 
-#define NOMINMAX
-#define CURL_STATICLIB
-#include <curl/curl.h>
-
 class gui_settings;
 class progress_dialog;
 
@@ -44,7 +40,7 @@ class game_compatibility : public QObject
 	std::atomic<bool> m_curl_result = false;
 	std::atomic<bool> m_curl_abort = false;
 	double m_actual_dwnld_size = -1.0;
-	CURL *m_curl = nullptr;
+	void* m_curl = nullptr;
 	QByteArray m_curl_buf;
 	progress_dialog* m_progress_dialog = nullptr;
 	std::shared_ptr<gui_settings> m_xgui_settings;

rpcs3/rpcs3qt/update_manager.cpp

@@ -31,6 +31,11 @@
 #include <sys/stat.h>
 #endif
 
+#ifndef CURL_STATICLIB
+#define CURL_STATICLIB
+#endif
+#include <curl/curl.h>
+
 LOG_CHANNEL(update_log, "UPDATER");
 
 size_t curl_write_cb(char* ptr, size_t /*size*/, size_t nmemb, void* userdata)

rpcs3/rpcs3qt/update_manager.h

@@ -1,9 +1,6 @@
 #pragma once
 
 #include "stdafx.h"
-#define NOMINMAX
-#define CURL_STATICLIB
-#include <curl/curl.h>
 #include <QObject>
 #include <QByteArray>
 
@@ -21,7 +18,7 @@ class update_manager final :  public QObject
 	progress_dialog* m_progress_dialog = nullptr;
 	QWidget* m_parent                  = nullptr;
 
-	CURL *m_curl = nullptr;
+	void* m_curl = nullptr;
 	QByteArray m_curl_buf;
 	std::atomic<bool> m_curl_abort = false;
 	std::atomic<bool> m_curl_result = false;