diff --git a/rpcs3/Emu/ARMv7/Modules/sceRtc.h b/rpcs3/Emu/ARMv7/Modules/sceRtc.h
deleted file mode 100644
index 6f70f09bee..0000000000
--- a/rpcs3/Emu/ARMv7/Modules/sceRtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/rpcs3/Emu/ARMv7/ARMv7Callback.h b/rpcs3/Emu/PSP2/ARMv7Callback.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/ARMv7Callback.h
rename to rpcs3/Emu/PSP2/ARMv7Callback.h
diff --git a/rpcs3/Emu/ARMv7/ARMv7DisAsm.cpp b/rpcs3/Emu/PSP2/ARMv7DisAsm.cpp
similarity index 99%
rename from rpcs3/Emu/ARMv7/ARMv7DisAsm.cpp
rename to rpcs3/Emu/PSP2/ARMv7DisAsm.cpp
index 5334757d1c..178fcb3ca2 100644
--- a/rpcs3/Emu/ARMv7/ARMv7DisAsm.cpp
+++ b/rpcs3/Emu/PSP2/ARMv7DisAsm.cpp
@@ -99,8 +99,8 @@ static const char* fmt_reg(u32 reg)
 
 static std::string fmt_shift(u32 type, u32 amount)
 {
-	Expects(type != arm_code::SRType_RRX || amount == 1);
-	Expects(amount <= 32);
+	EXPECTS(type != arm_code::SRType_RRX || amount == 1);
+	EXPECTS(amount <= 32);
 
 	if (amount)
 	{
diff --git a/rpcs3/Emu/ARMv7/ARMv7DisAsm.h b/rpcs3/Emu/PSP2/ARMv7DisAsm.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/ARMv7DisAsm.h
rename to rpcs3/Emu/PSP2/ARMv7DisAsm.h
diff --git a/rpcs3/Emu/ARMv7/ARMv7Function.cpp b/rpcs3/Emu/PSP2/ARMv7Function.cpp
similarity index 100%
rename from rpcs3/Emu/ARMv7/ARMv7Function.cpp
rename to rpcs3/Emu/PSP2/ARMv7Function.cpp
diff --git a/rpcs3/Emu/ARMv7/ARMv7Function.h b/rpcs3/Emu/PSP2/ARMv7Function.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/ARMv7Function.h
rename to rpcs3/Emu/PSP2/ARMv7Function.h
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/PSP2/ARMv7Interpreter.cpp
similarity index 99%
rename from rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
rename to rpcs3/Emu/PSP2/ARMv7Interpreter.cpp
index 30330a477a..4e8082fc83 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/PSP2/ARMv7Interpreter.cpp
@@ -669,7 +669,7 @@ void arm_interpreter::LDM(ARMv7Thread& cpu, const u32 op, const u32 cond)
 
 	if (ConditionPassed(cpu, cond))
 	{
-		vm::ptr<u32> memory(cpu.read_gpr(n), vm::addr);
+		vm::ptr<u32> memory(vm::cast(cpu.read_gpr(n)));
 
 		for (u32 i = 0; i < 16; i++)
 		{
@@ -1384,7 +1384,7 @@ void arm_interpreter::PUSH(ARMv7Thread& cpu, const u32 op, const u32 cond)
 
 	if (ConditionPassed(cpu, cond))
 	{
-		vm::ptr<u32> memory(cpu.SP, vm::addr);
+		vm::ptr<u32> memory(vm::cast(cpu.SP));
 
 		for (u32 i = 15; ~i; i--)
 		{
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/PSP2/ARMv7Interpreter.h
similarity index 99%
rename from rpcs3/Emu/ARMv7/ARMv7Interpreter.h
rename to rpcs3/Emu/PSP2/ARMv7Interpreter.h
index 33f3b3d622..fd77ae1374 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/PSP2/ARMv7Interpreter.h
@@ -48,46 +48,46 @@ struct arm_interpreter
 
 	static u32 LSL_C(u32 x, s32 shift, bool& carry_out)
 	{
-		Expects(shift > 0);
+		EXPECTS(shift > 0);
 		carry_out = shift <= 32 ? (x & (1 << (32 - shift))) != 0 : false;
 		return shift < 32 ? x << shift : 0;
 	}
 
 	static u32 LSL_(u32 x, s32 shift)
 	{
-		Expects(shift >= 0);
+		EXPECTS(shift >= 0);
 		return shift < 32 ? x << shift : 0;
 	}
 
 	static u32 LSR_C(u32 x, s32 shift, bool& carry_out)
 	{
-		Expects(shift > 0);
+		EXPECTS(shift > 0);
 		carry_out = shift <= 32 ? (x & (1 << (shift - 1))) != 0 : false;
 		return shift < 32 ? x >> shift : 0;
 	}
 
 	static u32 LSR_(u32 x, s32 shift)
 	{
-		Expects(shift >= 0);
+		EXPECTS(shift >= 0);
 		return shift < 32 ? x >> shift : 0;
 	}
 
 	static s32 ASR_C(s32 x, s32 shift, bool& carry_out)
 	{
-		Expects(shift > 0);
+		EXPECTS(shift > 0);
 		carry_out = shift <= 32 ? (x & (1 << (shift - 1))) != 0 : x < 0;
 		return shift < 32 ? x >> shift : x >> 31;
 	}
 
 	static s32 ASR_(s32 x, s32 shift)
 	{
-		Expects(shift >= 0);
+		EXPECTS(shift >= 0);
 		return shift < 32 ? x >> shift : x >> 31;
 	}
 
 	static u32 ROR_C(u32 x, s32 shift, bool& carry_out)
 	{
-		Expects(shift);
+		EXPECTS(shift);
 		const u32 result = x >> shift | x << (32 - shift);
 		carry_out = (result >> 31) != 0;
 		return result;
@@ -111,7 +111,7 @@ struct arm_interpreter
 
 	static u32 Shift_C(u32 value, u32 type, s32 amount, bool carry_in, bool& carry_out)
 	{
-		Expects(type != arm_code::SRType_RRX || amount == 1);
+		EXPECTS(type != arm_code::SRType_RRX || amount == 1);
 
 		if (amount)
 		{
diff --git a/rpcs3/Emu/ARMv7/ARMv7Module.cpp b/rpcs3/Emu/PSP2/ARMv7Module.cpp
similarity index 91%
rename from rpcs3/Emu/ARMv7/ARMv7Module.cpp
rename to rpcs3/Emu/PSP2/ARMv7Module.cpp
index c4a104ce0d..69d4802e77 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Module.cpp
+++ b/rpcs3/Emu/PSP2/ARMv7Module.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "Utilities/Config.h"
 #include "Loader/ELF.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
@@ -9,6 +10,67 @@
 #include "ARMv7Function.h"
 #include "ARMv7Module.h"
 
+LOG_CHANNEL(sceAppMgr);
+LOG_CHANNEL(sceAppUtil);
+LOG_CHANNEL(sceAudio);
+LOG_CHANNEL(sceAudiodec);
+LOG_CHANNEL(sceAudioenc);
+LOG_CHANNEL(sceAudioIn);
+LOG_CHANNEL(sceCamera);
+LOG_CHANNEL(sceCodecEngine);
+LOG_CHANNEL(sceCommonDialog);
+LOG_CHANNEL(sceCtrl);
+LOG_CHANNEL(sceDbg);
+LOG_CHANNEL(sceDeci4p);
+LOG_CHANNEL(sceDeflt);
+LOG_CHANNEL(sceDisplay);
+LOG_CHANNEL(sceFiber);
+LOG_CHANNEL(sceFios);
+LOG_CHANNEL(sceFpu);
+LOG_CHANNEL(sceGxm);
+LOG_CHANNEL(sceHttp);
+LOG_CHANNEL(sceIme);
+LOG_CHANNEL(sceJpeg);
+LOG_CHANNEL(sceJpegEnc);
+LOG_CHANNEL(sceLibc);
+LOG_CHANNEL(sceLibKernel);
+LOG_CHANNEL(sceLibm);
+LOG_CHANNEL(sceLibstdcxx);
+LOG_CHANNEL(sceLibXml);
+LOG_CHANNEL(sceLiveArea);
+LOG_CHANNEL(sceLocation);
+LOG_CHANNEL(sceMd5);
+LOG_CHANNEL(sceMotion);
+LOG_CHANNEL(sceMt19937);
+LOG_CHANNEL(sceNet);
+LOG_CHANNEL(sceNetCtl);
+LOG_CHANNEL(sceNgs);
+LOG_CHANNEL(sceNpBasic);
+LOG_CHANNEL(sceNpCommon);
+LOG_CHANNEL(sceNpManager);
+LOG_CHANNEL(sceNpMatching);
+LOG_CHANNEL(sceNpScore);
+LOG_CHANNEL(sceNpUtility);
+LOG_CHANNEL(scePerf);
+LOG_CHANNEL(scePgf);
+LOG_CHANNEL(scePhotoExport);
+LOG_CHANNEL(sceRazorCapture);
+LOG_CHANNEL(sceRtc);
+LOG_CHANNEL(sceSas);
+LOG_CHANNEL(sceScreenShot);
+LOG_CHANNEL(sceSfmt);
+LOG_CHANNEL(sceSha);
+LOG_CHANNEL(sceSqlite);
+LOG_CHANNEL(sceSsl);
+LOG_CHANNEL(sceSulpha);
+LOG_CHANNEL(sceSysmodule);
+LOG_CHANNEL(sceSystemGesture);
+LOG_CHANNEL(sceTouch);
+LOG_CHANNEL(sceUlt);
+LOG_CHANNEL(sceVideodec);
+LOG_CHANNEL(sceVoice);
+LOG_CHANNEL(sceVoiceQoS);
+
 extern void armv7_init_tls();
 
 extern std::string arm_get_function_name(const std::string& module, u32 fnid);
@@ -29,18 +91,18 @@ extern void arm_execute_function(ARMv7Thread& cpu, u32 index)
 			{
 				func(cpu);
 			}
-			catch (const std::exception&)
-			{
-				LOG_ERROR(ARMv7, "Function '%s' aborted", cpu.last_function);
-				cpu.last_function = previous_function;
-				throw;
-			}
 			catch (EmulationStopped)
 			{
 				LOG_WARNING(ARMv7, "Function '%s' aborted", cpu.last_function);
 				cpu.last_function = previous_function;
 				throw;
 			}
+			catch (...)
+			{
+				LOG_ERROR(ARMv7, "Function '%s' aborted", cpu.last_function);
+				cpu.last_function = previous_function;
+				throw;
+			}
 
 			LOG_TRACE(ARMv7, "Function '%s' finished, r0=0x%x", cpu.last_function, cpu.GPR[0]);
 			cpu.last_function = previous_function;
@@ -411,7 +473,7 @@ void arm_exec_loader::load() const
 
 				case 0x6c2224ba: // __sce_moduleinfo
 				{
-					ASSERT(addr == module_info.addr());
+					VERIFY(addr == module_info.addr());
 					break;
 				}
 
@@ -546,8 +608,8 @@ void arm_exec_loader::load() const
 
 	LOG_NOTICE(LOADER, "__sce_process_param(*0x%x) analysis...", proc_param);
 
-	ASSERT(proc_param->size >= sizeof(psv_process_param_t));
-	ASSERT(proc_param->ver == "PSP2"_u32);
+	VERIFY(proc_param->size >= sizeof(psv_process_param_t));
+	VERIFY(proc_param->ver == "PSP2"_u32);
 
 	LOG_NOTICE(LOADER, "*** size=0x%x; 0x%x, 0x%x, 0x%x", proc_param->size, proc_param->ver, proc_param->unk0, proc_param->unk1);
 
@@ -563,7 +625,7 @@ void arm_exec_loader::load() const
 
 	LOG_NOTICE(LOADER, "__sce_libcparam(*0x%x) analysis...", libc_param);
 
-	ASSERT(libc_param->size >= 0x1c);
+	VERIFY(libc_param->size >= 0x1c);
 
 	LOG_NOTICE(LOADER, "*** size=0x%x; 0x%x, 0x%x, 0x%x", libc_param->size, libc_param->unk0, libc_param->unk1, libc_param->unk2);
 
diff --git a/rpcs3/Emu/ARMv7/ARMv7Module.h b/rpcs3/Emu/PSP2/ARMv7Module.h
similarity index 93%
rename from rpcs3/Emu/ARMv7/ARMv7Module.h
rename to rpcs3/Emu/PSP2/ARMv7Module.h
index 8083f9b581..3a40c3b0ef 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Module.h
+++ b/rpcs3/Emu/PSP2/ARMv7Module.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Utilities/Config.h"
 #include "ARMv7Function.h"
 #include "ARMv7Callback.h"
 #include "ErrorCodes.h"
@@ -167,37 +166,3 @@ public:
 #define REG_FNID(module, nid, func, ...) arm_module_manager::register_static_function<decltype(&func), &func>(#module, #func, BIND_FUNC(func), nid, {__VA_ARGS__})
 
 #define REG_VNID(module, nid, var, ...) arm_module_manager::register_static_variable<decltype(var), &var>(#module, #var, nid, {__VA_ARGS__})
-
-struct SceDateTime
-{
-	le_t<u16> year;
-	le_t<u16> month;
-	le_t<u16> day;
-	le_t<u16> hour;
-	le_t<u16> minute;
-	le_t<u16> second;
-	le_t<u32> microsecond;
-};
-
-struct SceFVector3
-{
-	le_t<f32> x, y, z;
-};
-
-struct SceFQuaternion
-{
-	le_t<f32> x, y, z, w;
-};
-
-union SceUMatrix4
-{
-	struct
-	{
-		le_t<f32> f[4][4];
-	};
-
-	struct
-	{
-		le_t<s32> i[4][4];
-	};
-};
diff --git a/rpcs3/Emu/ARMv7/ARMv7Opcodes.h b/rpcs3/Emu/PSP2/ARMv7Opcodes.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/ARMv7Opcodes.h
rename to rpcs3/Emu/PSP2/ARMv7Opcodes.h
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/PSP2/ARMv7Thread.cpp
similarity index 100%
rename from rpcs3/Emu/ARMv7/ARMv7Thread.cpp
rename to rpcs3/Emu/PSP2/ARMv7Thread.cpp
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.h b/rpcs3/Emu/PSP2/ARMv7Thread.h
similarity index 96%
rename from rpcs3/Emu/ARMv7/ARMv7Thread.h
rename to rpcs3/Emu/PSP2/ARMv7Thread.h
index 7b9e619a08..59b9c393a9 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.h
+++ b/rpcs3/Emu/PSP2/ARMv7Thread.h
@@ -129,7 +129,7 @@ public:
 	std::array<perf_counter, 6> counters{};
 
 	u32 PC = 0;
-	s32 prio = 0;
+	u32 prio = -1;
 	u32 stack_addr = 0;
 	u32 stack_size = 0;
 
@@ -155,7 +155,7 @@ public:
 
 	void write_gpr(u32 n, u32 value, u32 size)
 	{
-		Expects(n < 16);
+		EXPECTS(n < 16);
 
 		if (n < 15)
 		{
@@ -169,7 +169,7 @@ public:
 
 	u32 read_gpr(u32 n)
 	{
-		Expects(n < 16);
+		EXPECTS(n < 16);
 
 		if (n < 15)
 		{
@@ -242,7 +242,7 @@ struct arm_gpr_cast_impl<vm::_ptr_base<T, AT>, void>
 
 	static inline vm::_ptr_base<T, AT> from(const u32 reg)
 	{
-		return{ arm_gpr_cast_impl<AT>::from(reg), vm::addr };
+		return vm::cast(arm_gpr_cast_impl<AT>::from(reg));
 	}
 };
 
@@ -256,7 +256,7 @@ struct arm_gpr_cast_impl<vm::_ref_base<T, AT>, void>
 
 	static inline vm::_ref_base<T, AT> from(const u32 reg)
 	{
-		return{ arm_gpr_cast_impl<AT>::from(reg), vm::addr };
+		return vm::cast(arm_gpr_cast_impl<AT>::from(reg));
 	}
 };
 
diff --git a/rpcs3/Emu/ARMv7/ErrorCodes.h b/rpcs3/Emu/PSP2/ErrorCodes.h
similarity index 98%
rename from rpcs3/Emu/ARMv7/ErrorCodes.h
rename to rpcs3/Emu/PSP2/ErrorCodes.h
index 7cba3359e8..924c337b5d 100644
--- a/rpcs3/Emu/ARMv7/ErrorCodes.h
+++ b/rpcs3/Emu/PSP2/ErrorCodes.h
@@ -179,9 +179,12 @@ struct arm_error_code
 	{
 	}
 
+	// Helper
+	enum class not_an_error : s32 {};
+
 	// Silence any error
-	constexpr arm_error_code(s32 value, const std::nothrow_t&)
-		: value(value)
+	constexpr arm_error_code(not_an_error value)
+		: value(static_cast<s32>(value))
 	{
 	}
 
@@ -193,7 +196,7 @@ struct arm_error_code
 };
 
 // Helper macro for silencing possible error checks on returning arm_error_code values
-#define NOT_AN_ERROR(value) { static_cast<s32>(value), std::nothrow }
+#define NOT_AN_ERROR(...) static_cast<arm_error_code::not_an_error>(static_cast<s32>(__VA_ARGS__))
 
 template<typename T, typename>
 struct arm_gpr_cast_impl;
diff --git a/rpcs3/Emu/PSP2/Modules/Common.h b/rpcs3/Emu/PSP2/Modules/Common.h
new file mode 100644
index 0000000000..c86c93de3e
--- /dev/null
+++ b/rpcs3/Emu/PSP2/Modules/Common.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include "Utilities/types.h"
+#include "Utilities/BEType.h"
+
+struct SceDateTime
+{
+	le_t<u16> year;
+	le_t<u16> month;
+	le_t<u16> day;
+	le_t<u16> hour;
+	le_t<u16> minute;
+	le_t<u16> second;
+	le_t<u32> microsecond;
+};
+
+struct SceFVector3
+{
+	le_t<f32> x, y, z;
+};
+
+struct SceFQuaternion
+{
+	le_t<f32> x, y, z, w;
+};
+
+union SceUMatrix4
+{
+	struct
+	{
+		le_t<f32> f[4][4];
+	};
+
+	struct
+	{
+		le_t<s32> i[4][4];
+	};
+};
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp b/rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp
similarity index 88%
rename from rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp
rename to rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp
index 1dee409ee3..9d3661a650 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceAppMgr.h"
 
-LOG_CHANNEL(sceAppMgr);
+logs::channel sceAppMgr("sceAppMgr", logs::level::notice);
 
 s32 sceAppMgrReceiveEventNum(vm::ptr<s32> eventNum)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppMgr.h b/rpcs3/Emu/PSP2/Modules/sceAppMgr.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceAppMgr.h
rename to rpcs3/Emu/PSP2/Modules/sceAppMgr.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp b/rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp
similarity index 96%
rename from rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp
rename to rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp
index 6d63c2bf94..267bbbfba8 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceAppUtil.h"
 
-LOG_CHANNEL(sceAppUtil);
+logs::channel sceAppUtil("sceAppUtil", logs::level::notice);
 
 s32 sceAppUtilInit(vm::cptr<SceAppUtilInitParam> initParam, vm::ptr<SceAppUtilBootParam> bootParam)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.h b/rpcs3/Emu/PSP2/Modules/sceAppUtil.h
similarity index 98%
rename from rpcs3/Emu/ARMv7/Modules/sceAppUtil.h
rename to rpcs3/Emu/PSP2/Modules/sceAppUtil.h
index 3e3ef55694..3e35140209 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.h
+++ b/rpcs3/Emu/PSP2/Modules/sceAppUtil.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Common.h"
+
 struct SceAppUtilInitParam
 {
 	le_t<u32> workBufSize;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp b/rpcs3/Emu/PSP2/Modules/sceAudio.cpp
similarity index 93%
rename from rpcs3/Emu/ARMv7/Modules/sceAudio.cpp
rename to rpcs3/Emu/PSP2/Modules/sceAudio.cpp
index 0261c2e89b..447c19a83b 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceAudio.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceAudio.h"
 
-LOG_CHANNEL(sceAudio);
+logs::channel sceAudio("sceAudio", logs::level::notice);
 
 s32 sceAudioOutOpenPort(s32 portType, s32 len, s32 freq, s32 param)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudio.h b/rpcs3/Emu/PSP2/Modules/sceAudio.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceAudio.h
rename to rpcs3/Emu/PSP2/Modules/sceAudio.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp b/rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp
similarity index 86%
rename from rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp
rename to rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp
index b97a8c6988..870adbdbc7 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceAudioIn.h"
 
-LOG_CHANNEL(sceAudioIn);
+logs::channel sceAudioIn("sceAudioIn", logs::level::notice);
 
 s32 sceAudioInOpenPort(s32 portType, s32 grain, s32 freq, s32 param)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudioIn.h b/rpcs3/Emu/PSP2/Modules/sceAudioIn.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceAudioIn.h
rename to rpcs3/Emu/PSP2/Modules/sceAudioIn.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp b/rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp
similarity index 92%
rename from rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp
rename to rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp
index bce2640203..00fd6ac245 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceAudiodec.h"
 
-LOG_CHANNEL(sceAudiodec);
+logs::channel sceAudiodec("sceAudiodec", logs::level::notice);
 
 s32 sceAudiodecInitLibrary(u32 codecType, vm::ptr<SceAudiodecInitParam> pInitParam)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudiodec.h b/rpcs3/Emu/PSP2/Modules/sceAudiodec.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceAudiodec.h
rename to rpcs3/Emu/PSP2/Modules/sceAudiodec.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp b/rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp
similarity index 93%
rename from rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp
rename to rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp
index ca7bc17aec..0b26d376dd 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceAudioenc.h"
 
-LOG_CHANNEL(sceAudioenc);
+logs::channel sceAudioenc("sceAudioenc", logs::level::notice);
 
 s32 sceAudioencInitLibrary(u32 codecType, vm::ptr<SceAudioencInitParam> pInitParam)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudioenc.h b/rpcs3/Emu/PSP2/Modules/sceAudioenc.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceAudioenc.h
rename to rpcs3/Emu/PSP2/Modules/sceAudioenc.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp b/rpcs3/Emu/PSP2/Modules/sceCamera.cpp
similarity index 98%
rename from rpcs3/Emu/ARMv7/Modules/sceCamera.cpp
rename to rpcs3/Emu/PSP2/Modules/sceCamera.cpp
index 766b450b4f..4bfe8de61d 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceCamera.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceCamera.h"
 
-LOG_CHANNEL(sceCamera);
+logs::channel sceCamera("sceCamera", logs::level::notice);
 
 s32 sceCameraOpen(s32 devnum, vm::ptr<SceCameraInfo> pInfo)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCamera.h b/rpcs3/Emu/PSP2/Modules/sceCamera.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceCamera.h
rename to rpcs3/Emu/PSP2/Modules/sceCamera.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp b/rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp
similarity index 87%
rename from rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp
rename to rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp
index 0fb17012d2..ecb2dc7021 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceCodecEngine.h"
 
-LOG_CHANNEL(sceCodecEngine);
+logs::channel sceCodecEngine("sceCodecEngine", logs::level::notice);
 
 s32 sceCodecEnginePmonStart()
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.h b/rpcs3/Emu/PSP2/Modules/sceCodecEngine.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceCodecEngine.h
rename to rpcs3/Emu/PSP2/Modules/sceCodecEngine.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp b/rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp
similarity index 98%
rename from rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp
rename to rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp
index c3c290dc53..254972d198 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceCommonDialog.h"
 
-LOG_CHANNEL(sceCommonDialog);
+logs::channel sceCommonDialog("sceCommonDialog", logs::level::notice);
 
 s32 sceCommonDialogUpdate(vm::cptr<SceCommonDialogUpdateParam> updateParam)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.h b/rpcs3/Emu/PSP2/Modules/sceCommonDialog.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceCommonDialog.h
rename to rpcs3/Emu/PSP2/Modules/sceCommonDialog.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp b/rpcs3/Emu/PSP2/Modules/sceCtrl.cpp
similarity index 93%
rename from rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp
rename to rpcs3/Emu/PSP2/Modules/sceCtrl.cpp
index 1351e97738..ca5f36e827 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceCtrl.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceCtrl.h"
 
-LOG_CHANNEL(sceCtrl);
+logs::channel sceCtrl("sceCtrl", logs::level::notice);
 
 s32 sceCtrlSetSamplingMode(u32 uiMode)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCtrl.h b/rpcs3/Emu/PSP2/Modules/sceCtrl.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceCtrl.h
rename to rpcs3/Emu/PSP2/Modules/sceCtrl.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp b/rpcs3/Emu/PSP2/Modules/sceDbg.cpp
similarity index 91%
rename from rpcs3/Emu/ARMv7/Modules/sceDbg.cpp
rename to rpcs3/Emu/PSP2/Modules/sceDbg.cpp
index 3617d18e07..dacfd1066c 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceDbg.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceDbg.h"
 
-LOG_CHANNEL(sceDbg);
+logs::channel sceDbg("sceDbg", logs::level::notice);
 
 s32 sceDbgSetMinimumLogLevel(s32 minimumLogLevel)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDbg.h b/rpcs3/Emu/PSP2/Modules/sceDbg.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceDbg.h
rename to rpcs3/Emu/PSP2/Modules/sceDbg.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp b/rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp
similarity index 90%
rename from rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp
rename to rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp
index abacc1199e..3b79bb78ee 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceDeci4p.h"
 
-LOG_CHANNEL(sceDeci4p);
+logs::channel sceDeci4p("sceDeci4p", logs::level::notice);
 
 s32 sceKernelDeci4pOpen(vm::cptr<char> protoname, u32 protonum, u32 bufsize)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.h b/rpcs3/Emu/PSP2/Modules/sceDeci4p.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceDeci4p.h
rename to rpcs3/Emu/PSP2/Modules/sceDeci4p.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp b/rpcs3/Emu/PSP2/Modules/sceDeflt.cpp
similarity index 95%
rename from rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp
rename to rpcs3/Emu/PSP2/Modules/sceDeflt.cpp
index dc70310c59..32e34b9060 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceDeflt.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceDeflt.h"
 
-LOG_CHANNEL(sceDeflt);
+logs::channel sceDeflt("sceDeflt", logs::level::notice);
 
 s32 sceGzipIsValid(vm::cptr<void> pSrcGzip)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeflt.h b/rpcs3/Emu/PSP2/Modules/sceDeflt.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceDeflt.h
rename to rpcs3/Emu/PSP2/Modules/sceDeflt.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp b/rpcs3/Emu/PSP2/Modules/sceDisplay.cpp
similarity index 95%
rename from rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp
rename to rpcs3/Emu/PSP2/Modules/sceDisplay.cpp
index b9f978e3b0..a069620b79 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceDisplay.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceDisplay.h"
 
-LOG_CHANNEL(sceDisplay);
+logs::channel sceDisplay("sceDisplay", logs::level::notice);
 
 s32 sceDisplayGetRefreshRate(vm::ptr<float> pFps)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDisplay.h b/rpcs3/Emu/PSP2/Modules/sceDisplay.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceDisplay.h
rename to rpcs3/Emu/PSP2/Modules/sceDisplay.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp b/rpcs3/Emu/PSP2/Modules/sceFiber.cpp
similarity index 94%
rename from rpcs3/Emu/ARMv7/Modules/sceFiber.cpp
rename to rpcs3/Emu/PSP2/Modules/sceFiber.cpp
index bc769383df..14cb3ea270 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceFiber.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceFiber.h"
 
-LOG_CHANNEL(sceFiber);
+logs::channel sceFiber("sceFiber", logs::level::notice);
 
 s32 _sceFiberInitializeImpl(vm::ptr<SceFiber> fiber, vm::cptr<char> name, vm::ptr<SceFiberEntry> entry, u32 argOnInitialize, vm::ptr<void> addrContext, u32 sizeContext, vm::cptr<SceFiberOptParam> optParam, u32 buildVersion)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceFiber.h b/rpcs3/Emu/PSP2/Modules/sceFiber.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceFiber.h
rename to rpcs3/Emu/PSP2/Modules/sceFiber.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp b/rpcs3/Emu/PSP2/Modules/sceFios.cpp
similarity index 99%
rename from rpcs3/Emu/ARMv7/Modules/sceFios.cpp
rename to rpcs3/Emu/PSP2/Modules/sceFios.cpp
index 67420d112f..08f24eb6dd 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceFios.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceFios.h"
 
-LOG_CHANNEL(sceFios);
+logs::channel sceFios("sceFios", logs::level::notice);
 
 s32 sceFiosInitialize(vm::cptr<SceFiosParams> pParameters)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceFios.h b/rpcs3/Emu/PSP2/Modules/sceFios.h
similarity index 99%
rename from rpcs3/Emu/ARMv7/Modules/sceFios.h
rename to rpcs3/Emu/PSP2/Modules/sceFios.h
index 569c663893..838e31b5ce 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceFios.h
+++ b/rpcs3/Emu/PSP2/Modules/sceFios.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Common.h"
+
 using SceFiosOpCallback = s32(vm::ptr<void> pContext, s32 op, u8 event, s32 err);
 using SceFiosVprintfCallback = s32(vm::cptr<char> fmt, arm_va_args_t ap /* va_list */);
 using SceFiosMemcpyCallback = vm::ptr<void>(vm::ptr<void> dst, vm::cptr<void> src, u32 len);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceFpu.cpp b/rpcs3/Emu/PSP2/Modules/sceFpu.cpp
similarity index 94%
rename from rpcs3/Emu/ARMv7/Modules/sceFpu.cpp
rename to rpcs3/Emu/PSP2/Modules/sceFpu.cpp
index 9dda61cf8e..e6480e5528 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceFpu.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceFpu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceFpu.h"
 
-LOG_CHANNEL(sceFpu);
+logs::channel sceFpu("sceFpu", logs::level::notice);
 
 float sceFpuSinf(float x)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceFpu.h b/rpcs3/Emu/PSP2/Modules/sceFpu.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceFpu.h
rename to rpcs3/Emu/PSP2/Modules/sceFpu.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp b/rpcs3/Emu/PSP2/Modules/sceGxm.cpp
similarity index 99%
rename from rpcs3/Emu/ARMv7/Modules/sceGxm.cpp
rename to rpcs3/Emu/PSP2/Modules/sceGxm.cpp
index 22fb6d3a92..3f433da956 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceGxm.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceGxm.h"
 
-LOG_CHANNEL(sceGxm);
+logs::channel sceGxm("sceGxm", logs::level::notice);
 
 s32 sceGxmInitialize(vm::cptr<SceGxmInitializeParams> params)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceGxm.h b/rpcs3/Emu/PSP2/Modules/sceGxm.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceGxm.h
rename to rpcs3/Emu/PSP2/Modules/sceGxm.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp b/rpcs3/Emu/PSP2/Modules/sceHttp.cpp
similarity index 99%
rename from rpcs3/Emu/ARMv7/Modules/sceHttp.cpp
rename to rpcs3/Emu/PSP2/Modules/sceHttp.cpp
index 1889742d60..c52183762e 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceHttp.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceHttp.h"
 
-LOG_CHANNEL(sceHttp);
+logs::channel sceHttp("sceHttp", logs::level::notice);
 
 s32 sceHttpInit(u32 poolSize)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceHttp.h b/rpcs3/Emu/PSP2/Modules/sceHttp.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceHttp.h
rename to rpcs3/Emu/PSP2/Modules/sceHttp.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceIme.cpp b/rpcs3/Emu/PSP2/Modules/sceIme.cpp
similarity index 89%
rename from rpcs3/Emu/ARMv7/Modules/sceIme.cpp
rename to rpcs3/Emu/PSP2/Modules/sceIme.cpp
index 7404b7d5d5..c8499c0b5c 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceIme.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceIme.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceIme.h"
 
-LOG_CHANNEL(sceIme);
+logs::channel sceIme("sceIme", logs::level::notice);
 
 s32 sceImeOpen(vm::ptr<SceImeParam> param)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceIme.h b/rpcs3/Emu/PSP2/Modules/sceIme.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceIme.h
rename to rpcs3/Emu/PSP2/Modules/sceIme.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp b/rpcs3/Emu/PSP2/Modules/sceJpeg.cpp
similarity index 95%
rename from rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp
rename to rpcs3/Emu/PSP2/Modules/sceJpeg.cpp
index cc003a075a..1bc2fcf01b 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceJpeg.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceJpeg.h"
 
-LOG_CHANNEL(sceJpeg);
+logs::channel sceJpeg("sceJpeg", logs::level::notice);
 
 s32 sceJpegInitMJpeg(s32 maxSplitDecoder)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpeg.h b/rpcs3/Emu/PSP2/Modules/sceJpeg.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceJpeg.h
rename to rpcs3/Emu/PSP2/Modules/sceJpeg.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp b/rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp
similarity index 94%
rename from rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp
rename to rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp
index 6146d926ba..afec5b64b1 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceJpegEnc.h"
 
-LOG_CHANNEL(sceJpegEnc);
+logs::channel sceJpegEnc("sceJpegEnc", logs::level::notice);
 
 s32 sceJpegEncoderGetContextSize()
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.h b/rpcs3/Emu/PSP2/Modules/sceJpegEnc.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceJpegEnc.h
rename to rpcs3/Emu/PSP2/Modules/sceJpegEnc.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp
similarity index 77%
rename from rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
rename to rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp
index f2ce259f97..114e7341bf 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp
@@ -1,18 +1,20 @@
 #include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/IdManager.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/IPC.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceLibKernel.h"
 
 #include "Utilities/StrUtil.h"
+#include "Utilities/lockless.h"
 
-LOG_CHANNEL(sceLibKernel);
+#include <algorithm>
+
+logs::channel sceLibKernel("sceLibKernel", logs::level::notice);
 
 extern u64 get_system_time();
 
-extern std::condition_variable& get_current_thread_cv();
-
 s32 sceKernelAllocMemBlock(vm::cptr<char> name, s32 type, u32 vsize, vm::ptr<SceKernelAllocMemBlockOpt> pOpt)
 {
 	throw EXCEPTION("");
@@ -75,7 +77,7 @@ arm_error_code sceKernelStartThread(s32 threadId, u32 argSize, vm::cptr<void> pA
 	thread->GPR[1] = pos;
 
 	thread->state -= cpu_state::stop;
-	thread->lock_notify();
+	(*thread)->lock_notify();
 	return SCE_OK;
 }
 
@@ -207,19 +209,6 @@ s32 sceKernelGetSystemInfo(vm::ptr<SceKernelSystemInfo> pInfo)
 	throw EXCEPTION("");
 }
 
-arm_error_code sceKernelGetThreadmgrUIDClass(s32 uid)
-{
-	sceLibKernel.error("sceKernelGetThreadmgrUIDClass(uid=0x%x)", uid);
-
-	if (idm::check<ARMv7Thread>(uid)) return SCE_KERNEL_THREADMGR_UID_CLASS_THREAD;
-	if (idm::check<psv_semaphore_t>(uid)) return SCE_KERNEL_THREADMGR_UID_CLASS_SEMA;
-	if (idm::check<psv_event_flag_t>(uid)) return SCE_KERNEL_THREADMGR_UID_CLASS_EVENT_FLAG;
-	if (idm::check<psv_mutex_t>(uid)) return SCE_KERNEL_THREADMGR_UID_CLASS_MUTEX;
-	if (idm::check<psv_cond_t>(uid)) return SCE_KERNEL_THREADMGR_UID_CLASS_COND;
-	
-	return SCE_KERNEL_ERROR_INVALID_UID;
-}
-
 s32 sceKernelChangeThreadVfpException(s32 clearMask, s32 setMask)
 {
 	sceLibKernel.todo("sceKernelChangeThreadVfpException(clearMask=0x%x, setMask=0x%x)", clearMask, setMask);
@@ -263,12 +252,7 @@ arm_error_code sceKernelWaitThreadEnd(s32 threadId, vm::ptr<s32> pExitStatus, vm
 	{
 	}
 
-	while (!(thread->state & cpu_state::exit))
-	{
-		CHECK_EMU_STATUS;
-
-		std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack
-	}
+	(*thread)->join();
 
 	if (pExitStatus)
 	{
@@ -374,20 +358,352 @@ s32 sceKernelWaitMultipleEventsCB(vm::ptr<SceKernelWaitEvent> pWaitEventList, s3
 	throw EXCEPTION("");
 }
 
-// Event flag functions
+struct psp2_event_flag final
+{
+	struct alignas(8) ctrl_t
+	{
+		u32 waiters;
+		u32 pattern;
+	};
+
+	atomic_t<ctrl_t> ctrl;    // Sync variable
+	atomic_t<u64> wait_ctr{}; // FIFO ordering helper
+
+	using ipc = ipc_manager<psp2_event_flag, std::string>;
+
+	const std::string name;   // IPC/Debug Name
+	atomic_t<u32> ipc_ref{1}; // IPC Ref Count
+
+	const u32 attr;
+	const u32 init;
+
+	psp2_event_flag(std::string&& name, u32 attr, u32 pattern)
+		: ctrl({0, pattern})
+		, name(std::move(name))
+		, attr(attr)
+		, init(pattern)
+	{
+	}
+
+	static inline bool pat_test(u32 current, u32 pattern, u32 mode)
+	{
+		const u32 or_mask = mode & SCE_KERNEL_EVF_WAITMODE_OR ? pattern : 0;
+		const u32 and_mask = mode & SCE_KERNEL_EVF_WAITMODE_OR ? 0 : pattern;
+
+		return (current & or_mask) != 0 && (current & and_mask) == and_mask;
+	}
+
+	// Get mask for bitwise AND for bit clear operation
+	static inline u32 pat_clear(u32 pattern, u32 mode)
+	{
+		return
+			mode & SCE_KERNEL_EVF_WAITMODE_CLEAR_ALL ? 0 :
+			mode & SCE_KERNEL_EVF_WAITMODE_CLEAR_PAT ? ~pattern : ~0;
+	}
+
+	// Commands
+	enum class task : u32
+	{
+		null = 0,
+		wait,
+		poll,
+		set,
+		clear,
+		cancel,
+		destroy,
+		signal,
+	};
+
+	struct alignas(8) cmd_t
+	{
+		task type;
+		u32 arg;
+	};
+
+	// Enqueue a command and try to execute all pending commands. Commands are executed sequentially.
+	// Returns true if the command has been completed immediately. Its status is unknown otherwise.
+	bool exec(task type, u32 arg)
+	{
+		// Acquire position in the queue
+		const u32 push_pos = m_workload.push_begin();
+
+		// Make the command
+		cmd_t cmd{type, arg};
+
+		u32 pos = m_workload.peek();
+
+		// Check optimistic case
+		if (UNLIKELY(pos != push_pos))
+		{
+			// Write the command
+			m_workload[push_pos] = cmd;
+			pos = m_workload.peek(); // ???
+
+			// Try to acquire a command
+			cmd = m_workload[pos].exchange({task::null});
+		}
+
+		while (true)
+		{
+			switch (cmd.type)
+			{
+			case task::null:
+			{
+				// Return immediately if can't process a command. Possible reasons:
+				// 1) The command has not yet been written
+				// 2) The command has already been acquired
+				return push_pos < pos;
+			}
+
+			case task::wait:    op_wait(cmd.arg); break;
+			case task::poll:    op_poll(cmd.arg); break;
+			case task::set:     op_set(cmd.arg); break;
+			case task::clear:   op_clear(cmd.arg); break;
+			case task::cancel:  op_stop(vm::cast(cmd.arg), SCE_KERNEL_ERROR_WAIT_CANCEL); break;
+			case task::destroy: op_stop(vm::cast(cmd.arg), SCE_KERNEL_ERROR_WAIT_DELETE); break;
+
+			case task::signal:
+			{
+				idm::get<ARMv7Thread>(cmd.arg, [&](u32, ARMv7Thread& cpu)
+				{
+					cpu.state += cpu_state::signal;
+					cpu->lock_notify();
+				});
+
+				break;
+			}
+
+			default: ASSUME(0);
+			}
+
+			// Get next position
+			pos = m_workload.pop_end();
+
+			// Exit after the cleanup
+			if (LIKELY(!pos)) return true;
+
+			// Get next command
+			cmd = m_workload[pos].exchange({task::null});
+		}
+	}
+
+	// Enqueue a command and ensure its completion.
+	void sync(ARMv7Thread& cpu, task type, u32 arg)
+	{
+		if (UNLIKELY(!exec(type, arg)))
+		{
+			if (!exec(task::signal, cpu.id))
+			{
+				thread_lock{cpu}, thread_ctrl::wait(WRAP_EXPR(cpu.state.test_and_reset(cpu_state::signal)));
+			}
+			else
+			{
+				cpu.state -= cpu_state::signal;
+			}
+		}
+	}
+
+private:
+	lf_fifo<atomic_t<cmd_t>, 16> m_workload;
+
+	// Check condition
+	void op_wait(u32 thread_id)
+	{
+		idm::get<ARMv7Thread>(thread_id, [&](u32, ARMv7Thread& cpu)
+		{
+			const u32 pattern = ctrl.atomic_op([&](psp2_event_flag::ctrl_t& state) -> u32
+			{
+				const u32 pat = state.pattern;
+				if (pat_test(pat, cpu.GPR[1], cpu.GPR[0]))
+				{
+					state.pattern &= pat_clear(cpu.GPR[1], cpu.GPR[0]);
+					state.waiters -= attr & SCE_KERNEL_ATTR_MULTI ? 1 : cpu.id;
+					return pat;
+				}
+
+				return 0;
+			});
+
+			if (pattern)
+			{
+				cpu.GPR[0] = SCE_OK;
+				cpu.GPR[1] = pattern;
+				cpu.state += cpu_state::signal;
+				cpu->lock_notify();
+			}
+			else
+			{
+				cpu.owner = this;
+				cpu.GPR_D[1] = ++wait_ctr;
+			}
+		});
+	}
+
+	// Check condition
+	void op_poll(u32 thread_id)
+	{
+		idm::get<ARMv7Thread>(thread_id, [&](u32, ARMv7Thread& cpu)
+		{
+			cpu.GPR[1] = ctrl.atomic_op([&](psp2_event_flag::ctrl_t& state) -> u32
+			{
+				const u32 pat = state.pattern;
+				if (pat_test(pat, cpu.GPR[1], cpu.GPR[0]))
+				{
+					state.pattern &= pat_clear(cpu.GPR[1], cpu.GPR[0]);
+					return pat;
+				}
+
+				return 0;
+			});
+		});
+	}
+
+	// Set pattern bits and wake up threads
+	void op_set(u32 pattern)
+	{
+		const auto new_state = ctrl.op_fetch([&](psp2_event_flag::ctrl_t& state)
+		{
+			state.pattern |= pattern;
+		});
+
+		if (new_state.waiters)
+		{
+			std::vector<std::reference_wrapper<ARMv7Thread>> threads;
+
+			// Check and lock appropriate threads
+			if (attr & SCE_KERNEL_ATTR_MULTI)
+			{
+				threads.reserve(new_state.waiters);
+
+				idm::select<ARMv7Thread>([&](u32 id, ARMv7Thread& cpu)
+				{
+					if (cpu->lock_if(WRAP_EXPR(cpu.owner == this && pat_test(new_state.pattern, cpu.GPR[1], cpu.GPR[0]))))
+					{
+						threads.emplace_back(cpu);
+					}
+				});
+
+				// Sort the thread list using appropriate scheduling policy
+				std::sort(threads.begin(), threads.end(), [&](const ARMv7Thread& cpu1, const ARMv7Thread& cpu2)
+				{
+					if (attr & SCE_KERNEL_ATTR_TH_PRIO && cpu1.prio != cpu2.prio)
+					{
+						return cpu1.prio < cpu2.prio;
+					}
+					else
+					{
+						return cpu1.GPR_D[1] < cpu2.GPR_D[1];
+					}
+				});
+			}
+			else
+			{
+				idm::get<ARMv7Thread>(new_state.waiters, [&](u32 id, ARMv7Thread& cpu)
+				{
+					if (cpu->lock_if(WRAP_EXPR(cpu.owner == this && pat_test(new_state.pattern, cpu.GPR[1], cpu.GPR[0]))))
+					{
+						threads.emplace_back(cpu);
+					}
+				});
+			}
+
+			// Wake up threads
+			for (ARMv7Thread& cpu : threads)
+			{
+				const u32 old_pattern = ctrl.atomic_op([&](psp2_event_flag::ctrl_t& state) -> u32
+				{
+					const u32 pat = state.pattern;
+
+					if (pat_test(pat, cpu.GPR[1], cpu.GPR[0]))
+					{
+						state.pattern &= pat_clear(cpu.GPR[1], cpu.GPR[0]);
+						state.waiters -= attr & SCE_KERNEL_ATTR_MULTI ? 1 : cpu.id;
+						return pat;
+					}
+
+					return 0;
+				});
+
+				if (old_pattern)
+				{
+					cpu.GPR[0] = SCE_OK;
+					cpu.GPR[1] = old_pattern;
+					cpu.state += cpu_state::signal;
+					cpu.owner = nullptr;
+					cpu->unlock();
+					cpu->notify();
+				}
+				else
+				{
+					cpu->unlock();
+				}
+			}
+		}
+	}
+
+	// Clear pattern bits (bitwise AND)
+	void op_clear(u32 pattern)
+	{
+		ctrl.atomic_op([&](psp2_event_flag::ctrl_t& state)
+		{
+			state.pattern &= pattern;
+		});
+	}
+
+	// Wake up all threads
+	void op_stop(vm::ptr<u32> ptr, s32 error)
+	{
+		s32 result = 0;
+		const u32 pattern = ptr ? ptr->value() : ctrl.load().pattern;
+
+		idm::select<ARMv7Thread>([&](u32, ARMv7Thread& cpu)
+		{
+			if (cpu->lock_if(WRAP_EXPR(cpu.owner == this)))
+			{
+				cpu.GPR[0] = error;
+				cpu.GPR[1] = pattern;
+				cpu.state += cpu_state::signal;
+				cpu.owner = nullptr;
+				cpu->unlock();
+				cpu->notify();
+				result++;
+			}
+		});
+
+		if (ptr)
+		{
+			*ptr = result;
+		}
+
+		ctrl.atomic_op([&](psp2_event_flag::ctrl_t& state)
+		{
+			state.pattern = pattern;
+			state.waiters = attr & SCE_KERNEL_ATTR_MULTI ? state.waiters - result : 0;
+		});
+	}
+};
+
+template<> DECLARE(psp2_event_flag::ipc::g_ipc) {};
 
 arm_error_code sceKernelCreateEventFlag(vm::cptr<char> pName, u32 attr, u32 initPattern, vm::cptr<SceKernelEventFlagOptParam> pOptParam)
 {
 	sceLibKernel.error("sceKernelCreateEventFlag(pName=*0x%x, attr=0x%x, initPattern=0x%x, pOptParam=*0x%x)", pName, attr, initPattern, pOptParam);
 
-	return NOT_AN_ERROR(idm::make<psv_event_flag_t>(pName.get_ptr(), attr, initPattern));
+	// Create EVF
+	auto evf = std::make_shared<psp2_event_flag>(pName.get_ptr(), attr, initPattern);
+
+	// Try to register IPC name, only if not empty string (TODO)
+	if (evf->name.empty() || !psp2_event_flag::ipc::add(evf->name, WRAP_EXPR(evf))) evf->ipc_ref = 0;
+
+	// Register ID
+	return NOT_AN_ERROR(idm::import_existing(evf));
 }
 
 arm_error_code sceKernelDeleteEventFlag(s32 evfId)
 {
 	sceLibKernel.error("sceKernelDeleteEventFlag(evfId=0x%x)", evfId);
 
-	const auto evf = idm::withdraw<psv_event_flag_t>(evfId);
+	const auto evf = idm::withdraw<psp2_event_flag>(evfId);
 
 	if (!evf)
 	{
@@ -395,9 +711,15 @@ arm_error_code sceKernelDeleteEventFlag(s32 evfId)
 	}
 
 	// Unregister IPC name
-	if (evf->ref.atomic_op(ipc_ref_try_unregister))
+	if (evf->ipc_ref.fetch_op([](u32& ref) { if (ref) ref--; }))
 	{
-		evf->destroy();
+		psp2_event_flag::ipc::remove(evf->name);
+	}
+
+	// Finalize the last reference
+	if (!evf->ipc_ref)
+	{
+		evf->exec(psp2_event_flag::task::destroy, 0);
 	}
 
 	return SCE_OK;
@@ -407,35 +729,32 @@ arm_error_code sceKernelOpenEventFlag(vm::cptr<char> pName)
 {
 	sceLibKernel.error("sceKernelOpenEventFlag(pName=*0x%x)", pName);
 
-	// For now, go through all objects to find the name
-	for (const auto& data : idm::get_map<psv_event_flag_t>())
-	{
-		const auto& evf = data.second;
+	const auto evf = psp2_event_flag::ipc::get(pName.get_ptr());
 
-		if (evf->name == pName.get_ptr() && evf->ref.atomic_op(ipc_ref_try_inc))
-		{
-			return NOT_AN_ERROR(idm::import_existing(evf));
-		}
+	// Try to add IPC reference
+	if (!evf || !evf->ipc_ref.fetch_op([](u32& ref) { if (ref) ref++; }))
+	{
+		return SCE_KERNEL_ERROR_UID_CANNOT_FIND_BY_NAME;
 	}
 
-	return SCE_KERNEL_ERROR_UID_CANNOT_FIND_BY_NAME;
+	return NOT_AN_ERROR(idm::import_existing(evf));
 }
 
 arm_error_code sceKernelCloseEventFlag(s32 evfId)
 {
 	sceLibKernel.error("sceKernelCloseEventFlag(evfId=0x%x)", evfId);
 
-	const auto evf = idm::withdraw<psv_event_flag_t>(evfId);
+	const auto evf = idm::withdraw<psp2_event_flag>(evfId);
 
-	if (!evf)
+	if (!evf || !evf->ipc_ref)
 	{
 		return SCE_KERNEL_ERROR_INVALID_UID;
 	}
 
-	// Decrement IPC ref
-	if (evf->ref.atomic_op(ipc_ref_try_dec))
+	// Remove one IPC reference
+	if (!evf->ipc_ref.op_fetch([](u32& ref) { if (ref) ref--; }))
 	{
-		evf->destroy();
+		evf->exec(psp2_event_flag::task::destroy, 0);
 	}
 
 	return SCE_OK;
@@ -448,52 +767,64 @@ arm_error_code sceKernelWaitEventFlag(ARMv7Thread& cpu, s32 evfId, u32 bitPatter
 	const u64 start_time = pTimeout ? get_system_time() : 0;
 	const u32 timeout = pTimeout ? pTimeout->value() : 0;
 
-	const auto evf = idm::get<psv_event_flag_t>(evfId);
+	const auto evf = idm::get<psp2_event_flag>(evfId);
 
 	if (!evf)
 	{
 		return SCE_KERNEL_ERROR_INVALID_UID;
 	}
 
-	std::unique_lock<std::mutex> lock(evf->mutex);
-
-	const u32 result = evf->pattern.fetch_op(event_flag_try_poll, bitPattern, waitMode);
-
-	if (event_flag_test(result, bitPattern, waitMode))
+	// First chance
+	const auto state = evf->ctrl.fetch_op([&](psp2_event_flag::ctrl_t& state)
 	{
-		if (pResultPat) *pResultPat = result;
+		if (!state.waiters && psp2_event_flag::pat_test(state.pattern, bitPattern, waitMode))
+		{
+			state.pattern &= psp2_event_flag::pat_clear(bitPattern, waitMode);
+		}
+		else if (evf->attr & SCE_KERNEL_ATTR_MULTI)
+		{
+			state.waiters++;
+		}
+		else if (!state.waiters)
+		{
+			state.waiters = cpu.id;
+		}
+	});
 
+	if (state.waiters && !(evf->attr & SCE_KERNEL_ATTR_MULTI))
+	{
+		return SCE_KERNEL_ERROR_EVF_MULTI;
+	}
+
+	if (!state.waiters && psp2_event_flag::pat_test(state.pattern, bitPattern, waitMode))
+	{
+		if (pResultPat) *pResultPat = state.pattern;
 		return SCE_OK;
 	}
 
-	// fixup register values for external use
+	// Set register values for external use
+	cpu.GPR[0] = waitMode;
 	cpu.GPR[1] = bitPattern;
-	cpu.GPR[2] = waitMode;
 
-	// add waiter; attributes are ignored in current implementation
-	sleep_entry<cpu_thread> waiter(evf->sq, cpu);
-
-	while (!cpu.state.test_and_reset(cpu_state::signal))
+	// Second chance
+	if (evf->exec(psp2_event_flag::task::wait, cpu.id) && cpu.state.test_and_reset(cpu_state::signal))
 	{
-		CHECK_EMU_STATUS;
+		if (pResultPat) *pResultPat = cpu.GPR[1];
+		return SCE_OK;
+	}
 
-		if (pTimeout)
+	cpu_thread_lock entry(cpu);
+
+	if (!thread_ctrl::wait(timeout, WRAP_EXPR(cpu.state.test_and_reset(cpu_state::signal))))
+	{
+		// Timeout cleanup
+		cpu.owner = nullptr;
+		cpu.GPR[0] = SCE_KERNEL_ERROR_WAIT_TIMEOUT;
+		cpu.GPR[1] = evf->ctrl.atomic_op([&](psp2_event_flag::ctrl_t& state)
 		{
-			const u64 passed = get_system_time() - start_time;
-
-			if (passed >= timeout)
-			{
-				cpu.GPR[0] = SCE_KERNEL_ERROR_WAIT_TIMEOUT;
-				cpu.GPR[1] = evf->pattern;
-				break;
-			}
-
-			get_current_thread_cv().wait_for(lock, std::chrono::microseconds(timeout - passed));
-		}
-		else
-		{
-			get_current_thread_cv().wait(lock);
-		}
+			state.waiters -= evf->attr & SCE_KERNEL_ATTR_MULTI ? 1 : cpu.id;
+			return state.pattern;
+		});
 	}
 
 	if (pResultPat) *pResultPat = cpu.GPR[1];
@@ -509,73 +840,63 @@ arm_error_code sceKernelWaitEventFlagCB(ARMv7Thread& cpu, s32 evfId, u32 bitPatt
 	return sceKernelWaitEventFlag(cpu, evfId, bitPattern, waitMode, pResultPat, pTimeout);
 }
 
-arm_error_code sceKernelPollEventFlag(s32 evfId, u32 bitPattern, u32 waitMode, vm::ptr<u32> pResultPat)
+arm_error_code sceKernelPollEventFlag(ARMv7Thread& cpu, s32 evfId, u32 bitPattern, u32 waitMode, vm::ptr<u32> pResultPat)
 {
 	sceLibKernel.error("sceKernelPollEventFlag(evfId=0x%x, bitPattern=0x%x, waitMode=0x%x, pResultPat=*0x%x)", evfId, bitPattern, waitMode, pResultPat);
 
-	const auto evf = idm::get<psv_event_flag_t>(evfId);
+	const auto evf = idm::get<psp2_event_flag>(evfId);
 
 	if (!evf)
 	{
 		return SCE_KERNEL_ERROR_INVALID_UID;
 	}
 
-	std::lock_guard<std::mutex> lock(evf->mutex);
-
-	const u32 result = evf->pattern.fetch_op(event_flag_try_poll, bitPattern, waitMode);
-
-	if (!event_flag_test(result, bitPattern, waitMode))
+	// First chance
+	const auto state = evf->ctrl.fetch_op([&](psp2_event_flag::ctrl_t& state)
 	{
-		return SCE_KERNEL_ERROR_EVENT_COND;
+		if (!state.waiters && psp2_event_flag::pat_test(state.pattern, bitPattern, waitMode))
+		{
+			state.pattern &= psp2_event_flag::pat_clear(bitPattern, waitMode);
+		}
+	});
+
+	if (psp2_event_flag::pat_test(state.pattern, bitPattern, waitMode))
+	{
+		if (!state.waiters)
+		{
+			*pResultPat = state.pattern;
+			return SCE_OK;
+		}
+
+		cpu.GPR[0] = waitMode;
+		cpu.GPR[1] = bitPattern;
+		
+		evf->sync(cpu, psp2_event_flag::task::poll, cpu.id);
+
+		if (cpu.GPR[1])
+		{
+			*pResultPat = cpu.GPR[1];
+			return SCE_OK;
+		}
 	}
 
-	*pResultPat = result;
-
-	return SCE_OK;
+	return NOT_AN_ERROR(SCE_KERNEL_ERROR_EVENT_COND);
 }
 
 arm_error_code sceKernelSetEventFlag(s32 evfId, u32 bitPattern)
 {
 	sceLibKernel.error("sceKernelSetEventFlag(evfId=0x%x, bitPattern=0x%x)", evfId, bitPattern);
 
-	const auto evf = idm::get<psv_event_flag_t>(evfId);
+	const auto evf = idm::get<psp2_event_flag>(evfId);
 
 	if (!evf)
 	{
 		return SCE_KERNEL_ERROR_INVALID_UID;
 	}
 
-	std::lock_guard<std::mutex> lock(evf->mutex);
-
-	evf->pattern |= bitPattern;
-
-	auto pred = [&](cpu_thread* thread) -> bool
+	if (!evf->exec(psp2_event_flag::task::set, bitPattern))
 	{
-		auto& cpu = static_cast<ARMv7Thread&>(*thread);
-
-		// load pattern and mode from registers
-		const u32 pattern = cpu.GPR[1];
-		const u32 mode = cpu.GPR[2];
-
-		// check specific pattern
-		const u32 result = evf->pattern.fetch_op(event_flag_try_poll, pattern, mode);
-
-		if (event_flag_test(result, pattern, mode))
-		{
-			// save pattern
-			cpu.GPR[0] = SCE_OK;
-			cpu.GPR[1] = result;
-
-			thread->state += cpu_state::signal;
-			thread->notify();
-			return true;
-		}
-
-		return false;
-	};
-
-	// check all waiters; protocol is ignored in current implementation
-	evf->sq.erase(std::remove_if(evf->sq.begin(), evf->sq.end(), pred), evf->sq.end());
+	}
 
 	return SCE_OK;
 }
@@ -584,45 +905,34 @@ arm_error_code sceKernelClearEventFlag(s32 evfId, u32 bitPattern)
 {
 	sceLibKernel.error("sceKernelClearEventFlag(evfId=0x%x, bitPattern=0x%x)", evfId, bitPattern);
 
-	const auto evf = idm::get<psv_event_flag_t>(evfId);
+	const auto evf = idm::get<psp2_event_flag>(evfId);
 
 	if (!evf)
 	{
 		return SCE_KERNEL_ERROR_INVALID_UID;
 	}
 
-	std::lock_guard<std::mutex> lock(evf->mutex);
-
-	evf->pattern &= ~bitPattern;
+	if (!evf->exec(psp2_event_flag::task::clear, bitPattern))
+	{
+	}
 
 	return SCE_OK;
 }
 
-arm_error_code sceKernelCancelEventFlag(s32 evfId, u32 setPattern, vm::ptr<s32> pNumWaitThreads)
+arm_error_code sceKernelCancelEventFlag(ARMv7Thread& cpu, s32 evfId, u32 setPattern, vm::ptr<s32> pNumWaitThreads)
 {
 	sceLibKernel.error("sceKernelCancelEventFlag(evfId=0x%x, setPattern=0x%x, pNumWaitThreads=*0x%x)", evfId, setPattern, pNumWaitThreads);
 
-	const auto evf = idm::get<psv_event_flag_t>(evfId);
+	const auto evf = idm::get<psp2_event_flag>(evfId);
 
 	if (!evf)
 	{
 		return SCE_KERNEL_ERROR_INVALID_UID;
 	}
 
-	std::lock_guard<std::mutex> lock(evf->mutex);
+	*pNumWaitThreads = setPattern;
 
-	for (auto& thread : evf->sq)
-	{
-		static_cast<ARMv7Thread&>(*thread).GPR[0] = SCE_KERNEL_ERROR_WAIT_CANCEL;
-		static_cast<ARMv7Thread&>(*thread).GPR[1] = setPattern;
-		thread->state += cpu_state::signal;
-		thread->notify();
-	}
-
-	*pNumWaitThreads = static_cast<u32>(evf->sq.size());
-
-	evf->pattern = setPattern;
-	evf->sq.clear();
+	evf->sync(cpu, psp2_event_flag::task::cancel, pNumWaitThreads.addr());
 
 	return SCE_OK;
 }
@@ -631,15 +941,13 @@ arm_error_code sceKernelGetEventFlagInfo(s32 evfId, vm::ptr<SceKernelEventFlagIn
 {
 	sceLibKernel.error("sceKernelGetEventFlagInfo(evfId=0x%x, pInfo=*0x%x)", evfId, pInfo);
 
-	const auto evf = idm::get<psv_event_flag_t>(evfId);
+	const auto evf = idm::get<psp2_event_flag>(evfId);
 
 	if (!evf)
 	{
 		return SCE_KERNEL_ERROR_INVALID_UID;
 	}
 
-	std::lock_guard<std::mutex> lock(evf->mutex);
-
 	pInfo->size = SIZE_32(SceKernelEventFlagInfo);
 	pInfo->evfId = evfId;
 	
@@ -647,8 +955,11 @@ arm_error_code sceKernelGetEventFlagInfo(s32 evfId, vm::ptr<SceKernelEventFlagIn
 
 	pInfo->attr = evf->attr;
 	pInfo->initPattern = evf->init;
-	pInfo->currentPattern = evf->pattern;
-	pInfo->numWaitThreads = static_cast<u32>(evf->sq.size());
+
+	const auto state = evf->ctrl.load();
+
+	pInfo->currentPattern = state.pattern;
+	pInfo->numWaitThreads = evf->attr & SCE_KERNEL_ATTR_MULTI ? state.waiters : state.waiters != 0;
 
 	return SCE_OK;
 }
@@ -659,14 +970,14 @@ arm_error_code sceKernelCreateSema(vm::cptr<char> pName, u32 attr, s32 initCount
 {
 	sceLibKernel.error("sceKernelCreateSema(pName=*0x%x, attr=0x%x, initCount=%d, maxCount=%d, pOptParam=*0x%x)", pName, attr, initCount, maxCount, pOptParam);
 
-	return NOT_AN_ERROR(idm::make<psv_semaphore_t>(pName.get_ptr(), attr, initCount, maxCount));
+	return NOT_AN_ERROR(idm::make<psp2_semaphore>(pName.get_ptr(), attr, initCount, maxCount));
 }
 
 arm_error_code sceKernelDeleteSema(s32 semaId)
 {
 	sceLibKernel.error("sceKernelDeleteSema(semaId=0x%x)", semaId);
 
-	const auto sema = idm::withdraw<psv_semaphore_t>(semaId);
+	const auto sema = idm::withdraw<psp2_semaphore>(semaId);
 
 	if (!sema)
 	{
@@ -692,7 +1003,7 @@ arm_error_code sceKernelWaitSema(s32 semaId, s32 needCount, vm::ptr<u32> pTimeou
 {
 	sceLibKernel.error("sceKernelWaitSema(semaId=0x%x, needCount=%d, pTimeout=*0x%x)", semaId, needCount, pTimeout);
 
-	const auto sema = idm::get<psv_semaphore_t>(semaId);
+	const auto sema = idm::get<psp2_semaphore>(semaId);
 
 	if (!sema)
 	{
@@ -735,14 +1046,14 @@ arm_error_code sceKernelCreateMutex(vm::cptr<char> pName, u32 attr, s32 initCoun
 {
 	sceLibKernel.error("sceKernelCreateMutex(pName=*0x%x, attr=0x%x, initCount=%d, pOptParam=*0x%x)", pName, attr, initCount, pOptParam);
 
-	return NOT_AN_ERROR(idm::make<psv_mutex_t>(pName.get_ptr(), attr, initCount));
+	return NOT_AN_ERROR(idm::make<psp2_mutex>(pName.get_ptr(), attr, initCount));
 }
 
 arm_error_code sceKernelDeleteMutex(s32 mutexId)
 {
 	sceLibKernel.error("sceKernelDeleteMutex(mutexId=0x%x)", mutexId);
 
-	const auto mutex = idm::withdraw<psv_mutex_t>(mutexId);
+	const auto mutex = idm::withdraw<psp2_mutex>(mutexId);
 
 	if (!mutex)
 	{
@@ -842,21 +1153,21 @@ arm_error_code sceKernelCreateCond(vm::cptr<char> pName, u32 attr, s32 mutexId,
 {
 	sceLibKernel.error("sceKernelCreateCond(pName=*0x%x, attr=0x%x, mutexId=0x%x, pOptParam=*0x%x)", pName, attr, mutexId, pOptParam);
 
-	const auto mutex = idm::get<psv_mutex_t>(mutexId);
+	const auto mutex = idm::get<psp2_mutex>(mutexId);
 
 	if (!mutex)
 	{
 		return SCE_KERNEL_ERROR_INVALID_UID;
 	}
 
-	return NOT_AN_ERROR(idm::make<psv_cond_t>(pName.get_ptr(), attr, mutex));
+	return NOT_AN_ERROR(idm::make<psp2_cond>(pName.get_ptr(), attr, mutex));
 }
 
 arm_error_code sceKernelDeleteCond(s32 condId)
 {
 	sceLibKernel.error("sceKernelDeleteCond(condId=0x%x)", condId);
 
-	const auto cond = idm::withdraw<psv_cond_t>(condId);
+	const auto cond = idm::withdraw<psp2_cond>(condId);
 
 	if (!cond)
 	{
@@ -1121,6 +1432,19 @@ s32 sceKernelGetRWLockInfo(s32 rwLockId, vm::ptr<SceKernelRWLockInfo> pInfo)
 	throw EXCEPTION("");
 }
 
+arm_error_code sceKernelGetThreadmgrUIDClass(s32 uid)
+{
+	sceLibKernel.error("sceKernelGetThreadmgrUIDClass(uid=0x%x)", uid);
+
+	if (idm::check<ARMv7Thread>(uid)) return SCE_KERNEL_THREADMGR_UID_CLASS_THREAD;
+	if (idm::check<psp2_semaphore>(uid)) return SCE_KERNEL_THREADMGR_UID_CLASS_SEMA;
+	if (idm::check<psp2_event_flag>(uid)) return SCE_KERNEL_THREADMGR_UID_CLASS_EVENT_FLAG;
+	if (idm::check<psp2_mutex>(uid)) return SCE_KERNEL_THREADMGR_UID_CLASS_MUTEX;
+	if (idm::check<psp2_cond>(uid)) return SCE_KERNEL_THREADMGR_UID_CLASS_COND;
+
+	return SCE_KERNEL_ERROR_INVALID_UID;
+}
+
 // IO/File functions
 
 s32 sceIoRemove(vm::cptr<char> filename)
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h b/rpcs3/Emu/PSP2/Modules/sceLibKernel.h
similarity index 94%
rename from rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
rename to rpcs3/Emu/PSP2/Modules/sceLibKernel.h
index 443b2f5df1..7bab50ac68 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
+++ b/rpcs3/Emu/PSP2/Modules/sceLibKernel.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include "Utilities/SleepQueue.h"
-#include "Emu/ARMv7/ErrorCodes.h"
+#include "Emu/PSP2/ErrorCodes.h"
+#include "Emu/PSP2/Modules/Common.h"
 
 // Error Codes
-
 enum SceLibKernelError : s32
 {
 	SCE_KERNEL_ERROR_ERROR                                        = ERROR_CODE(0x80020001),
@@ -99,6 +98,7 @@ enum SceLibKernelError : s32
 	SCE_KERNEL_ERROR_ILLEGAL_SELF_HEADER                          = ERROR_CODE(0x80025002),
 };
 
+// Error Codes
 enum SceLibKernelError0 : s32
 {
 	SCE_KERNEL_ERROR_EXCPMGR_ERROR                                = ERROR_CODE(0x80027000),
@@ -204,6 +204,7 @@ enum SceLibKernelError0 : s32
 	SCE_KERNEL_ERROR_RW_LOCK_FAILED_TO_UNLOCK                     = ERROR_CODE(0x80028046),
 };
 
+// Error Codes
 enum SceLibKernelError1 : s32
 {
 	SCE_KERNEL_ERROR_PROCESSMGR_ERROR                             = ERROR_CODE(0x80029000),
@@ -535,7 +536,8 @@ inline const char* arm_error_code::print(SceLibKernelError1 error)
 	return nullptr;
 }
 
-enum psv_object_class_t : u32
+// PSP2 UID Class
+enum : u32
 {
 	SCE_KERNEL_UID_CLASS_PROCESS = 0,
 	SCE_KERNEL_THREADMGR_UID_CLASS_THREAD = 1,
@@ -589,6 +591,15 @@ struct SceKernelAllocMemBlockOpt
 
 // Thread Manager definitions (threads)
 
+enum
+{
+	SCE_KERNEL_ATTR_TH_FIFO = 0,
+	SCE_KERNEL_ATTR_TH_PRIO = 0x2000,
+
+	SCE_KERNEL_ATTR_SINGLE  = 0,      // Event Flag only
+	SCE_KERNEL_ATTR_MULTI   = 0x1000, // Event Flag only
+};
+
 using SceKernelThreadEntry = s32(u32 argSize, vm::ptr<void> pArgBlock);
 
 struct SceKernelThreadOptParam
@@ -727,78 +738,6 @@ struct SceKernelEventFlagInfo
 	le_t<s32> numWaitThreads;
 };
 
-struct psv_event_flag_t
-{
-	const std::string name; // IPC Name
-
-	atomic_t<u32> ref{ 0x80000000 }; // IPC Ref Counter
-
-	const u32 attr; // Event Flag Attributes
-	const u32 init; // Event Flag Init Pattern
-
-	atomic_t<u32> pattern; // Event Flag Pattern
-
-	std::mutex mutex;
-
-	sleep_queue<cpu_thread> sq;
-
-	psv_event_flag_t(const char* name, u32 attr, u32 pattern)
-		: name(name)
-		, attr(attr)
-		, init(pattern)
-		, pattern(pattern)
-	{
-	}
-
-	// Wakeup all waiters to return SCE_KERNEL_ERROR_WAIT_DELETE
-	void destroy()
-	{
-		std::lock_guard<std::mutex> lock(mutex);
-
-		const u32 pattern = this->pattern;
-
-		for (auto& thread : sq)
-		{
-			static_cast<ARMv7Thread&>(*thread).GPR[0] = SCE_KERNEL_ERROR_WAIT_DELETE;
-			static_cast<ARMv7Thread&>(*thread).GPR[1] = pattern;
-			thread->state += cpu_state::signal;
-			thread->notify();
-		}
-	}
-};
-
-inline bool event_flag_test(u32 value, u32 pattern, u32 mode)
-{
-	if (mode & SCE_KERNEL_EVF_WAITMODE_OR)
-	{
-		return (value & pattern) != 0;
-	}
-	else
-	{
-		return (value & pattern) == pattern;
-	}
-}
-
-inline void event_flag_try_poll(u32& value, u32 pattern, u32 mode)
-{
-	if (mode & ~7 || (mode & 6) == 6)
-	{
-		throw EXCEPTION("Unknown mode (0x%x)", mode);
-	}
-
-	if (event_flag_test(value, pattern, mode))
-	{
-		if (mode & SCE_KERNEL_EVF_WAITMODE_CLEAR_ALL)
-		{
-			value = 0;
-		}
-		else if (mode & SCE_KERNEL_EVF_WAITMODE_CLEAR_PAT)
-		{
-			value &= ~pattern;
-		}
-	}
-}
-
 // Thread Manager definitions (semaphores)
 
 struct SceKernelSemaOptParam
@@ -818,18 +757,18 @@ struct SceKernelSemaInfo
 	le_t<s32> numWaitThreads;
 };
 
-struct psv_semaphore_t
+struct psp2_semaphore
 {
 	const std::string name; // IPC Name
 
-	atomic_t<u32> ref{ 0x80000000 }; // IPC Ref Counter
+	atomic_t<u32> ref{}; // IPC Ref Counter
 
 	const u32 attr;
 	const s32 max;
 
 	atomic_t<s32> count;
 
-	psv_semaphore_t(const char* name, u32 attr, s32 count, s32 max)
+	psp2_semaphore(const char* name, u32 attr, s32 count, s32 max)
 		: name(name)
 		, attr(attr)
 		, max(max)
@@ -858,17 +797,17 @@ struct SceKernelMutexInfo
 	le_t<s32> numWaitThreads;
 };
 
-struct psv_mutex_t
+struct psp2_mutex
 {
 	const std::string name; // IPC Name
 
-	atomic_t<u32> ref{ 0x80000000 }; // IPC Ref Counter
+	atomic_t<u32> ref{}; // IPC Ref Counter
 
 	const u32 attr;
 
 	atomic_t<s32> count;
 
-	psv_mutex_t(const char* name, u32 attr, s32 count)
+	psp2_mutex(const char* name, u32 attr, s32 count)
 		: name(name)
 		, attr(attr)
 		, count(count)
@@ -918,17 +857,17 @@ struct SceKernelCondInfo
 	le_t<u32> numWaitThreads;
 };
 
-struct psv_cond_t
+struct psp2_cond
 {
 	const std::string name; // IPC Name
 
-	atomic_t<u32> ref{ 0x80000000 }; // IPC Ref Counter
+	atomic_t<u32> ref{}; // IPC Ref Counter
 
 	const u32 attr;
 
-	const std::shared_ptr<psv_mutex_t> mutex;
+	const std::shared_ptr<psp2_mutex> mutex;
 
-	psv_cond_t(const char* name, u32 attr, const std::shared_ptr<psv_mutex_t>& mutex)
+	psp2_cond(const char* name, u32 attr, const std::shared_ptr<psp2_mutex>& mutex)
 		: name(name)
 		, attr(attr)
 		, mutex(mutex)
@@ -1022,47 +961,3 @@ struct SceIoDirent
 	vm::lptr<void> d_private;
 	le_t<s32> dummy;
 };
-
-// Module
-// Aux
-
-inline bool ipc_ref_try_dec(u32& ref)
-{
-	if (ref & 0x7fffffff)
-	{
-		// return true if the last reference is removed and object must be deleted
-		return !--ref;
-	}
-	else
-	{
-		throw EXCEPTION("Unexpected IPC Ref value (0x%x)", ref);
-	}
-}
-
-inline bool ipc_ref_try_inc(u32& ref)
-{
-	if (ref & 0x80000000)
-	{
-		if (!++ref)
-		{
-			throw EXCEPTION("IPC Ref overflow");
-		}
-
-		return true;
-	}
-
-	return false;
-}
-
-inline bool ipc_ref_try_unregister(u32& ref)
-{
-	if (ref & 0x80000000)
-	{
-		ref &= ~0x80000000;
-
-		// return true if object must be deleted
-		return !ref;
-	}
-
-	throw EXCEPTION("Unexpected IPC Ref value (0x%x)", ref);
-}
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibXml.cpp b/rpcs3/Emu/PSP2/Modules/sceLibXml.cpp
similarity index 99%
rename from rpcs3/Emu/ARMv7/Modules/sceLibXml.cpp
rename to rpcs3/Emu/PSP2/Modules/sceLibXml.cpp
index 789a45e8d7..18d1686c47 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibXml.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceLibXml.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceLibXml.h"
 
-LOG_CHANNEL(sceLibXml);
+logs::channel sceLibXml("sceLibXml", logs::level::notice);
 
 #define REG_FUNC(nid, name) REG_FNID(SceLibXml, nid, name)
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibXml.h b/rpcs3/Emu/PSP2/Modules/sceLibXml.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceLibXml.h
rename to rpcs3/Emu/PSP2/Modules/sceLibXml.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/PSP2/Modules/sceLibc.cpp
similarity index 97%
rename from rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
rename to rpcs3/Emu/PSP2/Modules/sceLibc.cpp
index 4532f085c7..e00b4ca46c 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceLibc.cpp
@@ -1,12 +1,14 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
-#include "Emu/ARMv7/ARMv7Thread.h"
-#include "Emu/ARMv7/ARMv7Callback.h"
+#include "Emu/PSP2/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Thread.h"
+#include "Emu/PSP2/ARMv7Callback.h"
 
 #include "sceLibc.h"
 
-LOG_CHANNEL(sceLibc);
+#include <thread>
+
+logs::channel sceLibc("sceLibc", logs::level::notice);
 
 extern fs::file g_tty;
 
@@ -15,8 +17,6 @@ vm::ptr<void> g_dso;
 
 std::vector<std::function<void(ARMv7Thread&)>> g_atexit;
 
-std::mutex g_atexit_mutex;
-
 std::string arm_fmt(ARMv7Thread& cpu, vm::cptr<char> fmt, u32 g_count)
 {
 	std::string result;
@@ -132,7 +132,7 @@ std::string arm_fmt(ARMv7Thread& cpu, vm::cptr<char> fmt, u32 g_count)
 			case 's':
 			{
 				// string
-				const vm::cptr<char> string{ cpu.get_next_gpr_arg(g_count), vm::addr };
+				const vm::cptr<char> string = vm::cast(cpu.get_next_gpr_arg(g_count));
 
 				if (plus_sign || minus_sign || space_sign || number_sign || zero_padding || width || prec) break;
 
@@ -157,8 +157,6 @@ namespace sce_libc_func
 	{
 		sceLibc.warning("__cxa_atexit(func=*0x%x, arg=*0x%x, dso=*0x%x)", func, arg, dso);
 		
-		std::lock_guard<std::mutex> lock(g_atexit_mutex);
-
 		g_atexit.insert(g_atexit.begin(), [func, arg, dso](ARMv7Thread& cpu)
 		{
 			func(cpu, arg);
@@ -169,8 +167,6 @@ namespace sce_libc_func
 	{
 		sceLibc.warning("__aeabi_atexit(arg=*0x%x, func=*0x%x, dso=*0x%x)", arg, func, dso);
 
-		std::lock_guard<std::mutex> lock(g_atexit_mutex);
-
 		g_atexit.insert(g_atexit.begin(), [func, arg, dso](ARMv7Thread& cpu)
 		{
 			func(cpu, arg);
@@ -181,8 +177,6 @@ namespace sce_libc_func
 	{
 		sceLibc.warning("exit()");
 
-		std::lock_guard<std::mutex> lock(g_atexit_mutex);
-
 		CHECK_EMU_STATUS;
 
 		for (auto& func : decltype(g_atexit)(std::move(g_atexit)))
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.h b/rpcs3/Emu/PSP2/Modules/sceLibc.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceLibc.h
rename to rpcs3/Emu/PSP2/Modules/sceLibc.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp b/rpcs3/Emu/PSP2/Modules/sceLibm.cpp
similarity index 98%
rename from rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
rename to rpcs3/Emu/PSP2/Modules/sceLibm.cpp
index cdadc4e103..c56118c908 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceLibm.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceLibm.h"
 
-LOG_CHANNEL(sceLibm);
+logs::channel sceLibm("sceLibm", logs::level::notice);
 
 namespace sce_libm_func
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibm.h b/rpcs3/Emu/PSP2/Modules/sceLibm.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceLibm.h
rename to rpcs3/Emu/PSP2/Modules/sceLibm.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp b/rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp
similarity index 99%
rename from rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
rename to rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp
index 53fd57dcec..986ba30972 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceLibstdcxx.h"
 
-LOG_CHANNEL(sceLibstdcxx);
+logs::channel sceLibstdcxx("sceLibstdcxx", logs::level::notice);
 
 namespace sce_libstdcxx_func
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.h b/rpcs3/Emu/PSP2/Modules/sceLibstdcxx.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.h
rename to rpcs3/Emu/PSP2/Modules/sceLibstdcxx.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp b/rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp
similarity index 82%
rename from rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp
rename to rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp
index f93fe7479e..9165edaf95 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceLiveArea.h"
 
-LOG_CHANNEL(sceLiveArea);
+logs::channel sceLiveArea("sceLiveArea", logs::level::notice);
 
 s32 sceLiveAreaResourceReplaceAll(vm::cptr<char> dirpath)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLiveArea.h b/rpcs3/Emu/PSP2/Modules/sceLiveArea.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceLiveArea.h
rename to rpcs3/Emu/PSP2/Modules/sceLiveArea.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp b/rpcs3/Emu/PSP2/Modules/sceLocation.cpp
similarity index 96%
rename from rpcs3/Emu/ARMv7/Modules/sceLocation.cpp
rename to rpcs3/Emu/PSP2/Modules/sceLocation.cpp
index c180e99c52..5d8988cdc2 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceLocation.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceLocation.h"
 
-LOG_CHANNEL(sceLocation);
+logs::channel sceLocation("sceLocation", logs::level::notice);
 
 s32 sceLocationOpen(vm::ptr<u8> handle, SceLocationLocationMethod lmethod, SceLocationHeadingMethod hmethod)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLocation.h b/rpcs3/Emu/PSP2/Modules/sceLocation.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceLocation.h
rename to rpcs3/Emu/PSP2/Modules/sceLocation.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp b/rpcs3/Emu/PSP2/Modules/sceMd5.cpp
similarity index 89%
rename from rpcs3/Emu/ARMv7/Modules/sceMd5.cpp
rename to rpcs3/Emu/PSP2/Modules/sceMd5.cpp
index e7f1412a5e..21906de842 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceMd5.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceMd5.h"
 
-LOG_CHANNEL(sceMd5);
+logs::channel sceMd5("sceMd5", logs::level::notice);
 
 s32 sceMd5Digest(vm::cptr<void> plain, u32 len, vm::ptr<u8> digest)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMd5.h b/rpcs3/Emu/PSP2/Modules/sceMd5.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceMd5.h
rename to rpcs3/Emu/PSP2/Modules/sceMd5.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp b/rpcs3/Emu/PSP2/Modules/sceMotion.cpp
similarity index 95%
rename from rpcs3/Emu/ARMv7/Modules/sceMotion.cpp
rename to rpcs3/Emu/PSP2/Modules/sceMotion.cpp
index 10d1729ecd..fc5f858d33 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceMotion.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceMotion.h"
 
-LOG_CHANNEL(sceMotion);
+logs::channel sceMotion("sceMotion", logs::level::notice);
 
 s32 sceMotionGetState(vm::ptr<SceMotionState> motionState)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMotion.h b/rpcs3/Emu/PSP2/Modules/sceMotion.h
similarity index 96%
rename from rpcs3/Emu/ARMv7/Modules/sceMotion.h
rename to rpcs3/Emu/PSP2/Modules/sceMotion.h
index 102108b336..307c50bf5d 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceMotion.h
+++ b/rpcs3/Emu/PSP2/Modules/sceMotion.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Common.h"
+
 struct SceMotionState
 {
 	le_t<u32> timestamp;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp b/rpcs3/Emu/PSP2/Modules/sceMt19937.cpp
similarity index 82%
rename from rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp
rename to rpcs3/Emu/PSP2/Modules/sceMt19937.cpp
index 5acabc9c25..42c4e1d20d 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceMt19937.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceMt19937.h"
 
-LOG_CHANNEL(sceMt19937);
+logs::channel sceMt19937("sceMt19937", logs::level::notice);
 
 s32 sceMt19937Init(vm::ptr<SceMt19937Context> pCtx, u32 seed)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMt19937.h b/rpcs3/Emu/PSP2/Modules/sceMt19937.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceMt19937.h
rename to rpcs3/Emu/PSP2/Modules/sceMt19937.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNet.cpp b/rpcs3/Emu/PSP2/Modules/sceNet.cpp
similarity index 98%
rename from rpcs3/Emu/ARMv7/Modules/sceNet.cpp
rename to rpcs3/Emu/PSP2/Modules/sceNet.cpp
index 1775cb22a4..4945c9ab86 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNet.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceNet.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceNet.h"
 
-LOG_CHANNEL(sceNet);
+logs::channel sceNet("sceNet", logs::level::notice);
 
 s32 sceNetSetDnsInfo(vm::ptr<SceNetDnsInfo> info, s32 flags)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNet.h b/rpcs3/Emu/PSP2/Modules/sceNet.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceNet.h
rename to rpcs3/Emu/PSP2/Modules/sceNet.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp b/rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp
similarity index 96%
rename from rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp
rename to rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp
index 6a19caba05..9390c957ab 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceNetCtl.h"
 
-LOG_CHANNEL(sceNetCtl);
+logs::channel sceNetCtl("sceNetCtl", logs::level::notice);
 
 s32 sceNetCtlInit()
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNetCtl.h b/rpcs3/Emu/PSP2/Modules/sceNetCtl.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceNetCtl.h
rename to rpcs3/Emu/PSP2/Modules/sceNetCtl.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp b/rpcs3/Emu/PSP2/Modules/sceNgs.cpp
similarity index 99%
rename from rpcs3/Emu/ARMv7/Modules/sceNgs.cpp
rename to rpcs3/Emu/PSP2/Modules/sceNgs.cpp
index 7b8005c8f0..c987b844d4 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceNgs.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceNgs.h"
 
-LOG_CHANNEL(sceNgs);
+logs::channel sceNgs("sceNgs", logs::level::notice);
 
 s32 sceNgsSystemGetRequiredMemorySize(vm::cptr<SceNgsSystemInitParams> pSynthParams, vm::ptr<u32> pnSize)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNgs.h b/rpcs3/Emu/PSP2/Modules/sceNgs.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceNgs.h
rename to rpcs3/Emu/PSP2/Modules/sceNgs.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp b/rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp
similarity index 97%
rename from rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp
rename to rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp
index c09a8002c4..7800496720 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceNpBasic.h"
 
-LOG_CHANNEL(sceNpBasic);
+logs::channel sceNpBasic("sceNpBasic", logs::level::notice);
 
 s32 sceNpBasicInit(vm::ptr<void> opt)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.h b/rpcs3/Emu/PSP2/Modules/sceNpBasic.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceNpBasic.h
rename to rpcs3/Emu/PSP2/Modules/sceNpBasic.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp b/rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp
similarity index 94%
rename from rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp
rename to rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp
index f052347148..bfe145d62a 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceNpCommon.h"
 
-LOG_CHANNEL(sceNpCommon);
+logs::channel sceNpCommon("sceNpCommon", logs::level::notice);
 
 s32 sceNpAuthInit()
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h b/rpcs3/Emu/PSP2/Modules/sceNpCommon.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceNpCommon.h
rename to rpcs3/Emu/PSP2/Modules/sceNpCommon.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp b/rpcs3/Emu/PSP2/Modules/sceNpManager.cpp
similarity index 94%
rename from rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp
rename to rpcs3/Emu/PSP2/Modules/sceNpManager.cpp
index e964eaccd2..d0eab10b94 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceNpManager.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceNpManager.h"
 
-LOG_CHANNEL(sceNpManager);
+logs::channel sceNpManager("sceNpManager", logs::level::notice);
 
 s32 sceNpInit(vm::cptr<SceNpCommunicationConfig> commConf, vm::ptr<SceNpOptParam> opt)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpManager.h b/rpcs3/Emu/PSP2/Modules/sceNpManager.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceNpManager.h
rename to rpcs3/Emu/PSP2/Modules/sceNpManager.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp b/rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp
similarity index 98%
rename from rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp
rename to rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp
index 0d19c7d717..83c4b03750 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceNpMatching.h"
 
-LOG_CHANNEL(sceNpMatching);
+logs::channel sceNpMatching("sceNpMatching", logs::level::notice);
 
 // Functions
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.h b/rpcs3/Emu/PSP2/Modules/sceNpMatching.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceNpMatching.h
rename to rpcs3/Emu/PSP2/Modules/sceNpMatching.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp b/rpcs3/Emu/PSP2/Modules/sceNpScore.cpp
similarity index 98%
rename from rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp
rename to rpcs3/Emu/PSP2/Modules/sceNpScore.cpp
index c9557fdc41..88c47ea935 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceNpScore.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceNpScore.h"
 
-LOG_CHANNEL(sceNpScore);
+logs::channel sceNpScore("sceNpScore", logs::level::notice);
 
 s32 sceNpScoreInit(s32 threadPriority, s32 cpuAffinityMask, vm::ptr<void> option)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpScore.h b/rpcs3/Emu/PSP2/Modules/sceNpScore.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceNpScore.h
rename to rpcs3/Emu/PSP2/Modules/sceNpScore.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp b/rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp
similarity index 97%
rename from rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp
rename to rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp
index 561bd9d7a2..a5a46791e0 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceNpUtility.h"
 
-LOG_CHANNEL(sceNpUtility);
+logs::channel sceNpUtility("sceNpUtility", logs::level::notice);
 
 s32 sceNpLookupInit(s32 usesAsync, s32 threadPriority, s32 cpuAffinityMask, vm::ptr<void> option)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpUtility.h b/rpcs3/Emu/PSP2/Modules/sceNpUtility.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceNpUtility.h
rename to rpcs3/Emu/PSP2/Modules/sceNpUtility.h
diff --git a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp b/rpcs3/Emu/PSP2/Modules/scePerf.cpp
similarity index 91%
rename from rpcs3/Emu/ARMv7/Modules/scePerf.cpp
rename to rpcs3/Emu/PSP2/Modules/scePerf.cpp
index bb04f5b6ad..c771da3d2f 100644
--- a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp
+++ b/rpcs3/Emu/PSP2/Modules/scePerf.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "scePerf.h"
 
-LOG_CHANNEL(scePerf);
+logs::channel scePerf("scePerf", logs::level::notice);
 
 extern u64 get_system_time();
 
@@ -12,7 +12,7 @@ arm_error_code scePerfArmPmonReset(ARMv7Thread& cpu, s32 threadId)
 {
 	scePerf.warning("scePerfArmPmonReset(threadId=0x%x)", threadId);
 
-	ASSERT(threadId == SCE_PERF_ARM_PMON_THREAD_ID_SELF);
+	VERIFY(threadId == SCE_PERF_ARM_PMON_THREAD_ID_SELF);
 
 	cpu.counters = {};
 
@@ -23,7 +23,7 @@ arm_error_code scePerfArmPmonSelectEvent(ARMv7Thread& cpu, s32 threadId, u32 cou
 {
 	scePerf.warning("scePerfArmPmonSelectEvent(threadId=0x%x, counter=0x%x, eventCode=0x%x)", threadId, counter, eventCode);
 
-	ASSERT(threadId == SCE_PERF_ARM_PMON_THREAD_ID_SELF);
+	VERIFY(threadId == SCE_PERF_ARM_PMON_THREAD_ID_SELF);
 
 	if (counter >= 6)
 	{
@@ -72,7 +72,7 @@ arm_error_code scePerfArmPmonStart(ARMv7Thread& cpu, s32 threadId)
 {
 	scePerf.warning("scePerfArmPmonStart(threadId=0x%x)", threadId);
 
-	ASSERT(threadId == SCE_PERF_ARM_PMON_THREAD_ID_SELF);
+	VERIFY(threadId == SCE_PERF_ARM_PMON_THREAD_ID_SELF);
 
 	return SCE_OK;
 }
@@ -81,7 +81,7 @@ arm_error_code scePerfArmPmonStop(ARMv7Thread& cpu, s32 threadId)
 {
 	scePerf.warning("scePerfArmPmonStop(threadId=0x%x)");
 
-	ASSERT(threadId == SCE_PERF_ARM_PMON_THREAD_ID_SELF);
+	VERIFY(threadId == SCE_PERF_ARM_PMON_THREAD_ID_SELF);
 
 	return SCE_OK;
 }
@@ -90,7 +90,7 @@ arm_error_code scePerfArmPmonGetCounterValue(ARMv7Thread& cpu, s32 threadId, u32
 {
 	scePerf.warning("scePerfArmPmonGetCounterValue(threadId=0x%x, counter=%d, pValue=*0x%x)", threadId, counter, pValue);
 
-	ASSERT(threadId == SCE_PERF_ARM_PMON_THREAD_ID_SELF);
+	VERIFY(threadId == SCE_PERF_ARM_PMON_THREAD_ID_SELF);
 
 	if (counter >= 6 && counter != SCE_PERF_ARM_PMON_CYCLE_COUNTER)
 	{
diff --git a/rpcs3/Emu/ARMv7/Modules/scePerf.h b/rpcs3/Emu/PSP2/Modules/scePerf.h
similarity index 98%
rename from rpcs3/Emu/ARMv7/Modules/scePerf.h
rename to rpcs3/Emu/PSP2/Modules/scePerf.h
index 81d4833320..acd7c5a383 100644
--- a/rpcs3/Emu/ARMv7/Modules/scePerf.h
+++ b/rpcs3/Emu/PSP2/Modules/scePerf.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Emu/ARMv7/ErrorCodes.h"
+#include "Emu/PSP2/ErrorCodes.h"
 
 enum ScePerfError : s32
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/scePgf.cpp b/rpcs3/Emu/PSP2/Modules/scePgf.cpp
similarity index 93%
rename from rpcs3/Emu/ARMv7/Modules/scePgf.cpp
rename to rpcs3/Emu/PSP2/Modules/scePgf.cpp
index 550c08def8..87418324a9 100644
--- a/rpcs3/Emu/ARMv7/Modules/scePgf.cpp
+++ b/rpcs3/Emu/PSP2/Modules/scePgf.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "scePgf.h"
 
-LOG_CHANNEL(scePgf);
+logs::channel scePgf("scePgf", logs::level::notice);
 
 #define REG_FUNC(nid, name) REG_FNID(ScePgf, nid, name)
 
diff --git a/rpcs3/Emu/ARMv7/Modules/scePgf.h b/rpcs3/Emu/PSP2/Modules/scePgf.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/scePgf.h
rename to rpcs3/Emu/PSP2/Modules/scePgf.h
diff --git a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp b/rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp
similarity index 89%
rename from rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp
rename to rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp
index d2caa21947..ad120525ec 100644
--- a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp
+++ b/rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "scePhotoExport.h"
 
-LOG_CHANNEL(scePhotoExport);
+logs::channel scePhotoExport("scePhotoExport", logs::level::notice);
 
 s32 scePhotoExportFromData(
 	vm::cptr<void> photodata,
diff --git a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.h b/rpcs3/Emu/PSP2/Modules/scePhotoExport.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/scePhotoExport.h
rename to rpcs3/Emu/PSP2/Modules/scePhotoExport.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp b/rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp
similarity index 85%
rename from rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp
rename to rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp
index 5fa33f4102..8e5f828e32 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceRazorCapture.h"
 
-LOG_CHANNEL(sceRazorCapture);
+logs::channel sceRazorCapture("sceRazorCapture", logs::level::notice);
 
 void sceRazorCaptureSetTrigger(u32 frameIndex, vm::cptr<char> captureFilename)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.h b/rpcs3/Emu/PSP2/Modules/sceRazorCapture.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceRazorCapture.h
rename to rpcs3/Emu/PSP2/Modules/sceRazorCapture.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp b/rpcs3/Emu/PSP2/Modules/sceRtc.cpp
similarity index 98%
rename from rpcs3/Emu/ARMv7/Modules/sceRtc.cpp
rename to rpcs3/Emu/PSP2/Modules/sceRtc.cpp
index b0c8836dc6..ea44db8ee7 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceRtc.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceRtc.h"
 
-LOG_CHANNEL(sceRtc);
+logs::channel sceRtc("sceRtc", logs::level::notice);
 
 u32 sceRtcGetTickResolution()
 {
diff --git a/rpcs3/Emu/PSP2/Modules/sceRtc.h b/rpcs3/Emu/PSP2/Modules/sceRtc.h
new file mode 100644
index 0000000000..4fd403207b
--- /dev/null
+++ b/rpcs3/Emu/PSP2/Modules/sceRtc.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "Common.h"
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSas.cpp b/rpcs3/Emu/PSP2/Modules/sceSas.cpp
similarity index 98%
rename from rpcs3/Emu/ARMv7/Modules/sceSas.cpp
rename to rpcs3/Emu/PSP2/Modules/sceSas.cpp
index 52088d1e00..921fadfb9a 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSas.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceSas.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceSas.h"
 
-LOG_CHANNEL(sceSas);
+logs::channel sceSas("sceSas", logs::level::notice);
 
 s32 sceSasGetNeededMemorySize(vm::cptr<char> config, vm::ptr<u32> outSize)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSas.h b/rpcs3/Emu/PSP2/Modules/sceSas.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceSas.h
rename to rpcs3/Emu/PSP2/Modules/sceSas.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp b/rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp
similarity index 87%
rename from rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp
rename to rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp
index a1d4385b02..b9acb49793 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceScreenShot.h"
 
-LOG_CHANNEL(sceScreenShot);
+logs::channel sceScreenShot("sceScreenShot", logs::level::notice);
 
 s32 sceScreenShotSetParam(vm::cptr<SceScreenShotParam> param)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceScreenShot.h b/rpcs3/Emu/PSP2/Modules/sceScreenShot.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceScreenShot.h
rename to rpcs3/Emu/PSP2/Modules/sceScreenShot.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSfmt.cpp b/rpcs3/Emu/PSP2/Modules/sceSfmt.cpp
similarity index 97%
rename from rpcs3/Emu/ARMv7/Modules/sceSfmt.cpp
rename to rpcs3/Emu/PSP2/Modules/sceSfmt.cpp
index 601c7d02de..ca0912b311 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSfmt.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceSfmt.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
-LOG_CHANNEL(sceSfmt);
+logs::channel sceSfmt("sceSfmt", logs::level::notice);
 
 #define REG_FUNC(nid, name) REG_FNID(SceSfmt, nid, name)
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSha.cpp b/rpcs3/Emu/PSP2/Modules/sceSha.cpp
similarity index 93%
rename from rpcs3/Emu/ARMv7/Modules/sceSha.cpp
rename to rpcs3/Emu/PSP2/Modules/sceSha.cpp
index a5322de9f6..0cf3a6c1e0 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSha.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceSha.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
-LOG_CHANNEL(sceSha);
+logs::channel sceSha("sceSha", logs::level::notice);
 
 #define REG_FUNC(nid, name) REG_FNID(SceSha, nid, name)
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSqlite.cpp b/rpcs3/Emu/PSP2/Modules/sceSqlite.cpp
similarity index 98%
rename from rpcs3/Emu/ARMv7/Modules/sceSqlite.cpp
rename to rpcs3/Emu/PSP2/Modules/sceSqlite.cpp
index 8d50081196..d73740a75f 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSqlite.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceSqlite.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceSqlite.h"
 
-LOG_CHANNEL(sceSqlite);
+logs::channel sceSqlite("sceSqlite", logs::level::notice);
 
 #define REG_FUNC(nid, name) REG_FNID(SceSqlite, nid, name)
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSqlite.h b/rpcs3/Emu/PSP2/Modules/sceSqlite.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceSqlite.h
rename to rpcs3/Emu/PSP2/Modules/sceSqlite.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp b/rpcs3/Emu/PSP2/Modules/sceSsl.cpp
similarity index 95%
rename from rpcs3/Emu/ARMv7/Modules/sceSsl.cpp
rename to rpcs3/Emu/PSP2/Modules/sceSsl.cpp
index 1a9979517f..e1d117dba6 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceSsl.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceSsl.h"
 
-LOG_CHANNEL(sceSsl);
+logs::channel sceSsl("sceSsl", logs::level::notice);
 
 s32 sceSslInit(u32 poolSize)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSsl.h b/rpcs3/Emu/PSP2/Modules/sceSsl.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceSsl.h
rename to rpcs3/Emu/PSP2/Modules/sceSsl.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp b/rpcs3/Emu/PSP2/Modules/sceSulpha.cpp
similarity index 96%
rename from rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp
rename to rpcs3/Emu/PSP2/Modules/sceSulpha.cpp
index 3210e04906..a602794ade 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceSulpha.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceSulpha.h"
 
-LOG_CHANNEL(sceSulpha);
+logs::channel sceSulpha("sceSulpha", logs::level::notice);
 
 s32 sceSulphaNetworkInit()
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSulpha.h b/rpcs3/Emu/PSP2/Modules/sceSulpha.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceSulpha.h
rename to rpcs3/Emu/PSP2/Modules/sceSulpha.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp b/rpcs3/Emu/PSP2/Modules/sceSysmodule.cpp
similarity index 89%
rename from rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp
rename to rpcs3/Emu/PSP2/Modules/sceSysmodule.cpp
index 6906f2cf3a..71dbe9870f 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceSysmodule.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceSysmodule.h"
 
-LOG_CHANNEL(sceSysmodule);
+logs::channel sceSysmodule("sceSysmodule", logs::level::notice);
 
 s32 sceSysmoduleLoadModule(u16 id)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSysmodule.h b/rpcs3/Emu/PSP2/Modules/sceSysmodule.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceSysmodule.h
rename to rpcs3/Emu/PSP2/Modules/sceSysmodule.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp b/rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp
similarity index 97%
rename from rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp
rename to rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp
index 6d6dedf763..c410a0c62f 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceSystemGesture.h"
 
-LOG_CHANNEL(sceSystemGesture);
+logs::channel sceSystemGesture("sceSystemGesture", logs::level::notice);
 
 s32 sceSystemGestureInitializePrimitiveTouchRecognizer(vm::ptr<SceSystemGesturePrimitiveTouchRecognizerParameter> parameter)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.h b/rpcs3/Emu/PSP2/Modules/sceSystemGesture.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceSystemGesture.h
rename to rpcs3/Emu/PSP2/Modules/sceSystemGesture.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp b/rpcs3/Emu/PSP2/Modules/sceTouch.cpp
similarity index 90%
rename from rpcs3/Emu/ARMv7/Modules/sceTouch.cpp
rename to rpcs3/Emu/PSP2/Modules/sceTouch.cpp
index 5f07db80e6..e59a7ef936 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceTouch.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceTouch.h"
 
-LOG_CHANNEL(sceTouch);
+logs::channel sceTouch("sceTouch", logs::level::notice);
 
 s32 sceTouchGetPanelInfo(u32 port, vm::ptr<SceTouchPanelInfo> pPanelInfo)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceTouch.h b/rpcs3/Emu/PSP2/Modules/sceTouch.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceTouch.h
rename to rpcs3/Emu/PSP2/Modules/sceTouch.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp b/rpcs3/Emu/PSP2/Modules/sceUlt.cpp
similarity index 99%
rename from rpcs3/Emu/ARMv7/Modules/sceUlt.cpp
rename to rpcs3/Emu/PSP2/Modules/sceUlt.cpp
index 445cf18212..af1ecd53dc 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceUlt.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceUlt.h"
 
-LOG_CHANNEL(sceUlt);
+logs::channel sceUlt("sceUlt", logs::level::notice);
 
 // Functions
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceUlt.h b/rpcs3/Emu/PSP2/Modules/sceUlt.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceUlt.h
rename to rpcs3/Emu/PSP2/Modules/sceUlt.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp b/rpcs3/Emu/PSP2/Modules/sceVideodec.cpp
similarity index 95%
rename from rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp
rename to rpcs3/Emu/PSP2/Modules/sceVideodec.cpp
index 9c57870236..0ebef4aa25 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceVideodec.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceVideodec.h"
 
-LOG_CHANNEL(sceVideodec);
+logs::channel sceVideodec("sceVideodec", logs::level::notice);
 
 s32 sceVideodecInitLibrary(u32 codecType, vm::cptr<SceVideodecQueryInitInfo> pInitInfo)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVideodec.h b/rpcs3/Emu/PSP2/Modules/sceVideodec.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceVideodec.h
rename to rpcs3/Emu/PSP2/Modules/sceVideodec.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp b/rpcs3/Emu/PSP2/Modules/sceVoice.cpp
similarity index 97%
rename from rpcs3/Emu/ARMv7/Modules/sceVoice.cpp
rename to rpcs3/Emu/PSP2/Modules/sceVoice.cpp
index b0c1d53bca..88967abaac 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceVoice.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceVoice.h"
 
-LOG_CHANNEL(sceVoice);
+logs::channel sceVoice("sceVoice", logs::level::notice);
 
 s32 sceVoiceInit(vm::ptr<SceVoiceInitParam> pArg, SceVoiceVersion version)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoice.h b/rpcs3/Emu/PSP2/Modules/sceVoice.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceVoice.h
rename to rpcs3/Emu/PSP2/Modules/sceVoice.h
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp b/rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp
similarity index 96%
rename from rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp
rename to rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp
index b584945713..f5ae9af81e 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp
+++ b/rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/ARMv7/ARMv7Module.h"
+#include "Emu/PSP2/ARMv7Module.h"
 
 #include "sceVoiceQoS.h"
 
-LOG_CHANNEL(sceVoiceQoS);
+logs::channel sceVoiceQoS("sceVoiceQoS", logs::level::notice);
 
 s32 sceVoiceQoSInit()
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.h b/rpcs3/Emu/PSP2/Modules/sceVoiceQoS.h
similarity index 100%
rename from rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.h
rename to rpcs3/Emu/PSP2/Modules/sceVoiceQoS.h