From 5dd3437da98898a06fb75feae51524e4464184e2 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Tue, 20 Jan 2015 18:06:15 +0300
Subject: [PATCH 01/70] ARMv7Context, some opcodes added

---
 rpcs3/Emu/ARMv7/ARMv7Context.h           |  267 +++++
 rpcs3/Emu/ARMv7/ARMv7Decoder.h           |   29 +-
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp     | 1268 ++++++++++++----------
 rpcs3/Emu/ARMv7/ARMv7Interpreter.h       |  644 +++++++----
 rpcs3/Emu/ARMv7/ARMv7Opcodes.h           |  264 ++---
 rpcs3/Emu/ARMv7/ARMv7Thread.cpp          |   63 +-
 rpcs3/Emu/ARMv7/ARMv7Thread.h            |  273 +----
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp |   13 +-
 rpcs3/Emu/ARMv7/PSVFuncList.cpp          |   22 +-
 rpcs3/Emu/ARMv7/PSVFuncList.h            |   56 +-
 rpcs3/Emu/Memory/vm.h                    |    2 +-
 rpcs3/emucore.vcxproj                    |    1 +
 rpcs3/emucore.vcxproj.filters            |    3 +
 13 files changed, 1607 insertions(+), 1298 deletions(-)
 create mode 100644 rpcs3/Emu/ARMv7/ARMv7Context.h

diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
new file mode 100644
index 0000000000..f1cd694844
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -0,0 +1,267 @@
+#pragma once
+
+class ARMv7Thread;
+
+enum ARMv7InstructionSet
+{
+	ARM,
+	Thumb,
+	Jazelle,
+	ThumbEE
+};
+
+union ARMv7Code
+{
+	struct
+	{
+		u16 code0;
+		u16 code1;
+	};
+
+	u32 data;
+};
+
+struct ARMv7Context
+{
+	ARMv7Thread& thread;
+
+	ARMv7Context(ARMv7Thread& thread) : thread(thread) {}
+
+	void write_pc(u32 value);
+	u32 read_pc();
+	u32 get_stack_arg(u32 pos);
+
+	union
+	{
+		u32 GPR[15];
+
+		struct
+		{
+			u32 pad[13];
+
+			union
+			{
+				u32 SP;
+
+				struct { u16 SP_main, SP_process; };
+			};
+
+			u32 LR;
+		};
+	};
+
+	union
+	{
+		struct
+		{
+			u32 N : 1; //Negative condition code flag
+			u32 Z : 1; //Zero condition code flag
+			u32 C : 1; //Carry condition code flag
+			u32 V : 1; //Overflow condition code flag
+			u32 Q : 1; //Set to 1 if an SSAT or USAT instruction changes (saturates) the input value for the signed or unsigned range of the result
+		u32: 27;
+		};
+
+		u32 APSR;
+
+	} APSR;
+
+	union
+	{
+		struct
+		{
+		u32: 24;
+			u32 exception : 8;
+		};
+
+		u32 IPSR;
+
+	} IPSR;
+
+	ARMv7InstructionSet ISET;
+
+	union
+	{
+		struct
+		{
+			u8 cond : 3;
+			u8 state : 5;
+		};
+
+		u8 IT;
+
+		u32 advance()
+		{
+			const u32 res = (state & 0xf) ? (cond << 1 | state >> 4) : 0xe /* true */;
+
+			state <<= 1;
+			if ((state & 0xf) == 0) // if no d
+			{
+				IT = 0; // clear ITSTATE
+			}
+
+			return res;
+		}
+
+		operator bool() const
+		{
+			return (state & 0xf) != 0;
+		}
+
+	} ITSTATE;
+
+	void write_gpr(u32 n, u32 value)
+	{
+		assert(n < 16);
+
+		if (n < 15)
+		{
+			GPR[n] = value;
+		}
+		else
+		{
+			write_pc(value & ~1);
+		}
+	}
+
+	u32 read_gpr(u32 n)
+	{
+		assert(n < 16);
+
+		if (n < 15)
+		{
+			return GPR[n];
+		}
+
+		return read_pc();
+	}
+};
+
+template<typename T, bool is_enum = std::is_enum<T>::value>
+struct cast_armv7_gpr
+{
+	static_assert(is_enum, "Invalid type for cast_armv7_gpr");
+
+	typedef typename std::underlying_type<T>::type underlying_type;
+
+	__forceinline static u32 to_gpr(const T& value)
+	{
+		return cast_armv7_gpr<underlying_type>::to_gpr(static_cast<underlying_type>(value));
+	}
+
+	__forceinline static T from_gpr(const u32 reg)
+	{
+		return static_cast<T>(cast_armv7_gpr<underlying_type>::from_gpr(reg));
+	}
+};
+
+template<>
+struct cast_armv7_gpr<u8, false>
+{
+	__forceinline static u32 to_gpr(const u8& value)
+	{
+		return value;
+	}
+
+	__forceinline static u8 from_gpr(const u32 reg)
+	{
+		return static_cast<u8>(reg);
+	}
+};
+
+template<>
+struct cast_armv7_gpr<u16, false>
+{
+	__forceinline static u32 to_gpr(const u16& value)
+	{
+		return value;
+	}
+
+	__forceinline static u16 from_gpr(const u32 reg)
+	{
+		return static_cast<u16>(reg);
+	}
+};
+
+template<>
+struct cast_armv7_gpr<u32, false>
+{
+	__forceinline static u32 to_gpr(const u32& value)
+	{
+		return value;
+	}
+
+	__forceinline static u32 from_gpr(const u32 reg)
+	{
+		return reg;
+	}
+};
+
+template<>
+struct cast_armv7_gpr<s8, false>
+{
+	__forceinline static u32 to_gpr(const s8& value)
+	{
+		return value;
+	}
+
+	__forceinline static s8 from_gpr(const u32 reg)
+	{
+		return static_cast<s8>(reg);
+	}
+};
+
+template<>
+struct cast_armv7_gpr<s16, false>
+{
+	__forceinline static u32 to_gpr(const s16& value)
+	{
+		return value;
+	}
+
+	__forceinline static s16 from_gpr(const u32 reg)
+	{
+		return static_cast<s16>(reg);
+	}
+};
+
+template<>
+struct cast_armv7_gpr<s32, false>
+{
+	__forceinline static u32 to_gpr(const s32& value)
+	{
+		return value;
+	}
+
+	__forceinline static s32 from_gpr(const u32 reg)
+	{
+		return static_cast<s32>(reg);
+	}
+};
+
+template<>
+struct cast_armv7_gpr<bool, false>
+{
+	__forceinline static u32 to_gpr(const bool& value)
+	{
+		return value;
+	}
+
+	__forceinline static bool from_gpr(const u32 reg)
+	{
+		return reinterpret_cast<const bool&>(reg);
+	}
+};
+
+template<typename T>
+__forceinline u32 cast_to_armv7_gpr(const T& value)
+{
+	return cast_armv7_gpr<T>::to_gpr(value);
+}
+
+template<typename T>
+__forceinline T cast_from_armv7_gpr(const u32 reg)
+{
+	return cast_armv7_gpr<T>::from_gpr(reg);
+}
+
diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.h b/rpcs3/Emu/ARMv7/ARMv7Decoder.h
index 2a7de502f6..8e54b8880e 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.h
@@ -17,32 +17,33 @@ public:
 
 	virtual u8 DecodeMemory(const u32 address)
 	{
-		m_thr.update_code(address & ~1);
+		ARMv7Code code;
+		code.code0 = vm::psv::read16(address & ~1);
+		code.code1 = vm::psv::read16(address + 2 & ~1);
+		u32 arg = address & 0x1 ? code.data : (u32)code.code0 << 16 | code.code1;
 
-		// LOG_NOTICE(GENERAL, "code0 = 0x%04x, code1 = 0x%04x, data = 0x%08x", m_thr.code.code0, m_thr.code.code1, m_thr.code.data);
-		// LOG_NOTICE(GENERAL, "arg = 0x%08x", m_thr.m_arg);
-		// Emu.Pause();
+		LOG_NOTICE(GENERAL, "code0 = 0x%04x, code1 = 0x%04x, data = 0x%08x, arg = 0x%08x", code.code0, code.code1, code.data, arg);
 
 		// old decoding algorithm
-		/*
+		
 		for (auto& opcode : ARMv7_opcode_table)
 		{
-			if ((opcode.type < A1) == ((address & 0x1) == 0) && (m_thr.m_arg & opcode.mask) == opcode.code)
+			if ((opcode.type < A1) == ((address & 0x1) == 0) && (arg & opcode.mask) == opcode.code)
 			{
-				m_thr.code.data = opcode.length == 2 ? m_thr.code.code0 : m_thr.m_arg;
-				(*opcode.func)(&m_thr, opcode.type);
+				code.data = opcode.length == 2 ? code.code0 : arg;
+				(*opcode.func)(m_thr.context, code, opcode.type);
 				// LOG_NOTICE(GENERAL, "%s, %d \n\n", opcode.name, opcode.length);
 				return opcode.length;
 			}
 		}
 
-		ARMv7_instrs::UNK(&m_thr);
+		ARMv7_instrs::UNK(m_thr.context, code);
 		return address & 0x1 ? 4 : 2;
-		*/
+		
 
-		execute_main_group(&m_thr);
-		// LOG_NOTICE(GENERAL, "%s, %d \n\n", m_thr.m_last_instr_name, m_thr.m_last_instr_size);
-		m_thr.m_last_instr_name = "Unknown";
-		return m_thr.m_last_instr_size;
+		//execute_main_group(&m_thr);
+		//// LOG_NOTICE(GENERAL, "%s, %d \n\n", m_thr.m_last_instr_name, m_thr.m_last_instr_size);
+		//m_thr.m_last_instr_name = "Unknown";
+		//return m_thr.m_last_instr_size;
 	}
 };
\ No newline at end of file
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index aa963e583b..3fbc1d0ff1 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -1,7 +1,9 @@
 #include "stdafx.h"
+#include "Utilities/Log.h"
 #include "Emu/System.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/CPU/CPUDecoder.h"
+
 #include "ARMv7Thread.h"
 #include "PSVFuncList.h"
 #include "ARMv7Interpreter.h"
@@ -101,7 +103,7 @@ u32 ARMv7_instrs::LSL_C(u32 x, s32 shift, bool& carry_out)
 	return shift < 32 ? x << shift : 0;
 }
 
-u32 ARMv7_instrs::LSL(u32 x, s32 shift)
+u32 ARMv7_instrs::LSL_(u32 x, s32 shift)
 {
 	assert(shift >= 0);
 	return shift < 32 ? x << shift : 0;
@@ -114,7 +116,7 @@ u32 ARMv7_instrs::LSR_C(u32 x, s32 shift, bool& carry_out)
 	return shift < 32 ? x >> shift : 0;
 }
 
-u32 ARMv7_instrs::LSR(u32 x, s32 shift)
+u32 ARMv7_instrs::LSR_(u32 x, s32 shift)
 {
 	assert(shift >= 0);
 	return shift < 32 ? x >> shift : 0;
@@ -127,7 +129,7 @@ s32 ARMv7_instrs::ASR_C(s32 x, s32 shift, bool& carry_out)
 	return shift < 32 ? x >> shift : x >> 31;
 }
 
-s32 ARMv7_instrs::ASR(s32 x, s32 shift)
+s32 ARMv7_instrs::ASR_(s32 x, s32 shift)
 {
 	assert(shift >= 0);
 	return shift < 32 ? x >> shift : x >> 31;
@@ -140,7 +142,7 @@ u32 ARMv7_instrs::ROR_C(u32 x, s32 shift, bool& carry_out)
 	return x >> shift | x << (32 - shift);
 }
 
-u32 ARMv7_instrs::ROR(u32 x, s32 shift)
+u32 ARMv7_instrs::ROR_(u32 x, s32 shift)
 {
 	return x >> shift | x << (32 - shift);
 }
@@ -151,7 +153,7 @@ u32 ARMv7_instrs::RRX_C(u32 x, bool carry_in, bool& carry_out)
 	return ((u32)carry_in << 31) | (x >> 1);
 }
 
-u32 ARMv7_instrs::RRX(u32 x, bool carry_in)
+u32 ARMv7_instrs::RRX_(u32 x, bool carry_in)
 {
 	return ((u32)carry_in << 31) | (x >> 1);
 }
@@ -222,25 +224,25 @@ u32 ARMv7_instrs::ThumbExpandImm_C(u32 imm12, bool carry_in, bool& carry_out)
 	}
 }
 
-u32 ARMv7_instrs::ThumbExpandImm(ARMv7Thread* CPU, u32 imm12)
+u32 ARMv7_instrs::ThumbExpandImm(ARMv7Context& context, u32 imm12)
 {
-	bool carry = CPU->APSR.C;
+	bool carry = context.APSR.C;
 	return ThumbExpandImm_C(imm12, carry, carry);
 }
 
-bool ARMv7_instrs::ConditionPassed(ARMv7Thread* CPU, u32 cond)
+bool ARMv7_instrs::ConditionPassed(ARMv7Context& context, u32 cond)
 {
 	bool result = false;
 
 	switch (cond >> 1)
 	{
-	case 0: result = CPU->APSR.Z == 1; break;
-	case 1: result = CPU->APSR.C == 1; break;
-	case 2: result = CPU->APSR.N == 1; break;
-	case 3: result = CPU->APSR.V == 1; break;
-	case 4: result = CPU->APSR.C == 1 && CPU->APSR.Z == 0; break;
-	case 5: result = CPU->APSR.N == CPU->APSR.V; break;
-	case 6: result = CPU->APSR.N == CPU->APSR.V && CPU->APSR.Z == 0; break;
+	case 0: result = context.APSR.Z == 1; break;
+	case 1: result = context.APSR.C == 1; break;
+	case 2: result = context.APSR.N == 1; break;
+	case 3: result = context.APSR.V == 1; break;
+	case 4: result = context.APSR.C == 1 && context.APSR.Z == 0; break;
+	case 5: result = context.APSR.N == context.APSR.V; break;
+	case 6: result = context.APSR.N == context.APSR.V && context.APSR.Z == 0; break;
 	case 7: return true;
 	}
 
@@ -253,46 +255,46 @@ bool ARMv7_instrs::ConditionPassed(ARMv7Thread* CPU, u32 cond)
 }
 
 // instructions
-void ARMv7_instrs::UNK(ARMv7Thread* thr)
+void ARMv7_instrs::UNK(ARMv7Context& context, const ARMv7Code code)
 {
-	LOG_ERROR(HLE, "Unknown/illegal opcode! (0x%04x : 0x%04x)", thr->code.data >> 16, thr->code.data & 0xffff);
+	LOG_ERROR(HLE, "Unknown/illegal opcode! (0x%04x : 0x%04x)", code.data >> 16, code.data & 0xffff);
 	Emu.Pause();
 }
 
-void ARMv7_instrs::NULL_OP(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::NULL_OP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	LOG_ERROR(HLE, "Null opcode found: data = 0x%x", thr->m_arg);
+	LOG_ERROR(HLE, "Null opcode found: data = 0x%x", code.data);
 	Emu.Pause();
 }
 
-void ARMv7_instrs::HACK(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::HACK(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
-	u32 code = 0;
+	u32 cond = context.ITSTATE.advance();
+	u32 func = 0;
 
 	switch (type)
 	{
 	case T1:
 	{
-		code = thr->code.data & 0xffff;
+		func = code.data & 0xffff;
 		break;
 	}
 	case A1:
 	{
-		cond = thr->code.data >> 28;
-		code = (thr->code.data & 0xfff00) >> 4 | (thr->code.data & 0xf);
+		cond = code.data >> 28;
+		func = (code.data & 0xfff00) >> 4 | (code.data & 0xf);
 		break;
 	}
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		execute_psv_func_by_index(*thr, code);
+		execute_psv_func_by_index(context, func);
 	}
 }
 
-void ARMv7_instrs::ADC_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ADC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -301,7 +303,7 @@ void ARMv7_instrs::ADC_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::ADC_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ADC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -310,7 +312,7 @@ void ARMv7_instrs::ADC_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::ADC_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ADC_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -320,10 +322,10 @@ void ARMv7_instrs::ADC_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::ADD_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ADD_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	bool set_flags = !thr->ITSTATE;
-	u32 cond = thr->ITSTATE.advance();
+	bool set_flags = !context.ITSTATE;
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 0;
 	u32 n = 0;
 	u32 imm32 = 0;
@@ -332,23 +334,23 @@ void ARMv7_instrs::ADD_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		d = (thr->code.data & 0x7);
-		n = (thr->code.data & 0x38) >> 3;
-		imm32 = (thr->code.data & 0x1c0) >> 6;
+		d = (code.data & 0x7);
+		n = (code.data & 0x38) >> 3;
+		imm32 = (code.data & 0x1c0) >> 6;
 		break;
 	}
 	case T2:
 	{
-		d = n = (thr->code.data & 0x700) >> 8;
-		imm32 = (thr->code.data & 0xff);
+		d = n = (code.data & 0x700) >> 8;
+		imm32 = (code.data & 0xff);
 		break;
 	}
 	case T3:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		n = (thr->code.data & 0xf0000) >> 16;
-		set_flags = (thr->code.data & 0x100000);
-		imm32 = ThumbExpandImm(thr, (thr->code.data & 0x4000000) >> 15 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff));
+		d = (code.data & 0xf00) >> 8;
+		n = (code.data & 0xf0000) >> 16;
+		set_flags = (code.data & 0x100000);
+		imm32 = ThumbExpandImm(context, (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff));
 
 		if (d == 15 && set_flags)
 		{
@@ -362,10 +364,10 @@ void ARMv7_instrs::ADD_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case T4:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		n = (thr->code.data & 0xf0000) >> 16;
+		d = (code.data & 0xf00) >> 8;
+		n = (code.data & 0xf0000) >> 16;
 		set_flags = false;
-		imm32 = (thr->code.data & 0x4000000) >> 15 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff);
+		imm32 = (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
 
 		if (n == 15)
 		{
@@ -381,29 +383,29 @@ void ARMv7_instrs::ADD_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 		if (set_flags)
 		{
 			bool carry, overflow;
-			const u32 res = AddWithCarry(thr->read_gpr(n), imm32, false, carry, overflow);
-			thr->write_gpr(d, res);
-			thr->APSR.N = res >> 31;
-			thr->APSR.Z = res == 0;
-			thr->APSR.C = carry;
-			thr->APSR.V = overflow;
+			const u32 res = AddWithCarry(context.read_gpr(n), imm32, false, carry, overflow);
+			context.write_gpr(d, res);
+			context.APSR.N = res >> 31;
+			context.APSR.Z = res == 0;
+			context.APSR.C = carry;
+			context.APSR.V = overflow;
 		}
 		else
 		{
-			thr->write_gpr(d, thr->read_gpr(n) + imm32);
+			context.write_gpr(d, context.read_gpr(n) + imm32);
 		}
 	}
 }
 
-void ARMv7_instrs::ADD_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ADD_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	bool set_flags = !thr->ITSTATE;
-	u32 cond = thr->ITSTATE.advance();
+	bool set_flags = !context.ITSTATE;
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 0;
 	u32 n = 0;
 	u32 m = 0;
@@ -414,15 +416,15 @@ void ARMv7_instrs::ADD_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		d = (thr->code.data & 0x7);
-		n = (thr->code.data & 0x38) >> 3;
-		m = (thr->code.data & 0x1c0) >> 6;
+		d = (code.data & 0x7);
+		n = (code.data & 0x38) >> 3;
+		m = (code.data & 0x1c0) >> 6;
 		break;
 	}
 	case T2:
 	{
-		n = d = (thr->code.data & 0x80) >> 4 | (thr->code.data & 0x7);
-		m = (thr->code.data & 0x78) >> 3;
+		n = d = (code.data & 0x80) >> 4 | (code.data & 0x7);
+		m = (code.data & 0x78) >> 3;
 		set_flags = false;
 
 		if (n == 13 || m == 13)
@@ -433,11 +435,11 @@ void ARMv7_instrs::ADD_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case T3:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		n = (thr->code.data & 0xf0000) >> 16;
-		m = (thr->code.data & 0xf);
-		set_flags = (thr->code.data & 0x100000);
-		shift_t = DecodeImmShift((thr->code.data & 0x30) >> 4, (thr->code.data & 0x7000) >> 10 | (thr->code.data & 0xc0) >> 6, &shift_n);
+		d = (code.data & 0xf00) >> 8;
+		n = (code.data & 0xf0000) >> 16;
+		m = (code.data & 0xf);
+		set_flags = (code.data & 0x100000);
+		shift_t = DecodeImmShift((code.data & 0x30) >> 4, (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6, &shift_n);
 
 		if (d == 15 && set_flags)
 		{
@@ -453,27 +455,27 @@ void ARMv7_instrs::ADD_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		const u32 shifted = Shift(thr->read_gpr(m), shift_t, shift_n, true);
+		const u32 shifted = Shift(context.read_gpr(m), shift_t, shift_n, true);
 		if (set_flags)
 		{
 			bool carry, overflow;
-			const u32 res = AddWithCarry(thr->read_gpr(n), shifted, false, carry, overflow);
-			thr->write_gpr(d, res);
-			thr->APSR.N = res >> 31;
-			thr->APSR.Z = res == 0;
-			thr->APSR.C = carry;
-			thr->APSR.V = overflow;
+			const u32 res = AddWithCarry(context.read_gpr(n), shifted, false, carry, overflow);
+			context.write_gpr(d, res);
+			context.APSR.N = res >> 31;
+			context.APSR.Z = res == 0;
+			context.APSR.C = carry;
+			context.APSR.V = overflow;
 		}
 		else
 		{
-			thr->write_gpr(d, thr->read_gpr(n) + shifted);
+			context.write_gpr(d, context.read_gpr(n) + shifted);
 		}
 	}
 }
 
-void ARMv7_instrs::ADD_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ADD_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -482,9 +484,9 @@ void ARMv7_instrs::ADD_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::ADD_SPI(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ADD_SPI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 13;
 	bool set_flags = false;
 	u32 imm32 = 0;
@@ -493,20 +495,20 @@ void ARMv7_instrs::ADD_SPI(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		d = (thr->code.data & 0x700) >> 8;
-		imm32 = (thr->code.data & 0xff) << 2;
+		d = (code.data & 0x700) >> 8;
+		imm32 = (code.data & 0xff) << 2;
 		break;
 	}
 	case T2:
 	{
-		imm32 = (thr->code.data & 0x7f) << 2;
+		imm32 = (code.data & 0x7f) << 2;
 		break;
 	}
 	case T3:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		set_flags = (thr->code.data & 0x100000);
-		imm32 = ThumbExpandImm(thr, (thr->code.data & 0x4000000) >> 15 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff));
+		d = (code.data & 0xf00) >> 8;
+		set_flags = (code.data & 0x100000);
+		imm32 = ThumbExpandImm(context, (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff));
 
 		if (d == 15 && set_flags)
 		{
@@ -516,37 +518,37 @@ void ARMv7_instrs::ADD_SPI(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case T4:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
+		d = (code.data & 0xf00) >> 8;
 		set_flags = false;
-		imm32 = (thr->code.data & 0x4000000) >> 15 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff);
+		imm32 = (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
 		break;
 	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 		if (set_flags)
 		{
 			bool carry, overflow;
-			const u32 res = AddWithCarry(thr->SP, imm32, false, carry, overflow);
-			thr->write_gpr(d, res);
-			thr->APSR.N = res >> 31;
-			thr->APSR.Z = res == 0;
-			thr->APSR.C = carry;
-			thr->APSR.V = overflow;
+			const u32 res = AddWithCarry(context.SP, imm32, false, carry, overflow);
+			context.write_gpr(d, res);
+			context.APSR.N = res >> 31;
+			context.APSR.Z = res == 0;
+			context.APSR.C = carry;
+			context.APSR.V = overflow;
 		}
 		else
 		{
-			thr->write_gpr(d, thr->SP + imm32);
+			context.write_gpr(d, context.SP + imm32);
 		}
 	}
 }
 
-void ARMv7_instrs::ADD_SPR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ADD_SPR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 13;
 	u32 m = 0;
 	bool set_flags = false;
@@ -557,12 +559,12 @@ void ARMv7_instrs::ADD_SPR(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		m = d = (thr->code.data & 0x80) >> 4 | (thr->code.data & 0x7);
+		m = d = (code.data & 0x80) >> 4 | (code.data & 0x7);
 		break;
 	}
 	case T2:
 	{
-		m = (thr->code.data & 0x78) >> 3;
+		m = (code.data & 0x78) >> 3;
 
 		if (m == 13)
 		{
@@ -572,38 +574,38 @@ void ARMv7_instrs::ADD_SPR(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case T3:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		m = (thr->code.data & 0xf);
-		set_flags = (thr->code.data & 0x100000);
-		shift_t = DecodeImmShift((thr->code.data & 0x30) >> 4, (thr->code.data & 0x7000) >> 10 | (thr->code.data & 0xc0) >> 6, &shift_n);
+		d = (code.data & 0xf00) >> 8;
+		m = (code.data & 0xf);
+		set_flags = (code.data & 0x100000);
+		shift_t = DecodeImmShift((code.data & 0x30) >> 4, (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6, &shift_n);
 		break;
 	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		const u32 shifted = Shift(thr->read_gpr(m), shift_t, shift_n, thr->APSR.C);
+		const u32 shifted = Shift(context.read_gpr(m), shift_t, shift_n, context.APSR.C);
 		if (set_flags)
 		{
 			bool carry, overflow;
-			const u32 res = AddWithCarry(thr->SP, shifted, false, carry, overflow);
-			thr->write_gpr(d, res);
-			thr->APSR.N = res >> 31;
-			thr->APSR.Z = res == 0;
-			thr->APSR.C = carry;
-			thr->APSR.V = overflow;
+			const u32 res = AddWithCarry(context.SP, shifted, false, carry, overflow);
+			context.write_gpr(d, res);
+			context.APSR.N = res >> 31;
+			context.APSR.Z = res == 0;
+			context.APSR.C = carry;
+			context.APSR.V = overflow;
 		}
 		else
 		{
-			thr->write_gpr(d, thr->SP + thr->read_gpr(m));
+			context.write_gpr(d, context.SP + context.read_gpr(m));
 		}
 	}
 }
 
 
-void ARMv7_instrs::ADR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ADR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -613,7 +615,7 @@ void ARMv7_instrs::ADR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::AND_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::AND_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -622,7 +624,7 @@ void ARMv7_instrs::AND_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::AND_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::AND_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -631,7 +633,7 @@ void ARMv7_instrs::AND_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::AND_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::AND_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -641,7 +643,7 @@ void ARMv7_instrs::AND_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::ASR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ASR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -650,7 +652,7 @@ void ARMv7_instrs::ASR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::ASR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ASR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -660,68 +662,68 @@ void ARMv7_instrs::ASR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::B(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::B(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 jump = 0; // jump = instr_size + imm32 ???
 
 	switch (type)
 	{
 	case T1:
 	{
-		cond = (thr->code.data >> 8) & 0xf;
+		cond = (code.data >> 8) & 0xf;
 		if (cond == 0xf)
 		{
 			throw "SVC";
 		}
 
-		jump = 4 + sign<9, u32>((thr->code.data & 0xff) << 1);
+		jump = 4 + sign<9, u32>((code.data & 0xff) << 1);
 		break;
 	}
 	case T2:
 	{
-		jump = 4 + sign<12, u32>((thr->code.data & 0x7ff) << 1);
+		jump = 4 + sign<12, u32>((code.data & 0x7ff) << 1);
 		break;
 	}
 	case T3:
 	{
-		cond = (thr->code.data >> 6) & 0xf;
+		cond = (code.data >> 6) & 0xf;
 		if (cond >= 0xe)
 		{
 			throw "B_T3: Related encodings";
 		}
 
-		u32 s = (thr->code.data >> 26) & 0x1;
-		u32 j1 = (thr->code.data >> 13) & 0x1;
-		u32 j2 = (thr->code.data >> 11) & 0x1;
-		jump = 4 + sign<21, u32>(s << 20 | j2 << 19 | j1 << 18 | (thr->code.data & 0x3f0000) >> 4 | (thr->code.data & 0x7ff) << 1);
+		u32 s = (code.data >> 26) & 0x1;
+		u32 j1 = (code.data >> 13) & 0x1;
+		u32 j2 = (code.data >> 11) & 0x1;
+		jump = 4 + sign<21, u32>(s << 20 | j2 << 19 | j1 << 18 | (code.data & 0x3f0000) >> 4 | (code.data & 0x7ff) << 1);
 		break;
 	}
 	case T4:
 	{
-		u32 s = (thr->code.data >> 26) & 0x1;
-		u32 i1 = (thr->code.data >> 13) & 0x1 ^ s ^ 1;
-		u32 i2 = (thr->code.data >> 11) & 0x1 ^ s ^ 1;
-		jump = 4 + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (thr->code.data & 0x3ff0000) >> 4 | (thr->code.data & 0x7ff) << 1);
+		u32 s = (code.data >> 26) & 0x1;
+		u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
+		u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
+		jump = 4 + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
 		break;
 	}
 	case A1:
 	{
-		cond = thr->code.data >> 28;
-		jump = 1 + 4 + sign<26, u32>((thr->code.data & 0xffffff) << 2);
+		cond = code.data >> 28;
+		jump = 1 + 4 + sign<26, u32>((code.data & 0xffffff) << 2);
 		break;
 	}
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		thr->SetBranch(thr->PC + jump);
+		context.thread.SetBranch(context.thread.PC + jump);
 	}
 }
 
 
-void ARMv7_instrs::BFC(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::BFC(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -730,7 +732,7 @@ void ARMv7_instrs::BFC(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::BFI(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::BFI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -740,7 +742,7 @@ void ARMv7_instrs::BFI(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::BIC_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::BIC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -749,7 +751,7 @@ void ARMv7_instrs::BIC_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::BIC_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::BIC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -758,7 +760,7 @@ void ARMv7_instrs::BIC_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::BIC_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::BIC_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -768,7 +770,7 @@ void ARMv7_instrs::BIC_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::BKPT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::BKPT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -778,132 +780,132 @@ void ARMv7_instrs::BKPT(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::BL(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::BL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
-	u32 newLR = thr->PC;
+	u32 cond = context.ITSTATE.advance();
+	u32 newLR = context.thread.PC;
 	u32 imm32 = 0;
 
 	switch (type)
 	{
 	case T1:
 	{
-		u32 s = (thr->code.data >> 26) & 0x1;
-		u32 i1 = (thr->code.data >> 13) & 0x1 ^ s ^ 1;
-		u32 i2 = (thr->code.data >> 11) & 0x1 ^ s ^ 1;
-		imm32 = 4 + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (thr->code.data & 0x3ff0000) >> 4 | (thr->code.data & 0x7ff) << 1);
-		newLR = (thr->PC + 4) | 1;
+		u32 s = (code.data >> 26) & 0x1;
+		u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
+		u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
+		imm32 = 4 + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
+		newLR = (context.thread.PC + 4) | 1;
 		break;
 	}
 	case A1:
 	{
-		cond = thr->code.data >> 28;
-		imm32 = 4 + sign<26, u32>((thr->code.data & 0xffffff) << 2);
-		newLR = (thr->PC + 4) - 4;
+		cond = code.data >> 28;
+		imm32 = 4 + sign<26, u32>((code.data & 0xffffff) << 2);
+		newLR = (context.thread.PC + 4) - 4;
 		break;
 	}
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		thr->LR = newLR;
-		thr->SetBranch(thr->PC + imm32);
+		context.LR = newLR;
+		context.thread.SetBranch(context.thread.PC + imm32);
 	}
 }
 
-void ARMv7_instrs::BLX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::BLX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
-	u32 newLR = thr->PC;
+	u32 cond = context.ITSTATE.advance();
+	u32 newLR = context.thread.PC;
 	u32 target = 0;
 
 	switch (type)
 	{
 	case T1:
 	{
-		target = thr->read_gpr((thr->code.data >> 3) & 0xf);
-		newLR = (thr->PC + 2) | 1; // ???
+		target = context.read_gpr((code.data >> 3) & 0xf);
+		newLR = (context.thread.PC + 2) | 1; // ???
 		break;
 	}
 	case T2:
 	{
-		u32 s = (thr->code.data >> 26) & 0x1;
-		u32 i1 = (thr->code.data >> 13) & 0x1 ^ s ^ 1;
-		u32 i2 = (thr->code.data >> 11) & 0x1 ^ s ^ 1;
-		target = (thr->PC + 4 & ~3) + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (thr->code.data & 0x3ff0000) >> 4 | (thr->code.data & 0x7ff) << 1);
-		newLR = (thr->PC + 4) | 1;
+		u32 s = (code.data >> 26) & 0x1;
+		u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
+		u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
+		target = (context.thread.PC + 4 & ~3) + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
+		newLR = (context.thread.PC + 4) | 1;
 		break;
 	}
 	case A1:
 	{
-		cond = thr->code.data >> 28;
-		target = thr->read_gpr(thr->code.data & 0xf);
-		newLR = (thr->PC + 4) - 4;
+		cond = code.data >> 28;
+		target = context.read_gpr(code.data & 0xf);
+		newLR = (context.thread.PC + 4) - 4;
 		break;
 	}
 	case A2:
 	{
-		target = (thr->PC + 4 | 1) + sign<25, u32>((thr->code.data & 0xffffff) << 2 | (thr->code.data & 0x1000000) >> 23);
-		newLR = (thr->PC + 4) - 4;
+		target = (context.thread.PC + 4 | 1) + sign<25, u32>((code.data & 0xffffff) << 2 | (code.data & 0x1000000) >> 23);
+		newLR = (context.thread.PC + 4) - 4;
 		break;
 	}
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		thr->LR = newLR;
+		context.LR = newLR;
 		if (target & 1)
 		{
-			thr->ISET = Thumb;
-			thr->SetBranch(target & ~1);
+			context.ISET = Thumb;
+			context.thread.SetBranch(target & ~1);
 		}
 		else
 		{
-			thr->ISET = ARM;
-			thr->SetBranch(target);
+			context.ISET = ARM;
+			context.thread.SetBranch(target);
 		}
 	}
 }
 
-void ARMv7_instrs::BX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::BX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 target = 0;
 
 	switch (type)
 	{
 	case T1:
 	{
-		target = thr->read_gpr((thr->code.data >> 3) & 0xf);
+		target = context.read_gpr((code.data >> 3) & 0xf);
 		break;
 	}
 	case A1:
 	{
-		cond = thr->code.data >> 28;
-		target = thr->read_gpr(thr->code.data & 0xf);
+		cond = code.data >> 28;
+		target = context.read_gpr(code.data & 0xf);
 	}
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 		if (target & 1)
 		{
-			thr->ISET = Thumb;
-			thr->SetBranch(target & ~1);
+			context.ISET = Thumb;
+			context.thread.SetBranch(target & ~1);
 		}
 		else
 		{
-			thr->ISET = ARM;
-			thr->SetBranch(target);
+			context.ISET = ARM;
+			context.thread.SetBranch(target);
 		}
 	}
 }
 
 
-void ARMv7_instrs::CB_Z(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::CB_Z(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -911,14 +913,14 @@ void ARMv7_instrs::CB_Z(ARMv7Thread* thr, const ARMv7_encoding type)
 	default: throw __FUNCTION__;
 	}
 
-	if ((thr->read_gpr(thr->code.data & 0x7) == 0) ^ ((thr->code.data & 0x800) != 0))
+	if ((context.read_gpr(code.data & 0x7) == 0) ^ ((code.data & 0x800) != 0))
 	{
-		thr->SetBranch(thr->PC + 2 + ((thr->code.data & 0xf8) >> 2) + ((thr->code.data & 0x200) >> 3));
+		context.thread.SetBranch(context.thread.PC + 2 + ((code.data & 0xf8) >> 2) + ((code.data & 0x200) >> 3));
 	}
 }
 
 
-void ARMv7_instrs::CLZ(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::CLZ(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -928,7 +930,7 @@ void ARMv7_instrs::CLZ(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::CMN_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::CMN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -937,7 +939,7 @@ void ARMv7_instrs::CMN_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::CMN_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::CMN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -946,7 +948,7 @@ void ARMv7_instrs::CMN_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::CMN_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::CMN_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -956,9 +958,9 @@ void ARMv7_instrs::CMN_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::CMP_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::CMP_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 n = 0;
 	u32 imm32 = 0;
 
@@ -966,34 +968,34 @@ void ARMv7_instrs::CMP_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		n = (thr->code.data & 0x700) >> 8;
-		imm32 = (thr->code.data & 0xff);
+		n = (code.data & 0x700) >> 8;
+		imm32 = (code.data & 0xff);
 		break;
 	}
 	case T2:
 	{
-		n = (thr->code.data & 0xf0000) >> 16;
-		imm32 = ThumbExpandImm(thr, (thr->code.data & 0x4000000) >> 15 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff));
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = ThumbExpandImm(context, (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff));
 		break;
 	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 		bool carry, overflow;
-		const u32 res = AddWithCarry(thr->read_gpr(n), ~imm32, true, carry, overflow);
-		thr->APSR.N = res >> 31;
-		thr->APSR.Z = res == 0;
-		thr->APSR.C = carry;
-		thr->APSR.V = overflow;
+		const u32 res = AddWithCarry(context.read_gpr(n), ~imm32, true, carry, overflow);
+		context.APSR.N = res >> 31;
+		context.APSR.Z = res == 0;
+		context.APSR.C = carry;
+		context.APSR.V = overflow;
 	}
 }
 
-void ARMv7_instrs::CMP_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::CMP_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 n = 0;
 	u32 m = 0;
 	auto shift_t = SRType_LSL;
@@ -1003,40 +1005,40 @@ void ARMv7_instrs::CMP_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		n = (thr->code.data & 0x7);
-		m = (thr->code.data & 0x38) >> 3;
+		n = (code.data & 0x7);
+		m = (code.data & 0x38) >> 3;
 		break;
 	}
 	case T2:
 	{
-		n = (thr->code.data & 0x80) >> 4 | (thr->code.data & 0x7);
-		m = (thr->code.data & 0x78) >> 3;
+		n = (code.data & 0x80) >> 4 | (code.data & 0x7);
+		m = (code.data & 0x78) >> 3;
 		break;
 	}
 	case T3:
 	{
-		n = (thr->code.data & 0xf0000) >> 16;
-		m = (thr->code.data & 0xf);
-		shift_t = DecodeImmShift((thr->code.data & 0x30) >> 4, (thr->code.data & 0x7000) >> 10 | (thr->code.data & 0xc0) >> 6, &shift_n);
+		n = (code.data & 0xf0000) >> 16;
+		m = (code.data & 0xf);
+		shift_t = DecodeImmShift((code.data & 0x30) >> 4, (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6, &shift_n);
 		break;
 	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 		bool carry, overflow;
-		const u32 shifted = Shift(thr->read_gpr(m), shift_t, shift_n, true);
-		const u32 res = AddWithCarry(thr->read_gpr(n), ~shifted, true, carry, overflow);
-		thr->APSR.N = res >> 31;
-		thr->APSR.Z = res == 0;
-		thr->APSR.C = carry;
-		thr->APSR.V = overflow;
+		const u32 shifted = Shift(context.read_gpr(m), shift_t, shift_n, true);
+		const u32 res = AddWithCarry(context.read_gpr(n), ~shifted, true, carry, overflow);
+		context.APSR.N = res >> 31;
+		context.APSR.Z = res == 0;
+		context.APSR.C = carry;
+		context.APSR.V = overflow;
 	}
 }
 
-void ARMv7_instrs::CMP_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::CMP_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1046,7 +1048,7 @@ void ARMv7_instrs::CMP_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::EOR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::EOR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1055,7 +1057,7 @@ void ARMv7_instrs::EOR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::EOR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::EOR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1064,7 +1066,7 @@ void ARMv7_instrs::EOR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::EOR_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::EOR_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1074,18 +1076,18 @@ void ARMv7_instrs::EOR_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::IT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::IT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
 	case T1:
 	{
-		if ((thr->code.data & 0xf) == 0)
+		if ((code.data & 0xf) == 0)
 		{
 			throw "IT_T1: Related encodings";
 		}
 
-		thr->ITSTATE.IT = thr->code.data & 0xff;
+		context.ITSTATE.IT = code.data & 0xff;
 		return;
 	}
 	default: throw __FUNCTION__;
@@ -1093,7 +1095,7 @@ void ARMv7_instrs::IT(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::LDM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1102,7 +1104,7 @@ void ARMv7_instrs::LDM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDMDA(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDMDA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1111,7 +1113,7 @@ void ARMv7_instrs::LDMDA(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDMDB(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDMDB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1120,7 +1122,7 @@ void ARMv7_instrs::LDMDB(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDMIB(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDMIB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1130,9 +1132,9 @@ void ARMv7_instrs::LDMIB(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::LDR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 t = 0;
 	u32 n = 13;
 	u32 imm32 = 0;
@@ -1144,22 +1146,22 @@ void ARMv7_instrs::LDR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		t = (thr->code.data & 0x7);
-		n = (thr->code.data & 0x38) >> 3;
-		imm32 = (thr->code.data & 0x7c0) >> 4;
+		t = (code.data & 0x7);
+		n = (code.data & 0x38) >> 3;
+		imm32 = (code.data & 0x7c0) >> 4;
 		break;
 	}
 	case T2:
 	{
-		t = (thr->code.data & 0x700) >> 8;
-		imm32 = (thr->code.data & 0xff) << 2;
+		t = (code.data & 0x700) >> 8;
+		imm32 = (code.data & 0xff) << 2;
 		break;
 	}
 	case T3:
 	{
-		t = (thr->code.data & 0xf000) >> 12;
-		n = (thr->code.data & 0xf0000) >> 16;
-		imm32 = (thr->code.data & 0xfff);
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xfff);
 
 		if (n == 15)
 		{
@@ -1169,12 +1171,12 @@ void ARMv7_instrs::LDR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case T4:
 	{
-		t = (thr->code.data & 0xf000) >> 12;
-		n = (thr->code.data & 0xf0000) >> 16;
-		imm32 = (thr->code.data & 0xff);
-		index = (thr->code.data & 0x400);
-		add = (thr->code.data & 0x200);
-		wback = (thr->code.data & 0x100);
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xff);
+		index = (code.data & 0x400);
+		add = (code.data & 0x200);
+		wback = (code.data & 0x100);
 
 		if (n == 15)
 		{
@@ -1197,21 +1199,21 @@ void ARMv7_instrs::LDR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		const u32 offset_addr = add ? thr->read_gpr(n) + imm32 : thr->read_gpr(n) - imm32;
-		const u32 addr = index ? offset_addr : thr->read_gpr(n);
+		const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32;
+		const u32 addr = index ? offset_addr : context.read_gpr(n);
 
 		if (wback)
 		{
-			thr->write_gpr(n, offset_addr);
+			context.write_gpr(n, offset_addr);
 		}
 
-		thr->write_gpr(t, vm::psv::read32(addr));
+		context.write_gpr(t, vm::psv::read32(addr));
 	}
 }
 
-void ARMv7_instrs::LDR_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDR_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1220,7 +1222,7 @@ void ARMv7_instrs::LDR_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1230,7 +1232,7 @@ void ARMv7_instrs::LDR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::LDRB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1239,7 +1241,7 @@ void ARMv7_instrs::LDRB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDRB_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRB_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1248,7 +1250,7 @@ void ARMv7_instrs::LDRB_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDRB_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1258,7 +1260,7 @@ void ARMv7_instrs::LDRB_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::LDRD_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRD_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1267,7 +1269,7 @@ void ARMv7_instrs::LDRD_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDRD_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRD_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1276,7 +1278,7 @@ void ARMv7_instrs::LDRD_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDRD_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRD_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1286,7 +1288,7 @@ void ARMv7_instrs::LDRD_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::LDRH_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRH_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1295,7 +1297,7 @@ void ARMv7_instrs::LDRH_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDRH_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRH_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1304,7 +1306,7 @@ void ARMv7_instrs::LDRH_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDRH_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRH_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1314,7 +1316,7 @@ void ARMv7_instrs::LDRH_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::LDRSB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRSB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1323,7 +1325,7 @@ void ARMv7_instrs::LDRSB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDRSB_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRSB_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1332,7 +1334,7 @@ void ARMv7_instrs::LDRSB_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDRSB_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRSB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1342,7 +1344,7 @@ void ARMv7_instrs::LDRSB_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::LDRSH_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRSH_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1351,7 +1353,7 @@ void ARMv7_instrs::LDRSH_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDRSH_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRSH_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1360,7 +1362,7 @@ void ARMv7_instrs::LDRSH_LIT(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LDRSH_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDRSH_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1370,10 +1372,47 @@ void ARMv7_instrs::LDRSH_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::LSL_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LDREX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	bool set_flags = !thr->ITSTATE;
-	u32 cond = thr->ITSTATE.advance();
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::LDREXB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::LDREXD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::LDREXH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+
+void ARMv7_instrs::LSL_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	bool set_flags = !context.ITSTATE;
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 0;
 	u32 m = 0;
 	u32 shift_n = 0;
@@ -1382,9 +1421,9 @@ void ARMv7_instrs::LSL_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		d = (thr->code.data & 0x7);
-		m = (thr->code.data & 0x38) >> 3;
-		shift_n = (thr->code.data & 0x7c0) >> 6;
+		d = (code.data & 0x7);
+		m = (code.data & 0x38) >> 3;
+		shift_n = (code.data & 0x7c0) >> 6;
 
 		if (!shift_n)
 		{
@@ -1394,10 +1433,10 @@ void ARMv7_instrs::LSL_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case T2:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		m = (thr->code.data & 0xf);
-		set_flags = (thr->code.data & 0x100000);
-		shift_n = (thr->code.data & 0x7000) >> 10 | (thr->code.data & 0xc0) >> 6;
+		d = (code.data & 0xf00) >> 8;
+		m = (code.data & 0xf);
+		set_flags = (code.data & 0x100000);
+		shift_n = (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6;
 
 		if (!shift_n)
 		{
@@ -1409,24 +1448,24 @@ void ARMv7_instrs::LSL_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 		bool carry;
-		const u32 res = Shift_C<u32>(thr->read_gpr(m), SRType_LSL, shift_n, thr->APSR.C, carry);
-		thr->write_gpr(d, res);
+		const u32 res = Shift_C<u32>(context.read_gpr(m), SRType_LSL, shift_n, context.APSR.C, carry);
+		context.write_gpr(d, res);
 		if (set_flags)
 		{
-			thr->APSR.N = res >> 31;
-			thr->APSR.Z = res == 0;
-			thr->APSR.C = carry;
+			context.APSR.N = res >> 31;
+			context.APSR.Z = res == 0;
+			context.APSR.C = carry;
 		}
 	}
 }
 
-void ARMv7_instrs::LSL_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LSL_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	bool set_flags = !thr->ITSTATE;
-	u32 cond = thr->ITSTATE.advance();
+	bool set_flags = !context.ITSTATE;
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 0;
 	u32 n = 0;
 	u32 m = 0;
@@ -1435,38 +1474,38 @@ void ARMv7_instrs::LSL_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		d = n = (thr->code.data & 0x7);
-		m = (thr->code.data & 0x38) >> 3;
+		d = n = (code.data & 0x7);
+		m = (code.data & 0x38) >> 3;
 		break;
 	}
 	case T2:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		n = (thr->code.data & 0xf0000) >> 16;
-		m = (thr->code.data & 0xf);
-		set_flags = (thr->code.data & 0x100000);
+		d = (code.data & 0xf00) >> 8;
+		n = (code.data & 0xf0000) >> 16;
+		m = (code.data & 0xf);
+		set_flags = (code.data & 0x100000);
 		break;
 	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 		bool carry;
-		const u32 res = Shift_C(thr->read_gpr(n), SRType_LSL, (thr->read_gpr(m) & 0xff), thr->APSR.C, carry);
-		thr->write_gpr(d, res);
+		const u32 res = Shift_C(context.read_gpr(n), SRType_LSL, (context.read_gpr(m) & 0xff), context.APSR.C, carry);
+		context.write_gpr(d, res);
 		if (set_flags)
 		{
-			thr->APSR.N = res >> 31;
-			thr->APSR.Z = res == 0;
-			thr->APSR.C = carry;
+			context.APSR.N = res >> 31;
+			context.APSR.Z = res == 0;
+			context.APSR.C = carry;
 		}
 	}
 }
 
 
-void ARMv7_instrs::LSR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LSR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1475,7 +1514,7 @@ void ARMv7_instrs::LSR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::LSR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::LSR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1485,7 +1524,7 @@ void ARMv7_instrs::LSR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::MLA(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MLA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1494,7 +1533,7 @@ void ARMv7_instrs::MLA(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::MLS(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MLS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1504,11 +1543,11 @@ void ARMv7_instrs::MLS(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::MOV_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MOV_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	bool set_flags = !thr->ITSTATE;
-	bool carry = thr->APSR.C;
-	u32 cond = thr->ITSTATE.advance();
+	bool set_flags = !context.ITSTATE;
+	bool carry = context.APSR.C;
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 0;
 	u32 imm32 = 0;
 
@@ -1516,42 +1555,42 @@ void ARMv7_instrs::MOV_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		d = (thr->code.data >> 8) & 0x7;
-		imm32 = sign<8, u32>(thr->code.data & 0xff);
+		d = (code.data >> 8) & 0x7;
+		imm32 = sign<8, u32>(code.data & 0xff);
 		break;
 	}
 	case T2:
 	{
-		set_flags = thr->code.data & 0x100000;
-		d = (thr->code.data >> 8) & 0xf;
-		imm32 = ThumbExpandImm_C((thr->code.data & 0x4000000) >> 15 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff), carry, carry);
+		set_flags = code.data & 0x100000;
+		d = (code.data >> 8) & 0xf;
+		imm32 = ThumbExpandImm_C((code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff), carry, carry);
 		break;
 	}
 	case T3:
 	{
 		set_flags = false;
-		d = (thr->code.data >> 8) & 0xf;
-		imm32 = (thr->code.data & 0xf0000) >> 4 | (thr->code.data & 0x4000000) >> 15 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff);
+		d = (code.data >> 8) & 0xf;
+		imm32 = (code.data & 0xf0000) >> 4 | (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
 		break;
 	}
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		thr->write_gpr(d, imm32);
+		context.write_gpr(d, imm32);
 		if (set_flags)
 		{
-			thr->APSR.N = imm32 >> 31;
-			thr->APSR.Z = imm32 == 0;
-			thr->APSR.C = carry;
+			context.APSR.N = imm32 >> 31;
+			context.APSR.Z = imm32 == 0;
+			context.APSR.C = carry;
 		}
 	}
 }
 
-void ARMv7_instrs::MOV_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MOV_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 0;
 	u32 m = 0;
 	bool set_flags = false;
@@ -1560,44 +1599,44 @@ void ARMv7_instrs::MOV_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		d = (thr->code.data & 0x80) >> 4 | (thr->code.data & 0x7);
-		m = (thr->code.data & 0x78) >> 3;
+		d = (code.data & 0x80) >> 4 | (code.data & 0x7);
+		m = (code.data & 0x78) >> 3;
 		break;
 	}
 	case T2:
 	{
-		d = (thr->code.data & 0x7);
-		m = (thr->code.data & 0x38) >> 3;
+		d = (code.data & 0x7);
+		m = (code.data & 0x38) >> 3;
 		set_flags = true;
 		break;
 	}
 	case T3:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		m = (thr->code.data & 0xf);
-		set_flags = (thr->code.data & 0x100000);
+		d = (code.data & 0xf00) >> 8;
+		m = (code.data & 0xf);
+		set_flags = (code.data & 0x100000);
 		break;
 	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		const u32 res = thr->read_gpr(m);
-		thr->write_gpr(d, res);
+		const u32 res = context.read_gpr(m);
+		context.write_gpr(d, res);
 		if (set_flags)
 		{
-			thr->APSR.N = res >> 31;
-			thr->APSR.Z = res == 0;
-			//thr->APSR.C = ?
+			context.APSR.N = res >> 31;
+			context.APSR.Z = res == 0;
+			//context.APSR.C = ?
 		}
 	}
 }
 
-void ARMv7_instrs::MOVT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MOVT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 0;
 	u32 imm16 = 0;
 
@@ -1605,22 +1644,22 @@ void ARMv7_instrs::MOVT(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		imm16 = (thr->code.data & 0xf0000) >> 4 | (thr->code.data & 0x4000000) >> 14 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff);
+		d = (code.data & 0xf00) >> 8;
+		imm16 = (code.data & 0xf0000) >> 4 | (code.data & 0x4000000) >> 14 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
 		break;
 	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		thr->write_gpr(d, (thr->read_gpr(d) & 0xffff) | (imm16 << 16));
+		context.write_gpr(d, (context.read_gpr(d) & 0xffff) | (imm16 << 16));
 	}
 }
 
 
-void ARMv7_instrs::MRS(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MRS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1629,7 +1668,7 @@ void ARMv7_instrs::MRS(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::MSR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MSR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1638,7 +1677,7 @@ void ARMv7_instrs::MSR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::MSR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MSR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1648,7 +1687,7 @@ void ARMv7_instrs::MSR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::MUL(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1658,7 +1697,7 @@ void ARMv7_instrs::MUL(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::MVN_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MVN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1667,7 +1706,7 @@ void ARMv7_instrs::MVN_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::MVN_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MVN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1676,7 +1715,7 @@ void ARMv7_instrs::MVN_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::MVN_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::MVN_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1686,9 +1725,9 @@ void ARMv7_instrs::MVN_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::NOP(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::NOP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 
 	switch (type)
 	{
@@ -1702,19 +1741,19 @@ void ARMv7_instrs::NOP(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case A1:
 	{
-		cond = thr->code.data >> 28;
+		cond = code.data >> 28;
 		break;
 	}
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 	}
 }
 
 
-void ARMv7_instrs::ORN_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ORN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1723,7 +1762,7 @@ void ARMv7_instrs::ORN_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::ORN_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ORN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1733,7 +1772,7 @@ void ARMv7_instrs::ORN_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::ORR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ORR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1742,7 +1781,7 @@ void ARMv7_instrs::ORR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::ORR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ORR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1751,7 +1790,7 @@ void ARMv7_instrs::ORR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::ORR_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ORR_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1761,7 +1800,7 @@ void ARMv7_instrs::ORR_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::PKH(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::PKH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1771,32 +1810,32 @@ void ARMv7_instrs::PKH(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::POP(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::POP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u16 reg_list = 0;
 
 	switch (type)
 	{
 	case T1:
 	{
-		reg_list = ((thr->code.data & 0x100) << 7) | (thr->code.data & 0xff);
+		reg_list = ((code.data & 0x100) << 7) | (code.data & 0xff);
 		break;
 	}
 	case T2:
 	{
-		reg_list = thr->code.data & 0xdfff;
+		reg_list = code.data & 0xdfff;
 		break;
 	}
 	case T3:
 	{
-		reg_list = 1 << (thr->code.data >> 12);
+		reg_list = 1 << (code.data >> 12);
 		break;
 	}
 	case A1:
 	{
-		cond = thr->code.data >> 28;
-		reg_list = thr->code.data & 0xffff;
+		cond = code.data >> 28;
+		reg_list = code.data & 0xffff;
 		if (BitCount(reg_list) < 2)
 		{
 			throw "LDM / LDMIA / LDMFD";
@@ -1805,52 +1844,52 @@ void ARMv7_instrs::POP(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case A2:
 	{
-		cond = thr->code.data >> 28;
-		reg_list = 1 << ((thr->code.data >> 12) & 0xf);
+		cond = code.data >> 28;
+		reg_list = 1 << ((code.data >> 12) & 0xf);
 		break;
 	}
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 		for (u16 mask = 1, i = 0; mask; mask <<= 1, i++)
 		{
 			if (reg_list & mask)
 			{
-				thr->write_gpr(i, vm::psv::read32(thr->SP));
-				thr->SP += 4;
+				context.write_gpr(i, vm::psv::read32(context.SP));
+				context.SP += 4;
 			}
 		}
 	}
 }
 
-void ARMv7_instrs::PUSH(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::PUSH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u16 reg_list = 0;
 
 	switch (type)
 	{
 	case T1:
 	{
-		reg_list = ((thr->code.data & 0x100) << 6) | (thr->code.data & 0xff);
+		reg_list = ((code.data & 0x100) << 6) | (code.data & 0xff);
 		break;
 	}
 	case T2:
 	{
-		reg_list = thr->code.data & 0x5fff;
+		reg_list = code.data & 0x5fff;
 		break;
 	}
 	case T3:
 	{
-		reg_list = 1 << (thr->code.data >> 12);
+		reg_list = 1 << (code.data >> 12);
 		break;
 	}
 	case A1:
 	{
-		cond = thr->code.data >> 28;
-		reg_list = thr->code.data & 0xffff;
+		cond = code.data >> 28;
+		reg_list = code.data & 0xffff;
 		if (BitCount(reg_list) < 2)
 		{
 			throw "STMDB / STMFD";
@@ -1859,28 +1898,28 @@ void ARMv7_instrs::PUSH(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case A2:
 	{
-		cond = thr->code.data >> 28;
-		reg_list = 1 << ((thr->code.data >> 12) & 0xf);
+		cond = code.data >> 28;
+		reg_list = 1 << ((code.data >> 12) & 0xf);
 		break;
 	}
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 		for (u16 mask = 1 << 15, i = 15; mask; mask >>= 1, i--)
 		{
 			if (reg_list & mask)
 			{
-				thr->SP -= 4;
-				vm::psv::write32(thr->SP, thr->read_gpr(i));
+				context.SP -= 4;
+				vm::psv::write32(context.SP, context.read_gpr(i));
 			}
 		}
 	}
 }
 
 
-void ARMv7_instrs::QADD(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::QADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1889,7 +1928,7 @@ void ARMv7_instrs::QADD(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::QADD16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::QADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1898,7 +1937,7 @@ void ARMv7_instrs::QADD16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::QADD8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::QADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1907,7 +1946,7 @@ void ARMv7_instrs::QADD8(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::QASX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::QASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1916,7 +1955,7 @@ void ARMv7_instrs::QASX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::QDADD(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::QDADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1925,7 +1964,7 @@ void ARMv7_instrs::QDADD(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::QDSUB(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::QDSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1934,7 +1973,7 @@ void ARMv7_instrs::QDSUB(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::QSAX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::QSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1943,7 +1982,7 @@ void ARMv7_instrs::QSAX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::QSUB(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::QSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1952,7 +1991,7 @@ void ARMv7_instrs::QSUB(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::QSUB16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::QSUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1961,7 +2000,7 @@ void ARMv7_instrs::QSUB16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::QSUB8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::QSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1971,7 +2010,7 @@ void ARMv7_instrs::QSUB8(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::RBIT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::RBIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1980,7 +2019,7 @@ void ARMv7_instrs::RBIT(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::REV(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::REV(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1989,7 +2028,7 @@ void ARMv7_instrs::REV(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::REV16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::REV16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -1998,7 +2037,7 @@ void ARMv7_instrs::REV16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::REVSH(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::REVSH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2008,7 +2047,7 @@ void ARMv7_instrs::REVSH(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::ROR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ROR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2017,7 +2056,7 @@ void ARMv7_instrs::ROR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::ROR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::ROR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2027,7 +2066,7 @@ void ARMv7_instrs::ROR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::RRX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::RRX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2037,7 +2076,7 @@ void ARMv7_instrs::RRX(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::RSB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::RSB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2046,7 +2085,7 @@ void ARMv7_instrs::RSB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::RSB_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::RSB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2055,7 +2094,7 @@ void ARMv7_instrs::RSB_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::RSB_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::RSB_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2065,7 +2104,7 @@ void ARMv7_instrs::RSB_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::RSC_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::RSC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2074,7 +2113,7 @@ void ARMv7_instrs::RSC_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::RSC_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::RSC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2083,7 +2122,7 @@ void ARMv7_instrs::RSC_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::RSC_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::RSC_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2093,7 +2132,7 @@ void ARMv7_instrs::RSC_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::SADD16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2102,7 +2141,7 @@ void ARMv7_instrs::SADD16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SADD8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2111,7 +2150,7 @@ void ARMv7_instrs::SADD8(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SASX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2121,7 +2160,7 @@ void ARMv7_instrs::SASX(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::SBC_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SBC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2130,7 +2169,7 @@ void ARMv7_instrs::SBC_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SBC_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SBC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2139,7 +2178,7 @@ void ARMv7_instrs::SBC_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SBC_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SBC_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2149,7 +2188,7 @@ void ARMv7_instrs::SBC_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::SBFX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SBFX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2159,7 +2198,7 @@ void ARMv7_instrs::SBFX(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::SDIV(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SDIV(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2169,7 +2208,7 @@ void ARMv7_instrs::SDIV(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::SEL(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SEL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2179,7 +2218,7 @@ void ARMv7_instrs::SEL(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::SHADD16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SHADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2188,7 +2227,7 @@ void ARMv7_instrs::SHADD16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SHADD8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SHADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2197,7 +2236,7 @@ void ARMv7_instrs::SHADD8(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SHASX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SHASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2206,7 +2245,7 @@ void ARMv7_instrs::SHASX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SHSAX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SHSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2215,7 +2254,7 @@ void ARMv7_instrs::SHSAX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SHSUB16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SHSUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2224,7 +2263,7 @@ void ARMv7_instrs::SHSUB16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SHSUB8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SHSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2234,7 +2273,7 @@ void ARMv7_instrs::SHSUB8(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::SMLA__(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMLA__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2243,7 +2282,7 @@ void ARMv7_instrs::SMLA__(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMLAD(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMLAD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2252,7 +2291,7 @@ void ARMv7_instrs::SMLAD(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMLAL(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMLAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2261,7 +2300,7 @@ void ARMv7_instrs::SMLAL(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMLAL__(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMLAL__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2270,7 +2309,7 @@ void ARMv7_instrs::SMLAL__(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMLALD(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMLALD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2279,7 +2318,7 @@ void ARMv7_instrs::SMLALD(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMLAW_(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMLAW_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2288,7 +2327,7 @@ void ARMv7_instrs::SMLAW_(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMLSD(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMLSD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2297,7 +2336,7 @@ void ARMv7_instrs::SMLSD(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMLSLD(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMLSLD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2306,7 +2345,7 @@ void ARMv7_instrs::SMLSLD(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMMLA(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMMLA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2315,7 +2354,7 @@ void ARMv7_instrs::SMMLA(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMMLS(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMMLS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2324,7 +2363,7 @@ void ARMv7_instrs::SMMLS(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMMUL(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMMUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2333,7 +2372,7 @@ void ARMv7_instrs::SMMUL(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMUAD(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMUAD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2342,7 +2381,7 @@ void ARMv7_instrs::SMUAD(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMUL__(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMUL__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2351,7 +2390,7 @@ void ARMv7_instrs::SMUL__(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMULL(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMULL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2360,7 +2399,7 @@ void ARMv7_instrs::SMULL(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMULW_(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMULW_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2369,7 +2408,7 @@ void ARMv7_instrs::SMULW_(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SMUSD(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SMUSD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2379,7 +2418,7 @@ void ARMv7_instrs::SMUSD(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::SSAT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SSAT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2388,7 +2427,7 @@ void ARMv7_instrs::SSAT(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SSAT16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SSAT16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2397,7 +2436,7 @@ void ARMv7_instrs::SSAT16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SSAX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2406,7 +2445,7 @@ void ARMv7_instrs::SSAX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SSUB16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SSUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2415,7 +2454,7 @@ void ARMv7_instrs::SSUB16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SSUB8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2425,7 +2464,7 @@ void ARMv7_instrs::SSUB8(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::STM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2434,7 +2473,7 @@ void ARMv7_instrs::STM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::STMDA(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STMDA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2443,7 +2482,7 @@ void ARMv7_instrs::STMDA(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::STMDB(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STMDB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2452,7 +2491,7 @@ void ARMv7_instrs::STMDB(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::STMIB(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STMIB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2462,9 +2501,9 @@ void ARMv7_instrs::STMIB(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::STR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 t = 16;
 	u32 n = 13;
 	u32 imm32 = 0;
@@ -2476,22 +2515,22 @@ void ARMv7_instrs::STR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		t = (thr->code.data & 0x7);
-		n = (thr->code.data & 0x38) >> 3;
-		imm32 = (thr->code.data & 0x7c0) >> 4;
+		t = (code.data & 0x7);
+		n = (code.data & 0x38) >> 3;
+		imm32 = (code.data & 0x7c0) >> 4;
 		break;
 	}
 	case T2:
 	{
-		t = (thr->code.data & 0x700) >> 8;
-		imm32 = (thr->code.data & 0xff) << 2;
+		t = (code.data & 0x700) >> 8;
+		imm32 = (code.data & 0xff) << 2;
 		break;
 	}
 	case T3:
 	{
-		t = (thr->code.data & 0xf000) >> 12;
-		n = (thr->code.data & 0xf0000) >> 16;
-		imm32 = (thr->code.data & 0xfff);
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xfff);
 
 		if (n == 0xf)
 		{
@@ -2501,12 +2540,12 @@ void ARMv7_instrs::STR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case T4:
 	{
-		t = (thr->code.data & 0xf000) >> 12;
-		n = (thr->code.data & 0xf0000) >> 16;
-		imm32 = (thr->code.data & 0xff);
-		index = (thr->code.data & 0x400);
-		add = (thr->code.data & 0x200);
-		wback = (thr->code.data & 0x100);
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xff);
+		index = (code.data & 0x400);
+		add = (code.data & 0x200);
+		wback = (code.data & 0x100);
 
 		if (index && add && !wback)
 		{
@@ -2526,23 +2565,23 @@ void ARMv7_instrs::STR_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		const u32 offset_addr = add ? thr->read_gpr(n) + imm32 : thr->read_gpr(n) - imm32;
-		const u32 addr = index ? offset_addr : thr->read_gpr(n);
+		const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32;
+		const u32 addr = index ? offset_addr : context.read_gpr(n);
 
-		vm::psv::write32(addr, thr->read_gpr(t));
+		vm::psv::write32(addr, context.read_gpr(t));
 
 		if (wback)
 		{
-			thr->write_gpr(n, offset_addr);
+			context.write_gpr(n, offset_addr);
 		}
 	}
 }
 
-void ARMv7_instrs::STR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 t = 0;
 	u32 n = 0;
 	u32 m = 0;
@@ -2556,17 +2595,17 @@ void ARMv7_instrs::STR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		t = (thr->code.data & 0x7);
-		n = (thr->code.data & 0x38) >> 3;
-		m = (thr->code.data & 0x1c0) >> 6;
+		t = (code.data & 0x7);
+		n = (code.data & 0x38) >> 3;
+		m = (code.data & 0x1c0) >> 6;
 		break;
 	}
 	case T2:
 	{
-		t = (thr->code.data & 0xf000) >> 12;
-		n = (thr->code.data & 0xf0000) >> 16;
-		m = (thr->code.data & 0xf);
-		shift_n = (thr->code.data & 0x30) >> 4;
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		m = (code.data & 0xf);
+		shift_n = (code.data & 0x30) >> 4;
 
 		if (n == 15)
 		{
@@ -2578,23 +2617,23 @@ void ARMv7_instrs::STR_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		const u32 offset = Shift(thr->read_gpr(m), shift_t, shift_n, thr->APSR.C);
-		const u32 offset_addr = add ? thr->read_gpr(n) + offset : thr->read_gpr(n) - offset;
-		const u32 addr = index ? offset_addr : thr->read_gpr(n);
+		const u32 offset = Shift(context.read_gpr(m), shift_t, shift_n, context.APSR.C);
+		const u32 offset_addr = add ? context.read_gpr(n) + offset : context.read_gpr(n) - offset;
+		const u32 addr = index ? offset_addr : context.read_gpr(n);
 
-		vm::psv::write32(addr, thr->read_gpr(t));
+		vm::psv::write32(addr, context.read_gpr(t));
 
 		if (wback)
 		{
-			thr->write_gpr(n, offset_addr);
+			context.write_gpr(n, offset_addr);
 		}
 	}
 }
 
 
-void ARMv7_instrs::STRB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STRB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2603,7 +2642,7 @@ void ARMv7_instrs::STRB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::STRB_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STRB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2613,7 +2652,7 @@ void ARMv7_instrs::STRB_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::STRD_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STRD_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2622,7 +2661,7 @@ void ARMv7_instrs::STRD_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::STRD_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STRD_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2632,7 +2671,7 @@ void ARMv7_instrs::STRD_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::STRH_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STRH_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2641,7 +2680,7 @@ void ARMv7_instrs::STRH_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::STRH_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STRH_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2651,10 +2690,47 @@ void ARMv7_instrs::STRH_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::SUB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::STREX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	bool set_flags = !thr->ITSTATE;
-	u32 cond = thr->ITSTATE.advance();
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::STREXB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::STREXD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::STREXH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+
+void ARMv7_instrs::SUB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	bool set_flags = !context.ITSTATE;
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 0;
 	u32 n = 0;
 	u32 imm32 = 0;
@@ -2663,23 +2739,23 @@ void ARMv7_instrs::SUB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		d = (thr->code.data & 0x7);
-		n = (thr->code.data & 0x38) >> 3;
-		imm32 = (thr->code.data & 0x1c) >> 6;
+		d = (code.data & 0x7);
+		n = (code.data & 0x38) >> 3;
+		imm32 = (code.data & 0x1c) >> 6;
 		break;
 	}
 	case T2:
 	{
-		d = n = (thr->code.data & 0x700) >> 8;
-		imm32 = (thr->code.data & 0xff);
+		d = n = (code.data & 0x700) >> 8;
+		imm32 = (code.data & 0xff);
 		break;
 	}
 	case T3:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		n = (thr->code.data & 0xf0000) >> 16;
-		set_flags = (thr->code.data & 0x100000);
-		imm32 = ThumbExpandImm(thr, (thr->code.data & 0x4000000) >> 15 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff));
+		d = (code.data & 0xf00) >> 8;
+		n = (code.data & 0xf0000) >> 16;
+		set_flags = (code.data & 0x100000);
+		imm32 = ThumbExpandImm(context, (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff));
 
 		if (d == 15 && set_flags)
 		{
@@ -2693,10 +2769,10 @@ void ARMv7_instrs::SUB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case T4:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		n = (thr->code.data & 0xf0000) >> 16;
+		d = (code.data & 0xf00) >> 8;
+		n = (code.data & 0xf0000) >> 16;
 		set_flags = false;
-		imm32 = (thr->code.data & 0x4000000) >> 15 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff);
+		imm32 = (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
 
 		if (d == 15)
 		{
@@ -2712,29 +2788,29 @@ void ARMv7_instrs::SUB_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 		if (set_flags)
 		{
 			bool carry, overflow;
-			const u32 res = AddWithCarry(thr->read_gpr(n), ~imm32, true, carry, overflow);
-			thr->write_gpr(d, res);
-			thr->APSR.N = res >> 31;
-			thr->APSR.Z = res == 0;
-			thr->APSR.C = carry;
-			thr->APSR.V = overflow;
+			const u32 res = AddWithCarry(context.read_gpr(n), ~imm32, true, carry, overflow);
+			context.write_gpr(d, res);
+			context.APSR.N = res >> 31;
+			context.APSR.Z = res == 0;
+			context.APSR.C = carry;
+			context.APSR.V = overflow;
 		}
 		else
 		{
-			thr->write_gpr(d, thr->read_gpr(n) - imm32);
+			context.write_gpr(d, context.read_gpr(n) - imm32);
 		}
 	}
 }
 
-void ARMv7_instrs::SUB_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SUB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	bool set_flags = !thr->ITSTATE;
-	u32 cond = thr->ITSTATE.advance();
+	bool set_flags = !context.ITSTATE;
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 0;
 	u32 n = 0;
 	u32 m = 0;
@@ -2745,18 +2821,18 @@ void ARMv7_instrs::SUB_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		d = (thr->code.data & 0x7);
-		n = (thr->code.data & 0x38) >> 3;
-		m = (thr->code.data & 0x1c0) >> 6;
+		d = (code.data & 0x7);
+		n = (code.data & 0x38) >> 3;
+		m = (code.data & 0x1c0) >> 6;
 		break;
 	}
 	case T2:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		n = (thr->code.data & 0xf0000) >> 16;
-		m = (thr->code.data & 0xf);
-		set_flags = (thr->code.data & 0x100000);
-		shift_t = DecodeImmShift((thr->code.data & 0x30) >> 4, (thr->code.data & 0x7000) >> 10 | (thr->code.data & 0xc0) >> 6, &shift_n);
+		d = (code.data & 0xf00) >> 8;
+		n = (code.data & 0xf0000) >> 16;
+		m = (code.data & 0xf);
+		set_flags = (code.data & 0x100000);
+		shift_t = DecodeImmShift((code.data & 0x30) >> 4, (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6, &shift_n);
 
 		if (d == 15 && set_flags)
 		{
@@ -2772,27 +2848,27 @@ void ARMv7_instrs::SUB_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
-		const u32 shifted = Shift(thr->read_gpr(m), shift_t, shift_n, thr->APSR.C);
+		const u32 shifted = Shift(context.read_gpr(m), shift_t, shift_n, context.APSR.C);
 		if (set_flags)
 		{
 			bool carry, overflow;
-			const u32 res = AddWithCarry(thr->read_gpr(n), ~shifted, true, carry, overflow);
-			thr->write_gpr(d, res);
-			thr->APSR.N = res >> 31;
-			thr->APSR.Z = res == 0;
-			thr->APSR.C = carry;
-			thr->APSR.V = overflow;
+			const u32 res = AddWithCarry(context.read_gpr(n), ~shifted, true, carry, overflow);
+			context.write_gpr(d, res);
+			context.APSR.N = res >> 31;
+			context.APSR.Z = res == 0;
+			context.APSR.C = carry;
+			context.APSR.V = overflow;
 		}
 		else
 		{
-			thr->write_gpr(d, thr->read_gpr(n) - shifted);
+			context.write_gpr(d, context.read_gpr(n) - shifted);
 		}
 	}
 }
 
-void ARMv7_instrs::SUB_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SUB_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2801,9 +2877,9 @@ void ARMv7_instrs::SUB_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SUB_SPI(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SUB_SPI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = thr->ITSTATE.advance();
+	u32 cond = context.ITSTATE.advance();
 	u32 d = 13;
 	bool set_flags = false;
 	u32 imm32 = 0;
@@ -2812,14 +2888,14 @@ void ARMv7_instrs::SUB_SPI(ARMv7Thread* thr, const ARMv7_encoding type)
 	{
 	case T1:
 	{
-		imm32 = (thr->code.data & 0x7f) << 2;
+		imm32 = (code.data & 0x7f) << 2;
 		break;
 	}
 	case T2:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
-		set_flags = (thr->code.data & 0x100000);
-		imm32 = ThumbExpandImm(thr, (thr->code.data & 0x4000000) >> 15 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff));
+		d = (code.data & 0xf00) >> 8;
+		set_flags = (code.data & 0x100000);
+		imm32 = ThumbExpandImm(context, (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff));
 
 		if (d == 15 && set_flags)
 		{
@@ -2829,35 +2905,35 @@ void ARMv7_instrs::SUB_SPI(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 	case T3:
 	{
-		d = (thr->code.data & 0xf00) >> 8;
+		d = (code.data & 0xf00) >> 8;
 		set_flags = false;
-		imm32 = (thr->code.data & 0x4000000) >> 15 | (thr->code.data & 0x7000) >> 4 | (thr->code.data & 0xff);
+		imm32 = (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
 		break;
 	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
 
-	if (ConditionPassed(thr, cond))
+	if (ConditionPassed(context, cond))
 	{
 		if (set_flags)
 		{
 			bool carry, overflow;
-			const u32 res = AddWithCarry(thr->SP, ~imm32, true, carry, overflow);
-			thr->write_gpr(d, res);
-			thr->APSR.N = res >> 31;
-			thr->APSR.Z = res == 0;
-			thr->APSR.C = carry;
-			thr->APSR.V = overflow;
+			const u32 res = AddWithCarry(context.SP, ~imm32, true, carry, overflow);
+			context.write_gpr(d, res);
+			context.APSR.N = res >> 31;
+			context.APSR.Z = res == 0;
+			context.APSR.C = carry;
+			context.APSR.V = overflow;
 		}
 		else
 		{
-			thr->write_gpr(d, thr->SP - imm32);
+			context.write_gpr(d, context.SP - imm32);
 		}
 	}
 }
 
-void ARMv7_instrs::SUB_SPR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SUB_SPR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2867,7 +2943,7 @@ void ARMv7_instrs::SUB_SPR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::SVC(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SVC(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2877,7 +2953,7 @@ void ARMv7_instrs::SVC(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::SXTAB(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SXTAB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2886,7 +2962,7 @@ void ARMv7_instrs::SXTAB(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SXTAB16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SXTAB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2895,7 +2971,7 @@ void ARMv7_instrs::SXTAB16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SXTAH(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SXTAH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2904,7 +2980,7 @@ void ARMv7_instrs::SXTAH(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SXTB(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SXTB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2913,7 +2989,7 @@ void ARMv7_instrs::SXTB(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SXTB16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SXTB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2922,7 +2998,7 @@ void ARMv7_instrs::SXTB16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::SXTH(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::SXTH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2932,7 +3008,7 @@ void ARMv7_instrs::SXTH(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::TB_(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::TB_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2942,7 +3018,7 @@ void ARMv7_instrs::TB_(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::TEQ_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::TEQ_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2951,7 +3027,7 @@ void ARMv7_instrs::TEQ_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::TEQ_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::TEQ_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2960,7 +3036,7 @@ void ARMv7_instrs::TEQ_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::TEQ_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::TEQ_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2970,7 +3046,7 @@ void ARMv7_instrs::TEQ_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::TST_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::TST_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2979,7 +3055,7 @@ void ARMv7_instrs::TST_IMM(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::TST_REG(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::TST_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2988,7 +3064,7 @@ void ARMv7_instrs::TST_REG(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::TST_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::TST_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -2998,7 +3074,7 @@ void ARMv7_instrs::TST_RSR(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 
-void ARMv7_instrs::UADD16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3007,7 +3083,7 @@ void ARMv7_instrs::UADD16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UADD8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3016,7 +3092,7 @@ void ARMv7_instrs::UADD8(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UASX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3025,7 +3101,7 @@ void ARMv7_instrs::UASX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UBFX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UBFX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3034,7 +3110,7 @@ void ARMv7_instrs::UBFX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UDIV(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UDIV(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3043,7 +3119,7 @@ void ARMv7_instrs::UDIV(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UHADD16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UHADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3052,7 +3128,7 @@ void ARMv7_instrs::UHADD16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UHADD8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UHADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3061,7 +3137,7 @@ void ARMv7_instrs::UHADD8(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UHASX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UHASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3070,7 +3146,7 @@ void ARMv7_instrs::UHASX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UHSAX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UHSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3079,7 +3155,7 @@ void ARMv7_instrs::UHSAX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UHSUB16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UHSUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3088,7 +3164,7 @@ void ARMv7_instrs::UHSUB16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UHSUB8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UHSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3097,7 +3173,7 @@ void ARMv7_instrs::UHSUB8(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UMAAL(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UMAAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3106,7 +3182,7 @@ void ARMv7_instrs::UMAAL(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UMLAL(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UMLAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3115,7 +3191,7 @@ void ARMv7_instrs::UMLAL(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UMULL(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UMULL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3124,7 +3200,7 @@ void ARMv7_instrs::UMULL(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UQADD16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UQADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3133,7 +3209,7 @@ void ARMv7_instrs::UQADD16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UQADD8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UQADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3142,7 +3218,7 @@ void ARMv7_instrs::UQADD8(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UQASX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UQASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3151,7 +3227,7 @@ void ARMv7_instrs::UQASX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UQSAX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UQSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3160,7 +3236,7 @@ void ARMv7_instrs::UQSAX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UQSUB16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UQSUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3169,7 +3245,7 @@ void ARMv7_instrs::UQSUB16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UQSUB8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UQSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3178,7 +3254,7 @@ void ARMv7_instrs::UQSUB8(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::USAD8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::USAD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3187,7 +3263,7 @@ void ARMv7_instrs::USAD8(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::USADA8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::USADA8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3196,7 +3272,7 @@ void ARMv7_instrs::USADA8(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::USAT(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::USAT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3205,7 +3281,7 @@ void ARMv7_instrs::USAT(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::USAT16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::USAT16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3214,7 +3290,7 @@ void ARMv7_instrs::USAT16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::USAX(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::USAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3223,7 +3299,7 @@ void ARMv7_instrs::USAX(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::USUB16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::USUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3232,7 +3308,7 @@ void ARMv7_instrs::USUB16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::USUB8(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::USUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3241,7 +3317,7 @@ void ARMv7_instrs::USUB8(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UXTAB(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UXTAB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3250,7 +3326,7 @@ void ARMv7_instrs::UXTAB(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UXTAB16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UXTAB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3259,7 +3335,7 @@ void ARMv7_instrs::UXTAB16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UXTAH(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UXTAH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3268,7 +3344,7 @@ void ARMv7_instrs::UXTAH(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UXTB(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UXTB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3277,7 +3353,7 @@ void ARMv7_instrs::UXTB(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UXTB16(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UXTB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3286,7 +3362,7 @@ void ARMv7_instrs::UXTB16(ARMv7Thread* thr, const ARMv7_encoding type)
 	}
 }
 
-void ARMv7_instrs::UXTH(ARMv7Thread* thr, const ARMv7_encoding type)
+void ARMv7_instrs::UXTH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
index 0cd02aecf7..0bf9652ba6 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include "Emu/ARMv7/ARMv7Thread.h"
-#include "Emu/System.h"
-#include "Utilities/Log.h"
-
 enum ARMv7_encoding
 {
 	T1, T2, T3, T4, A1, A2
@@ -61,18 +57,18 @@ namespace ARMv7_instrs
 	SRType DecodeRegShift(u8 type);
 
 	u32 LSL_C(u32 x, s32 shift, bool& carry_out);
-	u32 LSL(u32 x, s32 shift);
+	u32 LSL_(u32 x, s32 shift);
 	u32 LSR_C(u32 x, s32 shift, bool& carry_out);
-	u32 LSR(u32 x, s32 shift);
+	u32 LSR_(u32 x, s32 shift);
 
 	s32 ASR_C(s32 x, s32 shift, bool& carry_out);
-	s32 ASR(s32 x, s32 shift);
+	s32 ASR_(s32 x, s32 shift);
 
 	u32 ROR_C(u32 x, s32 shift, bool& carry_out);
-	u32 ROR(u32 x, s32 shift);
+	u32 ROR_(u32 x, s32 shift);
 
 	u32 RRX_C(u32 x, bool carry_in, bool& carry_out);
-	u32 RRX(u32 x, bool carry_in);
+	u32 RRX_(u32 x, bool carry_in);
 
 	template<typename T> T Shift_C(T value, SRType type, s32 amount, bool carry_in, bool& carry_out);
 
@@ -81,283 +77,293 @@ namespace ARMv7_instrs
 	template<typename T> T AddWithCarry(T x, T y, bool carry_in, bool& carry_out, bool& overflow);
 
 	u32 ThumbExpandImm_C(u32 imm12, bool carry_in, bool& carry_out);
-	u32 ThumbExpandImm(ARMv7Thread* CPU, u32 imm12);
+	u32 ThumbExpandImm(ARMv7Context& context, u32 imm12);
 
-	bool ConditionPassed(ARMv7Thread* CPU, u32 cond);
+	bool ConditionPassed(ARMv7Context& context, u32 cond);
 
 	// instructions
-	void UNK(ARMv7Thread* thr);
+	void UNK(ARMv7Context& context, const ARMv7Code code);
 
-	void NULL_OP(ARMv7Thread* thr, const ARMv7_encoding type);
+	void NULL_OP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void HACK(ARMv7Thread* thr, const ARMv7_encoding type);
+	void HACK(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void ADC_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void ADC_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void ADC_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void ADC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void ADC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void ADC_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void ADD_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void ADD_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void ADD_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
-	void ADD_SPI(ARMv7Thread* thr, const ARMv7_encoding type);
-	void ADD_SPR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void ADD_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void ADD_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void ADD_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void ADD_SPI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void ADD_SPR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void ADR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void ADR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void AND_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void AND_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void AND_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void AND_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void AND_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void AND_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void ASR_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void ASR_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void ASR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void ASR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void B(ARMv7Thread* thr, const ARMv7_encoding type);
+	void B(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void BFC(ARMv7Thread* thr, const ARMv7_encoding type);
-	void BFI(ARMv7Thread* thr, const ARMv7_encoding type);
+	void BFC(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void BFI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void BIC_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void BIC_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void BIC_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void BIC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void BIC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void BIC_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void BKPT(ARMv7Thread* thr, const ARMv7_encoding type);
+	void BKPT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void BL(ARMv7Thread* thr, const ARMv7_encoding type);
-	void BLX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void BX(ARMv7Thread* thr, const ARMv7_encoding type);
+	void BL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void BLX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void BX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void CB_Z(ARMv7Thread* thr, const ARMv7_encoding type);
+	void CB_Z(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void CLZ(ARMv7Thread* thr, const ARMv7_encoding type);
+	void CLZ(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void CMN_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void CMN_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void CMN_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void CMN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void CMN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void CMN_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void CMP_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void CMP_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void CMP_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void CMP_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void CMP_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void CMP_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void EOR_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void EOR_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void EOR_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void EOR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void EOR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void EOR_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void IT(ARMv7Thread* thr, const ARMv7_encoding type);
+	void IT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void LDM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDMDA(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDMDB(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDMIB(ARMv7Thread* thr, const ARMv7_encoding type);
+	void LDM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDMDA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDMDB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDMIB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void LDR_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDR_LIT(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDR_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void LDR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDR_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void LDRB_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDRB_LIT(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDRB_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void LDRB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDRB_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDRB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void LDRD_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDRD_LIT(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDRD_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void LDRD_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDRD_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDRD_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void LDRH_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDRH_LIT(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDRH_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void LDRH_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDRH_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDRH_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void LDRSB_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDRSB_LIT(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDRSB_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void LDRSB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDRSB_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDRSB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void LDRSH_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDRSH_LIT(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LDRSH_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void LDRSH_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDRSH_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDRSH_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void LSL_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LSL_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void LDREX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDREXB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDREXD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LDREXH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void LSR_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void LSR_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void LSL_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LSL_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void MLA(ARMv7Thread* thr, const ARMv7_encoding type);
-	void MLS(ARMv7Thread* thr, const ARMv7_encoding type);
+	void LSR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void LSR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void MOV_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void MOV_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void MOVT(ARMv7Thread* thr, const ARMv7_encoding type);
+	void MLA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void MLS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void MRS(ARMv7Thread* thr, const ARMv7_encoding type);
-	void MSR_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void MSR_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void MOV_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void MOV_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void MOVT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void MUL(ARMv7Thread* thr, const ARMv7_encoding type);
+	void MRS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void MSR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void MSR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void MVN_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void MVN_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void MVN_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void NOP(ARMv7Thread* thr, const ARMv7_encoding type);
+	void MVN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void MVN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void MVN_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void ORN_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void ORN_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void NOP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void ORR_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void ORR_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void ORR_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void ORN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void ORN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void PKH(ARMv7Thread* thr, const ARMv7_encoding type);
+	void ORR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void ORR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void ORR_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void POP(ARMv7Thread* thr, const ARMv7_encoding type);
-	void PUSH(ARMv7Thread* thr, const ARMv7_encoding type);
+	void PKH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void QADD(ARMv7Thread* thr, const ARMv7_encoding type);
-	void QADD16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void QADD8(ARMv7Thread* thr, const ARMv7_encoding type);
-	void QASX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void QDADD(ARMv7Thread* thr, const ARMv7_encoding type);
-	void QDSUB(ARMv7Thread* thr, const ARMv7_encoding type);
-	void QSAX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void QSUB(ARMv7Thread* thr, const ARMv7_encoding type);
-	void QSUB16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void QSUB8(ARMv7Thread* thr, const ARMv7_encoding type);
+	void POP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void PUSH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void RBIT(ARMv7Thread* thr, const ARMv7_encoding type);
-	void REV(ARMv7Thread* thr, const ARMv7_encoding type);
-	void REV16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void REVSH(ARMv7Thread* thr, const ARMv7_encoding type);
+	void QADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void QADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void QADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void QASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void QDADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void QDSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void QSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void QSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void QSUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void QSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void ROR_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void ROR_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void RBIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void REV(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void REV16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void REVSH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void RRX(ARMv7Thread* thr, const ARMv7_encoding type);
+	void ROR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void ROR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void RSB_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void RSB_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void RSB_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void RRX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void RSC_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void RSC_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void RSC_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void RSB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void RSB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void RSB_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void SADD16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SADD8(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SASX(ARMv7Thread* thr, const ARMv7_encoding type);
+	void RSC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void RSC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void RSC_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void SBC_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SBC_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SBC_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void SADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void SBFX(ARMv7Thread* thr, const ARMv7_encoding type);
+	void SBC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SBC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SBC_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void SDIV(ARMv7Thread* thr, const ARMv7_encoding type);
+	void SBFX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void SEL(ARMv7Thread* thr, const ARMv7_encoding type);
+	void SDIV(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void SHADD16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SHADD8(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SHASX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SHSAX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SHSUB16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SHSUB8(ARMv7Thread* thr, const ARMv7_encoding type);
+	void SEL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void SMLA__(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMLAD(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMLAL(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMLAL__(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMLALD(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMLAW_(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMLSD(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMLSLD(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMMLA(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMMLS(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMMUL(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMUAD(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMUL__(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMULL(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMULW_(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SMUSD(ARMv7Thread* thr, const ARMv7_encoding type);
+	void SHADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SHADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SHASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SHSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SHSUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SHSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void SSAT(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SSAT16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SSAX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SSUB16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SSUB8(ARMv7Thread* thr, const ARMv7_encoding type);
+	void SMLA__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMLAD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMLAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMLAL__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMLALD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMLAW_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMLSD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMLSLD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMMLA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMMLS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMMUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMUAD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMUL__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMULL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMULW_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SMUSD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void STM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void STMDA(ARMv7Thread* thr, const ARMv7_encoding type);
-	void STMDB(ARMv7Thread* thr, const ARMv7_encoding type);
-	void STMIB(ARMv7Thread* thr, const ARMv7_encoding type);
+	void SSAT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SSAT16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SSUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void STR_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void STR_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void STM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void STMDA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void STMDB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void STMIB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void STRB_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void STRB_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void STR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void STR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void STRD_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void STRD_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void STRB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void STRB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void STRH_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void STRH_REG(ARMv7Thread* thr, const ARMv7_encoding type);
+	void STRD_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void STRD_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void SUB_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SUB_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SUB_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SUB_SPI(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SUB_SPR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void STRH_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void STRH_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void SVC(ARMv7Thread* thr, const ARMv7_encoding type);
+	void STREX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void STREXB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void STREXD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void STREXH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void SXTAB(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SXTAB16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SXTAH(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SXTB(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SXTB16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void SXTH(ARMv7Thread* thr, const ARMv7_encoding type);
+	void SUB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SUB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SUB_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SUB_SPI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SUB_SPR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void TB_(ARMv7Thread* thr, const ARMv7_encoding type);
+	void SVC(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void TEQ_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void TEQ_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void TEQ_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void SXTAB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SXTAB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SXTAH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SXTB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SXTB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void SXTH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void TST_IMM(ARMv7Thread* thr, const ARMv7_encoding type);
-	void TST_REG(ARMv7Thread* thr, const ARMv7_encoding type);
-	void TST_RSR(ARMv7Thread* thr, const ARMv7_encoding type);
+	void TB_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
-	void UADD16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UADD8(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UASX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UBFX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UDIV(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UHADD16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UHADD8(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UHASX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UHSAX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UHSUB16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UHSUB8(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UMAAL(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UMLAL(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UMULL(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UQADD16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UQADD8(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UQASX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UQSAX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UQSUB16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UQSUB8(ARMv7Thread* thr, const ARMv7_encoding type);
-	void USAD8(ARMv7Thread* thr, const ARMv7_encoding type);
-	void USADA8(ARMv7Thread* thr, const ARMv7_encoding type);
-	void USAT(ARMv7Thread* thr, const ARMv7_encoding type);
-	void USAT16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void USAX(ARMv7Thread* thr, const ARMv7_encoding type);
-	void USUB16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void USUB8(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UXTAB(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UXTAB16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UXTAH(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UXTB(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UXTB16(ARMv7Thread* thr, const ARMv7_encoding type);
-	void UXTH(ARMv7Thread* thr, const ARMv7_encoding type);
+	void TEQ_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void TEQ_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void TEQ_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+
+	void TST_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void TST_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void TST_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+
+	void UADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UBFX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UDIV(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UHADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UHADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UHASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UHSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UHSUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UHSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UMAAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UMLAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UMULL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UQADD16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UQADD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UQASX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UQSAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UQSUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UQSUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void USAD8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void USADA8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void USAT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void USAT16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void USAX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void USUB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void USUB8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UXTAB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UXTAB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UXTAH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UXTB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UXTB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void UXTH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 };
 
 
@@ -371,7 +377,7 @@ struct ARMv7_opcode_t
 	u32 length; // 2 or 4
 	const char* name;
 	ARMv7_encoding type;
-	void(*func)(ARMv7Thread* thr, const ARMv7_encoding type);
+	void(*func)(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 };
 
 // single 16-bit value
@@ -548,6 +554,15 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfff0, 0x0fc0, 0xf930, 0x0000, T2, LDRSH_REG),
 	ARMv7_OP4(0x0e50, 0x0ff0, 0x0010, 0x00f0, A1, LDRSH_REG),
 
+	ARMv7_OP4(0xfff0, 0x0f00, 0xe850, 0x0f00, T1, LDREX),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x0190, 0x0f9f, A1, LDREX),
+	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f4f, T1, LDREXB),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01d0, 0x0f9f, A1, LDREXB),
+	ARMv7_OP4(0xfff0, 0x00ff, 0xe8d0, 0x007f, T1, LDREXD),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01b0, 0x0f9f, A1, LDREXD),
+	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f5f, T1, LDREXH),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01f0, 0x0f9f, A1, LDREXH),
+
 	ARMv7_OP2(0xf800, 0x0000, T1, LSL_IMM),
 	ARMv7_OP4(0xffef, 0x8030, 0xea4f, 0x0000, T2, LSL_IMM),
 	ARMv7_OP4(0x0fef, 0x0070, 0x01a0, 0x0000, A1, LSL_IMM),
@@ -626,7 +641,26 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0x0fff, 0x0000, 0x092d, 0x0000, A1, PUSH),
 	ARMv7_OP4(0x0fff, 0x0fff, 0x052d, 0x0004, A2, PUSH),
 
-	// TODO (Q*...)
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf080, T1, QADD),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0100, 0x0050, A1, QADD),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf010, T1, QADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f10, A1, QADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf010, T1, QADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f90, A1, QADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf010, T1, QASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f30, A1, QASX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf090, T1, QDADD),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0140, 0x0050, A1, QDADD),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf0b0, T1, QDSUB),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0160, 0x0050, A1, QDSUB),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf010, T1, QSAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f50, A1, QSAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf0a0, T1, QSUB),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0120, 0x0050, A1, QSUB),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf010, T1, QSUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f70, A1, QSUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf010, T1, QSUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0ff0, A1, QSUB8),
 
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf0a0, T1, RBIT),
 	ARMv7_OP4(0x0fff, 0x0ff0, 0x06ff, 0x0f30, A1, RBIT),
@@ -660,7 +694,12 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0x0fe0, 0x0010, 0x00e0, 0x0000, A1, RSC_REG),
 	ARMv7_OP4(0x0fe0, 0x0090, 0x00e0, 0x0010, A1, RSC_RSR),
 
-	// TODO (SADD16, SADD8, SASX)
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf000, T1, SADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f10, A1, SADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf000, T1, SADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f90, A1, SADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf000, T1, SASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f30, A1, SASX),
 
 	ARMv7_OP4(0xfbe0, 0x8000, 0xf160, 0x0000, T1, SBC_IMM),
 	ARMv7_OP4(0x0fe0, 0x0000, 0x02c0, 0x0000, A1, SBC_IMM),
@@ -677,7 +716,62 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf080, T1, SEL),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0680, 0x0fb0, A1, SEL),
 
-	// TODO (SH*, SM*, SS*)
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf020, T1, SHADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f10, A1, SHADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf020, T1, SHADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f90, A1, SHADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf020, T1, SHASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f30, A1, SHASX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf020, T1, SHSAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f50, A1, SHSAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf020, T1, SHSUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f70, A1, SHSUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf020, T1, SHSUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0ff0, A1, SHSUB8),
+
+	ARMv7_OP4(0xfff0, 0x00c0, 0xfb10, 0x0000, T1, SMLA__),
+	ARMv7_OP4(0x0ff0, 0x0090, 0x0100, 0x0080, A1, SMLA__),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfb20, 0x0000, T1, SMLAD),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0700, 0x0010, A1, SMLAD),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfbc0, 0x0000, T1, SMLAL),
+	ARMv7_OP4(0x0fe0, 0x00f0, 0x00e0, 0x0090, A1, SMLAL),//???
+	ARMv7_OP4(0xfff0, 0x00c0, 0xfbc0, 0x0080, T1, SMLAL__),
+	ARMv7_OP4(0x0ff0, 0x0090, 0x0140, 0x0080, A1, SMLAL__),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfbc0, 0x00c0, T1, SMLALD),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0740, 0x0010, A1, SMLALD),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfb30, 0x0000, T1, SMLAW_),
+	ARMv7_OP4(0x0ff0, 0x00b0, 0x0120, 0x0080, A1, SMLAW_),
+
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfb40, 0x0000, T1, SMLSD),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0700, 0x0050, A1, SMLSD),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfbd0, 0x00c0, T1, SMLSLD),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0740, 0x0050, A1, SMLSLD),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfb50, 0x0000, T1, SMMLA),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0750, 0x0010, A1, SMMLA),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfb60, 0x0000, T1, SMMLS),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0750, 0x00d0, A1, SMMLS),
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb50, 0xf000, T1, SMMUL),
+	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0750, 0xf010, A1, SMMUL),
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb20, 0xf000, T1, SMUAD),
+	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0700, 0xf010, A1, SMUAD),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfb10, 0xf000, T1, SMUL__),
+	ARMv7_OP4(0x0ff0, 0xf090, 0x0160, 0x0080, A1, SMUL__),//???
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfb80, 0x0000, T1, SMULL),
+	ARMv7_OP4(0x0fe0, 0x00f0, 0x00c0, 0x0090, A1, SMULL),
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb30, 0xf000, T1, SMULW_),
+	ARMv7_OP4(0x0ff0, 0xf0b0, 0x0120, 0x00a0, A1, SMULW_),//???
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb40, 0xf000, T1, SMUSD),
+	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0700, 0xf050, A1, SMUSD),
+	ARMv7_OP4(0xffd0, 0x8020, 0xf300, 0x0000, T1, SSAT),
+	ARMv7_OP4(0x0fe0, 0x0030, 0x06a0, 0x0010, A1, SSAT),
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xf320, 0x0000, T1, SSAT16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x06a0, 0x0f30, A1, SSAT16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf000, T1, SSAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f50, A1, SSAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf000, T1, SSUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f70, A1, SSUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf000, T1, SSUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0ff0, A1, SSUB8),
 
 	ARMv7_OP2(0xf800, 0xc000, T1, STM),
 	ARMv7_OP4(0xffd0, 0xa000, 0xe880, 0x0000, T2, STM),
@@ -716,6 +810,15 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfff0, 0x0fc0, 0xf820, 0x0000, T2, STRH_REG),
 	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00b0, A1, STRH_REG),
 
+	ARMv7_OP4(0xfff0, 0x0000, 0xe840, 0x0000, T1, STREX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0180, 0x0f90, A1, STREX),
+	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f40, T1, STREXB),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01c0, 0x0f90, A1, STREXB),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xe8c0, 0x0070, T1, STREXD),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01a0, 0x0f90, A1, STREXD),
+	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f50, T1, STREXH),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01e0, 0x0f90, A1, STREXH),
+
 	ARMv7_OP2(0xff80, 0xb080, T1, SUB_SPI),
 	ARMv7_OP4(0xfbef, 0x8000, 0xf1ad, 0x0000, T2, SUB_SPI),
 	ARMv7_OP4(0xfbff, 0x8000, 0xf2ad, 0x0000, T3, SUB_SPI),
@@ -735,7 +838,23 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP2(0xff00, 0xdf00, T1, SVC),
 	ARMv7_OP4(0x0f00, 0x0000, 0x0f00, 0x0000, A1, SVC),
 
-	// TODO (SX*)
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa40, 0xf080, T1, SXTAB),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x06a0, 0x0070, A1, SXTAB),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa20, 0xf080, T1, SXTAB16),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x0680, 0x0070, A1, SXTAB16),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa00, 0xf080, T1, SXTAH),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x06b0, 0x0070, A1, SXTAH),
+
+	ARMv7_OP2(0xffc0, 0xb240, T1, SXTB),
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa4f, 0xf080, T2, SXTB),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x06af, 0x0070, A1, SXTB),
+
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa2f, 0xf080, T1, SXTB16),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x068f, 0x0070, A1, SXTB16),
+
+	ARMv7_OP2(0xffc0, 0xb200, T1, SXTH),
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa0f, 0xf080, T2, SXTH),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x06bf, 0x0070, A1, SXTH),
 
 	ARMv7_OP4(0xfff0, 0xffe0, 0xe8d0, 0xf000, T1, TB_),
 
@@ -750,9 +869,80 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP2(0xffc0, 0x4200, T1, TST_REG),
 	ARMv7_OP4(0xfff0, 0x8f00, 0xea10, 0x0f00, T2, TST_REG),
 	ARMv7_OP4(0x0ff0, 0xf010, 0x0110, 0x0000, A1, TST_REG),
-	ARMv7_OP4(0x0ff0, 0xf090, 0x0110, 0x0010, A1, TST_RSR)
+	ARMv7_OP4(0x0ff0, 0xf090, 0x0110, 0x0010, A1, TST_RSR),
 
-	// TODO (U*, V*)
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf040, T1, UADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f10, A1, UADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf040, T1, UADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f90, A1, UADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf040, T1, UASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f30, A1, UASX),
+	ARMv7_OP4(0xfff0, 0x8020, 0xf3c0, 0x0000, T1, UBFX),
+	ARMv7_OP4(0x0fe0, 0x0070, 0x07e0, 0x0050, A1, UBFX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfbb0, 0xf0f0, T1, UDIV),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf060, T1, UHADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f10, A1, UHADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf060, T1, UHADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f90, A1, UHADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf060, T1, UHASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f30, A1, UHASX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf060, T1, UHSAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f50, A1, UHSAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf060, T1, UHSUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f70, A1, UHSUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf060, T1, UHSUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0ff0, A1, UHSUB8),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfbe0, 0x0060, T1, UMAAL),
+	ARMv7_OP4(0x0ff0, 0x00f0, 0x0040, 0x0090, A1, UMAAL),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfbe0, 0x0000, T1, UMLAL),
+	ARMv7_OP4(0x0fe0, 0x00f0, 0x00a0, 0x0090, A1, UMLAL),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfba0, 0x0000, T1, UMULL),
+	ARMv7_OP4(0x0fe0, 0x00f0, 0x0080, 0x0090, A1, UMULL),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf050, T1, UQADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f10, A1, UQADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf050, T1, UQADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f90, A1, UQADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf050, T1, UQASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f30, A1, UQASX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf050, T1, UQSAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f50, A1, UQSAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf050, T1, UQSUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f70, A1, UQSUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf050, T1, UQSUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0ff0, A1, UQSUB8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfb70, 0xf000, T1, USAD8),
+	ARMv7_OP4(0x0ff0, 0xf0f0, 0x0780, 0xf010, A1, USAD8),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfb70, 0x0000, T1, USADA8),
+	ARMv7_OP4(0x0ff0, 0x00f0, 0x0780, 0x0010, A1, USADA8),
+	ARMv7_OP4(0xffd0, 0x8020, 0xf380, 0x0000, T1, USAT),
+	ARMv7_OP4(0x0fe0, 0x0030, 0x06e0, 0x0010, A1, USAT),
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xf3a0, 0x0000, T1, USAT16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x06e0, 0x0f30, A1, USAT16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf040, T1, USAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f50, A1, USAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf040, T1, USUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f70, A1, USUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf040, T1, USUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0ff0, A1, USUB8),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa50, 0xf080, T1, UXTAB),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x06e0, 0x0070, A1, UXTAB),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa30, 0xf080, T1, UXTAB16),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x06c0, 0x0070, A1, UXTAB16),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa10, 0xf080, T1, UXTAH),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x06f0, 0x0070, A1, UXTAH),
+
+	ARMv7_OP2(0xffc0, 0xb2c0, T1, UXTB),
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa5f, 0xf080, T2, UXTB),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x06ef, 0x0070, A1, UXTB),
+
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa3f, 0xf080, T1, UXTB16),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x06cf, 0x0070, A1, UXTB16),
+
+	ARMv7_OP2(0xffc0, 0xb280, T1, UXTH),
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa1f, 0xf080, T2, UXTH),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x06ff, 0x0070, A1, UXTH),
+
+	// TODO (V*)
 };
 
 #undef ARMv7_OP2
diff --git a/rpcs3/Emu/ARMv7/ARMv7Opcodes.h b/rpcs3/Emu/ARMv7/ARMv7Opcodes.h
index 2d079aa6f9..2a73550111 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Opcodes.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Opcodes.h
@@ -2,8 +2,8 @@
 
 #include "Emu/ARMv7/ARMv7Thread.h"
 #include "Emu/ARMv7/ARMv7Interpreter.h"
-#include "Emu/System.h"
-#include "Utilities/Log.h"
+//#include "Emu/System.h"
+//#include "Utilities/Log.h"
 
 static const char* g_arm_reg_name[16] =
 {
@@ -17,12 +17,13 @@ using namespace ARMv7_instrs;
 
 struct ARMv7_Instruction
 {
-	void(*func)(ARMv7Thread* thr, const ARMv7_encoding type);
+	void(*func)(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	u8 size;
 	ARMv7_encoding type;
 	const char* name;
 };
 
+#if 0
 
 #define ARMv7_OP_2(func, type) { func, 2, type, #func "_" #type }
 #define ARMv7_OP_4(func, type) { func, 4, type, #func "_" #type }
@@ -30,7 +31,7 @@ struct ARMv7_Instruction
 
 
 // 0x1...
-static void group_0x1(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0x1(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0x1_main[] =
 {
@@ -56,7 +57,7 @@ static const ARMv7_Instruction g_table_0x1[] =
 	{ group_0x1 }
 };
 
-static void group_0x1(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x1(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x0e00) >> 8;
 
@@ -69,7 +70,7 @@ static void group_0x1(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0x2...
-static void group_0x2(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0x2(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0x2_main[] =
 {
@@ -89,7 +90,7 @@ static const ARMv7_Instruction g_table_0x2[] =
 	{ group_0x2 }
 };
 
-static void group_0x2(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x2(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x0800) >> 8;
 	thr->m_last_instr_name = g_table_0x2_main[index].name;
@@ -99,7 +100,7 @@ static void group_0x2(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0x3...
-static void group_0x3(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0x3(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0x3_main[] =
 {
@@ -119,7 +120,7 @@ static const ARMv7_Instruction g_table_0x3[] =
 	{ group_0x3 }
 };
 
-static void group_0x3(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x3(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x0800) >> 8;
 	thr->m_last_instr_name = g_table_0x3_main[index].name;
@@ -129,13 +130,13 @@ static void group_0x3(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0x4...
-static void group_0x4(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0x40(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0x41(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0x42(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0x43(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0x44(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0x47(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0x4(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0x40(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0x41(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0x42(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0x43(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0x44(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0x47(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0x4[] =
 {
@@ -160,7 +161,7 @@ static const ARMv7_Instruction g_table_0x40[] =
 	ARMv7_OP_2(LSR_REG, T1)  // C 0xffc0
 };
 
-static void group_0x40(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x40(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x00c0) >> 4;
 	thr->m_last_instr_name = g_table_0x40[index].name;
@@ -186,7 +187,7 @@ static const ARMv7_Instruction g_table_0x41[] =
 	ARMv7_OP_2(ROR_REG, T1)  // C 0xffc0
 };
 
-static void group_0x41(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x41(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x00c0) >> 4;
 	thr->m_last_instr_name = g_table_0x41[index].name;
@@ -211,7 +212,7 @@ static const ARMv7_Instruction g_table_0x42[] =
 	ARMv7_OP_2(CMN_REG, T1)  // C 0xffc0
 };
 
-static void group_0x42(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x42(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x00c0) >> 4;
 	thr->m_last_instr_name = g_table_0x42[index].name;
@@ -237,7 +238,7 @@ static const ARMv7_Instruction g_table_0x43[] =
 	ARMv7_OP_2(MVN_REG, T1)  // C 0xffc0
 };
 
-static void group_0x43(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x43(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x00c0) >> 4;
 	thr->m_last_instr_name = g_table_0x43[index].name;
@@ -258,7 +259,7 @@ static const ARMv7_Instruction g_table_0x44[] =
 	ARMv7_OP_2(ADD_SPR, T2)  // 8 0xff87
 };
 
-static void group_0x44(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x44(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x0080) >> 4;
 
@@ -284,7 +285,7 @@ static const ARMv7_Instruction g_table_0x47[] =
 	ARMv7_OP_2(BLX, T1)      // 8 0xff80
 };
 
-static void group_0x47(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x47(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x0080) >> 4;
 	thr->m_last_instr_name = g_table_0x47[index].name;
@@ -306,7 +307,7 @@ static const ARMv7_Instruction g_table_0x4_main[] =
 	ARMv7_OP_2(LDR_LIT, T1)  // 8 0xf800
 };
 
-static void group_0x4(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x4(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x0f00) >> 8;
 
@@ -319,7 +320,7 @@ static void group_0x4(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0x5...
-static void group_0x5(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0x5(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0x5_main[] =
 {
@@ -345,7 +346,7 @@ static const ARMv7_Instruction g_table_0x5[] =
 	{ group_0x5 }
 };
 
-static void group_0x5(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x5(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x0e00) >> 8;
 	thr->m_last_instr_name = g_table_0x5_main[index].name;
@@ -355,7 +356,7 @@ static void group_0x5(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0x6...
-static void group_0x6(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0x6(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0x6_main[] =
 {
@@ -375,7 +376,7 @@ static const ARMv7_Instruction g_table_0x6[] =
 	{ group_0x6 }
 };
 
-static void group_0x6(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x6(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x0800) >> 8;
 	thr->m_last_instr_name = g_table_0x6_main[index].name;
@@ -385,7 +386,7 @@ static void group_0x6(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0x7...
-static void group_0x7(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0x7(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0x7_main[] =
 {
@@ -405,7 +406,7 @@ static const ARMv7_Instruction g_table_0x7[] =
 	{ group_0x7 }
 };
 
-static void group_0x7(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x7(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x0800) >> 8;
 	thr->m_last_instr_name = g_table_0x7_main[index].name;
@@ -415,7 +416,7 @@ static void group_0x7(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0x8...
-static void group_0x8(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0x8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0x8_main[] =
 {
@@ -427,7 +428,7 @@ static const ARMv7_Instruction g_table_0x8[] =
 	{ group_0x8 }
 };
 
-static void group_0x8(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x0800) >> 8;
 	thr->m_last_instr_name = g_table_0x8_main[index].name;
@@ -437,7 +438,7 @@ static void group_0x8(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0x9...
-static void group_0x9(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0x9(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0x9_main[] =
 {
@@ -457,7 +458,7 @@ static const ARMv7_Instruction g_table_0x9[] =
 	{ group_0x9 }
 };
 
-static void group_0x9(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0x9(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x0800) >> 8;
 	thr->m_last_instr_name = g_table_0x9_main[index].name;
@@ -467,7 +468,7 @@ static void group_0x9(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0xa...
-static void group_0xa(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0xa(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0xa_main[] =
 {
@@ -487,7 +488,7 @@ static const ARMv7_Instruction g_table_0xa[] =
 	{ group_0xa }
 };
 
-static void group_0xa(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xa(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x0800) >> 8;
 	thr->m_last_instr_name = g_table_0xa_main[index].name;
@@ -497,9 +498,9 @@ static void group_0xa(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0xb...
-static void group_0xb(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xb0(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xba(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0xb(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xb0(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xba(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0xb0[] =
 {
@@ -514,7 +515,7 @@ static const ARMv7_Instruction g_table_0xb0[] =
 	ARMv7_OP_2(SUB_SPI, T1)  // 8 0xff80
 };
 
-static void group_0xb0(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xb0(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x0080) >> 4;
 	thr->m_last_instr_name = g_table_0xb0[index].name;
@@ -540,7 +541,7 @@ static const ARMv7_Instruction g_table_0xba[] =
 	ARMv7_OP_2(REVSH, T1)    // C 0xffc0
 };
 
-static void group_0xba(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xba(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x00c0) >> 4; // mask 0xffc0
 	thr->m_last_instr_name = g_table_0xba[index].name;
@@ -575,7 +576,7 @@ static const ARMv7_Instruction g_table_0xb[] =
 	{ group_0xb }
 };
 
-static void group_0xb(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xb(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x0e00) >> 8;
 
@@ -591,7 +592,7 @@ static void group_0xb(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0xc...
-static void group_0xc(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0xc(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0xc_main[] =
 {
@@ -611,7 +612,7 @@ static const ARMv7_Instruction g_table_0xc[] =
 	{ group_0xc }
 };
 
-static void group_0xc(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xc(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x0800) >> 8;
 	thr->m_last_instr_name = g_table_0xc_main[index].name;
@@ -621,7 +622,7 @@ static void group_0xc(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0xd...
-static void group_0xd(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0xd(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0xd_main[] =
 {
@@ -648,7 +649,7 @@ static const ARMv7_Instruction g_table_0xd[] =
 	{ group_0xd }
 };
 
-static void group_0xd(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xd(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	//u32 index = (thr->code.code0 & 0x0f00) >> 8;
 	//if ((thr->code.code0 & 0xf000) == 0xd000) index = 0;
@@ -661,19 +662,19 @@ static void group_0xd(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0xe...
-static void group_0xe(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xe85(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xe8(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xe9(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xea(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xea4(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xea4f(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xea4f0000(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xea4f0030(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xea6(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xeb(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xeb0(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xeba(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0xe(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xe85(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xe8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xe9(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xea(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xea4(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xea4f(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xea4f0000(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xea4f0030(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xea6(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xeb(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xeb0(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xeba(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 
 static const ARMv7_Instruction g_table_0xe85[] =
@@ -696,7 +697,7 @@ static const ARMv7_Instruction g_table_0xe85[] =
 	ARMv7_OP_4(LDRD_LIT, T1)  // F 0xfe7f, 0x0000
 };
 
-static void group_0xe85(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xe85(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	//u32 index = thr->code.code0 & 0x000f;
 	//if ((thr->code.code0 & 0xfe50) == 0xe850) index = 0x0;
@@ -726,7 +727,7 @@ static const ARMv7_Instruction g_table_0xe8[] =
 	ARMv7_OP_4(TB_, T1)       // D 0xfff0, 0xffe0
 };
 
-static void group_0xe8(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xe8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x00f0) >> 4;
 
@@ -747,7 +748,7 @@ static const ARMv7_Instruction g_table_0xe9[] =
 	ARMv7_OP_4(PUSH, T2)      // 2 0xffff, 0x0000
 };
 
-static void group_0xe9(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xe9(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x00d0) >> 4;
 
@@ -779,7 +780,7 @@ static const ARMv7_Instruction g_table_0xea4[] =
 	{ group_0xea4f }         // F
 };
 
-static void group_0xea4(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xea4(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = 0x0;
 	if ((thr->code.code0 & 0xffef) == 0xea4f) index = 0xf; // check me
@@ -798,7 +799,7 @@ static const ARMv7_Instruction g_table_0xea4f[] =
 	{ group_0xea4f0030 }     // 3
 };
 
-static void group_0xea4f(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xea4f(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code1 & 0x0030) >> 4;
 	thr->m_last_instr_name = g_table_0xea4f[index].name;
@@ -813,7 +814,7 @@ static const ARMv7_Instruction g_table_0xea4f0000[] =
 	ARMv7_OP_4(LSL_IMM, T2)  // 1 0xffef, 0x8030
 };
 
-static void group_0xea4f0000(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xea4f0000(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = thr->code.code1 & 0x8030 ? 0x0 : 0x1;
 	thr->m_last_instr_name = g_table_0xea4f0000[index].name;
@@ -828,7 +829,7 @@ static const ARMv7_Instruction g_table_0xea4f0030[] =
 	ARMv7_OP_4(ROR_IMM, T1)  // 2 0xffef, 0x8030
 };
 
-static void group_0xea4f0030(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xea4f0030(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = thr->code.code1 & 0x8030 ? 0x0 : 0x1;
 	thr->m_last_instr_name = g_table_0xea4f0030[index].name;
@@ -857,7 +858,7 @@ static const ARMv7_Instruction g_table_0xea6[] =
 	ARMv7_OP_4(MVN_REG, T2)  // F 0xffef, 0x8000
 };
 
-static void group_0xea6(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xea6(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -886,7 +887,7 @@ static const ARMv7_Instruction g_table_0xea[] =
 	ARMv7_OP_4(PKH, T1)       // C 0xfff0, 0x8010
 };
 
-static void group_0xea(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xea(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x00e0) >> 4;
 
@@ -918,7 +919,7 @@ static const ARMv7_Instruction g_table_0xeb0[] =
 	ARMv7_OP_4(ADD_SPR, T3)  // D 0xffef, 0x8000
 };
 
-static void group_0xeb0(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xeb0(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -948,7 +949,7 @@ static const ARMv7_Instruction g_table_0xeba[] =
 	ARMv7_OP_4(SUB_SPR, T1)  // D 0xffef, 0x8000
 };
 
-static void group_0xeba(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xeba(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -977,7 +978,7 @@ static const ARMv7_Instruction g_table_0xeb[] =
 	ARMv7_OP_4(RSB_REG, T1)  // C 0xffe0, 0x8000
 };
 
-static void group_0xeb(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xeb(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x00e0) >> 4;
 
@@ -1015,7 +1016,7 @@ static const ARMv7_Instruction g_table_0xe[] =
 	{ group_0xe }
 };
 
-static void group_0xe(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xe(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x0f00) >> 8;
 
@@ -1028,36 +1029,36 @@ static void group_0xe(ARMv7Thread* thr, const ARMv7_encoding type)
 }
 
 // 0xf...
-static void group_0xf(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf000(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf04(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf06(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf0(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf1(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf1a(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf10(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf20(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf2a(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf2(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf36(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf3(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf810(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf800(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf81(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf820(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf840(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf84(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf850(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf85(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf8(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf910(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf91(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf930(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf93(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xf9(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xfa00(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xfa90(ARMv7Thread* thr, const ARMv7_encoding type);
-static void group_0xfa(ARMv7Thread* thr, const ARMv7_encoding type);
+static void group_0xf(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf000(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf04(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf06(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf0(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf1(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf1a(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf10(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf20(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf2a(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf2(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf36(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf3(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf810(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf800(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf81(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf820(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf840(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf84(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf850(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf85(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf910(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf91(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf930(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf93(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xf9(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xfa00(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xfa90(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+static void group_0xfa(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 static const ARMv7_Instruction g_table_0xf000[] =
 {
@@ -1077,7 +1078,7 @@ static const ARMv7_Instruction g_table_0xf000[] =
 	ARMv7_OP_4(BL, T1)       // D 0xf800, 0xd000
 };
 
-static void group_0xf000(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf000(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code1 & 0xd000) >> 12;
 
@@ -1110,7 +1111,7 @@ static const ARMv7_Instruction g_table_0xf04[] =
 	ARMv7_OP_4(MOV_IMM, T2)  // F 0xfbef, 0x8000
 };
 
-static void group_0xf04(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf04(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1142,7 +1143,7 @@ static const ARMv7_Instruction g_table_0xf06[] =
 	ARMv7_OP_4(MVN_IMM, T1)  // F 0xfbef, 0x8000
 };
 
-static void group_0xf06(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf06(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1194,7 +1195,7 @@ static const ARMv7_Instruction g_table_0xf0[] =
 
 };
 
-static void group_0xf0(ARMv7Thread* thr, const ARMv7_encoding type) // TODO: optimize this group
+static void group_0xf0(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type) // TODO: optimize this group
 {
 	u32 index = 0;
 	if ((thr->m_arg & 0xfbe08000) == 0xf0000000) index = 0x0;
@@ -1242,7 +1243,7 @@ static const ARMv7_Instruction g_table_0xf10[] =
 	ARMv7_OP_4(ADD_SPI, T3)  // D 0xfbef, 0x8000
 };
 
-static void group_0xf10(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf10(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1272,7 +1273,7 @@ static const ARMv7_Instruction g_table_0xf1a[] =
 	ARMv7_OP_4(SUB_SPI, T2)  // D 0xfbef, 0x8000
 };
 
-static void group_0xf1a(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf1a(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1301,7 +1302,7 @@ static const ARMv7_Instruction g_table_0xf1[] =
 	ARMv7_OP_4(RSB_IMM, T2)  // C 0xfbe0, 0x8000
 };
 
-static void group_0xf1(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf1(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x00e0) >> 4;
 
@@ -1334,7 +1335,7 @@ static const ARMv7_Instruction g_table_0xf20[] =
 	ARMv7_OP_4(ADR, T3)      // F 0xfbff, 0x8000
 };
 
-static void group_0xf20(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf20(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1366,7 +1367,7 @@ static const ARMv7_Instruction g_table_0xf2a[] =
 	ARMv7_OP_4(ADR, T2)      // F 0xfbff, 0x8000
 };
 
-static void group_0xf2a(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf2a(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1395,7 +1396,7 @@ static const ARMv7_Instruction g_table_0xf2[] =
 	ARMv7_OP_4(MOVT, T1)     // C 0xfbf0, 0x8000
 };
 
-static void group_0xf2(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf2(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x00f0) >> 4; // mask 0xfbf0
 	thr->m_last_instr_name = g_table_0xf2[index].name;
@@ -1424,7 +1425,7 @@ static const ARMv7_Instruction g_table_0xf36[] =
 	ARMv7_OP_4(BFC, T1)      // F 0xffff, 0x8020
 };
 
-static void group_0xf36(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf36(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1455,7 +1456,7 @@ static const ARMv7_Instruction g_table_0xf3[] =
 	ARMv7_OP_4(MRS, T1),     // E 0xffff, 0xf0ff
 };
 
-static void group_0xf3(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf3(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x00f0) >> 4;
 	thr->m_last_instr_name = g_table_0xf3[index].name;
@@ -1477,7 +1478,7 @@ static const ARMv7_Instruction g_table_0xf800[] =
 	ARMv7_OP_4(STRB_IMM, T3)  // 8 0xfff0, 0x0800
 };
 
-static void group_0xf800(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf800(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code1 & 0x0f00) >> 8;
 
@@ -1502,7 +1503,7 @@ static const ARMv7_Instruction g_table_0xf810[] =
 	ARMv7_OP_4(LDRB_IMM, T3)  // 8 0xfff0, 0x0800
 };
 
-static void group_0xf810(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf810(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code1 & 0x0f00) >> 8;
 
@@ -1534,7 +1535,7 @@ static const ARMv7_Instruction g_table_0xf81[] =
 	ARMv7_OP_4(LDRB_LIT, T1) // F 0xff7f, 0x0000
 };
 
-static void group_0xf81(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf81(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1559,7 +1560,7 @@ static const ARMv7_Instruction g_table_0xf820[] =
 	ARMv7_OP_4(STRH_IMM, T3)  // 8 0xfff0, 0x0800
 };
 
-static void group_0xf820(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf820(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code1 & 0x0f00) >> 8;
 
@@ -1584,7 +1585,7 @@ static const ARMv7_Instruction g_table_0xf840[] =
 	ARMv7_OP_4(STR_IMM, T4)   // 8 0xfff0, 0x0800
 };
 
-static void group_0xf840(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf840(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code1 & 0x0f00) >> 8;
 
@@ -1614,7 +1615,7 @@ static const ARMv7_Instruction g_table_0xf84[] =
 	ARMv7_OP_4(PUSH, T3)      // D 0xffff, 0x0fff
 };
 
-static void group_0xf84(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf84(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1639,7 +1640,7 @@ static const ARMv7_Instruction g_table_0xf850[] =
 	ARMv7_OP_4(LDR_IMM, T4)   // 8 0xfff0, 0x0800
 };
 
-static void group_0xf850(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf850(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code1 & 0x0f00) >> 8;
 
@@ -1671,7 +1672,7 @@ static const ARMv7_Instruction g_table_0xf85[] =
 	ARMv7_OP_4(LDR_LIT, T2)   // F 0xff7f, 0x0000
 };
 
-static void group_0xf85(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf85(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1701,7 +1702,7 @@ static const ARMv7_Instruction g_table_0xf8[] =
 	ARMv7_OP_4(LDR_IMM, T3)   // D 0xfff0, 0x0000
 };
 
-static void group_0xf8(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf8(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code0 & 0x00f0) >> 4;
 	thr->m_last_instr_name = g_table_0xf8[index].name;
@@ -1723,7 +1724,7 @@ static const ARMv7_Instruction g_table_0xf910[] =
 	ARMv7_OP_4(LDRSB_IMM, T2)  // 8 0xfff0, 0x0800
 };
 
-static void group_0xf910(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf910(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code1 & 0x0f00) >> 8;
 
@@ -1755,7 +1756,7 @@ static const ARMv7_Instruction g_table_0xf91[] =
 	ARMv7_OP_4(LDRSB_LIT, T1) // F 0xff7f, 0x0000
 };
 
-static void group_0xf91(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf91(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1780,7 +1781,7 @@ static const ARMv7_Instruction g_table_0xf930[] =
 	ARMv7_OP_4(LDRSH_IMM, T2)  // 8 0xfff0, 0x0800
 };
 
-static void group_0xf930(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf930(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code1 & 0x0f00) >> 8;
 
@@ -1812,7 +1813,7 @@ static const ARMv7_Instruction g_table_0xf93[] =
 	ARMv7_OP_4(LDRSH_LIT, T1) // F 0xff7f, 0x0000
 };
 
-static void group_0xf93(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf93(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = thr->code.code0 & 0x000f;
 
@@ -1840,7 +1841,7 @@ static const ARMv7_Instruction g_table_0xf9[] =
 	ARMv7_OP_4(LDRSH_IMM, T1), // B 0xfff0, 0x0000
 };
 
-static void group_0xf9(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf9(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x00f0) >> 4;
 
@@ -1873,7 +1874,7 @@ static const ARMv7_Instruction g_table_0xfa00[] =
 	ARMv7_OP_4(LSL_REG, T2)    // F 0xffe0, 0xf0f0
 };
 
-static void group_0xfa00(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xfa00(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code1 & 0xf0f0) == 0xf000 ? 0xf : 0x0;
 	thr->m_last_instr_name = g_table_0xfa00[index].name;
@@ -1898,7 +1899,7 @@ static const ARMv7_Instruction g_table_0xfa90[] =
 	ARMv7_OP_4(REVSH, T2)      // B 0xfff0, 0xf0f0
 };
 
-static void group_0xfa90(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xfa90(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	const u32 index = (thr->code.code1 & 0x00f0) >> 4;
 	thr->m_last_instr_name = g_table_0xfa90[index].name;
@@ -1923,7 +1924,7 @@ static const ARMv7_Instruction g_table_0xfa[] =
 	ARMv7_OP_4(CLZ, T1)        // B 0xfff0, 0xf0f0
 };
 
-static void group_0xfa(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xfa(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x00e0) >> 4;
 
@@ -1958,7 +1959,7 @@ static const ARMv7_Instruction g_table_0xf_main[] =
 
 };
 
-static void group_0xf(ARMv7Thread* thr, const ARMv7_encoding type)
+static void group_0xf(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 index = (thr->code.code0 & 0x0b00) >> 8;
 
@@ -2023,3 +2024,4 @@ static void execute_main_group(ARMv7Thread* thr)
 #undef ARMv7_OP_2
 #undef ARMv7_OP_4
 #undef ARMv7_NULL_OP
+#endif
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
index c8a9e7c4b5..c9e04f786b 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
@@ -10,22 +10,38 @@
 #include "ARMv7DisAsm.h"
 #include "ARMv7Interpreter.h"
 
+void ARMv7Context::write_pc(u32 value)
+{
+	thread.SetBranch(value);
+}
+
+u32 ARMv7Context::read_pc()
+{
+	return thread.PC;
+}
+
+u32 ARMv7Context::get_stack_arg(u32 pos)
+{
+	return vm::psv::read32(SP + sizeof(u32) * (pos - 5));
+}
+
 ARMv7Thread::ARMv7Thread()
 	: CPUThread(CPU_THREAD_ARMv7)
-	, m_arg(0)
-	, m_last_instr_size(0)
-	, m_last_instr_name("UNK")
+	, context(*this)
+	//, m_arg(0)
+	//, m_last_instr_size(0)
+	//, m_last_instr_name("UNK")
 {
 }
 
 void ARMv7Thread::InitRegs()
 {
-	memset(GPR, 0, sizeof(GPR[0]) * 15);
-	APSR.APSR = 0;
-	IPSR.IPSR = 0;
-	ISET = Thumb;
-	ITSTATE.IT = 0;
-	SP = m_stack_addr + m_stack_size;
+	memset(context.GPR, 0, sizeof(context.GPR[0]) * 15);
+	context.APSR.APSR = 0;
+	context.IPSR.IPSR = 0;
+	context.ISET = Thumb;
+	context.ITSTATE.IT = 0;
+	context.SP = m_stack_addr + m_stack_size;
 }
 
 void ARMv7Thread::InitStack()
@@ -37,26 +53,21 @@ void ARMv7Thread::InitStack()
 	}
 }
 
-u32 ARMv7Thread::GetStackArg(u32 pos)
-{
-	return vm::psv::read32(SP + sizeof(u32) * (pos - 5));
-}
-
 std::string ARMv7Thread::RegsToString()
 {
 	std::string result = "Registers:\n=========\n";
 	for(int i=0; i<15; ++i)
 	{
-		result += fmt::Format("%s\t= 0x%08x\n", g_arm_reg_name[i], GPR[i]);
+		result += fmt::Format("%s\t= 0x%08x\n", g_arm_reg_name[i], context.GPR[i]);
 	}
 
 	result += fmt::Format("APSR\t= 0x%08x [N: %d, Z: %d, C: %d, V: %d, Q: %d]\n", 
-		APSR.APSR,
-		fmt::by_value(APSR.N),
-		fmt::by_value(APSR.Z),
-		fmt::by_value(APSR.C),
-		fmt::by_value(APSR.V),
-		fmt::by_value(APSR.Q));
+		context.APSR.APSR,
+		fmt::by_value(context.APSR.N),
+		fmt::by_value(context.APSR.Z),
+		fmt::by_value(context.APSR.C),
+		fmt::by_value(context.APSR.V),
+		fmt::by_value(context.APSR.Q));
 	
 	return result;
 }
@@ -110,21 +121,21 @@ void ARMv7Thread::FastCall(u32 addr)
 {
 	auto old_status = m_status;
 	auto old_PC = PC;
-	auto old_stack = SP;
-	auto old_LR = LR;
+	auto old_stack = context.SP;
+	auto old_LR = context.LR;
 	auto old_thread = GetCurrentNamedThread();
 
 	m_status = Running;
 	PC = addr;
-	LR = Emu.GetCPUThreadStop();
+	context.LR = Emu.GetCPUThreadStop();
 	SetCurrentNamedThread(this);
 
 	CPUThread::Task();
 
 	m_status = old_status;
 	PC = old_PC;
-	SP = old_stack;
-	LR = old_LR;
+	context.SP = old_stack;
+	context.LR = old_LR;
 	SetCurrentNamedThread(old_thread);
 }
 
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.h b/rpcs3/Emu/ARMv7/ARMv7Thread.h
index 22e655188d..2dd26772e7 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.h
@@ -1,147 +1,24 @@
 #pragma once
 #include "Emu/CPU/CPUThread.h"
 #include "Emu/Memory/Memory.h"
-
-enum ARMv7InstructionSet
-{
-	ARM,
-	Thumb,
-	Jazelle,
-	ThumbEE
-};
+#include "ARMv7Context.h"
 
 class ARMv7Thread : public CPUThread
 {
 public:
-	u32 m_arg;
-	u8 m_last_instr_size;
-	const char* m_last_instr_name;
+	ARMv7Context context;
+	//u32 m_arg;
+	//u8 m_last_instr_size;
+	//const char* m_last_instr_name;
 
 	ARMv7Thread();
 
-	union
-	{
-		u32 GPR[15];
-
-		struct
-		{
-			u32 pad[13];
-
-			union
-			{
-				u32 SP;
-
-				struct { u16 SP_main, SP_process; };
-			};
-
-			u32 LR;
-		};
-	};
-
-	union
-	{
-		struct
-		{
-			u32 N : 1; //Negative condition code flag
-			u32 Z : 1; //Zero condition code flag
-			u32 C : 1; //Carry condition code flag
-			u32 V : 1; //Overflow condition code flag
-			u32 Q : 1; //Set to 1 if an SSAT or USAT instruction changes (saturates) the input value for the signed or unsigned range of the result
-			u32 : 27;
-		};
-
-		u32 APSR;
-
-	} APSR;
-
-	union
-	{
-		struct
-		{
-			u32 : 24;
-			u32 exception : 8;
-		};
-
-		u32 IPSR;
-
-	} IPSR;
-
-	union
-	{
-		struct
-		{
-			u32 code1 : 16;
-			u32 code0 : 16;
-		};
-
-		u32 data;
-
-	} code;
-
-	ARMv7InstructionSet ISET;
-
-	union
-	{
-		struct
-		{
-			u8 cond : 3;
-			u8 state : 5;
-		};
-
-		u8 IT;
-
-		u32 advance()
-		{
-			const u32 res = (state & 0xf) ? (cond << 1 | state >> 4) : 0xe /* true */;
-
-			state <<= 1;
-			if ((state & 0xf) == 0) // if no d
-			{
-				IT = 0; // clear ITSTATE
-			}
-
-			return res;
-		}
-
-		operator bool() const
-		{
-			return (state & 0xf) != 0;
-		}
-
-	} ITSTATE;
-
-	void write_gpr(u32 n, u32 value)
-	{
-		assert(n < 16);
-
-		if(n < 15)
-		{
-			GPR[n] = value;
-		}
-		else
-		{
-			SetBranch(value & ~1);
-		}
-	}
-
-	u32 read_gpr(u32 n)
-	{
-		assert(n < 16);
-
-		if(n < 15)
-		{
-			return GPR[n];
-		}
-		
-		return PC;
-	}
-
-	void update_code(const u32 address)
-	{
-		code.code0 = vm::psv::read16(address & ~1);
-		code.code1 = vm::psv::read16(address + 2 & ~1);
-		m_arg = address & 0x1 ? code.code1 << 16 | code.code0 : code.data;
-	}
+	//void update_code(const u32 address)
+	//{
+	//	code.code0 = vm::psv::read16(address & ~1);
+	//	code.code1 = vm::psv::read16(address + 2 & ~1);
+	//	m_arg = address & 0x1 ? code.code1 << 16 | code.code0 : code.data;
+	//}
 
 public:
 	virtual void InitRegs(); 
@@ -209,131 +86,3 @@ public:
 		return *this;
 	}
 };
-
-template<typename T, bool is_enum = std::is_enum<T>::value>
-struct cast_armv7_gpr
-{
-	static_assert(is_enum, "Invalid type for cast_armv7_gpr");
-
-	typedef typename std::underlying_type<T>::type underlying_type;
-
-	__forceinline static u32 to_gpr(const T& value)
-	{
-		return cast_armv7_gpr<underlying_type>::to_gpr(static_cast<underlying_type>(value));
-	}
-
-	__forceinline static T from_gpr(const u32 reg)
-	{
-		return static_cast<T>(cast_armv7_gpr<underlying_type>::from_gpr(reg));
-	}
-};
-
-template<>
-struct cast_armv7_gpr<u8, false>
-{
-	__forceinline static u32 to_gpr(const u8& value)
-	{
-		return value;
-	}
-
-	__forceinline static u8 from_gpr(const u32 reg)
-	{
-		return static_cast<u8>(reg);
-	}
-};
-
-template<>
-struct cast_armv7_gpr<u16, false>
-{
-	__forceinline static u32 to_gpr(const u16& value)
-	{
-		return value;
-	}
-
-	__forceinline static u16 from_gpr(const u32 reg)
-	{
-		return static_cast<u16>(reg);
-	}
-};
-
-template<>
-struct cast_armv7_gpr<u32, false>
-{
-	__forceinline static u32 to_gpr(const u32& value)
-	{
-		return value;
-	}
-
-	__forceinline static u32 from_gpr(const u32 reg)
-	{
-		return reg;
-	}
-};
-
-template<>
-struct cast_armv7_gpr<s8, false>
-{
-	__forceinline static u32 to_gpr(const s8& value)
-	{
-		return value;
-	}
-
-	__forceinline static s8 from_gpr(const u32 reg)
-	{
-		return static_cast<s8>(reg);
-	}
-};
-
-template<>
-struct cast_armv7_gpr<s16, false>
-{
-	__forceinline static u32 to_gpr(const s16& value)
-	{
-		return value;
-	}
-
-	__forceinline static s16 from_gpr(const u32 reg)
-	{
-		return static_cast<s16>(reg);
-	}
-};
-
-template<>
-struct cast_armv7_gpr<s32, false>
-{
-	__forceinline static u32 to_gpr(const s32& value)
-	{
-		return value;
-	}
-
-	__forceinline static s32 from_gpr(const u32 reg)
-	{
-		return static_cast<s32>(reg);
-	}
-};
-
-template<>
-struct cast_armv7_gpr<bool, false>
-{
-	__forceinline static u32 to_gpr(const bool& value)
-	{
-		return value;
-	}
-
-	__forceinline static bool from_gpr(const u32 reg)
-	{
-		return reinterpret_cast<const bool&>(reg);
-	}
-};
-
-template<typename T>
-__forceinline u32 cast_to_armv7_gpr(const T& value)
-{
-	return cast_armv7_gpr<T>::to_gpr(value);
-}
-
-template<typename T>
-__forceinline T cast_from_armv7_gpr(const u32 reg)
-{
-	return cast_armv7_gpr<T>::from_gpr(reg);
-}
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index 7ae9f6a2a6..b07f39f522 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -1,9 +1,10 @@
 #include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/Memory/Memory.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
 #include "Emu/CPU/CPUThreadManager.h"
 #include "Emu/ARMv7/ARMv7Thread.h"
-#include "Emu/ARMv7/PSVFuncList.h"
 
 extern psv_log_base sceLibKernel;
 
@@ -129,23 +130,23 @@ s32 sceKernelStartThread(s32 threadId, u32 argSize, vm::psv::ptr<const void> pAr
 	ARMv7Thread& thread = static_cast<ARMv7Thread&>(*t);
 
 	// push arg block onto the stack
-	const u32 pos = (thread.SP -= argSize);
+	const u32 pos = (thread.context.SP -= argSize);
 	memcpy(vm::get_ptr<void>(pos), pArgBlock.get_ptr(), argSize);
 
 	// set SceKernelThreadEntry function arguments
-	thread.write_gpr(0, argSize);
-	thread.write_gpr(1, pos);
+	thread.context.write_gpr(0, argSize);
+	thread.context.write_gpr(1, pos);
 
 	thread.Exec();
 	return SCE_OK;
 }
 
-s32 sceKernelExitThread(ARMv7Thread& CPU, s32 exitStatus)
+s32 sceKernelExitThread(ARMv7Context& context, s32 exitStatus)
 {
 	sceLibKernel.Error("sceKernelExitThread(exitStatus=0x%x)", exitStatus);
 
 	// exit status is stored in r0
-	CPU.Stop();
+	context.thread.Stop();
 
 	return SCE_OK;
 }
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.cpp b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
index 84262b3b0f..a40457aef3 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.cpp
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
@@ -2,6 +2,7 @@
 #include <unordered_map>
 #include "Utilities/Log.h"
 #include "Emu/System.h"
+#include "ARMv7Thread.h"
 #include "PSVFuncList.h"
 
 std::vector<psv_func> g_psv_func_list;
@@ -14,13 +15,20 @@ void add_psv_func(psv_func& data)
 		psv_func unimplemented;
 		unimplemented.nid = 0;
 		unimplemented.name = "Special function (unimplemented stub)";
-		unimplemented.func.reset(new psv_func_detail::func_binder<void, ARMv7Thread&>([](ARMv7Thread& CPU){ CPU.m_last_syscall = vm::psv::read32(CPU.PC + 4); throw "Unimplemented function executed"; }));
+		unimplemented.func.reset(new psv_func_detail::func_binder<void, ARMv7Context&>([](ARMv7Context& context)
+		{
+			context.thread.m_last_syscall = vm::psv::read32(context.thread.PC + 4);
+			throw "Unimplemented function executed";
+		}));
 		g_psv_func_list.push_back(unimplemented);
 
 		psv_func hle_return;
 		hle_return.nid = 1;
 		hle_return.name = "Special function (return from HLE)";
-		hle_return.func.reset(new psv_func_detail::func_binder<void, ARMv7Thread&>([](ARMv7Thread& CPU){ CPU.FastStop(); }));
+		hle_return.func.reset(new psv_func_detail::func_binder<void, ARMv7Context&>([](ARMv7Context& context)
+		{
+			context.thread.FastStop();
+		}));
 		g_psv_func_list.push_back(hle_return);
 	}
 
@@ -49,16 +57,16 @@ u32 get_psv_func_index(psv_func* func)
 	return (u32)res;
 }
 
-void execute_psv_func_by_index(ARMv7Thread& CPU, u32 index)
+void execute_psv_func_by_index(ARMv7Context& context, u32 index)
 {
 	assert(index < g_psv_func_list.size());
 	
-	auto old_last_syscall = CPU.m_last_syscall;
-	CPU.m_last_syscall = g_psv_func_list[index].nid;
+	auto old_last_syscall = context.thread.m_last_syscall;
+	context.thread.m_last_syscall = g_psv_func_list[index].nid;
 
-	(*g_psv_func_list[index].func)(CPU);
+	(*g_psv_func_list[index].func)(context);
 
-	CPU.m_last_syscall = old_last_syscall;
+	context.thread.m_last_syscall = old_last_syscall;
 }
 
 extern psv_log_base sceLibc;
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h
index 9fe75a647a..c6959a1bd5 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.h
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "ARMv7Thread.h"
+#include "ARMv7Context.h"
 #include "Emu/SysCalls/LogBase.h"
 
 class psv_log_base : public LogBase
@@ -401,7 +401,7 @@ enum psv_error_codes
 class psv_func_caller
 {
 public:
-	virtual void operator()(ARMv7Thread& CPU) = 0;
+	virtual void operator()(ARMv7Context& CPU) = 0;
 	virtual ~psv_func_caller(){};
 };
 
@@ -423,9 +423,9 @@ namespace psv_func_detail
 	{
 		static_assert(sizeof(T) <= 4, "Invalid function argument type for ARG_GENERAL");
 
-		static __forceinline T func(ARMv7Thread& CPU)
+		static __forceinline T func(ARMv7Context& context)
 		{
-			return cast_from_armv7_gpr<T>(CPU.GPR[g_count - 1]);
+			return cast_from_armv7_gpr<T>(context.GPR[g_count - 1]);
 		}
 	};
 
@@ -435,7 +435,7 @@ namespace psv_func_detail
 		static_assert(f_count <= 0, "TODO: Unsupported argument type (float)");
 		static_assert(sizeof(T) <= 8, "Invalid function argument type for ARG_FLOAT");
 
-		static __forceinline T func(ARMv7Thread& CPU)
+		static __forceinline T func(ARMv7Context& context)
 		{
 		}
 	};
@@ -446,7 +446,7 @@ namespace psv_func_detail
 		static_assert(v_count <= 0, "TODO: Unsupported argument type (vector)");
 		static_assert(std::is_same<T, u128>::value, "Invalid function argument type for ARG_VECTOR");
 
-		static __forceinline T func(ARMv7Thread& CPU)
+		static __forceinline T func(ARMv7Context& context)
 		{
 		}
 	};
@@ -458,10 +458,10 @@ namespace psv_func_detail
 		static_assert(v_count <= 0, "TODO: Unsupported stack argument type (vector)");
 		static_assert(sizeof(T) <= 4, "Invalid function argument type for ARG_STACK");
 
-		static __forceinline T func(ARMv7Thread& CPU)
+		static __forceinline T func(ARMv7Context& context)
 		{
 			// TODO: check
-			const u32 res = CPU.GetStackArg(g_count);
+			const u32 res = context.get_stack_arg(g_count);
 			return cast_from_armv7_gpr<T>(res);
 		}
 	};
@@ -474,9 +474,9 @@ namespace psv_func_detail
 		static_assert(type == ARG_GENERAL, "Wrong use of bind_result template");
 		static_assert(sizeof(T) <= 4, "Invalid function result type for ARG_GENERAL");
 
-		static __forceinline void func(ARMv7Thread& CPU, const T& result)
+		static __forceinline void func(ARMv7Context& context, const T& result)
 		{
-			CPU.GPR[0] = cast_to_armv7_gpr<T>(result);
+			context.GPR[0] = cast_to_armv7_gpr<T>(result);
 		}
 	};
 
@@ -485,7 +485,7 @@ namespace psv_func_detail
 	//{
 	//	static_assert(sizeof(T) <= 8, "Invalid function result type for ARG_FLOAT");
 
-	//	static __forceinline void func(ARMv7Thread& CPU, const T& result)
+	//	static __forceinline void func(ARMv7Context& context, const T& result)
 	//	{
 	//	}
 	//};
@@ -495,7 +495,7 @@ namespace psv_func_detail
 	//{
 	//	static_assert(std::is_same<T, u128>::value, "Invalid function result type for ARG_VECTOR");
 
-	//	static __forceinline void func(ARMv7Thread& CPU, const T& result)
+	//	static __forceinline void func(ARMv7Context& context, const T& result)
 	//	{
 	//	}
 	//};
@@ -526,14 +526,14 @@ namespace psv_func_detail
 	}
 
 	template<int g_count, int f_count, int v_count>
-	__forceinline std::tuple<> iterate(ARMv7Thread& CPU)
+	__forceinline std::tuple<> iterate(ARMv7Context& context)
 	{
 		// terminator
 		return std::tuple<>();
 	}
 
 	template<int g_count, int f_count, int v_count, typename T, typename... A>
-	__forceinline std::tuple<T, A...> iterate(ARMv7Thread& CPU)
+	__forceinline std::tuple<T, A...> iterate(ARMv7Context& context)
 	{
 		static_assert(!std::is_pointer<T>::value, "Invalid function argument type (pointer)");
 		static_assert(!std::is_reference<T>::value, "Invalid function argument type (reference)");
@@ -547,7 +547,7 @@ namespace psv_func_detail
 		const int f = f_count + (is_float ? 1 : 0);
 		const int v = v_count + (is_vector ? 1 : 0);
 
-		return std::tuple_cat(std::tuple<T>(bind_arg<T, t, g, f, v>::func(CPU)), iterate<g, f, v, A...>(CPU));
+		return std::tuple_cat(std::tuple<T>(bind_arg<T, t, g, f, v>::func(context)), iterate<g, f, v, A...>(context));
 	}
 
 	template<typename RT>
@@ -576,16 +576,16 @@ namespace psv_func_detail
 		{
 		}
 
-		virtual void operator()(ARMv7Thread& CPU)
+		virtual void operator()(ARMv7Context& context)
 		{
-			call<void>(m_call, iterate<0, 0, 0, T...>(CPU));
+			call<void>(m_call, iterate<0, 0, 0, T...>(context));
 		}
 	};
 
 	template<typename... T>
-	class func_binder<void, ARMv7Thread&, T...> : public psv_func_caller
+	class func_binder<void, ARMv7Context&, T...> : public psv_func_caller
 	{
-		typedef void(*func_t)(ARMv7Thread&, T...);
+		typedef void(*func_t)(ARMv7Context&, T...);
 		const func_t m_call;
 
 	public:
@@ -595,9 +595,9 @@ namespace psv_func_detail
 		{
 		}
 
-		virtual void operator()(ARMv7Thread& CPU)
+		virtual void operator()(ARMv7Context& context)
 		{
-			call<void>(m_call, std::tuple_cat(std::tuple<ARMv7Thread&>(CPU), iterate<0, 0, 0, T...>(CPU)));
+			call<void>(m_call, std::tuple_cat(std::tuple<ARMv7Context&>(context), iterate<0, 0, 0, T...>(context)));
 		}
 	};
 
@@ -614,16 +614,16 @@ namespace psv_func_detail
 		{
 		}
 
-		virtual void operator()(ARMv7Thread& CPU)
+		virtual void operator()(ARMv7Context& context)
 		{
-			bind_result<RT, result_type<RT>::value>::func(CPU, call<RT>(m_call, iterate<0, 0, 0, T...>(CPU)));
+			bind_result<RT, result_type<RT>::value>::func(context, call<RT>(m_call, iterate<0, 0, 0, T...>(context)));
 		}
 	};
 
 	template<typename RT, typename... T>
-	class func_binder<RT, ARMv7Thread&, T...> : public psv_func_caller
+	class func_binder<RT, ARMv7Context&, T...> : public psv_func_caller
 	{
-		typedef RT(*func_t)(ARMv7Thread&, T...);
+		typedef RT(*func_t)(ARMv7Context&, T...);
 		const func_t m_call;
 
 	public:
@@ -633,9 +633,9 @@ namespace psv_func_detail
 		{
 		}
 
-		virtual void operator()(ARMv7Thread& CPU)
+		virtual void operator()(ARMv7Context& context)
 		{
-			bind_result<RT, result_type<RT>::value>::func(CPU, call<RT>(m_call, std::tuple_cat(std::tuple<ARMv7Thread&>(CPU), iterate<0, 0, 0, T...>(CPU))));
+			bind_result<RT, result_type<RT>::value>::func(context, call<RT>(m_call, std::tuple_cat(std::tuple<ARMv7Context&>(context), iterate<0, 0, 0, T...>(context))));
 		}
 	};
 }
@@ -665,5 +665,5 @@ void reg_psv_func(u32 nid, psv_log_base* module, const char* name, RT(*func)(T..
 psv_func* get_psv_func_by_nid(u32 nid);
 u32 get_psv_func_index(psv_func* func);
 
-void execute_psv_func_by_index(ARMv7Thread& CPU, u32 index);
+void execute_psv_func_by_index(ARMv7Context& context, u32 index);
 void list_known_psv_modules();
diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/Emu/Memory/vm.h
index 9068888ead..38735da8ba 100644
--- a/rpcs3/Emu/Memory/vm.h
+++ b/rpcs3/Emu/Memory/vm.h
@@ -70,7 +70,7 @@ namespace vm
 			const u32 res = static_cast<u32>(addr);
 			if (res != addr)
 			{
-				throw fmt::Format("%s(): invalid address 0x%llx", func, addr);
+				throw fmt::format("%s(): invalid address 0x%llx", func, addr);
 			}
 
 			return res;
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index a925170fbe..001fcfc477 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -266,6 +266,7 @@
     <ClInclude Include="Crypto\unself.h" />
     <ClInclude Include="Crypto\utils.h" />
     <ClInclude Include="define_new_memleakdetect.h" />
+    <ClInclude Include="Emu\ARMv7\ARMv7Context.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7Decoder.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7DisAsm.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7Interpreter.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 1ef837c8fd..681270e3d6 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -1282,5 +1282,8 @@
     <ClInclude Include="Emu\SysCalls\Modules\cellAudio.h">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\ARMv7\ARMv7Context.h">
+      <Filter>Emu\CPU\ARMv7</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 2d7bf06dea44077d6dacd4095a071a6dbe13d9ea Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 21 Jan 2015 01:29:33 +0300
Subject: [PATCH 02/70] ARMv7: LDR_REG, LDRD_IMM, LDREX, STREX

sceLibc: printf() improved
sceLibKernel: sceKernelGetThreadId(), sceKernelWaitThreadEnd()
---
 rpcs3/Emu/ARMv7/ARMv7Context.h           |  18 +++
 rpcs3/Emu/ARMv7/ARMv7Decoder.h           |   4 +-
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp     | 153 ++++++++++++++++++++++-
 rpcs3/Emu/ARMv7/ARMv7Interpreter.h       |  36 +++---
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp |  81 +++++++-----
 rpcs3/Emu/ARMv7/Modules/sceLibc.cpp      |  60 ++++++++-
 6 files changed, 296 insertions(+), 56 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index f1cd694844..491c00f9d7 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -110,6 +110,9 @@ struct ARMv7Context
 
 	} ITSTATE;
 
+	u32 R_ADDR;
+	u64 R_DATA;
+
 	void write_gpr(u32 n, u32 value)
 	{
 		assert(n < 16);
@@ -135,6 +138,21 @@ struct ARMv7Context
 
 		return read_pc();
 	}
+
+	// function for processing va_args in printf-like functions
+	u32 get_next_gpr_arg(u32& g_count, u32& f_count, u32& v_count)
+	{
+		assert(!f_count && !v_count); // not supported
+
+		if (g_count < 4)
+		{
+			return GPR[g_count++];
+		}
+		else
+		{
+			return get_stack_arg(g_count++);
+		}
+	}
 };
 
 template<typename T, bool is_enum = std::is_enum<T>::value>
diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.h b/rpcs3/Emu/ARMv7/ARMv7Decoder.h
index 8e54b8880e..14a2fc5c83 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.h
@@ -22,7 +22,7 @@ public:
 		code.code1 = vm::psv::read16(address + 2 & ~1);
 		u32 arg = address & 0x1 ? code.data : (u32)code.code0 << 16 | code.code1;
 
-		LOG_NOTICE(GENERAL, "code0 = 0x%04x, code1 = 0x%04x, data = 0x%08x, arg = 0x%08x", code.code0, code.code1, code.data, arg);
+		//LOG_NOTICE(GENERAL, "code0 = 0x%04x, code1 = 0x%04x, data = 0x%08x, arg = 0x%08x", code.code0, code.code1, code.data, arg);
 
 		// old decoding algorithm
 		
@@ -32,7 +32,7 @@ public:
 			{
 				code.data = opcode.length == 2 ? code.code0 : arg;
 				(*opcode.func)(m_thr.context, code, opcode.type);
-				// LOG_NOTICE(GENERAL, "%s, %d \n\n", opcode.name, opcode.length);
+				//LOG_NOTICE(ARMv7, "%s, %s", opcode.name, m_thr.RegsToString());
 				return opcode.length;
 			}
 		}
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index 3fbc1d0ff1..5695e87b9c 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -1204,12 +1204,12 @@ void ARMv7_instrs::LDR_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 		const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32;
 		const u32 addr = index ? offset_addr : context.read_gpr(n);
 
+		context.write_gpr(t, vm::psv::read32(addr));
+
 		if (wback)
 		{
 			context.write_gpr(n, offset_addr);
 		}
-
-		context.write_gpr(t, vm::psv::read32(addr));
 	}
 }
 
@@ -1224,11 +1224,56 @@ void ARMv7_instrs::LDR_LIT(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::LDR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	u32 cond = context.ITSTATE.advance();
+	u32 t = 0;
+	u32 n = 0;
+	u32 m = 0;
+	bool index = true;
+	bool add = true;
+	bool wback = false;
+	auto shift_t = SRType_LSL;
+	u32 shift_n = 0;
+
 	switch (type)
 	{
+	case T1:
+	{
+		t = (code.data & 0x7);
+		n = (code.data & 0x38) >> 3;
+		m = (code.data & 0x1c0) >> 6;
+		break;
+	}
+	case T2:
+	{
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		m = (code.data & 0xf);
+		shift_n = (code.data & 0x30) >> 4;
+
+		if (n == 15)
+		{
+			throw "LDR (literal)";
+		}
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		const u32 offset = Shift(context.read_gpr(m), shift_t, shift_n, context.APSR.C);
+		const u32 offset_addr = add ? context.read_gpr(n) + offset : context.read_gpr(n) - offset;
+		const u32 addr = index ? offset_addr : context.read_gpr(n);
+		const u32 data = vm::psv::read32(addr);
+
+		if (wback)
+		{
+			context.write_gpr(n, offset_addr);
+		}
+
+		context.write_gpr(t, data);
+	}
 }
 
 
@@ -1262,11 +1307,55 @@ void ARMv7_instrs::LDRB_REG(ARMv7Context& context, const ARMv7Code code, const A
 
 void ARMv7_instrs::LDRD_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	u32 cond = context.ITSTATE.advance();
+	u32 t = 0;
+	u32 t2 = 0;
+	u32 n = 13;
+	u32 imm32 = 0;
+	bool index = true;
+	bool add = true;
+	bool wback = false;
+
 	switch (type)
 	{
+	case T1:
+	{
+		t = (code.data & 0xf000) >> 12;
+		t2 = (code.data & 0xf00) >> 8;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xff) << 2;
+		index = (code.data & 0x1000000);
+		add = (code.data & 0x800000);
+		wback = (code.data & 0x200000);
+
+		if (!index && !wback)
+		{
+			throw "LDRD_IMM_T1: Related encodings";
+		}
+		if (n == 15)
+		{
+			throw "LDRD (literal)";
+		}
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32;
+		const u32 addr = index ? offset_addr : context.read_gpr(n);
+		const u64 value = vm::psv::read64(addr);
+
+		context.write_gpr(t, (u32)(value));
+		context.write_gpr(t2, (u32)(value >> 32));
+
+		if (wback)
+		{
+			context.write_gpr(n, offset_addr);
+		}
+	}
 }
 
 void ARMv7_instrs::LDRD_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
@@ -1374,11 +1463,33 @@ void ARMv7_instrs::LDRSH_REG(ARMv7Context& context, const ARMv7Code code, const
 
 void ARMv7_instrs::LDREX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	u32 cond = context.ITSTATE.advance();
+	u32 t = 0;
+	u32 n = 0;
+	u32 imm32 = 0;
+
 	switch (type)
 	{
+	case T1:
+	{
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xff) << 2;
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		const u32 addr = context.read_gpr(n) + imm32;
+		const u32 value = vm::psv::read32(addr);
+		
+		context.R_ADDR = addr;
+		context.R_DATA = value;
+		context.write_gpr(t, value);
+	}
 }
 
 void ARMv7_instrs::LDREXB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
@@ -1853,14 +1964,17 @@ void ARMv7_instrs::POP(ARMv7Context& context, const ARMv7Code code, const ARMv7_
 
 	if (ConditionPassed(context, cond))
 	{
+		u32 written = 0;
 		for (u16 mask = 1, i = 0; mask; mask <<= 1, i++)
 		{
 			if (reg_list & mask)
 			{
-				context.write_gpr(i, vm::psv::read32(context.SP));
-				context.SP += 4;
+				context.write_gpr(i, vm::psv::read32(context.SP + written));
+				written += 4;
 			}
 		}
+
+		context.SP += written;
 	}
 }
 
@@ -1907,14 +2021,17 @@ void ARMv7_instrs::PUSH(ARMv7Context& context, const ARMv7Code code, const ARMv7
 
 	if (ConditionPassed(context, cond))
 	{
+		u32 read = 0;
 		for (u16 mask = 1 << 15, i = 15; mask; mask >>= 1, i--)
 		{
 			if (reg_list & mask)
 			{
-				context.SP -= 4;
-				vm::psv::write32(context.SP, context.read_gpr(i));
+				read += 4;
+				vm::psv::write32(context.SP - read, context.read_gpr(i));
 			}
 		}
+
+		context.SP -= read;
 	}
 }
 
@@ -2692,11 +2809,35 @@ void ARMv7_instrs::STRH_REG(ARMv7Context& context, const ARMv7Code code, const A
 
 void ARMv7_instrs::STREX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	u32 cond = context.ITSTATE.advance();
+	u32 d = 0;
+	u32 t = 0;
+	u32 n = 0;
+	u32 imm32 = 0;
+
 	switch (type)
 	{
+	case T1:
+	{
+		d = (code.data & 0xf00) >> 8;
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xff) << 2;
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		const u32 addr = context.read_gpr(n) + imm32;
+		const u32 value = context.read_gpr(t);
+		
+		auto& sync_obj = vm::get_ref<atomic_le_t<u32>>(addr);
+		context.write_gpr(d, addr != context.R_ADDR || sync_obj.compare_and_swap((u32)context.R_DATA, value) != context.R_DATA);
+		context.R_ADDR = 0;
+	}
 }
 
 void ARMv7_instrs::STREXB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
index 0bf9652ba6..1736fdd38a 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
@@ -500,6 +500,15 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP2(0xff00, 0xbf00, T1, IT),
 
+	ARMv7_OP4(0xfff0, 0x0f00, 0xe850, 0x0f00, T1, LDREX),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x0190, 0x0f9f, A1, LDREX),
+	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f4f, T1, LDREXB),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01d0, 0x0f9f, A1, LDREXB),
+	ARMv7_OP4(0xfff0, 0x00ff, 0xe8d0, 0x007f, T1, LDREXD),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01b0, 0x0f9f, A1, LDREXD),
+	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f5f, T1, LDREXH),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01f0, 0x0f9f, A1, LDREXH),
+
 	ARMv7_OP2(0xf800, 0xc800, T1, LDM),
 	ARMv7_OP4(0xffd0, 0x2000, 0xe890, 0x0000, T2, LDM),
 	ARMv7_OP4(0x0fd0, 0x0000, 0x0890, 0x0000, A1, LDM),
@@ -554,15 +563,6 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfff0, 0x0fc0, 0xf930, 0x0000, T2, LDRSH_REG),
 	ARMv7_OP4(0x0e50, 0x0ff0, 0x0010, 0x00f0, A1, LDRSH_REG),
 
-	ARMv7_OP4(0xfff0, 0x0f00, 0xe850, 0x0f00, T1, LDREX),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x0190, 0x0f9f, A1, LDREX),
-	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f4f, T1, LDREXB),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x01d0, 0x0f9f, A1, LDREXB),
-	ARMv7_OP4(0xfff0, 0x00ff, 0xe8d0, 0x007f, T1, LDREXD),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x01b0, 0x0f9f, A1, LDREXD),
-	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f5f, T1, LDREXH),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x01f0, 0x0f9f, A1, LDREXH),
-
 	ARMv7_OP2(0xf800, 0x0000, T1, LSL_IMM),
 	ARMv7_OP4(0xffef, 0x8030, 0xea4f, 0x0000, T2, LSL_IMM),
 	ARMv7_OP4(0x0fef, 0x0070, 0x01a0, 0x0000, A1, LSL_IMM),
@@ -773,6 +773,15 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf000, T1, SSUB8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0ff0, A1, SSUB8),
 
+	ARMv7_OP4(0xfff0, 0x0000, 0xe840, 0x0000, T1, STREX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0180, 0x0f90, A1, STREX),
+	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f40, T1, STREXB),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01c0, 0x0f90, A1, STREXB),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xe8c0, 0x0070, T1, STREXD),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01a0, 0x0f90, A1, STREXD),
+	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f50, T1, STREXH),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01e0, 0x0f90, A1, STREXH),
+
 	ARMv7_OP2(0xf800, 0xc000, T1, STM),
 	ARMv7_OP4(0xffd0, 0xa000, 0xe880, 0x0000, T2, STM),
 	ARMv7_OP4(0x0fd0, 0x0000, 0x0880, 0x0000, A1, STM),
@@ -810,15 +819,6 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfff0, 0x0fc0, 0xf820, 0x0000, T2, STRH_REG),
 	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00b0, A1, STRH_REG),
 
-	ARMv7_OP4(0xfff0, 0x0000, 0xe840, 0x0000, T1, STREX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0180, 0x0f90, A1, STREX),
-	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f40, T1, STREXB),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01c0, 0x0f90, A1, STREXB),
-	ARMv7_OP4(0xfff0, 0x00f0, 0xe8c0, 0x0070, T1, STREXD),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01a0, 0x0f90, A1, STREXD),
-	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f50, T1, STREXH),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01e0, 0x0f90, A1, STREXH),
-
 	ARMv7_OP2(0xff80, 0xb080, T1, SUB_SPI),
 	ARMv7_OP4(0xfbef, 0x8000, 0xf1ad, 0x0000, T2, SUB_SPI),
 	ARMv7_OP4(0xfbff, 0x8000, 0xf2ad, 0x0000, T3, SUB_SPI),
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index b07f39f522..3fb874ee2c 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -87,7 +87,7 @@ struct SceKernelSystemInfo
 
 #pragma pack(pop)
 
-s32 sceKernelCreateThread(
+u32 sceKernelCreateThread(
 	vm::psv::ptr<const char> pName,
 	vm::psv::ptr<SceKernelThreadEntry> entry,
 	s32 initPriority,
@@ -101,24 +101,21 @@ s32 sceKernelCreateThread(
 
 	ARMv7Thread& new_thread = static_cast<ARMv7Thread&>(Emu.GetCPU().AddThread(CPU_THREAD_ARMv7));
 
-	u32 id = new_thread.GetId();
+	const auto id = new_thread.GetId();
 	new_thread.SetEntry(entry.addr() ^ 1);
 	new_thread.SetPrio(initPriority);
 	new_thread.SetStackSize(stackSize);
 	new_thread.SetName(pName.get_ptr());
 
-	sceLibKernel.Error("*** New ARMv7 Thread [%s] (entry=0x%x)^1: id = %d", pName.get_ptr(), entry, id);
+	sceLibKernel.Error("*** New ARMv7 Thread [%s] (entry=0x%x)^1: id -> 0x%x", pName.get_ptr(), entry, id);
 
 	new_thread.Run();
-
-	Emu.Pause();
-
 	return id;
 }
 
-s32 sceKernelStartThread(s32 threadId, u32 argSize, vm::psv::ptr<const void> pArgBlock)
+s32 sceKernelStartThread(u32 threadId, u32 argSize, vm::psv::ptr<const void> pArgBlock)
 {
-	sceLibKernel.Error("sceKernelStartThread(threadId=%d, argSize=%d, pArgBlock=0x%x)", threadId, argSize, pArgBlock);
+	sceLibKernel.Error("sceKernelStartThread(threadId=0x%x, argSize=0x%x, pArgBlock=0x%x)", threadId, argSize, pArgBlock);
 
 	std::shared_ptr<CPUThread> t = Emu.GetCPU().GetThread(threadId);
 
@@ -134,8 +131,8 @@ s32 sceKernelStartThread(s32 threadId, u32 argSize, vm::psv::ptr<const void> pAr
 	memcpy(vm::get_ptr<void>(pos), pArgBlock.get_ptr(), argSize);
 
 	// set SceKernelThreadEntry function arguments
-	thread.context.write_gpr(0, argSize);
-	thread.context.write_gpr(1, pos);
+	thread.context.GPR[0] = argSize;
+	thread.context.GPR[1] = pos;
 
 	thread.Exec();
 	return SCE_OK;
@@ -151,9 +148,9 @@ s32 sceKernelExitThread(ARMv7Context& context, s32 exitStatus)
 	return SCE_OK;
 }
 
-s32 sceKernelDeleteThread(s32 threadId)
+s32 sceKernelDeleteThread(u32 threadId)
 {
-	sceLibKernel.Todo("sceKernelDeleteThread(threadId=%d)", threadId);
+	sceLibKernel.Todo("sceKernelDeleteThread(threadId=0x%x)", threadId);
 
 	return SCE_OK;
 }
@@ -165,21 +162,21 @@ s32 sceKernelExitDeleteThread(s32 exitStatus)
 	return SCE_OK;
 }
 
-s32 sceKernelChangeThreadCpuAffinityMask(s32 threadId, s32 cpuAffinityMask)
+s32 sceKernelChangeThreadCpuAffinityMask(u32 threadId, s32 cpuAffinityMask)
 {
-	sceLibKernel.Todo("sceKernelChangeThreadCpuAffinityMask(threadId=%d, cpuAffinityMask=0x%x)", threadId, cpuAffinityMask);
+	sceLibKernel.Todo("sceKernelChangeThreadCpuAffinityMask(threadId=0x%x, cpuAffinityMask=0x%x)", threadId, cpuAffinityMask);
 
 	return SCE_OK;
 }
 
-s32 sceKernelGetThreadCpuAffinityMask(s32 threadId)
+s32 sceKernelGetThreadCpuAffinityMask(u32 threadId)
 {
 	sceLibKernel.Todo("sceKernelGetThreadCpuAffinityMask(threadId=0x%x)", threadId);
 
 	return SCE_OK;
 }
 
-s32 sceKernelChangeThreadPriority(s32 threadId, s32 priority)
+s32 sceKernelChangeThreadPriority(u32 threadId, s32 priority)
 {
 	sceLibKernel.Todo("sceKernelChangeThreadPriority(threadId=0x%x, priority=%d)", threadId, priority);
 
@@ -193,11 +190,11 @@ s32 sceKernelGetThreadCurrentPriority()
 	return SCE_OK;
 }
 
-s32 sceKernelGetThreadId()
+u32 sceKernelGetThreadId(ARMv7Context& context)
 {
-	sceLibKernel.Todo("sceKernelGetThreadId()");
+	sceLibKernel.Log("sceKernelGetThreadId()");
 
-	return SCE_OK;
+	return context.thread.GetId();
 }
 
 s32 sceKernelChangeCurrentThreadAttr(u32 clearAttr, u32 setAttr)
@@ -207,9 +204,9 @@ s32 sceKernelChangeCurrentThreadAttr(u32 clearAttr, u32 setAttr)
 	return SCE_OK;
 }
 
-s32 sceKernelGetThreadExitStatus(s32 threadId, vm::psv::ptr<s32> pExitStatus)
+s32 sceKernelGetThreadExitStatus(u32 threadId, vm::psv::ptr<s32> pExitStatus)
 {
-	sceLibKernel.Todo("sceKernelGetThreadExitStatus(threadId=%d, pExitStatus=0x%x)", threadId, pExitStatus);
+	sceLibKernel.Todo("sceKernelGetThreadExitStatus(threadId=0x%x, pExitStatus=0x%x)", threadId, pExitStatus);
 
 	return SCE_OK;
 }
@@ -228,9 +225,9 @@ s32 sceKernelCheckWaitableStatus()
 	return SCE_OK;
 }
 
-s32 sceKernelGetThreadInfo(s32 threadId, vm::psv::ptr<SceKernelThreadInfo> pInfo)
+s32 sceKernelGetThreadInfo(u32 threadId, vm::psv::ptr<SceKernelThreadInfo> pInfo)
 {
-	sceLibKernel.Todo("sceKernelGetThreadInfo(threadId=%d, pInfo=0x%x)", threadId, pInfo);
+	sceLibKernel.Todo("sceKernelGetThreadInfo(threadId=0x%x, pInfo=0x%x)", threadId, pInfo);
 
 	return SCE_OK;
 }
@@ -251,7 +248,7 @@ s32 sceKernelGetSystemInfo(vm::psv::ptr<SceKernelSystemInfo> pInfo)
 
 s32 sceKernelGetThreadmgrUIDClass(s32 uid)
 {
-	sceLibKernel.Todo("sceKernelGetThreadmgrUIDClass(uid=%d)", uid);
+	sceLibKernel.Todo("sceKernelGetThreadmgrUIDClass(uid=0x%x)", uid);
 
 	return SCE_OK;
 }
@@ -284,16 +281,44 @@ s32 sceKernelDelayThreadCB(u32 usec)
 	return SCE_OK;
 }
 
-s32 sceKernelWaitThreadEnd(s32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
+s32 sceKernelWaitThreadEnd(u32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
 {
-	sceLibKernel.Todo("sceKernelWaitThreadEnd(threadId=%d, pExitStatus=0x%x, pTimeout=0x%x)", threadId, pExitStatus, pTimeout);
+	sceLibKernel.Error("sceKernelWaitThreadEnd(threadId=0x%x, pExitStatus=0x%x, pTimeout=0x%x)", threadId, pExitStatus, pTimeout);
+
+	std::shared_ptr<CPUThread> t = Emu.GetCPU().GetThread(threadId);
+
+	if (!t || t->GetType() != CPU_THREAD_ARMv7)
+	{
+		RETURN_ERROR(SCE_KERNEL_ERROR_INVALID_UID);
+	}
+
+	ARMv7Thread& thread = static_cast<ARMv7Thread&>(*t);
+
+	if (pTimeout)
+	{
+	}
+
+	while (thread.IsAlive())
+	{
+		if (Emu.IsStopped())
+		{
+			sceLibKernel.Warning("sceKernelWaitThreadEnd(0x%x) aborted", threadId);
+			return SCE_OK;
+		}
+		std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack
+	}
+
+	if (pExitStatus)
+	{
+		*pExitStatus = thread.context.GPR[0];
+	}
 
 	return SCE_OK;
 }
 
-s32 sceKernelWaitThreadEndCB(s32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
+s32 sceKernelWaitThreadEndCB(u32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
 {
-	sceLibKernel.Todo("sceKernelWaitThreadEndCB(threadId=%d, pExitStatus=0x%x, pTimeout=0x%x)", threadId, pExitStatus, pTimeout);
+	sceLibKernel.Todo("sceKernelWaitThreadEndCB(threadId=0x%x, pExitStatus=0x%x, pTimeout=0x%x)", threadId, pExitStatus, pTimeout);
 
 	return SCE_OK;
 }
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
index 9abcf593e4..5c5e7599f8 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
@@ -26,11 +26,67 @@ namespace sce_libc_func
 		});
 	}
 
-	void printf(vm::psv::ptr<const char> fmt) // va_args...
+	void printf(ARMv7Context& context, vm::psv::ptr<const char> fmt) // va_args...
 	{
 		sceLibc.Error("printf(fmt=0x%x)", fmt);
 
-		LOG_NOTICE(TTY, "%s", fmt.get_ptr());
+		sceLibc.Notice("*** *fmt = '%s'", fmt.get_ptr());
+
+		std::string result;
+		u32 g_count = 1;
+		u32 f_count = 0;
+		u32 v_count = 0;
+
+		for (char c = *fmt++; c; c = *fmt++)
+		{
+			switch (c)
+			{
+			case '%':
+			{
+				const auto start = fmt - 1;
+				const bool �” = *fmt == '#' ? fmt++, true : false;
+
+				switch (*fmt++)
+				{
+				case '%':
+				{
+					result += '%';
+					continue;
+				}
+				case 'd':
+				case 'i':
+				{
+					// signed decimal
+					const s64 value = context.get_next_gpr_arg(g_count, f_count, v_count);
+
+					result += fmt::to_sdec(value);
+					continue;
+				}
+				case 'x':
+				{
+					// hexadecimal
+					const u64 value = context.get_next_gpr_arg(g_count, f_count, v_count);
+
+					if (�” && value)
+					{
+						result += "0x";
+					}
+
+					result += fmt::to_hex(value);
+					continue;
+				}
+				default:
+				{
+					throw fmt::Format("printf(): unknown formatting: '%s'", start.get_ptr());
+				}
+				}
+			}
+			}
+
+			result += c;
+		}
+
+		LOG_NOTICE(TTY, result);
 	}
 
 	void __cxa_set_dso_handle_main()

From f3ee2ac9ef24b9d62a380a55c035a12e833046e5 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 21 Jan 2015 01:46:59 +0300
Subject: [PATCH 03/70] Compilation fix

---
 rpcs3/Emu/ARMv7/Modules/sceLibc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
index 5c5e7599f8..79d53bf830 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Utilities/Log.h"
 #include "Emu/System.h"
 #include "Emu/Memory/Memory.h"
@@ -44,7 +44,7 @@ namespace sce_libc_func
 			case '%':
 			{
 				const auto start = fmt - 1;
-				const bool �” = *fmt == '#' ? fmt++, true : false;
+				const bool number_sign = *fmt == '#' ? fmt++, true : false;
 
 				switch (*fmt++)
 				{
@@ -67,7 +67,7 @@ namespace sce_libc_func
 					// hexadecimal
 					const u64 value = context.get_next_gpr_arg(g_count, f_count, v_count);
 
-					if (�” && value)
+					if (number_sign && value)
 					{
 						result += "0x";
 					}

From 0cd03ca9e60cc87324f8694852998326b70c21dd Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 21 Jan 2015 02:29:54 +0300
Subject: [PATCH 04/70] psv_log_base initialization fixed

---
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp | 6 ++----
 rpcs3/Emu/ARMv7/Modules/sceLibc.cpp      | 6 ++----
 rpcs3/Emu/ARMv7/Modules/sceLibm.cpp      | 6 ++----
 rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp | 6 ++----
 rpcs3/Emu/ARMv7/PSVFuncList.h            | 3 ++-
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index 3fb874ee2c..ff7eb1df4f 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -325,7 +325,7 @@ s32 sceKernelWaitThreadEndCB(u32 threadId, vm::psv::ptr<s32> pExitStatus, vm::ps
 
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibKernel, #name, &name)
 
-psv_log_base sceLibKernel = []() -> psv_log_base
+psv_log_base sceLibKernel("sceLibKernel", []()
 {
 	//REG_FUNC(0x23EAA62, sceKernelPuts);
 	//REG_FUNC(0xB0335388, sceClibToupper);
@@ -691,6 +691,4 @@ psv_log_base sceLibKernel = []() -> psv_log_base
 
 	/* SceDebugLed */
 	//REG_FUNC(0x78E702D3, sceKernelSetGPO);
-
-	return psv_log_base("sceLibKernel");
-}();
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
index 79d53bf830..eeb52f50a7 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
@@ -112,7 +112,7 @@ namespace sce_libc_func
 
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibc, #name, &sce_libc_func::name)
 
-psv_log_base sceLibc = []() -> psv_log_base
+psv_log_base sceLibc("SceLibc", []()
 {
 	REG_FUNC(0xE4531F85, _Assert);
 	//REG_FUNC(0xE71C5CDE, _Stoul);
@@ -406,6 +406,4 @@ psv_log_base sceLibc = []() -> psv_log_base
 	//REG_FUNC(0x677CDE35, _Snan);
 	//REG_FUNC(0x7D35108B, _FSnan);
 	//REG_FUNC(0x48AEEF2A, _LSnan);
-
-	return psv_log_base("SceLibc");
-}();
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
index 30fcde88cb..ae85794c24 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
@@ -12,7 +12,7 @@ namespace sce_libm_func
 
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibm, #name, &sce_libm_func::name)
 
-psv_log_base sceLibm = []() -> psv_log_base
+psv_log_base sceLibm("SceLibm", []()
 {
 	//REG_FUNC(0xC73FE76D, _Exp);
 	//REG_FUNC(0xFF4EAE04, _FExp);
@@ -212,6 +212,4 @@ psv_log_base sceLibm = []() -> psv_log_base
 	//REG_FUNC(0x5BD0F71C, _Dsign);
 	//REG_FUNC(0xC4F7E42C, _FDsign);
 	//REG_FUNC(0x1DF73D2B, _LDsign);
-
-	return psv_log_base("SceLibm");
-}();
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
index 7813c8b8a5..7846ec1c0d 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
@@ -28,7 +28,7 @@ namespace sce_libstdcxx_func
 
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibstdcxx, #name, &sce_libstdcxx_func::name)
 
-psv_log_base sceLibstdcxx = []() -> psv_log_base
+psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 {
 	//REG_FUNC(0x52B0C625, std::bad_typeid::what() const);
 	//REG_FUNC(0x64D7D074, std::bad_typeid::_Doraise() const);
@@ -976,9 +976,7 @@ psv_log_base sceLibstdcxx = []() -> psv_log_base
 	//REG_FUNC(0x7321E731, vtable for __cxxabiv1::__vmi_class_type_info);
 	//REG_FUNC(0x33836375, vtable for __cxxabiv1::__fundamental_type_info);
 	//REG_FUNC(0x94664DEB, vtable for __cxxabiv1::__pointer_to_member_type_info);
-
-	return psv_log_base("SceLibstdcxx");
-}();
+});
 
 /*
 // original names
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h
index c6959a1bd5..8a26743b6d 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.h
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.h
@@ -7,9 +7,10 @@ class psv_log_base : public LogBase
 	std::string m_name;
 
 public:
-	psv_log_base(const std::string& name)
+	psv_log_base(const std::string& name, void(*init_func)())
 		: m_name(name)
 	{
+		init_func();
 	}
 
 	virtual const std::string& GetName() const override

From ab5dd3ae6f1e39ad82ed67f8a9c8390a02ed7c86 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 21 Jan 2015 02:41:56 +0300
Subject: [PATCH 05/70] Another attempt

---
 rpcs3/Emu/ARMv7/PSVFuncList.cpp | 54 ++++++++++++++++-----------------
 rpcs3/Emu/ARMv7/PSVFuncList.h   |  8 ++++-
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.cpp b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
index a40457aef3..271cdef08c 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.cpp
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
@@ -9,29 +9,6 @@ std::vector<psv_func> g_psv_func_list;
 
 void add_psv_func(psv_func& data)
 {
-	// setup special functions (without NIDs)
-	if (!g_psv_func_list.size())
-	{
-		psv_func unimplemented;
-		unimplemented.nid = 0;
-		unimplemented.name = "Special function (unimplemented stub)";
-		unimplemented.func.reset(new psv_func_detail::func_binder<void, ARMv7Context&>([](ARMv7Context& context)
-		{
-			context.thread.m_last_syscall = vm::psv::read32(context.thread.PC + 4);
-			throw "Unimplemented function executed";
-		}));
-		g_psv_func_list.push_back(unimplemented);
-
-		psv_func hle_return;
-		hle_return.nid = 1;
-		hle_return.name = "Special function (return from HLE)";
-		hle_return.func.reset(new psv_func_detail::func_binder<void, ARMv7Context&>([](ARMv7Context& context)
-		{
-			context.thread.FastStop();
-		}));
-		g_psv_func_list.push_back(hle_return);
-	}
-
 	g_psv_func_list.push_back(data);
 }
 
@@ -76,8 +53,31 @@ extern psv_log_base sceLibKernel;
 
 void list_known_psv_modules()
 {
-	sceLibc.Log("");
-	sceLibm.Log("");
-	sceLibstdcxx.Log("");
-	sceLibKernel.Log("");
+	if (!g_psv_func_list.size())
+	{
+		// setup special functions (without NIDs)
+		psv_func unimplemented;
+		unimplemented.nid = 0;
+		unimplemented.name = "Special function (unimplemented stub)";
+		unimplemented.func.reset(new psv_func_detail::func_binder<void, ARMv7Context&>([](ARMv7Context& context)
+		{
+			context.thread.m_last_syscall = vm::psv::read32(context.thread.PC + 4);
+			throw "Unimplemented function executed";
+		}));
+		g_psv_func_list.push_back(unimplemented);
+
+		psv_func hle_return;
+		hle_return.nid = 1;
+		hle_return.name = "Special function (return from HLE)";
+		hle_return.func.reset(new psv_func_detail::func_binder<void, ARMv7Context&>([](ARMv7Context& context)
+		{
+			context.thread.FastStop();
+		}));
+		g_psv_func_list.push_back(hle_return);
+
+		sceLibc.Init();
+		sceLibm.Init();
+		sceLibstdcxx.Init();
+		sceLibKernel.Init();
+	}
 }
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h
index 8a26743b6d..2562670c08 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.h
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.h
@@ -5,12 +5,18 @@
 class psv_log_base : public LogBase
 {
 	std::string m_name;
+	void(*m_init_func)();
 
 public:
 	psv_log_base(const std::string& name, void(*init_func)())
 		: m_name(name)
+		, m_init_func(init_func)
 	{
-		init_func();
+	}
+
+	void Init()
+	{
+		m_init_func();
 	}
 
 	virtual const std::string& GetName() const override

From 506951a5a40f9f23ddceec6c621b30daafb29ad3 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 21 Jan 2015 14:38:24 +0300
Subject: [PATCH 06/70] sceLibc: memset()

---
 rpcs3/Emu/ARMv7/Modules/sceLibc.cpp | 17 +++++++++++++++--
 rpcs3/Emu/ARMv7/PSVFuncList.cpp     |  3 ---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
index eeb52f50a7..0a63907a63 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
@@ -14,6 +14,12 @@ namespace sce_libc_func
 		Emu.Pause();
 	}
 
+	void __aeabi_atexit()
+	{
+		sceLibc.Todo(__FUNCTION__);
+		Emu.Pause();
+	}
+
 	void exit()
 	{
 		sceLibc.Error("exit()");
@@ -101,6 +107,13 @@ namespace sce_libc_func
 		::memcpy(dst.get_ptr(), src.get_ptr(), size);
 	}
 
+	void memset(vm::psv::ptr<void> dst, s32 value, u32 size)
+	{
+		sceLibc.Error("memset(dst=0x%x, value=%d, size=0x%x)", dst, value, size);
+
+		::memset(dst.get_ptr(), value, size);
+	}
+
 	void _Assert(vm::psv::ptr<const char> text, vm::psv::ptr<const char> func)
 	{
 		sceLibc.Error("_Assert(text=0x%x, func=0x%x)", text, func);
@@ -256,7 +269,7 @@ psv_log_base sceLibc("SceLibc", []()
 	//REG_FUNC(0x7747F6D7, memcmp);
 	REG_FUNC(0x7205BFDB, memcpy);
 	//REG_FUNC(0xAF5C218D, memmove);
-	//REG_FUNC(0x6DC1F0D8, memset);
+	REG_FUNC(0x6DC1F0D8, memset);
 	//REG_FUNC(0x1434FA46, strcat);
 	//REG_FUNC(0xB9336E16, strchr);
 	//REG_FUNC(0x1B58FA3B, strcmp);
@@ -373,7 +386,7 @@ psv_log_base sceLibc("SceLibc", []()
 	//REG_FUNC(0x9D885076, _Towctrans);
 	//REG_FUNC(0xE980110A, _Iswctype);
 	REG_FUNC(0x33b83b70, __cxa_atexit);
-	//REG_FUNC(0xEDC939E1, __aeabi_atexit);
+	REG_FUNC(0xEDC939E1, __aeabi_atexit);
 	//REG_FUNC(0xB538BF48, __cxa_finalize);
 	//REG_FUNC(0xD0310E31, __cxa_guard_acquire);
 	//REG_FUNC(0x4ED1056F, __cxa_guard_release);
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.cpp b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
index 271cdef08c..784ff534fd 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.cpp
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
@@ -1,7 +1,4 @@
 #include "stdafx.h"
-#include <unordered_map>
-#include "Utilities/Log.h"
-#include "Emu/System.h"
 #include "ARMv7Thread.h"
 #include "PSVFuncList.h"
 

From 509e09c2c57b9c2c77331a690977e39464fdc725 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 21 Jan 2015 17:34:05 +0300
Subject: [PATCH 07/70] ARMv7Callback.h, psv modules initialization fixed

sceLibc: __cxa_atexit, __aeabi_atexit
---
 rpcs3/Emu/ARMv7/ARMv7Callback.h          |  18 ++++
 rpcs3/Emu/ARMv7/ARMv7Context.h           |   2 +
 rpcs3/Emu/ARMv7/ARMv7Thread.cpp          |  10 ++
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp |   4 +
 rpcs3/Emu/ARMv7/Modules/sceLibc.cpp      |  51 +++++++--
 rpcs3/Emu/ARMv7/Modules/sceLibm.cpp      |   4 +
 rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp |   4 +
 rpcs3/Emu/ARMv7/PSVFuncList.cpp          |  69 +++++++-----
 rpcs3/Emu/ARMv7/PSVFuncList.h            | 132 +++++++++++++++++++----
 rpcs3/Emu/Memory/vm_ptr.h                |   7 +-
 rpcs3/Emu/System.cpp                     |   2 +
 rpcs3/Loader/ELF32.cpp                   |   2 +-
 rpcs3/emucore.vcxproj                    |   1 +
 rpcs3/emucore.vcxproj.filters            |   3 +
 14 files changed, 251 insertions(+), 58 deletions(-)
 create mode 100644 rpcs3/Emu/ARMv7/ARMv7Callback.h

diff --git a/rpcs3/Emu/ARMv7/ARMv7Callback.h b/rpcs3/Emu/ARMv7/ARMv7Callback.h
new file mode 100644
index 0000000000..4f9c72d1e0
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/ARMv7Callback.h
@@ -0,0 +1,18 @@
+#pragma once
+#include "Emu/Memory/Memory.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+namespace vm
+{
+	template<typename AT, typename RT, typename... T>
+	__forceinline RT _ptr_base<RT(*)(T...), 1, AT>::operator()(ARMv7Context& context, T... args) const
+	{
+		return psv_func_detail::func_caller<RT, T...>::call(context, vm::cast(this->addr()), args...);
+	}
+}
+
+template<typename RT, typename... T>
+__forceinline RT cb_call(ARMv7Context& context, u32 addr, T... args)
+{
+	return psv_func_detail::func_caller<RT, T...>::call(context, addr, args...);
+}
\ No newline at end of file
diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index 491c00f9d7..c474dc6e6d 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -29,7 +29,9 @@ struct ARMv7Context
 
 	void write_pc(u32 value);
 	u32 read_pc();
+	void put_stack_arg(u32 shift, u32 value);
 	u32 get_stack_arg(u32 pos);
+	void fast_call(u32 addr);
 
 	union
 	{
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
index c9e04f786b..abd6b2791f 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
@@ -20,11 +20,21 @@ u32 ARMv7Context::read_pc()
 	return thread.PC;
 }
 
+void ARMv7Context::put_stack_arg(u32 shift, u32 value)
+{
+	vm::psv::write32(SP + shift, value);
+}
+
 u32 ARMv7Context::get_stack_arg(u32 pos)
 {
 	return vm::psv::read32(SP + sizeof(u32) * (pos - 5));
 }
 
+void ARMv7Context::fast_call(u32 addr)
+{
+	return thread.FastCall(addr);
+}
+
 ARMv7Thread::ARMv7Thread()
 	: CPUThread(CPU_THREAD_ARMv7)
 	, context(*this)
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index ff7eb1df4f..73a6f864e3 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -327,6 +327,10 @@ s32 sceKernelWaitThreadEndCB(u32 threadId, vm::psv::ptr<s32> pExitStatus, vm::ps
 
 psv_log_base sceLibKernel("sceLibKernel", []()
 {
+	sceLibKernel.on_load = nullptr;
+	sceLibKernel.on_unload = nullptr;
+	sceLibKernel.on_stop = nullptr;
+
 	//REG_FUNC(0x23EAA62, sceKernelPuts);
 	//REG_FUNC(0xB0335388, sceClibToupper);
 	//REG_FUNC(0x4C5471BC, sceClibTolower);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
index 0a63907a63..8bca615fcf 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
@@ -3,29 +3,51 @@
 #include "Emu/System.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/ARMv7/PSVFuncList.h"
+#include "Emu/ARMv7/ARMv7Callback.h"
 
 extern psv_log_base sceLibc;
 
+vm::psv::ptr<void> g_dso;
+
+typedef void(*atexit_func_t)(vm::psv::ptr<void>);
+
+std::vector<std::function<void(ARMv7Context&)>> g_atexit;
+
 namespace sce_libc_func
 {
-	void __cxa_atexit()
+	void __cxa_atexit(vm::psv::ptr<atexit_func_t> func, vm::psv::ptr<void> arg, vm::psv::ptr<void> dso)
 	{
-		sceLibc.Todo(__FUNCTION__);
-		Emu.Pause();
+		sceLibc.Error("__cxa_atexit(func=0x%x, arg=0x%x, dso=0x%x)", func, arg, dso);
+		
+		g_atexit.insert(g_atexit.begin(), [func, arg, dso](ARMv7Context& context)
+		{
+			func(context, arg);
+		});
 	}
 
-	void __aeabi_atexit()
+	void __aeabi_atexit(vm::psv::ptr<void> arg, vm::psv::ptr<atexit_func_t> func, vm::psv::ptr<void> dso)
 	{
-		sceLibc.Todo(__FUNCTION__);
-		Emu.Pause();
+		sceLibc.Error("__aeabi_atexit(arg=0x%x, func=0x%x, dso=0x%x)", arg, func, dso);
+
+		g_atexit.insert(g_atexit.begin(), [func, arg, dso](ARMv7Context& context)
+		{
+			func(context, arg);
+		});
 	}
 
-	void exit()
+	void exit(ARMv7Context& context)
 	{
 		sceLibc.Error("exit()");
-		Emu.Pause();
+		
+		for (auto func : g_atexit)
+		{
+			func(context);
+		}
+
+		g_atexit.clear();
 
 		sceLibc.Success("Process finished");
+
 		CallAfter([]()
 		{
 			Emu.Stop();
@@ -95,9 +117,11 @@ namespace sce_libc_func
 		LOG_NOTICE(TTY, result);
 	}
 
-	void __cxa_set_dso_handle_main()
+	void __cxa_set_dso_handle_main(vm::psv::ptr<void> dso)
 	{
-		sceLibc.Error("__cxa_set_dso_handle_main()");
+		sceLibc.Error("__cxa_set_dso_handle_main(dso=0x%x)", dso);
+
+		g_dso = dso;
 	}
 
 	void memcpy(vm::psv::ptr<void> dst, vm::psv::ptr<const void> src, u32 size)
@@ -127,6 +151,13 @@ namespace sce_libc_func
 
 psv_log_base sceLibc("SceLibc", []()
 {
+	g_dso.set(0);
+	g_atexit.clear();
+
+	sceLibc.on_load = nullptr;
+	sceLibc.on_unload = nullptr;
+	sceLibc.on_stop = nullptr;
+
 	REG_FUNC(0xE4531F85, _Assert);
 	//REG_FUNC(0xE71C5CDE, _Stoul);
 	//REG_FUNC(0x7A5CA6A3, _Stoulx);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
index ae85794c24..db7745f9f3 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
@@ -14,6 +14,10 @@ namespace sce_libm_func
 
 psv_log_base sceLibm("SceLibm", []()
 {
+	sceLibm.on_load = nullptr;
+	sceLibm.on_unload = nullptr;
+	sceLibm.on_stop = nullptr;
+
 	//REG_FUNC(0xC73FE76D, _Exp);
 	//REG_FUNC(0xFF4EAE04, _FExp);
 	//REG_FUNC(0xB363D7D4, _LExp);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
index 7846ec1c0d..ef215f0971 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
@@ -30,6 +30,10 @@ namespace sce_libstdcxx_func
 
 psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 {
+	sceLibstdcxx.on_load = nullptr;
+	sceLibstdcxx.on_unload = nullptr;
+	sceLibstdcxx.on_stop = nullptr;
+
 	//REG_FUNC(0x52B0C625, std::bad_typeid::what() const);
 	//REG_FUNC(0x64D7D074, std::bad_typeid::_Doraise() const);
 	//REG_FUNC(0x15FB88E2, std::logic_error::what() const);
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.cpp b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
index 784ff534fd..bd17628f20 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.cpp
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
@@ -3,6 +3,7 @@
 #include "PSVFuncList.h"
 
 std::vector<psv_func> g_psv_func_list;
+std::vector<psv_log_base*> g_psv_modules;
 
 void add_psv_func(psv_func& data)
 {
@@ -48,33 +49,53 @@ extern psv_log_base sceLibm;
 extern psv_log_base sceLibstdcxx;
 extern psv_log_base sceLibKernel;
 
-void list_known_psv_modules()
+void initialize_psv_modules()
 {
-	if (!g_psv_func_list.size())
+	assert(!g_psv_func_list.size() && !g_psv_modules.size());
+
+	// fill module list
+	g_psv_modules.push_back(&sceLibc);
+	g_psv_modules.push_back(&sceLibm);
+	g_psv_modules.push_back(&sceLibstdcxx);
+	g_psv_modules.push_back(&sceLibKernel);
+
+	// setup special functions (without NIDs)
+	psv_func unimplemented;
+	unimplemented.nid = 0;
+	unimplemented.name = "Special function (unimplemented stub)";
+	unimplemented.func.reset(new psv_func_detail::func_binder<void, ARMv7Context&>([](ARMv7Context& context)
 	{
-		// setup special functions (without NIDs)
-		psv_func unimplemented;
-		unimplemented.nid = 0;
-		unimplemented.name = "Special function (unimplemented stub)";
-		unimplemented.func.reset(new psv_func_detail::func_binder<void, ARMv7Context&>([](ARMv7Context& context)
-		{
-			context.thread.m_last_syscall = vm::psv::read32(context.thread.PC + 4);
-			throw "Unimplemented function executed";
-		}));
-		g_psv_func_list.push_back(unimplemented);
+		context.thread.m_last_syscall = vm::psv::read32(context.thread.PC + 4);
+		throw "Unimplemented function executed";
+	}));
+	g_psv_func_list.push_back(unimplemented);
 
-		psv_func hle_return;
-		hle_return.nid = 1;
-		hle_return.name = "Special function (return from HLE)";
-		hle_return.func.reset(new psv_func_detail::func_binder<void, ARMv7Context&>([](ARMv7Context& context)
-		{
-			context.thread.FastStop();
-		}));
-		g_psv_func_list.push_back(hle_return);
+	psv_func hle_return;
+	hle_return.nid = 1;
+	hle_return.name = "Special function (return from HLE)";
+	hle_return.func.reset(new psv_func_detail::func_binder<void, ARMv7Context&>([](ARMv7Context& context)
+	{
+		context.thread.FastStop();
+	}));
+	g_psv_func_list.push_back(hle_return);
 
-		sceLibc.Init();
-		sceLibm.Init();
-		sceLibstdcxx.Init();
-		sceLibKernel.Init();
+	// load functions
+	for (auto module : g_psv_modules)
+	{
+		module->Init();
 	}
 }
+
+void finalize_psv_modules()
+{
+	for (auto module : g_psv_modules)
+	{
+		if (module->on_stop)
+		{
+			module->on_stop();
+		}
+	}
+
+	g_psv_func_list.clear();
+	g_psv_modules.clear();
+}
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h
index 2562670c08..195460de5f 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.h
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.h
@@ -7,6 +7,11 @@ class psv_log_base : public LogBase
 	std::string m_name;
 	void(*m_init_func)();
 
+public:
+	std::function<void()> on_load;
+	std::function<void()> on_unload;
+	std::function<void()> on_stop;
+
 public:
 	psv_log_base(const std::string& name, void(*init_func)())
 		: m_name(name)
@@ -422,6 +427,8 @@ namespace psv_func_detail
 		ARG_STACK,
 	};
 
+	static const auto FIXED_STACK_FRAME_SIZE = 0x100; // described in CB_FUNC.h
+
 	template<typename T, bind_arg_type type, int g_count, int f_count, int v_count>
 	struct bind_arg;
 
@@ -430,10 +437,15 @@ namespace psv_func_detail
 	{
 		static_assert(sizeof(T) <= 4, "Invalid function argument type for ARG_GENERAL");
 
-		static __forceinline T func(ARMv7Context& context)
+		__forceinline static T get_arg(ARMv7Context& context)
 		{
 			return cast_from_armv7_gpr<T>(context.GPR[g_count - 1]);
 		}
+
+		__forceinline static void put_arg(ARMv7Context& context, const T& arg)
+		{
+			context.GPR[g_count - 1] = cast_to_armv7_gpr<T>(arg);
+		}
 	};
 
 	template<typename T, int g_count, int f_count, int v_count>
@@ -442,7 +454,11 @@ namespace psv_func_detail
 		static_assert(f_count <= 0, "TODO: Unsupported argument type (float)");
 		static_assert(sizeof(T) <= 8, "Invalid function argument type for ARG_FLOAT");
 
-		static __forceinline T func(ARMv7Context& context)
+		__forceinline static T get_arg(ARMv7Context& context)
+		{
+		}
+
+		__forceinline static void put_arg(ARMv7Context& context, const T& arg)
 		{
 		}
 	};
@@ -453,7 +469,11 @@ namespace psv_func_detail
 		static_assert(v_count <= 0, "TODO: Unsupported argument type (vector)");
 		static_assert(std::is_same<T, u128>::value, "Invalid function argument type for ARG_VECTOR");
 
-		static __forceinline T func(ARMv7Context& context)
+		__forceinline static T get_arg(ARMv7Context& context)
+		{
+		}
+
+		__forceinline static void put_arg(ARMv7Context& context, const T& arg)
 		{
 		}
 	};
@@ -465,11 +485,19 @@ namespace psv_func_detail
 		static_assert(v_count <= 0, "TODO: Unsupported stack argument type (vector)");
 		static_assert(sizeof(T) <= 4, "Invalid function argument type for ARG_STACK");
 
-		static __forceinline T func(ARMv7Context& context)
+		__forceinline static T get_arg(ARMv7Context& context)
 		{
 			// TODO: check
-			const u32 res = context.get_stack_arg(g_count);
-			return cast_from_armv7_gpr<T>(res);
+			return cast_from_armv7_gpr<T>(context.get_stack_arg(g_count));
+		}
+
+		__forceinline static void put_arg(ARMv7Context& context, const T& arg)
+		{
+			// TODO: check
+			const int stack_pos = (g_count - 5) * 4 - FIXED_STACK_FRAME_SIZE;
+			static_assert(stack_pos < 0, "TODO: Increase fixed stack frame size (arg count limit broken)");
+
+			context.write_stack_arg(stack_pos, cast_to_armv7_gpr<T>(arg));
 		}
 	};
 
@@ -481,7 +509,12 @@ namespace psv_func_detail
 		static_assert(type == ARG_GENERAL, "Wrong use of bind_result template");
 		static_assert(sizeof(T) <= 4, "Invalid function result type for ARG_GENERAL");
 
-		static __forceinline void func(ARMv7Context& context, const T& result)
+		__forceinline static T get_result(ARMv7Context& context)
+		{
+			return cast_from_armv7_gpr<T>(context.GPR[0]);
+		}
+
+		__forceinline static void put_result(ARMv7Context& context, const T& result)
 		{
 			context.GPR[0] = cast_to_armv7_gpr<T>(result);
 		}
@@ -492,7 +525,7 @@ namespace psv_func_detail
 	//{
 	//	static_assert(sizeof(T) <= 8, "Invalid function result type for ARG_FLOAT");
 
-	//	static __forceinline void func(ARMv7Context& context, const T& result)
+	//	static __forceinline void put_result(ARMv7Context& context, const T& result)
 	//	{
 	//	}
 	//};
@@ -502,11 +535,21 @@ namespace psv_func_detail
 	//{
 	//	static_assert(std::is_same<T, u128>::value, "Invalid function result type for ARG_VECTOR");
 
-	//	static __forceinline void func(ARMv7Context& context, const T& result)
+	//	static __forceinline void put_result(ARMv7Context& context, const T& result)
 	//	{
 	//	}
 	//};
 
+	template<typename RT>
+	struct result_type
+	{
+		static_assert(!std::is_pointer<RT>::value, "Invalid function result type (pointer)");
+		static_assert(!std::is_reference<RT>::value, "Invalid function result type (reference)");
+		static const bool is_float = std::is_floating_point<RT>::value;
+		static const bool is_vector = std::is_same<RT, u128>::value;
+		static const bind_arg_type value = is_float ? ARG_FLOAT : (is_vector ? ARG_VECTOR : ARG_GENERAL);
+	};
+
 	template <typename RT, typename F, typename Tuple, bool Done, int Total, int... N>
 	struct call_impl
 	{
@@ -554,18 +597,35 @@ namespace psv_func_detail
 		const int f = f_count + (is_float ? 1 : 0);
 		const int v = v_count + (is_vector ? 1 : 0);
 
-		return std::tuple_cat(std::tuple<T>(bind_arg<T, t, g, f, v>::func(context)), iterate<g, f, v, A...>(context));
+		return std::tuple_cat(std::tuple<T>(bind_arg<T, t, g, f, v>::get_arg(context)), iterate<g, f, v, A...>(context));
 	}
 
-	template<typename RT>
-	struct result_type
+	template<int g_count, int f_count, int v_count>
+	__forceinline static bool put_func_args(ARMv7Context& context)
 	{
-		static_assert(!std::is_pointer<RT>::value, "Invalid function result type (pointer)");
-		static_assert(!std::is_reference<RT>::value, "Invalid function result type (reference)");
-		static const bool is_float = std::is_floating_point<RT>::value;
-		static const bool is_vector = std::is_same<RT, u128>::value;
-		static const bind_arg_type value = is_float ? ARG_FLOAT : (is_vector ? ARG_VECTOR : ARG_GENERAL);
-	};
+		// terminator
+		return false;
+	}
+
+	template<int g_count, int f_count, int v_count, typename T1, typename... T>
+	__forceinline static bool put_func_args(ARMv7Context& context, T1 arg, T... args)
+	{
+		static_assert(!std::is_pointer<T1>::value, "Invalid callback argument type (pointer)");
+		static_assert(!std::is_reference<T1>::value, "Invalid callback argument type (reference)");
+		// TODO: check calculations
+		const bool is_float = std::is_floating_point<T>::value;
+		const bool is_vector = std::is_same<T, u128>::value;
+		const bind_arg_type t = is_float
+			? ((f_count >= 4) ? ARG_STACK : ARG_FLOAT)
+			: (is_vector ? ((v_count >= 4) ? ARG_STACK : ARG_VECTOR) : ((g_count >= 4) ? ARG_STACK : ARG_GENERAL));
+		const int g = g_count + (is_float || is_vector ? 0 : 1);
+		const int f = f_count + (is_float ? 1 : 0);
+		const int v = v_count + (is_vector ? 1 : 0);
+
+		bind_arg<T1, t, g, f, v>::put_arg(context, arg);
+		// return true if stack was used
+		return put_func_args<g, f, v>(context, args...) || (t == ARG_STACK);
+	}
 
 	template<typename RT, typename... T>
 	class func_binder;
@@ -623,7 +683,7 @@ namespace psv_func_detail
 
 		virtual void operator()(ARMv7Context& context)
 		{
-			bind_result<RT, result_type<RT>::value>::func(context, call<RT>(m_call, iterate<0, 0, 0, T...>(context)));
+			bind_result<RT, result_type<RT>::value>::put_result(context, call<RT>(m_call, iterate<0, 0, 0, T...>(context)));
 		}
 	};
 
@@ -642,7 +702,36 @@ namespace psv_func_detail
 
 		virtual void operator()(ARMv7Context& context)
 		{
-			bind_result<RT, result_type<RT>::value>::func(context, call<RT>(m_call, std::tuple_cat(std::tuple<ARMv7Context&>(context), iterate<0, 0, 0, T...>(context))));
+			bind_result<RT, result_type<RT>::value>::put_result(context, call<RT>(m_call, std::tuple_cat(std::tuple<ARMv7Context&>(context), iterate<0, 0, 0, T...>(context))));
+		}
+	};
+
+	template<typename RT, typename... T>
+	struct func_caller
+	{
+		__forceinline static RT call(ARMv7Context& context, u32 addr, T... args)
+		{
+			func_caller<void, T...>::call(context, addr, args...);
+
+			return bind_result<RT, result_type<RT>::value>::get_result(context);
+		}
+	};
+
+	template<typename... T>
+	struct func_caller<void, T...>
+	{
+		__forceinline static void call(ARMv7Context& context, u32 addr, T... args)
+		{
+			if (put_func_args<0, 0, 0, T...>(context, args...))
+			{
+				context.SP -= FIXED_STACK_FRAME_SIZE;
+				context.fast_call(addr);
+				context.SP += FIXED_STACK_FRAME_SIZE;
+			}
+			else
+			{
+				context.fast_call(addr);
+			}
 		}
 	};
 }
@@ -673,4 +762,5 @@ psv_func* get_psv_func_by_nid(u32 nid);
 u32 get_psv_func_index(psv_func* func);
 
 void execute_psv_func_by_index(ARMv7Context& context, u32 index);
-void list_known_psv_modules();
+void initialize_psv_modules();
+void finalize_psv_modules();
diff --git a/rpcs3/Emu/Memory/vm_ptr.h b/rpcs3/Emu/Memory/vm_ptr.h
index 5915a52a05..23c7123b2d 100644
--- a/rpcs3/Emu/Memory/vm_ptr.h
+++ b/rpcs3/Emu/Memory/vm_ptr.h
@@ -1,6 +1,7 @@
 #pragma once
 
 class CPUThread;
+struct ARMv7Context;
 
 namespace vm
 {
@@ -332,9 +333,11 @@ namespace vm
 	public:
 		typedef RT(*type)(T...);
 
-		RT operator()(CPUThread& CPU, T... args) const; // defined in CB_FUNC.h, call using specified CPU thread context
+		RT operator()(CPUThread& CPU, T... args) const; // defined in CB_FUNC.h, call using specified PPU thread context
 
-		RT operator()(T... args) const; // defined in CB_FUNC.h, call using current CPU thread context
+		RT operator()(ARMv7Context& context, T... args) const; // defined in ARMv7Callback.h, passing context is mandatory
+
+		RT operator()(T... args) const; // defined in CB_FUNC.h, call using current PPU thread context
 
 		AT addr() const
 		{
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 9944a5860f..9e17b56ddf 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -5,6 +5,7 @@
 #include "Emu/System.h"
 
 #include "Emu/GameInfo.h"
+#include "Emu/ARMv7/PSVFuncList.h"
 #include "Emu/SysCalls/Static.h"
 #include "Emu/SysCalls/ModuleManager.h"
 #include "Emu/Cell/PPUThread.h"
@@ -361,6 +362,7 @@ void Emulator::Stop()
 
 	LOG_NOTICE(HLE, "All threads stopped...");
 
+	finalize_psv_modules();
 	m_rsx_callback = 0;
 
 	// TODO: check finalization order
diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp
index cb9be62759..988d1d779c 100644
--- a/rpcs3/Loader/ELF32.cpp
+++ b/rpcs3/Loader/ELF32.cpp
@@ -89,7 +89,7 @@ namespace loader
 			case MACHINE_MIPS: break;
 			case MACHINE_ARM:
 			{
-				list_known_psv_modules();
+				initialize_psv_modules();
 
 				auto armv7_thr_stop_data = vm::psv::ptr<u32>::make(Memory.PSV.RAM.AllocAlign(3 * 4));
 				armv7_thr_stop_data[0] = 0xf870; // HACK instruction (Thumb)
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 001fcfc477..e68b19b861 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -266,6 +266,7 @@
     <ClInclude Include="Crypto\unself.h" />
     <ClInclude Include="Crypto\utils.h" />
     <ClInclude Include="define_new_memleakdetect.h" />
+    <ClInclude Include="Emu\ARMv7\ARMv7Callback.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7Context.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7Decoder.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7DisAsm.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 681270e3d6..3537bdfbf0 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -1285,5 +1285,8 @@
     <ClInclude Include="Emu\ARMv7\ARMv7Context.h">
       <Filter>Emu\CPU\ARMv7</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\ARMv7\ARMv7Callback.h">
+      <Filter>Emu\CPU\ARMv7</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 8660b41833d6935934af75c99ee8a7aa48886c2a Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 21 Jan 2015 17:43:45 +0300
Subject: [PATCH 08/70] Compilation fix

---
 rpcs3/Emu/ARMv7/PSVFuncList.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h
index 195460de5f..0850a88ccf 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.h
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.h
@@ -497,7 +497,7 @@ namespace psv_func_detail
 			const int stack_pos = (g_count - 5) * 4 - FIXED_STACK_FRAME_SIZE;
 			static_assert(stack_pos < 0, "TODO: Increase fixed stack frame size (arg count limit broken)");
 
-			context.write_stack_arg(stack_pos, cast_to_armv7_gpr<T>(arg));
+			context.put_stack_arg(stack_pos, cast_to_armv7_gpr<T>(arg));
 		}
 	};
 
@@ -613,8 +613,8 @@ namespace psv_func_detail
 		static_assert(!std::is_pointer<T1>::value, "Invalid callback argument type (pointer)");
 		static_assert(!std::is_reference<T1>::value, "Invalid callback argument type (reference)");
 		// TODO: check calculations
-		const bool is_float = std::is_floating_point<T>::value;
-		const bool is_vector = std::is_same<T, u128>::value;
+		const bool is_float = std::is_floating_point<T1>::value;
+		const bool is_vector = std::is_same<T1, u128>::value;
 		const bind_arg_type t = is_float
 			? ((f_count >= 4) ? ARG_STACK : ARG_FLOAT)
 			: (is_vector ? ((v_count >= 4) ? ARG_STACK : ARG_VECTOR) : ((g_count >= 4) ? ARG_STACK : ARG_GENERAL));

From aead66ccbff6aea8b195308b0e0577c3891f2eb9 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 21 Jan 2015 18:18:26 +0300
Subject: [PATCH 09/70] Some refactoring

---
 rpcs3/Emu/ARMv7/PSVFuncList.h | 63 +++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h
index 0850a88ccf..cf34bf846e 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.h
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.h
@@ -550,6 +550,22 @@ namespace psv_func_detail
 		static const bind_arg_type value = is_float ? ARG_FLOAT : (is_vector ? ARG_VECTOR : ARG_GENERAL);
 	};
 
+	template<typename T, int g_count, int f_count, int v_count>
+	struct arg_type
+	{
+		static_assert(!std::is_pointer<T>::value, "Invalid function argument type (pointer)");
+		static_assert(!std::is_reference<T>::value, "Invalid function argument type (reference)");
+		// TODO: check calculations
+		static const bool is_float = std::is_floating_point<T>::value;
+		static const bool is_vector = std::is_same<T, u128>::value;
+		static const bind_arg_type value = is_float
+			? ((f_count >= 4) ? ARG_STACK : ARG_FLOAT)
+			: (is_vector ? ((v_count >= 4) ? ARG_STACK : ARG_VECTOR) : ((g_count >= 4) ? ARG_STACK : ARG_GENERAL));
+		static const int g_value = g_count + (is_float || is_vector ? 0 : 1);
+		static const int f_value = f_count + (is_float ? 1 : 0);
+		static const int v_value = v_count + (is_vector ? 1 : 0);
+	};
+
 	template <typename RT, typename F, typename Tuple, bool Done, int Total, int... N>
 	struct call_impl
 	{
@@ -576,28 +592,22 @@ namespace psv_func_detail
 	}
 
 	template<int g_count, int f_count, int v_count>
-	__forceinline std::tuple<> iterate(ARMv7Context& context)
+	__forceinline std::tuple<> get_func_args(ARMv7Context& context)
 	{
 		// terminator
 		return std::tuple<>();
 	}
 
 	template<int g_count, int f_count, int v_count, typename T, typename... A>
-	__forceinline std::tuple<T, A...> iterate(ARMv7Context& context)
+	__forceinline std::tuple<T, A...> get_func_args(ARMv7Context& context)
 	{
-		static_assert(!std::is_pointer<T>::value, "Invalid function argument type (pointer)");
-		static_assert(!std::is_reference<T>::value, "Invalid function argument type (reference)");
-		// TODO: check calculations
-		const bool is_float = std::is_floating_point<T>::value;
-		const bool is_vector = std::is_same<T, u128>::value;
-		const bind_arg_type t = is_float
-			? ((f_count >= 4) ? ARG_STACK : ARG_FLOAT)
-			: (is_vector ? ((v_count >= 4) ? ARG_STACK : ARG_VECTOR) : ((g_count >= 4) ? ARG_STACK : ARG_GENERAL));
-		const int g = g_count + (is_float || is_vector ? 0 : 1);
-		const int f = f_count + (is_float ? 1 : 0);
-		const int v = v_count + (is_vector ? 1 : 0);
+		typedef arg_type<T, g_count, f_count, v_count> type;
+		const bind_arg_type t = type::value;
+		const int g = type::g_value;
+		const int f = type::f_value;
+		const int v = type::v_value;
 
-		return std::tuple_cat(std::tuple<T>(bind_arg<T, t, g, f, v>::get_arg(context)), iterate<g, f, v, A...>(context));
+		return std::tuple_cat(std::tuple<T>(bind_arg<T, t, g, f, v>::get_arg(context)), get_func_args<g, f, v, A...>(context));
 	}
 
 	template<int g_count, int f_count, int v_count>
@@ -610,19 +620,14 @@ namespace psv_func_detail
 	template<int g_count, int f_count, int v_count, typename T1, typename... T>
 	__forceinline static bool put_func_args(ARMv7Context& context, T1 arg, T... args)
 	{
-		static_assert(!std::is_pointer<T1>::value, "Invalid callback argument type (pointer)");
-		static_assert(!std::is_reference<T1>::value, "Invalid callback argument type (reference)");
-		// TODO: check calculations
-		const bool is_float = std::is_floating_point<T1>::value;
-		const bool is_vector = std::is_same<T1, u128>::value;
-		const bind_arg_type t = is_float
-			? ((f_count >= 4) ? ARG_STACK : ARG_FLOAT)
-			: (is_vector ? ((v_count >= 4) ? ARG_STACK : ARG_VECTOR) : ((g_count >= 4) ? ARG_STACK : ARG_GENERAL));
-		const int g = g_count + (is_float || is_vector ? 0 : 1);
-		const int f = f_count + (is_float ? 1 : 0);
-		const int v = v_count + (is_vector ? 1 : 0);
+		typedef arg_type<T1, g_count, f_count, v_count> type;
+		const bind_arg_type t = type::value;
+		const int g = type::g_value;
+		const int f = type::f_value;
+		const int v = type::v_value;
 
 		bind_arg<T1, t, g, f, v>::put_arg(context, arg);
+
 		// return true if stack was used
 		return put_func_args<g, f, v>(context, args...) || (t == ARG_STACK);
 	}
@@ -645,7 +650,7 @@ namespace psv_func_detail
 
 		virtual void operator()(ARMv7Context& context)
 		{
-			call<void>(m_call, iterate<0, 0, 0, T...>(context));
+			call<void>(m_call, get_func_args<0, 0, 0, T...>(context));
 		}
 	};
 
@@ -664,7 +669,7 @@ namespace psv_func_detail
 
 		virtual void operator()(ARMv7Context& context)
 		{
-			call<void>(m_call, std::tuple_cat(std::tuple<ARMv7Context&>(context), iterate<0, 0, 0, T...>(context)));
+			call<void>(m_call, std::tuple_cat(std::tuple<ARMv7Context&>(context), get_func_args<0, 0, 0, T...>(context)));
 		}
 	};
 
@@ -683,7 +688,7 @@ namespace psv_func_detail
 
 		virtual void operator()(ARMv7Context& context)
 		{
-			bind_result<RT, result_type<RT>::value>::put_result(context, call<RT>(m_call, iterate<0, 0, 0, T...>(context)));
+			bind_result<RT, result_type<RT>::value>::put_result(context, call<RT>(m_call, get_func_args<0, 0, 0, T...>(context)));
 		}
 	};
 
@@ -702,7 +707,7 @@ namespace psv_func_detail
 
 		virtual void operator()(ARMv7Context& context)
 		{
-			bind_result<RT, result_type<RT>::value>::put_result(context, call<RT>(m_call, std::tuple_cat(std::tuple<ARMv7Context&>(context), iterate<0, 0, 0, T...>(context))));
+			bind_result<RT, result_type<RT>::value>::put_result(context, call<RT>(m_call, std::tuple_cat(std::tuple<ARMv7Context&>(context), get_func_args<0, 0, 0, T...>(context))));
 		}
 	};
 

From ab501842c87da87780f2c7efb4978e9b37360633 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 21 Jan 2015 20:15:04 +0300
Subject: [PATCH 10/70] ARMv7: V* instructions draft

---
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 1345 +++++++++++++++++++++++++-
 rpcs3/Emu/ARMv7/ARMv7Interpreter.h   |  168 +++-
 2 files changed, 1511 insertions(+), 2 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index 5695e87b9c..c03c963075 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -3510,4 +3510,1347 @@ void ARMv7_instrs::UXTH(ARMv7Context& context, const ARMv7Code code, const ARMv7
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
-}
\ No newline at end of file
+}
+
+
+void ARMv7_instrs::VABA_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VABD_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VABD_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VABS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VAC__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VADD_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VADDHN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VADD_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VAND_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VAND_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VBIC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VBIC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VB__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCEQ_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCEQ_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCGE_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCGE_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCGT_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCGT_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCLE_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCLE_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCLS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCLT_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCLT_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCLZ(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCMP_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCNT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCVT_FIA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCVT_FIF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCVT_FFA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCVT_FFF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCVT_DF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCVT_HFA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VCVT_HFF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VDIV(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VDUP_S(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VDUP_R(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VEOR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VEXT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VHADDSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD1_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD1_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD1_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD2_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD2_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD2_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD3_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD3_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD3_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD4_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD4_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLD4_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLDM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VLDR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMAXMIN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMAXMIN_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VML__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VML_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VML__S(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMOV_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMOV_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMOV_RS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMOV_SR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMOV_RF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMOV_RF2(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMOV_RD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMOVL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMOVN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMRS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMUL_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMUL_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMUL_S(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMVN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VMVN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VNEG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VNM__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VORN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VORN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VORR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VORR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VPADAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VPADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VPADD_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VPADDL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VPMAXMIN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VPMAXMIN_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VPOP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VPUSH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQABS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQDML_L(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQDMULH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQDMULL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQMOV_N(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQNEG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQRDMULH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQRSHL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQRSHR_N(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQSHL_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQSHL_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQSHR_N(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VQSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VRADDHN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VRECPE(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VRECPS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VREV__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VRHADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VRSHL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VRSHR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VRSHRN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VRSQRTE(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VRSQRTS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VRSRA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VRSUBHN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSHL_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSHL_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSHLL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSHR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSHRN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSLI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSQRT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSRA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSRI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VST1_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VST1_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VST2_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VST2_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VST3_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VST3_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VST4_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VST4_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSTM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSTR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSUB_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSUBHN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSUB_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VSWP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VTBL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VTBX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VTRN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VTST(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VUZP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::VZIP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+
+void ARMv7_instrs::WFE(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::WFI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
+
+void ARMv7_instrs::YIELD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	switch (type)
+	{
+	case A1: throw __FUNCTION__;
+	default: throw __FUNCTION__;
+	}
+}
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
index 1736fdd38a..2426066bc9 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
@@ -364,6 +364,157 @@ namespace ARMv7_instrs
 	void UXTB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void UXTB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void UXTH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+
+	void VABA_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VABD_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VABD_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VABS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VAC__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VADD_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VADDHN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VADD_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VAND_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VAND_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VBIC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VBIC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VB__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCEQ_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCEQ_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCGE_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCGE_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCGT_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCGT_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCLE_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCLE_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCLS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCLT_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCLT_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCLZ(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCMP_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCNT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCVT_FIA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCVT_FIF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCVT_FFA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCVT_FFF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCVT_DF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCVT_HFA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VCVT_HFF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VDIV(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VDUP_S(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VDUP_R(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VEOR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VEXT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VHADDSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD1_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD1_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD1_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD2_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD2_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD2_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD3_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD3_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD3_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD4_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD4_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD4_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLDM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLDR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMAXMIN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMAXMIN_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VML__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VML_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VML__S(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMOV_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMOV_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMOV_RS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMOV_SR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMOV_RF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMOV_RF2(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMOV_RD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMOVL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMOVN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMRS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMUL_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMUL_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMUL_S(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMVN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMVN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VNEG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VNM__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VORN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VORN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VORR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VORR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VPADAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VPADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VPADD_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VPADDL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VPMAXMIN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VPMAXMIN_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VPOP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VPUSH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQABS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQDML_L(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQDMULH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQDMULL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQMOV_N(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQNEG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQRDMULH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQRSHL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQRSHR_N(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQSHL_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQSHL_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQSHR_N(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VQSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VRADDHN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VRECPE(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VRECPS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VREV__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VRHADD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VRSHL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VRSHR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VRSHRN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VRSQRTE(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VRSQRTS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VRSRA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VRSUBHN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSHL_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSHL_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSHLL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSHR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSHRN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSLI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSQRT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSRA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSRI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VST1_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VST1_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VST2_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VST2_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VST3_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VST3_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VST4_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VST4_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSTM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSTR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSUB_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSUBHN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSUB_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VSWP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VTBL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VTBX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VTRN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VTST(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VUZP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VZIP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+
+	void WFE(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void WFI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void YIELD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 };
 
 
@@ -942,7 +1093,22 @@ static const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xffff, 0xf0c0, 0xfa1f, 0xf080, T2, UXTH),
 	ARMv7_OP4(0x0fff, 0x03f0, 0x06ff, 0x0070, A1, UXTH),
 
-	// TODO (V*)
+	ARMv7_OP4(0xef80, 0x0f10, 0xef00, 0x0710, T1, VABA_),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0710, A1, VABA_),
+	ARMv7_OP4(0xef80, 0x0f50, 0xef80, 0x0500, T2, VABA_),
+	ARMv7_OP4(0xfe80, 0x0f50, 0xf280, 0x0500, A2, VABA_),
+
+	// TODO: vector instructions
+
+	ARMv7_OP2(0xffff, 0xbf20, T1, WFE),
+	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8002, T2, WFE),
+	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf002, A1, WFE),
+	ARMv7_OP2(0xffff, 0xbf30, T1, WFI),
+	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8003, T2, WFI),
+	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf003, A1, WFI),
+	ARMv7_OP2(0xffff, 0xbf10, T1, YIELD),
+	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8001, T2, YIELD),
+	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf001, A1, YIELD),
 };
 
 #undef ARMv7_OP2

From 6069be7a93dbdce1fb40295620a040e0c603e669 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 21 Jan 2015 20:33:24 +0300
Subject: [PATCH 11/70] Some code moved to ARMv7Decoder.cpp

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp   | 628 +++++++++++++++++++++++++++++
 rpcs3/Emu/ARMv7/ARMv7Decoder.h     |  41 +-
 rpcs3/Emu/ARMv7/ARMv7Interpreter.h | 597 ---------------------------
 rpcs3/Emu/ARMv7/ARMv7Opcodes.h     |   6 +-
 rpcs3/emucore.vcxproj              |   1 +
 rpcs3/emucore.vcxproj.filters      |   3 +
 6 files changed, 637 insertions(+), 639 deletions(-)
 create mode 100644 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
new file mode 100644
index 0000000000..c28a880722
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -0,0 +1,628 @@
+#include "stdafx.h"
+#include "Utilities/Log.h"
+#include "ARMv7Thread.h"
+#include "ARMv7Interpreter.h"
+#include "ARMv7Opcodes.h"
+#include "ARMv7Decoder.h"
+
+struct ARMv7_opcode_t
+{
+	u32 mask;
+	u32 code;
+	u32 length; // 2 or 4
+	const char* name;
+	ARMv7_encoding type;
+	void(*func)(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+};
+
+// single 16-bit value
+#define ARMv7_OP2(mask, code, type, name) { (u32)((mask) << 16), (u32)((code) << 16), 2, #name "_" #type, type, ARMv7_instrs::name }
+// two 16-bit values
+#define ARMv7_OP4(mask0, mask1, code0, code1, type, name) { (u32)((mask0) << 16) | (mask1), (u32)((code0) << 16) | (code1), 4, #name "_" #type, type, ARMv7_instrs::name }
+
+const ARMv7_opcode_t ARMv7_opcode_table[] =
+{
+	ARMv7_OP2(0xffff, 0x0000, T1, NULL_OP), // ???
+
+	ARMv7_OP4(0xffff, 0x0000, 0xf870, 0x0000, T1, HACK), // "Undefined" Thumb opcode
+	ARMv7_OP4(0x0ff0, 0x00f0, 0x0070, 0x0090, A1, HACK), // "Undefined" ARM opcode
+
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf140, 0x0000, T1, ADC_IMM),
+	ARMv7_OP4(0x0fe0, 0x0000, 0x02a0, 0x0000, A1, ADC_IMM),
+	ARMv7_OP2(0xffc0, 0x4040, T1, ADC_REG),
+	ARMv7_OP4(0xffe0, 0x8000, 0xeb40, 0x0000, T2, ADC_REG),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x00a0, 0x0000, A1, ADC_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x00a0, 0x0010, A1, ADC_RSR),
+
+	ARMv7_OP2(0xf800, 0xa800, T1, ADD_SPI),
+	ARMv7_OP2(0xff80, 0xb000, T2, ADD_SPI),
+	ARMv7_OP4(0xfbef, 0x8000, 0xf10d, 0x0000, T3, ADD_SPI),
+	ARMv7_OP4(0xfbff, 0x8000, 0xf20d, 0x0000, T4, ADD_SPI),
+	ARMv7_OP4(0x0fef, 0x0000, 0x028d, 0x0000, A1, ADD_SPI),
+	ARMv7_OP2(0xff78, 0x4468, T1, ADD_SPR),
+	ARMv7_OP2(0xff87, 0x4485, T2, ADD_SPR),
+	ARMv7_OP4(0xffef, 0x8000, 0xeb0d, 0x0000, T3, ADD_SPR),
+	ARMv7_OP4(0x0fef, 0x0010, 0x008d, 0x0000, A1, ADD_SPR),
+	ARMv7_OP2(0xfe00, 0x1c00, T1, ADD_IMM),
+	ARMv7_OP2(0xf800, 0x3000, T2, ADD_IMM),
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf100, 0x0000, T3, ADD_IMM),
+	ARMv7_OP4(0xfbf0, 0x8000, 0xf200, 0x0000, T4, ADD_IMM),
+	ARMv7_OP4(0x0fe0, 0x0000, 0x0280, 0x0000, A1, ADD_IMM),
+	ARMv7_OP2(0xfe00, 0x1800, T1, ADD_REG),
+	ARMv7_OP2(0xff00, 0x4400, T2, ADD_REG),
+	ARMv7_OP4(0xffe0, 0x8000, 0xeb00, 0x0000, T3, ADD_REG),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x0080, 0x0000, A1, ADD_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x0080, 0x0010, A1, ADD_RSR),
+
+	ARMv7_OP2(0xf800, 0xa000, T1, ADR),
+	ARMv7_OP4(0xfbff, 0x8000, 0xf2af, 0x0000, T2, ADR),
+	ARMv7_OP4(0xfbff, 0x8000, 0xf20f, 0x0000, T3, ADR),
+	ARMv7_OP4(0x0fff, 0x0000, 0x028f, 0x0000, A1, ADR),
+	ARMv7_OP4(0x0fff, 0x0000, 0x024f, 0x0000, A2, ADR),
+
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf000, 0x0000, T1, AND_IMM),
+	ARMv7_OP4(0x0fe0, 0x0000, 0x0200, 0x0000, A1, AND_IMM),
+	ARMv7_OP2(0xffc0, 0x4000, T1, AND_REG),
+	ARMv7_OP4(0xffe0, 0x8000, 0xea00, 0x0000, T2, AND_REG),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x0000, 0x0000, A1, AND_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x0000, 0x0010, A1, AND_RSR),
+
+	ARMv7_OP2(0xf800, 0x1000, T1, ASR_IMM),
+	ARMv7_OP4(0xffef, 0x8030, 0xea4f, 0x0020, T2, ASR_IMM),
+	ARMv7_OP4(0x0fef, 0x0070, 0x01a0, 0x0040, A1, ASR_IMM),
+	ARMv7_OP2(0xffc0, 0x4100, T1, ASR_REG),
+	ARMv7_OP4(0xffe0, 0xf0f0, 0xfa40, 0xf000, T2, ASR_REG),
+	ARMv7_OP4(0x0fef, 0x00f0, 0x01a0, 0x0050, A1, ASR_REG),
+
+	ARMv7_OP2(0xf000, 0xd000, T1, B),
+	ARMv7_OP2(0xf800, 0xe000, T2, B),
+	ARMv7_OP4(0xf800, 0xd000, 0xf000, 0x8000, T3, B),
+	ARMv7_OP4(0xf800, 0xd000, 0xf000, 0x9000, T4, B),
+	ARMv7_OP4(0x0f00, 0x0000, 0x0a00, 0x0000, A1, B),
+
+	ARMv7_OP4(0xffff, 0x8020, 0xf36f, 0x0000, T1, BFC),
+	ARMv7_OP4(0x0fe0, 0x007f, 0x07c0, 0x001f, A1, BFC),
+	ARMv7_OP4(0xfff0, 0x8020, 0xf360, 0x0000, T1, BFI),
+	ARMv7_OP4(0x0fe0, 0x0070, 0x07c0, 0x0010, A1, BFI),
+
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf020, 0x0000, T1, BIC_IMM),
+	ARMv7_OP4(0x0fe0, 0x0000, 0x03c0, 0x0000, A1, BIC_IMM),
+	ARMv7_OP2(0xffc0, 0x4380, T1, BIC_REG),
+	ARMv7_OP4(0xffe0, 0x8000, 0xea20, 0x0000, T2, BIC_REG),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x01c0, 0x0000, A1, BIC_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x01c0, 0x0010, A1, BIC_RSR),
+
+	ARMv7_OP2(0xff00, 0xbe00, T1, BKPT),
+	ARMv7_OP4(0x0ff0, 0x00f0, 0x0120, 0x0070, A1, BKPT),
+
+	ARMv7_OP4(0xf800, 0xd000, 0xf000, 0xd000, T1, BL),
+	ARMv7_OP4(0x0f00, 0x0000, 0x0b00, 0x0000, A1, BL),
+	ARMv7_OP2(0xff80, 0x4780, T1, BLX),
+	ARMv7_OP4(0xf800, 0xc001, 0xf000, 0xc000, T2, BLX),
+	ARMv7_OP4(0x0fff, 0xfff0, 0x012f, 0xff30, A1, BLX),
+	ARMv7_OP4(0xfe00, 0x0000, 0xfa00, 0x0000, A2, BLX),
+
+	ARMv7_OP2(0xff87, 0x4700, T1, BX),
+	ARMv7_OP4(0x0fff, 0xfff0, 0x012f, 0xff10, A1, BX),
+
+	ARMv7_OP2(0xf500, 0xb100, T1, CB_Z),
+
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfab0, 0xf080, T1, CLZ),
+	ARMv7_OP4(0x0fff, 0x0ff0, 0x016f, 0x0f10, A1, CLZ),
+
+	ARMv7_OP4(0xfbf0, 0x8f00, 0xf110, 0x0f00, T1, CMN_IMM),
+	ARMv7_OP4(0x0ff0, 0xf000, 0x0370, 0x0000, A1, CMN_IMM),
+	ARMv7_OP2(0xffc0, 0x42c0, T1, CMN_REG),
+	ARMv7_OP4(0xfff0, 0x8f00, 0xeb10, 0x0f00, T2, CMN_REG),
+	ARMv7_OP4(0x0ff0, 0xf010, 0x0170, 0x0000, A1, CMN_REG),
+	ARMv7_OP4(0x0ff0, 0xf090, 0x0170, 0x0010, A1, CMN_RSR),
+
+	ARMv7_OP2(0xf800, 0x2800, T1, CMP_IMM),
+	ARMv7_OP4(0xfbf0, 0x8f00, 0xf1b0, 0x0f00, T2, CMP_IMM),
+	ARMv7_OP4(0x0ff0, 0xf000, 0x0350, 0x0000, A1, CMP_IMM),
+	ARMv7_OP2(0xffc0, 0x4280, T1, CMP_REG),
+	ARMv7_OP2(0xff00, 0x4500, T2, CMP_REG),
+	ARMv7_OP4(0xfff0, 0x8f00, 0xebb0, 0x0f00, T3, CMP_REG),
+	ARMv7_OP4(0x0ff0, 0xf010, 0x0150, 0x0000, A1, CMP_REG),
+	ARMv7_OP4(0x0ff0, 0xf090, 0x0150, 0x0010, A1, CMP_RSR),
+
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf080, 0x0000, T1, EOR_IMM),
+	ARMv7_OP4(0x0fe0, 0x0000, 0x0220, 0x0000, A1, EOR_IMM),
+	ARMv7_OP2(0xffc0, 0x4040, T1, EOR_REG),
+	ARMv7_OP4(0xffe0, 0x8000, 0xea80, 0x0000, T2, EOR_REG),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x0020, 0x0000, A1, EOR_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x0020, 0x0010, A1, EOR_RSR),
+
+	ARMv7_OP2(0xff00, 0xbf00, T1, IT),
+
+	ARMv7_OP4(0xfff0, 0x0f00, 0xe850, 0x0f00, T1, LDREX),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x0190, 0x0f9f, A1, LDREX),
+	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f4f, T1, LDREXB),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01d0, 0x0f9f, A1, LDREXB),
+	ARMv7_OP4(0xfff0, 0x00ff, 0xe8d0, 0x007f, T1, LDREXD),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01b0, 0x0f9f, A1, LDREXD),
+	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f5f, T1, LDREXH),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01f0, 0x0f9f, A1, LDREXH),
+
+	ARMv7_OP2(0xf800, 0xc800, T1, LDM),
+	ARMv7_OP4(0xffd0, 0x2000, 0xe890, 0x0000, T2, LDM),
+	ARMv7_OP4(0x0fd0, 0x0000, 0x0890, 0x0000, A1, LDM),
+	ARMv7_OP4(0x0fd0, 0x0000, 0x0810, 0x0000, A1, LDMDA),
+	ARMv7_OP4(0xffd0, 0x2000, 0xe910, 0x0000, T1, LDMDB),
+	ARMv7_OP4(0x0fd0, 0x0000, 0x0910, 0x0000, A1, LDMDB),
+	ARMv7_OP4(0x0fd0, 0x0000, 0x0990, 0x0000, A1, LDMIB),
+
+	ARMv7_OP2(0xf800, 0x6800, T1, LDR_IMM),
+	ARMv7_OP2(0xf800, 0x9800, T2, LDR_IMM),
+	ARMv7_OP4(0xfff0, 0x0000, 0xf8d0, 0x0000, T3, LDR_IMM),
+	ARMv7_OP4(0xfff0, 0x0800, 0xf850, 0x0800, T4, LDR_IMM),
+	ARMv7_OP4(0x0e50, 0x0000, 0x0410, 0x0000, A1, LDR_IMM),
+	ARMv7_OP2(0xf800, 0x4800, T1, LDR_LIT),
+	ARMv7_OP4(0xff7f, 0x0000, 0xf85f, 0x0000, T2, LDR_LIT),
+	ARMv7_OP4(0x0f7f, 0x0000, 0x051f, 0x0000, A1, LDR_LIT),
+	ARMv7_OP2(0xfe00, 0x5800, T1, LDR_REG),
+	ARMv7_OP4(0xfff0, 0x0fc0, 0xf850, 0x0000, T2, LDR_REG),
+	ARMv7_OP4(0x0e50, 0x0010, 0x0610, 0x0000, A1, LDR_REG),
+
+	ARMv7_OP2(0xf800, 0x7800, T1, LDRB_IMM),
+	ARMv7_OP4(0xfff0, 0x0000, 0xf890, 0x0000, T2, LDRB_IMM),
+	ARMv7_OP4(0xfff0, 0x0800, 0xf810, 0x0800, T3, LDRB_IMM),
+	ARMv7_OP4(0x0e50, 0x0000, 0x0450, 0x0000, A1, LDRB_IMM),
+	ARMv7_OP4(0xff7f, 0x0000, 0xf81f, 0x0000, T1, LDRB_LIT),
+	ARMv7_OP4(0x0f7f, 0x0000, 0x055f, 0x0000, A1, LDRB_LIT),
+	ARMv7_OP2(0xfe00, 0x5c00, T1, LDRB_REG),
+	ARMv7_OP4(0xfff0, 0x0fc0, 0xf810, 0x0000, T2, LDRB_REG),
+	ARMv7_OP4(0x0e50, 0x0010, 0x0650, 0x0000, A1, LDRB_REG),
+
+	ARMv7_OP4(0xfe50, 0x0000, 0xe850, 0x0000, T1, LDRD_IMM),
+	ARMv7_OP4(0x0e50, 0x00f0, 0x0040, 0x00d0, A1, LDRD_IMM),
+	ARMv7_OP4(0xfe7f, 0x0000, 0xe85f, 0x0000, T1, LDRD_LIT),
+	ARMv7_OP4(0x0f7f, 0x00f0, 0x014f, 0x00d0, A1, LDRD_LIT),
+	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00d0, A1, LDRD_REG),
+
+	ARMv7_OP4(0xfff0, 0x0000, 0xf990, 0x0000, T1, LDRSB_IMM),
+	ARMv7_OP4(0xfff0, 0x0800, 0xf910, 0x0800, T2, LDRSB_IMM),
+	ARMv7_OP4(0x0e50, 0x00f0, 0x0050, 0x00d0, A1, LDRSB_IMM),
+	ARMv7_OP4(0xff7f, 0x0000, 0xf91f, 0x0000, T1, LDRSB_LIT),
+	ARMv7_OP4(0x0f7f, 0x00f0, 0x015f, 0x00d0, A1, LDRSB_LIT),
+	ARMv7_OP2(0xfe00, 0x5600, T1, LDRSB_REG),
+	ARMv7_OP4(0xfff0, 0x0fc0, 0xf910, 0x0000, T2, LDRSB_REG),
+	ARMv7_OP4(0x0e50, 0x0ff0, 0x0010, 0x00d0, A1, LDRSB_REG),
+
+	ARMv7_OP4(0xfff0, 0x0000, 0xf9b0, 0x0000, T1, LDRSH_IMM),
+	ARMv7_OP4(0xfff0, 0x0800, 0xf930, 0x0800, T2, LDRSH_IMM),
+	ARMv7_OP4(0x0e50, 0x00f0, 0x0050, 0x00f0, A1, LDRSH_IMM),
+	ARMv7_OP4(0xff7f, 0x0000, 0xf93f, 0x0000, T1, LDRSH_LIT),
+	ARMv7_OP4(0x0f7f, 0x00f0, 0x015f, 0x00f0, A1, LDRSH_LIT),
+	ARMv7_OP2(0xfe00, 0x5e00, T1, LDRSH_REG),
+	ARMv7_OP4(0xfff0, 0x0fc0, 0xf930, 0x0000, T2, LDRSH_REG),
+	ARMv7_OP4(0x0e50, 0x0ff0, 0x0010, 0x00f0, A1, LDRSH_REG),
+
+	ARMv7_OP2(0xf800, 0x0000, T1, LSL_IMM),
+	ARMv7_OP4(0xffef, 0x8030, 0xea4f, 0x0000, T2, LSL_IMM),
+	ARMv7_OP4(0x0fef, 0x0070, 0x01a0, 0x0000, A1, LSL_IMM),
+	ARMv7_OP2(0xffc0, 0x4080, T1, LSL_REG),
+	ARMv7_OP4(0xffe0, 0xf0f0, 0xfa00, 0xf000, T2, LSL_REG),
+	ARMv7_OP4(0x0fef, 0x00f0, 0x01a0, 0x0010, A1, LSL_REG),
+
+	ARMv7_OP2(0xf800, 0x0800, T1, LSR_IMM),
+	ARMv7_OP4(0xffef, 0x8030, 0xea4f, 0x0010, T2, LSR_IMM),
+	ARMv7_OP4(0x0fef, 0x0030, 0x01a0, 0x0020, A1, LSR_IMM),
+	ARMv7_OP2(0xffc0, 0x40c0, T1, LSR_REG),
+	ARMv7_OP4(0xffe0, 0xf0f0, 0xfa20, 0xf000, T2, LSR_REG),
+	ARMv7_OP4(0x0fef, 0x00f0, 0x01a0, 0x0030, A1, LSR_REG),
+
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfb00, 0x0000, T1, MLA),
+	ARMv7_OP4(0x0fe0, 0x00f0, 0x0020, 0x0090, A1, MLA),
+
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfb00, 0x0010, T1, MLS),
+	ARMv7_OP4(0x0ff0, 0x00f0, 0x0060, 0x0090, A1, MLS),
+
+	ARMv7_OP2(0xf800, 0x2000, T1, MOV_IMM),
+	ARMv7_OP4(0xfbef, 0x8000, 0xf04f, 0x0000, T2, MOV_IMM),
+	ARMv7_OP4(0xfbf0, 0x8000, 0xf240, 0x0000, T3, MOV_IMM),
+	ARMv7_OP4(0x0fef, 0x0000, 0x03a0, 0x0000, A1, MOV_IMM),
+	ARMv7_OP4(0x0ff0, 0x0000, 0x0300, 0x0000, A2, MOV_IMM),
+	ARMv7_OP2(0xff00, 0x4600, T1, MOV_REG),
+	ARMv7_OP2(0xffc0, 0x0000, T2, MOV_REG),
+	ARMv7_OP4(0xffef, 0xf0f0, 0xea4f, 0x0000, T3, MOV_REG),
+	ARMv7_OP4(0x0fef, 0x0ff0, 0x01a0, 0x0000, A1, MOV_REG),
+	ARMv7_OP4(0xfbf0, 0x8000, 0xf2c0, 0x0000, T1, MOVT),
+	ARMv7_OP4(0x0ff0, 0x0000, 0x0340, 0x0000, A1, MOVT),
+
+	ARMv7_OP4(0xffff, 0xf0ff, 0xf3ef, 0x8000, T1, MRS),
+	ARMv7_OP4(0x0fff, 0x0fff, 0x010f, 0x0000, A1, MRS),
+	ARMv7_OP4(0x0ff3, 0xf000, 0x0320, 0xf000, A1, MSR_IMM),
+	ARMv7_OP4(0xfff0, 0xf3ff, 0xf380, 0x8000, T1, MSR_REG),
+	ARMv7_OP4(0x0ff3, 0xfff0, 0x0120, 0xf000, A1, MSR_REG),
+
+	ARMv7_OP2(0xffc0, 0x4340, T1, MUL),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfb00, 0xf000, T2, MUL),
+	ARMv7_OP4(0x0fe0, 0xf0f0, 0x0000, 0x0090, A1, MUL),
+
+	ARMv7_OP4(0xfbef, 0x8000, 0xf06f, 0x0000, T1, MVN_IMM),
+	ARMv7_OP4(0x0fef, 0x0000, 0x03e0, 0x0000, A1, MVN_IMM),
+	ARMv7_OP2(0xffc0, 0x43c0, T1, MVN_REG),
+	ARMv7_OP4(0xffef, 0x8000, 0xea6f, 0x0000, T2, MVN_REG),
+	ARMv7_OP4(0xffef, 0x0010, 0x01e0, 0x0000, A1, MVN_REG),
+	ARMv7_OP4(0x0fef, 0x0090, 0x01e0, 0x0010, A1, MVN_RSR),
+
+	ARMv7_OP2(0xffff, 0xbf00, T1, NOP),
+	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8000, T2, NOP),
+	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf000, A1, NOP),
+
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf060, 0x0000, T1, ORN_IMM),
+	ARMv7_OP4(0xffe0, 0x8000, 0xea60, 0x0000, T1, ORN_REG),
+
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf040, 0x0000, T1, ORR_IMM),
+	ARMv7_OP4(0x0fe0, 0x0000, 0x0380, 0x0000, A1, ORR_IMM),
+	ARMv7_OP2(0xffc0, 0x4300, T1, ORR_REG),
+	ARMv7_OP4(0xffe0, 0x8000, 0xea40, 0x0000, T2, ORR_REG),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x0180, 0x0000, A1, ORR_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x0180, 0x0010, A1, ORR_RSR),
+
+	ARMv7_OP4(0xfff0, 0x8010, 0xeac0, 0x0000, T1, PKH),
+	ARMv7_OP4(0x0ff0, 0x0030, 0x0680, 0x0010, A1, PKH),
+
+	ARMv7_OP2(0xfe00, 0xbc00, T1, POP),
+	ARMv7_OP4(0xffff, 0x0000, 0xe8bd, 0x0000, T2, POP),
+	ARMv7_OP4(0xffff, 0x0fff, 0xf85d, 0x0b04, T3, POP),
+	ARMv7_OP4(0x0fff, 0x0000, 0x08bd, 0x0000, A1, POP),
+	ARMv7_OP4(0x0fff, 0x0fff, 0x049d, 0x0004, A2, POP),
+
+	ARMv7_OP2(0xfe00, 0xb400, T1, PUSH),
+	ARMv7_OP4(0xffff, 0x0000, 0xe92d, 0x0000, T2, PUSH), // had an error in arch ref
+	ARMv7_OP4(0xffff, 0x0fff, 0xf84d, 0x0d04, T3, PUSH),
+	ARMv7_OP4(0x0fff, 0x0000, 0x092d, 0x0000, A1, PUSH),
+	ARMv7_OP4(0x0fff, 0x0fff, 0x052d, 0x0004, A2, PUSH),
+
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf080, T1, QADD),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0100, 0x0050, A1, QADD),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf010, T1, QADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f10, A1, QADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf010, T1, QADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f90, A1, QADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf010, T1, QASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f30, A1, QASX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf090, T1, QDADD),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0140, 0x0050, A1, QDADD),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf0b0, T1, QDSUB),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0160, 0x0050, A1, QDSUB),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf010, T1, QSAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f50, A1, QSAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf0a0, T1, QSUB),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0120, 0x0050, A1, QSUB),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf010, T1, QSUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f70, A1, QSUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf010, T1, QSUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0ff0, A1, QSUB8),
+
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf0a0, T1, RBIT),
+	ARMv7_OP4(0x0fff, 0x0ff0, 0x06ff, 0x0f30, A1, RBIT),
+
+	ARMv7_OP2(0xffc0, 0xba00, T1, REV),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf080, T2, REV),
+	ARMv7_OP4(0x0fff, 0x0ff0, 0x06bf, 0x0f30, A1, REV),
+	ARMv7_OP2(0xffc0, 0xba40, T1, REV16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf090, T2, REV16),
+	ARMv7_OP4(0x0fff, 0x0ff0, 0x06bf, 0x0fb0, A1, REV16),
+	ARMv7_OP2(0xffc0, 0xbac0, T1, REVSH),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf0b0, T2, REVSH),
+	ARMv7_OP4(0x0fff, 0x0ff0, 0x06ff, 0x0fb0, A1, REVSH),
+
+	ARMv7_OP4(0xffef, 0x8030, 0xea4f, 0x0030, T1, ROR_IMM),
+	ARMv7_OP4(0x0fef, 0x0070, 0x01a0, 0x0060, A1, ROR_IMM),
+	ARMv7_OP2(0xffc0, 0x41c0, T1, ROR_REG),
+	ARMv7_OP4(0xffe0, 0xf0f0, 0xfa60, 0xf000, T2, ROR_REG),
+	ARMv7_OP4(0x0fef, 0x00f0, 0x01a0, 0x0070, A1, ROR_REG),
+	ARMv7_OP4(0xffef, 0xf0f0, 0xea4f, 0x0030, T1, RRX),
+	ARMv7_OP4(0x0fef, 0x0ff0, 0x01a0, 0x0060, A1, RRX),
+
+	ARMv7_OP2(0xffc0, 0x4240, T1, RSB_IMM),
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf1c0, 0x0000, T2, RSB_IMM),
+	ARMv7_OP4(0x0fe0, 0x0000, 0x0260, 0x0000, A1, RSB_IMM),
+	ARMv7_OP4(0xffe0, 0x8000, 0xebc0, 0x0000, T1, RSB_REG),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x0060, 0x0000, A1, RSB_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x0060, 0x0010, A1, RSB_RSR),
+
+	ARMv7_OP4(0x0fe0, 0x0000, 0x02e0, 0x0000, A1, RSC_IMM),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x00e0, 0x0000, A1, RSC_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x00e0, 0x0010, A1, RSC_RSR),
+
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf000, T1, SADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f10, A1, SADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf000, T1, SADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f90, A1, SADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf000, T1, SASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f30, A1, SASX),
+
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf160, 0x0000, T1, SBC_IMM),
+	ARMv7_OP4(0x0fe0, 0x0000, 0x02c0, 0x0000, A1, SBC_IMM),
+	ARMv7_OP2(0xffc0, 0x4180, T1, SBC_REG),
+	ARMv7_OP4(0xffe0, 0x8000, 0xeb60, 0x0000, T2, SBC_REG),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x00c0, 0x0000, A1, SBC_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x00c0, 0x0010, A1, SBC_RSR),
+
+	ARMv7_OP4(0xfff0, 0x8020, 0xf340, 0x0000, T1, SBFX),
+	ARMv7_OP4(0x0fe0, 0x0070, 0x07a0, 0x0050, A1, SBFX),
+
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfb90, 0xf0f0, T1, SDIV), // ???
+
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf080, T1, SEL),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0680, 0x0fb0, A1, SEL),
+
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf020, T1, SHADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f10, A1, SHADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf020, T1, SHADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f90, A1, SHADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf020, T1, SHASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f30, A1, SHASX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf020, T1, SHSAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f50, A1, SHSAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf020, T1, SHSUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f70, A1, SHSUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf020, T1, SHSUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0ff0, A1, SHSUB8),
+
+	ARMv7_OP4(0xfff0, 0x00c0, 0xfb10, 0x0000, T1, SMLA__),
+	ARMv7_OP4(0x0ff0, 0x0090, 0x0100, 0x0080, A1, SMLA__),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfb20, 0x0000, T1, SMLAD),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0700, 0x0010, A1, SMLAD),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfbc0, 0x0000, T1, SMLAL),
+	ARMv7_OP4(0x0fe0, 0x00f0, 0x00e0, 0x0090, A1, SMLAL),//???
+	ARMv7_OP4(0xfff0, 0x00c0, 0xfbc0, 0x0080, T1, SMLAL__),
+	ARMv7_OP4(0x0ff0, 0x0090, 0x0140, 0x0080, A1, SMLAL__),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfbc0, 0x00c0, T1, SMLALD),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0740, 0x0010, A1, SMLALD),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfb30, 0x0000, T1, SMLAW_),
+	ARMv7_OP4(0x0ff0, 0x00b0, 0x0120, 0x0080, A1, SMLAW_),
+
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfb40, 0x0000, T1, SMLSD),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0700, 0x0050, A1, SMLSD),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfbd0, 0x00c0, T1, SMLSLD),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0740, 0x0050, A1, SMLSLD),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfb50, 0x0000, T1, SMMLA),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0750, 0x0010, A1, SMMLA),
+	ARMv7_OP4(0xfff0, 0x00e0, 0xfb60, 0x0000, T1, SMMLS),
+	ARMv7_OP4(0x0ff0, 0x00d0, 0x0750, 0x00d0, A1, SMMLS),
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb50, 0xf000, T1, SMMUL),
+	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0750, 0xf010, A1, SMMUL),
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb20, 0xf000, T1, SMUAD),
+	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0700, 0xf010, A1, SMUAD),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfb10, 0xf000, T1, SMUL__),
+	ARMv7_OP4(0x0ff0, 0xf090, 0x0160, 0x0080, A1, SMUL__),//???
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfb80, 0x0000, T1, SMULL),
+	ARMv7_OP4(0x0fe0, 0x00f0, 0x00c0, 0x0090, A1, SMULL),
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb30, 0xf000, T1, SMULW_),
+	ARMv7_OP4(0x0ff0, 0xf0b0, 0x0120, 0x00a0, A1, SMULW_),//???
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb40, 0xf000, T1, SMUSD),
+	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0700, 0xf050, A1, SMUSD),
+	ARMv7_OP4(0xffd0, 0x8020, 0xf300, 0x0000, T1, SSAT),
+	ARMv7_OP4(0x0fe0, 0x0030, 0x06a0, 0x0010, A1, SSAT),
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xf320, 0x0000, T1, SSAT16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x06a0, 0x0f30, A1, SSAT16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf000, T1, SSAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f50, A1, SSAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf000, T1, SSUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f70, A1, SSUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf000, T1, SSUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0ff0, A1, SSUB8),
+
+	ARMv7_OP4(0xfff0, 0x0000, 0xe840, 0x0000, T1, STREX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0180, 0x0f90, A1, STREX),
+	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f40, T1, STREXB),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01c0, 0x0f90, A1, STREXB),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xe8c0, 0x0070, T1, STREXD),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01a0, 0x0f90, A1, STREXD),
+	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f50, T1, STREXH),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01e0, 0x0f90, A1, STREXH),
+
+	ARMv7_OP2(0xf800, 0xc000, T1, STM),
+	ARMv7_OP4(0xffd0, 0xa000, 0xe880, 0x0000, T2, STM),
+	ARMv7_OP4(0x0fd0, 0x0000, 0x0880, 0x0000, A1, STM),
+	ARMv7_OP4(0x0fd0, 0x0000, 0x0800, 0x0000, A1, STMDA),
+	ARMv7_OP4(0xffd0, 0xa000, 0xe900, 0x0000, T1, STMDB),
+	ARMv7_OP4(0x0fd0, 0x0000, 0x0900, 0x0000, A1, STMDB),
+	ARMv7_OP4(0x0fd0, 0x0000, 0x0980, 0x0000, A1, STMIB),
+
+	ARMv7_OP2(0xf800, 0x6000, T1, STR_IMM),
+	ARMv7_OP2(0xf800, 0x9000, T2, STR_IMM),
+	ARMv7_OP4(0xfff0, 0x0000, 0xf8c0, 0x0000, T3, STR_IMM),
+	ARMv7_OP4(0xfff0, 0x0800, 0xf840, 0x0800, T4, STR_IMM),
+	ARMv7_OP4(0x0e50, 0x0000, 0x0400, 0x0000, A1, STR_IMM),
+	ARMv7_OP2(0xfe00, 0x5000, T1, STR_REG),
+	ARMv7_OP4(0xfff0, 0x0fc0, 0xf840, 0x0000, T2, STR_REG),
+	ARMv7_OP4(0x0e50, 0x0010, 0x0600, 0x0000, A1, STR_REG),
+
+	ARMv7_OP2(0xf800, 0x7000, T1, STRB_IMM),
+	ARMv7_OP4(0xfff0, 0x0000, 0xf880, 0x0000, T2, STRB_IMM),
+	ARMv7_OP4(0xfff0, 0x0800, 0xf800, 0x0800, T3, STRB_IMM),
+	ARMv7_OP4(0x0e50, 0x0000, 0x0440, 0x0000, A1, STRB_IMM),
+	ARMv7_OP2(0xfe00, 0x5400, T1, STRB_REG),
+	ARMv7_OP4(0xfff0, 0x0fc0, 0xf800, 0x0000, T2, STRB_REG),
+	ARMv7_OP4(0x0e50, 0x0010, 0x0640, 0x0000, A1, STRB_REG),
+
+	ARMv7_OP4(0xfe50, 0x0000, 0xe840, 0x0000, T1, STRD_IMM),
+	ARMv7_OP4(0x0e50, 0x00f0, 0x0040, 0x00f0, A1, STRD_IMM),
+	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00f0, A1, STRD_REG),
+
+	ARMv7_OP2(0xf800, 0x8000, T1, STRH_IMM),
+	ARMv7_OP4(0xfff0, 0x0000, 0xf8a0, 0x0000, T2, STRH_IMM),
+	ARMv7_OP4(0xfff0, 0x0800, 0xf820, 0x0800, T3, STRH_IMM),
+	ARMv7_OP4(0x0e50, 0x00f0, 0x0040, 0x00b0, A1, STRH_IMM),
+	ARMv7_OP2(0xfe00, 0x5200, T1, STRH_REG),
+	ARMv7_OP4(0xfff0, 0x0fc0, 0xf820, 0x0000, T2, STRH_REG),
+	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00b0, A1, STRH_REG),
+
+	ARMv7_OP2(0xff80, 0xb080, T1, SUB_SPI),
+	ARMv7_OP4(0xfbef, 0x8000, 0xf1ad, 0x0000, T2, SUB_SPI),
+	ARMv7_OP4(0xfbff, 0x8000, 0xf2ad, 0x0000, T3, SUB_SPI),
+	ARMv7_OP4(0x0fef, 0x0000, 0x024d, 0x0000, A1, SUB_SPI),
+	ARMv7_OP4(0xffef, 0x8000, 0xebad, 0x0000, T1, SUB_SPR),
+	ARMv7_OP4(0x0fef, 0x0010, 0x004d, 0x0000, A1, SUB_SPR),
+	ARMv7_OP2(0xfe00, 0x1e00, T1, SUB_IMM),
+	ARMv7_OP2(0xf800, 0x3800, T2, SUB_IMM),
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf1a0, 0x0000, T3, SUB_IMM),
+	ARMv7_OP4(0xfbf0, 0x8000, 0xf2a0, 0x0000, T4, SUB_IMM),
+	ARMv7_OP4(0x0fe0, 0x0000, 0x0240, 0x0000, A1, SUB_IMM),
+	ARMv7_OP2(0xfe00, 0x1a00, T1, SUB_REG),
+	ARMv7_OP4(0xffe0, 0x8000, 0xeba0, 0x0000, T2, SUB_REG),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x0040, 0x0000, A1, SUB_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x0040, 0x0010, A1, SUB_RSR),
+
+	ARMv7_OP2(0xff00, 0xdf00, T1, SVC),
+	ARMv7_OP4(0x0f00, 0x0000, 0x0f00, 0x0000, A1, SVC),
+
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa40, 0xf080, T1, SXTAB),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x06a0, 0x0070, A1, SXTAB),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa20, 0xf080, T1, SXTAB16),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x0680, 0x0070, A1, SXTAB16),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa00, 0xf080, T1, SXTAH),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x06b0, 0x0070, A1, SXTAH),
+
+	ARMv7_OP2(0xffc0, 0xb240, T1, SXTB),
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa4f, 0xf080, T2, SXTB),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x06af, 0x0070, A1, SXTB),
+
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa2f, 0xf080, T1, SXTB16),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x068f, 0x0070, A1, SXTB16),
+
+	ARMv7_OP2(0xffc0, 0xb200, T1, SXTH),
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa0f, 0xf080, T2, SXTH),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x06bf, 0x0070, A1, SXTH),
+
+	ARMv7_OP4(0xfff0, 0xffe0, 0xe8d0, 0xf000, T1, TB_),
+
+	ARMv7_OP4(0xfbf0, 0x8f00, 0xf090, 0x0f00, T1, TEQ_IMM),
+	ARMv7_OP4(0x0ff0, 0xf000, 0x0330, 0x0000, A1, TEQ_IMM),
+	ARMv7_OP4(0xfff0, 0x8f00, 0xea90, 0x0f00, T1, TEQ_REG),
+	ARMv7_OP4(0x0ff0, 0xf010, 0x0130, 0x0000, A1, TEQ_REG),
+	ARMv7_OP4(0x0ff0, 0xf090, 0x0130, 0x0010, A1, TEQ_RSR),
+
+	ARMv7_OP4(0xfbf0, 0x8f00, 0xf010, 0x0f00, T1, TST_IMM),
+	ARMv7_OP4(0x0ff0, 0xf000, 0x0310, 0x0000, A1, TST_IMM),
+	ARMv7_OP2(0xffc0, 0x4200, T1, TST_REG),
+	ARMv7_OP4(0xfff0, 0x8f00, 0xea10, 0x0f00, T2, TST_REG),
+	ARMv7_OP4(0x0ff0, 0xf010, 0x0110, 0x0000, A1, TST_REG),
+	ARMv7_OP4(0x0ff0, 0xf090, 0x0110, 0x0010, A1, TST_RSR),
+
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf040, T1, UADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f10, A1, UADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf040, T1, UADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f90, A1, UADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf040, T1, UASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f30, A1, UASX),
+	ARMv7_OP4(0xfff0, 0x8020, 0xf3c0, 0x0000, T1, UBFX),
+	ARMv7_OP4(0x0fe0, 0x0070, 0x07e0, 0x0050, A1, UBFX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfbb0, 0xf0f0, T1, UDIV),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf060, T1, UHADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f10, A1, UHADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf060, T1, UHADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f90, A1, UHADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf060, T1, UHASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f30, A1, UHASX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf060, T1, UHSAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f50, A1, UHSAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf060, T1, UHSUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f70, A1, UHSUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf060, T1, UHSUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0ff0, A1, UHSUB8),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfbe0, 0x0060, T1, UMAAL),
+	ARMv7_OP4(0x0ff0, 0x00f0, 0x0040, 0x0090, A1, UMAAL),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfbe0, 0x0000, T1, UMLAL),
+	ARMv7_OP4(0x0fe0, 0x00f0, 0x00a0, 0x0090, A1, UMLAL),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfba0, 0x0000, T1, UMULL),
+	ARMv7_OP4(0x0fe0, 0x00f0, 0x0080, 0x0090, A1, UMULL),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf050, T1, UQADD16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f10, A1, UQADD16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf050, T1, UQADD8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f90, A1, UQADD8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf050, T1, UQASX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f30, A1, UQASX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf050, T1, UQSAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f50, A1, UQSAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf050, T1, UQSUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f70, A1, UQSUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf050, T1, UQSUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0ff0, A1, UQSUB8),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfb70, 0xf000, T1, USAD8),
+	ARMv7_OP4(0x0ff0, 0xf0f0, 0x0780, 0xf010, A1, USAD8),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfb70, 0x0000, T1, USADA8),
+	ARMv7_OP4(0x0ff0, 0x00f0, 0x0780, 0x0010, A1, USADA8),
+	ARMv7_OP4(0xffd0, 0x8020, 0xf380, 0x0000, T1, USAT),
+	ARMv7_OP4(0x0fe0, 0x0030, 0x06e0, 0x0010, A1, USAT),
+	ARMv7_OP4(0xfff0, 0xf0e0, 0xf3a0, 0x0000, T1, USAT16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x06e0, 0x0f30, A1, USAT16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf040, T1, USAX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f50, A1, USAX),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf040, T1, USUB16),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f70, A1, USUB16),
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf040, T1, USUB8),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0ff0, A1, USUB8),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa50, 0xf080, T1, UXTAB),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x06e0, 0x0070, A1, UXTAB),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa30, 0xf080, T1, UXTAB16),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x06c0, 0x0070, A1, UXTAB16),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa10, 0xf080, T1, UXTAH),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x06f0, 0x0070, A1, UXTAH),
+
+	ARMv7_OP2(0xffc0, 0xb2c0, T1, UXTB),
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa5f, 0xf080, T2, UXTB),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x06ef, 0x0070, A1, UXTB),
+
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa3f, 0xf080, T1, UXTB16),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x06cf, 0x0070, A1, UXTB16),
+
+	ARMv7_OP2(0xffc0, 0xb280, T1, UXTH),
+	ARMv7_OP4(0xffff, 0xf0c0, 0xfa1f, 0xf080, T2, UXTH),
+	ARMv7_OP4(0x0fff, 0x03f0, 0x06ff, 0x0070, A1, UXTH),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef00, 0x0710, T1, VABA_),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0710, A1, VABA_),
+	ARMv7_OP4(0xef80, 0x0f50, 0xef80, 0x0500, T2, VABA_),
+	ARMv7_OP4(0xfe80, 0x0f50, 0xf280, 0x0500, A2, VABA_),
+
+	// TODO: vector instructions
+
+	ARMv7_OP2(0xffff, 0xbf20, T1, WFE),
+	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8002, T2, WFE),
+	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf002, A1, WFE),
+	ARMv7_OP2(0xffff, 0xbf30, T1, WFI),
+	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8003, T2, WFI),
+	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf003, A1, WFI),
+	ARMv7_OP2(0xffff, 0xbf10, T1, YIELD),
+	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8001, T2, YIELD),
+	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf001, A1, YIELD),
+};
+
+u8 ARMv7Decoder::DecodeMemory(const u32 address)
+{
+	ARMv7Code code;
+	code.code0 = vm::psv::read16(address & ~1);
+	code.code1 = vm::psv::read16(address + 2 & ~1);
+	u32 arg = address & 0x1 ? code.data : (u32)code.code0 << 16 | code.code1;
+
+	//LOG_NOTICE(GENERAL, "code0 = 0x%04x, code1 = 0x%04x, data = 0x%08x, arg = 0x%08x", code.code0, code.code1, code.data, arg);
+
+	// old decoding algorithm
+
+	for (auto& opcode : ARMv7_opcode_table)
+	{
+		if ((opcode.type < A1) == ((address & 0x1) == 0) && (arg & opcode.mask) == opcode.code)
+		{
+			code.data = opcode.length == 2 ? code.code0 : arg;
+			(*opcode.func)(m_thr.context, code, opcode.type);
+			//LOG_NOTICE(ARMv7, "%s, %s", opcode.name, m_thr.RegsToString());
+			return opcode.length;
+		}
+	}
+
+	ARMv7_instrs::UNK(m_thr.context, code);
+	return address & 0x1 ? 4 : 2;
+
+
+	//execute_main_group(&m_thr);
+	//// LOG_NOTICE(GENERAL, "%s, %d \n\n", m_thr.m_last_instr_name, m_thr.m_last_instr_size);
+	//m_thr.m_last_instr_name = "Unknown";
+	//return m_thr.m_last_instr_size;
+}
diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.h b/rpcs3/Emu/ARMv7/ARMv7Decoder.h
index 14a2fc5c83..341ed6a276 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.h
@@ -1,10 +1,7 @@
 #pragma once
-
 #include "Emu/CPU/CPUDecoder.h"
-#include "ARMv7Thread.h"
-#include "ARMv7Interpreter.h"
-#include "ARMv7Opcodes.h"
-#include "Utilities/Log.h"
+
+class ARMv7Thread;
 
 class ARMv7Decoder : public CPUDecoder
 {
@@ -15,35 +12,5 @@ public:
 	{
 	}
 
-	virtual u8 DecodeMemory(const u32 address)
-	{
-		ARMv7Code code;
-		code.code0 = vm::psv::read16(address & ~1);
-		code.code1 = vm::psv::read16(address + 2 & ~1);
-		u32 arg = address & 0x1 ? code.data : (u32)code.code0 << 16 | code.code1;
-
-		//LOG_NOTICE(GENERAL, "code0 = 0x%04x, code1 = 0x%04x, data = 0x%08x, arg = 0x%08x", code.code0, code.code1, code.data, arg);
-
-		// old decoding algorithm
-		
-		for (auto& opcode : ARMv7_opcode_table)
-		{
-			if ((opcode.type < A1) == ((address & 0x1) == 0) && (arg & opcode.mask) == opcode.code)
-			{
-				code.data = opcode.length == 2 ? code.code0 : arg;
-				(*opcode.func)(m_thr.context, code, opcode.type);
-				//LOG_NOTICE(ARMv7, "%s, %s", opcode.name, m_thr.RegsToString());
-				return opcode.length;
-			}
-		}
-
-		ARMv7_instrs::UNK(m_thr.context, code);
-		return address & 0x1 ? 4 : 2;
-		
-
-		//execute_main_group(&m_thr);
-		//// LOG_NOTICE(GENERAL, "%s, %d \n\n", m_thr.m_last_instr_name, m_thr.m_last_instr_size);
-		//m_thr.m_last_instr_name = "Unknown";
-		//return m_thr.m_last_instr_size;
-	}
-};
\ No newline at end of file
+	virtual u8 DecodeMemory(const u32 address);
+};
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
index 2426066bc9..b73b46b2f9 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
@@ -516,600 +516,3 @@ namespace ARMv7_instrs
 	void WFI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void YIELD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 };
-
-
-// old instructions table for debugging and information, delete this later
-using namespace ARMv7_instrs;
-
-struct ARMv7_opcode_t
-{
-	u32 mask;
-	u32 code;
-	u32 length; // 2 or 4
-	const char* name;
-	ARMv7_encoding type;
-	void(*func)(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-};
-
-// single 16-bit value
-#define ARMv7_OP2(mask, code, type, name) { (u32)((mask) << 16), (u32)((code) << 16), 2, #name "_" #type, type, name }
-// two 16-bit values
-#define ARMv7_OP4(mask0, mask1, code0, code1, type, name) { (u32)((mask0) << 16) | (mask1), (u32)((code0) << 16) | (code1), 4, #name "_" #type, type, name }
-
-static const ARMv7_opcode_t ARMv7_opcode_table[] =
-{
-	ARMv7_OP2(0xffff, 0x0000, T1, NULL_OP), // ???
-
-	ARMv7_OP4(0xffff, 0x0000, 0xf870, 0x0000, T1, HACK), // "Undefined" Thumb opcode
-	ARMv7_OP4(0x0ff0, 0x00f0, 0x0070, 0x0090, A1, HACK), // "Undefined" ARM opcode
-
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf140, 0x0000, T1, ADC_IMM),
-	ARMv7_OP4(0x0fe0, 0x0000, 0x02a0, 0x0000, A1, ADC_IMM),
-	ARMv7_OP2(0xffc0, 0x4040, T1, ADC_REG),
-	ARMv7_OP4(0xffe0, 0x8000, 0xeb40, 0x0000, T2, ADC_REG),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x00a0, 0x0000, A1, ADC_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x00a0, 0x0010, A1, ADC_RSR),
-
-	ARMv7_OP2(0xf800, 0xa800, T1, ADD_SPI),
-	ARMv7_OP2(0xff80, 0xb000, T2, ADD_SPI),
-	ARMv7_OP4(0xfbef, 0x8000, 0xf10d, 0x0000, T3, ADD_SPI),
-	ARMv7_OP4(0xfbff, 0x8000, 0xf20d, 0x0000, T4, ADD_SPI),
-	ARMv7_OP4(0x0fef, 0x0000, 0x028d, 0x0000, A1, ADD_SPI),
-	ARMv7_OP2(0xff78, 0x4468, T1, ADD_SPR),
-	ARMv7_OP2(0xff87, 0x4485, T2, ADD_SPR),
-	ARMv7_OP4(0xffef, 0x8000, 0xeb0d, 0x0000, T3, ADD_SPR),
-	ARMv7_OP4(0x0fef, 0x0010, 0x008d, 0x0000, A1, ADD_SPR),
-	ARMv7_OP2(0xfe00, 0x1c00, T1, ADD_IMM),
-	ARMv7_OP2(0xf800, 0x3000, T2, ADD_IMM),
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf100, 0x0000, T3, ADD_IMM),
-	ARMv7_OP4(0xfbf0, 0x8000, 0xf200, 0x0000, T4, ADD_IMM),
-	ARMv7_OP4(0x0fe0, 0x0000, 0x0280, 0x0000, A1, ADD_IMM),
-	ARMv7_OP2(0xfe00, 0x1800, T1, ADD_REG),
-	ARMv7_OP2(0xff00, 0x4400, T2, ADD_REG),
-	ARMv7_OP4(0xffe0, 0x8000, 0xeb00, 0x0000, T3, ADD_REG),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x0080, 0x0000, A1, ADD_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x0080, 0x0010, A1, ADD_RSR),
-
-	ARMv7_OP2(0xf800, 0xa000, T1, ADR),
-	ARMv7_OP4(0xfbff, 0x8000, 0xf2af, 0x0000, T2, ADR),
-	ARMv7_OP4(0xfbff, 0x8000, 0xf20f, 0x0000, T3, ADR),
-	ARMv7_OP4(0x0fff, 0x0000, 0x028f, 0x0000, A1, ADR),
-	ARMv7_OP4(0x0fff, 0x0000, 0x024f, 0x0000, A2, ADR),
-
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf000, 0x0000, T1, AND_IMM),
-	ARMv7_OP4(0x0fe0, 0x0000, 0x0200, 0x0000, A1, AND_IMM),
-	ARMv7_OP2(0xffc0, 0x4000, T1, AND_REG),
-	ARMv7_OP4(0xffe0, 0x8000, 0xea00, 0x0000, T2, AND_REG),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x0000, 0x0000, A1, AND_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x0000, 0x0010, A1, AND_RSR),
-
-	ARMv7_OP2(0xf800, 0x1000, T1, ASR_IMM),
-	ARMv7_OP4(0xffef, 0x8030, 0xea4f, 0x0020, T2, ASR_IMM),
-	ARMv7_OP4(0x0fef, 0x0070, 0x01a0, 0x0040, A1, ASR_IMM),
-	ARMv7_OP2(0xffc0, 0x4100, T1, ASR_REG),
-	ARMv7_OP4(0xffe0, 0xf0f0, 0xfa40, 0xf000, T2, ASR_REG),
-	ARMv7_OP4(0x0fef, 0x00f0, 0x01a0, 0x0050, A1, ASR_REG),
-
-	ARMv7_OP2(0xf000, 0xd000, T1, B),
-	ARMv7_OP2(0xf800, 0xe000, T2, B),
-	ARMv7_OP4(0xf800, 0xd000, 0xf000, 0x8000, T3, B),
-	ARMv7_OP4(0xf800, 0xd000, 0xf000, 0x9000, T4, B),
-	ARMv7_OP4(0x0f00, 0x0000, 0x0a00, 0x0000, A1, B),
-
-	ARMv7_OP4(0xffff, 0x8020, 0xf36f, 0x0000, T1, BFC),
-	ARMv7_OP4(0x0fe0, 0x007f, 0x07c0, 0x001f, A1, BFC),
-	ARMv7_OP4(0xfff0, 0x8020, 0xf360, 0x0000, T1, BFI),
-	ARMv7_OP4(0x0fe0, 0x0070, 0x07c0, 0x0010, A1, BFI),
-
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf020, 0x0000, T1, BIC_IMM),
-	ARMv7_OP4(0x0fe0, 0x0000, 0x03c0, 0x0000, A1, BIC_IMM),
-	ARMv7_OP2(0xffc0, 0x4380, T1, BIC_REG),
-	ARMv7_OP4(0xffe0, 0x8000, 0xea20, 0x0000, T2, BIC_REG),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x01c0, 0x0000, A1, BIC_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x01c0, 0x0010, A1, BIC_RSR),
-
-	ARMv7_OP2(0xff00, 0xbe00, T1, BKPT),
-	ARMv7_OP4(0x0ff0, 0x00f0, 0x0120, 0x0070, A1, BKPT),
-
-	ARMv7_OP4(0xf800, 0xd000, 0xf000, 0xd000, T1, BL),
-	ARMv7_OP4(0x0f00, 0x0000, 0x0b00, 0x0000, A1, BL),
-	ARMv7_OP2(0xff80, 0x4780, T1, BLX),
-	ARMv7_OP4(0xf800, 0xc001, 0xf000, 0xc000, T2, BLX),
-	ARMv7_OP4(0x0fff, 0xfff0, 0x012f, 0xff30, A1, BLX),
-	ARMv7_OP4(0xfe00, 0x0000, 0xfa00, 0x0000, A2, BLX),
-
-	ARMv7_OP2(0xff87, 0x4700, T1, BX),
-	ARMv7_OP4(0x0fff, 0xfff0, 0x012f, 0xff10, A1, BX),
-
-	ARMv7_OP2(0xf500, 0xb100, T1, CB_Z),
-
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfab0, 0xf080, T1, CLZ),
-	ARMv7_OP4(0x0fff, 0x0ff0, 0x016f, 0x0f10, A1, CLZ),
-
-	ARMv7_OP4(0xfbf0, 0x8f00, 0xf110, 0x0f00, T1, CMN_IMM),
-	ARMv7_OP4(0x0ff0, 0xf000, 0x0370, 0x0000, A1, CMN_IMM),
-	ARMv7_OP2(0xffc0, 0x42c0, T1, CMN_REG),
-	ARMv7_OP4(0xfff0, 0x8f00, 0xeb10, 0x0f00, T2, CMN_REG),
-	ARMv7_OP4(0x0ff0, 0xf010, 0x0170, 0x0000, A1, CMN_REG),
-	ARMv7_OP4(0x0ff0, 0xf090, 0x0170, 0x0010, A1, CMN_RSR),
-
-	ARMv7_OP2(0xf800, 0x2800, T1, CMP_IMM),
-	ARMv7_OP4(0xfbf0, 0x8f00, 0xf1b0, 0x0f00, T2, CMP_IMM),
-	ARMv7_OP4(0x0ff0, 0xf000, 0x0350, 0x0000, A1, CMP_IMM),
-	ARMv7_OP2(0xffc0, 0x4280, T1, CMP_REG),
-	ARMv7_OP2(0xff00, 0x4500, T2, CMP_REG),
-	ARMv7_OP4(0xfff0, 0x8f00, 0xebb0, 0x0f00, T3, CMP_REG),
-	ARMv7_OP4(0x0ff0, 0xf010, 0x0150, 0x0000, A1, CMP_REG),
-	ARMv7_OP4(0x0ff0, 0xf090, 0x0150, 0x0010, A1, CMP_RSR),
-
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf080, 0x0000, T1, EOR_IMM),
-	ARMv7_OP4(0x0fe0, 0x0000, 0x0220, 0x0000, A1, EOR_IMM),
-	ARMv7_OP2(0xffc0, 0x4040, T1, EOR_REG),
-	ARMv7_OP4(0xffe0, 0x8000, 0xea80, 0x0000, T2, EOR_REG),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x0020, 0x0000, A1, EOR_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x0020, 0x0010, A1, EOR_RSR),
-
-	ARMv7_OP2(0xff00, 0xbf00, T1, IT),
-
-	ARMv7_OP4(0xfff0, 0x0f00, 0xe850, 0x0f00, T1, LDREX),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x0190, 0x0f9f, A1, LDREX),
-	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f4f, T1, LDREXB),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x01d0, 0x0f9f, A1, LDREXB),
-	ARMv7_OP4(0xfff0, 0x00ff, 0xe8d0, 0x007f, T1, LDREXD),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x01b0, 0x0f9f, A1, LDREXD),
-	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f5f, T1, LDREXH),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x01f0, 0x0f9f, A1, LDREXH),
-
-	ARMv7_OP2(0xf800, 0xc800, T1, LDM),
-	ARMv7_OP4(0xffd0, 0x2000, 0xe890, 0x0000, T2, LDM),
-	ARMv7_OP4(0x0fd0, 0x0000, 0x0890, 0x0000, A1, LDM),
-	ARMv7_OP4(0x0fd0, 0x0000, 0x0810, 0x0000, A1, LDMDA),
-	ARMv7_OP4(0xffd0, 0x2000, 0xe910, 0x0000, T1, LDMDB),
-	ARMv7_OP4(0x0fd0, 0x0000, 0x0910, 0x0000, A1, LDMDB),
-	ARMv7_OP4(0x0fd0, 0x0000, 0x0990, 0x0000, A1, LDMIB),
-
-	ARMv7_OP2(0xf800, 0x6800, T1, LDR_IMM),
-	ARMv7_OP2(0xf800, 0x9800, T2, LDR_IMM),
-	ARMv7_OP4(0xfff0, 0x0000, 0xf8d0, 0x0000, T3, LDR_IMM),
-	ARMv7_OP4(0xfff0, 0x0800, 0xf850, 0x0800, T4, LDR_IMM),
-	ARMv7_OP4(0x0e50, 0x0000, 0x0410, 0x0000, A1, LDR_IMM),
-	ARMv7_OP2(0xf800, 0x4800, T1, LDR_LIT),
-	ARMv7_OP4(0xff7f, 0x0000, 0xf85f, 0x0000, T2, LDR_LIT),
-	ARMv7_OP4(0x0f7f, 0x0000, 0x051f, 0x0000, A1, LDR_LIT),
-	ARMv7_OP2(0xfe00, 0x5800, T1, LDR_REG),
-	ARMv7_OP4(0xfff0, 0x0fc0, 0xf850, 0x0000, T2, LDR_REG),
-	ARMv7_OP4(0x0e50, 0x0010, 0x0610, 0x0000, A1, LDR_REG),
-
-	ARMv7_OP2(0xf800, 0x7800, T1, LDRB_IMM),
-	ARMv7_OP4(0xfff0, 0x0000, 0xf890, 0x0000, T2, LDRB_IMM),
-	ARMv7_OP4(0xfff0, 0x0800, 0xf810, 0x0800, T3, LDRB_IMM),
-	ARMv7_OP4(0x0e50, 0x0000, 0x0450, 0x0000, A1, LDRB_IMM),
-	ARMv7_OP4(0xff7f, 0x0000, 0xf81f, 0x0000, T1, LDRB_LIT),
-	ARMv7_OP4(0x0f7f, 0x0000, 0x055f, 0x0000, A1, LDRB_LIT),
-	ARMv7_OP2(0xfe00, 0x5c00, T1, LDRB_REG),
-	ARMv7_OP4(0xfff0, 0x0fc0, 0xf810, 0x0000, T2, LDRB_REG),
-	ARMv7_OP4(0x0e50, 0x0010, 0x0650, 0x0000, A1, LDRB_REG),
-
-	ARMv7_OP4(0xfe50, 0x0000, 0xe850, 0x0000, T1, LDRD_IMM),
-	ARMv7_OP4(0x0e50, 0x00f0, 0x0040, 0x00d0, A1, LDRD_IMM),
-	ARMv7_OP4(0xfe7f, 0x0000, 0xe85f, 0x0000, T1, LDRD_LIT),
-	ARMv7_OP4(0x0f7f, 0x00f0, 0x014f, 0x00d0, A1, LDRD_LIT),
-	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00d0, A1, LDRD_REG),
-
-	ARMv7_OP4(0xfff0, 0x0000, 0xf990, 0x0000, T1, LDRSB_IMM),
-	ARMv7_OP4(0xfff0, 0x0800, 0xf910, 0x0800, T2, LDRSB_IMM),
-	ARMv7_OP4(0x0e50, 0x00f0, 0x0050, 0x00d0, A1, LDRSB_IMM),
-	ARMv7_OP4(0xff7f, 0x0000, 0xf91f, 0x0000, T1, LDRSB_LIT),
-	ARMv7_OP4(0x0f7f, 0x00f0, 0x015f, 0x00d0, A1, LDRSB_LIT),
-	ARMv7_OP2(0xfe00, 0x5600, T1, LDRSB_REG),
-	ARMv7_OP4(0xfff0, 0x0fc0, 0xf910, 0x0000, T2, LDRSB_REG),
-	ARMv7_OP4(0x0e50, 0x0ff0, 0x0010, 0x00d0, A1, LDRSB_REG),
-
-	ARMv7_OP4(0xfff0, 0x0000, 0xf9b0, 0x0000, T1, LDRSH_IMM),
-	ARMv7_OP4(0xfff0, 0x0800, 0xf930, 0x0800, T2, LDRSH_IMM),
-	ARMv7_OP4(0x0e50, 0x00f0, 0x0050, 0x00f0, A1, LDRSH_IMM),
-	ARMv7_OP4(0xff7f, 0x0000, 0xf93f, 0x0000, T1, LDRSH_LIT),
-	ARMv7_OP4(0x0f7f, 0x00f0, 0x015f, 0x00f0, A1, LDRSH_LIT),
-	ARMv7_OP2(0xfe00, 0x5e00, T1, LDRSH_REG),
-	ARMv7_OP4(0xfff0, 0x0fc0, 0xf930, 0x0000, T2, LDRSH_REG),
-	ARMv7_OP4(0x0e50, 0x0ff0, 0x0010, 0x00f0, A1, LDRSH_REG),
-
-	ARMv7_OP2(0xf800, 0x0000, T1, LSL_IMM),
-	ARMv7_OP4(0xffef, 0x8030, 0xea4f, 0x0000, T2, LSL_IMM),
-	ARMv7_OP4(0x0fef, 0x0070, 0x01a0, 0x0000, A1, LSL_IMM),
-	ARMv7_OP2(0xffc0, 0x4080, T1, LSL_REG),
-	ARMv7_OP4(0xffe0, 0xf0f0, 0xfa00, 0xf000, T2, LSL_REG),
-	ARMv7_OP4(0x0fef, 0x00f0, 0x01a0, 0x0010, A1, LSL_REG),
-
-	ARMv7_OP2(0xf800, 0x0800, T1, LSR_IMM),
-	ARMv7_OP4(0xffef, 0x8030, 0xea4f, 0x0010, T2, LSR_IMM),
-	ARMv7_OP4(0x0fef, 0x0030, 0x01a0, 0x0020, A1, LSR_IMM),
-	ARMv7_OP2(0xffc0, 0x40c0, T1, LSR_REG),
-	ARMv7_OP4(0xffe0, 0xf0f0, 0xfa20, 0xf000, T2, LSR_REG),
-	ARMv7_OP4(0x0fef, 0x00f0, 0x01a0, 0x0030, A1, LSR_REG),
-
-	ARMv7_OP4(0xfff0, 0x00f0, 0xfb00, 0x0000, T1, MLA),
-	ARMv7_OP4(0x0fe0, 0x00f0, 0x0020, 0x0090, A1, MLA),
-
-	ARMv7_OP4(0xfff0, 0x00f0, 0xfb00, 0x0010, T1, MLS),
-	ARMv7_OP4(0x0ff0, 0x00f0, 0x0060, 0x0090, A1, MLS),
-
-	ARMv7_OP2(0xf800, 0x2000, T1, MOV_IMM),
-	ARMv7_OP4(0xfbef, 0x8000, 0xf04f, 0x0000, T2, MOV_IMM),
-	ARMv7_OP4(0xfbf0, 0x8000, 0xf240, 0x0000, T3, MOV_IMM),
-	ARMv7_OP4(0x0fef, 0x0000, 0x03a0, 0x0000, A1, MOV_IMM),
-	ARMv7_OP4(0x0ff0, 0x0000, 0x0300, 0x0000, A2, MOV_IMM),
-	ARMv7_OP2(0xff00, 0x4600, T1, MOV_REG),
-	ARMv7_OP2(0xffc0, 0x0000, T2, MOV_REG),
-	ARMv7_OP4(0xffef, 0xf0f0, 0xea4f, 0x0000, T3, MOV_REG),
-	ARMv7_OP4(0x0fef, 0x0ff0, 0x01a0, 0x0000, A1, MOV_REG),
-	ARMv7_OP4(0xfbf0, 0x8000, 0xf2c0, 0x0000, T1, MOVT),
-	ARMv7_OP4(0x0ff0, 0x0000, 0x0340, 0x0000, A1, MOVT),
-
-	ARMv7_OP4(0xffff, 0xf0ff, 0xf3ef, 0x8000, T1, MRS),
-	ARMv7_OP4(0x0fff, 0x0fff, 0x010f, 0x0000, A1, MRS),
-	ARMv7_OP4(0x0ff3, 0xf000, 0x0320, 0xf000, A1, MSR_IMM),
-	ARMv7_OP4(0xfff0, 0xf3ff, 0xf380, 0x8000, T1, MSR_REG),
-	ARMv7_OP4(0x0ff3, 0xfff0, 0x0120, 0xf000, A1, MSR_REG),
-
-	ARMv7_OP2(0xffc0, 0x4340, T1, MUL),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfb00, 0xf000, T2, MUL),
-	ARMv7_OP4(0x0fe0, 0xf0f0, 0x0000, 0x0090, A1, MUL),
-
-	ARMv7_OP4(0xfbef, 0x8000, 0xf06f, 0x0000, T1, MVN_IMM),
-	ARMv7_OP4(0x0fef, 0x0000, 0x03e0, 0x0000, A1, MVN_IMM),
-	ARMv7_OP2(0xffc0, 0x43c0, T1, MVN_REG),
-	ARMv7_OP4(0xffef, 0x8000, 0xea6f, 0x0000, T2, MVN_REG),
-	ARMv7_OP4(0xffef, 0x0010, 0x01e0, 0x0000, A1, MVN_REG),
-	ARMv7_OP4(0x0fef, 0x0090, 0x01e0, 0x0010, A1, MVN_RSR),
-
-	ARMv7_OP2(0xffff, 0xbf00, T1, NOP),
-	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8000, T2, NOP),
-	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf000, A1, NOP),
-
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf060, 0x0000, T1, ORN_IMM),
-	ARMv7_OP4(0xffe0, 0x8000, 0xea60, 0x0000, T1, ORN_REG),
-
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf040, 0x0000, T1, ORR_IMM),
-	ARMv7_OP4(0x0fe0, 0x0000, 0x0380, 0x0000, A1, ORR_IMM),
-	ARMv7_OP2(0xffc0, 0x4300, T1, ORR_REG),
-	ARMv7_OP4(0xffe0, 0x8000, 0xea40, 0x0000, T2, ORR_REG),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x0180, 0x0000, A1, ORR_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x0180, 0x0010, A1, ORR_RSR),
-
-	ARMv7_OP4(0xfff0, 0x8010, 0xeac0, 0x0000, T1, PKH),
-	ARMv7_OP4(0x0ff0, 0x0030, 0x0680, 0x0010, A1, PKH),
-
-	ARMv7_OP2(0xfe00, 0xbc00, T1, POP),
-	ARMv7_OP4(0xffff, 0x0000, 0xe8bd, 0x0000, T2, POP),
-	ARMv7_OP4(0xffff, 0x0fff, 0xf85d, 0x0b04, T3, POP),
-	ARMv7_OP4(0x0fff, 0x0000, 0x08bd, 0x0000, A1, POP),
-	ARMv7_OP4(0x0fff, 0x0fff, 0x049d, 0x0004, A2, POP),
-
-	ARMv7_OP2(0xfe00, 0xb400, T1, PUSH),
-	ARMv7_OP4(0xffff, 0x0000, 0xe92d, 0x0000, T2, PUSH), // had an error in arch ref
-	ARMv7_OP4(0xffff, 0x0fff, 0xf84d, 0x0d04, T3, PUSH),
-	ARMv7_OP4(0x0fff, 0x0000, 0x092d, 0x0000, A1, PUSH),
-	ARMv7_OP4(0x0fff, 0x0fff, 0x052d, 0x0004, A2, PUSH),
-
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf080, T1, QADD),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0100, 0x0050, A1, QADD),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf010, T1, QADD16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f10, A1, QADD16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf010, T1, QADD8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f90, A1, QADD8),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf010, T1, QASX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f30, A1, QASX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf090, T1, QDADD),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0140, 0x0050, A1, QDADD),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf0b0, T1, QDSUB),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0160, 0x0050, A1, QDSUB),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf010, T1, QSAX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f50, A1, QSAX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf0a0, T1, QSUB),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0120, 0x0050, A1, QSUB),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf010, T1, QSUB16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f70, A1, QSUB16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf010, T1, QSUB8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0ff0, A1, QSUB8),
-
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf0a0, T1, RBIT),
-	ARMv7_OP4(0x0fff, 0x0ff0, 0x06ff, 0x0f30, A1, RBIT),
-
-	ARMv7_OP2(0xffc0, 0xba00, T1, REV),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf080, T2, REV),
-	ARMv7_OP4(0x0fff, 0x0ff0, 0x06bf, 0x0f30, A1, REV),
-	ARMv7_OP2(0xffc0, 0xba40, T1, REV16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf090, T2, REV16),
-	ARMv7_OP4(0x0fff, 0x0ff0, 0x06bf, 0x0fb0, A1, REV16),
-	ARMv7_OP2(0xffc0, 0xbac0, T1, REVSH),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf0b0, T2, REVSH),
-	ARMv7_OP4(0x0fff, 0x0ff0, 0x06ff, 0x0fb0, A1, REVSH),
-
-	ARMv7_OP4(0xffef, 0x8030, 0xea4f, 0x0030, T1, ROR_IMM),
-	ARMv7_OP4(0x0fef, 0x0070, 0x01a0, 0x0060, A1, ROR_IMM),
-	ARMv7_OP2(0xffc0, 0x41c0, T1, ROR_REG),
-	ARMv7_OP4(0xffe0, 0xf0f0, 0xfa60, 0xf000, T2, ROR_REG),
-	ARMv7_OP4(0x0fef, 0x00f0, 0x01a0, 0x0070, A1, ROR_REG),
-	ARMv7_OP4(0xffef, 0xf0f0, 0xea4f, 0x0030, T1, RRX),
-	ARMv7_OP4(0x0fef, 0x0ff0, 0x01a0, 0x0060, A1, RRX),
-
-	ARMv7_OP2(0xffc0, 0x4240, T1, RSB_IMM),
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf1c0, 0x0000, T2, RSB_IMM),
-	ARMv7_OP4(0x0fe0, 0x0000, 0x0260, 0x0000, A1, RSB_IMM),
-	ARMv7_OP4(0xffe0, 0x8000, 0xebc0, 0x0000, T1, RSB_REG),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x0060, 0x0000, A1, RSB_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x0060, 0x0010, A1, RSB_RSR),
-
-	ARMv7_OP4(0x0fe0, 0x0000, 0x02e0, 0x0000, A1, RSC_IMM),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x00e0, 0x0000, A1, RSC_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x00e0, 0x0010, A1, RSC_RSR),
-
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf000, T1, SADD16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f10, A1, SADD16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf000, T1, SADD8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f90, A1, SADD8),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf000, T1, SASX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f30, A1, SASX),
-
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf160, 0x0000, T1, SBC_IMM),
-	ARMv7_OP4(0x0fe0, 0x0000, 0x02c0, 0x0000, A1, SBC_IMM),
-	ARMv7_OP2(0xffc0, 0x4180, T1, SBC_REG),
-	ARMv7_OP4(0xffe0, 0x8000, 0xeb60, 0x0000, T2, SBC_REG),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x00c0, 0x0000, A1, SBC_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x00c0, 0x0010, A1, SBC_RSR),
-
-	ARMv7_OP4(0xfff0, 0x8020, 0xf340, 0x0000, T1, SBFX),
-	ARMv7_OP4(0x0fe0, 0x0070, 0x07a0, 0x0050, A1, SBFX),
-
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfb90, 0xf0f0, T1, SDIV), // ???
-
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf080, T1, SEL),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0680, 0x0fb0, A1, SEL),
-
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf020, T1, SHADD16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f10, A1, SHADD16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf020, T1, SHADD8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f90, A1, SHADD8),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf020, T1, SHASX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f30, A1, SHASX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf020, T1, SHSAX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f50, A1, SHSAX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf020, T1, SHSUB16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f70, A1, SHSUB16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf020, T1, SHSUB8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0ff0, A1, SHSUB8),
-
-	ARMv7_OP4(0xfff0, 0x00c0, 0xfb10, 0x0000, T1, SMLA__),
-	ARMv7_OP4(0x0ff0, 0x0090, 0x0100, 0x0080, A1, SMLA__),
-	ARMv7_OP4(0xfff0, 0x00e0, 0xfb20, 0x0000, T1, SMLAD),
-	ARMv7_OP4(0x0ff0, 0x00d0, 0x0700, 0x0010, A1, SMLAD),
-	ARMv7_OP4(0xfff0, 0x00f0, 0xfbc0, 0x0000, T1, SMLAL),
-	ARMv7_OP4(0x0fe0, 0x00f0, 0x00e0, 0x0090, A1, SMLAL),//???
-	ARMv7_OP4(0xfff0, 0x00c0, 0xfbc0, 0x0080, T1, SMLAL__),
-	ARMv7_OP4(0x0ff0, 0x0090, 0x0140, 0x0080, A1, SMLAL__),
-	ARMv7_OP4(0xfff0, 0x00e0, 0xfbc0, 0x00c0, T1, SMLALD),
-	ARMv7_OP4(0x0ff0, 0x00d0, 0x0740, 0x0010, A1, SMLALD),
-	ARMv7_OP4(0xfff0, 0x00e0, 0xfb30, 0x0000, T1, SMLAW_),
-	ARMv7_OP4(0x0ff0, 0x00b0, 0x0120, 0x0080, A1, SMLAW_),
-
-	ARMv7_OP4(0xfff0, 0x00e0, 0xfb40, 0x0000, T1, SMLSD),
-	ARMv7_OP4(0x0ff0, 0x00d0, 0x0700, 0x0050, A1, SMLSD),
-	ARMv7_OP4(0xfff0, 0x00e0, 0xfbd0, 0x00c0, T1, SMLSLD),
-	ARMv7_OP4(0x0ff0, 0x00d0, 0x0740, 0x0050, A1, SMLSLD),
-	ARMv7_OP4(0xfff0, 0x00e0, 0xfb50, 0x0000, T1, SMMLA),
-	ARMv7_OP4(0x0ff0, 0x00d0, 0x0750, 0x0010, A1, SMMLA),
-	ARMv7_OP4(0xfff0, 0x00e0, 0xfb60, 0x0000, T1, SMMLS),
-	ARMv7_OP4(0x0ff0, 0x00d0, 0x0750, 0x00d0, A1, SMMLS),
-	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb50, 0xf000, T1, SMMUL),
-	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0750, 0xf010, A1, SMMUL),
-	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb20, 0xf000, T1, SMUAD),
-	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0700, 0xf010, A1, SMUAD),
-	ARMv7_OP4(0xfff0, 0xf0c0, 0xfb10, 0xf000, T1, SMUL__),
-	ARMv7_OP4(0x0ff0, 0xf090, 0x0160, 0x0080, A1, SMUL__),//???
-	ARMv7_OP4(0xfff0, 0x00f0, 0xfb80, 0x0000, T1, SMULL),
-	ARMv7_OP4(0x0fe0, 0x00f0, 0x00c0, 0x0090, A1, SMULL),
-	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb30, 0xf000, T1, SMULW_),
-	ARMv7_OP4(0x0ff0, 0xf0b0, 0x0120, 0x00a0, A1, SMULW_),//???
-	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb40, 0xf000, T1, SMUSD),
-	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0700, 0xf050, A1, SMUSD),
-	ARMv7_OP4(0xffd0, 0x8020, 0xf300, 0x0000, T1, SSAT),
-	ARMv7_OP4(0x0fe0, 0x0030, 0x06a0, 0x0010, A1, SSAT),
-	ARMv7_OP4(0xfff0, 0xf0e0, 0xf320, 0x0000, T1, SSAT16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x06a0, 0x0f30, A1, SSAT16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf000, T1, SSAX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f50, A1, SSAX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf000, T1, SSUB16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f70, A1, SSUB16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf000, T1, SSUB8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0ff0, A1, SSUB8),
-
-	ARMv7_OP4(0xfff0, 0x0000, 0xe840, 0x0000, T1, STREX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0180, 0x0f90, A1, STREX),
-	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f40, T1, STREXB),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01c0, 0x0f90, A1, STREXB),
-	ARMv7_OP4(0xfff0, 0x00f0, 0xe8c0, 0x0070, T1, STREXD),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01a0, 0x0f90, A1, STREXD),
-	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f50, T1, STREXH),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01e0, 0x0f90, A1, STREXH),
-
-	ARMv7_OP2(0xf800, 0xc000, T1, STM),
-	ARMv7_OP4(0xffd0, 0xa000, 0xe880, 0x0000, T2, STM),
-	ARMv7_OP4(0x0fd0, 0x0000, 0x0880, 0x0000, A1, STM),
-	ARMv7_OP4(0x0fd0, 0x0000, 0x0800, 0x0000, A1, STMDA),
-	ARMv7_OP4(0xffd0, 0xa000, 0xe900, 0x0000, T1, STMDB),
-	ARMv7_OP4(0x0fd0, 0x0000, 0x0900, 0x0000, A1, STMDB),
-	ARMv7_OP4(0x0fd0, 0x0000, 0x0980, 0x0000, A1, STMIB),
-
-	ARMv7_OP2(0xf800, 0x6000, T1, STR_IMM),
-	ARMv7_OP2(0xf800, 0x9000, T2, STR_IMM),
-	ARMv7_OP4(0xfff0, 0x0000, 0xf8c0, 0x0000, T3, STR_IMM),
-	ARMv7_OP4(0xfff0, 0x0800, 0xf840, 0x0800, T4, STR_IMM),
-	ARMv7_OP4(0x0e50, 0x0000, 0x0400, 0x0000, A1, STR_IMM),
-	ARMv7_OP2(0xfe00, 0x5000, T1, STR_REG),
-	ARMv7_OP4(0xfff0, 0x0fc0, 0xf840, 0x0000, T2, STR_REG),
-	ARMv7_OP4(0x0e50, 0x0010, 0x0600, 0x0000, A1, STR_REG),
-
-	ARMv7_OP2(0xf800, 0x7000, T1, STRB_IMM),
-	ARMv7_OP4(0xfff0, 0x0000, 0xf880, 0x0000, T2, STRB_IMM),
-	ARMv7_OP4(0xfff0, 0x0800, 0xf800, 0x0800, T3, STRB_IMM),
-	ARMv7_OP4(0x0e50, 0x0000, 0x0440, 0x0000, A1, STRB_IMM),
-	ARMv7_OP2(0xfe00, 0x5400, T1, STRB_REG),
-	ARMv7_OP4(0xfff0, 0x0fc0, 0xf800, 0x0000, T2, STRB_REG),
-	ARMv7_OP4(0x0e50, 0x0010, 0x0640, 0x0000, A1, STRB_REG),
-
-	ARMv7_OP4(0xfe50, 0x0000, 0xe840, 0x0000, T1, STRD_IMM),
-	ARMv7_OP4(0x0e50, 0x00f0, 0x0040, 0x00f0, A1, STRD_IMM),
-	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00f0, A1, STRD_REG),
-
-	ARMv7_OP2(0xf800, 0x8000, T1, STRH_IMM),
-	ARMv7_OP4(0xfff0, 0x0000, 0xf8a0, 0x0000, T2, STRH_IMM),
-	ARMv7_OP4(0xfff0, 0x0800, 0xf820, 0x0800, T3, STRH_IMM),
-	ARMv7_OP4(0x0e50, 0x00f0, 0x0040, 0x00b0, A1, STRH_IMM),
-	ARMv7_OP2(0xfe00, 0x5200, T1, STRH_REG),
-	ARMv7_OP4(0xfff0, 0x0fc0, 0xf820, 0x0000, T2, STRH_REG),
-	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00b0, A1, STRH_REG),
-
-	ARMv7_OP2(0xff80, 0xb080, T1, SUB_SPI),
-	ARMv7_OP4(0xfbef, 0x8000, 0xf1ad, 0x0000, T2, SUB_SPI),
-	ARMv7_OP4(0xfbff, 0x8000, 0xf2ad, 0x0000, T3, SUB_SPI),
-	ARMv7_OP4(0x0fef, 0x0000, 0x024d, 0x0000, A1, SUB_SPI),
-	ARMv7_OP4(0xffef, 0x8000, 0xebad, 0x0000, T1, SUB_SPR),
-	ARMv7_OP4(0x0fef, 0x0010, 0x004d, 0x0000, A1, SUB_SPR),
-	ARMv7_OP2(0xfe00, 0x1e00, T1, SUB_IMM),
-	ARMv7_OP2(0xf800, 0x3800, T2, SUB_IMM),
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf1a0, 0x0000, T3, SUB_IMM),
-	ARMv7_OP4(0xfbf0, 0x8000, 0xf2a0, 0x0000, T4, SUB_IMM),
-	ARMv7_OP4(0x0fe0, 0x0000, 0x0240, 0x0000, A1, SUB_IMM),
-	ARMv7_OP2(0xfe00, 0x1a00, T1, SUB_REG),
-	ARMv7_OP4(0xffe0, 0x8000, 0xeba0, 0x0000, T2, SUB_REG),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x0040, 0x0000, A1, SUB_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x0040, 0x0010, A1, SUB_RSR),
-
-	ARMv7_OP2(0xff00, 0xdf00, T1, SVC),
-	ARMv7_OP4(0x0f00, 0x0000, 0x0f00, 0x0000, A1, SVC),
-
-	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa40, 0xf080, T1, SXTAB),
-	ARMv7_OP4(0x0ff0, 0x03f0, 0x06a0, 0x0070, A1, SXTAB),
-	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa20, 0xf080, T1, SXTAB16),
-	ARMv7_OP4(0x0ff0, 0x03f0, 0x0680, 0x0070, A1, SXTAB16),
-	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa00, 0xf080, T1, SXTAH),
-	ARMv7_OP4(0x0ff0, 0x03f0, 0x06b0, 0x0070, A1, SXTAH),
-
-	ARMv7_OP2(0xffc0, 0xb240, T1, SXTB),
-	ARMv7_OP4(0xffff, 0xf0c0, 0xfa4f, 0xf080, T2, SXTB),
-	ARMv7_OP4(0x0fff, 0x03f0, 0x06af, 0x0070, A1, SXTB),
-
-	ARMv7_OP4(0xffff, 0xf0c0, 0xfa2f, 0xf080, T1, SXTB16),
-	ARMv7_OP4(0x0fff, 0x03f0, 0x068f, 0x0070, A1, SXTB16),
-
-	ARMv7_OP2(0xffc0, 0xb200, T1, SXTH),
-	ARMv7_OP4(0xffff, 0xf0c0, 0xfa0f, 0xf080, T2, SXTH),
-	ARMv7_OP4(0x0fff, 0x03f0, 0x06bf, 0x0070, A1, SXTH),
-
-	ARMv7_OP4(0xfff0, 0xffe0, 0xe8d0, 0xf000, T1, TB_),
-
-	ARMv7_OP4(0xfbf0, 0x8f00, 0xf090, 0x0f00, T1, TEQ_IMM),
-	ARMv7_OP4(0x0ff0, 0xf000, 0x0330, 0x0000, A1, TEQ_IMM),
-	ARMv7_OP4(0xfff0, 0x8f00, 0xea90, 0x0f00, T1, TEQ_REG),
-	ARMv7_OP4(0x0ff0, 0xf010, 0x0130, 0x0000, A1, TEQ_REG),
-	ARMv7_OP4(0x0ff0, 0xf090, 0x0130, 0x0010, A1, TEQ_RSR),
-
-	ARMv7_OP4(0xfbf0, 0x8f00, 0xf010, 0x0f00, T1, TST_IMM),
-	ARMv7_OP4(0x0ff0, 0xf000, 0x0310, 0x0000, A1, TST_IMM),
-	ARMv7_OP2(0xffc0, 0x4200, T1, TST_REG),
-	ARMv7_OP4(0xfff0, 0x8f00, 0xea10, 0x0f00, T2, TST_REG),
-	ARMv7_OP4(0x0ff0, 0xf010, 0x0110, 0x0000, A1, TST_REG),
-	ARMv7_OP4(0x0ff0, 0xf090, 0x0110, 0x0010, A1, TST_RSR),
-
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf040, T1, UADD16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f10, A1, UADD16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf040, T1, UADD8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f90, A1, UADD8),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf040, T1, UASX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f30, A1, UASX),
-	ARMv7_OP4(0xfff0, 0x8020, 0xf3c0, 0x0000, T1, UBFX),
-	ARMv7_OP4(0x0fe0, 0x0070, 0x07e0, 0x0050, A1, UBFX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfbb0, 0xf0f0, T1, UDIV),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf060, T1, UHADD16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f10, A1, UHADD16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf060, T1, UHADD8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f90, A1, UHADD8),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf060, T1, UHASX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f30, A1, UHASX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf060, T1, UHSAX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f50, A1, UHSAX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf060, T1, UHSUB16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f70, A1, UHSUB16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf060, T1, UHSUB8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0ff0, A1, UHSUB8),
-	ARMv7_OP4(0xfff0, 0x00f0, 0xfbe0, 0x0060, T1, UMAAL),
-	ARMv7_OP4(0x0ff0, 0x00f0, 0x0040, 0x0090, A1, UMAAL),
-	ARMv7_OP4(0xfff0, 0x00f0, 0xfbe0, 0x0000, T1, UMLAL),
-	ARMv7_OP4(0x0fe0, 0x00f0, 0x00a0, 0x0090, A1, UMLAL),
-	ARMv7_OP4(0xfff0, 0x00f0, 0xfba0, 0x0000, T1, UMULL),
-	ARMv7_OP4(0x0fe0, 0x00f0, 0x0080, 0x0090, A1, UMULL),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf050, T1, UQADD16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f10, A1, UQADD16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf050, T1, UQADD8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f90, A1, UQADD8),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf050, T1, UQASX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f30, A1, UQASX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf050, T1, UQSAX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f50, A1, UQSAX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf050, T1, UQSUB16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f70, A1, UQSUB16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf050, T1, UQSUB8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0ff0, A1, UQSUB8),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfb70, 0xf000, T1, USAD8),
-	ARMv7_OP4(0x0ff0, 0xf0f0, 0x0780, 0xf010, A1, USAD8),
-	ARMv7_OP4(0xfff0, 0x00f0, 0xfb70, 0x0000, T1, USADA8),
-	ARMv7_OP4(0x0ff0, 0x00f0, 0x0780, 0x0010, A1, USADA8),
-	ARMv7_OP4(0xffd0, 0x8020, 0xf380, 0x0000, T1, USAT),
-	ARMv7_OP4(0x0fe0, 0x0030, 0x06e0, 0x0010, A1, USAT),
-	ARMv7_OP4(0xfff0, 0xf0e0, 0xf3a0, 0x0000, T1, USAT16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x06e0, 0x0f30, A1, USAT16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf040, T1, USAX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f50, A1, USAX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf040, T1, USUB16),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f70, A1, USUB16),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf040, T1, USUB8),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0ff0, A1, USUB8),
-	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa50, 0xf080, T1, UXTAB),
-	ARMv7_OP4(0x0ff0, 0x03f0, 0x06e0, 0x0070, A1, UXTAB),
-	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa30, 0xf080, T1, UXTAB16),
-	ARMv7_OP4(0x0ff0, 0x03f0, 0x06c0, 0x0070, A1, UXTAB16),
-	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa10, 0xf080, T1, UXTAH),
-	ARMv7_OP4(0x0ff0, 0x03f0, 0x06f0, 0x0070, A1, UXTAH),
-
-	ARMv7_OP2(0xffc0, 0xb2c0, T1, UXTB),
-	ARMv7_OP4(0xffff, 0xf0c0, 0xfa5f, 0xf080, T2, UXTB),
-	ARMv7_OP4(0x0fff, 0x03f0, 0x06ef, 0x0070, A1, UXTB),
-
-	ARMv7_OP4(0xffff, 0xf0c0, 0xfa3f, 0xf080, T1, UXTB16),
-	ARMv7_OP4(0x0fff, 0x03f0, 0x06cf, 0x0070, A1, UXTB16),
-
-	ARMv7_OP2(0xffc0, 0xb280, T1, UXTH),
-	ARMv7_OP4(0xffff, 0xf0c0, 0xfa1f, 0xf080, T2, UXTH),
-	ARMv7_OP4(0x0fff, 0x03f0, 0x06ff, 0x0070, A1, UXTH),
-
-	ARMv7_OP4(0xef80, 0x0f10, 0xef00, 0x0710, T1, VABA_),
-	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0710, A1, VABA_),
-	ARMv7_OP4(0xef80, 0x0f50, 0xef80, 0x0500, T2, VABA_),
-	ARMv7_OP4(0xfe80, 0x0f50, 0xf280, 0x0500, A2, VABA_),
-
-	// TODO: vector instructions
-
-	ARMv7_OP2(0xffff, 0xbf20, T1, WFE),
-	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8002, T2, WFE),
-	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf002, A1, WFE),
-	ARMv7_OP2(0xffff, 0xbf30, T1, WFI),
-	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8003, T2, WFI),
-	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf003, A1, WFI),
-	ARMv7_OP2(0xffff, 0xbf10, T1, YIELD),
-	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8001, T2, YIELD),
-	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf001, A1, YIELD),
-};
-
-#undef ARMv7_OP2
-#undef ARMv7_OP4
diff --git a/rpcs3/Emu/ARMv7/ARMv7Opcodes.h b/rpcs3/Emu/ARMv7/ARMv7Opcodes.h
index 2a73550111..7a7f0e7e53 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Opcodes.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Opcodes.h
@@ -2,8 +2,6 @@
 
 #include "Emu/ARMv7/ARMv7Thread.h"
 #include "Emu/ARMv7/ARMv7Interpreter.h"
-//#include "Emu/System.h"
-//#include "Utilities/Log.h"
 
 static const char* g_arm_reg_name[16] =
 {
@@ -12,7 +10,7 @@ static const char* g_arm_reg_name[16] =
 	"r8", "r9", "r10", "r11",
 	"r12", "sp", "lr", "pc",
 };
-
+#if 0
 using namespace ARMv7_instrs;
 
 struct ARMv7_Instruction
@@ -23,8 +21,6 @@ struct ARMv7_Instruction
 	const char* name;
 };
 
-#if 0
-
 #define ARMv7_OP_2(func, type) { func, 2, type, #func "_" #type }
 #define ARMv7_OP_4(func, type) { func, 4, type, #func "_" #type }
 #define ARMv7_NULL_OP { NULL_OP, 2, T1, "NULL_OP" }
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index e68b19b861..42813536b7 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -52,6 +52,7 @@
     <ClCompile Include="Crypto\unpkg.cpp" />
     <ClCompile Include="Crypto\unself.cpp" />
     <ClCompile Include="Crypto\utils.cpp" />
+    <ClCompile Include="Emu\ARMv7\ARMv7Decoder.cpp" />
     <ClCompile Include="Emu\ARMv7\ARMv7DisAsm.cpp" />
     <ClCompile Include="Emu\ARMv7\ARMv7Interpreter.cpp" />
     <ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 3537bdfbf0..4965248105 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -662,6 +662,9 @@
     <ClCompile Include="Emu\Audio\XAudio2\XAudio2Thread.cpp">
       <Filter>Emu\Audio\XAudio2</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\ARMv7\ARMv7Decoder.cpp">
+      <Filter>Emu\CPU\ARMv7</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">

From 79d03ece667396adf68d83aeed202f2c1a464c78 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Thu, 22 Jan 2015 00:09:37 +0300
Subject: [PATCH 12/70] ARMv7 decoder improved

---
 rpcs3/Emu/ARMv7/ARMv7Context.h       |  11 --
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp     | 168 ++++++++++++++++++++++++---
 rpcs3/Emu/ARMv7/ARMv7Decoder.h       |  10 +-
 rpcs3/Emu/ARMv7/ARMv7DisAsm.cpp      |   3 +-
 rpcs3/Emu/ARMv7/ARMv7DisAsm.h        |  11 +-
 rpcs3/Emu/ARMv7/ARMv7Interpreter.h   |  11 ++
 rpcs3/Emu/ARMv7/ARMv7Opcodes.h       |  10 +-
 rpcs3/Emu/ARMv7/ARMv7Thread.cpp      |   2 +-
 rpcs3/Emu/CPU/CPUDecoder.h           |   2 +-
 rpcs3/Emu/Cell/PPCDecoder.cpp        |   2 +-
 rpcs3/Emu/Cell/PPCDecoder.h          |   4 +-
 rpcs3/Emu/Cell/SPURecompiler.h       |   2 +-
 rpcs3/Emu/Cell/SPURecompilerCore.cpp |   2 +-
 rpcs3/Loader/ELF32.cpp               |  27 +++--
 rpcs3/Loader/ELF64.cpp               |   2 +-
 15 files changed, 204 insertions(+), 63 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index c474dc6e6d..bdfa8107e2 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -10,17 +10,6 @@ enum ARMv7InstructionSet
 	ThumbEE
 };
 
-union ARMv7Code
-{
-	struct
-	{
-		u16 code0;
-		u16 code1;
-	};
-
-	u32 data;
-};
-
 struct ARMv7Context
 {
 	ARMv7Thread& thread;
diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index c28a880722..179e461aed 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include <unordered_map>
 #include "Utilities/Log.h"
 #include "ARMv7Thread.h"
 #include "ARMv7Interpreter.h"
@@ -595,31 +596,164 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf001, A1, YIELD),
 };
 
-u8 ARMv7Decoder::DecodeMemory(const u32 address)
+struct ARMv7_op2_table_t
 {
-	ARMv7Code code;
-	code.code0 = vm::psv::read16(address & ~1);
-	code.code1 = vm::psv::read16(address + 2 & ~1);
-	u32 arg = address & 0x1 ? code.data : (u32)code.code0 << 16 | code.code1;
+	const ARMv7_opcode_t* data[0x10000];
 
-	//LOG_NOTICE(GENERAL, "code0 = 0x%04x, code1 = 0x%04x, data = 0x%08x, arg = 0x%08x", code.code0, code.code1, code.data, arg);
-
-	// old decoding algorithm
-
-	for (auto& opcode : ARMv7_opcode_table)
+	ARMv7_op2_table_t()
 	{
-		if ((opcode.type < A1) == ((address & 0x1) == 0) && (arg & opcode.mask) == opcode.code)
+		std::vector<const ARMv7_opcode_t*> t2;
+
+		for (auto& opcode : ARMv7_opcode_table)
 		{
-			code.data = opcode.length == 2 ? code.code0 : arg;
-			(*opcode.func)(m_thr.context, code, opcode.type);
-			//LOG_NOTICE(ARMv7, "%s, %s", opcode.name, m_thr.RegsToString());
-			return opcode.length;
+			if (opcode.length == 2)
+			{
+				t2.push_back(&opcode);
+			}
+		}
+
+		for (u32 i = 0; i < 0x10000; i++)
+		{
+			data[i] = nullptr;
+
+			for (auto& opcode : t2)
+			{
+				if (((i << 16) & opcode->mask) == opcode->code)
+				{
+					data[i] = opcode;
+					break;
+				}
+			}
 		}
 	}
 
-	ARMv7_instrs::UNK(m_thr.context, code);
-	return address & 0x1 ? 4 : 2;
+} g_op2t;
 
+struct ARMv7_op4t_table_t
+{
+	std::vector<const ARMv7_opcode_t*> table;
+
+	ARMv7_op4t_table_t()
+	{
+		for (auto& opcode : ARMv7_opcode_table)
+		{
+			if (opcode.length == 4 && opcode.type < A1)
+			{
+				table.push_back(&opcode);
+			}
+		}
+	}
+	
+} g_op4t;
+
+std::unordered_map<u32, const ARMv7_opcode_t*> g_opct;
+
+void armv7_decoder_initialize(u32 addr, u32 end_addr, bool dump)
+{
+	// 1. Find every 4-byte thumb instruction and cache it
+	// 2. If some instruction is not recognized, print the error
+	// 3. Possibly print disasm
+	g_opct.clear();
+
+	while (addr < end_addr)
+	{
+		ARMv7Code code = {};
+		code.code0 = vm::psv::read16(addr);
+
+		auto found = g_op2t.data[code.code0];
+
+		if (!found)
+		{
+			code.code1 = code.code0;
+			code.code0 = vm::psv::read16(addr + 2);
+
+			auto op = g_opct.find(code.data);
+			if (op != g_opct.end())
+			{
+				found = op->second;
+			}
+		}
+
+		if (!found)
+		{
+			for (auto opcode : g_op4t.table)
+			{
+				if ((code.data & opcode->mask) == opcode->code)
+				{
+					g_opct[code.data] = (found = opcode);
+					break;
+				}
+			}
+		}
+		
+		if (!found)
+		{
+			LOG_ERROR(ARMv7, "Unknown instruction found at address 0x%08x: %04x %04x", addr, code.code1, code.code0);
+			addr += 4;
+		}
+		else
+		{
+			if (dump) if (found->length == 2)
+			{
+				LOG_NOTICE(ARMv7, "0x%08x: %04x       %s", addr, code.code0, found->name);
+			}
+			else
+			{
+				LOG_NOTICE(ARMv7, "0x%08x: %04x %04x  %s", addr, code.code1, code.code0, found->name);
+			}
+
+			addr += found->length;
+		}
+	}
+
+	while (vm::psv::read16(addr) == 0xf870)
+	{
+		g_opct[0xf8700000 | vm::psv::read16(addr + 2)] = g_op4t.table[0];
+		addr += 16;
+	}
+
+	LOG_NOTICE(ARMv7, "armv7_decoder_initialize() finished, g_opct.size() = %lld", g_opct.size());
+}
+
+u32 ARMv7Decoder::DecodeMemory(const u32 address)
+{
+	if (address & 0x1)
+	{
+		throw "ARMv7Decoder::DecodeMemory() failed (something is wrong with instruction set)";
+	}
+
+	ARMv7Code code = {};
+	code.code0 = vm::psv::read16(address);
+
+	if (auto opcode = g_op2t.data[code.code0])
+	{
+		(*opcode->func)(m_ctx, code, opcode->type);
+		return 2;
+	}
+
+	code.code1 = code.code0;
+	code.code0 = vm::psv::read16(address + 2);
+
+	auto op = g_opct.find(code.data);
+	if (op != g_opct.end())
+	{
+		(*op->second->func)(m_ctx, code, op->second->type);
+		return 4;
+	}
+
+	//for (auto opcode : g_op4t.table)
+	//{
+	//	if ((code.data & opcode->mask) == opcode->code)
+	//	{
+	//		(*opcode->func)(m_ctx, code, opcode->type);
+	//		return 4;
+	//	}
+	//}
+
+	ARMv7_instrs::UNK(m_ctx, code);
+	return 2;
+
+	// "group" decoding algorithm (temporarily disabled)
 
 	//execute_main_group(&m_thr);
 	//// LOG_NOTICE(GENERAL, "%s, %d \n\n", m_thr.m_last_instr_name, m_thr.m_last_instr_size);
diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.h b/rpcs3/Emu/ARMv7/ARMv7Decoder.h
index 341ed6a276..229f74014b 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.h
@@ -1,16 +1,18 @@
 #pragma once
 #include "Emu/CPU/CPUDecoder.h"
 
-class ARMv7Thread;
+struct ARMv7Context;
 
 class ARMv7Decoder : public CPUDecoder
 {
-	ARMv7Thread& m_thr;
+	ARMv7Context& m_ctx;
 
 public:
-	ARMv7Decoder(ARMv7Thread& thr) : m_thr(thr)
+	ARMv7Decoder(ARMv7Context& context) : m_ctx(context)
 	{
 	}
 
-	virtual u8 DecodeMemory(const u32 address);
+	virtual u32 DecodeMemory(const u32 address);
 };
+
+void armv7_decoder_initialize(u32 addr, u32 end_addr, bool dump = false);
diff --git a/rpcs3/Emu/ARMv7/ARMv7DisAsm.cpp b/rpcs3/Emu/ARMv7/ARMv7DisAsm.cpp
index ccb2582cad..6a3626522b 100644
--- a/rpcs3/Emu/ARMv7/ARMv7DisAsm.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7DisAsm.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#if 0
 #include "ARMv7DisAsm.h"
 
 void ARMv7DisAsm::UNK(const u32 data)
@@ -1119,4 +1120,4 @@ void ARMv7DisAsm::UXTH(const u32 data, const ARMv7_encoding type)
 {
 	Write(__FUNCTION__);
 }
-
+#endif
diff --git a/rpcs3/Emu/ARMv7/ARMv7DisAsm.h b/rpcs3/Emu/ARMv7/ARMv7DisAsm.h
index 05375dc167..848baaf7cb 100644
--- a/rpcs3/Emu/ARMv7/ARMv7DisAsm.h
+++ b/rpcs3/Emu/ARMv7/ARMv7DisAsm.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "Emu/ARMv7/ARMv7Opcodes.h"
 #include "Emu/CPU/CPUDisAsm.h"
 
 static const char* g_arm_cond_name[16] =
@@ -10,6 +9,14 @@ static const char* g_arm_cond_name[16] =
 	"gt", "le", "al", "al",
 };
 
+static const char* g_arm_reg_name[16] =
+{
+	"r0", "r1", "r2", "r3",
+	"r4", "r5", "r6", "r7",
+	"r8", "r9", "r10", "r11",
+	"r12", "sp", "lr", "pc",
+};
+
 class ARMv7DisAsm
 	: public CPUDisAsm
 {
@@ -24,6 +31,7 @@ protected:
 		return (u32)dump_pc + imm;
 	}
 
+#if 0
 	std::string GetRegsListString(u16 regs_list)
 	{
 		std::string regs_str;
@@ -316,4 +324,5 @@ protected:
 	virtual void UXTB(const u32 data, const ARMv7_encoding type);
 	virtual void UXTB16(const u32 data, const ARMv7_encoding type);
 	virtual void UXTH(const u32 data, const ARMv7_encoding type);
+#endif
 };
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
index b73b46b2f9..4f187e379b 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
@@ -1,5 +1,16 @@
 #pragma once
 
+union ARMv7Code
+{
+	struct
+	{
+		u16 code0;
+		u16 code1;
+	};
+
+	u32 data;
+};
+
 enum ARMv7_encoding
 {
 	T1, T2, T3, T4, A1, A2
diff --git a/rpcs3/Emu/ARMv7/ARMv7Opcodes.h b/rpcs3/Emu/ARMv7/ARMv7Opcodes.h
index 7a7f0e7e53..ed415bf2a2 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Opcodes.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Opcodes.h
@@ -1,16 +1,8 @@
 #pragma once
-
+#if 0
 #include "Emu/ARMv7/ARMv7Thread.h"
 #include "Emu/ARMv7/ARMv7Interpreter.h"
 
-static const char* g_arm_reg_name[16] =
-{
-	"r0", "r1", "r2", "r3",
-	"r4", "r5", "r6", "r7",
-	"r8", "r9", "r10", "r11",
-	"r12", "sp", "lr", "pc",
-};
-#if 0
 using namespace ARMv7_instrs;
 
 struct ARMv7_Instruction
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
index abd6b2791f..e4b1d65291 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
@@ -106,7 +106,7 @@ void ARMv7Thread::DoRun()
 
 	case 1:
 	case 2:
-		m_dec = new ARMv7Decoder(*this);
+		m_dec = new ARMv7Decoder(context);
 	break;
 	}
 }
diff --git a/rpcs3/Emu/CPU/CPUDecoder.h b/rpcs3/Emu/CPU/CPUDecoder.h
index beb0027055..0a0aea1e0c 100644
--- a/rpcs3/Emu/CPU/CPUDecoder.h
+++ b/rpcs3/Emu/CPU/CPUDecoder.h
@@ -5,7 +5,7 @@
 class CPUDecoder
 {
 public:
-	virtual u8 DecodeMemory(const u32 address)=0;
+	virtual u32 DecodeMemory(const u32 address) = 0;
 
 	virtual ~CPUDecoder() = default;
 };
diff --git a/rpcs3/Emu/Cell/PPCDecoder.cpp b/rpcs3/Emu/Cell/PPCDecoder.cpp
index de2b55fdf9..6425cf7c7a 100644
--- a/rpcs3/Emu/Cell/PPCDecoder.cpp
+++ b/rpcs3/Emu/Cell/PPCDecoder.cpp
@@ -2,7 +2,7 @@
 #include "Emu/Memory/Memory.h"
 #include "PPCDecoder.h"
 
-u8 PPCDecoder::DecodeMemory(const u32 address)
+u32 PPCDecoder::DecodeMemory(const u32 address)
 {
 	u32 instr = vm::read32(address);
 	Decode(instr);
diff --git a/rpcs3/Emu/Cell/PPCDecoder.h b/rpcs3/Emu/Cell/PPCDecoder.h
index b13ab08efd..a653f06e81 100644
--- a/rpcs3/Emu/Cell/PPCDecoder.h
+++ b/rpcs3/Emu/Cell/PPCDecoder.h
@@ -5,9 +5,9 @@
 class PPCDecoder : public CPUDecoder
 {
 public:
-	virtual void Decode(const u32 code)=0;
+	virtual void Decode(const u32 code) = 0;
 
-	virtual u8 DecodeMemory(const u32 address);
+	virtual u32 DecodeMemory(const u32 address);
 
 	virtual ~PPCDecoder() = default;
 };
diff --git a/rpcs3/Emu/Cell/SPURecompiler.h b/rpcs3/Emu/Cell/SPURecompiler.h
index 1b977a6e52..1b85a16d21 100644
--- a/rpcs3/Emu/Cell/SPURecompiler.h
+++ b/rpcs3/Emu/Cell/SPURecompiler.h
@@ -45,7 +45,7 @@ public:
 
 	virtual void Decode(const u32 code);
 
-	virtual u8 DecodeMemory(const u32 address);
+	virtual u32 DecodeMemory(const u32 address);
 };
 
 #define c (*compiler)
diff --git a/rpcs3/Emu/Cell/SPURecompilerCore.cpp b/rpcs3/Emu/Cell/SPURecompilerCore.cpp
index 197f42987e..a829019603 100644
--- a/rpcs3/Emu/Cell/SPURecompilerCore.cpp
+++ b/rpcs3/Emu/Cell/SPURecompilerCore.cpp
@@ -180,7 +180,7 @@ void SPURecompilerCore::Compile(u16 pos)
 	first = false;
 }
 
-u8 SPURecompilerCore::DecodeMemory(const u32 address)
+u32 SPURecompilerCore::DecodeMemory(const u32 address)
 {
 	assert(CPU.ls_offset == address - CPU.PC);
 	const u32 m_offset = CPU.ls_offset;
diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp
index 988d1d779c..80906f88ca 100644
--- a/rpcs3/Loader/ELF32.cpp
+++ b/rpcs3/Loader/ELF32.cpp
@@ -6,6 +6,7 @@
 #include "ELF32.h"
 #include "Emu/Cell/SPUThread.h"
 #include "Emu/ARMv7/ARMv7Thread.h"
+#include "Emu/ARMv7/ARMv7Decoder.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 #include "Emu/System.h"
 
@@ -98,17 +99,8 @@ namespace loader
 
 				u32 entry = 0; // actual entry point (ELFs entry point is ignored)
 				u32 fnid_addr = 0;
-
-				// load section names
-				//assert(m_ehdr.data_le.e_shstrndx < m_shdrs.size());
-				//const u32 sname_off = m_shdrs[m_ehdr.data_le.e_shstrndx].data_le.sh_offset;
-				//const u32 sname_size = m_shdrs[m_ehdr.data_le.e_shstrndx].data_le.sh_size;
-				//const u32 sname_base = sname_size ? Memory.PSV.RAM.AllocAlign(sname_size) : 0;
-				//if (sname_base)
-				//{
-				//	m_stream->Seek(handler::get_stream_offset() + sname_off);
-				//	m_stream->Read(vm::get_ptr<void>(sname_base), sname_size);
-				//}
+				u32 code_start = 0;
+				u32 code_end = 0;
 
 				for (auto& shdr : m_shdrs)
 				{
@@ -125,7 +117,14 @@ namespace loader
 						name.push_back(c);
 					}
 
-					if (!strcmp(name.c_str(), ".sceModuleInfo.rodata"))
+					if (!strcmp(name.c_str(), ".text"))
+					{
+						LOG_NOTICE(LOADER, ".text analysis...");
+
+						code_start = shdr.data_le.sh_addr;
+						code_end = shdr.data_le.sh_size + code_start;
+					}
+					else if (!strcmp(name.c_str(), ".sceModuleInfo.rodata"))
 					{
 						LOG_NOTICE(LOADER, ".sceModuleInfo.rodata analysis...");
 
@@ -190,6 +189,8 @@ namespace loader
 								vm::psv::write16(addr + 2, 0); // index 0 (unimplemented stub)
 								vm::psv::write32(addr + 4, nid); // nid
 							}
+
+							code_end = std::min<u32>(addr, code_end);
 						}
 					}
 					else if (!strcmp(name.c_str(), ".sceRefs.rodata"))
@@ -238,6 +239,8 @@ namespace loader
 					}
 				}
 
+				armv7_decoder_initialize(code_start, code_end);
+
 				arm7_thread(entry & ~1 /* TODO: Thumb/ARM encoding selection */, "main_thread").args({ Emu.GetPath()/*, "-emu"*/ }).run();
 				break;
 			}
diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp
index 706aee8000..c943495597 100644
--- a/rpcs3/Loader/ELF64.cpp
+++ b/rpcs3/Loader/ELF64.cpp
@@ -516,7 +516,7 @@ namespace loader
 
 									if (module && !module->Load(nid))
 									{
-										LOG_WARNING(LOADER, "Unimplemented function '%s' in '%s' module (HLE)", SysCalls::GetHLEFuncName(nid).c_str(), module_name.c_str());
+										LOG_ERROR(LOADER, "Unimplemented function '%s' in '%s' module (HLE)", SysCalls::GetHLEFuncName(nid).c_str(), module_name.c_str());
 									}
 									else //if (Ini.HLELogging.GetValue())
 									{

From 1a5d5c96edc13b89d921bad766550ed4905f57a7 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Thu, 22 Jan 2015 00:39:25 +0300
Subject: [PATCH 13/70] Compilation fix

---
 rpcs3/Emu/CPU/CPUThread.cpp          | 2 +-
 rpcs3/Emu/CPU/CPUThread.h            | 2 +-
 rpcs3/Emu/Cell/PPULLVMRecompiler.cpp | 2 +-
 rpcs3/Emu/Cell/PPULLVMRecompiler.h   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp
index df64539f20..a69ec8338a 100644
--- a/rpcs3/Emu/CPU/CPUThread.cpp
+++ b/rpcs3/Emu/CPU/CPUThread.cpp
@@ -115,7 +115,7 @@ void CPUThread::SetEntry(const u32 pc)
 	entry = pc;
 }
 
-void CPUThread::NextPc(u8 instr_size)
+void CPUThread::NextPc(u32 instr_size)
 {
 	if(m_is_branch)
 	{
diff --git a/rpcs3/Emu/CPU/CPUThread.h b/rpcs3/Emu/CPU/CPUThread.h
index 7261d0f28d..dd79700c65 100644
--- a/rpcs3/Emu/CPU/CPUThread.h
+++ b/rpcs3/Emu/CPU/CPUThread.h
@@ -132,7 +132,7 @@ public:
 
 	int ThreadStatus();
 
-	void NextPc(u8 instr_size);
+	void NextPc(u32 instr_size);
 	void SetBranch(const u32 pc, bool record_branch = false);
 	void SetPc(const u32 pc);
 	void SetEntry(const u32 entry);
diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp
index c14d0a4131..5678d5f9d9 100644
--- a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp
+++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp
@@ -6030,7 +6030,7 @@ ppu_recompiler_llvm::ExecutionEngine::~ExecutionEngine() {
 
 }
 
-u8 ppu_recompiler_llvm::ExecutionEngine::DecodeMemory(const u32 address) {
+u32 ppu_recompiler_llvm::ExecutionEngine::DecodeMemory(const u32 address) {
     ExecuteFunction(&m_ppu, 0);
     return 0;
 }
diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.h b/rpcs3/Emu/Cell/PPULLVMRecompiler.h
index 715e9f08ab..40a9472e1e 100644
--- a/rpcs3/Emu/Cell/PPULLVMRecompiler.h
+++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.h
@@ -1128,7 +1128,7 @@ namespace ppu_recompiler_llvm {
         ExecutionEngine & operator = (const ExecutionEngine & other) = delete;
         ExecutionEngine & operator = (ExecutionEngine && other) = delete;
 
-        u8 DecodeMemory(const u32 address) override;
+        u32 DecodeMemory(const u32 address) override;
 
     private:
         /// PPU processor context

From ec3c8999553e875400b361d908c6096a02ebbb2b Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Thu, 22 Jan 2015 02:12:49 +0300
Subject: [PATCH 14/70] Some bug fixed

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp     |  9 +++++--
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 37 +++++++++++++++++++++++++---
 rpcs3/Emu/ARMv7/ARMv7Interpreter.h   |  2 ++
 rpcs3/Loader/ELF32.cpp               |  5 +++-
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index 179e461aed..521b62502d 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -25,8 +25,8 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 {
 	ARMv7_OP2(0xffff, 0x0000, T1, NULL_OP), // ???
 
-	ARMv7_OP4(0xffff, 0x0000, 0xf870, 0x0000, T1, HACK), // "Undefined" Thumb opcode
-	ARMv7_OP4(0x0ff0, 0x00f0, 0x0070, 0x0090, A1, HACK), // "Undefined" ARM opcode
+	ARMv7_OP4(0xffff, 0x0000, 0xf870, 0x0000, T1, HACK), // "Undefined" Thumb opcode used
+	ARMv7_OP4(0x0ff0, 0x00f0, 0x0070, 0x0090, A1, HACK), // "Undefined" ARM opcode used
 
 	ARMv7_OP4(0xfbe0, 0x8000, 0xf140, 0x0000, T1, ADC_IMM),
 	ARMv7_OP4(0x0fe0, 0x0000, 0x02a0, 0x0000, A1, ADC_IMM),
@@ -594,6 +594,11 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP2(0xffff, 0xbf10, T1, YIELD),
 	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8001, T2, YIELD),
 	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf001, A1, YIELD),
+
+	ARMv7_OP4(0xff10, 0x0010, 0xee10, 0x0010, T1, MRC_),
+	ARMv7_OP4(0x0f10, 0x0010, 0x0e10, 0x0010, A1, MRC_),
+	ARMv7_OP4(0xff10, 0x0010, 0xfe10, 0x0010, T2, MRC_),
+	ARMv7_OP4(0xff10, 0x0010, 0xfe10, 0x0010, A2, MRC_),
 };
 
 struct ARMv7_op2_table_t
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index c03c963075..e9e865f6c6 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -257,13 +257,13 @@ bool ARMv7_instrs::ConditionPassed(ARMv7Context& context, u32 cond)
 // instructions
 void ARMv7_instrs::UNK(ARMv7Context& context, const ARMv7Code code)
 {
-	LOG_ERROR(HLE, "Unknown/illegal opcode! (0x%04x : 0x%04x)", code.data >> 16, code.data & 0xffff);
+	LOG_ERROR(HLE, "Unknown/illegal opcode: 0x%04x 0x%04x", code.code1, code.code0);
 	Emu.Pause();
 }
 
 void ARMv7_instrs::NULL_OP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	LOG_ERROR(HLE, "Null opcode found: data = 0x%x", code.data);
+	LOG_ERROR(HLE, "Null opcode found: 0x%04x 0x%04x", code.code1, code.code0);
 	Emu.Pause();
 }
 
@@ -687,7 +687,7 @@ void ARMv7_instrs::B(ARMv7Context& context, const ARMv7Code code, const ARMv7_en
 	}
 	case T3:
 	{
-		cond = (code.data >> 6) & 0xf;
+		cond = (code.data >> 22) & 0xf;
 		if (cond >= 0xe)
 		{
 			throw "B_T3: Related encodings";
@@ -4854,3 +4854,34 @@ void ARMv7_instrs::YIELD(ARMv7Context& context, const ARMv7Code code, const ARMv
 	default: throw __FUNCTION__;
 	}
 }
+
+
+void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	u32 cond = context.ITSTATE.advance();
+	u32 t = 0;
+	u32 cp = 0;
+
+	switch (type)
+	{
+	case T1:
+	case A1:
+	{
+		t = (code.data & 0xf000) >> 12;
+		cp = (code.data & 0xf00) >> 8;
+
+		if (cp - 10 < 2)
+		{
+			throw "Advanced SIMD and VFP";
+		}
+		break;
+	}
+	default: throw __FUNCTION__;
+	}
+
+	if (ConditionPassed(context, cond))
+	{
+		LOG_ERROR(ARMv7, "Bad instruction (MRC): 0x%04x 0x%04x", code.code1, code.code0);
+		throw __FUNCTION__;
+	}
+}
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
index 4f187e379b..88306e053f 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
@@ -526,4 +526,6 @@ namespace ARMv7_instrs
 	void WFE(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void WFI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void YIELD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+
+	void MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 };
diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp
index 80906f88ca..520fb8f991 100644
--- a/rpcs3/Loader/ELF32.cpp
+++ b/rpcs3/Loader/ELF32.cpp
@@ -215,6 +215,7 @@ namespace loader
 								const u32 addr = *++code;
 								vm::psv::write16(addr + 0, 0xf240 | (data & 0x800) >> 1 | (data & 0xf000) >> 12); // MOVW
 								vm::psv::write16(addr + 2, 0x0c00 | (data & 0x700) << 4 | (data & 0xff));
+								LOG_NOTICE(LOADER, "sceRefs: movw written at 0x%x (data=0x%x)", addr, data);
 								break;
 							}
 							case 0x00000030:
@@ -223,16 +224,18 @@ namespace loader
 								const u32 addr = *++code;
 								vm::psv::write16(addr + 0, 0xf2c0 | (data & 0x8000000) >> 17 | (data & 0xf0000000) >> 28); // MOVT
 								vm::psv::write16(addr + 2, 0x0c00 | (data & 0x7000000) >> 12 | (data & 0xff0000) >> 16);
+								LOG_NOTICE(LOADER, "sceRefs: movt written at 0x%x (data=0x%x)", addr, data);
 								break;
 							}
 							case 0x00000000:
 							{
 								// probably, no operation
+								LOG_NOTICE(LOADER, "sceRefs: zero code");
 								break;
 							}
 							default:
 							{
-								LOG_NOTICE(LOADER, "sceRefs: unknown code found (0x%08x)", *code);
+								LOG_ERROR(LOADER, "sceRefs: unknown code found (0x%08x)", *code);
 							}
 							}
 						}

From 07a2e0b55a86eca3c50d7492b38ca49152e68d33 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Thu, 22 Jan 2015 02:45:50 +0300
Subject: [PATCH 15/70] fmt::format fixed

---
 Utilities/StrFmt.cpp |  4 +-
 Utilities/StrFmt.h   | 90 ++++++++------------------------------------
 2 files changed, 17 insertions(+), 77 deletions(-)

diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp
index 4c8c43cdf2..0b8410e2f4 100644
--- a/Utilities/StrFmt.cpp
+++ b/Utilities/StrFmt.cpp
@@ -96,9 +96,9 @@ size_t fmt::detail::get_fmt_len(const char* fmt, size_t len)
 		fmt += 2;
 		len -= 2;
 
-		if (fmt[1] == '1')
+		if (fmt[0] == '1')
 		{
-			assert(len >= 3 && fmt[2] - '0' < 7);
+			assert(len >= 3 && fmt[1] - '0' < 7);
 			res++;
 			fmt++;
 			len--;
diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h
index 36a1ee4abb..ef8842062a 100644
--- a/Utilities/StrFmt.h
+++ b/Utilities/StrFmt.h
@@ -435,24 +435,6 @@ namespace fmt
 			}
 		};
 
-		template<>
-		struct get_fmt<char*>
-		{
-			static std::string text(const char* fmt, size_t len, char* arg)
-			{
-				if (fmt[len - 1] == 's')
-				{
-					return arg;
-				}
-				else
-				{
-					throw "Invalid formatting (char*): " + std::string(fmt, len);
-				}
-
-				return{};
-			}
-		};
-
 		template<>
 		struct get_fmt<const char*>
 		{
@@ -471,60 +453,6 @@ namespace fmt
 			}
 		};
 
-		//template<size_t size>
-		//struct get_fmt<char[size], false>
-		//{
-		//	static std::string text(const char* fmt, size_t len, const char(&arg)[size])
-		//	{
-		//		if (fmt[len - 1] == 's')
-		//		{
-		//			return std::string(arg, size);
-		//		}
-		//		else
-		//		{
-		//			throw "Invalid formatting (char[size]): " + std::string(fmt, len);
-		//		}
-
-		//		return{};
-		//	}
-		//};
-
-		//template<size_t size>
-		//struct get_fmt<const char[size], false>
-		//{
-		//	static std::string text(const char* fmt, size_t len, const char(&arg)[size])
-		//	{
-		//		if (fmt[len - 1] == 's')
-		//		{
-		//			return std::string(arg, size);
-		//		}
-		//		else
-		//		{
-		//			throw "Invalid formatting (const char[size]): " + std::string(fmt, len);
-		//		}
-
-		//		return{};
-		//	}
-		//};
-
-		template<>
-		struct get_fmt<std::string>
-		{
-			static std::string text(const char* fmt, size_t len, const std::string& arg)
-			{
-				if (fmt[len - 1] == 's')
-				{
-					return arg;
-				}
-				else
-				{
-					throw "Invalid formatting (std::string): " + std::string(fmt, len);
-				}
-
-				return{};
-			}
-		};
-
 		std::string format(const char* fmt, size_t len); // terminator
 
 		template<typename T, typename... Args>
@@ -549,6 +477,17 @@ namespace fmt
 		}
 	};
 
+	template<>
+	struct unveil<char*, false>
+	{
+		typedef const char* result_type;
+
+		__forceinline static result_type get_value(const char* arg)
+		{
+			return arg;
+		}
+	};
+
 	template<size_t N>
 	struct unveil<const char[N], false>
 	{
@@ -563,11 +502,11 @@ namespace fmt
 	template<>
 	struct unveil<std::string, false>
 	{
-		typedef const std::string& result_type;
+		typedef const char* result_type;
 
 		__forceinline static result_type get_value(const std::string& arg)
 		{
-			return arg;
+			return arg.c_str();
 		}
 	};
 
@@ -613,8 +552,9 @@ namespace fmt
 	float (%x, %f)
 	double (%x, %f)
 	bool (%x, %d, %s)
-	char*, const char*, std::string (%s)
+	char* (%s)
 
+	std::string forced to .c_str() (fmt::unveil)
 	be_t<> of any appropriate type in this list (fmt::unveil)
 	enum of any appropriate type in this list (fmt::unveil)
 

From 4246d83f2a9486602db35596eb82b6f887563463 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Thu, 22 Jan 2015 04:58:20 +0300
Subject: [PATCH 16/70] More opcodes

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp     | 98 ++++++++++++++++++++++++++++
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 29 +-------
 rpcs3/Emu/ARMv7/ARMv7Interpreter.h   |  5 +-
 3 files changed, 100 insertions(+), 32 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index 521b62502d..69ef8ba493 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -583,6 +583,104 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xef80, 0x0f50, 0xef80, 0x0500, T2, VABA_),
 	ARMv7_OP4(0xfe80, 0x0f50, 0xf280, 0x0500, A2, VABA_),
 
+	ARMv7_OP4(0xef80, 0x0f10, 0xef00, 0x0700, T1, VABD_),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0700, A1, VABD_),
+	ARMv7_OP4(0xef80, 0x0f50, 0xef80, 0x0700, T2, VABD_),
+	ARMv7_OP4(0xfe80, 0x0f50, 0xf280, 0x0700, A2, VABD_),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xff20, 0x0d00, T1, VABD_FP),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xf320, 0x0d00, A1, VABD_FP),
+
+	ARMv7_OP4(0xffb3, 0x0b90, 0xffb1, 0x0300, T1, VABS),
+	ARMv7_OP4(0xffb3, 0x0b90, 0xf3b1, 0x0300, A1, VABS),
+	ARMv7_OP4(0xffbf, 0x0ed0, 0xeeb0, 0x0ac0, T2, VABS),
+	ARMv7_OP4(0x0fbf, 0x0ed0, 0x0eb0, 0x0ac0, A2, VABS),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xff00, 0x0e10, T1, VAC__),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf300, 0x0e10, A1, VAC__),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xef00, 0x0800, T1, VADD),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf200, 0x0800, A1, VADD),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xef00, 0x0d00, T1, VADD_FP),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xf200, 0x0d00, A1, VADD_FP),
+	ARMv7_OP4(0xffb0, 0x0e50, 0xee30, 0x0a00, T2, VADD_FP),
+	ARMv7_OP4(0x0fb0, 0x0e50, 0x0e30, 0x0a00, A2, VADD_FP),
+
+	ARMv7_OP4(0xff80, 0x0f50, 0xef80, 0x0400, T1, VADDHN),
+	ARMv7_OP4(0xff80, 0x0f50, 0xf280, 0x0400, A1, VADDHN),
+
+	ARMv7_OP4(0xef80, 0x0e50, 0xef80, 0x0000, T1, VADD_),
+	ARMv7_OP4(0xfe80, 0x0e50, 0xf280, 0x0000, A1, VADD_),
+
+	ARMv7_OP4(0xffb0, 0x0f10, 0xef00, 0x0110, T1, VAND),
+	ARMv7_OP4(0xffb0, 0x0f10, 0xf200, 0x0110, A1, VAND),
+
+	ARMv7_OP4(0xefb8, 0x00b0, 0xef80, 0x0030, T1, VBIC_IMM),
+	ARMv7_OP4(0xfeb0, 0x00b0, 0xf280, 0x0030, A1, VBIC_IMM),
+	ARMv7_OP4(0xffb0, 0x0f10, 0xef10, 0x0110, T1, VBIC_REG),
+	ARMv7_OP4(0xffb0, 0x0f10, 0xf210, 0x0110, A1, VBIC_REG),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xff00, 0x0110, T1, VB__),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf300, 0x0110, A1, VB__),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xff00, 0x0810, T1, VCEQ_REG),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf300, 0x0810, A1, VCEQ_REG),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xef00, 0x0e00, T2, VCEQ_REG),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xf200, 0x0e00, A2, VCEQ_REG),
+	ARMv7_OP4(0xffb3, 0x0b90, 0xffb1, 0x0100, T1, VCEQ_ZERO),
+	ARMv7_OP4(0xffb3, 0x0b90, 0xf3b1, 0x0100, A1, VCEQ_ZERO),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef00, 0x0310, T1, VCGE_REG),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0310, A1, VCGE_REG),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xff00, 0x0e00, T2, VCGE_REG),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xf300, 0x0e00, A2, VCGE_REG),
+	ARMv7_OP4(0xffb3, 0x0b90, 0xffb1, 0x0080, T1, VCGE_ZERO),
+	ARMv7_OP4(0xffb3, 0x0b90, 0xf3b1, 0x0080, A1, VCGE_ZERO),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef00, 0x0300, T1, VCGT_REG),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0300, A1, VCGT_REG),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xff20, 0x0e00, T2, VCGT_REG),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xf320, 0x0e00, A2, VCGT_REG),
+	ARMv7_OP4(0xffb3, 0x0b90, 0xffb1, 0x0000, T1, VCGT_ZERO),
+	ARMv7_OP4(0xffb3, 0x0b90, 0xf3b1, 0x0000, A1, VCGT_ZERO),
+
+	ARMv7_OP4(0xffb3, 0x0b90, 0xffb1, 0x0180, T1, VCLE_ZERO),
+	ARMv7_OP4(0xffb3, 0x0b90, 0xf3b1, 0x0180, A1, VCLE_ZERO),
+
+	ARMv7_OP4(0xffb3, 0x0f90, 0xffb0, 0x0400, T1, VCLS),
+	ARMv7_OP4(0xffb3, 0x0f90, 0xf3b0, 0x0400, A1, VCLS),
+
+	ARMv7_OP4(0xffb3, 0x0b90, 0xffb1, 0x0200, T1, VCLT_ZERO),
+	ARMv7_OP4(0xffb3, 0x0b90, 0xf3b1, 0x0200, A1, VCLT_ZERO),
+
+	ARMv7_OP4(0xffb3, 0x0f90, 0xffb0, 0x0480, T1, VCLZ),
+	ARMv7_OP4(0xffb3, 0x0f90, 0xf3b0, 0x0480, A1, VCLZ),
+
+	ARMv7_OP4(0xffbf, 0x0e50, 0xeeb4, 0x0a40, T1, VCMP_),
+	ARMv7_OP4(0x0fbf, 0x0e50, 0x0eb4, 0x0a40, A1, VCMP_),
+	ARMv7_OP4(0xffbf, 0x0e7f, 0xeeb5, 0x0a40, T2, VCMP_),
+	ARMv7_OP4(0x0fbf, 0x0e7f, 0x0eb5, 0x0a40, A2, VCMP_),
+
+	ARMv7_OP4(0xffb3, 0x0f90, 0xffb0, 0x0500, T1, VCNT),
+	ARMv7_OP4(0xffb3, 0x0f90, 0xf3b0, 0x0500, A1, VCNT),
+
+	ARMv7_OP4(0xffb3, 0x0e10, 0xffb3, 0x0600, T1, VCVT_FIA),
+	ARMv7_OP4(0xffb3, 0x0e10, 0xf3b3, 0x0600, A1, VCVT_FIA),
+	ARMv7_OP4(0xffb8, 0x0e50, 0xeeb8, 0x0a40, T1, VCVT_FIF),
+	ARMv7_OP4(0x0fb8, 0x0e50, 0x0eb8, 0x0a40, A1, VCVT_FIF),
+
+	ARMv7_OP4(0xef80, 0x0e90, 0xef80, 0x0e10, T1, VCVT_FFA),
+	ARMv7_OP4(0xfe80, 0x0e90, 0xf280, 0x0e10, A1, VCVT_FFA),
+	ARMv7_OP4(0xffba, 0x0e50, 0xeeba, 0x0a40, T1, VCVT_FFF),
+	ARMv7_OP4(0x0fba, 0x0e50, 0x0eba, 0x0a40, A1, VCVT_FFF),
+
+	ARMv7_OP4(0xffbf, 0x0ed0, 0xeeb7, 0x0ac0, T1, VCVT_DF),
+	ARMv7_OP4(0x0fbf, 0x0ed0, 0x0eb7, 0x0ac0, A1, VCVT_DF),
+
+	ARMv7_OP4(0xffb3, 0x0ed0, 0xffb2, 0x0600, T1, VCVT_HFA),
+	ARMv7_OP4(0xffb3, 0x0ed0, 0xf3b2, 0x0600, A1, VCVT_HFA),
+	ARMv7_OP4(0xffbe, 0x0f50, 0xeeb2, 0x0a40, T1, VCVT_HFF),
+	ARMv7_OP4(0x0fbe, 0x0f50, 0x0eb2, 0x0a40, A1, VCVT_HFF),
+
 	// TODO: vector instructions
 
 	ARMv7_OP2(0xffff, 0xbf20, T1, WFE),
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index e9e865f6c6..3ecf868c80 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -3594,16 +3594,7 @@ void ARMv7_instrs::VADD_(ARMv7Context& context, const ARMv7Code code, const ARMv
 	}
 }
 
-void ARMv7_instrs::VAND_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	switch (type)
-	{
-	case A1: throw __FUNCTION__;
-	default: throw __FUNCTION__;
-	}
-}
-
-void ARMv7_instrs::VAND_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+void ARMv7_instrs::VAND(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3693,15 +3684,6 @@ void ARMv7_instrs::VCGT_ZERO(ARMv7Context& context, const ARMv7Code code, const
 	}
 }
 
-void ARMv7_instrs::VCLE_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	switch (type)
-	{
-	case A1: throw __FUNCTION__;
-	default: throw __FUNCTION__;
-	}
-}
-
 void ARMv7_instrs::VCLE_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
@@ -3720,15 +3702,6 @@ void ARMv7_instrs::VCLS(ARMv7Context& context, const ARMv7Code code, const ARMv7
 	}
 }
 
-void ARMv7_instrs::VCLT_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	switch (type)
-	{
-	case A1: throw __FUNCTION__;
-	default: throw __FUNCTION__;
-	}
-}
-
 void ARMv7_instrs::VCLT_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
index 88306e053f..d279a4258e 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
@@ -385,8 +385,7 @@ namespace ARMv7_instrs
 	void VADD_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VADDHN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VADD_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VAND_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VAND_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VAND(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VBIC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VBIC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VB__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
@@ -396,10 +395,8 @@ namespace ARMv7_instrs
 	void VCGE_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VCGT_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VCGT_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VCLE_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VCLE_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VCLS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VCLT_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VCLT_ZERO(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VCLZ(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VCMP_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);

From 3e40f22d15d42a82e3f14f293ca2b2a611cfc730 Mon Sep 17 00:00:00 2001
From: sb2130 <214009270@qq.com>
Date: Thu, 22 Jan 2015 13:44:33 +0800
Subject: [PATCH 17/70] small fix on loader::load(vfsStream& stream)

i->get_error_code() would have been changed in the if brace
---
 rpcs3/Loader/Loader.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Loader/Loader.cpp b/rpcs3/Loader/Loader.cpp
index debb40f589..47ef19c595 100644
--- a/rpcs3/Loader/Loader.cpp
+++ b/rpcs3/Loader/Loader.cpp
@@ -21,9 +21,11 @@ namespace loader
 
 				LOG_ERROR(LOADER, "loader::load() failed: %s", i->get_error_code().c_str());
 			}
-
-			LOG_ERROR(LOADER, "loader::init() failed: %s", i->get_error_code().c_str());
-			stream.Seek(i->get_stream_offset());
+			else
+			{
+				LOG_ERROR(LOADER, "loader::init() failed: %s", i->get_error_code().c_str());
+				stream.Seek(i->get_stream_offset());
+			}
 		}
 
 		return false;

From 15e946053baad7fdf9bdcdd07f2925ff52ad1936 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Thu, 22 Jan 2015 21:42:03 +0300
Subject: [PATCH 18/70] More opcodes

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp     | 314 ++++++++++++++++++++++++++-
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp |  84 +------
 rpcs3/Emu/ARMv7/ARMv7Interpreter.h   |  20 +-
 3 files changed, 325 insertions(+), 93 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index 69ef8ba493..90009b3987 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -587,6 +587,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0700, A1, VABD_),
 	ARMv7_OP4(0xef80, 0x0f50, 0xef80, 0x0700, T2, VABD_),
 	ARMv7_OP4(0xfe80, 0x0f50, 0xf280, 0x0700, A2, VABD_),
+
 	ARMv7_OP4(0xffa0, 0x0f10, 0xff20, 0x0d00, T1, VABD_FP),
 	ARMv7_OP4(0xffa0, 0x0f10, 0xf320, 0x0d00, A1, VABD_FP),
 
@@ -600,6 +601,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP4(0xff80, 0x0f10, 0xef00, 0x0800, T1, VADD),
 	ARMv7_OP4(0xff80, 0x0f10, 0xf200, 0x0800, A1, VADD),
+
 	ARMv7_OP4(0xffa0, 0x0f10, 0xef00, 0x0d00, T1, VADD_FP),
 	ARMv7_OP4(0xffa0, 0x0f10, 0xf200, 0x0d00, A1, VADD_FP),
 	ARMv7_OP4(0xffb0, 0x0e50, 0xee30, 0x0a00, T2, VADD_FP),
@@ -616,6 +618,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP4(0xefb8, 0x00b0, 0xef80, 0x0030, T1, VBIC_IMM),
 	ARMv7_OP4(0xfeb0, 0x00b0, 0xf280, 0x0030, A1, VBIC_IMM),
+
 	ARMv7_OP4(0xffb0, 0x0f10, 0xef10, 0x0110, T1, VBIC_REG),
 	ARMv7_OP4(0xffb0, 0x0f10, 0xf210, 0x0110, A1, VBIC_REG),
 
@@ -626,6 +629,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xff80, 0x0f10, 0xf300, 0x0810, A1, VCEQ_REG),
 	ARMv7_OP4(0xffa0, 0x0f10, 0xef00, 0x0e00, T2, VCEQ_REG),
 	ARMv7_OP4(0xffa0, 0x0f10, 0xf200, 0x0e00, A2, VCEQ_REG),
+
 	ARMv7_OP4(0xffb3, 0x0b90, 0xffb1, 0x0100, T1, VCEQ_ZERO),
 	ARMv7_OP4(0xffb3, 0x0b90, 0xf3b1, 0x0100, A1, VCEQ_ZERO),
 
@@ -633,6 +637,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0310, A1, VCGE_REG),
 	ARMv7_OP4(0xffa0, 0x0f10, 0xff00, 0x0e00, T2, VCGE_REG),
 	ARMv7_OP4(0xffa0, 0x0f10, 0xf300, 0x0e00, A2, VCGE_REG),
+
 	ARMv7_OP4(0xffb3, 0x0b90, 0xffb1, 0x0080, T1, VCGE_ZERO),
 	ARMv7_OP4(0xffb3, 0x0b90, 0xf3b1, 0x0080, A1, VCGE_ZERO),
 
@@ -640,6 +645,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0300, A1, VCGT_REG),
 	ARMv7_OP4(0xffa0, 0x0f10, 0xff20, 0x0e00, T2, VCGT_REG),
 	ARMv7_OP4(0xffa0, 0x0f10, 0xf320, 0x0e00, A2, VCGT_REG),
+
 	ARMv7_OP4(0xffb3, 0x0b90, 0xffb1, 0x0000, T1, VCGT_ZERO),
 	ARMv7_OP4(0xffb3, 0x0b90, 0xf3b1, 0x0000, A1, VCGT_ZERO),
 
@@ -665,11 +671,13 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP4(0xffb3, 0x0e10, 0xffb3, 0x0600, T1, VCVT_FIA),
 	ARMv7_OP4(0xffb3, 0x0e10, 0xf3b3, 0x0600, A1, VCVT_FIA),
+
 	ARMv7_OP4(0xffb8, 0x0e50, 0xeeb8, 0x0a40, T1, VCVT_FIF),
 	ARMv7_OP4(0x0fb8, 0x0e50, 0x0eb8, 0x0a40, A1, VCVT_FIF),
 
 	ARMv7_OP4(0xef80, 0x0e90, 0xef80, 0x0e10, T1, VCVT_FFA),
 	ARMv7_OP4(0xfe80, 0x0e90, 0xf280, 0x0e10, A1, VCVT_FFA),
+
 	ARMv7_OP4(0xffba, 0x0e50, 0xeeba, 0x0a40, T1, VCVT_FFF),
 	ARMv7_OP4(0x0fba, 0x0e50, 0x0eba, 0x0a40, A1, VCVT_FFF),
 
@@ -678,10 +686,314 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP4(0xffb3, 0x0ed0, 0xffb2, 0x0600, T1, VCVT_HFA),
 	ARMv7_OP4(0xffb3, 0x0ed0, 0xf3b2, 0x0600, A1, VCVT_HFA),
+
 	ARMv7_OP4(0xffbe, 0x0f50, 0xeeb2, 0x0a40, T1, VCVT_HFF),
 	ARMv7_OP4(0x0fbe, 0x0f50, 0x0eb2, 0x0a40, A1, VCVT_HFF),
 
-	// TODO: vector instructions
+	ARMv7_OP4(0xffb0, 0x0e50, 0xee80, 0x0a00, T1, VDIV),
+	ARMv7_OP4(0x0fb0, 0x0e50, 0x0e80, 0x0a00, A1, VDIV),
+
+	ARMv7_OP4(0xffb0, 0x0f90, 0xffb0, 0x0c00, T1, VDUP_S),
+	ARMv7_OP4(0xffb0, 0x0f90, 0xf3b0, 0x0c00, A1, VDUP_S),
+
+	ARMv7_OP4(0xff90, 0x0f5f, 0xee80, 0x0b10, T1, VDUP_R),
+	ARMv7_OP4(0x0f90, 0x0f5f, 0x0e80, 0x0b10, A1, VDUP_R),
+
+	ARMv7_OP4(0xffb0, 0x0f10, 0xff00, 0x0110, T1, VEOR),
+	ARMv7_OP4(0xffb0, 0x0f10, 0xf300, 0x0110, A1, VEOR),
+
+	ARMv7_OP4(0xffb0, 0x0010, 0xefb0, 0x0000, T1, VEXT),
+	ARMv7_OP4(0xffb0, 0x0010, 0xf2b0, 0x0000, A1, VEXT),
+
+	ARMv7_OP4(0xef80, 0x0b10, 0xef00, 0x0000, T1, VHADDSUB),
+	ARMv7_OP4(0xfe80, 0x0b10, 0xf200, 0x0000, A1, VHADDSUB),
+
+	ARMv7_OP4(0xffb0, 0x0f00, 0xf9a0, 0x0c00, T1, VLD1_SAL),
+	ARMv7_OP4(0xffb0, 0x0f00, 0xf4a0, 0x0c00, A1, VLD1_SAL),
+
+	ARMv7_OP4(0xffb0, 0x0300, 0xf9a0, 0x0000, T1, VLD1_SL),
+	ARMv7_OP4(0xffb0, 0x0300, 0xf4a0, 0x0000, A1, VLD1_SL),
+
+	ARMv7_OP4(0xffb0, 0x0f00, 0xf9a0, 0x0d00, T1, VLD2_SAL),
+	ARMv7_OP4(0xffb0, 0x0f00, 0xf4a0, 0x0d00, A1, VLD2_SAL),
+
+	ARMv7_OP4(0xffb0, 0x0300, 0xf9a0, 0x0100, T1, VLD2_SL),
+	ARMv7_OP4(0xffb0, 0x0300, 0xf4a0, 0x0100, A1, VLD2_SL),
+
+	ARMv7_OP4(0xffb0, 0x0f00, 0xf9a0, 0x0e00, T1, VLD3_SAL),
+	ARMv7_OP4(0xffb0, 0x0f00, 0xf4a0, 0x0e00, A1, VLD3_SAL),
+
+	ARMv7_OP4(0xffb0, 0x0300, 0xf9a0, 0x0200, T1, VLD3_SL),
+	ARMv7_OP4(0xffb0, 0x0300, 0xf4a0, 0x0200, A1, VLD3_SL),
+
+	ARMv7_OP4(0xffb0, 0x0f00, 0xf9a0, 0x0f00, T1, VLD4_SAL),
+	ARMv7_OP4(0xffb0, 0x0f00, 0xf4a0, 0x0f00, A1, VLD4_SAL),
+
+	ARMv7_OP4(0xffb0, 0x0300, 0xf9a0, 0x0300, T1, VLD4_SL),
+	ARMv7_OP4(0xffb0, 0x0300, 0xf4a0, 0x0300, A1, VLD4_SL),
+
+	ARMv7_OP4(0xffb0, 0x0000, 0xf920, 0x0000, T1, VLD__MS), // VLD1, VLD2, VLD3, VLD4
+	ARMv7_OP4(0xffb0, 0x0000, 0xf420, 0x0000, A1, VLD__MS),
+
+	ARMv7_OP4(0xfe10, 0x0f00, 0xec10, 0x0b00, T1, VLDM),
+	ARMv7_OP4(0x0e10, 0x0f00, 0x0c10, 0x0b00, A1, VLDM),
+	ARMv7_OP4(0xfe10, 0x0f00, 0xec10, 0x0a00, T2, VLDM),
+	ARMv7_OP4(0x0e10, 0x0f00, 0x0c10, 0x0a00, A2, VLDM),
+
+	ARMv7_OP4(0xff30, 0x0f00, 0xed10, 0x0b00, T1, VLDR),
+	ARMv7_OP4(0x0f30, 0x0f00, 0x0d10, 0x0b00, A1, VLDR),
+	ARMv7_OP4(0xff30, 0x0f00, 0xed10, 0x0a00, T2, VLDR),
+	ARMv7_OP4(0x0f30, 0x0f00, 0x0d10, 0x0a00, A2, VLDR),
+
+	ARMv7_OP4(0xef80, 0x0f00, 0xef00, 0x0600, T1, VMAXMIN),
+	ARMv7_OP4(0xfe80, 0x0f00, 0xf200, 0x0600, A1, VMAXMIN),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xef00, 0x0f00, T1, VMAXMIN_FP),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf200, 0x0f00, A1, VMAXMIN_FP),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef00, 0x0900, T1, VML__),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0900, A1, VML__),
+	ARMv7_OP4(0xef80, 0x0d50, 0xef80, 0x0800, T2, VML__),
+	ARMv7_OP4(0xfe80, 0x0d50, 0xf280, 0x0800, A2, VML__),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xef00, 0x0d10, T1, VML__FP),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf200, 0x0d10, A1, VML__FP),
+	ARMv7_OP4(0xffb0, 0x0e10, 0xee00, 0x0a00, T2, VML__FP),
+	ARMv7_OP4(0x0fb0, 0x0e10, 0x0e00, 0x0a00, A2, VML__FP),
+
+	ARMv7_OP4(0xef80, 0x0a50, 0xef80, 0x0040, T1, VML__S),
+	ARMv7_OP4(0xfe80, 0x0a50, 0xf280, 0x0040, A1, VML__S),
+	ARMv7_OP4(0xef80, 0x0b50, 0xef80, 0x0240, T2, VML__S),
+	ARMv7_OP4(0xfe80, 0x0b50, 0xf280, 0x0240, A2, VML__S),
+
+	ARMv7_OP4(0xefb8, 0x0090, 0xef80, 0x0010, T1, VMOV_IMM),
+	ARMv7_OP4(0xfeb8, 0x0090, 0xf280, 0x0010, A1, VMOV_IMM),
+	ARMv7_OP4(0xffb0, 0x0ef0, 0xeeb0, 0x0a00, T2, VMOV_IMM),
+	ARMv7_OP4(0x0fb0, 0x0ef0, 0x0eb0, 0x0a00, A2, VMOV_IMM),
+
+	ARMv7_OP4(0xffb0, 0x0f10, 0xef20, 0x0110, T1, VMOV_REG),
+	ARMv7_OP4(0xffb0, 0x0f10, 0xf220, 0x0110, A1, VMOV_REG),
+	ARMv7_OP4(0xffbf, 0x0ed0, 0xeeb0, 0x0a40, T2, VMOV_REG),
+	ARMv7_OP4(0x0fbf, 0x0ed0, 0x0eb0, 0x0a40, A2, VMOV_REG),
+
+	ARMv7_OP4(0xff90, 0x0f1f, 0xee00, 0x0b10, T1, VMOV_RS),
+	ARMv7_OP4(0x0f90, 0x0f1f, 0x0e00, 0x0b10, A1, VMOV_RS),
+
+	ARMv7_OP4(0xff10, 0x0f1f, 0xee10, 0x0b10, T1, VMOV_SR),
+	ARMv7_OP4(0x0f10, 0x0f1f, 0x0e10, 0x0b10, A1, VMOV_SR),
+
+	ARMv7_OP4(0xffe0, 0x0f7f, 0xee00, 0x0a10, T1, VMOV_RF),
+	ARMv7_OP4(0x0fe0, 0x0f7f, 0x0e00, 0x0a10, A1, VMOV_RF),
+
+	ARMv7_OP4(0xffe0, 0x0fd0, 0xec40, 0x0a10, T1, VMOV_2RF),
+	ARMv7_OP4(0x0fe0, 0x0fd0, 0x0c40, 0x0a10, A1, VMOV_2RF),
+
+	ARMv7_OP4(0xffe0, 0x0fd0, 0xec40, 0x0b10, T1, VMOV_2RD),
+	ARMv7_OP4(0x0fe0, 0x0fd0, 0x0c40, 0x0b10, A1, VMOV_2RD),
+	
+	ARMv7_OP4(0xef87, 0x0fd0, 0xef80, 0x0a10, T1, VMOVL),
+	ARMv7_OP4(0xfe87, 0x0fd0, 0xf280, 0x0a10, A1, VMOVL),
+
+	ARMv7_OP4(0xffb3, 0x0fd0, 0xffb2, 0x0200, T1, VMOVN),
+	ARMv7_OP4(0xffb3, 0x0fd0, 0xf3b2, 0x0200, A1, VMOVN),
+
+	ARMv7_OP4(0xffff, 0x0fff, 0xeef1, 0x0a10, T1, VMRS),
+	ARMv7_OP4(0x0fff, 0x0fff, 0x0ef1, 0x0a10, A1, VMRS),
+
+	ARMv7_OP4(0xffff, 0x0fff, 0xeee1, 0x0a10, T1, VMSR),
+	ARMv7_OP4(0x0fff, 0x0fff, 0x0ee1, 0x0a10, A1, VMSR),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef00, 0x0910, T1, VMUL_),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0910, A1, VMUL_),
+	ARMv7_OP4(0xef80, 0x0d50, 0xef80, 0x0c00, T2, VMUL_),
+	ARMv7_OP4(0xfe80, 0x0d50, 0xf280, 0x0c00, A2, VMUL_),
+
+	ARMv7_OP4(0xffa0, 0x0f10, 0xff00, 0x0d10, T1, VMUL_FP),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xf300, 0x0d10, A1, VMUL_FP),
+	ARMv7_OP4(0xffb0, 0x0e50, 0xee20, 0x0a00, T2, VMUL_FP),
+	ARMv7_OP4(0x0fb0, 0x0e50, 0x0e20, 0x0a00, A2, VMUL_FP),
+
+	ARMv7_OP4(0xef80, 0x0e50, 0xef80, 0x0840, T1, VMUL_S),
+	ARMv7_OP4(0xfe80, 0x0e50, 0xf280, 0x0840, A1, VMUL_S),
+	ARMv7_OP4(0xef80, 0x0f50, 0xef80, 0x0a40, T2, VMUL_S),
+	ARMv7_OP4(0xfe80, 0x0f50, 0xf280, 0x0a40, A2, VMUL_S),
+
+	ARMv7_OP4(0xefb8, 0x00b0, 0xef80, 0x0030, T1, VMVN_IMM),
+	ARMv7_OP4(0xfeb8, 0x00b0, 0xf280, 0x0030, A1, VMVN_IMM),
+
+	ARMv7_OP4(0xffb3, 0x0f90, 0xffb0, 0x0580, T1, VMVN_REG),
+	ARMv7_OP4(0xffb3, 0x0f90, 0xf3b0, 0x0580, A1, VMVN_REG),
+
+	ARMv7_OP4(0xffb3, 0x0b90, 0xffb1, 0x0380, T1, VNEG),
+	ARMv7_OP4(0xffb3, 0x0b90, 0xf3b1, 0x0380, A1, VNEG),
+	ARMv7_OP4(0xffbf, 0x0ed0, 0xeeb1, 0x0a40, T2, VNEG),
+	ARMv7_OP4(0x0fbf, 0x0ed0, 0x0eb1, 0x0a40, A2, VNEG),
+
+	ARMv7_OP4(0xffb0, 0x0e10, 0xee10, 0x0a00, T1, VNM__),
+	ARMv7_OP4(0x0fb0, 0x0e10, 0x0e10, 0x0a00, A1, VNM__),
+	ARMv7_OP4(0xffb0, 0x0e50, 0xee20, 0x0a40, T2, VNM__),
+	ARMv7_OP4(0x0fb0, 0x0e50, 0x0e20, 0x0a40, A2, VNM__),
+
+	ARMv7_OP4(0xffb0, 0x0f10, 0xef30, 0x0110, T1, VORN_REG),
+	ARMv7_OP4(0xffb0, 0x0f10, 0xf230, 0x0110, A1, VORN_REG),
+
+	ARMv7_OP4(0xefb8, 0x00b0, 0xef80, 0x0010, T1, VORR_IMM),
+	ARMv7_OP4(0xfeb8, 0x00b0, 0xf280, 0x0010, A1, VORR_IMM),
+
+	ARMv7_OP4(0xffb0, 0x0f10, 0xef20, 0x0110, T1, VORR_REG),
+	ARMv7_OP4(0xffb0, 0x0f10, 0xf220, 0x0110, A1, VORR_REG),
+
+	ARMv7_OP4(0xffb3, 0x0f10, 0xffb0, 0x0600, T1, VPADAL),
+	ARMv7_OP4(0xffb3, 0x0f10, 0xf3b0, 0x0600, A1, VPADAL),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xef00, 0x0b10, T1, VPADD),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf200, 0x0b10, A1, VPADD),
+
+	ARMv7_OP4(0xffa0, 0x0f10, 0xff00, 0x0d00, T1, VPADD_FP),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xf300, 0x0d00, A1, VPADD_FP),
+
+	ARMv7_OP4(0xffb3, 0x0f10, 0xffb0, 0x0200, T1, VPADDL),
+	ARMv7_OP4(0xffb3, 0x0f10, 0xf3b0, 0x0200, A1, VPADDL),
+
+	ARMv7_OP4(0xef80, 0x0f00, 0xef00, 0x0a00, T1, VPMAXMIN),
+	ARMv7_OP4(0xfe80, 0x0f00, 0xf200, 0x0a00, A1, VPMAXMIN),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xff00, 0x0f00, T1, VPMAXMIN_FP),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf300, 0x0f00, A1, VPMAXMIN_FP),
+
+	ARMv7_OP4(0xffbf, 0x0f00, 0xecbd, 0x0b00, T1, VPOP),
+	ARMv7_OP4(0x0fbf, 0x0f00, 0x0cbd, 0x0b00, A1, VPOP),
+	ARMv7_OP4(0xffbf, 0x0f00, 0xecbd, 0x0a00, T2, VPOP),
+	ARMv7_OP4(0x0fbf, 0x0f00, 0x0cbd, 0x0a00, A2, VPOP),
+
+	ARMv7_OP4(0xffbf, 0x0f00, 0xed2d, 0x0b00, T1, VPUSH),
+	ARMv7_OP4(0x0fbf, 0x0f00, 0x0d2d, 0x0b00, A1, VPUSH),
+	ARMv7_OP4(0xffbf, 0x0f00, 0xed2d, 0x0a00, T2, VPUSH),
+	ARMv7_OP4(0x0fbf, 0x0f00, 0x0d2d, 0x0a00, A2, VPUSH),
+
+	// TODO: VQ* instructions
+
+	ARMv7_OP4(0xff80, 0x0f50, 0xff80, 0x0400, T1, VRADDHN),
+	ARMv7_OP4(0xff80, 0x0f50, 0xf380, 0x0400, A1, VRADDHN),
+
+	ARMv7_OP4(0xffb3, 0x0e90, 0xffb3, 0x0400, T1, VRECPE),
+	ARMv7_OP4(0xffb3, 0x0e90, 0xf3b3, 0x0400, A1, VRECPE),
+
+	ARMv7_OP4(0xffa0, 0x0f10, 0xef00, 0x0f10, T1, VRECPS),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xf200, 0x0f10, A1, VRECPS),
+
+	ARMv7_OP4(0xffb3, 0x0e10, 0xffb0, 0x0000, T1, VREV__),
+	ARMv7_OP4(0xffb3, 0x0e10, 0xf3b0, 0x0000, A1, VREV__),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef00, 0x0100, T1, VRHADD),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0100, A1, VRHADD),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef00, 0x0500, T1, VRSHL),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0500, A1, VRSHL),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef80, 0x0210, T1, VRSHR),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf280, 0x0210, A1, VRSHR),
+
+	ARMv7_OP4(0xff80, 0x0fd0, 0xef80, 0x0850, T1, VRSHRN),
+	ARMv7_OP4(0xff80, 0x0fd0, 0xf280, 0x0850, A1, VRSHRN),
+
+	ARMv7_OP4(0xffb3, 0x0e90, 0xffb3, 0x0480, T1, VRSQRTE),
+	ARMv7_OP4(0xffb3, 0x0e90, 0xf3b3, 0x0480, A1, VRSQRTE),
+
+	ARMv7_OP4(0xffa0, 0x0f10, 0xef20, 0x0f10, T1, VRSQRTS),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xf220, 0x0f10, A1, VRSQRTS),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef80, 0x0310, T1, VRSRA),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf280, 0x0310, A1, VRSRA),
+
+	ARMv7_OP4(0xff80, 0x0f50, 0xff80, 0x0600, T1, VRSUBHN),
+	ARMv7_OP4(0xff80, 0x0f50, 0xf380, 0x0600, A1, VRSUBHN),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xef80, 0x0510, T1, VSHL_IMM),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf280, 0x0510, A1, VSHL_IMM),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef00, 0x0400, T1, VSHL_REG),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf200, 0x0400, A1, VSHL_REG),
+
+	ARMv7_OP4(0xef80, 0x0fd0, 0xef80, 0x0a10, T1, VSHLL),
+	ARMv7_OP4(0xfe80, 0x0fd0, 0xf280, 0x0a10, A1, VSHLL),
+	ARMv7_OP4(0xffb3, 0x0fd0, 0xffb2, 0x0300, T2, VSHLL),
+	ARMv7_OP4(0xffb3, 0x0fd0, 0xf3b2, 0x0300, A2, VSHLL),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef80, 0x0010, T1, VSHR),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf280, 0x0010, A1, VSHR),
+	
+	ARMv7_OP4(0xff80, 0x0fd0, 0xef80, 0x0810, T1, VSHRN),
+	ARMv7_OP4(0xff80, 0x0fd0, 0xf280, 0x0810, A1, VSHRN),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xff80, 0x0510, T1, VSLI),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf380, 0x0510, A1, VSLI),
+
+	ARMv7_OP4(0xffbf, 0x0ed0, 0xeeb1, 0x0ac0, T1, VSQRT),
+	ARMv7_OP4(0x0fbf, 0x0ed0, 0x0eb1, 0x0ac0, A1, VSQRT),
+
+	ARMv7_OP4(0xef80, 0x0f10, 0xef80, 0x0110, T1, VSRA),
+	ARMv7_OP4(0xfe80, 0x0f10, 0xf280, 0x0110, A1, VSRA),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xff80, 0x0410, T1, VSRI),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf380, 0x0410, A1, VSRI),
+
+	ARMv7_OP4(0xffb0, 0x0000, 0xf900, 0x0000, T1, VST__MS), // VST1, VST2, VST3, VST4
+	ARMv7_OP4(0xffb0, 0x0000, 0xf400, 0x0000, A1, VST__MS),
+
+	ARMv7_OP4(0xffb0, 0x0300, 0xf980, 0x0000, T1, VST1_SL),
+	ARMv7_OP4(0xffb0, 0x0300, 0xf480, 0x0000, A1, VST1_SL),
+
+	ARMv7_OP4(0xffb0, 0x0300, 0xf980, 0x0100, T1, VST2_SL),
+	ARMv7_OP4(0xffb0, 0x0300, 0xf480, 0x0100, A1, VST2_SL),
+
+	ARMv7_OP4(0xffb0, 0x0300, 0xf980, 0x0200, T1, VST3_SL),
+	ARMv7_OP4(0xffb0, 0x0300, 0xf480, 0x0200, A1, VST3_SL),
+
+	ARMv7_OP4(0xffb0, 0x0300, 0xf980, 0x0300, T1, VST4_SL),
+	ARMv7_OP4(0xffb0, 0x0300, 0xf480, 0x0300, A1, VST4_SL),
+
+	ARMv7_OP4(0xfe10, 0x0f00, 0xec00, 0x0b00, T1, VSTM),
+	ARMv7_OP4(0x0e10, 0x0f00, 0x0c00, 0x0b00, A1, VSTM),
+	ARMv7_OP4(0xfe10, 0x0f00, 0xec00, 0x0a00, T2, VSTM),
+	ARMv7_OP4(0x0e10, 0x0f00, 0x0c00, 0x0a00, A2, VSTM),
+
+	ARMv7_OP4(0xff30, 0x0f00, 0xed00, 0x0b00, T1, VSTR),
+	ARMv7_OP4(0x0f30, 0x0f00, 0x0d00, 0x0b00, A1, VSTR),
+	ARMv7_OP4(0xff30, 0x0f00, 0xed00, 0x0a00, T2, VSTR),
+	ARMv7_OP4(0x0f30, 0x0f00, 0x0d00, 0x0a00, A2, VSTR),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xff00, 0x0800, T1, VSUB),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf300, 0x0800, A1, VSUB),
+
+	ARMv7_OP4(0xffa0, 0x0f10, 0xef20, 0x0d00, T1, VSUB_FP),
+	ARMv7_OP4(0xffa0, 0x0f10, 0xf220, 0x0d00, A1, VSUB_FP),
+	ARMv7_OP4(0xffb0, 0x0e50, 0xee30, 0x0a40, T2, VSUB_FP),
+	ARMv7_OP4(0x0fb0, 0x0e50, 0x0e30, 0x0a40, A2, VSUB_FP),
+
+	ARMv7_OP4(0xff80, 0x0f50, 0xef80, 0x0600, T1, VSUBHN),
+	ARMv7_OP4(0xff80, 0x0f50, 0xf280, 0x0600, A1, VSUBHN),
+
+	ARMv7_OP4(0xef80, 0x0e50, 0xef80, 0x0200, T1, VSUB_),
+	ARMv7_OP4(0xfe80, 0x0e50, 0xf280, 0x0200, A1, VSUB_),
+
+	ARMv7_OP4(0xffb3, 0x0f90, 0xffb2, 0x0000, T1, VSWP),
+	ARMv7_OP4(0xffb3, 0x0f90, 0xf3b2, 0x0000, A1, VSWP),
+
+	ARMv7_OP4(0xffb0, 0x0c10, 0xffb0, 0x0800, T1, VTB_),
+	ARMv7_OP4(0xffb0, 0x0c10, 0xf3b0, 0x0800, A1, VTB_),
+
+	ARMv7_OP4(0xffb3, 0x0f90, 0xffb2, 0x0080, T1, VTRN),
+	ARMv7_OP4(0xffb3, 0x0f90, 0xf3b2, 0x0080, A1, VTRN),
+
+	ARMv7_OP4(0xff80, 0x0f10, 0xef00, 0x0810, T1, VTST),
+	ARMv7_OP4(0xff80, 0x0f10, 0xf200, 0x0810, A1, VTST),
+
+	ARMv7_OP4(0xffb3, 0x0f90, 0xffb2, 0x0100, T1, VUZP),
+	ARMv7_OP4(0xffb3, 0x0f90, 0xf3b2, 0x0100, A1, VUZP),
+
+	ARMv7_OP4(0xffb3, 0x0f90, 0xffb2, 0x0180, T1, VZIP),
+	ARMv7_OP4(0xffb3, 0x0f90, 0xf3b2, 0x0180, A1, VZIP),
 
 	ARMv7_OP2(0xffff, 0xbf20, T1, WFE),
 	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8002, T2, WFE),
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index 3ecf868c80..2488f1b1a9 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -3855,7 +3855,7 @@ void ARMv7_instrs::VHADDSUB(ARMv7Context& context, const ARMv7Code code, const A
 	}
 }
 
-void ARMv7_instrs::VLD1_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+void ARMv7_instrs::VLD__MS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -3882,15 +3882,6 @@ void ARMv7_instrs::VLD1_SAL(ARMv7Context& context, const ARMv7Code code, const A
 	}
 }
 
-void ARMv7_instrs::VLD2_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	switch (type)
-	{
-	case A1: throw __FUNCTION__;
-	default: throw __FUNCTION__;
-	}
-}
-
 void ARMv7_instrs::VLD2_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
@@ -3909,15 +3900,6 @@ void ARMv7_instrs::VLD2_SAL(ARMv7Context& context, const ARMv7Code code, const A
 	}
 }
 
-void ARMv7_instrs::VLD3_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	switch (type)
-	{
-	case A1: throw __FUNCTION__;
-	default: throw __FUNCTION__;
-	}
-}
-
 void ARMv7_instrs::VLD3_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
@@ -3936,15 +3918,6 @@ void ARMv7_instrs::VLD3_SAL(ARMv7Context& context, const ARMv7Code code, const A
 	}
 }
 
-void ARMv7_instrs::VLD4_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	switch (type)
-	{
-	case A1: throw __FUNCTION__;
-	default: throw __FUNCTION__;
-	}
-}
-
 void ARMv7_instrs::VLD4_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
@@ -4008,7 +3981,7 @@ void ARMv7_instrs::VML__(ARMv7Context& context, const ARMv7Code code, const ARMv
 	}
 }
 
-void ARMv7_instrs::VML_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+void ARMv7_instrs::VML__FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -4071,7 +4044,7 @@ void ARMv7_instrs::VMOV_RF(ARMv7Context& context, const ARMv7Code code, const AR
 	}
 }
 
-void ARMv7_instrs::VMOV_RF2(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+void ARMv7_instrs::VMOV_2RF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -4080,7 +4053,7 @@ void ARMv7_instrs::VMOV_RF2(ARMv7Context& context, const ARMv7Code code, const A
 	}
 }
 
-void ARMv7_instrs::VMOV_RD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+void ARMv7_instrs::VMOV_2RD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -4188,15 +4161,6 @@ void ARMv7_instrs::VNM__(ARMv7Context& context, const ARMv7Code code, const ARMv
 	}
 }
 
-void ARMv7_instrs::VORN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	switch (type)
-	{
-	case A1: throw __FUNCTION__;
-	default: throw __FUNCTION__;
-	}
-}
-
 void ARMv7_instrs::VORN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
@@ -4611,7 +4575,7 @@ void ARMv7_instrs::VSRI(ARMv7Context& context, const ARMv7Code code, const ARMv7
 	}
 }
 
-void ARMv7_instrs::VST1_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+void ARMv7_instrs::VST__MS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
@@ -4629,15 +4593,6 @@ void ARMv7_instrs::VST1_SL(ARMv7Context& context, const ARMv7Code code, const AR
 	}
 }
 
-void ARMv7_instrs::VST2_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	switch (type)
-	{
-	case A1: throw __FUNCTION__;
-	default: throw __FUNCTION__;
-	}
-}
-
 void ARMv7_instrs::VST2_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
@@ -4647,15 +4602,6 @@ void ARMv7_instrs::VST2_SL(ARMv7Context& context, const ARMv7Code code, const AR
 	}
 }
 
-void ARMv7_instrs::VST3_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	switch (type)
-	{
-	case A1: throw __FUNCTION__;
-	default: throw __FUNCTION__;
-	}
-}
-
 void ARMv7_instrs::VST3_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
@@ -4665,15 +4611,6 @@ void ARMv7_instrs::VST3_SL(ARMv7Context& context, const ARMv7Code code, const AR
 	}
 }
 
-void ARMv7_instrs::VST4_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	switch (type)
-	{
-	case A1: throw __FUNCTION__;
-	default: throw __FUNCTION__;
-	}
-}
-
 void ARMv7_instrs::VST4_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
@@ -4746,16 +4683,7 @@ void ARMv7_instrs::VSWP(ARMv7Context& context, const ARMv7Code code, const ARMv7
 	}
 }
 
-void ARMv7_instrs::VTBL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	switch (type)
-	{
-	case A1: throw __FUNCTION__;
-	default: throw __FUNCTION__;
-	}
-}
-
-void ARMv7_instrs::VTBX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+void ARMv7_instrs::VTB_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
 	{
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
index d279a4258e..14b044ac63 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
@@ -414,16 +414,13 @@ namespace ARMv7_instrs
 	void VEOR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VEXT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VHADDSUB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VLD1_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VLD__MS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VLD1_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VLD1_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VLD2_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VLD2_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VLD2_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VLD3_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VLD3_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VLD3_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VLD4_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VLD4_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VLD4_SAL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VLDM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
@@ -431,15 +428,15 @@ namespace ARMv7_instrs
 	void VMAXMIN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VMAXMIN_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VML__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VML_FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VML__FP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VML__S(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VMOV_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VMOV_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VMOV_RS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VMOV_SR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VMOV_RF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VMOV_RF2(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VMOV_RD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMOV_2RF(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VMOV_2RD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VMOVL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VMOVN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VMRS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
@@ -451,7 +448,6 @@ namespace ARMv7_instrs
 	void VMVN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VNEG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VNM__(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VORN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VORN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VORR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VORR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
@@ -498,13 +494,10 @@ namespace ARMv7_instrs
 	void VSQRT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VSRA(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VSRI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VST1_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VST__MS(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VST1_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VST2_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VST2_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VST3_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VST3_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VST4_MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VST4_SL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VSTM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VSTR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
@@ -513,8 +506,7 @@ namespace ARMv7_instrs
 	void VSUBHN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VSUB_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VSWP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VTBL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-	void VTBX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	void VTB_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VTRN(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VTST(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void VUZP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);

From e01528137e3c829d55a1137e3edb492789ec790c Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Thu, 22 Jan 2015 22:34:03 +0300
Subject: [PATCH 19/70] LDRH opcodes

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp | 134 ++++++++++++++++++++++++-------
 1 file changed, 107 insertions(+), 27 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index 90009b3987..4cfdc42fed 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -136,15 +136,6 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP2(0xff00, 0xbf00, T1, IT),
 
-	ARMv7_OP4(0xfff0, 0x0f00, 0xe850, 0x0f00, T1, LDREX),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x0190, 0x0f9f, A1, LDREX),
-	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f4f, T1, LDREXB),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x01d0, 0x0f9f, A1, LDREXB),
-	ARMv7_OP4(0xfff0, 0x00ff, 0xe8d0, 0x007f, T1, LDREXD),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x01b0, 0x0f9f, A1, LDREXD),
-	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f5f, T1, LDREXH),
-	ARMv7_OP4(0x0ff0, 0x0fff, 0x01f0, 0x0f9f, A1, LDREXH),
-
 	ARMv7_OP2(0xf800, 0xc800, T1, LDM),
 	ARMv7_OP4(0xffd0, 0x2000, 0xe890, 0x0000, T2, LDM),
 	ARMv7_OP4(0x0fd0, 0x0000, 0x0890, 0x0000, A1, LDM),
@@ -181,6 +172,25 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0x0f7f, 0x00f0, 0x014f, 0x00d0, A1, LDRD_LIT),
 	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00d0, A1, LDRD_REG),
 
+	ARMv7_OP4(0xfff0, 0x0f00, 0xe850, 0x0f00, T1, LDREX),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x0190, 0x0f9f, A1, LDREX),
+	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f4f, T1, LDREXB),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01d0, 0x0f9f, A1, LDREXB),
+	ARMv7_OP4(0xfff0, 0x00ff, 0xe8d0, 0x007f, T1, LDREXD),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01b0, 0x0f9f, A1, LDREXD),
+	ARMv7_OP4(0xfff0, 0x0fff, 0xe8d0, 0x0f5f, T1, LDREXH),
+	ARMv7_OP4(0x0ff0, 0x0fff, 0x01f0, 0x0f9f, A1, LDREXH),
+
+	ARMv7_OP2(0xf800, 0x8800, T1, LDRH_IMM),
+	ARMv7_OP4(0xfff0, 0x0000, 0xf8b0, 0x0000, T2, LDRH_IMM),
+	ARMv7_OP4(0xfff0, 0x0800, 0xf830, 0x0800, T3, LDRH_IMM),
+	ARMv7_OP4(0x0e50, 0x00f0, 0x0050, 0x00b0, A1, LDRH_IMM),
+	ARMv7_OP4(0xff7f, 0x0000, 0xf83f, 0x0000, T1, LDRH_LIT),
+	ARMv7_OP4(0x0f7f, 0x00f0, 0x015f, 0x00b0, A1, LDRH_LIT),
+	ARMv7_OP2(0xfe00, 0x5a00, T1, LDRH_REG),
+	ARMv7_OP4(0xfff0, 0x0fc0, 0xf830, 0x0000, T2, LDRH_REG),
+	ARMv7_OP4(0x0e50, 0x0ff0, 0x0010, 0x00b0, A1, LDRH_REG),
+
 	ARMv7_OP4(0xfff0, 0x0000, 0xf990, 0x0000, T1, LDRSB_IMM),
 	ARMv7_OP4(0xfff0, 0x0800, 0xf910, 0x0800, T2, LDRSB_IMM),
 	ARMv7_OP4(0x0e50, 0x00f0, 0x0050, 0x00d0, A1, LDRSB_IMM),
@@ -228,11 +238,18 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP2(0xffc0, 0x0000, T2, MOV_REG),
 	ARMv7_OP4(0xffef, 0xf0f0, 0xea4f, 0x0000, T3, MOV_REG),
 	ARMv7_OP4(0x0fef, 0x0ff0, 0x01a0, 0x0000, A1, MOV_REG),
+
 	ARMv7_OP4(0xfbf0, 0x8000, 0xf2c0, 0x0000, T1, MOVT),
 	ARMv7_OP4(0x0ff0, 0x0000, 0x0340, 0x0000, A1, MOVT),
 
+	ARMv7_OP4(0xff10, 0x0010, 0xee10, 0x0010, T1, MRC_),
+	ARMv7_OP4(0x0f10, 0x0010, 0x0e10, 0x0010, A1, MRC_),
+	ARMv7_OP4(0xff10, 0x0010, 0xfe10, 0x0010, T2, MRC_),
+	ARMv7_OP4(0xff10, 0x0010, 0xfe10, 0x0010, A2, MRC_),
+
 	ARMv7_OP4(0xffff, 0xf0ff, 0xf3ef, 0x8000, T1, MRS),
 	ARMv7_OP4(0x0fff, 0x0fff, 0x010f, 0x0000, A1, MRS),
+
 	ARMv7_OP4(0x0ff3, 0xf000, 0x0320, 0xf000, A1, MSR_IMM),
 	ARMv7_OP4(0xfff0, 0xf3ff, 0xf380, 0x8000, T1, MSR_REG),
 	ARMv7_OP4(0x0ff3, 0xfff0, 0x0120, 0xf000, A1, MSR_REG),
@@ -279,22 +296,31 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf080, T1, QADD),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0100, 0x0050, A1, QADD),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf010, T1, QADD16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f10, A1, QADD16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf010, T1, QADD8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f90, A1, QADD8),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf010, T1, QASX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f30, A1, QASX),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf090, T1, QDADD),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0140, 0x0050, A1, QDADD),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf0b0, T1, QDSUB),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0160, 0x0050, A1, QDSUB),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf010, T1, QSAX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f50, A1, QSAX),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf0a0, T1, QSUB),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0120, 0x0050, A1, QSUB),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf010, T1, QSUB16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0f70, A1, QSUB16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf010, T1, QSUB8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0620, 0x0ff0, A1, QSUB8),
 
@@ -304,9 +330,11 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP2(0xffc0, 0xba00, T1, REV),
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf080, T2, REV),
 	ARMv7_OP4(0x0fff, 0x0ff0, 0x06bf, 0x0f30, A1, REV),
+
 	ARMv7_OP2(0xffc0, 0xba40, T1, REV16),
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf090, T2, REV16),
 	ARMv7_OP4(0x0fff, 0x0ff0, 0x06bf, 0x0fb0, A1, REV16),
+
 	ARMv7_OP2(0xffc0, 0xbac0, T1, REVSH),
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf0b0, T2, REVSH),
 	ARMv7_OP4(0x0fff, 0x0ff0, 0x06ff, 0x0fb0, A1, REVSH),
@@ -332,8 +360,10 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf000, T1, SADD16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f10, A1, SADD16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf000, T1, SADD8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f90, A1, SADD8),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf000, T1, SASX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f30, A1, SASX),
 
@@ -354,70 +384,85 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf020, T1, SHADD16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f10, A1, SHADD16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf020, T1, SHADD8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f90, A1, SHADD8),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf020, T1, SHASX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f30, A1, SHASX),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf020, T1, SHSAX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f50, A1, SHSAX),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf020, T1, SHSUB16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0f70, A1, SHSUB16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf020, T1, SHSUB8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0630, 0x0ff0, A1, SHSUB8),
 
 	ARMv7_OP4(0xfff0, 0x00c0, 0xfb10, 0x0000, T1, SMLA__),
 	ARMv7_OP4(0x0ff0, 0x0090, 0x0100, 0x0080, A1, SMLA__),
+
 	ARMv7_OP4(0xfff0, 0x00e0, 0xfb20, 0x0000, T1, SMLAD),
 	ARMv7_OP4(0x0ff0, 0x00d0, 0x0700, 0x0010, A1, SMLAD),
+
 	ARMv7_OP4(0xfff0, 0x00f0, 0xfbc0, 0x0000, T1, SMLAL),
-	ARMv7_OP4(0x0fe0, 0x00f0, 0x00e0, 0x0090, A1, SMLAL),//???
+	ARMv7_OP4(0x0fe0, 0x00f0, 0x00e0, 0x0090, A1, SMLAL),
+
 	ARMv7_OP4(0xfff0, 0x00c0, 0xfbc0, 0x0080, T1, SMLAL__),
 	ARMv7_OP4(0x0ff0, 0x0090, 0x0140, 0x0080, A1, SMLAL__),
+
 	ARMv7_OP4(0xfff0, 0x00e0, 0xfbc0, 0x00c0, T1, SMLALD),
 	ARMv7_OP4(0x0ff0, 0x00d0, 0x0740, 0x0010, A1, SMLALD),
+
 	ARMv7_OP4(0xfff0, 0x00e0, 0xfb30, 0x0000, T1, SMLAW_),
 	ARMv7_OP4(0x0ff0, 0x00b0, 0x0120, 0x0080, A1, SMLAW_),
 
 	ARMv7_OP4(0xfff0, 0x00e0, 0xfb40, 0x0000, T1, SMLSD),
 	ARMv7_OP4(0x0ff0, 0x00d0, 0x0700, 0x0050, A1, SMLSD),
+
 	ARMv7_OP4(0xfff0, 0x00e0, 0xfbd0, 0x00c0, T1, SMLSLD),
 	ARMv7_OP4(0x0ff0, 0x00d0, 0x0740, 0x0050, A1, SMLSLD),
+
 	ARMv7_OP4(0xfff0, 0x00e0, 0xfb50, 0x0000, T1, SMMLA),
 	ARMv7_OP4(0x0ff0, 0x00d0, 0x0750, 0x0010, A1, SMMLA),
+
 	ARMv7_OP4(0xfff0, 0x00e0, 0xfb60, 0x0000, T1, SMMLS),
 	ARMv7_OP4(0x0ff0, 0x00d0, 0x0750, 0x00d0, A1, SMMLS),
+
 	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb50, 0xf000, T1, SMMUL),
 	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0750, 0xf010, A1, SMMUL),
+
 	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb20, 0xf000, T1, SMUAD),
 	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0700, 0xf010, A1, SMUAD),
+
 	ARMv7_OP4(0xfff0, 0xf0c0, 0xfb10, 0xf000, T1, SMUL__),
-	ARMv7_OP4(0x0ff0, 0xf090, 0x0160, 0x0080, A1, SMUL__),//???
+	ARMv7_OP4(0x0ff0, 0xf090, 0x0160, 0x0080, A1, SMUL__),
+
 	ARMv7_OP4(0xfff0, 0x00f0, 0xfb80, 0x0000, T1, SMULL),
 	ARMv7_OP4(0x0fe0, 0x00f0, 0x00c0, 0x0090, A1, SMULL),
+
 	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb30, 0xf000, T1, SMULW_),
-	ARMv7_OP4(0x0ff0, 0xf0b0, 0x0120, 0x00a0, A1, SMULW_),//???
+	ARMv7_OP4(0x0ff0, 0xf0b0, 0x0120, 0x00a0, A1, SMULW_),
+
 	ARMv7_OP4(0xfff0, 0xf0e0, 0xfb40, 0xf000, T1, SMUSD),
 	ARMv7_OP4(0x0ff0, 0xf0d0, 0x0700, 0xf050, A1, SMUSD),
+
 	ARMv7_OP4(0xffd0, 0x8020, 0xf300, 0x0000, T1, SSAT),
 	ARMv7_OP4(0x0fe0, 0x0030, 0x06a0, 0x0010, A1, SSAT),
+
 	ARMv7_OP4(0xfff0, 0xf0e0, 0xf320, 0x0000, T1, SSAT16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x06a0, 0x0f30, A1, SSAT16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf000, T1, SSAX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f50, A1, SSAX),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf000, T1, SSUB16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0f70, A1, SSUB16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf000, T1, SSUB8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0610, 0x0ff0, A1, SSUB8),
 
-	ARMv7_OP4(0xfff0, 0x0000, 0xe840, 0x0000, T1, STREX),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0180, 0x0f90, A1, STREX),
-	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f40, T1, STREXB),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01c0, 0x0f90, A1, STREXB),
-	ARMv7_OP4(0xfff0, 0x00f0, 0xe8c0, 0x0070, T1, STREXD),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01a0, 0x0f90, A1, STREXD),
-	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f50, T1, STREXH),
-	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01e0, 0x0f90, A1, STREXH),
-
 	ARMv7_OP2(0xf800, 0xc000, T1, STM),
 	ARMv7_OP4(0xffd0, 0xa000, 0xe880, 0x0000, T2, STM),
 	ARMv7_OP4(0x0fd0, 0x0000, 0x0880, 0x0000, A1, STM),
@@ -447,6 +492,15 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0x0e50, 0x00f0, 0x0040, 0x00f0, A1, STRD_IMM),
 	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00f0, A1, STRD_REG),
 
+	ARMv7_OP4(0xfff0, 0x0000, 0xe840, 0x0000, T1, STREX),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0180, 0x0f90, A1, STREX),
+	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f40, T1, STREXB),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01c0, 0x0f90, A1, STREXB),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xe8c0, 0x0070, T1, STREXD),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01a0, 0x0f90, A1, STREXD),
+	ARMv7_OP4(0xfff0, 0x0ff0, 0xe8c0, 0x0f50, T1, STREXH),
+	ARMv7_OP4(0x0ff0, 0x0ff0, 0x01e0, 0x0f90, A1, STREXH),
+
 	ARMv7_OP2(0xf800, 0x8000, T1, STRH_IMM),
 	ARMv7_OP4(0xfff0, 0x0000, 0xf8a0, 0x0000, T2, STRH_IMM),
 	ARMv7_OP4(0xfff0, 0x0800, 0xf820, 0x0800, T3, STRH_IMM),
@@ -476,8 +530,10 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa40, 0xf080, T1, SXTAB),
 	ARMv7_OP4(0x0ff0, 0x03f0, 0x06a0, 0x0070, A1, SXTAB),
+
 	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa20, 0xf080, T1, SXTAB16),
 	ARMv7_OP4(0x0ff0, 0x03f0, 0x0680, 0x0070, A1, SXTAB16),
+
 	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa00, 0xf080, T1, SXTAH),
 	ARMv7_OP4(0x0ff0, 0x03f0, 0x06b0, 0x0070, A1, SXTAH),
 
@@ -509,61 +565,90 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf040, T1, UADD16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f10, A1, UADD16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf040, T1, UADD8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f90, A1, UADD8),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf040, T1, UASX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f30, A1, UASX),
+
 	ARMv7_OP4(0xfff0, 0x8020, 0xf3c0, 0x0000, T1, UBFX),
 	ARMv7_OP4(0x0fe0, 0x0070, 0x07e0, 0x0050, A1, UBFX),
-	ARMv7_OP4(0xfff0, 0xf0f0, 0xfbb0, 0xf0f0, T1, UDIV),
+
+	ARMv7_OP4(0xfff0, 0xf0f0, 0xfbb0, 0xf0f0, T1, UDIV), // ???
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf060, T1, UHADD16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f10, A1, UHADD16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf060, T1, UHADD8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f90, A1, UHADD8),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf060, T1, UHASX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f30, A1, UHASX),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf060, T1, UHSAX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f50, A1, UHSAX),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf060, T1, UHSUB16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0f70, A1, UHSUB16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf060, T1, UHSUB8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0670, 0x0ff0, A1, UHSUB8),
+
 	ARMv7_OP4(0xfff0, 0x00f0, 0xfbe0, 0x0060, T1, UMAAL),
 	ARMv7_OP4(0x0ff0, 0x00f0, 0x0040, 0x0090, A1, UMAAL),
+
 	ARMv7_OP4(0xfff0, 0x00f0, 0xfbe0, 0x0000, T1, UMLAL),
 	ARMv7_OP4(0x0fe0, 0x00f0, 0x00a0, 0x0090, A1, UMLAL),
+
 	ARMv7_OP4(0xfff0, 0x00f0, 0xfba0, 0x0000, T1, UMULL),
 	ARMv7_OP4(0x0fe0, 0x00f0, 0x0080, 0x0090, A1, UMULL),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa90, 0xf050, T1, UQADD16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f10, A1, UQADD16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfa80, 0xf050, T1, UQADD8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f90, A1, UQADD8),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfaa0, 0xf050, T1, UQASX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f30, A1, UQASX),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf050, T1, UQSAX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f50, A1, UQSAX),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf050, T1, UQSUB16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0f70, A1, UQSUB16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf050, T1, UQSUB8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0660, 0x0ff0, A1, UQSUB8),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfb70, 0xf000, T1, USAD8),
 	ARMv7_OP4(0x0ff0, 0xf0f0, 0x0780, 0xf010, A1, USAD8),
+
 	ARMv7_OP4(0xfff0, 0x00f0, 0xfb70, 0x0000, T1, USADA8),
 	ARMv7_OP4(0x0ff0, 0x00f0, 0x0780, 0x0010, A1, USADA8),
+
 	ARMv7_OP4(0xffd0, 0x8020, 0xf380, 0x0000, T1, USAT),
 	ARMv7_OP4(0x0fe0, 0x0030, 0x06e0, 0x0010, A1, USAT),
+
 	ARMv7_OP4(0xfff0, 0xf0e0, 0xf3a0, 0x0000, T1, USAT16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x06e0, 0x0f30, A1, USAT16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfae0, 0xf040, T1, USAX),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f50, A1, USAX),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfad0, 0xf040, T1, USUB16),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0f70, A1, USUB16),
+
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf040, T1, USUB8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0ff0, A1, USUB8),
+
 	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa50, 0xf080, T1, UXTAB),
 	ARMv7_OP4(0x0ff0, 0x03f0, 0x06e0, 0x0070, A1, UXTAB),
+
 	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa30, 0xf080, T1, UXTAB16),
 	ARMv7_OP4(0x0ff0, 0x03f0, 0x06c0, 0x0070, A1, UXTAB16),
+
 	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa10, 0xf080, T1, UXTAH),
 	ARMv7_OP4(0x0ff0, 0x03f0, 0x06f0, 0x0070, A1, UXTAH),
 
@@ -1004,11 +1089,6 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP2(0xffff, 0xbf10, T1, YIELD),
 	ARMv7_OP4(0xffff, 0xffff, 0xf3af, 0x8001, T2, YIELD),
 	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf001, A1, YIELD),
-
-	ARMv7_OP4(0xff10, 0x0010, 0xee10, 0x0010, T1, MRC_),
-	ARMv7_OP4(0x0f10, 0x0010, 0x0e10, 0x0010, A1, MRC_),
-	ARMv7_OP4(0xff10, 0x0010, 0xfe10, 0x0010, T2, MRC_),
-	ARMv7_OP4(0xff10, 0x0010, 0xfe10, 0x0010, A2, MRC_),
 };
 
 struct ARMv7_op2_table_t

From cbd56fc4f57d1188e5e5a5bd2e8629d573ac7150 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Thu, 22 Jan 2015 23:35:22 +0300
Subject: [PATCH 20/70] ARMv7 opcode table fixed

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp     | 72 ++++++++++++++++++----------
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 58 +++++++++++-----------
 2 files changed, 76 insertions(+), 54 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index 4cfdc42fed..df10fe52a0 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -14,12 +14,18 @@ struct ARMv7_opcode_t
 	const char* name;
 	ARMv7_encoding type;
 	void(*func)(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+	bool(*skip)(u32 code);
 };
 
 // single 16-bit value
-#define ARMv7_OP2(mask, code, type, name) { (u32)((mask) << 16), (u32)((code) << 16), 2, #name "_" #type, type, ARMv7_instrs::name }
+#define ARMv7_OP2(mask, code, type, name, ...) { (u32)((mask) << 16), (u32)((code) << 16), 2, #name "_" #type, type, ARMv7_instrs::name, __VA_ARGS__ }
 // two 16-bit values
-#define ARMv7_OP4(mask0, mask1, code0, code1, type, name) { (u32)((mask0) << 16) | (mask1), (u32)((code0) << 16) | (code1), 4, #name "_" #type, type, ARMv7_instrs::name }
+#define ARMv7_OP4(mask0, mask1, code0, code1, type, name, ...) { (u32)((mask0) << 16) | (mask1), (u32)((code0) << 16) | (code1), 4, #name "_" #type, type, ARMv7_instrs::name, __VA_ARGS__ }
+
+#define SKIP_IF(cond) [](u32 c) -> bool { return cond; }
+
+#define BF(start, end) ((c << (31 - (end))) >> ((start) + 31 - (end)))
+#define BT(pos) ((c >> (pos)) & 1)
 
 const ARMv7_opcode_t ARMv7_opcode_table[] =
 {
@@ -35,6 +41,16 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0x0fe0, 0x0010, 0x00a0, 0x0000, A1, ADC_REG),
 	ARMv7_OP4(0x0fe0, 0x0090, 0x00a0, 0x0010, A1, ADC_RSR),
 
+	ARMv7_OP2(0xfe00, 0x1c00, T1, ADD_IMM),
+	ARMv7_OP2(0xf800, 0x3000, T2, ADD_IMM),
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf100, 0x0000, T3, ADD_IMM, SKIP_IF( (BF(8, 11) == 15 && BT(20)) || (BF(16, 19) == 13) )),
+	ARMv7_OP4(0xfbf0, 0x8000, 0xf200, 0x0000, T4, ADD_IMM),
+	ARMv7_OP4(0x0fe0, 0x0000, 0x0280, 0x0000, A1, ADD_IMM),
+	ARMv7_OP2(0xfe00, 0x1800, T1, ADD_REG),
+	ARMv7_OP2(0xff00, 0x4400, T2, ADD_REG, SKIP_IF( (c & 0x87) == 0x85 || BF(3, 6) == 13 )),
+	ARMv7_OP4(0xffe0, 0x8000, 0xeb00, 0x0000, T3, ADD_REG),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x0080, 0x0000, A1, ADD_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x0080, 0x0010, A1, ADD_RSR),
 	ARMv7_OP2(0xf800, 0xa800, T1, ADD_SPI),
 	ARMv7_OP2(0xff80, 0xb000, T2, ADD_SPI),
 	ARMv7_OP4(0xfbef, 0x8000, 0xf10d, 0x0000, T3, ADD_SPI),
@@ -44,16 +60,6 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP2(0xff87, 0x4485, T2, ADD_SPR),
 	ARMv7_OP4(0xffef, 0x8000, 0xeb0d, 0x0000, T3, ADD_SPR),
 	ARMv7_OP4(0x0fef, 0x0010, 0x008d, 0x0000, A1, ADD_SPR),
-	ARMv7_OP2(0xfe00, 0x1c00, T1, ADD_IMM),
-	ARMv7_OP2(0xf800, 0x3000, T2, ADD_IMM),
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf100, 0x0000, T3, ADD_IMM),
-	ARMv7_OP4(0xfbf0, 0x8000, 0xf200, 0x0000, T4, ADD_IMM),
-	ARMv7_OP4(0x0fe0, 0x0000, 0x0280, 0x0000, A1, ADD_IMM),
-	ARMv7_OP2(0xfe00, 0x1800, T1, ADD_REG),
-	ARMv7_OP2(0xff00, 0x4400, T2, ADD_REG),
-	ARMv7_OP4(0xffe0, 0x8000, 0xeb00, 0x0000, T3, ADD_REG),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x0080, 0x0000, A1, ADD_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x0080, 0x0010, A1, ADD_RSR),
 
 	ARMv7_OP2(0xf800, 0xa000, T1, ADR),
 	ARMv7_OP4(0xfbff, 0x8000, 0xf2af, 0x0000, T2, ADR),
@@ -166,7 +172,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfff0, 0x0fc0, 0xf810, 0x0000, T2, LDRB_REG),
 	ARMv7_OP4(0x0e50, 0x0010, 0x0650, 0x0000, A1, LDRB_REG),
 
-	ARMv7_OP4(0xfe50, 0x0000, 0xe850, 0x0000, T1, LDRD_IMM),
+	ARMv7_OP4(0xfe50, 0x0000, 0xe850, 0x0000, T1, LDRD_IMM, SKIP_IF( (!BT(21) && !BT(24)) || BF(16, 19) == 15 )),
 	ARMv7_OP4(0x0e50, 0x00f0, 0x0040, 0x00d0, A1, LDRD_IMM),
 	ARMv7_OP4(0xfe7f, 0x0000, 0xe85f, 0x0000, T1, LDRD_LIT),
 	ARMv7_OP4(0x0f7f, 0x00f0, 0x014f, 0x00d0, A1, LDRD_LIT),
@@ -488,7 +494,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfff0, 0x0fc0, 0xf800, 0x0000, T2, STRB_REG),
 	ARMv7_OP4(0x0e50, 0x0010, 0x0640, 0x0000, A1, STRB_REG),
 
-	ARMv7_OP4(0xfe50, 0x0000, 0xe840, 0x0000, T1, STRD_IMM),
+	ARMv7_OP4(0xfe50, 0x0000, 0xe840, 0x0000, T1, STRD_IMM, SKIP_IF(!BT(21) && !BT(24))),
 	ARMv7_OP4(0x0e50, 0x00f0, 0x0040, 0x00f0, A1, STRD_IMM),
 	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00f0, A1, STRD_REG),
 
@@ -509,21 +515,21 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfff0, 0x0fc0, 0xf820, 0x0000, T2, STRH_REG),
 	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00b0, A1, STRH_REG),
 
+	ARMv7_OP2(0xfe00, 0x1e00, T1, SUB_IMM),
+	ARMv7_OP2(0xf800, 0x3800, T2, SUB_IMM),
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf1a0, 0x0000, T3, SUB_IMM, SKIP_IF( (BF(8, 11) == 15 && BT(20)) || (BF(16, 19) == 13) )),
+	ARMv7_OP4(0xfbf0, 0x8000, 0xf2a0, 0x0000, T4, SUB_IMM),
+	ARMv7_OP4(0x0fe0, 0x0000, 0x0240, 0x0000, A1, SUB_IMM),
+	ARMv7_OP2(0xfe00, 0x1a00, T1, SUB_REG),
+	ARMv7_OP4(0xffe0, 0x8000, 0xeba0, 0x0000, T2, SUB_REG, SKIP_IF( (BF(8, 11) == 15 && BT(20)) || (BF(16, 19) == 13) )),
+	ARMv7_OP4(0x0fe0, 0x0010, 0x0040, 0x0000, A1, SUB_REG),
+	ARMv7_OP4(0x0fe0, 0x0090, 0x0040, 0x0010, A1, SUB_RSR),
 	ARMv7_OP2(0xff80, 0xb080, T1, SUB_SPI),
 	ARMv7_OP4(0xfbef, 0x8000, 0xf1ad, 0x0000, T2, SUB_SPI),
 	ARMv7_OP4(0xfbff, 0x8000, 0xf2ad, 0x0000, T3, SUB_SPI),
 	ARMv7_OP4(0x0fef, 0x0000, 0x024d, 0x0000, A1, SUB_SPI),
 	ARMv7_OP4(0xffef, 0x8000, 0xebad, 0x0000, T1, SUB_SPR),
 	ARMv7_OP4(0x0fef, 0x0010, 0x004d, 0x0000, A1, SUB_SPR),
-	ARMv7_OP2(0xfe00, 0x1e00, T1, SUB_IMM),
-	ARMv7_OP2(0xf800, 0x3800, T2, SUB_IMM),
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf1a0, 0x0000, T3, SUB_IMM),
-	ARMv7_OP4(0xfbf0, 0x8000, 0xf2a0, 0x0000, T4, SUB_IMM),
-	ARMv7_OP4(0x0fe0, 0x0000, 0x0240, 0x0000, A1, SUB_IMM),
-	ARMv7_OP2(0xfe00, 0x1a00, T1, SUB_REG),
-	ARMv7_OP4(0xffe0, 0x8000, 0xeba0, 0x0000, T2, SUB_REG),
-	ARMv7_OP4(0x0fe0, 0x0010, 0x0040, 0x0000, A1, SUB_REG),
-	ARMv7_OP4(0x0fe0, 0x0090, 0x0040, 0x0010, A1, SUB_RSR),
 
 	ARMv7_OP2(0xff00, 0xdf00, T1, SVC),
 	ARMv7_OP4(0x0f00, 0x0000, 0x0f00, 0x0000, A1, SVC),
@@ -1091,6 +1097,12 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0x0fff, 0xffff, 0x0320, 0xf001, A1, YIELD),
 };
 
+#undef ARMv7_OP2
+#undef ARMv7_OP4
+#undef SKIP_IF
+#undef BF
+#undef BT
+
 struct ARMv7_op2_table_t
 {
 	const ARMv7_opcode_t* data[0x10000];
@@ -1103,6 +1115,11 @@ struct ARMv7_op2_table_t
 		{
 			if (opcode.length == 2)
 			{
+				if (opcode.code & ~opcode.mask)
+				{
+					LOG_ERROR(GENERAL, "%s: wrong opcode mask (mask=0x%04x, code=0x%04x)", opcode.name, opcode.mask >> 16, opcode.code >> 16);
+				}
+
 				t2.push_back(&opcode);
 			}
 		}
@@ -1113,7 +1130,7 @@ struct ARMv7_op2_table_t
 
 			for (auto& opcode : t2)
 			{
-				if (((i << 16) & opcode->mask) == opcode->code)
+				if (((i << 16) & opcode->mask) == opcode->code && (!opcode->skip || !opcode->skip(i)))
 				{
 					data[i] = opcode;
 					break;
@@ -1134,6 +1151,11 @@ struct ARMv7_op4t_table_t
 		{
 			if (opcode.length == 4 && opcode.type < A1)
 			{
+				if (opcode.code & ~opcode.mask)
+				{
+					LOG_ERROR(GENERAL, "%s: wrong opcode mask (mask=0x%04x 0x%04x, code=0x%04x 0x%04x)", opcode.name, opcode.mask >> 16, (u16)opcode.mask, opcode.code >> 16, (u16)opcode.code);
+				}
+
 				table.push_back(&opcode);
 			}
 		}
@@ -1173,7 +1195,7 @@ void armv7_decoder_initialize(u32 addr, u32 end_addr, bool dump)
 		{
 			for (auto opcode : g_op4t.table)
 			{
-				if ((code.data & opcode->mask) == opcode->code)
+				if ((code.data & opcode->mask) == opcode->code && (!opcode->skip || !opcode->skip(code.data)))
 				{
 					g_opct[code.data] = (found = opcode);
 					break;
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index 2488f1b1a9..3610925ecd 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -354,11 +354,11 @@ void ARMv7_instrs::ADD_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (d == 15 && set_flags)
 		{
-			throw "CMN (immediate)";
+			throw "ADD_IMM_T3: CMN (immediate)";
 		}
 		if (n == 13)
 		{
-			throw "ADD (SP plus immediate)";
+			throw "ADD_IMM_T3: ADD (SP plus immediate)";
 		}
 		break;
 	}
@@ -371,11 +371,11 @@ void ARMv7_instrs::ADD_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (n == 15)
 		{
-			throw "ADR";
+			throw "ADD_IMM_T4: ADR";
 		}
 		if (n == 13)
 		{
-			throw "ADD (SP plus immediate)";
+			throw "ADD_IMM_T4: ADD (SP plus immediate)";
 		}
 		break;
 	}
@@ -429,7 +429,7 @@ void ARMv7_instrs::ADD_REG(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (n == 13 || m == 13)
 		{
-			throw "ADD (SP plus register)";
+			throw "ADD_REG_T2: ADD (SP plus register)";
 		}
 		break;
 	}
@@ -443,11 +443,11 @@ void ARMv7_instrs::ADD_REG(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (d == 15 && set_flags)
 		{
-			throw "CMN (register)";
+			throw "ADD_REG_T3: CMN (register)";
 		}
 		if (n == 13)
 		{
-			throw "ADD (SP plus register)";
+			throw "ADD_REG_T3: ADD (SP plus register)";
 		}
 		break;
 	}
@@ -512,7 +512,7 @@ void ARMv7_instrs::ADD_SPI(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (d == 15 && set_flags)
 		{
-			throw "CMN (immediate)";
+			throw "ADD_SPI_T3: CMN (immediate)";
 		}
 		break;
 	}
@@ -674,7 +674,7 @@ void ARMv7_instrs::B(ARMv7Context& context, const ARMv7Code code, const ARMv7_en
 		cond = (code.data >> 8) & 0xf;
 		if (cond == 0xf)
 		{
-			throw "SVC";
+			throw "B_T1: SVC";
 		}
 
 		jump = 4 + sign<9, u32>((code.data & 0xff) << 1);
@@ -1165,7 +1165,7 @@ void ARMv7_instrs::LDR_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (n == 15)
 		{
-			throw "LDR (literal)";
+			throw "LDR_IMM_T3: LDR (literal)";
 		}
 		break;
 	}
@@ -1180,15 +1180,15 @@ void ARMv7_instrs::LDR_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (n == 15)
 		{
-			throw "LDR (literal)";
+			throw "LDR_IMM_T4: LDR (literal)";
 		}
 		if (index && add && !wback)
 		{
-			throw "LDRT";
+			throw "LDR_IMM_T4: LDRT";
 		}
 		if (n == 13 && !index && add && wback && imm32 == 4)
 		{
-			throw "POP";
+			throw "LDR_IMM_T4: POP";
 		}
 		if (!index && !wback)
 		{
@@ -1252,7 +1252,7 @@ void ARMv7_instrs::LDR_REG(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (n == 15)
 		{
-			throw "LDR (literal)";
+			throw "LDR_REG_T2: LDR (literal)";
 		}
 		break;
 	}
@@ -1334,7 +1334,7 @@ void ARMv7_instrs::LDRD_IMM(ARMv7Context& context, const ARMv7Code code, const A
 		}
 		if (n == 15)
 		{
-			throw "LDRD (literal)";
+			throw "LDRD_IMM_T1: LDRD (literal)";
 		}
 		break;
 	}
@@ -1538,7 +1538,7 @@ void ARMv7_instrs::LSL_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (!shift_n)
 		{
-			throw "MOV (register)";
+			throw "LSL_IMM_T1: MOV (register)";
 		}
 		break;
 	}
@@ -1551,7 +1551,7 @@ void ARMv7_instrs::LSL_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (!shift_n)
 		{
-			throw "MOV (register)";
+			throw "LSL_IMM_T2: MOV (register)";
 		}
 		break;
 	}
@@ -1949,7 +1949,7 @@ void ARMv7_instrs::POP(ARMv7Context& context, const ARMv7Code code, const ARMv7_
 		reg_list = code.data & 0xffff;
 		if (BitCount(reg_list) < 2)
 		{
-			throw "LDM / LDMIA / LDMFD";
+			throw "POP_A1: LDM / LDMIA / LDMFD";
 		}
 		break;
 	}
@@ -2006,7 +2006,7 @@ void ARMv7_instrs::PUSH(ARMv7Context& context, const ARMv7Code code, const ARMv7
 		reg_list = code.data & 0xffff;
 		if (BitCount(reg_list) < 2)
 		{
-			throw "STMDB / STMFD";
+			throw "PUSH_A1: STMDB / STMFD";
 		}
 		break;
 	}
@@ -2666,11 +2666,11 @@ void ARMv7_instrs::STR_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (index && add && !wback)
 		{
-			throw "STRT";
+			throw "STR_IMM_T4: STRT";
 		}
 		if (n == 13 && index && !add && wback && imm32 == 4)
 		{
-			throw "PUSH";
+			throw "STR_IMM_T4: PUSH";
 		}
 		if (n == 15 || (!index && !wback))
 		{
@@ -2900,11 +2900,11 @@ void ARMv7_instrs::SUB_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (d == 15 && set_flags)
 		{
-			throw "CMP (immediate)";
+			throw "SUB_IMM_T3: CMP (immediate)";
 		}
 		if (n == 13)
 		{
-			throw "SUB (SP minus immediate)";
+			throw "SUB_IMM_T3: SUB (SP minus immediate)";
 		}
 		break;
 	}
@@ -2917,11 +2917,11 @@ void ARMv7_instrs::SUB_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (d == 15)
 		{
-			throw "ADR";
+			throw "SUB_IMM_T4: ADR";
 		}
 		if (n == 13)
 		{
-			throw "SUB (SP minus immediate)";
+			throw "SUB_IMM_T4: SUB (SP minus immediate)";
 		}
 		break;
 	}
@@ -2977,11 +2977,11 @@ void ARMv7_instrs::SUB_REG(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (d == 15 && set_flags)
 		{
-			throw "CMP (register)";
+			throw "SUB_REG_T2: CMP (register)";
 		}
 		if (n == 13)
 		{
-			throw "SUB (SP minus register)";
+			throw "SUB_REG_T2: SUB (SP minus register)";
 		}
 		break;
 	}
@@ -3040,7 +3040,7 @@ void ARMv7_instrs::SUB_SPI(ARMv7Context& context, const ARMv7Code code, const AR
 
 		if (d == 15 && set_flags)
 		{
-			throw "CMP (immediate)";
+			throw "SUB_SPI_T2: CMP (immediate)";
 		}
 		break;
 	}
@@ -4773,7 +4773,7 @@ void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7
 
 		if (cp - 10 < 2)
 		{
-			throw "Advanced SIMD and VFP";
+			throw "MRC_(T1/A1): Advanced SIMD and VFP";
 		}
 		break;
 	}

From b4c4c4cc896dd0fbb9fcfeae2c029bf7a4428387 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 23 Jan 2015 02:47:28 +0300
Subject: [PATCH 21/70] Small update

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index df10fe52a0..2b81a1659a 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -799,6 +799,9 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xef80, 0x0b10, 0xef00, 0x0000, T1, VHADDSUB),
 	ARMv7_OP4(0xfe80, 0x0b10, 0xf200, 0x0000, A1, VHADDSUB),
 
+	ARMv7_OP4(0xffb0, 0x0000, 0xf920, 0x0000, T1, VLD__MS), // VLD1, VLD2, VLD3, VLD4
+	ARMv7_OP4(0xffb0, 0x0000, 0xf420, 0x0000, A1, VLD__MS),
+
 	ARMv7_OP4(0xffb0, 0x0f00, 0xf9a0, 0x0c00, T1, VLD1_SAL),
 	ARMv7_OP4(0xffb0, 0x0f00, 0xf4a0, 0x0c00, A1, VLD1_SAL),
 
@@ -823,9 +826,6 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xffb0, 0x0300, 0xf9a0, 0x0300, T1, VLD4_SL),
 	ARMv7_OP4(0xffb0, 0x0300, 0xf4a0, 0x0300, A1, VLD4_SL),
 
-	ARMv7_OP4(0xffb0, 0x0000, 0xf920, 0x0000, T1, VLD__MS), // VLD1, VLD2, VLD3, VLD4
-	ARMv7_OP4(0xffb0, 0x0000, 0xf420, 0x0000, A1, VLD__MS),
-
 	ARMv7_OP4(0xfe10, 0x0f00, 0xec10, 0x0b00, T1, VLDM),
 	ARMv7_OP4(0x0e10, 0x0f00, 0x0c10, 0x0b00, A1, VLDM),
 	ARMv7_OP4(0xfe10, 0x0f00, 0xec10, 0x0a00, T2, VLDM),
@@ -1170,6 +1170,7 @@ void armv7_decoder_initialize(u32 addr, u32 end_addr, bool dump)
 	// 1. Find every 4-byte thumb instruction and cache it
 	// 2. If some instruction is not recognized, print the error
 	// 3. Possibly print disasm
+
 	g_opct.clear();
 
 	while (addr < end_addr)
@@ -1219,6 +1220,31 @@ void armv7_decoder_initialize(u32 addr, u32 end_addr, bool dump)
 				LOG_NOTICE(ARMv7, "0x%08x: %04x %04x  %s", addr, code.code1, code.code0, found->name);
 			}
 
+			if (found->func == ARMv7_instrs::BLX && found->type == T2)
+			{
+				const u32 s = (code.data >> 26) & 0x1;
+				const u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
+				const u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
+				const u32 target = (addr + 4 & ~3) + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
+
+				// possibly a call to imported function:
+				if (target >= end_addr && ((target - end_addr) % 16) == 0 && vm::psv::read16(target) == 0xf870)
+				{
+					const u32 instr = vm::psv::read32(target);
+
+					// check if not "unimplemented"
+					if (instr >> 16)
+					{
+						// replace BLX with "hack" instruction directly, it can help to see where it was called from
+						vm::psv::write32(addr, instr);
+					}
+				}
+				else
+				{
+					LOG_ERROR(ARMv7, "Unrecognized BLX call found at adddress 0x%08x (target=0x%08x)", addr, target);
+				}
+			}
+
 			addr += found->length;
 		}
 	}

From ca3e82341d839e1f5257aa99b972f36d6c51b490 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 23 Jan 2015 04:47:55 +0300
Subject: [PATCH 22/70] sceLibc: sprintf()

---
 rpcs3/Emu/ARMv7/ARMv7Context.h       |  4 +-
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 85 ++++++++++++++++------------
 rpcs3/Emu/ARMv7/ARMv7Interpreter.h   |  4 +-
 rpcs3/Emu/ARMv7/Modules/sceLibc.cpp  | 37 ++++++++----
 4 files changed, 80 insertions(+), 50 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index bdfa8107e2..be06cc4a45 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -50,7 +50,7 @@ struct ARMv7Context
 			u32 C : 1; //Carry condition code flag
 			u32 V : 1; //Overflow condition code flag
 			u32 Q : 1; //Set to 1 if an SSAT or USAT instruction changes (saturates) the input value for the signed or unsigned range of the result
-		u32: 27;
+			u32 dummy : 27;
 		};
 
 		u32 APSR;
@@ -61,7 +61,7 @@ struct ARMv7Context
 	{
 		struct
 		{
-		u32: 24;
+			u32 dummy : 24;
 			u32 exception : 8;
 		};
 
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index 3610925ecd..1ff87dd909 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -257,14 +257,12 @@ bool ARMv7_instrs::ConditionPassed(ARMv7Context& context, u32 cond)
 // instructions
 void ARMv7_instrs::UNK(ARMv7Context& context, const ARMv7Code code)
 {
-	LOG_ERROR(HLE, "Unknown/illegal opcode: 0x%04x 0x%04x", code.code1, code.code0);
-	Emu.Pause();
+	throw fmt::format("Unknown/illegal opcode: 0x%04x 0x%04x", code.code1, code.code0);
 }
 
 void ARMv7_instrs::NULL_OP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	LOG_ERROR(HLE, "Null opcode found: 0x%04x 0x%04x", code.code1, code.code0);
-	Emu.Pause();
+	throw fmt::format("Null opcode found: 0x%04x 0x%04x", code.code1, code.code0);
 }
 
 void ARMv7_instrs::HACK(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
@@ -294,6 +292,54 @@ void ARMv7_instrs::HACK(ARMv7Context& context, const ARMv7Code code, const ARMv7
 	}
 }
 
+void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
+{
+	u32 cond = context.ITSTATE.advance();
+	u32 t = 0;
+	u32 cp = 0;
+	u32 opc1 = 0;
+	u32 opc2 = 0;
+	u32 cn = 0;
+	u32 cm = 0;
+
+	switch (type)
+	{
+	case T1:
+	case A1:
+	{
+		t = (code.data & 0xf000) >> 12;
+		cp = (code.data & 0xf00) >> 8;
+		opc1 = (code.data & 0xe00000) >> 21;
+		opc2 = (code.data & 0xe0) >> 5;
+		cn = (code.data & 0xf0000) >> 16;
+		cm = (code.data & 0xf);
+
+		if (cp - 10 < 2)
+		{
+			throw "MRC_(T1/A1): Advanced SIMD and VFP";
+		}
+		break;
+	}
+	default: throw __FUNCTION__;
+	}
+
+	if (ConditionPassed(context, cond))
+	{
+		if (cp == 15 && opc1 == 0 && cn == 13 && cm == 0 && opc2 == 3)
+		{
+			LOG_ERROR(ARMv7, "TODO: TLS requested");
+
+			if (t < 15)
+			{
+				context.GPR[t] = 0;
+				return;
+			}
+		}
+
+		throw fmt::format("Bad instruction: mrc p%d,%d,r%d,c%d,c%d,%d", cp, opc1, t, cn, cm, opc2);
+	}
+}
+
 void ARMv7_instrs::ADC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	switch (type)
@@ -4755,34 +4801,3 @@ void ARMv7_instrs::YIELD(ARMv7Context& context, const ARMv7Code code, const ARMv
 	default: throw __FUNCTION__;
 	}
 }
-
-
-void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	u32 cond = context.ITSTATE.advance();
-	u32 t = 0;
-	u32 cp = 0;
-
-	switch (type)
-	{
-	case T1:
-	case A1:
-	{
-		t = (code.data & 0xf000) >> 12;
-		cp = (code.data & 0xf00) >> 8;
-
-		if (cp - 10 < 2)
-		{
-			throw "MRC_(T1/A1): Advanced SIMD and VFP";
-		}
-		break;
-	}
-	default: throw __FUNCTION__;
-	}
-
-	if (ConditionPassed(context, cond))
-	{
-		LOG_ERROR(ARMv7, "Bad instruction (MRC): 0x%04x 0x%04x", code.code1, code.code0);
-		throw __FUNCTION__;
-	}
-}
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
index 14b044ac63..c99958a35c 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
@@ -99,6 +99,8 @@ namespace ARMv7_instrs
 
 	void HACK(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
+	void MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
+
 	void ADC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void ADC_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void ADC_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
@@ -515,6 +517,4 @@ namespace ARMv7_instrs
 	void WFE(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void WFI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 	void YIELD(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-
-	void MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 };
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
index 8bca615fcf..a81d82ac51 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
@@ -54,16 +54,9 @@ namespace sce_libc_func
 		});
 	}
 
-	void printf(ARMv7Context& context, vm::psv::ptr<const char> fmt) // va_args...
+	std::string armv7_fmt(ARMv7Context& context, vm::psv::ptr<const char> fmt, u32 g_count, u32 f_count, u32 v_count)
 	{
-		sceLibc.Error("printf(fmt=0x%x)", fmt);
-
-		sceLibc.Notice("*** *fmt = '%s'", fmt.get_ptr());
-
 		std::string result;
-		u32 g_count = 1;
-		u32 f_count = 0;
-		u32 v_count = 0;
 
 		for (char c = *fmt++; c; c = *fmt++)
 		{
@@ -105,7 +98,7 @@ namespace sce_libc_func
 				}
 				default:
 				{
-					throw fmt::Format("printf(): unknown formatting: '%s'", start.get_ptr());
+					throw fmt::Format("armv7_fmt(): unknown formatting: '%s'", start.get_ptr());
 				}
 				}
 			}
@@ -114,7 +107,29 @@ namespace sce_libc_func
 			result += c;
 		}
 
-		LOG_NOTICE(TTY, result);
+		return result;
+	}
+
+	void printf(ARMv7Context& context, vm::psv::ptr<const char> fmt) // va_args...
+	{
+		sceLibc.Error("printf(fmt=0x%x)", fmt);
+
+		sceLibc.Notice("*** *fmt = '%s'", fmt.get_ptr());
+
+		LOG_NOTICE(TTY, armv7_fmt(context, fmt, 1, 0, 0));
+	}
+
+	void sprintf(ARMv7Context& context, vm::psv::ptr<char> str, vm::psv::ptr<const char> fmt) // va_args...
+	{
+		sceLibc.Error("sprintf(str=0x%x, fmt=0x%x)", str, fmt);
+
+		sceLibc.Notice("*** *fmt = '%s'", fmt.get_ptr());
+
+		const std::string& result = armv7_fmt(context, fmt, 2, 0, 0);
+
+		sceLibc.Notice("*** res -> '%s'", result);
+
+		::memcpy(str.get_ptr(), result.c_str(), result.size() + 1);
 	}
 
 	void __cxa_set_dso_handle_main(vm::psv::ptr<void> dso)
@@ -247,7 +262,7 @@ psv_log_base sceLibc("SceLibc", []()
 	//REG_FUNC(0x395490DA, setbuf);
 	//REG_FUNC(0x2CA980A0, setvbuf);
 	//REG_FUNC(0xA1BFF606, snprintf);
-	//REG_FUNC(0x7449B359, sprintf);
+	REG_FUNC(0x7449B359, sprintf);
 	//REG_FUNC(0xEC585241, sscanf);
 	//REG_FUNC(0x2BCB3F01, ungetc);
 	//REG_FUNC(0xF7915685, vfprintf);

From bef2ee8f724359ecd3f67a3c7116330d2806f2f0 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 23 Jan 2015 06:50:14 +0300
Subject: [PATCH 23/70] ARMv7: MUL implemented

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp     | 14 ++++++------
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 34 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index 2b81a1659a..42bda91fd6 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -43,7 +43,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP2(0xfe00, 0x1c00, T1, ADD_IMM),
 	ARMv7_OP2(0xf800, 0x3000, T2, ADD_IMM),
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf100, 0x0000, T3, ADD_IMM, SKIP_IF( (BF(8, 11) == 15 && BT(20)) || (BF(16, 19) == 13) )),
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf100, 0x0000, T3, ADD_IMM, SKIP_IF( (BF(8, 11) == 15 && BT(20)) || BF(16, 19) == 13 )),
 	ARMv7_OP4(0xfbf0, 0x8000, 0xf200, 0x0000, T4, ADD_IMM),
 	ARMv7_OP4(0x0fe0, 0x0000, 0x0280, 0x0000, A1, ADD_IMM),
 	ARMv7_OP2(0xfe00, 0x1800, T1, ADD_REG),
@@ -229,7 +229,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xffe0, 0xf0f0, 0xfa20, 0xf000, T2, LSR_REG),
 	ARMv7_OP4(0x0fef, 0x00f0, 0x01a0, 0x0030, A1, LSR_REG),
 
-	ARMv7_OP4(0xfff0, 0x00f0, 0xfb00, 0x0000, T1, MLA),
+	ARMv7_OP4(0xfff0, 0x00f0, 0xfb00, 0x0000, T1, MLA, SKIP_IF( BF(12, 15) == 15 )),
 	ARMv7_OP4(0x0fe0, 0x00f0, 0x0020, 0x0090, A1, MLA),
 
 	ARMv7_OP4(0xfff0, 0x00f0, 0xfb00, 0x0010, T1, MLS),
@@ -494,7 +494,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfff0, 0x0fc0, 0xf800, 0x0000, T2, STRB_REG),
 	ARMv7_OP4(0x0e50, 0x0010, 0x0640, 0x0000, A1, STRB_REG),
 
-	ARMv7_OP4(0xfe50, 0x0000, 0xe840, 0x0000, T1, STRD_IMM, SKIP_IF(!BT(21) && !BT(24))),
+	ARMv7_OP4(0xfe50, 0x0000, 0xe840, 0x0000, T1, STRD_IMM, SKIP_IF( !BT(21) && !BT(24) )),
 	ARMv7_OP4(0x0e50, 0x00f0, 0x0040, 0x00f0, A1, STRD_IMM),
 	ARMv7_OP4(0x0e50, 0x0ff0, 0x0000, 0x00f0, A1, STRD_REG),
 
@@ -517,11 +517,11 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 
 	ARMv7_OP2(0xfe00, 0x1e00, T1, SUB_IMM),
 	ARMv7_OP2(0xf800, 0x3800, T2, SUB_IMM),
-	ARMv7_OP4(0xfbe0, 0x8000, 0xf1a0, 0x0000, T3, SUB_IMM, SKIP_IF( (BF(8, 11) == 15 && BT(20)) || (BF(16, 19) == 13) )),
+	ARMv7_OP4(0xfbe0, 0x8000, 0xf1a0, 0x0000, T3, SUB_IMM, SKIP_IF( (BF(8, 11) == 15 && BT(20)) || BF(16, 19) == 13 )),
 	ARMv7_OP4(0xfbf0, 0x8000, 0xf2a0, 0x0000, T4, SUB_IMM),
 	ARMv7_OP4(0x0fe0, 0x0000, 0x0240, 0x0000, A1, SUB_IMM),
 	ARMv7_OP2(0xfe00, 0x1a00, T1, SUB_REG),
-	ARMv7_OP4(0xffe0, 0x8000, 0xeba0, 0x0000, T2, SUB_REG, SKIP_IF( (BF(8, 11) == 15 && BT(20)) || (BF(16, 19) == 13) )),
+	ARMv7_OP4(0xffe0, 0x8000, 0xeba0, 0x0000, T2, SUB_REG, SKIP_IF( (BF(8, 11) == 15 && BT(20)) || BF(16, 19) == 13 )),
 	ARMv7_OP4(0x0fe0, 0x0010, 0x0040, 0x0000, A1, SUB_REG),
 	ARMv7_OP4(0x0fe0, 0x0090, 0x0040, 0x0010, A1, SUB_RSR),
 	ARMv7_OP2(0xff80, 0xb080, T1, SUB_SPI),
@@ -1286,7 +1286,7 @@ u32 ARMv7Decoder::DecodeMemory(const u32 address)
 
 	//for (auto opcode : g_op4t.table)
 	//{
-	//	if ((code.data & opcode->mask) == opcode->code)
+	//	if ((code.data & opcode->mask) == opcode->code && (!opcode->skip || !opcode->skip(code.data)))
 	//	{
 	//		(*opcode->func)(m_ctx, code, opcode->type);
 	//		return 4;
@@ -1294,7 +1294,7 @@ u32 ARMv7Decoder::DecodeMemory(const u32 address)
 	//}
 
 	ARMv7_instrs::UNK(m_ctx, code);
-	return 2;
+	return 4;
 
 	// "group" decoding algorithm (temporarily disabled)
 
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index 1ff87dd909..c6292e371a 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -1846,11 +1846,45 @@ void ARMv7_instrs::MSR_REG(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	bool set_flags = !context.ITSTATE;
+	u32 cond = context.ITSTATE.advance();
+	u32 d = 0;
+	u32 n = 0;
+	u32 m = 0;
+
 	switch (type)
 	{
+	case T1:
+	{
+		d = m = code.data & 0x7;
+		n = (code.data & 0x38) >> 3;
+		break;
+	}
+	case T2:
+	{
+		d = (code.data & 0xf00) >> 8;
+		n = (code.data & 0xf0000) >> 16;
+		m = (code.data & 0xf);
+		set_flags = false;
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		const u32 op1 = context.read_gpr(n);
+		const u32 op2 = context.read_gpr(m);
+		const u32 result = op1 * op2;
+		context.write_gpr(d, result);
+
+		if (set_flags)
+		{
+			context.APSR.N = result >> 31;
+			context.APSR.Z = result == 0;
+		}
+	}
 }
 
 

From 4f706ed69c712ac6c3efac250828295e3497b1e5 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 23 Jan 2015 15:57:50 +0300
Subject: [PATCH 24/70] ++

---
 Utilities/StrFmt.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h
index ef8842062a..557a51ec4a 100644
--- a/Utilities/StrFmt.h
+++ b/Utilities/StrFmt.h
@@ -198,7 +198,7 @@ namespace fmt
 				{
 					return to_hex(arg, get_fmt_precision(fmt, len));
 				}
-				else if (fmt[len - 1] == 'd')
+				else if (fmt[len - 1] == 'd' || fmt[len - 1] == 'u')
 				{
 					return to_udec(arg);
 				}
@@ -220,7 +220,7 @@ namespace fmt
 				{
 					return to_hex(arg, get_fmt_precision(fmt, len));
 				}
-				else if (fmt[len - 1] == 'd')
+				else if (fmt[len - 1] == 'd' || fmt[len - 1] == 'u')
 				{
 					return to_udec(arg);
 				}
@@ -242,7 +242,7 @@ namespace fmt
 				{
 					return to_hex(arg, get_fmt_precision(fmt, len));
 				}
-				else if (fmt[len - 1] == 'd')
+				else if (fmt[len - 1] == 'd' || fmt[len - 1] == 'u')
 				{
 					return to_udec(arg);
 				}
@@ -264,7 +264,7 @@ namespace fmt
 				{
 					return to_hex(arg, get_fmt_precision(fmt, len));
 				}
-				else if (fmt[len - 1] == 'd')
+				else if (fmt[len - 1] == 'd' || fmt[len - 1] == 'u')
 				{
 					return to_udec(arg);
 				}
@@ -418,7 +418,7 @@ namespace fmt
 				{
 					return to_hex(arg, get_fmt_precision(fmt, len));
 				}
-				else if (fmt[len - 1] == 'd')
+				else if (fmt[len - 1] == 'd' || fmt[len - 1] == 'u')
 				{
 					return arg ? "1" : "0";
 				}

From 47e2e0bd58d40928b00053254eb169f465ae4819 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 23 Jan 2015 20:25:36 +0300
Subject: [PATCH 25/70] ARMv7 interpreter refactoring

---
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 1186 ++++++++++++++------------
 rpcs3/Emu/ARMv7/ARMv7Interpreter.h   |   65 --
 2 files changed, 648 insertions(+), 603 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index c6292e371a..1af7c948ec 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -8,253 +8,276 @@
 #include "PSVFuncList.h"
 #include "ARMv7Interpreter.h"
 
-template<typename T>
-u8 ARMv7_instrs::BitCount(T x, u8 len)
-{
-	u8 result = 0;
+#define reject(cond, info) { if (cond) Error(__FUNCTION__, code, type, #cond, info); }
 
-	for (u8 mask = 1 << (len - 1); mask; mask >>= 1)
+namespace ARMv7_instrs
+{
+	template<typename T>
+	u32 BitCount(T x, size_t len = sizeof(T) * 8)
 	{
-		if (x & mask) result++;
-	}
+		u32 result = 0;
 
-	return result;
-}
-
-template<typename T>
-s8 ARMv7_instrs::LowestSetBit(T x, u8 len)
-{
-	if (!x) return len;
-
-	u8 result = 0;
-
-	for (T mask = 1, i = 0; i<len && (x & mask) == 0; mask <<= 1, i++)
-	{
-		result++;
-	}
-
-	return result;
-}
-
-template<typename T>
-s8 ARMv7_instrs::HighestSetBit(T x, u8 len)
-{
-	if (!x) return -1;
-
-	u8 result = len;
-
-	for (T mask = T(1) << (len - 1); (x & mask) == 0; mask >>= 1)
-	{
-		result--;
-	}
-
-	return result;
-}
-
-template<typename T>
-s8 ARMv7_instrs::CountLeadingZeroBits(T x, u8 len)
-{
-	return len - 1 - HighestSetBit(x, len);
-}
-
-SRType ARMv7_instrs::DecodeImmShift(u32 type, u32 imm5, u32* shift_n)
-{
-	SRType shift_t = SRType_None;
-
-	switch (type)
-	{
-	case 0: shift_t = SRType_LSL; if (shift_n) *shift_n = imm5; break;
-	case 1: shift_t = SRType_LSR; if (shift_n) *shift_n = imm5 == 0 ? 32 : imm5; break;
-	case 2: shift_t = SRType_ASR; if (shift_n) *shift_n = imm5 == 0 ? 32 : imm5; break;
-	case 3:
-		if (imm5 == 0)
+		for (T mask = static_cast<T>(1) << (len - 1); mask; mask >>= 1)
 		{
-			shift_t = SRType_RRX; if (shift_n) *shift_n = 1;
+			if (x & mask) result++;
+		}
+
+		return result;
+	}
+
+	//template<typename T>
+	//s8 LowestSetBit(T x, u8 len)
+	//{
+	//	if (!x) return len;
+
+	//	u8 result = 0;
+
+	//	for (T mask = 1, i = 0; i<len && (x & mask) == 0; mask <<= 1, i++)
+	//	{
+	//		result++;
+	//	}
+
+	//	return result;
+	//}
+
+	//template<typename T>
+	//s8 HighestSetBit(T x, u8 len)
+	//{
+	//	if (!x) return -1;
+
+	//	u8 result = len;
+
+	//	for (T mask = T(1) << (len - 1); (x & mask) == 0; mask >>= 1)
+	//	{
+	//		result--;
+	//	}
+
+	//	return result;
+	//}
+
+	//template<typename T>
+	//s8 CountLeadingZeroBits(T x, u8 len)
+	//{
+	//	return len - 1 - HighestSetBit(x, len);
+	//}
+
+	SRType DecodeImmShift(u32 type, u32 imm5, u32* shift_n)
+	{
+		SRType shift_t = SRType_None;
+
+		switch (type)
+		{
+		case 0: shift_t = SRType_LSL; if (shift_n) *shift_n = imm5; break;
+		case 1: shift_t = SRType_LSR; if (shift_n) *shift_n = imm5 == 0 ? 32 : imm5; break;
+		case 2: shift_t = SRType_ASR; if (shift_n) *shift_n = imm5 == 0 ? 32 : imm5; break;
+		case 3:
+			if (imm5 == 0)
+			{
+				shift_t = SRType_RRX; if (shift_n) *shift_n = 1;
+			}
+			else
+			{
+				shift_t = SRType_ROR; if (shift_n) *shift_n = imm5;
+			}
+			break;
+		}
+
+		return shift_t;
+	}
+
+	SRType DecodeRegShift(u8 type)
+	{
+		SRType shift_t = SRType_None;
+
+		switch (type)
+		{
+		case 0: shift_t = SRType_LSL; break;
+		case 1: shift_t = SRType_LSR; break;
+		case 2: shift_t = SRType_ASR; break;
+		case 3: shift_t = SRType_ROR; break;
+		}
+
+		return shift_t;
+	}
+
+	u32 LSL_C(u32 x, s32 shift, bool& carry_out)
+	{
+		assert(shift > 0);
+		carry_out = shift <= 32 ? x & (1 << (32 - shift)) : false;
+		return shift < 32 ? x << shift : 0;
+	}
+
+	u32 LSL_(u32 x, s32 shift)
+	{
+		assert(shift >= 0);
+		return shift < 32 ? x << shift : 0;
+	}
+
+	u32 LSR_C(u32 x, s32 shift, bool& carry_out)
+	{
+		assert(shift > 0);
+		carry_out = shift <= 32 ? x & (1 << (shift - 1)) : false;
+		return shift < 32 ? x >> shift : 0;
+	}
+
+	u32 LSR_(u32 x, s32 shift)
+	{
+		assert(shift >= 0);
+		return shift < 32 ? x >> shift : 0;
+	}
+
+	s32 ASR_C(s32 x, s32 shift, bool& carry_out)
+	{
+		assert(shift > 0);
+		carry_out = shift <= 32 ? x & (1 << (shift - 1)) : false;
+		return shift < 32 ? x >> shift : x >> 31;
+	}
+
+	s32 ASR_(s32 x, s32 shift)
+	{
+		assert(shift >= 0);
+		return shift < 32 ? x >> shift : x >> 31;
+	}
+
+	u32 ROR_C(u32 x, s32 shift, bool& carry_out)
+	{
+		assert(shift);
+		carry_out = x & (1 << (shift - 1));
+		return x >> shift | x << (32 - shift);
+	}
+
+	u32 ROR_(u32 x, s32 shift)
+	{
+		return x >> shift | x << (32 - shift);
+	}
+
+	u32 RRX_C(u32 x, bool carry_in, bool& carry_out)
+	{
+		carry_out = x & 0x1;
+		return ((u32)carry_in << 31) | (x >> 1);
+	}
+
+	u32 RRX_(u32 x, bool carry_in)
+	{
+		return ((u32)carry_in << 31) | (x >> 1);
+	}
+
+	u32 Shift_C(u32 value, u32 type, s32 amount, bool carry_in, bool& carry_out)
+	{
+		assert(type != SRType_RRX || amount == 1);
+
+		if (amount)
+		{
+			switch (type)
+			{
+			case SRType_LSL: return LSL_C(value, amount, carry_out);
+			case SRType_LSR: return LSR_C(value, amount, carry_out);
+			case SRType_ASR: return ASR_C(value, amount, carry_out);
+			case SRType_ROR: return ROR_C(value, amount, carry_out);
+			case SRType_RRX: return RRX_C(value, carry_in, carry_out);
+			default: throw __FUNCTION__;
+			}
+		}
+
+		carry_out = carry_in;
+		return value;
+	}
+
+	u32 Shift(u32 value, u32 type, s32 amount, bool carry_in)
+	{
+		bool carry_out;
+		return Shift_C(value, type, amount, carry_in, carry_out);
+	}
+
+	template<typename T> T AddWithCarry(T x, T y, bool carry_in, bool& carry_out, bool& overflow)
+	{
+		const T sign_mask = (T)1 << (sizeof(T) - 1);
+
+		T result = x + y;
+		carry_out = ((x & y) | ((x ^ y) & ~result)) & sign_mask;
+		overflow = (x ^ result) & (y ^ result) & sign_mask;
+		if (carry_in)
+		{
+			result += 1;
+			carry_out ^= (result == 0);
+			overflow ^= (result == sign_mask);
+		}
+		return result;
+	}
+
+	u32 ThumbExpandImm_C(u32 imm12, bool carry_in, bool& carry_out)
+	{
+		if ((imm12 & 0xc00) >> 10)
+		{
+			u32 unrotated_value = (imm12 & 0x7f) | 0x80;
+
+			return ROR_C(unrotated_value, (imm12 & 0xf80) >> 7, carry_out);
 		}
 		else
 		{
-			shift_t = SRType_ROR; if (shift_n) *shift_n = imm5;
+			carry_out = carry_in;
+
+			u32 imm8 = imm12 & 0xff;
+			switch ((imm12 & 0x300) >> 8)
+			{
+			case 0: return imm8;
+			case 1: return imm8 << 16 | imm8;
+			case 2: return imm8 << 24 | imm8 << 8;
+			default: return imm8 << 24 | imm8 << 16 | imm8 << 8 | imm8;
+			}
 		}
-		break;
 	}
 
-	return shift_t;
-}
-
-SRType ARMv7_instrs::DecodeRegShift(u8 type)
-{
-	SRType shift_t = SRType_None;
-
-	switch (type)
+	u32 ThumbExpandImm(ARMv7Context& context, u32 imm12)
 	{
-	case 0: shift_t = SRType_LSL; break;
-	case 1: shift_t = SRType_LSR; break;
-	case 2: shift_t = SRType_ASR; break;
-	case 3: shift_t = SRType_ROR; break;
+		bool carry = context.APSR.C;
+		return ThumbExpandImm_C(imm12, carry, carry);
 	}
 
-	return shift_t;
-}
-
-u32 ARMv7_instrs::LSL_C(u32 x, s32 shift, bool& carry_out)
-{
-	assert(shift > 0);
-	carry_out = shift <= 32 ? x & (1 << (32 - shift)) : false;
-	return shift < 32 ? x << shift : 0;
-}
-
-u32 ARMv7_instrs::LSL_(u32 x, s32 shift)
-{
-	assert(shift >= 0);
-	return shift < 32 ? x << shift : 0;
-}
-
-u32 ARMv7_instrs::LSR_C(u32 x, s32 shift, bool& carry_out)
-{
-	assert(shift > 0);
-	carry_out = shift <= 32 ? x & (1 << (shift - 1)) : false;
-	return shift < 32 ? x >> shift : 0;
-}
-
-u32 ARMv7_instrs::LSR_(u32 x, s32 shift)
-{
-	assert(shift >= 0);
-	return shift < 32 ? x >> shift : 0;
-}
-
-s32 ARMv7_instrs::ASR_C(s32 x, s32 shift, bool& carry_out)
-{
-	assert(shift > 0);
-	carry_out = shift <= 32 ? x & (1 << (shift - 1)) : false;
-	return shift < 32 ? x >> shift : x >> 31;
-}
-
-s32 ARMv7_instrs::ASR_(s32 x, s32 shift)
-{
-	assert(shift >= 0);
-	return shift < 32 ? x >> shift : x >> 31;
-}
-
-u32 ARMv7_instrs::ROR_C(u32 x, s32 shift, bool& carry_out)
-{
-	assert(shift);
-	carry_out = x & (1 << (shift - 1));
-	return x >> shift | x << (32 - shift);
-}
-
-u32 ARMv7_instrs::ROR_(u32 x, s32 shift)
-{
-	return x >> shift | x << (32 - shift);
-}
-
-u32 ARMv7_instrs::RRX_C(u32 x, bool carry_in, bool& carry_out)
-{
-	carry_out = x & 0x1;
-	return ((u32)carry_in << 31) | (x >> 1);
-}
-
-u32 ARMv7_instrs::RRX_(u32 x, bool carry_in)
-{
-	return ((u32)carry_in << 31) | (x >> 1);
-}
-
-template<typename T> T ARMv7_instrs::Shift_C(T value, SRType type, s32 amount, bool carry_in, bool& carry_out)
-{
-	assert(type != SRType_RRX || amount == 1);
-
-	if (amount)
+	bool ConditionPassed(ARMv7Context& context, u32 cond)
 	{
-		switch (type)
+		bool result = false;
+
+		switch (cond >> 1)
 		{
-		case SRType_LSL: return LSL_C(value, amount, carry_out);
-		case SRType_LSR: return LSR_C(value, amount, carry_out);
-		case SRType_ASR: return ASR_C(value, amount, carry_out);
-		case SRType_ROR: return ROR_C(value, amount, carry_out);
-		case SRType_RRX: return RRX_C(value, carry_in, carry_out);
-		default: throw __FUNCTION__;
+		case 0: result = context.APSR.Z == 1; break;
+		case 1: result = context.APSR.C == 1; break;
+		case 2: result = context.APSR.N == 1; break;
+		case 3: result = context.APSR.V == 1; break;
+		case 4: result = context.APSR.C == 1 && context.APSR.Z == 0; break;
+		case 5: result = context.APSR.N == context.APSR.V; break;
+		case 6: result = context.APSR.N == context.APSR.V && context.APSR.Z == 0; break;
+		case 7: return true;
 		}
-	}
 
-	carry_out = carry_in;
-	return value;
-}
-
-template<typename T> T ARMv7_instrs::Shift(T value, SRType type, s32 amount, bool carry_in)
-{
-	bool carry_out;
-	return Shift_C(value, type, amount, carry_in, carry_out);
-}
-
-template<typename T> T ARMv7_instrs::AddWithCarry(T x, T y, bool carry_in, bool& carry_out, bool& overflow)
-{
-	const T sign_mask = (T)1 << (sizeof(T) - 1);
-
-	T result = x + y;
-	carry_out = ((x & y) | ((x ^ y) & ~result)) & sign_mask;
-	overflow = (x ^ result) & (y ^ result) & sign_mask;
-	if (carry_in)
-	{
-		result += 1;
-		carry_out ^= (result == 0);
-		overflow ^= (result == sign_mask);
-	}
-	return result;
-}
-
-u32 ARMv7_instrs::ThumbExpandImm_C(u32 imm12, bool carry_in, bool& carry_out)
-{
-	if ((imm12 & 0xc00) >> 10)
-	{
-		u32 unrotated_value = (imm12 & 0x7f) | 0x80;
-
-		return ROR_C(unrotated_value, (imm12 & 0xf80) >> 7, carry_out);
-	}
-	else
-	{
-		carry_out = carry_in;
-
-		u32 imm8 = imm12 & 0xff;
-		switch ((imm12 & 0x300) >> 8)
+		if (cond & 0x1)
 		{
-		case 0: return imm8;
-		case 1: return imm8 << 16 | imm8;
-		case 2: return imm8 << 24 | imm8 << 8;
-		default: return imm8 << 24 | imm8 << 16 | imm8 << 8 | imm8;
+			return !result;
 		}
+
+		return result;
 	}
-}
 
-u32 ARMv7_instrs::ThumbExpandImm(ARMv7Context& context, u32 imm12)
-{
-	bool carry = context.APSR.C;
-	return ThumbExpandImm_C(imm12, carry, carry);
-}
-
-bool ARMv7_instrs::ConditionPassed(ARMv7Context& context, u32 cond)
-{
-	bool result = false;
-
-	switch (cond >> 1)
+	void Error(const char* func, const ARMv7Code code, const ARMv7_encoding type, const char* cond, const char* info)
 	{
-	case 0: result = context.APSR.Z == 1; break;
-	case 1: result = context.APSR.C == 1; break;
-	case 2: result = context.APSR.N == 1; break;
-	case 3: result = context.APSR.V == 1; break;
-	case 4: result = context.APSR.C == 1 && context.APSR.Z == 0; break;
-	case 5: result = context.APSR.N == context.APSR.V; break;
-	case 6: result = context.APSR.N == context.APSR.V && context.APSR.Z == 0; break;
-	case 7: return true;
-	}
+		auto format_encoding = [](const ARMv7_encoding type) -> const char*
+		{
+			switch (type)
+			{
+			case T1: return "T1";
+			case T2: return "T2";
+			case T3: return "T3";
+			case T4: return "T4";
+			case A1: return "A1";
+			case A2: return "A2";
+			default: return "???";
+			}
+		};
 
-	if (cond & 0x1)
-	{
-		return !result;
+		throw fmt::format("%s(%s) error: %s (%s)", func, format_encoding(type), info, cond);
 	}
-
-	return result;
 }
 
-// instructions
 void ARMv7_instrs::UNK(ARMv7Context& context, const ARMv7Code code)
 {
 	throw fmt::format("Unknown/illegal opcode: 0x%04x 0x%04x", code.code1, code.code0);
@@ -267,13 +290,13 @@ void ARMv7_instrs::NULL_OP(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::HACK(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 func = 0;
+	u32 cond, func;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		func = code.data & 0xffff;
 		break;
 	}
@@ -294,19 +317,14 @@ void ARMv7_instrs::HACK(ARMv7Context& context, const ARMv7Code code, const ARMv7
 
 void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 t = 0;
-	u32 cp = 0;
-	u32 opc1 = 0;
-	u32 opc2 = 0;
-	u32 cn = 0;
-	u32 cm = 0;
+	u32 cond, t, cp, opc1, opc2, cn, cm;
 
 	switch (type)
 	{
 	case T1:
 	case A1:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0xf000) >> 12;
 		cp = (code.data & 0xf00) >> 8;
 		opc1 = (code.data & 0xe00000) >> 21;
@@ -314,10 +332,8 @@ void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7
 		cn = (code.data & 0xf0000) >> 16;
 		cm = (code.data & 0xf);
 
-		if (cp - 10 < 2)
-		{
-			throw "MRC_(T1/A1): Advanced SIMD and VFP";
-		}
+		reject(cp - 10 < 2, "Advanced SIMD and VFP");
+		reject(t == 13 && type == T1, "UNPREDICTABLE");
 		break;
 	}
 	default: throw __FUNCTION__;
@@ -371,15 +387,13 @@ void ARMv7_instrs::ADC_RSR(ARMv7Context& context, const ARMv7Code code, const AR
 void ARMv7_instrs::ADD_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	bool set_flags = !context.ITSTATE;
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 0;
-	u32 n = 0;
-	u32 imm32 = 0;
+	u32 cond, d, n, imm32;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0x7);
 		n = (code.data & 0x38) >> 3;
 		imm32 = (code.data & 0x1c0) >> 6;
@@ -387,42 +401,35 @@ void ARMv7_instrs::ADD_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		d = n = (code.data & 0x700) >> 8;
 		imm32 = (code.data & 0xff);
 		break;
 	}
 	case T3:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		n = (code.data & 0xf0000) >> 16;
 		set_flags = (code.data & 0x100000);
 		imm32 = ThumbExpandImm(context, (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff));
 
-		if (d == 15 && set_flags)
-		{
-			throw "ADD_IMM_T3: CMN (immediate)";
-		}
-		if (n == 13)
-		{
-			throw "ADD_IMM_T3: ADD (SP plus immediate)";
-		}
+		reject(d == 15 && set_flags, "CMN (immediate)");
+		reject(n == 13, "ADD (SP plus immediate)");
+		reject(d == 13 || n == 15, "UNPREDICTABLE");
 		break;
 	}
 	case T4:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		n = (code.data & 0xf0000) >> 16;
 		set_flags = false;
 		imm32 = (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
 
-		if (n == 15)
-		{
-			throw "ADD_IMM_T4: ADR";
-		}
-		if (n == 13)
-		{
-			throw "ADD_IMM_T4: ADD (SP plus immediate)";
-		}
+		reject(n == 15, "ADR");
+		reject(n == 13, "ADD (SP plus immediate)");
+		reject(d == 13 || d == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -451,50 +458,46 @@ void ARMv7_instrs::ADD_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 void ARMv7_instrs::ADD_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	bool set_flags = !context.ITSTATE;
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 0;
-	u32 n = 0;
-	u32 m = 0;
-	auto shift_t = SRType_LSL;
-	u32 shift_n = 0;
+	u32 cond, d, n, m, shift_t, shift_n;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0x7);
 		n = (code.data & 0x38) >> 3;
 		m = (code.data & 0x1c0) >> 6;
+		shift_t = SRType_LSL;
+		shift_n = 0;
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		n = d = (code.data & 0x80) >> 4 | (code.data & 0x7);
 		m = (code.data & 0x78) >> 3;
 		set_flags = false;
+		shift_t = SRType_LSL;
+		shift_n = 0;
 
-		if (n == 13 || m == 13)
-		{
-			throw "ADD_REG_T2: ADD (SP plus register)";
-		}
+		reject(n == 13 || m == 13, "ADD (SP plus register)");
+		reject(n == 15 && m == 15, "UNPREDICTABLE");
+		reject(d == 15 && context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case T3:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		n = (code.data & 0xf0000) >> 16;
 		m = (code.data & 0xf);
 		set_flags = (code.data & 0x100000);
 		shift_t = DecodeImmShift((code.data & 0x30) >> 4, (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6, &shift_n);
 
-		if (d == 15 && set_flags)
-		{
-			throw "ADD_REG_T3: CMN (register)";
-		}
-		if (n == 13)
-		{
-			throw "ADD_REG_T3: ADD (SP plus register)";
-		}
+		reject(d == 15 && set_flags, "CMN (register)");
+		reject(n == 13, "ADD (SP plus register)");
+		reject(d == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -532,41 +535,46 @@ void ARMv7_instrs::ADD_RSR(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::ADD_SPI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 13;
-	bool set_flags = false;
-	u32 imm32 = 0;
+	bool set_flags;
+	u32 cond, d, imm32;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0x700) >> 8;
+		set_flags = false;
 		imm32 = (code.data & 0xff) << 2;
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
+		d = 13;
+		set_flags = false;
 		imm32 = (code.data & 0x7f) << 2;
 		break;
 	}
 	case T3:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		set_flags = (code.data & 0x100000);
 		imm32 = ThumbExpandImm(context, (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff));
 
-		if (d == 15 && set_flags)
-		{
-			throw "ADD_SPI_T3: CMN (immediate)";
-		}
+		reject(d == 15 && set_flags, "CMN (immediate)");
+		reject(d == 15, "UNPREDICTABLE");
 		break;
 	}
 	case T4:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		set_flags = false;
 		imm32 = (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
+
+		reject(d == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -594,36 +602,42 @@ void ARMv7_instrs::ADD_SPI(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::ADD_SPR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 13;
-	u32 m = 0;
-	bool set_flags = false;
-	auto shift_t = SRType_LSL;
-	u32 shift_n = 0;
+	bool set_flags;
+	u32 cond, d, m, shift_t, shift_n;
 
 	switch (type)
 	{
 	case T1:
 	{
-		m = d = (code.data & 0x80) >> 4 | (code.data & 0x7);
+		cond = context.ITSTATE.advance();
+		d = m = (code.data & 0x80) >> 4 | (code.data & 0x7);
+		set_flags = false;
+		shift_t = SRType_LSL;
+		shift_n = 0;
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
+		d = 13;
 		m = (code.data & 0x78) >> 3;
+		set_flags = false;
+		shift_t = SRType_LSL;
+		shift_n = 0;
 
-		if (m == 13)
-		{
-			throw "ADD_SPR_T2: T1";
-		}
+		reject(m == 13, "encoding T1");
 		break;
 	}
 	case T3:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		m = (code.data & 0xf);
 		set_flags = (code.data & 0x100000);
 		shift_t = DecodeImmShift((code.data & 0x30) >> 4, (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6, &shift_n);
+
+		reject(d == 13 && (shift_t != SRType_LSL || shift_n > 3), "UNPREDICTABLE");
+		reject(d == 15 || m == 13 || m == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -672,11 +686,49 @@ void ARMv7_instrs::AND_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::AND_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	bool set_flags = !context.ITSTATE;
+	u32 cond, d, n, m, shift_t, shift_n;
+
 	switch (type)
 	{
+	case T1:
+	{
+		d = n = (code.data & 0x7);
+		m = (code.data & 0x38) >> 3;
+		shift_t = SRType_LSL;
+		shift_n = 0;
+		break;
+	}
+	case T2:
+	{
+		d = (code.data & 0xf00) >> 8;
+		n = (code.data & 0xf0000) >> 16;
+		m = (code.data & 0xf);
+		set_flags = (code.data & 0x100000);
+		shift_t = DecodeImmShift((code.data & 0x30) >> 4, (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6, &shift_n);
+
+		reject(d == 15 && set_flags, "TST (register)");
+		reject(d == 13 || d == 15 || n == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE");
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		bool carry;
+		const u32 shifted = Shift_C(context.read_gpr(m), shift_t, shift_n, context.APSR.C, carry);
+		const u32 result = context.read_gpr(n) & shifted;
+		context.write_gpr(d, result);
+
+		if (set_flags)
+		{
+			context.APSR.N = result >> 31;
+			context.APSR.Z = result == 0;
+			context.APSR.C = carry;
+		}
+	}
 }
 
 void ARMv7_instrs::AND_RSR(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
@@ -710,47 +762,53 @@ void ARMv7_instrs::ASR_REG(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::B(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 jump = 0; // jump = instr_size + imm32 ???
+	u32 cond, jump;
 
 	switch (type)
 	{
 	case T1:
 	{
 		cond = (code.data >> 8) & 0xf;
-		if (cond == 0xf)
-		{
-			throw "B_T1: SVC";
-		}
-
 		jump = 4 + sign<9, u32>((code.data & 0xff) << 1);
+
+		reject(cond == 14, "UNDEFINED");
+		reject(cond == 15, "SVC");
+		reject(context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		jump = 4 + sign<12, u32>((code.data & 0x7ff) << 1);
+
+		reject(context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case T3:
 	{
 		cond = (code.data >> 22) & 0xf;
-		if (cond >= 0xe)
 		{
-			throw "B_T3: Related encodings";
+			const u32 s = (code.data >> 26) & 0x1;
+			const u32 j1 = (code.data >> 13) & 0x1;
+			const u32 j2 = (code.data >> 11) & 0x1;
+			jump = 4 + sign<21, u32>(s << 20 | j2 << 19 | j1 << 18 | (code.data & 0x3f0000) >> 4 | (code.data & 0x7ff) << 1);
 		}
 
-		u32 s = (code.data >> 26) & 0x1;
-		u32 j1 = (code.data >> 13) & 0x1;
-		u32 j2 = (code.data >> 11) & 0x1;
-		jump = 4 + sign<21, u32>(s << 20 | j2 << 19 | j1 << 18 | (code.data & 0x3f0000) >> 4 | (code.data & 0x7ff) << 1);
+		reject(cond >= 14, "Related encodings");
+		reject(context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case T4:
 	{
-		u32 s = (code.data >> 26) & 0x1;
-		u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
-		u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
-		jump = 4 + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
+		cond = context.ITSTATE.advance();
+		{
+			const u32 s = (code.data >> 26) & 0x1;
+			const u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
+			const u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
+			jump = 4 + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
+		}
+		
+		reject(context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case A1:
@@ -828,26 +886,29 @@ void ARMv7_instrs::BKPT(ARMv7Context& context, const ARMv7Code code, const ARMv7
 
 void ARMv7_instrs::BL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 newLR = context.thread.PC;
-	u32 imm32 = 0;
+	u32 cond, imm32, newLR;
 
 	switch (type)
 	{
 	case T1:
 	{
-		u32 s = (code.data >> 26) & 0x1;
-		u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
-		u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
-		imm32 = 4 + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
+		cond = context.ITSTATE.advance();
 		newLR = (context.thread.PC + 4) | 1;
+		{
+			const u32 s = (code.data >> 26) & 0x1;
+			const u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
+			const u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
+			imm32 = 4 + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
+		}
+
+		reject(context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case A1:
 	{
 		cond = code.data >> 28;
-		imm32 = 4 + sign<26, u32>((code.data & 0xffffff) << 2);
 		newLR = (context.thread.PC + 4) - 4;
+		imm32 = 4 + sign<26, u32>((code.data & 0xffffff) << 2);
 		break;
 	}
 	default: throw __FUNCTION__;
@@ -862,38 +923,49 @@ void ARMv7_instrs::BL(ARMv7Context& context, const ARMv7Code code, const ARMv7_e
 
 void ARMv7_instrs::BLX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 newLR = context.thread.PC;
-	u32 target = 0;
+	u32 cond, target, newLR;
 
 	switch (type)
 	{
 	case T1:
 	{
-		target = context.read_gpr((code.data >> 3) & 0xf);
+		cond = context.ITSTATE.advance();
 		newLR = (context.thread.PC + 2) | 1; // ???
+		{
+			const u32 m = (code.data >> 3) & 0xf;
+			reject(m == 15, "UNPREDICTABLE");
+			target = context.read_gpr(m);
+		}
+
+		reject(context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case T2:
 	{
-		u32 s = (code.data >> 26) & 0x1;
-		u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
-		u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
-		target = (context.thread.PC + 4 & ~3) + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
+		cond = context.ITSTATE.advance();
 		newLR = (context.thread.PC + 4) | 1;
+		{
+			const u32 s = (code.data >> 26) & 0x1;
+			const u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
+			const u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
+			target = (context.thread.PC + 4 & ~3) + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
+		}
+
+		reject(context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case A1:
 	{
 		cond = code.data >> 28;
-		target = context.read_gpr(code.data & 0xf);
 		newLR = (context.thread.PC + 4) - 4;
+		target = context.read_gpr(code.data & 0xf);
 		break;
 	}
 	case A2:
 	{
-		target = (context.thread.PC + 4 | 1) + sign<25, u32>((code.data & 0xffffff) << 2 | (code.data & 0x1000000) >> 23);
+		cond = 15;
 		newLR = (context.thread.PC + 4) - 4;
+		target = (context.thread.PC + 4 | 1) + sign<25, u32>((code.data & 0xffffff) << 2 | (code.data & 0x1000000) >> 23);
 		break;
 	}
 	default: throw __FUNCTION__;
@@ -917,20 +989,23 @@ void ARMv7_instrs::BLX(ARMv7Context& context, const ARMv7Code code, const ARMv7_
 
 void ARMv7_instrs::BX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 target = 0;
+	u32 cond, target;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		target = context.read_gpr((code.data >> 3) & 0xf);
+
+		reject(context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case A1:
 	{
 		cond = code.data >> 28;
 		target = context.read_gpr(code.data & 0xf);
+		break;
 	}
 	default: throw __FUNCTION__;
 	}
@@ -953,15 +1028,26 @@ void ARMv7_instrs::BX(ARMv7Context& context, const ARMv7Code code, const ARMv7_e
 
 void ARMv7_instrs::CB_Z(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	u32 n, imm32;
+	bool nonzero;
+
 	switch (type)
 	{
-	case T1: break;
+	case T1:
+	{
+		n = code.data & 0x7;
+		imm32 = (code.data & 0xf8) >> 2 | (code.data & 0x200) >> 3;
+		nonzero = (code.data & 0x800);
+
+		reject(context.ITSTATE, "UNPREDICTABLE");
+		break;
+	}
 	default: throw __FUNCTION__;
 	}
 
-	if ((context.read_gpr(code.data & 0x7) == 0) ^ ((code.data & 0x800) != 0))
+	if ((context.read_gpr(n) == 0) ^ nonzero)
 	{
-		context.thread.SetBranch(context.thread.PC + 2 + ((code.data & 0xf8) >> 2) + ((code.data & 0x200) >> 3));
+		context.thread.SetBranch(context.thread.PC + 2 + imm32);
 	}
 }
 
@@ -1006,22 +1092,24 @@ void ARMv7_instrs::CMN_RSR(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::CMP_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 n = 0;
-	u32 imm32 = 0;
+	u32 cond, n, imm32;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		n = (code.data & 0x700) >> 8;
 		imm32 = (code.data & 0xff);
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		n = (code.data & 0xf0000) >> 16;
 		imm32 = ThumbExpandImm(context, (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff));
+
+		reject(n == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -1041,24 +1129,29 @@ void ARMv7_instrs::CMP_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::CMP_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 n = 0;
-	u32 m = 0;
-	auto shift_t = SRType_LSL;
-	u32 shift_n = 0;
+	u32 cond, n, m, shift_t, shift_n;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		n = (code.data & 0x7);
 		m = (code.data & 0x38) >> 3;
+		shift_t = SRType_LSL;
+		shift_n = 0;
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		n = (code.data & 0x80) >> 4 | (code.data & 0x7);
 		m = (code.data & 0x78) >> 3;
+		shift_t = SRType_LSL;
+		shift_n = 0;
+
+		reject(n < 8 && m < 8, "UNPREDICTABLE");
+		reject(n == 15 || m == 15, "UNPREDICTABLE");
 		break;
 	}
 	case T3:
@@ -1066,6 +1159,8 @@ void ARMv7_instrs::CMP_REG(ARMv7Context& context, const ARMv7Code code, const AR
 		n = (code.data & 0xf0000) >> 16;
 		m = (code.data & 0xf);
 		shift_t = DecodeImmShift((code.data & 0x30) >> 4, (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6, &shift_n);
+
+		reject(n == 15 || m == 13 || m == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -1128,16 +1223,19 @@ void ARMv7_instrs::IT(ARMv7Context& context, const ARMv7Code code, const ARMv7_e
 	{
 	case T1:
 	{
-		if ((code.data & 0xf) == 0)
-		{
-			throw "IT_T1: Related encodings";
-		}
-
-		context.ITSTATE.IT = code.data & 0xff;
-		return;
+		const u32 mask = code.data & 0xf;
+		const u32 first = (code.data & 0xf0) >> 4;
+		
+		reject(mask == 0, "Related encodings");
+		reject(first == 15, "UNPREDICTABLE");
+		reject(first == 14 && BitCount(mask) != 1, "UNPREDICTABLE");
+		reject(context.ITSTATE, "UNPREDICTABLE");
+		break;
 	}
 	default: throw __FUNCTION__;
 	}
+
+	context.ITSTATE.IT = code.data & 0xff;
 }
 
 
@@ -1180,43 +1278,50 @@ void ARMv7_instrs::LDMIB(ARMv7Context& context, const ARMv7Code code, const ARMv
 
 void ARMv7_instrs::LDR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 t = 0;
-	u32 n = 13;
-	u32 imm32 = 0;
-	bool index = true;
-	bool add = true;
-	bool wback = false;
+	u32 cond, t, n, imm32;
+	bool index, add, wback;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0x7);
 		n = (code.data & 0x38) >> 3;
 		imm32 = (code.data & 0x7c0) >> 4;
+		index = true;
+		add = true;
+		wback = false;
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0x700) >> 8;
+		n = 13;
 		imm32 = (code.data & 0xff) << 2;
+		index = true;
+		add = true;
+		wback = false;
 		break;
 	}
 	case T3:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0xf000) >> 12;
 		n = (code.data & 0xf0000) >> 16;
 		imm32 = (code.data & 0xfff);
+		index = true;
+		add = true;
+		wback = false;
 
-		if (n == 15)
-		{
-			throw "LDR_IMM_T3: LDR (literal)";
-		}
+		reject(n == 15, "LDR (literal)");
+		reject(t == 15 && context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case T4:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0xf000) >> 12;
 		n = (code.data & 0xf0000) >> 16;
 		imm32 = (code.data & 0xff);
@@ -1224,22 +1329,11 @@ void ARMv7_instrs::LDR_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 		add = (code.data & 0x200);
 		wback = (code.data & 0x100);
 
-		if (n == 15)
-		{
-			throw "LDR_IMM_T4: LDR (literal)";
-		}
-		if (index && add && !wback)
-		{
-			throw "LDR_IMM_T4: LDRT";
-		}
-		if (n == 13 && !index && add && wback && imm32 == 4)
-		{
-			throw "LDR_IMM_T4: POP";
-		}
-		if (!index && !wback)
-		{
-			throw "LDR_IMM_T4: undefined";
-		}
+		reject(n == 15, "LDR (literal)");
+		reject(index && add && !wback, "LDRT");
+		reject(n == 13 && !index && add && wback && imm32 == 4, "POP");
+		reject(!index && !wback, "UNDEFINED");
+		reject((wback && n == t) || (t == 15 && context.ITSTATE), "UNPREDICTABLE");
 		break;
 	}
 	default: throw __FUNCTION__;
@@ -1270,36 +1364,39 @@ void ARMv7_instrs::LDR_LIT(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::LDR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 t = 0;
-	u32 n = 0;
-	u32 m = 0;
-	bool index = true;
-	bool add = true;
-	bool wback = false;
-	auto shift_t = SRType_LSL;
-	u32 shift_n = 0;
+	u32 cond, t, n, m, shift_t, shift_n;
+	bool index, add, wback;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0x7);
 		n = (code.data & 0x38) >> 3;
 		m = (code.data & 0x1c0) >> 6;
+		index = true;
+		add = true;
+		wback = false;
+		shift_t = SRType_LSL;
+		shift_n = 0;
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0xf000) >> 12;
 		n = (code.data & 0xf0000) >> 16;
 		m = (code.data & 0xf);
-		shift_n = (code.data & 0x30) >> 4;
+		index = true;
+		add = true;
+		wback = false;
+		shift_t = (code.data & 0x30) >> 4;
+		shift_n = 0;
 
-		if (n == 15)
-		{
-			throw "LDR_REG_T2: LDR (literal)";
-		}
+		reject(n == 15, "LDR (literal)");
+		reject(m == 13 || m == 15, "UNPREDICTABLE");
+		reject(t == 15 && context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -1353,19 +1450,14 @@ void ARMv7_instrs::LDRB_REG(ARMv7Context& context, const ARMv7Code code, const A
 
 void ARMv7_instrs::LDRD_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 t = 0;
-	u32 t2 = 0;
-	u32 n = 13;
-	u32 imm32 = 0;
-	bool index = true;
-	bool add = true;
-	bool wback = false;
+	u32 cond, t, t2, n, imm32;
+	bool index, add, wback;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0xf000) >> 12;
 		t2 = (code.data & 0xf00) >> 8;
 		n = (code.data & 0xf0000) >> 16;
@@ -1374,14 +1466,10 @@ void ARMv7_instrs::LDRD_IMM(ARMv7Context& context, const ARMv7Code code, const A
 		add = (code.data & 0x800000);
 		wback = (code.data & 0x200000);
 
-		if (!index && !wback)
-		{
-			throw "LDRD_IMM_T1: Related encodings";
-		}
-		if (n == 15)
-		{
-			throw "LDRD_IMM_T1: LDRD (literal)";
-		}
+		reject(!index && !wback, "Related encodings");
+		reject(n == 15, "LDRD (literal)");
+		reject(wback && (n == t || n == t2), "UNPREDICTABLE");
+		reject(t == 13 || t == 15 || t2 == 13 || t2 == 15 || t == t2, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -1509,18 +1597,18 @@ void ARMv7_instrs::LDRSH_REG(ARMv7Context& context, const ARMv7Code code, const
 
 void ARMv7_instrs::LDREX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 t = 0;
-	u32 n = 0;
-	u32 imm32 = 0;
+	u32 cond, t, n, imm32;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0xf000) >> 12;
 		n = (code.data & 0xf0000) >> 16;
 		imm32 = (code.data & 0xff) << 2;
+
+		reject(t == 13 || t == 15 || n == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -1569,36 +1657,30 @@ void ARMv7_instrs::LDREXH(ARMv7Context& context, const ARMv7Code code, const ARM
 void ARMv7_instrs::LSL_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	bool set_flags = !context.ITSTATE;
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 0;
-	u32 m = 0;
-	u32 shift_n = 0;
+	u32 cond, d, m, shift_n;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0x7);
 		m = (code.data & 0x38) >> 3;
 		shift_n = (code.data & 0x7c0) >> 6;
 
-		if (!shift_n)
-		{
-			throw "LSL_IMM_T1: MOV (register)";
-		}
+		reject(!shift_n, "MOV (register)");
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		m = (code.data & 0xf);
 		set_flags = (code.data & 0x100000);
 		shift_n = (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6;
 
-		if (!shift_n)
-		{
-			throw "LSL_IMM_T2: MOV (register)";
-		}
+		reject(!shift_n, "MOV (register)");
+		reject(d == 13 || d == 15 || m == 13 || m == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -1608,7 +1690,7 @@ void ARMv7_instrs::LSL_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 	if (ConditionPassed(context, cond))
 	{
 		bool carry;
-		const u32 res = Shift_C<u32>(context.read_gpr(m), SRType_LSL, shift_n, context.APSR.C, carry);
+		const u32 res = Shift_C(context.read_gpr(m), SRType_LSL, shift_n, context.APSR.C, carry);
 		context.write_gpr(d, res);
 		if (set_flags)
 		{
@@ -1622,25 +1704,26 @@ void ARMv7_instrs::LSL_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 void ARMv7_instrs::LSL_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	bool set_flags = !context.ITSTATE;
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 0;
-	u32 n = 0;
-	u32 m = 0;
+	u32 cond, d, n, m;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = n = (code.data & 0x7);
 		m = (code.data & 0x38) >> 3;
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		n = (code.data & 0xf0000) >> 16;
 		m = (code.data & 0xf);
 		set_flags = (code.data & 0x100000);
+
+		reject(d == 13 || d == 15 || n == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -1704,30 +1787,35 @@ void ARMv7_instrs::MOV_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 {
 	bool set_flags = !context.ITSTATE;
 	bool carry = context.APSR.C;
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 0;
-	u32 imm32 = 0;
+	u32 cond, d, imm32;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data >> 8) & 0x7;
 		imm32 = sign<8, u32>(code.data & 0xff);
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		set_flags = code.data & 0x100000;
 		d = (code.data >> 8) & 0xf;
 		imm32 = ThumbExpandImm_C((code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff), carry, carry);
+
+		reject(d == 13 || d == 15, "UNPREDICTABLE");
 		break;
 	}
 	case T3:
 	{
+		cond = context.ITSTATE.advance();
 		set_flags = false;
 		d = (code.data >> 8) & 0xf;
 		imm32 = (code.data & 0xf0000) >> 4 | (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
+
+		reject(d == 13 || d == 15, "UNPREDICTABLE");
 		break;
 	}
 	default: throw __FUNCTION__;
@@ -1747,31 +1835,40 @@ void ARMv7_instrs::MOV_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::MOV_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 0;
-	u32 m = 0;
-	bool set_flags = false;
+	u32 cond, d, m;
+	bool set_flags;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0x80) >> 4 | (code.data & 0x7);
 		m = (code.data & 0x78) >> 3;
+		set_flags = false;
+
+		reject(d == 15 && context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case T2:
 	{
+		cond = 15;
 		d = (code.data & 0x7);
 		m = (code.data & 0x38) >> 3;
 		set_flags = true;
+
+		reject(context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case T3:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		m = (code.data & 0xf);
 		set_flags = (code.data & 0x100000);
+
+		reject((d == 13 || m == 13 || m == 15) && set_flags, "UNPREDICTABLE");
+		reject((d == 13 && (m == 13 || m == 15)) || d == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -1793,16 +1890,17 @@ void ARMv7_instrs::MOV_REG(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::MOVT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 0;
-	u32 imm16 = 0;
+	u32 cond, d, imm16;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		imm16 = (code.data & 0xf0000) >> 4 | (code.data & 0x4000000) >> 14 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
+
+		reject(d == 13 || d == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -1847,25 +1945,28 @@ void ARMv7_instrs::MSR_REG(ARMv7Context& context, const ARMv7Code code, const AR
 void ARMv7_instrs::MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	bool set_flags = !context.ITSTATE;
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 0;
-	u32 n = 0;
-	u32 m = 0;
+	u32 cond, d, n, m;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = m = code.data & 0x7;
 		n = (code.data & 0x38) >> 3;
+
+		//reject(ArchVersion() < 6 && d == n, "UNPREDICTABLE");
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		n = (code.data & 0xf0000) >> 16;
 		m = (code.data & 0xf);
 		set_flags = false;
+
+		reject(d == 13 || d == 15 || n == 13 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -1918,16 +2019,18 @@ void ARMv7_instrs::MVN_RSR(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::NOP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
+	u32 cond; 
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		break;
 	}
 	case A1:
@@ -2003,40 +2106,50 @@ void ARMv7_instrs::PKH(ARMv7Context& context, const ARMv7Code code, const ARMv7_
 
 void ARMv7_instrs::POP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u16 reg_list = 0;
+	u32 cond, reg_list;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		reg_list = ((code.data & 0x100) << 7) | (code.data & 0xff);
+
+		reject(!reg_list, "UNPREDICTABLE");
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		reg_list = code.data & 0xdfff;
+
+		reject(BitCount(reg_list, 16) < 2 || ((reg_list & 0x8000) && (reg_list & 0x4000)), "UNPREDICTABLE");
+		reject((reg_list & 0x8000) && context.ITSTATE, "UNPREDICTABLE");
 		break;
 	}
 	case T3:
 	{
-		reg_list = 1 << (code.data >> 12);
+		cond = context.ITSTATE.advance();
+		reg_list = 1 << ((code.data & 0xf000) >> 12);
+
+		reject((reg_list & 0x2000) || ((reg_list & 0x8000) && context.ITSTATE), "UNPREDICTABLE");
 		break;
 	}
 	case A1:
 	{
 		cond = code.data >> 28;
 		reg_list = code.data & 0xffff;
-		if (BitCount(reg_list) < 2)
-		{
-			throw "POP_A1: LDM / LDMIA / LDMFD";
-		}
+
+		reject(BitCount(reg_list, 16) < 2, "LDM / LDMIA / LDMFD");
+		reject((reg_list & 0x2000) /* && ArchVersion() >= 7*/, "UNPREDICTABLE");
 		break;
 	}
 	case A2:
 	{
 		cond = code.data >> 28;
-		reg_list = 1 << ((code.data >> 12) & 0xf);
+		reg_list = 1 << ((code.data & 0xf000) >> 12);
+
+		reject(reg_list & 0x2000, "UNPREDICTABLE");
 		break;
 	}
 	default: throw __FUNCTION__;
@@ -2060,40 +2173,48 @@ void ARMv7_instrs::POP(ARMv7Context& context, const ARMv7Code code, const ARMv7_
 
 void ARMv7_instrs::PUSH(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u16 reg_list = 0;
+	u32 cond, reg_list;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		reg_list = ((code.data & 0x100) << 6) | (code.data & 0xff);
+
+		reject(!reg_list, "UNPREDICTABLE");
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		reg_list = code.data & 0x5fff;
+
+		reject(BitCount(reg_list, 16) < 2, "UNPREDICTABLE");
 		break;
 	}
 	case T3:
 	{
-		reg_list = 1 << (code.data >> 12);
+		cond = context.ITSTATE.advance();
+		reg_list = 1 << ((code.data & 0xf000) >> 12);
+
+		reject((reg_list & 0x8000) || (reg_list & 0x2000), "UNPREDICTABLE");
 		break;
 	}
 	case A1:
 	{
 		cond = code.data >> 28;
 		reg_list = code.data & 0xffff;
-		if (BitCount(reg_list) < 2)
-		{
-			throw "PUSH_A1: STMDB / STMFD";
-		}
+
+		reject(BitCount(reg_list) < 2, "STMDB / STMFD");
 		break;
 	}
 	case A2:
 	{
 		cond = code.data >> 28;
-		reg_list = 1 << ((code.data >> 12) & 0xf);
+		reg_list = 1 << ((code.data & 0xf000) >> 12);
+
+		reject(reg_list & 0x2000, "UNPREDICTABLE");
 		break;
 	}
 	default: throw __FUNCTION__;
@@ -2700,43 +2821,50 @@ void ARMv7_instrs::STMIB(ARMv7Context& context, const ARMv7Code code, const ARMv
 
 void ARMv7_instrs::STR_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 t = 16;
-	u32 n = 13;
-	u32 imm32 = 0;
-	bool index = true;
-	bool add = true;
-	bool wback = false;
+	u32 cond, t, n, imm32;
+	bool index, add, wback;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0x7);
 		n = (code.data & 0x38) >> 3;
 		imm32 = (code.data & 0x7c0) >> 4;
+		index = true;
+		add = true;
+		wback = false;
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0x700) >> 8;
+		n = 13;
 		imm32 = (code.data & 0xff) << 2;
+		index = true;
+		add = true;
+		wback = false;
 		break;
 	}
 	case T3:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0xf000) >> 12;
 		n = (code.data & 0xf0000) >> 16;
 		imm32 = (code.data & 0xfff);
+		index = true;
+		add = true;
+		wback = false;
 
-		if (n == 0xf)
-		{
-			throw "STR_IMM_T3: undefined";
-		}
+		reject(n == 15, "UNDEFINED");
+		reject(t == 15, "UNPREDICTABLE");
 		break;
 	}
 	case T4:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0xf000) >> 12;
 		n = (code.data & 0xf0000) >> 16;
 		imm32 = (code.data & 0xff);
@@ -2744,18 +2872,10 @@ void ARMv7_instrs::STR_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 		add = (code.data & 0x200);
 		wback = (code.data & 0x100);
 
-		if (index && add && !wback)
-		{
-			throw "STR_IMM_T4: STRT";
-		}
-		if (n == 13 && index && !add && wback && imm32 == 4)
-		{
-			throw "STR_IMM_T4: PUSH";
-		}
-		if (n == 15 || (!index && !wback))
-		{
-			throw "STR_IMM_T4: undefined";
-		}
+		reject(index && add && !wback, "STRT");
+		reject(n == 13 && index && !add && wback && imm32 == 4, "PUSH");
+		reject(n == 15 || (!index && !wback), "UNDEFINED");
+		reject(t == 15 || (wback && n == t), "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -2778,36 +2898,38 @@ void ARMv7_instrs::STR_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::STR_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 t = 0;
-	u32 n = 0;
-	u32 m = 0;
-	bool index = true;
-	bool add = true;
-	bool wback = false;
-	auto shift_t = SRType_LSL;
-	u32 shift_n = 0;
+	u32 cond, t, n, m, shift_t, shift_n;
+	bool index, add, wback;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0x7);
 		n = (code.data & 0x38) >> 3;
 		m = (code.data & 0x1c0) >> 6;
+		index = true;
+		add = true;
+		wback = false;
+		shift_t = SRType_LSL;
+		shift_n = 0;
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		t = (code.data & 0xf000) >> 12;
 		n = (code.data & 0xf0000) >> 16;
 		m = (code.data & 0xf);
+		index = true;
+		add = true;
+		wback = false;
+		shift_t = SRType_LSL;
 		shift_n = (code.data & 0x30) >> 4;
 
-		if (n == 15)
-		{
-			throw "STR_REG_T2: undefined";
-		}
+		reject(n == 15, "UNDEFINED");
+		reject(t == 15 || m == 13 || m == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -2889,20 +3011,20 @@ void ARMv7_instrs::STRH_REG(ARMv7Context& context, const ARMv7Code code, const A
 
 void ARMv7_instrs::STREX(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 0;
-	u32 t = 0;
-	u32 n = 0;
-	u32 imm32 = 0;
+	u32 cond, d, t, n, imm32;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		t = (code.data & 0xf000) >> 12;
 		n = (code.data & 0xf0000) >> 16;
 		imm32 = (code.data & 0xff) << 2;
+
+		reject(d == 13 || d == 15 || t == 13 || t == 15 || n == 15, "UNPREDICTABLE");
+		reject(d == n || d == t, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -2951,15 +3073,13 @@ void ARMv7_instrs::STREXH(ARMv7Context& context, const ARMv7Code code, const ARM
 void ARMv7_instrs::SUB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	bool set_flags = !context.ITSTATE;
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 0;
-	u32 n = 0;
-	u32 imm32 = 0;
+	u32 cond, d, n, imm32;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0x7);
 		n = (code.data & 0x38) >> 3;
 		imm32 = (code.data & 0x1c) >> 6;
@@ -2967,42 +3087,35 @@ void ARMv7_instrs::SUB_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		d = n = (code.data & 0x700) >> 8;
 		imm32 = (code.data & 0xff);
 		break;
 	}
 	case T3:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		n = (code.data & 0xf0000) >> 16;
 		set_flags = (code.data & 0x100000);
 		imm32 = ThumbExpandImm(context, (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff));
 
-		if (d == 15 && set_flags)
-		{
-			throw "SUB_IMM_T3: CMP (immediate)";
-		}
-		if (n == 13)
-		{
-			throw "SUB_IMM_T3: SUB (SP minus immediate)";
-		}
+		reject(d == 15 && set_flags, "CMP (immediate)");
+		reject(n == 13, "SUB (SP minus immediate)");
+		reject(d == 13 || d == 15 || n == 15, "UNPREDICTABLE");
 		break;
 	}
 	case T4:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		n = (code.data & 0xf0000) >> 16;
 		set_flags = false;
 		imm32 = (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
 
-		if (d == 15)
-		{
-			throw "SUB_IMM_T4: ADR";
-		}
-		if (n == 13)
-		{
-			throw "SUB_IMM_T4: SUB (SP minus immediate)";
-		}
+		reject(d == 15, "ADR");
+		reject(n == 13, "SUB (SP minus immediate)");
+		reject(d == 13 || d == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -3031,38 +3144,32 @@ void ARMv7_instrs::SUB_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 void ARMv7_instrs::SUB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	bool set_flags = !context.ITSTATE;
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 0;
-	u32 n = 0;
-	u32 m = 0;
-	auto shift_t = SRType_LSL;
-	u32 shift_n = 0;
+	u32 cond, d, n, m, shift_t, shift_n;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0x7);
 		n = (code.data & 0x38) >> 3;
 		m = (code.data & 0x1c0) >> 6;
+		shift_t = SRType_LSL;
+		shift_n = 0;
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		n = (code.data & 0xf0000) >> 16;
 		m = (code.data & 0xf);
 		set_flags = (code.data & 0x100000);
 		shift_t = DecodeImmShift((code.data & 0x30) >> 4, (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6, &shift_n);
 
-		if (d == 15 && set_flags)
-		{
-			throw "SUB_REG_T2: CMP (register)";
-		}
-		if (n == 13)
-		{
-			throw "SUB_REG_T2: SUB (SP minus register)";
-		}
+		reject(d == 15 && set_flags, "CMP (register)");
+		reject(n == 13, "SUB (SP minus register)");
+		reject(d == 13 || d == 15 || n == 15 || m == 13 || m == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
@@ -3100,35 +3207,38 @@ void ARMv7_instrs::SUB_RSR(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::SUB_SPI(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
-	u32 cond = context.ITSTATE.advance();
-	u32 d = 13;
-	bool set_flags = false;
-	u32 imm32 = 0;
+	u32 cond, d, imm32;
+	bool set_flags;
 
 	switch (type)
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
+		d = 13;
+		set_flags = false;
 		imm32 = (code.data & 0x7f) << 2;
 		break;
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		set_flags = (code.data & 0x100000);
 		imm32 = ThumbExpandImm(context, (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff));
 
-		if (d == 15 && set_flags)
-		{
-			throw "SUB_SPI_T2: CMP (immediate)";
-		}
+		reject(d == 15 && set_flags, "CMP (immediate)");
+		reject(d == 15, "UNPREDICTABLE");
 		break;
 	}
 	case T3:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		set_flags = false;
 		imm32 = (code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff);
+
+		reject(d == 15, "UNPREDICTABLE");
 		break;
 	}
 	case A1: throw __FUNCTION__;
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
index c99958a35c..4e4b8b6dc1 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
@@ -28,71 +28,6 @@ enum SRType : u32
 
 namespace ARMv7_instrs
 {
-	template<typename T>
-	static bool IsZero(T x)
-	{
-		return x == T(0);
-	}
-
-	template<typename T>
-	static bool IsOnes(T x)
-	{
-		return x == ~T(0);
-	}
-
-	template<typename T>
-	static u8 IsZeroBit(T x)
-	{
-		return IsZero(x) ? 1 : 0;
-	}
-
-	template<typename T>
-	static bool IsOnesBit(T x, u8 len = sizeof(T) * 8)
-	{
-		return IsOnes(x) ? 1 : 0;
-	}
-
-	template<typename T>
-	u8 BitCount(T x, u8 len = sizeof(T) * 8);
-
-	template<typename T>
-	s8 LowestSetBit(T x, u8 len = sizeof(T) * 8);
-
-	template<typename T>
-	s8 HighestSetBit(T x, u8 len = sizeof(T) * 8);
-
-	template<typename T>
-	s8 CountLeadingZeroBits(T x, u8 len = sizeof(T) * 8);
-
-	SRType DecodeImmShift(u32 type, u32 imm5, u32* shift_n);
-	SRType DecodeRegShift(u8 type);
-
-	u32 LSL_C(u32 x, s32 shift, bool& carry_out);
-	u32 LSL_(u32 x, s32 shift);
-	u32 LSR_C(u32 x, s32 shift, bool& carry_out);
-	u32 LSR_(u32 x, s32 shift);
-
-	s32 ASR_C(s32 x, s32 shift, bool& carry_out);
-	s32 ASR_(s32 x, s32 shift);
-
-	u32 ROR_C(u32 x, s32 shift, bool& carry_out);
-	u32 ROR_(u32 x, s32 shift);
-
-	u32 RRX_C(u32 x, bool carry_in, bool& carry_out);
-	u32 RRX_(u32 x, bool carry_in);
-
-	template<typename T> T Shift_C(T value, SRType type, s32 amount, bool carry_in, bool& carry_out);
-
-	template<typename T> T Shift(T value, SRType type, s32 amount, bool carry_in);
-
-	template<typename T> T AddWithCarry(T x, T y, bool carry_in, bool& carry_out, bool& overflow);
-
-	u32 ThumbExpandImm_C(u32 imm12, bool carry_in, bool& carry_out);
-	u32 ThumbExpandImm(ARMv7Context& context, u32 imm12);
-
-	bool ConditionPassed(ARMv7Context& context, u32 cond);
-
-	// instructions
 	void UNK(ARMv7Context& context, const ARMv7Code code);
 
 	void NULL_OP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);

From 55a2a5c8e55a9500541105358d777ce11b8dc05c Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 23 Jan 2015 22:36:35 +0300
Subject: [PATCH 26/70] ARMv7: CLZ, MVN_IMM, UXTB implemented

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp     |  4 +-
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 70 ++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index 42bda91fd6..f913bcbb8a 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -649,8 +649,8 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0xfff0, 0xf0f0, 0xfac0, 0xf040, T1, USUB8),
 	ARMv7_OP4(0x0ff0, 0x0ff0, 0x0650, 0x0ff0, A1, USUB8),
 
-	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa50, 0xf080, T1, UXTAB),
-	ARMv7_OP4(0x0ff0, 0x03f0, 0x06e0, 0x0070, A1, UXTAB),
+	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa50, 0xf080, T1, UXTAB, SKIP_IF( BF(16, 19) == 15 )),
+	ARMv7_OP4(0x0ff0, 0x03f0, 0x06e0, 0x0070, A1, UXTAB, SKIP_IF( BF(16, 19) == 15 )),
 
 	ARMv7_OP4(0xfff0, 0xf0c0, 0xfa30, 0xf080, T1, UXTAB16),
 	ARMv7_OP4(0x0ff0, 0x03f0, 0x06c0, 0x0070, A1, UXTAB16),
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index 1af7c948ec..e6cd7dc651 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -693,6 +693,7 @@ void ARMv7_instrs::AND_REG(ARMv7Context& context, const ARMv7Code code, const AR
 	{
 	case T1:
 	{
+		cond = context.ITSTATE.advance();
 		d = n = (code.data & 0x7);
 		m = (code.data & 0x38) >> 3;
 		shift_t = SRType_LSL;
@@ -701,6 +702,7 @@ void ARMv7_instrs::AND_REG(ARMv7Context& context, const ARMv7Code code, const AR
 	}
 	case T2:
 	{
+		cond = context.ITSTATE.advance();
 		d = (code.data & 0xf00) >> 8;
 		n = (code.data & 0xf0000) >> 16;
 		m = (code.data & 0xf);
@@ -1054,11 +1056,28 @@ void ARMv7_instrs::CB_Z(ARMv7Context& context, const ARMv7Code code, const ARMv7
 
 void ARMv7_instrs::CLZ(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	u32 cond, d, m;
+
 	switch (type)
 	{
+	case T1:
+	{
+		cond = context.ITSTATE.advance();
+		d = (code.data & 0xf00) >> 8;
+		m = (code.data & 0xf);
+
+		reject((code.data & 0xf0000) >> 16 != m, "UNPREDICTABLE");
+		reject(d == 13 || d == 15 || m == 13 || m == 15, "UNPREDICTABLE");
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		context.write_gpr(d, cntlz32(context.read_gpr(m)));
+	}
 }
 
 
@@ -1991,11 +2010,37 @@ void ARMv7_instrs::MUL(ARMv7Context& context, const ARMv7Code code, const ARMv7_
 
 void ARMv7_instrs::MVN_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	u32 cond, d, imm32;
+	bool set_flags, carry;
+
 	switch (type)
 	{
+	case T1:
+	{
+		cond = context.ITSTATE.advance();
+		d = (code.data & 0xf00) >> 8;
+		set_flags = (code.data & 0x100000);
+		imm32 = ThumbExpandImm_C((code.data & 0x4000000) >> 15 | (code.data & 0x7000) >> 4 | (code.data & 0xff), context.APSR.C, carry);
+
+		reject(d == 13 || d == 15, "UNPREDICTABLE");
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		const u32 result = ~imm32;
+		context.write_gpr(d, result);
+
+		if (set_flags)
+		{
+			context.APSR.N = result >> 31;
+			context.APSR.Z = result == 0;
+			context.APSR.C = carry;
+		}
+	}
 }
 
 void ARMv7_instrs::MVN_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
@@ -3677,11 +3722,36 @@ void ARMv7_instrs::UXTAH(ARMv7Context& context, const ARMv7Code code, const ARMv
 
 void ARMv7_instrs::UXTB(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	u32 cond, d, m, rot;
+
 	switch (type)
 	{
+	case T1:
+	{
+		cond = context.ITSTATE.advance();
+		d = (code.data & 0x7);
+		m = (code.data & 0x38) >> 3;
+		rot = 0;
+		break;
+	}
+	case T2:
+	{
+		cond = context.ITSTATE.advance();
+		d = (code.data & 0xf00) >> 8;
+		m = (code.data & 0xf);
+		rot = (code.data & 0x30) >> 1;
+
+		reject(d == 13 || d == 15 || m == 13 || m == 15, "UNPREDICTABLE");
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		context.write_gpr(d, (context.read_gpr(m) >> rot) & 0xff);
+	}
 }
 
 void ARMv7_instrs::UXTB16(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)

From 2647b77c011bfc65c10093bd72f2e8ad99af02a8 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Sat, 24 Jan 2015 00:48:14 +0300
Subject: [PATCH 27/70] sceLibKernel.h added

---
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp | 154 ++++--------
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.h   | 308 +++++++++++++++++++++++
 rpcs3/Emu/CPU/CPUThreadManager.cpp       |  13 +
 rpcs3/Emu/CPU/CPUThreadManager.h         |   1 +
 rpcs3/emucore.vcxproj                    |   1 +
 rpcs3/emucore.vcxproj.filters            |   3 +
 6 files changed, 381 insertions(+), 99 deletions(-)
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceLibKernel.h

diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index 73a6f864e3..11cb59ae4b 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -4,89 +4,13 @@
 #include "Emu/ARMv7/PSVFuncList.h"
 
 #include "Emu/CPU/CPUThreadManager.h"
+#include "Emu/SysCalls/Callback.h"
 #include "Emu/ARMv7/ARMv7Thread.h"
 
-extern psv_log_base sceLibKernel;
+#include "sceLibKernel.h"
 
 #define RETURN_ERROR(code) { Emu.Pause(); sceLibKernel.Error("%s() failed: %s", __FUNCTION__, #code); return code; }
 
-#pragma pack(push, 4)
-
-typedef s32(*SceKernelThreadEntry)(u32 argSize, vm::psv::ptr<void> pArgBlock);
-
-union SceKernelSysClock
-{
-	struct
-	{
-		u32 low;
-		u32 hi;
-	};
-	u64 quad;
-};
-
-struct SceKernelThreadOptParam
-{
-	u32 size;
-	u32 attr;
-};
-
-struct SceKernelThreadInfo
-{
-	u32 size;
-	s32 processId;
-	char name[32];
-	u32 attr;
-	u32 status;
-	SceKernelThreadEntry entry;
-	vm::psv::ptr<void> pStack;
-	u32 stackSize;
-	s32 initPriority;
-	s32 currentPriority;
-	s32 initCpuAffinityMask;
-	s32 currentCpuAffinityMask;
-	s32 currentCpuId;
-	s32 lastExecutedCpuId;
-	u32 waitType;
-	s32 waitId;
-	s32 exitStatus;
-	SceKernelSysClock runClocks;
-	u32 intrPreemptCount;
-	u32 threadPreemptCount;
-	u32 threadReleaseCount;
-	s32 changeCpuCount;
-	s32 fNotifyCallback;
-	s32 reserved;
-};
-
-struct SceKernelThreadRunStatus
-{
-	u32 size;
-
-	struct
-	{
-		s32 processId;
-		s32 threadId;
-		s32 priority;
-
-	} cpuInfo[4];
-};
-
-struct SceKernelSystemInfo
-{
-	u32 size;
-	u32 activeCpuMask;
-
-	struct
-	{
-		SceKernelSysClock idleClock;
-		u32 comesOutOfIdleCount;
-		u32 threadSwitchCount;
-
-	} cpuInfo[4];
-};
-
-#pragma pack(pop)
-
 u32 sceKernelCreateThread(
 	vm::psv::ptr<const char> pName,
 	vm::psv::ptr<SceKernelThreadEntry> entry,
@@ -113,17 +37,24 @@ u32 sceKernelCreateThread(
 	return id;
 }
 
-s32 sceKernelStartThread(u32 threadId, u32 argSize, vm::psv::ptr<const void> pArgBlock)
+s32 sceKernelStartThread(s32 threadId, u32 argSize, vm::psv::ptr<const void> pArgBlock)
 {
 	sceLibKernel.Error("sceKernelStartThread(threadId=0x%x, argSize=0x%x, pArgBlock=0x%x)", threadId, argSize, pArgBlock);
 
-	std::shared_ptr<CPUThread> t = Emu.GetCPU().GetThread(threadId);
+	std::shared_ptr<CPUThread> t = Emu.GetCPU().GetThread(threadId, CPU_THREAD_ARMv7);
 
-	if (!t || t->GetType() != CPU_THREAD_ARMv7)
+	if (!t)
 	{
 		RETURN_ERROR(SCE_KERNEL_ERROR_INVALID_UID);
 	}
 
+	// thread should be in DORMANT state, but it's not possible to check it correctly atm
+
+	if (t->IsAlive())
+	{
+		RETURN_ERROR(SCE_KERNEL_ERROR_NOT_DORMANT);
+	}
+
 	ARMv7Thread& thread = static_cast<ARMv7Thread&>(*t);
 
 	// push arg block onto the stack
@@ -148,35 +79,60 @@ s32 sceKernelExitThread(ARMv7Context& context, s32 exitStatus)
 	return SCE_OK;
 }
 
-s32 sceKernelDeleteThread(u32 threadId)
+s32 sceKernelDeleteThread(s32 threadId)
 {
-	sceLibKernel.Todo("sceKernelDeleteThread(threadId=0x%x)", threadId);
+	sceLibKernel.Error("sceKernelDeleteThread(threadId=0x%x)", threadId);
+
+	std::shared_ptr<CPUThread> t = Emu.GetCPU().GetThread(threadId, CPU_THREAD_ARMv7);
+
+	if (!t)
+	{
+		RETURN_ERROR(SCE_KERNEL_ERROR_INVALID_UID);
+	}
+
+	// thread should be in DORMANT state, but it's not possible to check it correctly atm
+
+	if (t->IsAlive())
+	{
+		RETURN_ERROR(SCE_KERNEL_ERROR_NOT_DORMANT);
+	}
+
+	Emu.GetCPU().RemoveThread(threadId);
+	return SCE_OK;
+}
+
+s32 sceKernelExitDeleteThread(ARMv7Context& context, s32 exitStatus)
+{
+	sceLibKernel.Error("sceKernelExitDeleteThread(exitStatus=0x%x)", exitStatus);
+
+	// exit status is stored in r0
+	context.thread.Stop();
+
+	// current thread should be deleted
+	const u32 id = context.thread.GetId();
+	CallAfter([id]()
+	{
+		Emu.GetCPU().RemoveThread(id);
+	});
 
 	return SCE_OK;
 }
 
-s32 sceKernelExitDeleteThread(s32 exitStatus)
-{
-	sceLibKernel.Todo("sceKernelExitDeleteThread(exitStatus=0x%x)", exitStatus);
-
-	return SCE_OK;
-}
-
-s32 sceKernelChangeThreadCpuAffinityMask(u32 threadId, s32 cpuAffinityMask)
+s32 sceKernelChangeThreadCpuAffinityMask(s32 threadId, s32 cpuAffinityMask)
 {
 	sceLibKernel.Todo("sceKernelChangeThreadCpuAffinityMask(threadId=0x%x, cpuAffinityMask=0x%x)", threadId, cpuAffinityMask);
 
 	return SCE_OK;
 }
 
-s32 sceKernelGetThreadCpuAffinityMask(u32 threadId)
+s32 sceKernelGetThreadCpuAffinityMask(s32 threadId)
 {
 	sceLibKernel.Todo("sceKernelGetThreadCpuAffinityMask(threadId=0x%x)", threadId);
 
 	return SCE_OK;
 }
 
-s32 sceKernelChangeThreadPriority(u32 threadId, s32 priority)
+s32 sceKernelChangeThreadPriority(s32 threadId, s32 priority)
 {
 	sceLibKernel.Todo("sceKernelChangeThreadPriority(threadId=0x%x, priority=%d)", threadId, priority);
 
@@ -204,7 +160,7 @@ s32 sceKernelChangeCurrentThreadAttr(u32 clearAttr, u32 setAttr)
 	return SCE_OK;
 }
 
-s32 sceKernelGetThreadExitStatus(u32 threadId, vm::psv::ptr<s32> pExitStatus)
+s32 sceKernelGetThreadExitStatus(s32 threadId, vm::psv::ptr<s32> pExitStatus)
 {
 	sceLibKernel.Todo("sceKernelGetThreadExitStatus(threadId=0x%x, pExitStatus=0x%x)", threadId, pExitStatus);
 
@@ -225,7 +181,7 @@ s32 sceKernelCheckWaitableStatus()
 	return SCE_OK;
 }
 
-s32 sceKernelGetThreadInfo(u32 threadId, vm::psv::ptr<SceKernelThreadInfo> pInfo)
+s32 sceKernelGetThreadInfo(s32 threadId, vm::psv::ptr<SceKernelThreadInfo> pInfo)
 {
 	sceLibKernel.Todo("sceKernelGetThreadInfo(threadId=0x%x, pInfo=0x%x)", threadId, pInfo);
 
@@ -281,13 +237,13 @@ s32 sceKernelDelayThreadCB(u32 usec)
 	return SCE_OK;
 }
 
-s32 sceKernelWaitThreadEnd(u32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
+s32 sceKernelWaitThreadEnd(s32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
 {
 	sceLibKernel.Error("sceKernelWaitThreadEnd(threadId=0x%x, pExitStatus=0x%x, pTimeout=0x%x)", threadId, pExitStatus, pTimeout);
 
-	std::shared_ptr<CPUThread> t = Emu.GetCPU().GetThread(threadId);
+	std::shared_ptr<CPUThread> t = Emu.GetCPU().GetThread(threadId, CPU_THREAD_ARMv7);
 
-	if (!t || t->GetType() != CPU_THREAD_ARMv7)
+	if (!t)
 	{
 		RETURN_ERROR(SCE_KERNEL_ERROR_INVALID_UID);
 	}
@@ -316,7 +272,7 @@ s32 sceKernelWaitThreadEnd(u32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv:
 	return SCE_OK;
 }
 
-s32 sceKernelWaitThreadEndCB(u32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
+s32 sceKernelWaitThreadEndCB(s32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
 {
 	sceLibKernel.Todo("sceKernelWaitThreadEndCB(threadId=0x%x, pExitStatus=0x%x, pTimeout=0x%x)", threadId, pExitStatus, pTimeout);
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
new file mode 100644
index 0000000000..7750e9e58f
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
@@ -0,0 +1,308 @@
+#pragma once
+
+union SceKernelSysClock
+{
+	struct
+	{
+		u32 low;
+		u32 hi;
+	};
+
+	u64 quad;
+};
+
+// Memory Manager definitions
+
+typedef s32 SceKernelMemoryType;
+
+struct SceKernelMemBlockInfo
+{
+	u32 size;
+	vm::psv::ptr<void> mappedBase;
+	u32 mappedSize;
+	SceKernelMemoryType memoryType;
+	u32 access;
+};
+
+// Thread Manager definitions (threads)
+
+typedef s32(*SceKernelThreadEntry)(u32 argSize, vm::psv::ptr<void> pArgBlock);
+
+struct SceKernelThreadOptParam
+{
+	u32 size;
+	u32 attr;
+};
+
+struct SceKernelThreadInfo
+{
+	u32 size;
+	s32 processId;
+	char name[32];
+	u32 attr;
+	u32 status;
+	vm::psv::ptr<SceKernelThreadEntry> entry;
+	vm::psv::ptr<void> pStack;
+	u32 stackSize;
+	s32 initPriority;
+	s32 currentPriority;
+	s32 initCpuAffinityMask;
+	s32 currentCpuAffinityMask;
+	s32 currentCpuId;
+	s32 lastExecutedCpuId;
+	u32 waitType;
+	s32 waitId;
+	s32 exitStatus;
+	SceKernelSysClock runClocks;
+	u32 intrPreemptCount;
+	u32 threadPreemptCount;
+	u32 threadReleaseCount;
+	s32 changeCpuCount;
+	s32 fNotifyCallback;
+	s32 reserved;
+};
+
+struct SceKernelThreadRunStatus
+{
+	u32 size;
+
+	struct
+	{
+		s32 processId;
+		s32 threadId;
+		s32 priority;
+
+	} cpuInfo[4];
+};
+
+struct SceKernelSystemInfo
+{
+	u32 size;
+	u32 activeCpuMask;
+
+	struct
+	{
+		SceKernelSysClock idleClock;
+		u32 comesOutOfIdleCount;
+		u32 threadSwitchCount;
+
+	} cpuInfo[4];
+};
+
+// Thread Manager definitions (callbacks)
+
+typedef s32(*SceKernelCallbackFunction)(s32 notifyId, s32 notifyCount, s32 notifyArg, vm::psv::ptr<void> pCommon);
+
+struct SceKernelCallbackInfo
+{
+	u32 size;
+	s32 callbackId;
+	char name[32];
+	u32 attr;
+	s32 threadId;
+	vm::psv::ptr<SceKernelCallbackFunction> callbackFunc;
+	s32 notifyId;
+	s32 notifyCount;
+	s32 notifyArg;
+	vm::psv::ptr<void> pCommon;
+};
+
+// Thread Manager definitions (events)
+
+typedef s32(*SceKernelThreadEventHandler)(s32 type, s32 threadId, s32 arg, vm::psv::ptr<void> pCommon);
+
+struct SceKernelEventInfo
+{
+	u32 size;
+	s32 eventId;
+	char name[32];
+	u32 attr;
+	u32 eventPattern;
+	u64 userData;
+	u32 numWaitThreads;
+	s32 reserved[1];
+};
+
+struct SceKernelWaitEvent
+{
+	s32 eventId;
+	u32 eventPattern;
+};
+
+struct SceKernelResultEvent
+{
+	s32 eventId;
+	s32 result;
+	u32 resultPattern;
+	s32 reserved[1];
+	u64 userData;
+};
+
+// Thread Manager definitions (event flags)
+
+struct SceKernelEventFlagOptParam
+{
+	u32 size;
+};
+
+struct SceKernelEventFlagInfo
+{
+	u32 size;
+	s32 evfId;
+	char name[32];
+	u32 attr;
+	u32 initPattern;
+	u32 currentPattern;
+	s32 numWaitThreads;
+};
+
+// Thread Manager definitions (semaphores)
+
+struct SceKernelSemaOptParam
+{
+	u32 size;
+};
+
+struct SceKernelSemaInfo
+{
+	u32 size;
+	s32 semaId;
+	char name[32];
+	u32 attr;
+	s32 initCount;
+	s32 currentCount;
+	s32 maxCount;
+	s32 numWaitThreads;
+};
+
+// Thread Manager definitions (mutexes)
+
+struct SceKernelMutexOptParam
+{
+	u32 size;
+	s32 ceilingPriority;
+};
+
+struct SceKernelMutexInfo
+{
+	u32 size;
+	s32 mutexId;
+	char name[32];
+	u32 attr;
+	s32 initCount;
+	s32 currentCount;
+	s32 currentOwnerId;
+	s32 numWaitThreads;
+};
+
+// Thread Manager definitions (lightweight mutexes)
+
+struct SceKernelLwMutexWork
+{
+	s32 data[4];
+};
+
+struct SceKernelLwMutexOptParam
+{
+	u32 size;
+};
+
+struct SceKernelLwMutexInfo
+{
+	u32 size;
+	s32 uid;
+	char name[32];
+	u32 attr;
+	vm::psv::ptr<SceKernelLwMutexWork> pWork;
+	s32 initCount;
+	s32 currentCount;
+	s32 currentOwnerId;
+	s32 numWaitThreads;
+};
+
+// Thread Manager definitions (condition variables)
+
+struct SceKernelCondOptParam
+{
+	u32 size;
+};
+
+struct SceKernelCondInfo
+{
+	u32 size;
+	s32 condId;
+	char name[32];
+	u32 attr;
+	s32 mutexId;
+	u32 numWaitThreads;
+};
+
+// Thread Manager definitions (lightweight condition variables)
+
+struct SceKernelLwCondWork
+{
+	s32 data[4];
+};
+
+struct SceKernelLwCondOptParam
+{
+	u32 size;
+};
+
+struct SceKernelLwCondInfo
+{
+	u32 size;
+	s32 uid;
+	char name[32];
+	u32 attr;
+	vm::psv::ptr<SceKernelLwCondWork> pWork;
+	vm::psv::ptr<SceKernelLwMutexWork> pLwMutex;
+	u32 numWaitThreads;
+};
+
+// Thread Manager definitions (timers)
+
+struct SceKernelTimerOptParam
+{
+	u32 size;
+};
+
+struct SceKernelTimerInfo
+{
+	u32 size;
+	s32 timerId;
+	char name[32];
+	u32 attr;
+	s32 fActive;
+	SceKernelSysClock baseTime;
+	SceKernelSysClock currentTime;
+	SceKernelSysClock schedule;
+	SceKernelSysClock interval;
+	s32 type;
+	s32 fRepeat;
+	s32 numWaitThreads;
+	s32 reserved[1];
+};
+
+// Thread Manager definitions (reader/writer locks)
+
+struct SceKernelRWLockOptParam
+{
+	u32 size;
+};
+
+struct SceKernelRWLockInfo
+{
+	u32 size;
+	s32 rwLockId;
+	char name[32];
+	u32 attr;
+	s32 lockCount;
+	s32 writeOwnerId;
+	s32 numReadWaitThreads;
+	s32 numWriteWaitThreads;
+};
+
+// Module
+
+extern psv_log_base sceLibKernel;
diff --git a/rpcs3/Emu/CPU/CPUThreadManager.cpp b/rpcs3/Emu/CPU/CPUThreadManager.cpp
index fa682b4e82..dca9be9e98 100644
--- a/rpcs3/Emu/CPU/CPUThreadManager.cpp
+++ b/rpcs3/Emu/CPU/CPUThreadManager.cpp
@@ -117,6 +117,19 @@ std::shared_ptr<CPUThread> CPUThreadManager::GetThread(u32 id)
 	return res;
 }
 
+std::shared_ptr<CPUThread> CPUThreadManager::GetThread(u32 id, CPUThreadType type)
+{
+	std::shared_ptr<CPUThread> res;
+
+	if (!id) return nullptr;
+
+	if (!Emu.GetIdManager().GetIDData(id, res)) return nullptr;
+
+	if (res->GetType() != type) return nullptr;
+
+	return res;
+}
+
 RawSPUThread* CPUThreadManager::GetRawSPUThread(u32 num)
 {
 	if (num < sizeof(Memory.RawSPUMem) / sizeof(Memory.RawSPUMem[0]))
diff --git a/rpcs3/Emu/CPU/CPUThreadManager.h b/rpcs3/Emu/CPU/CPUThreadManager.h
index e3fc1df32b..66fef8b377 100644
--- a/rpcs3/Emu/CPU/CPUThreadManager.h
+++ b/rpcs3/Emu/CPU/CPUThreadManager.h
@@ -21,6 +21,7 @@ public:
 	//std::vector<std::shared_ptr<CPUThread>>& GetThreads() { return m_threads; }
 	s32 GetThreadNumById(CPUThreadType type, u32 id);
 	std::shared_ptr<CPUThread> GetThread(u32 id);
+	std::shared_ptr<CPUThread> GetThread(u32 id, CPUThreadType type);
 	RawSPUThread* GetRawSPUThread(u32 num);
 
 	void Exec();
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 42813536b7..4b4a2d6539 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -274,6 +274,7 @@
     <ClInclude Include="Emu\ARMv7\ARMv7Interpreter.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7Opcodes.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7Thread.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h" />
     <ClInclude Include="Emu\ARMv7\PSVFuncList.h" />
     <ClInclude Include="Emu\Audio\AL\OpenALThread.h" />
     <ClInclude Include="Emu\Audio\AudioDumper.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 4965248105..fdd71b410a 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -1291,5 +1291,8 @@
     <ClInclude Include="Emu\ARMv7\ARMv7Callback.h">
       <Filter>Emu\CPU\ARMv7</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 08c0c90a05b99fe33272a7fa433c97d1f799162b Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Sat, 24 Jan 2015 03:18:25 +0300
Subject: [PATCH 28/70] Some functions registered

---
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp | 161 ++++++++++++++++++-----
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.h   |  27 ++++
 rpcs3/Emu/ARMv7/PSVFuncList.h            |  11 ++
 3 files changed, 165 insertions(+), 34 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index 11cb59ae4b..41096a73dc 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -11,7 +11,7 @@
 
 #define RETURN_ERROR(code) { Emu.Pause(); sceLibKernel.Error("%s() failed: %s", __FUNCTION__, #code); return code; }
 
-u32 sceKernelCreateThread(
+s32 sceKernelCreateThread(
 	vm::psv::ptr<const char> pName,
 	vm::psv::ptr<SceKernelThreadEntry> entry,
 	s32 initPriority,
@@ -122,28 +122,28 @@ s32 sceKernelChangeThreadCpuAffinityMask(s32 threadId, s32 cpuAffinityMask)
 {
 	sceLibKernel.Todo("sceKernelChangeThreadCpuAffinityMask(threadId=0x%x, cpuAffinityMask=0x%x)", threadId, cpuAffinityMask);
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelGetThreadCpuAffinityMask(s32 threadId)
 {
 	sceLibKernel.Todo("sceKernelGetThreadCpuAffinityMask(threadId=0x%x)", threadId);
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelChangeThreadPriority(s32 threadId, s32 priority)
 {
 	sceLibKernel.Todo("sceKernelChangeThreadPriority(threadId=0x%x, priority=%d)", threadId, priority);
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelGetThreadCurrentPriority()
 {
 	sceLibKernel.Todo("sceKernelGetThreadCurrentPriority()");
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 u32 sceKernelGetThreadId(ARMv7Context& context)
@@ -157,84 +157,84 @@ s32 sceKernelChangeCurrentThreadAttr(u32 clearAttr, u32 setAttr)
 {
 	sceLibKernel.Todo("sceKernelChangeCurrentThreadAttr()");
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelGetThreadExitStatus(s32 threadId, vm::psv::ptr<s32> pExitStatus)
 {
 	sceLibKernel.Todo("sceKernelGetThreadExitStatus(threadId=0x%x, pExitStatus=0x%x)", threadId, pExitStatus);
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelGetProcessId()
 {
 	sceLibKernel.Todo("sceKernelGetProcessId()");
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelCheckWaitableStatus()
 {
 	sceLibKernel.Todo("sceKernelCheckWaitableStatus()");
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelGetThreadInfo(s32 threadId, vm::psv::ptr<SceKernelThreadInfo> pInfo)
 {
 	sceLibKernel.Todo("sceKernelGetThreadInfo(threadId=0x%x, pInfo=0x%x)", threadId, pInfo);
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelGetThreadRunStatus(vm::psv::ptr<SceKernelThreadRunStatus> pStatus)
 {
 	sceLibKernel.Todo("sceKernelGetThreadRunStatus(pStatus=0x%x)", pStatus);
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelGetSystemInfo(vm::psv::ptr<SceKernelSystemInfo> pInfo)
 {
 	sceLibKernel.Todo("sceKernelGetSystemInfo(pInfo=0x%x)", pInfo);
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelGetThreadmgrUIDClass(s32 uid)
 {
 	sceLibKernel.Todo("sceKernelGetThreadmgrUIDClass(uid=0x%x)", uid);
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelChangeThreadVfpException(s32 clearMask, s32 setMask)
 {
 	sceLibKernel.Todo("sceKernelChangeThreadVfpException(clearMask=0x%x, setMask=0x%x)", clearMask, setMask);
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelGetCurrentThreadVfpException()
 {
 	sceLibKernel.Todo("sceKernelGetCurrentThreadVfpException()");
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelDelayThread(u32 usec)
 {
 	sceLibKernel.Todo("sceKernelDelayThread()");
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelDelayThreadCB(u32 usec)
 {
 	sceLibKernel.Todo("sceKernelDelayThreadCB()");
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
 s32 sceKernelWaitThreadEnd(s32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
@@ -272,13 +272,104 @@ s32 sceKernelWaitThreadEnd(s32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv:
 	return SCE_OK;
 }
 
+// Callback functions
+
 s32 sceKernelWaitThreadEndCB(s32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
 {
 	sceLibKernel.Todo("sceKernelWaitThreadEndCB(threadId=0x%x, pExitStatus=0x%x, pTimeout=0x%x)", threadId, pExitStatus, pTimeout);
 
-	return SCE_OK;
+	throw __FUNCTION__;
 }
 
+s32 sceKernelCreateCallback(vm::psv::ptr<const char> pName, u32 attr, vm::psv::ptr<SceKernelCallbackFunction> callbackFunc, vm::psv::ptr<void> pCommon)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeleteCallback(s32 callbackId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelNotifyCallback(s32 callbackId, s32 notifyArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCancelCallback(s32 callbackId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetCallbackCount(s32 callbackId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCheckCallback()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetCallbackInfo(s32 callbackId, vm::psv::ptr<SceKernelCallbackInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelRegisterCallbackToEvent(s32 eventId, s32 callbackId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelUnregisterCallbackFromEvent(s32 eventId, s32 callbackId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelUnregisterCallbackFromEventAll(s32 eventId)
+{
+	throw __FUNCTION__;
+}
+
+// Event functions
+
+s32 sceKernelWaitEvent(s32 eventId, u32 waitPattern, vm::psv::ptr<u32> pResultPattern, vm::psv::ptr<u64> pUserData, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelWaitEventCB(s32 eventId, u32 waitPattern, vm::psv::ptr<u32> pResultPattern, vm::psv::ptr<u64> pUserData, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelPollEvent(s32 eventId, u32 bitPattern, vm::psv::ptr<u32> pResultPattern, vm::psv::ptr<u64> pUserData)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCancelEvent(s32 eventId, vm::psv::ptr<s32> pNumWaitThreads)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetEventInfo(s32 eventId, vm::psv::ptr<SceKernelEventInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelWaitMultipleEvents(vm::psv::ptr<SceKernelWaitEvent> pWaitEventList, s32 numEvents, u32 waitMode, vm::psv::ptr<SceKernelResultEvent> pResultEventList, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelWaitMultipleEventsCB(vm::psv::ptr<SceKernelWaitEvent> pWaitEventList, s32 numEvents, u32 waitMode, vm::psv::ptr<SceKernelResultEvent> pResultEventList, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibKernel, #name, &name)
 
 psv_log_base sceLibKernel("sceLibKernel", []()
@@ -287,6 +378,8 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	sceLibKernel.on_unload = nullptr;
 	sceLibKernel.on_stop = nullptr;
 
+	// REG_FUNC(???, sceKernelGetEventInfo);
+
 	//REG_FUNC(0x23EAA62, sceKernelPuts);
 	//REG_FUNC(0xB0335388, sceClibToupper);
 	//REG_FUNC(0x4C5471BC, sceClibTolower);
@@ -430,21 +523,21 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	REG_FUNC(0xF994FE65, sceKernelGetThreadmgrUIDClass);
 	//REG_FUNC(0xB4DE10C7, sceKernelGetActiveCpuMask);
 	REG_FUNC(0x2C1321A3, sceKernelChangeThreadVfpException);
-	//REG_FUNC(0x3849359A, sceKernelCreateCallback);
-	//REG_FUNC(0x88DD1BC8, sceKernelGetCallbackInfo);
-	//REG_FUNC(0x464559D3, sceKernelDeleteCallback);
-	//REG_FUNC(0xBD9C8F2B, sceKernelNotifyCallback);
-	//REG_FUNC(0x3137A687, sceKernelCancelCallback);
-	//REG_FUNC(0x76A2EF81, sceKernelGetCallbackCount);
-	//REG_FUNC(0xD4F75281, sceKernelRegisterCallbackToEvent);
-	//REG_FUNC(0x8D3940DF, sceKernelUnregisterCallbackFromEvent);
-	//REG_FUNC(0x2BD1E682, sceKernelUnregisterCallbackFromEventAll);
-	//REG_FUNC(0x120F03AF, sceKernelWaitEvent);
-	//REG_FUNC(0xA0490795, sceKernelWaitEventCB);
-	//REG_FUNC(0x241F3634, sceKernelPollEvent);
-	//REG_FUNC(0x603AB770, sceKernelCancelEvent);
-	//REG_FUNC(0x10586418, sceKernelWaitMultipleEvents);
-	//REG_FUNC(0x4263DBC9, sceKernelWaitMultipleEventsCB);
+	REG_FUNC(0x3849359A, sceKernelCreateCallback);
+	REG_FUNC(0x88DD1BC8, sceKernelGetCallbackInfo);
+	REG_FUNC(0x464559D3, sceKernelDeleteCallback);
+	REG_FUNC(0xBD9C8F2B, sceKernelNotifyCallback);
+	REG_FUNC(0x3137A687, sceKernelCancelCallback);
+	REG_FUNC(0x76A2EF81, sceKernelGetCallbackCount);
+	REG_FUNC(0xD4F75281, sceKernelRegisterCallbackToEvent);
+	REG_FUNC(0x8D3940DF, sceKernelUnregisterCallbackFromEvent);
+	REG_FUNC(0x2BD1E682, sceKernelUnregisterCallbackFromEventAll);
+	REG_FUNC(0x120F03AF, sceKernelWaitEvent);
+	REG_FUNC(0xA0490795, sceKernelWaitEventCB);
+	REG_FUNC(0x241F3634, sceKernelPollEvent);
+	REG_FUNC(0x603AB770, sceKernelCancelEvent);
+	REG_FUNC(0x10586418, sceKernelWaitMultipleEvents);
+	REG_FUNC(0x4263DBC9, sceKernelWaitMultipleEventsCB);
 	//REG_FUNC(0x8516D040, sceKernelCreateEventFlag);
 	//REG_FUNC(0x11FE9B8B, sceKernelDeleteEventFlag);
 	//REG_FUNC(0xE04EC73A, sceKernelOpenEventFlag);
@@ -644,7 +737,7 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	REG_FUNC(0x751C9B7A, sceKernelChangeCurrentThreadAttr);
 	REG_FUNC(0xD9BD74EB, sceKernelCheckWaitableStatus);
 	REG_FUNC(0x9DCB4B7A, sceKernelGetProcessId);
-	//REG_FUNC(0xE53E41F6, sceKernelCheckCallback);
+	REG_FUNC(0xE53E41F6, sceKernelCheckCallback);
 	//REG_FUNC(0xF4EE4FA9, sceKernelGetSystemTimeWide);
 	//REG_FUNC(0x47F6DE49, sceKernelGetSystemTimeLow);
 	//REG_FUNC(0xC0FAF6A3, sceKernelCreateThreadForUser);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
index 7750e9e58f..3e9ceec834 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
@@ -11,6 +11,12 @@ union SceKernelSysClock
 	u64 quad;
 };
 
+struct SceKernelCallFrame
+{
+	u32 sp;
+	u32 pc;
+};
+
 // Memory Manager definitions
 
 typedef s32 SceKernelMemoryType;
@@ -303,6 +309,27 @@ struct SceKernelRWLockInfo
 	s32 numWriteWaitThreads;
 };
 
+// IO/File Manager definitions
+
+struct SceIoStat
+{
+	s32 mode;
+	u32 attr;
+	s64 size;
+	SceDateTime ctime;
+	SceDateTime atime;
+	SceDateTime mtime;
+	u64 _private[6];
+};
+
+struct SceIoDirent
+{
+	SceIoStat d_stat;
+	char d_name[256];
+	vm::psv::ptr<void> d_private;
+	s32 dummy;
+};
+
 // Module
 
 extern psv_log_base sceLibKernel;
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h
index cf34bf846e..495bfec411 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.h
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.h
@@ -410,6 +410,17 @@ enum psv_error_codes
 	SCE_KERNEL_ERROR_NO_AUTH			 = 0x8002F001,
 };
 
+struct SceDateTime
+{
+	u16 year;
+	u16 month;
+	u16 day;
+	u16 hour;
+	u16 minute;
+	u16 second;
+	u32 microsecond;
+};
+
 class psv_func_caller
 {
 public:

From 23a5cd5cff74df3d09237132f17c7ff00a10568f Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Sat, 24 Jan 2015 21:21:19 +0200
Subject: [PATCH 29/70] Small fix to cellMsgDialogOpen2

---
 rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
index 64107c9461..a26cf637e1 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
@@ -127,8 +127,8 @@ s32 cellMsgDialogOpen2(u32 type, vm::ptr<const char> msgString, vm::ptr<CellMsgD
 	{
 		switch (type & CELL_MSGDIALOG_TYPE_SE_TYPE)
 		{
-		case CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL: LOG_WARNING(TTY, "\n%s", msg.c_str()); break;
-		case CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR: LOG_ERROR(TTY, "\n%s", msg.c_str()); break;
+		case CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL: LOG_WARNING(TTY, "%s\n", msg.c_str()); break;
+		case CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR: LOG_ERROR(TTY, "%s\n", msg.c_str()); break;
 		}
 
 		switch (type & CELL_MSGDIALOG_TYPE_SE_MUTE) // TODO
@@ -264,7 +264,7 @@ s32 cellMsgDialogOpenErrorCode(u32 errorCode, vm::ptr<CellMsgDialogCallback> cal
 	}
 
 	char errorCodeHex[12];
-	sprintf(errorCodeHex, "\n(%08x)", errorCode);
+	sprintf_s(errorCodeHex, "\n(%08x)", errorCode);
 	errorMessage.append(errorCodeHex);
 
 	u64 status;

From 94c81c73c57c96f1250e5477be3d6bc80597229c Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Sat, 24 Jan 2015 21:30:36 +0200
Subject: [PATCH 30/70] Implement more FP instructions

---
 rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp
index ea6bb1a0bb..d537bdf92d 100644
--- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp
+++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp
@@ -495,9 +495,9 @@ void GLFragmentDecompilerThread::Task()
 			case RSX_FP_OPCODE_NRM: SetDst("normalize($0)"); break;
 			case RSX_FP_OPCODE_BEM: LOG_ERROR(RSX, "Unimplemented TEX_SRB instruction: BEM"); break;
 			case RSX_FP_OPCODE_TEX: SetDst("texture($t, $0.xy)");  break;
-			case RSX_FP_OPCODE_TEXBEM: LOG_ERROR(RSX, "Unimplemented TEX_SRB instruction: TEXBEM"); break;
-			case RSX_FP_OPCODE_TXP: SetDst("textureProj($t, $0.xy, $1)"); break; //TODO: More testing (Sonic The Hedgehog (NPUB-30442/NPEB-00478) and The Simpsons Arcade Game (NPUB30563))
-			case RSX_FP_OPCODE_TXPBEM: LOG_ERROR(RSX, "Unimplemented TEX_SRB instruction: TXPBEM"); break;
+			case RSX_FP_OPCODE_TEXBEM: SetDst("texture($t, $0.xy, $1.x)"); break;
+			case RSX_FP_OPCODE_TXP: SetDst("textureProj($t, $0.xy, $1.x)"); break; //TODO: More testing (Sonic The Hedgehog (NPUB-30442/NPEB-00478) and The Simpsons Arcade Game (NPUB30563))
+			case RSX_FP_OPCODE_TXPBEM: SetDst("textureProj($t, $0.xy, $1.x)"); break;
 			case RSX_FP_OPCODE_TXD: LOG_ERROR(RSX, "Unimplemented TEX_SRB instruction: TXD"); break;
 			case RSX_FP_OPCODE_TXB: SetDst("texture($t, $0.xy, $1.x)"); break;
 			case RSX_FP_OPCODE_TXL: SetDst("textureLod($t, $0.xy, $1.x)"); break;

From be50130c3f6951176206ae20282339b1cd259b45 Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Sat, 24 Jan 2015 21:50:26 +0200
Subject: [PATCH 31/70] Various fixes

Fixes to dead code and a couple self-assignings
---
 Utilities/StrFmt.h                        | 6 ------
 rpcs3/Emu/Cell/PPUThread.h                | 3 +--
 rpcs3/Emu/FS/vfsDirBase.h                 | 6 ++----
 rpcs3/Emu/RSX/RSXTexture.cpp              | 2 +-
 rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp | 7 +++----
 rpcs3/Emu/SysCalls/Modules/cellSync.cpp   | 2 --
 rpcs3/Gui/CompilerELF.cpp                 | 6 +++---
 7 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h
index 557a51ec4a..056861c122 100644
--- a/Utilities/StrFmt.h
+++ b/Utilities/StrFmt.h
@@ -338,8 +338,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (s32): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
@@ -360,8 +358,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (s64): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
@@ -448,8 +444,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (const char*): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h
index 2c5c13246d..fa7d6803f0 100644
--- a/rpcs3/Emu/Cell/PPUThread.h
+++ b/rpcs3/Emu/Cell/PPUThread.h
@@ -363,6 +363,7 @@ struct PPCdouble
 		case _FPCLASS_PD:    return FPR_PD;
 		case _FPCLASS_PN:    return FPR_PN;
 		case _FPCLASS_PINF:  return FPR_PINF;
+		default: throw fmt::Format("PPCdouble::UpdateType() -> unknown fpclass (0x%04x).", fpc);
 		}
 #else
 		switch (fpc)
@@ -374,8 +375,6 @@ struct PPCdouble
 		default:            return std::signbit(_double) ? FPR_NN : FPR_PN;
 		}
 #endif
-
-		throw fmt::Format("PPCdouble::UpdateType() -> unknown fpclass (0x%04x).", fpc);
 	}
 
 	FPRType GetType() const
diff --git a/rpcs3/Emu/FS/vfsDirBase.h b/rpcs3/Emu/FS/vfsDirBase.h
index 0d05dcbaf5..84e4b0c342 100644
--- a/rpcs3/Emu/FS/vfsDirBase.h
+++ b/rpcs3/Emu/FS/vfsDirBase.h
@@ -62,14 +62,12 @@ public:
 
 	public:
 		iterator(vfsDirBase* parent)
-			: parent(parent)
-			, data(parent->First())
+			: data(parent->First())
 		{
 		}
 
 		iterator(const DirEntryInfo* data)
-			: parent(parent)
-			, data(data)
+			: data(data)
 		{
 		}
 
diff --git a/rpcs3/Emu/RSX/RSXTexture.cpp b/rpcs3/Emu/RSX/RSXTexture.cpp
index 7a21e076d3..ce56142468 100644
--- a/rpcs3/Emu/RSX/RSXTexture.cpp
+++ b/rpcs3/Emu/RSX/RSXTexture.cpp
@@ -295,7 +295,7 @@ u8 RSXVertexTexture::GetWrapS() const
 u8 RSXVertexTexture::GetWrapT() const
 {
 	return 1;
-	return ((methodRegisters[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 32)] >> 8) & 0xf);
+	//return ((methodRegisters[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 32)] >> 8) & 0xf);
 }
 
 u8 RSXVertexTexture::GetWrapR() const
diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
index f91f4cb1c6..17bc0b1460 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
@@ -542,12 +542,11 @@ int cellGcmSetSecondVFrequency(u32 freq)
 	switch (freq)
 	{
 	case CELL_GCM_DISPLAY_FREQUENCY_59_94HZ:
-		cellGcmSys->Todo("Unimplemented display frequency: 59.94Hz");
+		cellGcmSys->Todo("Unimplemented display frequency: 59.94Hz"); break;
 	case CELL_GCM_DISPLAY_FREQUENCY_SCANOUT:
-		cellGcmSys->Todo("Unimplemented display frequency: Scanout");
+		cellGcmSys->Todo("Unimplemented display frequency: Scanout"); break;
 	case CELL_GCM_DISPLAY_FREQUENCY_DISABLE:
-		Emu.GetGSManager().GetRender().m_frequency_mode = freq;
-		break;
+		Emu.GetGSManager().GetRender().m_frequency_mode = freq; break;
 
 	default: return CELL_EINVAL;
 	}
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
index 0c372e82e8..17d8d18eef 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
@@ -1062,7 +1062,6 @@ s32 syncLFQueueGetPushPointer(vm::ptr<CellSyncLFQueue> queue, s32& pointer, u32
 					{
 						return res;
 					}
-					break;
 				}
 				else if (!useEventQueue)
 				{
@@ -1439,7 +1438,6 @@ s32 syncLFQueueGetPopPointer(vm::ptr<CellSyncLFQueue> queue, s32& pointer, u32 i
 					{
 						return res;
 					}
-					break;
 				}
 				else if (!useEventQueue)
 				{
diff --git a/rpcs3/Gui/CompilerELF.cpp b/rpcs3/Gui/CompilerELF.cpp
index 0dcd836eca..d9979dbd70 100644
--- a/rpcs3/Gui/CompilerELF.cpp
+++ b/rpcs3/Gui/CompilerELF.cpp
@@ -210,7 +210,7 @@ void CompilerELF::OnUpdate(wxCommandEvent& event)
 	DoAnalyzeCode(false);
 
 	return;
-	asm_list->Freeze();
+	/*asm_list->Freeze();
 	asm_list->SetStyle(0, asm_list->GetValue().Len(), wxTextAttr("Black"));
 
 	/*
@@ -220,7 +220,7 @@ void CompilerELF::OnUpdate(wxCommandEvent& event)
 	}
 	*/
 	
-	SetOpStyle(".int", "Blue");
+	/*SetOpStyle(".int", "Blue");
 	SetOpStyle(".string", "Blue");
 	SetOpStyle(".strlen", "Blue");
 	SetOpStyle(".buf", "Blue");
@@ -294,7 +294,7 @@ void CompilerELF::OnUpdate(wxCommandEvent& event)
 
 	asm_list->Thaw();
 
-	UpdateScroll(true, wxVERTICAL);
+	UpdateScroll(true, wxVERTICAL);*/
 }
 
 void CompilerELF::OnScroll(wxScrollWinEvent& event)

From 23923af4871ffc00d2f17d51febb0f7ac3a4e2e7 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Sat, 24 Jan 2015 23:48:45 +0300
Subject: [PATCH 32/70] ARMv7: Some functions registered, u64/s64 arg/result
 support

---
 rpcs3/Emu/ARMv7/ARMv7Context.h           |   5 +
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp | 681 +++++++++++++++++++----
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.h   |   9 +
 rpcs3/Emu/ARMv7/PSVFuncList.h            |  83 ++-
 4 files changed, 673 insertions(+), 105 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index be06cc4a45..bc024e6e62 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -39,6 +39,11 @@ struct ARMv7Context
 
 			u32 LR;
 		};
+
+		struct
+		{
+			u64 GPR_D[8];
+		};
 	};
 
 	union
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index 41096a73dc..070650f925 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -11,6 +11,26 @@
 
 #define RETURN_ERROR(code) { Emu.Pause(); sceLibKernel.Error("%s() failed: %s", __FUNCTION__, #code); return code; }
 
+s32 sceKernelAllocMemBlock(vm::psv::ptr<const char> name, s32 type, u32 vsize, vm::psv::ptr<SceKernelAllocMemBlockOpt> pOpt)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelFreeMemBlock(s32 uid)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetMemBlockBase(s32 uid, vm::psv::ptr<vm::psv::ptr<void>> ppBase)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetMemBlockInfoByAddr(vm::psv::ptr<void> vbase, vm::psv::ptr<SceKernelMemBlockInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
 s32 sceKernelCreateThread(
 	vm::psv::ptr<const char> pName,
 	vm::psv::ptr<SceKernelThreadEntry> entry,
@@ -272,8 +292,6 @@ s32 sceKernelWaitThreadEnd(s32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv:
 	return SCE_OK;
 }
 
-// Callback functions
-
 s32 sceKernelWaitThreadEndCB(s32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
 {
 	sceLibKernel.Todo("sceKernelWaitThreadEndCB(threadId=0x%x, pExitStatus=0x%x, pTimeout=0x%x)", threadId, pExitStatus, pTimeout);
@@ -281,6 +299,8 @@ s32 sceKernelWaitThreadEndCB(s32 threadId, vm::psv::ptr<s32> pExitStatus, vm::ps
 	throw __FUNCTION__;
 }
 
+// Callback functions
+
 s32 sceKernelCreateCallback(vm::psv::ptr<const char> pName, u32 attr, vm::psv::ptr<SceKernelCallbackFunction> callbackFunc, vm::psv::ptr<void> pCommon)
 {
 	throw __FUNCTION__;
@@ -368,6 +388,475 @@ s32 sceKernelWaitMultipleEventsCB(vm::psv::ptr<SceKernelWaitEvent> pWaitEventLis
 	throw __FUNCTION__;
 }
 
+// Event flag functions
+
+s32 sceKernelCreateEventFlag(vm::psv::ptr<const char> pName, u32 attr, u32 initPattern, vm::psv::ptr<const SceKernelEventFlagOptParam> pOptParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeleteEventFlag(s32 evfId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelOpenEventFlag(vm::psv::ptr<const char> pName)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCloseEventFlag(s32 evfId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelWaitEventFlag(s32 evfId, u32 bitPattern, u32 waitMode, vm::psv::ptr<u32> pResultPat, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelWaitEventFlagCB(s32 evfId, u32 bitPattern, u32 waitMode, vm::psv::ptr<u32> pResultPat, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelPollEventFlag(s32 evfId, u32 bitPattern, u32 waitMode, vm::psv::ptr<u32> pResultPat)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelSetEventFlag(s32 evfId, u32 bitPattern)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelClearEventFlag(s32 evfId, u32 bitPattern)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCancelEventFlag(s32 evfId, u32 setPattern, vm::psv::ptr<s32> pNumWaitThreads)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetEventFlagInfo(s32 evfId, vm::psv::ptr<SceKernelEventFlagInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+// Semaphore functions
+
+s32 sceKernelCreateSema(vm::psv::ptr<const char> pName, u32 attr, s32 initCount, s32 maxCount, vm::psv::ptr<const SceKernelSemaOptParam> pOptParam)
+{
+	sceLibKernel.Error("sceKernelCreateSema(pName=0x%x, attr=0x%x, initCount=%d, maxCount=%d, pOptParam=0x%x)", pName, attr, initCount, maxCount, pOptParam);
+
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeleteSema(s32 semaId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelOpenSema(vm::psv::ptr<const char> pName)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCloseSema(s32 semaId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelWaitSema(s32 semaId, s32 needCount, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelWaitSemaCB(s32 semaId, s32 needCount, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelPollSema(s32 semaId, s32 needCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelSignalSema(s32 semaId, s32 signalCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCancelSema(s32 semaId, s32 setCount, vm::psv::ptr<s32> pNumWaitThreads)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetSemaInfo(s32 semaId, vm::psv::ptr<SceKernelSemaInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+// Mutex functions
+
+s32 sceKernelCreateMutex(vm::psv::ptr<const char> pName, u32 attr, s32 initCount, vm::psv::ptr<const SceKernelMutexOptParam> pOptParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeleteMutex(s32 mutexId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelOpenMutex(vm::psv::ptr<const char> pName)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCloseMutex(s32 mutexId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelLockMutex(s32 mutexId, s32 lockCount, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelLockMutexCB(s32 mutexId, s32 lockCount, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelTryLockMutex(s32 mutexId, s32 lockCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelUnlockMutex(s32 mutexId, s32 unlockCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCancelMutex(s32 mutexId, s32 newCount, vm::psv::ptr<s32> pNumWaitThreads)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetMutexInfo(s32 mutexId, vm::psv::ptr<SceKernelMutexInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+// Lightweight mutex functions
+
+s32 sceKernelCreateLwMutex(vm::psv::ptr<SceKernelLwMutexWork> pWork, vm::psv::ptr<const char> pName, u32 attr, s32 initCount, vm::psv::ptr<const SceKernelLwMutexOptParam> pOptParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeleteLwMutex(vm::psv::ptr<SceKernelLwMutexWork> pWork)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelLockLwMutex(vm::psv::ptr<SceKernelLwMutexWork> pWork, s32 lockCount, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelLockLwMutexCB(vm::psv::ptr<SceKernelLwMutexWork> pWork, s32 lockCount, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelTryLockLwMutex(vm::psv::ptr<SceKernelLwMutexWork> pWork, s32 lockCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelUnlockLwMutex(vm::psv::ptr<SceKernelLwMutexWork> pWork, s32 unlockCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetLwMutexInfo(vm::psv::ptr<SceKernelLwMutexWork> pWork, vm::psv::ptr<SceKernelLwMutexInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetLwMutexInfoById(s32 lwMutexId, vm::psv::ptr<SceKernelLwMutexInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+// Condition variable functions
+
+s32 sceKernelCreateCond(vm::psv::ptr<const char> pName, u32 attr, s32 mutexId, vm::psv::ptr<const SceKernelCondOptParam> pOptParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeleteCond(s32 condId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelOpenCond(vm::psv::ptr<const char> pName)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCloseCond(s32 condId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelWaitCond(s32 condId, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelWaitCondCB(s32 condId, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelSignalCond(s32 condId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelSignalCondAll(s32 condId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelSignalCondTo(s32 condId, s32 threadId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetCondInfo(s32 condId, vm::psv::ptr<SceKernelCondInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+// Lightweight condition variable functions
+
+s32 sceKernelCreateLwCond(vm::psv::ptr<SceKernelLwCondWork> pWork, vm::psv::ptr<const char> pName, u32 attr, vm::psv::ptr<SceKernelLwMutexWork> pLwMutex, vm::psv::ptr<const SceKernelLwCondOptParam> pOptParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeleteLwCond(vm::psv::ptr<SceKernelLwCondWork> pWork)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelWaitLwCond(vm::psv::ptr<SceKernelLwCondWork> pWork, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelWaitLwCondCB(vm::psv::ptr<SceKernelLwCondWork> pWork, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelSignalLwCond(vm::psv::ptr<SceKernelLwCondWork> pWork)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelSignalLwCondAll(vm::psv::ptr<SceKernelLwCondWork> pWork)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelSignalLwCondTo(vm::psv::ptr<SceKernelLwCondWork> pWork, s32 threadId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetLwCondInfo(vm::psv::ptr<SceKernelLwCondWork> pWork, vm::psv::ptr<SceKernelLwCondInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetLwCondInfoById(s32 lwCondId, vm::psv::ptr<SceKernelLwCondInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+// Time functions
+
+s32 sceKernelGetSystemTime(vm::psv::ptr<SceKernelSysClock> pClock)
+{
+	throw __FUNCTION__;
+}
+
+u64 sceKernelGetSystemTimeWide()
+{
+	throw __FUNCTION__;
+}
+
+u32 sceKernelGetSystemTimeLow()
+{
+	throw __FUNCTION__;
+}
+
+// Timer functions
+
+s32 sceKernelCreateTimer(vm::psv::ptr<const char> pName, u32 attr, vm::psv::ptr<const SceKernelTimerOptParam> pOptParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeleteTimer(s32 timerId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelOpenTimer(vm::psv::ptr<const char> pName)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCloseTimer(s32 timerId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelStartTimer(s32 timerId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelStopTimer(s32 timerId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetTimerBase(s32 timerId, vm::psv::ptr<SceKernelSysClock> pBase)
+{
+	throw __FUNCTION__;
+}
+
+u64 sceKernelGetTimerBaseWide(s32 timerId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetTimerTime(s32 timerId, vm::psv::ptr<SceKernelSysClock> pClock)
+{
+	throw __FUNCTION__;
+}
+
+u64 sceKernelGetTimerTimeWide(s32 timerId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelSetTimerTime(s32 timerId, vm::psv::ptr<SceKernelSysClock> pClock)
+{
+	throw __FUNCTION__;
+}
+
+u64 sceKernelSetTimerTimeWide(s32 timerId, u64 clock)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelSetTimerEvent(s32 timerId, s32 type, vm::psv::ptr<SceKernelSysClock> pInterval, s32 fRepeat)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCancelTimer(s32 timerId, vm::psv::ptr<s32> pNumWaitThreads)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetTimerInfo(s32 timerId, vm::psv::ptr<SceKernelTimerInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+// Reader/writer lock functions
+
+s32 sceKernelCreateRWLock(vm::psv::ptr<const char> pName, u32 attr, vm::psv::ptr<const SceKernelRWLockOptParam> pOptParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeleteRWLock(s32 rwLockId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelOpenRWLock(vm::psv::ptr<const char> pName)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCloseRWLock(s32 rwLockId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelLockReadRWLock(s32 rwLockId, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelLockReadRWLockCB(s32 rwLockId, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelTryLockReadRWLock(s32 rwLockId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelUnlockReadRWLock(s32 rwLockId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelLockWriteRWLock(s32 rwLockId, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelLockWriteRWLockCB(s32 rwLockId, vm::psv::ptr<u32> pTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelTryLockWriteRWLock(s32 rwLockId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelUnlockWriteRWLock(s32 rwLockId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelCancelRWLock(s32 rwLockId, vm::psv::ptr<s32> pNumReadWaitThreads, vm::psv::ptr<s32> pNumWriteWaitThreads, s32 flag)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelGetRWLockInfo(s32 rwLockId, vm::psv::ptr<SceKernelRWLockInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
 
 
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibKernel, #name, &name)
@@ -501,11 +990,11 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	//REG_FUNC(0x4E81DD5C, sceKernelReceiveMsgPipe);
 	//REG_FUNC(0x33AF829B, sceKernelReceiveMsgPipeCB);
 	//REG_FUNC(0x5615B006, sceKernelTryReceiveMsgPipe);
-	//REG_FUNC(0xA7819967, sceKernelLockLwMutex);
-	//REG_FUNC(0x6F9C4CC1, sceKernelLockLwMutexCB);
-	//REG_FUNC(0x9EF798C1, sceKernelTryLockLwMutex);
-	//REG_FUNC(0x499EA781, sceKernelUnlockLwMutex);
-	//REG_FUNC(0xF7D8F1FC, sceKernelGetLwMutexInfo);
+	REG_FUNC(0xA7819967, sceKernelLockLwMutex);
+	REG_FUNC(0x6F9C4CC1, sceKernelLockLwMutexCB);
+	REG_FUNC(0x9EF798C1, sceKernelTryLockLwMutex);
+	REG_FUNC(0x499EA781, sceKernelUnlockLwMutex);
+	REG_FUNC(0xF7D8F1FC, sceKernelGetLwMutexInfo);
 	REG_FUNC(0xDDB395A9, sceKernelWaitThreadEnd);
 	REG_FUNC(0xC54941ED, sceKernelWaitThreadEndCB);
 	REG_FUNC(0xD5DC26C4, sceKernelGetThreadExitStatus);
@@ -538,47 +1027,47 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	REG_FUNC(0x603AB770, sceKernelCancelEvent);
 	REG_FUNC(0x10586418, sceKernelWaitMultipleEvents);
 	REG_FUNC(0x4263DBC9, sceKernelWaitMultipleEventsCB);
-	//REG_FUNC(0x8516D040, sceKernelCreateEventFlag);
-	//REG_FUNC(0x11FE9B8B, sceKernelDeleteEventFlag);
-	//REG_FUNC(0xE04EC73A, sceKernelOpenEventFlag);
-	//REG_FUNC(0x9C0B8285, sceKernelCloseEventFlag);
-	//REG_FUNC(0x83C0E2AF, sceKernelWaitEventFlag);
-	//REG_FUNC(0xE737B1DF, sceKernelWaitEventFlagCB);
-	//REG_FUNC(0x1FBB0FE1, sceKernelPollEventFlag);
-	//REG_FUNC(0x2A12D9B7, sceKernelCancelEventFlag);
-	//REG_FUNC(0x8BA4C0C1, sceKernelGetEventFlagInfo);
-	//REG_FUNC(0x9EF9C0C5, sceKernelSetEventFlag);
-	//REG_FUNC(0xD018793F, sceKernelClearEventFlag);
-	//REG_FUNC(0x297AA2AE, sceKernelCreateSema);
-	//REG_FUNC(0xC08F5BC5, sceKernelDeleteSema);
-	//REG_FUNC(0xB028AB78, sceKernelOpenSema);
-	//REG_FUNC(0x817707AB, sceKernelCloseSema);
-	//REG_FUNC(0xC7B834B, sceKernelWaitSema);
-	//REG_FUNC(0x174692B4, sceKernelWaitSemaCB);
-	//REG_FUNC(0x66D6BF05, sceKernelCancelSema);
-	//REG_FUNC(0x595D3FA6, sceKernelGetSemaInfo);
-	//REG_FUNC(0x3012A9C6, sceKernelPollSema);
-	//REG_FUNC(0x2053A496, sceKernelSignalSema);
-	//REG_FUNC(0xED53334A, sceKernelCreateMutex);
-	//REG_FUNC(0x12D11F65, sceKernelDeleteMutex);
-	//REG_FUNC(0x16B85235, sceKernelOpenMutex);
-	//REG_FUNC(0x43DDC9CC, sceKernelCloseMutex);
-	//REG_FUNC(0x1D8D7945, sceKernelLockMutex);
-	//REG_FUNC(0x2BDAA524, sceKernelLockMutexCB);
-	//REG_FUNC(0x2144890D, sceKernelCancelMutex);
-	//REG_FUNC(0x9A6C43CA, sceKernelGetMutexInfo);
-	//REG_FUNC(0xE5901FF9, sceKernelTryLockMutex);
-	//REG_FUNC(0x34746309, sceKernelUnlockMutex);
-	//REG_FUNC(0x50572FDA, sceKernelCreateCond);
-	//REG_FUNC(0xFD295414, sceKernelDeleteCond);
-	//REG_FUNC(0xCB2A73A9, sceKernelOpenCond);
-	//REG_FUNC(0x4FB91A89, sceKernelCloseCond);
-	//REG_FUNC(0xC88D44AD, sceKernelWaitCond);
-	//REG_FUNC(0x4CE42CE2, sceKernelWaitCondCB);
-	//REG_FUNC(0x6864DCE2, sceKernelGetCondInfo);
-	//REG_FUNC(0x10A4976F, sceKernelSignalCond);
-	//REG_FUNC(0x2EB86929, sceKernelSignalCondAll);
-	//REG_FUNC(0x87629E6, sceKernelSignalCondTo);
+	REG_FUNC(0x8516D040, sceKernelCreateEventFlag);
+	REG_FUNC(0x11FE9B8B, sceKernelDeleteEventFlag);
+	REG_FUNC(0xE04EC73A, sceKernelOpenEventFlag);
+	REG_FUNC(0x9C0B8285, sceKernelCloseEventFlag);
+	REG_FUNC(0x83C0E2AF, sceKernelWaitEventFlag);
+	REG_FUNC(0xE737B1DF, sceKernelWaitEventFlagCB);
+	REG_FUNC(0x1FBB0FE1, sceKernelPollEventFlag);
+	REG_FUNC(0x2A12D9B7, sceKernelCancelEventFlag);
+	REG_FUNC(0x8BA4C0C1, sceKernelGetEventFlagInfo);
+	REG_FUNC(0x9EF9C0C5, sceKernelSetEventFlag);
+	REG_FUNC(0xD018793F, sceKernelClearEventFlag);
+	REG_FUNC(0x297AA2AE, sceKernelCreateSema);
+	REG_FUNC(0xC08F5BC5, sceKernelDeleteSema);
+	REG_FUNC(0xB028AB78, sceKernelOpenSema);
+	REG_FUNC(0x817707AB, sceKernelCloseSema);
+	REG_FUNC(0xC7B834B, sceKernelWaitSema);
+	REG_FUNC(0x174692B4, sceKernelWaitSemaCB);
+	REG_FUNC(0x66D6BF05, sceKernelCancelSema);
+	REG_FUNC(0x595D3FA6, sceKernelGetSemaInfo);
+	REG_FUNC(0x3012A9C6, sceKernelPollSema);
+	REG_FUNC(0x2053A496, sceKernelSignalSema);
+	REG_FUNC(0xED53334A, sceKernelCreateMutex);
+	REG_FUNC(0x12D11F65, sceKernelDeleteMutex);
+	REG_FUNC(0x16B85235, sceKernelOpenMutex);
+	REG_FUNC(0x43DDC9CC, sceKernelCloseMutex);
+	REG_FUNC(0x1D8D7945, sceKernelLockMutex);
+	REG_FUNC(0x2BDAA524, sceKernelLockMutexCB);
+	REG_FUNC(0x2144890D, sceKernelCancelMutex);
+	REG_FUNC(0x9A6C43CA, sceKernelGetMutexInfo);
+	REG_FUNC(0xE5901FF9, sceKernelTryLockMutex);
+	REG_FUNC(0x34746309, sceKernelUnlockMutex);
+	REG_FUNC(0x50572FDA, sceKernelCreateCond);
+	REG_FUNC(0xFD295414, sceKernelDeleteCond);
+	REG_FUNC(0xCB2A73A9, sceKernelOpenCond);
+	REG_FUNC(0x4FB91A89, sceKernelCloseCond);
+	REG_FUNC(0xC88D44AD, sceKernelWaitCond);
+	REG_FUNC(0x4CE42CE2, sceKernelWaitCondCB);
+	REG_FUNC(0x6864DCE2, sceKernelGetCondInfo);
+	REG_FUNC(0x10A4976F, sceKernelSignalCond);
+	REG_FUNC(0x2EB86929, sceKernelSignalCondAll);
+	REG_FUNC(0x87629E6, sceKernelSignalCondTo);
 	//REG_FUNC(0xA10C1C8, sceKernelCreateMsgPipe);
 	//REG_FUNC(0x69F6575D, sceKernelDeleteMsgPipe);
 	//REG_FUNC(0x230691DA, sceKernelOpenMsgPipe);
@@ -591,48 +1080,48 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	//REG_FUNC(0x86ECC0FF, sceKernelTryReceiveMsgPipeVector);
 	//REG_FUNC(0xEF14BA37, sceKernelCancelMsgPipe);
 	//REG_FUNC(0x4046D16B, sceKernelGetMsgPipeInfo);
-	//REG_FUNC(0xDA6EC8EF, sceKernelCreateLwMutex);
-	//REG_FUNC(0x244E76D2, sceKernelDeleteLwMutex);
-	//REG_FUNC(0x4846613D, sceKernelGetLwMutexInfoById);
-	//REG_FUNC(0x48C7EAE6, sceKernelCreateLwCond);
-	//REG_FUNC(0x721F6CB3, sceKernelDeleteLwCond);
-	//REG_FUNC(0xE1878282, sceKernelWaitLwCond);
-	//REG_FUNC(0x8FA54B07, sceKernelWaitLwCondCB);
-	//REG_FUNC(0x3AC63B9A, sceKernelSignalLwCond);
-	//REG_FUNC(0xE5241A0C, sceKernelSignalLwCondAll);
-	//REG_FUNC(0xFC1A48EB, sceKernelSignalLwCondTo);
-	//REG_FUNC(0xE4DF36A0, sceKernelGetLwCondInfo);
-	//REG_FUNC(0x971F1DE8, sceKernelGetLwCondInfoById);
-	//REG_FUNC(0x2255B2A5, sceKernelCreateTimer);
-	//REG_FUNC(0x746F3290, sceKernelDeleteTimer);
-	//REG_FUNC(0x2F3D35A3, sceKernelOpenTimer);
-	//REG_FUNC(0x17283DE6, sceKernelCloseTimer);
-	//REG_FUNC(0x1478249B, sceKernelStartTimer);
-	//REG_FUNC(0x75B1329, sceKernelStopTimer);
-	//REG_FUNC(0x1F59E04D, sceKernelGetTimerBase);
-	//REG_FUNC(0x3223CCD1, sceKernelGetTimerBaseWide);
-	//REG_FUNC(0x381DC300, sceKernelGetTimerTime);
-	//REG_FUNC(0x53C5D833, sceKernelGetTimerTimeWide);
-	//REG_FUNC(0xFFAD717F, sceKernelSetTimerTime);
-	//REG_FUNC(0xAF67678B, sceKernelSetTimerTimeWide);
-	//REG_FUNC(0x621D293B, sceKernelSetTimerEvent);
-	//REG_FUNC(0x9CCF768C, sceKernelCancelTimer);
-	//REG_FUNC(0x7E35E10A, sceKernelGetTimerInfo);
-	//REG_FUNC(0x8667951D, sceKernelCreateRWLock);
-	//REG_FUNC(0x3D750204, sceKernelDeleteRWLock);
-	//REG_FUNC(0xBA4DAC9A, sceKernelOpenRWLock);
-	//REG_FUNC(0xA7F94E64, sceKernelCloseRWLock);
-	//REG_FUNC(0xFA670F0F, sceKernelLockReadRWLock);
-	//REG_FUNC(0x2D4A62B7, sceKernelLockReadRWLockCB);
-	//REG_FUNC(0x1B8586C0, sceKernelTryLockReadRWLock);
-	//REG_FUNC(0x675D10A8, sceKernelUnlockReadRWLock);
-	//REG_FUNC(0x67A187BB, sceKernelLockWriteRWLock);
-	//REG_FUNC(0xA4777082, sceKernelLockWriteRWLockCB);
-	//REG_FUNC(0x597D4607, sceKernelTryLockWriteRWLock);
-	//REG_FUNC(0xD9369DF2, sceKernelUnlockWriteRWLock);
-	//REG_FUNC(0x190CA94B, sceKernelCancelRWLock);
-	//REG_FUNC(0x79A573B, sceKernelGetRWLockInfo);
-	//REG_FUNC(0x8AF15B5F, sceKernelGetSystemTime);
+	REG_FUNC(0xDA6EC8EF, sceKernelCreateLwMutex);
+	REG_FUNC(0x244E76D2, sceKernelDeleteLwMutex);
+	REG_FUNC(0x4846613D, sceKernelGetLwMutexInfoById);
+	REG_FUNC(0x48C7EAE6, sceKernelCreateLwCond);
+	REG_FUNC(0x721F6CB3, sceKernelDeleteLwCond);
+	REG_FUNC(0xE1878282, sceKernelWaitLwCond);
+	REG_FUNC(0x8FA54B07, sceKernelWaitLwCondCB);
+	REG_FUNC(0x3AC63B9A, sceKernelSignalLwCond);
+	REG_FUNC(0xE5241A0C, sceKernelSignalLwCondAll);
+	REG_FUNC(0xFC1A48EB, sceKernelSignalLwCondTo);
+	REG_FUNC(0xE4DF36A0, sceKernelGetLwCondInfo);
+	REG_FUNC(0x971F1DE8, sceKernelGetLwCondInfoById);
+	REG_FUNC(0x2255B2A5, sceKernelCreateTimer);
+	REG_FUNC(0x746F3290, sceKernelDeleteTimer);
+	REG_FUNC(0x2F3D35A3, sceKernelOpenTimer);
+	REG_FUNC(0x17283DE6, sceKernelCloseTimer);
+	REG_FUNC(0x1478249B, sceKernelStartTimer);
+	REG_FUNC(0x75B1329, sceKernelStopTimer);
+	REG_FUNC(0x1F59E04D, sceKernelGetTimerBase);
+	REG_FUNC(0x3223CCD1, sceKernelGetTimerBaseWide);
+	REG_FUNC(0x381DC300, sceKernelGetTimerTime);
+	REG_FUNC(0x53C5D833, sceKernelGetTimerTimeWide);
+	REG_FUNC(0xFFAD717F, sceKernelSetTimerTime);
+	REG_FUNC(0xAF67678B, sceKernelSetTimerTimeWide);
+	REG_FUNC(0x621D293B, sceKernelSetTimerEvent);
+	REG_FUNC(0x9CCF768C, sceKernelCancelTimer);
+	REG_FUNC(0x7E35E10A, sceKernelGetTimerInfo);
+	REG_FUNC(0x8667951D, sceKernelCreateRWLock);
+	REG_FUNC(0x3D750204, sceKernelDeleteRWLock);
+	REG_FUNC(0xBA4DAC9A, sceKernelOpenRWLock);
+	REG_FUNC(0xA7F94E64, sceKernelCloseRWLock);
+	REG_FUNC(0xFA670F0F, sceKernelLockReadRWLock);
+	REG_FUNC(0x2D4A62B7, sceKernelLockReadRWLockCB);
+	REG_FUNC(0x1B8586C0, sceKernelTryLockReadRWLock);
+	REG_FUNC(0x675D10A8, sceKernelUnlockReadRWLock);
+	REG_FUNC(0x67A187BB, sceKernelLockWriteRWLock);
+	REG_FUNC(0xA4777082, sceKernelLockWriteRWLockCB);
+	REG_FUNC(0x597D4607, sceKernelTryLockWriteRWLock);
+	REG_FUNC(0xD9369DF2, sceKernelUnlockWriteRWLock);
+	REG_FUNC(0x190CA94B, sceKernelCancelRWLock);
+	REG_FUNC(0x79A573B, sceKernelGetRWLockInfo);
+	REG_FUNC(0x8AF15B5F, sceKernelGetSystemTime);
 	//REG_FUNC(0x99B2BF15, sceKernelPMonThreadGetCounter);
 	//REG_FUNC(0x7C21C961, sceKernelPMonCpuGetCounter);
 	//REG_FUNC(0xADCA94E5, sceKernelWaitSignal);
@@ -712,12 +1201,12 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	//REG_FUNC(0x35EE7CF5, sceKernelStderr);
 
 	/* SceSysmem */
-	//REG_FUNC(0xB9D5EBDE, sceKernelAllocMemBlock);
-	//REG_FUNC(0xA91E15EE, sceKernelFreeMemBlock);
-	//REG_FUNC(0xB8EF5818, sceKernelGetMemBlockBase);
+	REG_FUNC(0xB9D5EBDE, sceKernelAllocMemBlock);
+	REG_FUNC(0xA91E15EE, sceKernelFreeMemBlock);
+	REG_FUNC(0xB8EF5818, sceKernelGetMemBlockBase);
 	//REG_FUNC(0x3B29E0F5, sceKernelRemapMemBlock);
 	//REG_FUNC(0xA33B99D1, sceKernelFindMemBlockByAddr);
-	//REG_FUNC(0x4010AD65, sceKernelGetMemBlockInfoByAddr);
+	REG_FUNC(0x4010AD65, sceKernelGetMemBlockInfoByAddr);
 
 	/* SceCpu */
 	//REG_FUNC(0x2704CFEE, sceKernelCpuId);
@@ -738,8 +1227,8 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	REG_FUNC(0xD9BD74EB, sceKernelCheckWaitableStatus);
 	REG_FUNC(0x9DCB4B7A, sceKernelGetProcessId);
 	REG_FUNC(0xE53E41F6, sceKernelCheckCallback);
-	//REG_FUNC(0xF4EE4FA9, sceKernelGetSystemTimeWide);
-	//REG_FUNC(0x47F6DE49, sceKernelGetSystemTimeLow);
+	REG_FUNC(0xF4EE4FA9, sceKernelGetSystemTimeWide);
+	REG_FUNC(0x47F6DE49, sceKernelGetSystemTimeLow);
 	//REG_FUNC(0xC0FAF6A3, sceKernelCreateThreadForUser);
 
 	/* SceDebugLed */
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
index 3e9ceec834..b68e89c93f 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
@@ -30,6 +30,15 @@ struct SceKernelMemBlockInfo
 	u32 access;
 };
 
+struct SceKernelAllocMemBlockOpt
+{
+	u32 size;
+	u32 attr;
+	u32 alignment;
+	s32 uidBaseBlock;
+	vm::psv::ptr<const char> strBaseBlockName;
+};
+
 // Thread Manager definitions (threads)
 
 typedef s32(*SceKernelThreadEntry)(u32 argSize, vm::psv::ptr<void> pArgBlock);
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h
index 495bfec411..acbf9b3f5d 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.h
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.h
@@ -459,6 +459,39 @@ namespace psv_func_detail
 		}
 	};
 
+	template<int g_count, int f_count, int v_count>
+	struct bind_arg<u64, ARG_GENERAL, g_count, f_count, v_count>
+	{
+		// first u64 argument is passed in r0-r1, second one is passed in r2-r3 (if g_count = 3)
+		static_assert(g_count == 1 || g_count == 3, "Wrong u64 argument position");
+
+		__forceinline static u64 get_arg(ARMv7Context& context)
+		{
+			return context.GPR_D[g_count >> 1];
+		}
+
+		__forceinline static void put_arg(ARMv7Context& context, u64 arg)
+		{
+			context.GPR_D[g_count >> 1] = arg;
+		}
+	};
+
+	template<int g_count, int f_count, int v_count>
+	struct bind_arg<s64, ARG_GENERAL, g_count, f_count, v_count>
+	{
+		static_assert(g_count == 1 || g_count == 3, "Wrong s64 argument position");
+
+		__forceinline static s64 get_arg(ARMv7Context& context)
+		{
+			return context.GPR_D[g_count >> 1];
+		}
+
+		__forceinline static void put_arg(ARMv7Context& context, s64 arg)
+		{
+			context.GPR_D[g_count >> 1] = arg;
+		}
+	};
+
 	template<typename T, int g_count, int f_count, int v_count>
 	struct bind_arg<T, ARG_FLOAT, g_count, f_count, v_count>
 	{
@@ -531,6 +564,34 @@ namespace psv_func_detail
 		}
 	};
 
+	template<>
+	struct bind_result<u64, ARG_GENERAL>
+	{
+		__forceinline static u64 get_result(ARMv7Context& context)
+		{
+			return context.GPR_D[0];
+		}
+
+		__forceinline static void put_result(ARMv7Context& context, u64 result)
+		{
+			context.GPR_D[0] = result;
+		}
+	};
+
+	template<>
+	struct bind_result<s64, ARG_GENERAL>
+	{
+		__forceinline static s64 get_result(ARMv7Context& context)
+		{
+			return context.GPR_D[0];
+		}
+
+		__forceinline static void put_result(ARMv7Context& context, s64 result)
+		{
+			context.GPR_D[0] = result;
+		}
+	};
+
 	//template<typename T>
 	//struct bind_result<T, ARG_FLOAT>
 	//{
@@ -571,10 +632,12 @@ namespace psv_func_detail
 		static const bool is_vector = std::is_same<T, u128>::value;
 		static const bind_arg_type value = is_float
 			? ((f_count >= 4) ? ARG_STACK : ARG_FLOAT)
-			: (is_vector ? ((v_count >= 4) ? ARG_STACK : ARG_VECTOR) : ((g_count >= 4) ? ARG_STACK : ARG_GENERAL));
-		static const int g_value = g_count + (is_float || is_vector ? 0 : 1);
-		static const int f_value = f_count + (is_float ? 1 : 0);
-		static const int v_value = v_count + (is_vector ? 1 : 0);
+			: (is_vector ? ((v_count >= 4) ? ARG_STACK : ARG_VECTOR): ((g_count >= 4) ? ARG_STACK : ARG_GENERAL));
+		static const int g_align = __alignof(T) > 4 ? __alignof(T) >> 2 : 1;
+		static const int g_pos = (is_float || is_vector) ? g_count : ((g_count + (g_align - 1)) & ~(g_align - 1)) + 1;
+		static const int g_next = g_pos + g_align - 1;
+		static const int f_value = !is_float ? f_count : f_count + 1;
+		static const int v_value = !is_vector ? v_count : v_count + 1;
 	};
 
 	template <typename RT, typename F, typename Tuple, bool Done, int Total, int... N>
@@ -614,11 +677,12 @@ namespace psv_func_detail
 	{
 		typedef arg_type<T, g_count, f_count, v_count> type;
 		const bind_arg_type t = type::value;
-		const int g = type::g_value;
+		const int g0 = type::g_pos;
+		const int g1 = type::g_next;
 		const int f = type::f_value;
 		const int v = type::v_value;
 
-		return std::tuple_cat(std::tuple<T>(bind_arg<T, t, g, f, v>::get_arg(context)), get_func_args<g, f, v, A...>(context));
+		return std::tuple_cat(std::tuple<T>(bind_arg<T, t, g0, f, v>::get_arg(context)), get_func_args<g1, f, v, A...>(context));
 	}
 
 	template<int g_count, int f_count, int v_count>
@@ -633,14 +697,15 @@ namespace psv_func_detail
 	{
 		typedef arg_type<T1, g_count, f_count, v_count> type;
 		const bind_arg_type t = type::value;
-		const int g = type::g_value;
+		const int g0 = type::g_pos;
+		const int g1 = type::g_next;
 		const int f = type::f_value;
 		const int v = type::v_value;
 
-		bind_arg<T1, t, g, f, v>::put_arg(context, arg);
+		bind_arg<T1, t, g0, f, v>::put_arg(context, arg);
 
 		// return true if stack was used
-		return put_func_args<g, f, v>(context, args...) || (t == ARG_STACK);
+		return put_func_args<g1, f, v>(context, args...) || (t == ARG_STACK);
 	}
 
 	template<typename RT, typename... T>

From 94b0d9dfd57bd773ee95b794c480f6b43952becc Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Sun, 25 Jan 2015 02:34:40 +0300
Subject: [PATCH 33/70] ARMv7: IO funcs registered, u64/s64 stack arg support

---
 rpcs3/Emu/ARMv7/ARMv7Context.h           |   1 -
 rpcs3/Emu/ARMv7/ARMv7Thread.cpp          |   5 -
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp | 143 +++++-
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.h   | 251 ++++++++++
 rpcs3/Emu/ARMv7/Modules/sceLibc.cpp      |   1 -
 rpcs3/Emu/ARMv7/Modules/sceLibm.cpp      |   1 -
 rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp |   1 -
 rpcs3/Emu/ARMv7/PSVFuncList.h            | 610 ++++++++---------------
 8 files changed, 579 insertions(+), 434 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index bc024e6e62..491e0a0845 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -18,7 +18,6 @@ struct ARMv7Context
 
 	void write_pc(u32 value);
 	u32 read_pc();
-	void put_stack_arg(u32 shift, u32 value);
 	u32 get_stack_arg(u32 pos);
 	void fast_call(u32 addr);
 
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
index e4b1d65291..0b9710ffe2 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
@@ -20,11 +20,6 @@ u32 ARMv7Context::read_pc()
 	return thread.PC;
 }
 
-void ARMv7Context::put_stack_arg(u32 shift, u32 value)
-{
-	vm::psv::write32(SP + shift, value);
-}
-
 u32 ARMv7Context::get_stack_arg(u32 pos)
 {
 	return vm::psv::read32(SP + sizeof(u32) * (pos - 5));
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index 070650f925..ac2600dc4b 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/Memory/Memory.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
 #include "Emu/CPU/CPUThreadManager.h"
@@ -858,6 +857,108 @@ s32 sceKernelGetRWLockInfo(s32 rwLockId, vm::psv::ptr<SceKernelRWLockInfo> pInfo
 	throw __FUNCTION__;
 }
 
+// IO/File functions
+
+s32 sceIoRemove(vm::psv::ptr<const char> filename)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoMkdir(vm::psv::ptr<const char> dirname, s32 mode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoRmdir(vm::psv::ptr<const char> dirname)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoRename(vm::psv::ptr<const char> oldname, vm::psv::ptr<const char> newname)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoDevctl(vm::psv::ptr<const char> devname, s32 cmd, vm::psv::ptr<const void> arg, u32 arglen, vm::psv::ptr<void> bufp, u32 buflen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoSync(vm::psv::ptr<const char> devname, s32 flag)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoOpen(vm::psv::ptr<const char> filename, s32 flag, s32 mode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoClose(s32 fd)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoIoctl(s32 fd, s32 cmd, vm::psv::ptr<const void> argp, u32 arglen, vm::psv::ptr<void> bufp, u32 buflen)
+{
+	throw __FUNCTION__;
+}
+
+s64 sceIoLseek(s32 fd, s64 offset, s32 whence)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoLseek32(s32 fd, s32 offset, s32 whence)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoRead(s32 fd, vm::psv::ptr<void> buf, u32 nbyte)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoWrite(s32 fd, vm::psv::ptr<const void> buf, u32 nbyte)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoPread(s32 fd, vm::psv::ptr<void> buf, u32 nbyte, s64 offset)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoPwrite(s32 fd, vm::psv::ptr<const void> buf, u32 nbyte, s64 offset)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoDopen(vm::psv::ptr<const char> dirname)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoDclose(s32 fd)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoDread(s32 fd, vm::psv::ptr<SceIoDirent> buf)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoChstat(vm::psv::ptr<const char> name, vm::psv::ptr<const SceIoStat> buf, u32 cbit)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceIoGetstat(vm::psv::ptr<const char> name, vm::psv::ptr<SceIoStat> buf)
+{
+	throw __FUNCTION__;
+}
+
 
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibKernel, #name, &name)
 
@@ -1128,24 +1229,24 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	//REG_FUNC(0x24460BB3, sceKernelWaitSignalCB);
 	//REG_FUNC(0x7BE9C4C8, sceKernelSendSignal);
 	REG_FUNC(0xC5C11EE7, sceKernelCreateThread);
-	//REG_FUNC(0x6C60AC61, sceIoOpen);
-	//REG_FUNC(0xF5C6F098, sceIoClose);
-	//REG_FUNC(0x713523E1, sceIoRead);
-	//REG_FUNC(0x11FED231, sceIoWrite);
-	//REG_FUNC(0x99BA173E, sceIoLseek);
-	//REG_FUNC(0x5CC983AC, sceIoLseek32);
-	//REG_FUNC(0xE20ED0F3, sceIoRemove);
-	//REG_FUNC(0xF737E369, sceIoRename);
-	//REG_FUNC(0x9670D39F, sceIoMkdir);
-	//REG_FUNC(0xE9F91EC8, sceIoRmdir);
-	//REG_FUNC(0xA9283DD0, sceIoDopen);
-	//REG_FUNC(0x9DFF9C59, sceIoDclose);
-	//REG_FUNC(0x9C8B6624, sceIoDread);
-	//REG_FUNC(0xBCA5B623, sceIoGetstat);
-	//REG_FUNC(0x29482F7F, sceIoChstat);
-	//REG_FUNC(0x98ACED6D, sceIoSync);
-	//REG_FUNC(0x4B30CB2, sceIoDevctl);
-	//REG_FUNC(0x54ABACFA, sceIoIoctl);
+	REG_FUNC(0x6C60AC61, sceIoOpen);
+	REG_FUNC(0xF5C6F098, sceIoClose);
+	REG_FUNC(0x713523E1, sceIoRead);
+	REG_FUNC(0x11FED231, sceIoWrite);
+	REG_FUNC(0x99BA173E, sceIoLseek);
+	REG_FUNC(0x5CC983AC, sceIoLseek32);
+	REG_FUNC(0xE20ED0F3, sceIoRemove);
+	REG_FUNC(0xF737E369, sceIoRename);
+	REG_FUNC(0x9670D39F, sceIoMkdir);
+	REG_FUNC(0xE9F91EC8, sceIoRmdir);
+	REG_FUNC(0xA9283DD0, sceIoDopen);
+	REG_FUNC(0x9DFF9C59, sceIoDclose);
+	REG_FUNC(0x9C8B6624, sceIoDread);
+	REG_FUNC(0xBCA5B623, sceIoGetstat);
+	REG_FUNC(0x29482F7F, sceIoChstat);
+	REG_FUNC(0x98ACED6D, sceIoSync);
+	REG_FUNC(0x4B30CB2, sceIoDevctl);
+	REG_FUNC(0x54ABACFA, sceIoIoctl);
 	//REG_FUNC(0x6A7EA9FD, sceIoOpenAsync);
 	//REG_FUNC(0x84201C9B, sceIoCloseAsync);
 	//REG_FUNC(0x7B3BE857, sceIoReadAsync);
@@ -1165,8 +1266,8 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	//REG_FUNC(0xF7C7FBFE, sceIoSyncAsync);
 	//REG_FUNC(0xEC96EA71, sceIoCancel);
 	//REG_FUNC(0x857E0C71, sceIoComplete);
-	//REG_FUNC(0x52315AD7, sceIoPread);
-	//REG_FUNC(0x8FFFF5A8, sceIoPwrite);
+	REG_FUNC(0x52315AD7, sceIoPread);
+	REG_FUNC(0x8FFFF5A8, sceIoPwrite);
 	//REG_FUNC(0xA010141E, sceIoPreadAsync);
 	//REG_FUNC(0xED25BEEF, sceIoPwriteAsync);
 	//REG_FUNC(0xA792C404, sceIoCompleteMultiple);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
index b68e89c93f..dca20547c1 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
@@ -1,5 +1,256 @@
 #pragma once
 
+// Error Codes
+
+enum
+{
+	SCE_KERNEL_ERROR_ERROR = 0x80020001,
+	SCE_KERNEL_ERROR_NOT_IMPLEMENTED = 0x80020002,
+	SCE_KERNEL_ERROR_INVALID_ARGUMENT = 0x80020003,
+	SCE_KERNEL_ERROR_INVALID_ARGUMENT_SIZE = 0x80020004,
+	SCE_KERNEL_ERROR_INVALID_FLAGS = 0x80020005,
+	SCE_KERNEL_ERROR_ILLEGAL_SIZE = 0x80020006,
+	SCE_KERNEL_ERROR_ILLEGAL_ADDR = 0x80020007,
+	SCE_KERNEL_ERROR_UNSUP = 0x80020008,
+	SCE_KERNEL_ERROR_ILLEGAL_MODE = 0x80020009,
+	SCE_KERNEL_ERROR_ILLEGAL_ALIGNMENT = 0x8002000A,
+	SCE_KERNEL_ERROR_NOSYS = 0x8002000B,
+	SCE_KERNEL_ERROR_DEBUG_ERROR = 0x80021000,
+	SCE_KERNEL_ERROR_ILLEGAL_DIPSW_NUMBER = 0x80021001,
+	SCE_KERNEL_ERROR_CPU_ERROR = 0x80022000,
+	SCE_KERNEL_ERROR_MMU_ILLEGAL_L1_TYPE = 0x80022001,
+	SCE_KERNEL_ERROR_MMU_L2_INDEX_OVERFLOW = 0x80022002,
+	SCE_KERNEL_ERROR_MMU_L2_SIZE_OVERFLOW = 0x80022003,
+	SCE_KERNEL_ERROR_INVALID_CPU_AFFINITY = 0x80022004,
+	SCE_KERNEL_ERROR_INVALID_MEMORY_ACCESS = 0x80022005,
+	SCE_KERNEL_ERROR_INVALID_MEMORY_ACCESS_PERMISSION = 0x80022006,
+	SCE_KERNEL_ERROR_VA2PA_FAULT = 0x80022007,
+	SCE_KERNEL_ERROR_VA2PA_MAPPED = 0x80022008,
+	SCE_KERNEL_ERROR_VALIDATION_CHECK_FAILED = 0x80022009,
+	SCE_KERNEL_ERROR_SYSMEM_ERROR = 0x80024000,
+	SCE_KERNEL_ERROR_INVALID_PROCESS_CONTEXT = 0x80024001,
+	SCE_KERNEL_ERROR_UID_NAME_TOO_LONG = 0x80024002,
+	SCE_KERNEL_ERROR_VARANGE_IS_NOT_PHYSICAL_CONTINUOUS = 0x80024003,
+	SCE_KERNEL_ERROR_PHYADDR_ERROR = 0x80024100,
+	SCE_KERNEL_ERROR_NO_PHYADDR = 0x80024101,
+	SCE_KERNEL_ERROR_PHYADDR_USED = 0x80024102,
+	SCE_KERNEL_ERROR_PHYADDR_NOT_USED = 0x80024103,
+	SCE_KERNEL_ERROR_NO_IOADDR = 0x80024104,
+	SCE_KERNEL_ERROR_PHYMEM_ERROR = 0x80024300,
+	SCE_KERNEL_ERROR_ILLEGAL_PHYPAGE_STATUS = 0x80024301,
+	SCE_KERNEL_ERROR_NO_FREE_PHYSICAL_PAGE = 0x80024302,
+	SCE_KERNEL_ERROR_NO_FREE_PHYSICAL_PAGE_UNIT = 0x80024303,
+	SCE_KERNEL_ERROR_PHYMEMPART_NOT_EMPTY = 0x80024304,
+	SCE_KERNEL_ERROR_NO_PHYMEMPART_LPDDR2 = 0x80024305,
+	SCE_KERNEL_ERROR_NO_PHYMEMPART_CDRAM = 0x80024306,
+	SCE_KERNEL_ERROR_FIXEDHEAP_ERROR = 0x80024400,
+	SCE_KERNEL_ERROR_FIXEDHEAP_ILLEGAL_SIZE = 0x80024401,
+	SCE_KERNEL_ERROR_FIXEDHEAP_ILLEGAL_INDEX = 0x80024402,
+	SCE_KERNEL_ERROR_FIXEDHEAP_INDEX_OVERFLOW = 0x80024403,
+	SCE_KERNEL_ERROR_FIXEDHEAP_NO_CHUNK = 0x80024404,
+	SCE_KERNEL_ERROR_UID_ERROR = 0x80024500,
+	SCE_KERNEL_ERROR_INVALID_UID = 0x80024501,
+	SCE_KERNEL_ERROR_SYSMEM_UID_INVALID_ARGUMENT = 0x80024502,
+	SCE_KERNEL_ERROR_SYSMEM_INVALID_UID_RANGE = 0x80024503,
+	SCE_KERNEL_ERROR_SYSMEM_NO_VALID_UID = 0x80024504,
+	SCE_KERNEL_ERROR_SYSMEM_CANNOT_ALLOCATE_UIDENTRY = 0x80024505,
+	SCE_KERNEL_ERROR_NOT_PROCESS_UID = 0x80024506,
+	SCE_KERNEL_ERROR_NOT_KERNEL_UID = 0x80024507,
+	SCE_KERNEL_ERROR_INVALID_UID_CLASS = 0x80024508,
+	SCE_KERNEL_ERROR_INVALID_UID_SUBCLASS = 0x80024509,
+	SCE_KERNEL_ERROR_UID_CANNOT_FIND_BY_NAME = 0x8002450A,
+	SCE_KERNEL_ERROR_VIRPAGE_ERROR = 0x80024600,
+	SCE_KERNEL_ERROR_ILLEGAL_VIRPAGE_TYPE = 0x80024601,
+	SCE_KERNEL_ERROR_BLOCK_ERROR = 0x80024700,
+	SCE_KERNEL_ERROR_ILLEGAL_BLOCK_ID = 0x80024701,
+	SCE_KERNEL_ERROR_ILLEGAL_BLOCK_TYPE = 0x80024702,
+	SCE_KERNEL_ERROR_BLOCK_IN_USE = 0x80024703,
+	SCE_KERNEL_ERROR_PARTITION_ERROR = 0x80024800,
+	SCE_KERNEL_ERROR_ILLEGAL_PARTITION_ID = 0x80024801,
+	SCE_KERNEL_ERROR_ILLEGAL_PARTITION_INDEX = 0x80024802,
+	SCE_KERNEL_ERROR_NO_L2PAGETABLE = 0x80024803,
+	SCE_KERNEL_ERROR_HEAPLIB_ERROR = 0x80024900,
+	SCE_KERNEL_ERROR_ILLEGAL_HEAP_ID = 0x80024901,
+	SCE_KERNEL_ERROR_OUT_OF_RANG = 0x80024902,
+	SCE_KERNEL_ERROR_HEAPLIB_NOMEM = 0x80024903,
+	SCE_KERNEL_ERROR_SYSMEM_ADDRESS_SPACE_ERROR = 0x80024A00,
+	SCE_KERNEL_ERROR_INVALID_ADDRESS_SPACE_ID = 0x80024A01,
+	SCE_KERNEL_ERROR_INVALID_PARTITION_INDEX = 0x80024A02,
+	SCE_KERNEL_ERROR_ADDRESS_SPACE_CANNOT_FIND_PARTITION_BY_ADDR = 0x80024A03,
+	SCE_KERNEL_ERROR_SYSMEM_MEMBLOCK_ERROR = 0x80024B00,
+	SCE_KERNEL_ERROR_ILLEGAL_MEMBLOCK_TYPE = 0x80024B01,
+	SCE_KERNEL_ERROR_ILLEGAL_MEMBLOCK_REMAP_TYPE = 0x80024B02,
+	SCE_KERNEL_ERROR_NOT_PHY_CONT_MEMBLOCK = 0x80024B03,
+	SCE_KERNEL_ERROR_ILLEGAL_MEMBLOCK_CODE = 0x80024B04,
+	SCE_KERNEL_ERROR_ILLEGAL_MEMBLOCK_SIZE = 0x80024B05,
+	SCE_KERNEL_ERROR_ILLEGAL_USERMAP_SIZE = 0x80024B06,
+	SCE_KERNEL_ERROR_MEMBLOCK_TYPE_FOR_KERNEL_PROCESS = 0x80024B07,
+	SCE_KERNEL_ERROR_PROCESS_CANNOT_REMAP_MEMBLOCK = 0x80024B08,
+	SCE_KERNEL_ERROR_SYSMEM_PHYMEMLOW_ERROR = 0x80024C00,
+	SCE_KERNEL_ERROR_CANNOT_ALLOC_PHYMEMLOW = 0x80024C01,
+	SCE_KERNEL_ERROR_UNKNOWN_PHYMEMLOW_TYPE = 0x80024C02,
+	SCE_KERNEL_ERROR_SYSMEM_BITHEAP_ERROR = 0x80024D00,
+	SCE_KERNEL_ERROR_CANNOT_ALLOC_BITHEAP = 0x80024D01,
+	SCE_KERNEL_ERROR_LOADCORE_ERROR = 0x80025000,
+	SCE_KERNEL_ERROR_ILLEGAL_ELF_HEADER = 0x80025001,
+	SCE_KERNEL_ERROR_ILLEGAL_SELF_HEADER = 0x80025002,
+	SCE_KERNEL_ERROR_EXCPMGR_ERROR = 0x80027000,
+	SCE_KERNEL_ERROR_ILLEGAL_EXCPCODE = 0x80027001,
+	SCE_KERNEL_ERROR_ILLEGAL_EXCPHANDLER = 0x80027002,
+	SCE_KERNEL_ERROR_NOTFOUND_EXCPHANDLER = 0x80027003,
+	SCE_KERNEL_ERROR_CANNOT_RELEASE_EXCPHANDLER = 0x80027004,
+	SCE_KERNEL_ERROR_INTRMGR_ERROR = 0x80027100,
+	SCE_KERNEL_ERROR_ILLEGAL_CONTEXT = 0x80027101,
+	SCE_KERNEL_ERROR_ILLEGAL_INTRCODE = 0x80027102,
+	SCE_KERNEL_ERROR_ILLEGAL_INTRPARAM = 0x80027103,
+	SCE_KERNEL_ERROR_ILLEGAL_INTRPRIORITY = 0x80027104,
+	SCE_KERNEL_ERROR_ILLEGAL_TARGET_CPU = 0x80027105,
+	SCE_KERNEL_ERROR_ILLEGAL_INTRFILTER = 0x80027106,
+	SCE_KERNEL_ERROR_ILLEGAL_INTRTYPE = 0x80027107,
+	SCE_KERNEL_ERROR_ILLEGAL_HANDLER = 0x80027108,
+	SCE_KERNEL_ERROR_FOUND_HANDLER = 0x80027109,
+	SCE_KERNEL_ERROR_NOTFOUND_HANDLER = 0x8002710A,
+	SCE_KERNEL_ERROR_NO_MEMORY = 0x8002710B,
+	SCE_KERNEL_ERROR_DMACMGR_ERROR = 0x80027200,
+	SCE_KERNEL_ERROR_ALREADY_QUEUED = 0x80027201,
+	SCE_KERNEL_ERROR_NOT_QUEUED = 0x80027202,
+	SCE_KERNEL_ERROR_NOT_SETUP = 0x80027203,
+	SCE_KERNEL_ERROR_ON_TRANSFERRING = 0x80027204,
+	SCE_KERNEL_ERROR_NOT_INITIALIZED = 0x80027205,
+	SCE_KERNEL_ERROR_TRANSFERRED = 0x80027206,
+	SCE_KERNEL_ERROR_NOT_UNDER_CONTROL = 0x80027207,
+	SCE_KERNEL_ERROR_SYSTIMER_ERROR = 0x80027300,
+	SCE_KERNEL_ERROR_NO_FREE_TIMER = 0x80027301,
+	SCE_KERNEL_ERROR_TIMER_NOT_ALLOCATED = 0x80027302,
+	SCE_KERNEL_ERROR_TIMER_COUNTING = 0x80027303,
+	SCE_KERNEL_ERROR_TIMER_STOPPED = 0x80027304,
+	SCE_KERNEL_ERROR_THREADMGR_ERROR = 0x80028000,
+	SCE_KERNEL_ERROR_DORMANT = 0x80028001,
+	SCE_KERNEL_ERROR_NOT_DORMANT = 0x80028002,
+	SCE_KERNEL_ERROR_UNKNOWN_THID = 0x80028003,
+	SCE_KERNEL_ERROR_CAN_NOT_WAIT = 0x80028004,
+	SCE_KERNEL_ERROR_ILLEGAL_THID = 0x80028005,
+	SCE_KERNEL_ERROR_THREAD_TERMINATED = 0x80028006,
+	SCE_KERNEL_ERROR_DELETED = 0x80028007,
+	SCE_KERNEL_ERROR_WAIT_TIMEOUT = 0x80028008,
+	SCE_KERNEL_ERROR_NOTIFY_CALLBACK = 0x80028009,
+	SCE_KERNEL_ERROR_WAIT_DELETE = 0x8002800A,
+	SCE_KERNEL_ERROR_ILLEGAL_ATTR = 0x8002800B,
+	SCE_KERNEL_ERROR_EVF_MULTI = 0x8002800C,
+	SCE_KERNEL_ERROR_WAIT_CANCEL = 0x8002800D,
+	SCE_KERNEL_ERROR_EVF_COND = 0x8002800E,
+	SCE_KERNEL_ERROR_ILLEGAL_COUNT = 0x8002800F,
+	SCE_KERNEL_ERROR_ILLEGAL_PRIORITY = 0x80028010,
+	SCE_KERNEL_ERROR_MUTEX_RECURSIVE = 0x80028011,
+	SCE_KERNEL_ERROR_MUTEX_LOCK_OVF = 0x80028012,
+	SCE_KERNEL_ERROR_MUTEX_NOT_OWNED = 0x80028013,
+	SCE_KERNEL_ERROR_MUTEX_UNLOCK_UDF = 0x80028014,
+	SCE_KERNEL_ERROR_MUTEX_FAILED_TO_OWN = 0x80028015,
+	SCE_KERNEL_ERROR_FAST_MUTEX_RECURSIVE = 0x80028016,
+	SCE_KERNEL_ERROR_FAST_MUTEX_LOCK_OVF = 0x80028017,
+	SCE_KERNEL_ERROR_FAST_MUTEX_FAILED_TO_OWN = 0x80028018,
+	SCE_KERNEL_ERROR_FAST_MUTEX_NOT_OWNED = 0x80028019,
+	SCE_KERNEL_ERROR_FAST_MUTEX_OWNED = 0x8002801A,
+	SCE_KERNEL_ERROR_ALARM_CAN_NOT_CANCEL = 0x8002801B,
+	SCE_KERNEL_ERROR_INVALID_OBJECT_TYPE = 0x8002801C,
+	SCE_KERNEL_ERROR_KERNEL_TLS_FULL = 0x8002801D,
+	SCE_KERNEL_ERROR_ILLEGAL_KERNEL_TLS_INDEX = 0x8002801E,
+	SCE_KERNEL_ERROR_KERNEL_TLS_BUSY = 0x8002801F,
+	SCE_KERNEL_ERROR_DIFFERENT_UID_CLASS = 0x80028020,
+	SCE_KERNEL_ERROR_UNKNOWN_UID = 0x80028021,
+	SCE_KERNEL_ERROR_SEMA_ZERO = 0x80028022,
+	SCE_KERNEL_ERROR_SEMA_OVF = 0x80028023,
+	SCE_KERNEL_ERROR_PMON_NOT_THREAD_MODE = 0x80028024,
+	SCE_KERNEL_ERROR_PMON_NOT_CPU_MODE = 0x80028025,
+	SCE_KERNEL_ERROR_ALREADY_REGISTERED = 0x80028026,
+	SCE_KERNEL_ERROR_INVALID_THREAD_ID = 0x80028027,
+	SCE_KERNEL_ERROR_ALREADY_DEBUG_SUSPENDED = 0x80028028,
+	SCE_KERNEL_ERROR_NOT_DEBUG_SUSPENDED = 0x80028029,
+	SCE_KERNEL_ERROR_CAN_NOT_USE_VFP = 0x8002802A,
+	SCE_KERNEL_ERROR_RUNNING = 0x8002802B,
+	SCE_KERNEL_ERROR_EVENT_COND = 0x8002802C,
+	SCE_KERNEL_ERROR_MSG_PIPE_FULL = 0x8002802D,
+	SCE_KERNEL_ERROR_MSG_PIPE_EMPTY = 0x8002802E,
+	SCE_KERNEL_ERROR_ALREADY_SENT = 0x8002802F,
+	SCE_KERNEL_ERROR_CAN_NOT_SUSPEND = 0x80028030,
+	SCE_KERNEL_ERROR_FAST_MUTEX_ALREADY_INITIALIZED = 0x80028031,
+	SCE_KERNEL_ERROR_FAST_MUTEX_NOT_INITIALIZED = 0x80028032,
+	SCE_KERNEL_ERROR_THREAD_STOPPED = 0x80028033,
+	SCE_KERNEL_ERROR_THREAD_SUSPENDED = 0x80028034,
+	SCE_KERNEL_ERROR_NOT_SUSPENDED = 0x80028035,
+	SCE_KERNEL_ERROR_WAIT_DELETE_MUTEX = 0x80028036,
+	SCE_KERNEL_ERROR_WAIT_CANCEL_MUTEX = 0x80028037,
+	SCE_KERNEL_ERROR_WAIT_DELETE_COND = 0x80028038,
+	SCE_KERNEL_ERROR_WAIT_CANCEL_COND = 0x80028039,
+	SCE_KERNEL_ERROR_LW_MUTEX_NOT_OWNED = 0x8002803A,
+	SCE_KERNEL_ERROR_LW_MUTEX_LOCK_OVF = 0x8002803B,
+	SCE_KERNEL_ERROR_LW_MUTEX_UNLOCK_UDF = 0x8002803C,
+	SCE_KERNEL_ERROR_LW_MUTEX_RECURSIVE = 0x8002803D,
+	SCE_KERNEL_ERROR_LW_MUTEX_FAILED_TO_OWN = 0x8002803E,
+	SCE_KERNEL_ERROR_WAIT_DELETE_LW_MUTEX = 0x8002803F,
+	SCE_KERNEL_ERROR_ILLEGAL_STACK_SIZE = 0x80028040,
+	SCE_KERNEL_ERROR_RW_LOCK_RECURSIVE = 0x80028041,
+	SCE_KERNEL_ERROR_RW_LOCK_LOCK_OVF = 0x80028042,
+	SCE_KERNEL_ERROR_RW_LOCK_NOT_OWNED = 0x80028043,
+	SCE_KERNEL_ERROR_RW_LOCK_UNLOCK_UDF = 0x80028044,
+	SCE_KERNEL_ERROR_RW_LOCK_FAILED_TO_LOCK = 0x80028045,
+	SCE_KERNEL_ERROR_RW_LOCK_FAILED_TO_UNLOCK = 0x80028046,
+
+	SCE_KERNEL_ERROR_PROCESSMGR_ERROR = 0x80029000,
+	SCE_KERNEL_ERROR_INVALID_PID = 0x80029001,
+	SCE_KERNEL_ERROR_INVALID_PROCESS_TYPE = 0x80029002,
+	SCE_KERNEL_ERROR_PLS_FULL = 0x80029003,
+	SCE_KERNEL_ERROR_INVALID_PROCESS_STATUS = 0x80029004,
+	SCE_KERNEL_ERROR_INVALID_BUDGET_ID = 0x80029005,
+	SCE_KERNEL_ERROR_INVALID_BUDGET_SIZE = 0x80029006,
+	SCE_KERNEL_ERROR_CP14_DISABLED = 0x80029007,
+	SCE_KERNEL_ERROR_EXCEEDED_MAX_PROCESSES = 0x80029008,
+	SCE_KERNEL_ERROR_PROCESS_REMAINING = 0x80029009,
+	SCE_KERNEL_ERROR_IOFILEMGR_ERROR = 0x8002A000,
+	SCE_KERNEL_ERROR_IO_NAME_TOO_LONG = 0x8002A001,
+	SCE_KERNEL_ERROR_IO_REG_DEV = 0x8002A002,
+	SCE_KERNEL_ERROR_IO_ALIAS_USED = 0x8002A003,
+	SCE_KERNEL_ERROR_IO_DEL_DEV = 0x8002A004,
+	SCE_KERNEL_ERROR_IO_WOULD_BLOCK = 0x8002A005,
+	SCE_KERNEL_ERROR_MODULEMGR_START_FAILED = 0x8002D000,
+	SCE_KERNEL_ERROR_MODULEMGR_STOP_FAIL = 0x8002D001,
+	SCE_KERNEL_ERROR_MODULEMGR_IN_USE = 0x8002D002,
+	SCE_KERNEL_ERROR_MODULEMGR_NO_LIB = 0x8002D003,
+	SCE_KERNEL_ERROR_MODULEMGR_SYSCALL_REG = 0x8002D004,
+	SCE_KERNEL_ERROR_MODULEMGR_NOMEM_LIB = 0x8002D005,
+	SCE_KERNEL_ERROR_MODULEMGR_NOMEM_STUB = 0x8002D006,
+	SCE_KERNEL_ERROR_MODULEMGR_NOMEM_SELF = 0x8002D007,
+	SCE_KERNEL_ERROR_MODULEMGR_NOMEM = 0x8002D008,
+	SCE_KERNEL_ERROR_MODULEMGR_INVALID_LIB = 0x8002D009,
+	SCE_KERNEL_ERROR_MODULEMGR_INVALID_STUB = 0x8002D00A,
+	SCE_KERNEL_ERROR_MODULEMGR_NO_FUNC_NID = 0x8002D00B,
+	SCE_KERNEL_ERROR_MODULEMGR_NO_VAR_NID = 0x8002D00C,
+	SCE_KERNEL_ERROR_MODULEMGR_INVALID_TYPE = 0x8002D00D,
+	SCE_KERNEL_ERROR_MODULEMGR_NO_MOD_ENTRY = 0x8002D00E,
+	SCE_KERNEL_ERROR_MODULEMGR_INVALID_PROC_PARAM = 0x8002D00F,
+	SCE_KERNEL_ERROR_MODULEMGR_NO_MODOBJ = 0x8002D010,
+	SCE_KERNEL_ERROR_MODULEMGR_NO_MOD = 0x8002D011,
+	SCE_KERNEL_ERROR_MODULEMGR_NO_PROCESS = 0x8002D012,
+	SCE_KERNEL_ERROR_MODULEMGR_OLD_LIB = 0x8002D013,
+	SCE_KERNEL_ERROR_MODULEMGR_STARTED = 0x8002D014,
+	SCE_KERNEL_ERROR_MODULEMGR_NOT_STARTED = 0x8002D015,
+	SCE_KERNEL_ERROR_MODULEMGR_NOT_STOPPED = 0x8002D016,
+	SCE_KERNEL_ERROR_MODULEMGR_INVALID_PROCESS_UID = 0x8002D017,
+	SCE_KERNEL_ERROR_MODULEMGR_CANNOT_EXPORT_LIB_TO_SHARED = 0x8002D018,
+	SCE_KERNEL_ERROR_MODULEMGR_INVALID_REL_INFO = 0x8002D019,
+	SCE_KERNEL_ERROR_MODULEMGR_INVALID_REF_INFO = 0x8002D01A,
+	SCE_KERNEL_ERROR_MODULEMGR_ELINK = 0x8002D01B,
+	SCE_KERNEL_ERROR_MODULEMGR_NOENT = 0x8002D01C,
+	SCE_KERNEL_ERROR_MODULEMGR_BUSY = 0x8002D01D,
+	SCE_KERNEL_ERROR_MODULEMGR_NOEXEC = 0x8002D01E,
+	SCE_KERNEL_ERROR_MODULEMGR_NAMETOOLONG = 0x8002D01F,
+	SCE_KERNEL_ERROR_LIBRARYDB_NOENT = 0x8002D080,
+	SCE_KERNEL_ERROR_LIBRARYDB_NO_LIB = 0x8002D081,
+	SCE_KERNEL_ERROR_LIBRARYDB_NO_MOD = 0x8002D082,
+	SCE_KERNEL_ERROR_AUTHFAIL = 0x8002F000,
+	SCE_KERNEL_ERROR_NO_AUTH = 0x8002F001,
+};
+
 union SceKernelSysClock
 {
 	struct
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
index a81d82ac51..f0e596af2b 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "Utilities/Log.h"
 #include "Emu/System.h"
-#include "Emu/Memory/Memory.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 #include "Emu/ARMv7/ARMv7Callback.h"
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
index db7745f9f3..c0b847e6e5 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/Memory/Memory.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
 extern psv_log_base sceLibm;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
index ef215f0971..44b3b75ff8 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "Emu/System.h"
-#include "Emu/Memory/Memory.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
 extern psv_log_base sceLibstdcxx;
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h
index acbf9b3f5d..0326208f9f 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.h
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.h
@@ -1,7 +1,9 @@
 #pragma once
+#include "Emu/Memory/Memory.h"
 #include "ARMv7Context.h"
 #include "Emu/SysCalls/LogBase.h"
 
+// PSV module class
 class psv_log_base : public LogBase
 {
 	std::string m_name;
@@ -31,396 +33,7 @@ public:
 
 };
 
-enum psv_error_codes
-{
-	SCE_OK = 0,
-
-	SCE_ERROR_ERRNO_EPERM				 = 0x80010001,
-	SCE_ERROR_ERRNO_ENOENT				 = 0x80010002,
-	SCE_ERROR_ERRNO_ESRCH				 = 0x80010003,
-	SCE_ERROR_ERRNO_EINTR				 = 0x80010004,
-	SCE_ERROR_ERRNO_EIO					 = 0x80010005,
-	SCE_ERROR_ERRNO_ENXIO				 = 0x80010006,
-	SCE_ERROR_ERRNO_E2BIG				 = 0x80010007,
-	SCE_ERROR_ERRNO_ENOEXEC				 = 0x80010008,
-	SCE_ERROR_ERRNO_EBADF				 = 0x80010009,
-	SCE_ERROR_ERRNO_ECHILD				 = 0x8001000A,
-	SCE_ERROR_ERRNO_EAGAIN				 = 0x8001000B,
-	SCE_ERROR_ERRNO_ENOMEM				 = 0x8001000C,
-	SCE_ERROR_ERRNO_EACCES				 = 0x8001000D,
-	SCE_ERROR_ERRNO_EFAULT				 = 0x8001000E,
-	SCE_ERROR_ERRNO_ENOTBLK				 = 0x8001000F,
-	SCE_ERROR_ERRNO_EBUSY				 = 0x80010010,
-	SCE_ERROR_ERRNO_EEXIST				 = 0x80010011,
-	SCE_ERROR_ERRNO_EXDEV				 = 0x80010012,
-	SCE_ERROR_ERRNO_ENODEV				 = 0x80010013,
-	SCE_ERROR_ERRNO_ENOTDIR				 = 0x80010014,
-	SCE_ERROR_ERRNO_EISDIR				 = 0x80010015,
-	SCE_ERROR_ERRNO_EINVAL				 = 0x80010016,
-	SCE_ERROR_ERRNO_ENFILE				 = 0x80010017,
-	SCE_ERROR_ERRNO_EMFILE				 = 0x80010018,
-	SCE_ERROR_ERRNO_ENOTTY				 = 0x80010019,
-	SCE_ERROR_ERRNO_ETXTBSY				 = 0x8001001A,
-	SCE_ERROR_ERRNO_EFBIG				 = 0x8001001B,
-	SCE_ERROR_ERRNO_ENOSPC				 = 0x8001001C,
-	SCE_ERROR_ERRNO_ESPIPE				 = 0x8001001D,
-	SCE_ERROR_ERRNO_EROFS				 = 0x8001001E,
-	SCE_ERROR_ERRNO_EMLINK				 = 0x8001001F,
-	SCE_ERROR_ERRNO_EPIPE				 = 0x80010020,
-	SCE_ERROR_ERRNO_EDOM				 = 0x80010021,
-	SCE_ERROR_ERRNO_ERANGE				 = 0x80010022,
-	SCE_ERROR_ERRNO_ENOMSG				 = 0x80010023,
-	SCE_ERROR_ERRNO_EIDRM				 = 0x80010024,
-	SCE_ERROR_ERRNO_ECHRNG				 = 0x80010025,
-	SCE_ERROR_ERRNO_EL2NSYNC			 = 0x80010026,
-	SCE_ERROR_ERRNO_EL3HLT				 = 0x80010027,
-	SCE_ERROR_ERRNO_EL3RST				 = 0x80010028,
-	SCE_ERROR_ERRNO_ELNRNG				 = 0x80010029,
-	SCE_ERROR_ERRNO_EUNATCH				 = 0x8001002A,
-	SCE_ERROR_ERRNO_ENOCSI				 = 0x8001002B,
-	SCE_ERROR_ERRNO_EL2HLT				 = 0x8001002C,
-	SCE_ERROR_ERRNO_EDEADLK				 = 0x8001002D,
-	SCE_ERROR_ERRNO_ENOLCK				 = 0x8001002E,
-	SCE_ERROR_ERRNO_EFORMAT				 = 0x8001002F,
-	SCE_ERROR_ERRNO_EUNSUP				 = 0x80010030,
-	SCE_ERROR_ERRNO_EBADE				 = 0x80010032,
-	SCE_ERROR_ERRNO_EBADR				 = 0x80010033,
-	SCE_ERROR_ERRNO_EXFULL				 = 0x80010034,
-	SCE_ERROR_ERRNO_ENOANO				 = 0x80010035,
-	SCE_ERROR_ERRNO_EBADRQC				 = 0x80010036,
-	SCE_ERROR_ERRNO_EBADSLT				 = 0x80010037,
-	SCE_ERROR_ERRNO_EDEADLOCK			 = 0x80010038,
-	SCE_ERROR_ERRNO_EBFONT				 = 0x80010039,
-	SCE_ERROR_ERRNO_ENOSTR				 = 0x8001003C,
-	SCE_ERROR_ERRNO_ENODATA				 = 0x8001003D,
-	SCE_ERROR_ERRNO_ETIME				 = 0x8001003E,
-	SCE_ERROR_ERRNO_ENOSR				 = 0x8001003F,
-	SCE_ERROR_ERRNO_ENONET				 = 0x80010040,
-	SCE_ERROR_ERRNO_ENOPKG				 = 0x80010041,
-	SCE_ERROR_ERRNO_EREMOTE				 = 0x80010042,
-	SCE_ERROR_ERRNO_ENOLINK				 = 0x80010043,
-	SCE_ERROR_ERRNO_EADV				 = 0x80010044,
-	SCE_ERROR_ERRNO_ESRMNT				 = 0x80010045,
-	SCE_ERROR_ERRNO_ECOMM				 = 0x80010046,
-	SCE_ERROR_ERRNO_EPROTO				 = 0x80010047,
-	SCE_ERROR_ERRNO_EMULTIHOP			 = 0x8001004A,
-	SCE_ERROR_ERRNO_ELBIN				 = 0x8001004B,
-	SCE_ERROR_ERRNO_EDOTDOT				 = 0x8001004C,
-	SCE_ERROR_ERRNO_EBADMSG				 = 0x8001004D,
-	SCE_ERROR_ERRNO_EFTYPE				 = 0x8001004F,
-	SCE_ERROR_ERRNO_ENOTUNIQ			 = 0x80010050,
-	SCE_ERROR_ERRNO_EBADFD				 = 0x80010051,
-	SCE_ERROR_ERRNO_EREMCHG				 = 0x80010052,
-	SCE_ERROR_ERRNO_ELIBACC				 = 0x80010053,
-	SCE_ERROR_ERRNO_ELIBBAD				 = 0x80010054,
-	SCE_ERROR_ERRNO_ELIBSCN				 = 0x80010055,
-	SCE_ERROR_ERRNO_ELIBMAX				 = 0x80010056,
-	SCE_ERROR_ERRNO_ELIBEXEC			 = 0x80010057,
-	SCE_ERROR_ERRNO_ENOSYS				 = 0x80010058,
-	SCE_ERROR_ERRNO_ENMFILE				 = 0x80010059,
-	SCE_ERROR_ERRNO_ENOTEMPTY			 = 0x8001005A,
-	SCE_ERROR_ERRNO_ENAMETOOLONG		 = 0x8001005B,
-	SCE_ERROR_ERRNO_ELOOP				 = 0x8001005C,
-	SCE_ERROR_ERRNO_EOPNOTSUPP			 = 0x8001005F,
-	SCE_ERROR_ERRNO_EPFNOSUPPORT		 = 0x80010060,
-	SCE_ERROR_ERRNO_ECONNRESET			 = 0x80010068,
-	SCE_ERROR_ERRNO_ENOBUFS				 = 0x80010069,
-	SCE_ERROR_ERRNO_EAFNOSUPPORT		 = 0x8001006A,
-	SCE_ERROR_ERRNO_EPROTOTYPE			 = 0x8001006B,
-	SCE_ERROR_ERRNO_ENOTSOCK			 = 0x8001006C,
-	SCE_ERROR_ERRNO_ENOPROTOOPT			 = 0x8001006D,
-	SCE_ERROR_ERRNO_ESHUTDOWN			 = 0x8001006E,
-	SCE_ERROR_ERRNO_ECONNREFUSED		 = 0x8001006F,
-	SCE_ERROR_ERRNO_EADDRINUSE			 = 0x80010070,
-	SCE_ERROR_ERRNO_ECONNABORTED		 = 0x80010071,
-	SCE_ERROR_ERRNO_ENETUNREACH			 = 0x80010072,
-	SCE_ERROR_ERRNO_ENETDOWN			 = 0x80010073,
-	SCE_ERROR_ERRNO_ETIMEDOUT			 = 0x80010074,
-	SCE_ERROR_ERRNO_EHOSTDOWN			 = 0x80010075,
-	SCE_ERROR_ERRNO_EHOSTUNREACH		 = 0x80010076,
-	SCE_ERROR_ERRNO_EINPROGRESS			 = 0x80010077,
-	SCE_ERROR_ERRNO_EALREADY			 = 0x80010078,
-	SCE_ERROR_ERRNO_EDESTADDRREQ		 = 0x80010079,
-	SCE_ERROR_ERRNO_EMSGSIZE			 = 0x8001007A,
-	SCE_ERROR_ERRNO_EPROTONOSUPPORT		 = 0x8001007B,
-	SCE_ERROR_ERRNO_ESOCKTNOSUPPORT		 = 0x8001007C,
-	SCE_ERROR_ERRNO_EADDRNOTAVAIL		 = 0x8001007D,
-	SCE_ERROR_ERRNO_ENETRESET			 = 0x8001007E,
-	SCE_ERROR_ERRNO_EISCONN				 = 0x8001007F,
-	SCE_ERROR_ERRNO_ENOTCONN			 = 0x80010080,
-	SCE_ERROR_ERRNO_ETOOMANYREFS		 = 0x80010081,
-	SCE_ERROR_ERRNO_EPROCLIM			 = 0x80010082,
-	SCE_ERROR_ERRNO_EUSERS				 = 0x80010083,
-	SCE_ERROR_ERRNO_EDQUOT				 = 0x80010084,
-	SCE_ERROR_ERRNO_ESTALE				 = 0x80010085,
-	SCE_ERROR_ERRNO_ENOTSUP				 = 0x80010086,
-	SCE_ERROR_ERRNO_ENOMEDIUM			 = 0x80010087,
-	SCE_ERROR_ERRNO_ENOSHARE			 = 0x80010088,
-	SCE_ERROR_ERRNO_ECASECLASH			 = 0x80010089,
-	SCE_ERROR_ERRNO_EILSEQ				 = 0x8001008A,
-	SCE_ERROR_ERRNO_EOVERFLOW			 = 0x8001008B,
-	SCE_ERROR_ERRNO_ECANCELED			 = 0x8001008C,
-	SCE_ERROR_ERRNO_ENOTRECOVERABLE		 = 0x8001008D,
-	SCE_ERROR_ERRNO_EOWNERDEAD			 = 0x8001008E,
-
-	SCE_KERNEL_ERROR_ERROR				 = 0x80020001,
-	SCE_KERNEL_ERROR_NOT_IMPLEMENTED	 = 0x80020002,
-	SCE_KERNEL_ERROR_INVALID_ARGUMENT	 = 0x80020003,
-	SCE_KERNEL_ERROR_INVALID_ARGUMENT_SIZE = 0x80020004,
-	SCE_KERNEL_ERROR_INVALID_FLAGS		 = 0x80020005,
-	SCE_KERNEL_ERROR_ILLEGAL_SIZE		 = 0x80020006,
-	SCE_KERNEL_ERROR_ILLEGAL_ADDR		 = 0x80020007,
-	SCE_KERNEL_ERROR_UNSUP				 = 0x80020008,
-	SCE_KERNEL_ERROR_ILLEGAL_MODE		 = 0x80020009,
-	SCE_KERNEL_ERROR_ILLEGAL_ALIGNMENT	 = 0x8002000A,
-	SCE_KERNEL_ERROR_NOSYS				 = 0x8002000B,
-	SCE_KERNEL_ERROR_DEBUG_ERROR		 = 0x80021000,
-	SCE_KERNEL_ERROR_ILLEGAL_DIPSW_NUMBER = 0x80021001,
-	SCE_KERNEL_ERROR_CPU_ERROR			 = 0x80022000,
-	SCE_KERNEL_ERROR_MMU_ILLEGAL_L1_TYPE = 0x80022001,
-	SCE_KERNEL_ERROR_MMU_L2_INDEX_OVERFLOW = 0x80022002,
-	SCE_KERNEL_ERROR_MMU_L2_SIZE_OVERFLOW = 0x80022003,
-	SCE_KERNEL_ERROR_INVALID_CPU_AFFINITY = 0x80022004,
-	SCE_KERNEL_ERROR_INVALID_MEMORY_ACCESS = 0x80022005,
-	SCE_KERNEL_ERROR_INVALID_MEMORY_ACCESS_PERMISSION = 0x80022006,
-	SCE_KERNEL_ERROR_VA2PA_FAULT		 = 0x80022007,
-	SCE_KERNEL_ERROR_VA2PA_MAPPED		 = 0x80022008,
-	SCE_KERNEL_ERROR_VALIDATION_CHECK_FAILED = 0x80022009,
-	SCE_KERNEL_ERROR_SYSMEM_ERROR		 = 0x80024000,
-	SCE_KERNEL_ERROR_INVALID_PROCESS_CONTEXT = 0x80024001,
-	SCE_KERNEL_ERROR_UID_NAME_TOO_LONG	 = 0x80024002,
-	SCE_KERNEL_ERROR_VARANGE_IS_NOT_PHYSICAL_CONTINUOUS = 0x80024003,
-	SCE_KERNEL_ERROR_PHYADDR_ERROR		 = 0x80024100,
-	SCE_KERNEL_ERROR_NO_PHYADDR			 = 0x80024101,
-	SCE_KERNEL_ERROR_PHYADDR_USED		 = 0x80024102,
-	SCE_KERNEL_ERROR_PHYADDR_NOT_USED	 = 0x80024103,
-	SCE_KERNEL_ERROR_NO_IOADDR			 = 0x80024104,
-	SCE_KERNEL_ERROR_PHYMEM_ERROR		 = 0x80024300,
-	SCE_KERNEL_ERROR_ILLEGAL_PHYPAGE_STATUS = 0x80024301,
-	SCE_KERNEL_ERROR_NO_FREE_PHYSICAL_PAGE = 0x80024302,
-	SCE_KERNEL_ERROR_NO_FREE_PHYSICAL_PAGE_UNIT = 0x80024303,
-	SCE_KERNEL_ERROR_PHYMEMPART_NOT_EMPTY = 0x80024304,
-	SCE_KERNEL_ERROR_NO_PHYMEMPART_LPDDR2 = 0x80024305,
-	SCE_KERNEL_ERROR_NO_PHYMEMPART_CDRAM = 0x80024306,
-	SCE_KERNEL_ERROR_FIXEDHEAP_ERROR	 = 0x80024400,
-	SCE_KERNEL_ERROR_FIXEDHEAP_ILLEGAL_SIZE = 0x80024401,
-	SCE_KERNEL_ERROR_FIXEDHEAP_ILLEGAL_INDEX = 0x80024402,
-	SCE_KERNEL_ERROR_FIXEDHEAP_INDEX_OVERFLOW = 0x80024403,
-	SCE_KERNEL_ERROR_FIXEDHEAP_NO_CHUNK	 = 0x80024404,
-	SCE_KERNEL_ERROR_UID_ERROR			 = 0x80024500,
-	SCE_KERNEL_ERROR_INVALID_UID		 = 0x80024501,
-	SCE_KERNEL_ERROR_SYSMEM_UID_INVALID_ARGUMENT = 0x80024502,
-	SCE_KERNEL_ERROR_SYSMEM_INVALID_UID_RANGE = 0x80024503,
-	SCE_KERNEL_ERROR_SYSMEM_NO_VALID_UID = 0x80024504,
-	SCE_KERNEL_ERROR_SYSMEM_CANNOT_ALLOCATE_UIDENTRY = 0x80024505,
-	SCE_KERNEL_ERROR_NOT_PROCESS_UID	 = 0x80024506,
-	SCE_KERNEL_ERROR_NOT_KERNEL_UID		 = 0x80024507,
-	SCE_KERNEL_ERROR_INVALID_UID_CLASS	 = 0x80024508,
-	SCE_KERNEL_ERROR_INVALID_UID_SUBCLASS = 0x80024509,
-	SCE_KERNEL_ERROR_UID_CANNOT_FIND_BY_NAME = 0x8002450A,
-	SCE_KERNEL_ERROR_VIRPAGE_ERROR		 = 0x80024600,
-	SCE_KERNEL_ERROR_ILLEGAL_VIRPAGE_TYPE = 0x80024601,
-	SCE_KERNEL_ERROR_BLOCK_ERROR		 = 0x80024700,
-	SCE_KERNEL_ERROR_ILLEGAL_BLOCK_ID	 = 0x80024701,
-	SCE_KERNEL_ERROR_ILLEGAL_BLOCK_TYPE	 = 0x80024702,
-	SCE_KERNEL_ERROR_BLOCK_IN_USE		 = 0x80024703,
-	SCE_KERNEL_ERROR_PARTITION_ERROR	 = 0x80024800,
-	SCE_KERNEL_ERROR_ILLEGAL_PARTITION_ID = 0x80024801,
-	SCE_KERNEL_ERROR_ILLEGAL_PARTITION_INDEX = 0x80024802,
-	SCE_KERNEL_ERROR_NO_L2PAGETABLE		 = 0x80024803,
-	SCE_KERNEL_ERROR_HEAPLIB_ERROR		 = 0x80024900,
-	SCE_KERNEL_ERROR_ILLEGAL_HEAP_ID	 = 0x80024901,
-	SCE_KERNEL_ERROR_OUT_OF_RANG		 = 0x80024902,
-	SCE_KERNEL_ERROR_HEAPLIB_NOMEM		 = 0x80024903,
-	SCE_KERNEL_ERROR_SYSMEM_ADDRESS_SPACE_ERROR = 0x80024A00,
-	SCE_KERNEL_ERROR_INVALID_ADDRESS_SPACE_ID = 0x80024A01,
-	SCE_KERNEL_ERROR_INVALID_PARTITION_INDEX = 0x80024A02,
-	SCE_KERNEL_ERROR_ADDRESS_SPACE_CANNOT_FIND_PARTITION_BY_ADDR = 0x80024A03,
-	SCE_KERNEL_ERROR_SYSMEM_MEMBLOCK_ERROR = 0x80024B00,
-	SCE_KERNEL_ERROR_ILLEGAL_MEMBLOCK_TYPE = 0x80024B01,
-	SCE_KERNEL_ERROR_ILLEGAL_MEMBLOCK_REMAP_TYPE = 0x80024B02,
-	SCE_KERNEL_ERROR_NOT_PHY_CONT_MEMBLOCK = 0x80024B03,
-	SCE_KERNEL_ERROR_ILLEGAL_MEMBLOCK_CODE = 0x80024B04,
-	SCE_KERNEL_ERROR_ILLEGAL_MEMBLOCK_SIZE = 0x80024B05,
-	SCE_KERNEL_ERROR_ILLEGAL_USERMAP_SIZE = 0x80024B06,
-	SCE_KERNEL_ERROR_MEMBLOCK_TYPE_FOR_KERNEL_PROCESS = 0x80024B07,
-	SCE_KERNEL_ERROR_PROCESS_CANNOT_REMAP_MEMBLOCK = 0x80024B08,
-	SCE_KERNEL_ERROR_SYSMEM_PHYMEMLOW_ERROR = 0x80024C00,
-	SCE_KERNEL_ERROR_CANNOT_ALLOC_PHYMEMLOW = 0x80024C01,
-	SCE_KERNEL_ERROR_UNKNOWN_PHYMEMLOW_TYPE = 0x80024C02,
-	SCE_KERNEL_ERROR_SYSMEM_BITHEAP_ERROR = 0x80024D00,
-	SCE_KERNEL_ERROR_CANNOT_ALLOC_BITHEAP = 0x80024D01,
-	SCE_KERNEL_ERROR_LOADCORE_ERROR		 = 0x80025000,
-	SCE_KERNEL_ERROR_ILLEGAL_ELF_HEADER	 = 0x80025001,
-	SCE_KERNEL_ERROR_ILLEGAL_SELF_HEADER = 0x80025002,
-	SCE_KERNEL_ERROR_EXCPMGR_ERROR		 = 0x80027000,
-	SCE_KERNEL_ERROR_ILLEGAL_EXCPCODE	 = 0x80027001,
-	SCE_KERNEL_ERROR_ILLEGAL_EXCPHANDLER = 0x80027002,
-	SCE_KERNEL_ERROR_NOTFOUND_EXCPHANDLER = 0x80027003,
-	SCE_KERNEL_ERROR_CANNOT_RELEASE_EXCPHANDLER = 0x80027004,
-	SCE_KERNEL_ERROR_INTRMGR_ERROR		 = 0x80027100,
-	SCE_KERNEL_ERROR_ILLEGAL_CONTEXT	 = 0x80027101,
-	SCE_KERNEL_ERROR_ILLEGAL_INTRCODE	 = 0x80027102,
-	SCE_KERNEL_ERROR_ILLEGAL_INTRPARAM	 = 0x80027103,
-	SCE_KERNEL_ERROR_ILLEGAL_INTRPRIORITY = 0x80027104,
-	SCE_KERNEL_ERROR_ILLEGAL_TARGET_CPU	 = 0x80027105,
-	SCE_KERNEL_ERROR_ILLEGAL_INTRFILTER	 = 0x80027106,
-	SCE_KERNEL_ERROR_ILLEGAL_INTRTYPE	 = 0x80027107,
-	SCE_KERNEL_ERROR_ILLEGAL_HANDLER	 = 0x80027108,
-	SCE_KERNEL_ERROR_FOUND_HANDLER		 = 0x80027109,
-	SCE_KERNEL_ERROR_NOTFOUND_HANDLER	 = 0x8002710A,
-	SCE_KERNEL_ERROR_NO_MEMORY			 = 0x8002710B,
-	SCE_KERNEL_ERROR_DMACMGR_ERROR		 = 0x80027200,
-	SCE_KERNEL_ERROR_ALREADY_QUEUED		 = 0x80027201,
-	SCE_KERNEL_ERROR_NOT_QUEUED			 = 0x80027202,
-	SCE_KERNEL_ERROR_NOT_SETUP			 = 0x80027203,
-	SCE_KERNEL_ERROR_ON_TRANSFERRING	 = 0x80027204,
-	SCE_KERNEL_ERROR_NOT_INITIALIZED	 = 0x80027205,
-	SCE_KERNEL_ERROR_TRANSFERRED		 = 0x80027206,
-	SCE_KERNEL_ERROR_NOT_UNDER_CONTROL	 = 0x80027207,
-	SCE_KERNEL_ERROR_SYSTIMER_ERROR		 = 0x80027300,
-	SCE_KERNEL_ERROR_NO_FREE_TIMER		 = 0x80027301,
-	SCE_KERNEL_ERROR_TIMER_NOT_ALLOCATED = 0x80027302,
-	SCE_KERNEL_ERROR_TIMER_COUNTING		 = 0x80027303,
-	SCE_KERNEL_ERROR_TIMER_STOPPED		 = 0x80027304,
-	SCE_KERNEL_ERROR_THREADMGR_ERROR	 = 0x80028000,
-	SCE_KERNEL_ERROR_DORMANT			 = 0x80028001,
-	SCE_KERNEL_ERROR_NOT_DORMANT		 = 0x80028002,
-	SCE_KERNEL_ERROR_UNKNOWN_THID		 = 0x80028003,
-	SCE_KERNEL_ERROR_CAN_NOT_WAIT		 = 0x80028004,
-	SCE_KERNEL_ERROR_ILLEGAL_THID		 = 0x80028005,
-	SCE_KERNEL_ERROR_THREAD_TERMINATED	 = 0x80028006,
-	SCE_KERNEL_ERROR_DELETED			 = 0x80028007,
-	SCE_KERNEL_ERROR_WAIT_TIMEOUT		 = 0x80028008,
-	SCE_KERNEL_ERROR_NOTIFY_CALLBACK	 = 0x80028009,
-	SCE_KERNEL_ERROR_WAIT_DELETE		 = 0x8002800A,
-	SCE_KERNEL_ERROR_ILLEGAL_ATTR		 = 0x8002800B,
-	SCE_KERNEL_ERROR_EVF_MULTI			 = 0x8002800C,
-	SCE_KERNEL_ERROR_WAIT_CANCEL		 = 0x8002800D,
-	SCE_KERNEL_ERROR_EVF_COND			 = 0x8002800E,
-	SCE_KERNEL_ERROR_ILLEGAL_COUNT		 = 0x8002800F,
-	SCE_KERNEL_ERROR_ILLEGAL_PRIORITY	 = 0x80028010,
-	SCE_KERNEL_ERROR_MUTEX_RECURSIVE	 = 0x80028011,
-	SCE_KERNEL_ERROR_MUTEX_LOCK_OVF		 = 0x80028012,
-	SCE_KERNEL_ERROR_MUTEX_NOT_OWNED	 = 0x80028013,
-	SCE_KERNEL_ERROR_MUTEX_UNLOCK_UDF	 = 0x80028014,
-	SCE_KERNEL_ERROR_MUTEX_FAILED_TO_OWN = 0x80028015,
-	SCE_KERNEL_ERROR_FAST_MUTEX_RECURSIVE = 0x80028016,
-	SCE_KERNEL_ERROR_FAST_MUTEX_LOCK_OVF = 0x80028017,
-	SCE_KERNEL_ERROR_FAST_MUTEX_FAILED_TO_OWN = 0x80028018,
-	SCE_KERNEL_ERROR_FAST_MUTEX_NOT_OWNED = 0x80028019,
-	SCE_KERNEL_ERROR_FAST_MUTEX_OWNED	 = 0x8002801A,
-	SCE_KERNEL_ERROR_ALARM_CAN_NOT_CANCEL = 0x8002801B,
-	SCE_KERNEL_ERROR_INVALID_OBJECT_TYPE = 0x8002801C,
-	SCE_KERNEL_ERROR_KERNEL_TLS_FULL	 = 0x8002801D,
-	SCE_KERNEL_ERROR_ILLEGAL_KERNEL_TLS_INDEX = 0x8002801E,
-	SCE_KERNEL_ERROR_KERNEL_TLS_BUSY	 = 0x8002801F,
-	SCE_KERNEL_ERROR_DIFFERENT_UID_CLASS = 0x80028020,
-	SCE_KERNEL_ERROR_UNKNOWN_UID		 = 0x80028021,
-	SCE_KERNEL_ERROR_SEMA_ZERO			 = 0x80028022,
-	SCE_KERNEL_ERROR_SEMA_OVF			 = 0x80028023,
-	SCE_KERNEL_ERROR_PMON_NOT_THREAD_MODE = 0x80028024,
-	SCE_KERNEL_ERROR_PMON_NOT_CPU_MODE	 = 0x80028025,
-	SCE_KERNEL_ERROR_ALREADY_REGISTERED	 = 0x80028026,
-	SCE_KERNEL_ERROR_INVALID_THREAD_ID	 = 0x80028027,
-	SCE_KERNEL_ERROR_ALREADY_DEBUG_SUSPENDED = 0x80028028,
-	SCE_KERNEL_ERROR_NOT_DEBUG_SUSPENDED = 0x80028029,
-	SCE_KERNEL_ERROR_CAN_NOT_USE_VFP	 = 0x8002802A,
-	SCE_KERNEL_ERROR_RUNNING			 = 0x8002802B,
-	SCE_KERNEL_ERROR_EVENT_COND			 = 0x8002802C,
-	SCE_KERNEL_ERROR_MSG_PIPE_FULL		 = 0x8002802D,
-	SCE_KERNEL_ERROR_MSG_PIPE_EMPTY		 = 0x8002802E,
-	SCE_KERNEL_ERROR_ALREADY_SENT		 = 0x8002802F,
-	SCE_KERNEL_ERROR_CAN_NOT_SUSPEND	 = 0x80028030,
-	SCE_KERNEL_ERROR_FAST_MUTEX_ALREADY_INITIALIZED = 0x80028031,
-	SCE_KERNEL_ERROR_FAST_MUTEX_NOT_INITIALIZED = 0x80028032,
-	SCE_KERNEL_ERROR_THREAD_STOPPED		 = 0x80028033,
-	SCE_KERNEL_ERROR_THREAD_SUSPENDED	 = 0x80028034,
-	SCE_KERNEL_ERROR_NOT_SUSPENDED		 = 0x80028035,
-	SCE_KERNEL_ERROR_WAIT_DELETE_MUTEX	 = 0x80028036,
-	SCE_KERNEL_ERROR_WAIT_CANCEL_MUTEX	 = 0x80028037,
-	SCE_KERNEL_ERROR_WAIT_DELETE_COND	 = 0x80028038,
-	SCE_KERNEL_ERROR_WAIT_CANCEL_COND	 = 0x80028039,
-	SCE_KERNEL_ERROR_LW_MUTEX_NOT_OWNED	 = 0x8002803A,
-	SCE_KERNEL_ERROR_LW_MUTEX_LOCK_OVF	 = 0x8002803B,
-	SCE_KERNEL_ERROR_LW_MUTEX_UNLOCK_UDF = 0x8002803C,
-	SCE_KERNEL_ERROR_LW_MUTEX_RECURSIVE	 = 0x8002803D,
-	SCE_KERNEL_ERROR_LW_MUTEX_FAILED_TO_OWN = 0x8002803E,
-	SCE_KERNEL_ERROR_WAIT_DELETE_LW_MUTEX = 0x8002803F,
-	SCE_KERNEL_ERROR_ILLEGAL_STACK_SIZE	 = 0x80028040,
-	SCE_KERNEL_ERROR_RW_LOCK_RECURSIVE = 0x80028041,
-	SCE_KERNEL_ERROR_RW_LOCK_LOCK_OVF	 = 0x80028042,
-	SCE_KERNEL_ERROR_RW_LOCK_NOT_OWNED = 0x80028043,
-	SCE_KERNEL_ERROR_RW_LOCK_UNLOCK_UDF	 = 0x80028044,
-	SCE_KERNEL_ERROR_RW_LOCK_FAILED_TO_LOCK = 0x80028045,
-	SCE_KERNEL_ERROR_RW_LOCK_FAILED_TO_UNLOCK = 0x80028046,
-
-	SCE_KERNEL_ERROR_PROCESSMGR_ERROR	 = 0x80029000,
-	SCE_KERNEL_ERROR_INVALID_PID		 = 0x80029001,
-	SCE_KERNEL_ERROR_INVALID_PROCESS_TYPE = 0x80029002,
-	SCE_KERNEL_ERROR_PLS_FULL			 = 0x80029003,
-	SCE_KERNEL_ERROR_INVALID_PROCESS_STATUS = 0x80029004,
-	SCE_KERNEL_ERROR_INVALID_BUDGET_ID	 = 0x80029005,
-	SCE_KERNEL_ERROR_INVALID_BUDGET_SIZE = 0x80029006,
-	SCE_KERNEL_ERROR_CP14_DISABLED		 = 0x80029007,
-	SCE_KERNEL_ERROR_EXCEEDED_MAX_PROCESSES = 0x80029008,
-	SCE_KERNEL_ERROR_PROCESS_REMAINING	 = 0x80029009,
-	SCE_KERNEL_ERROR_IOFILEMGR_ERROR	 = 0x8002A000,
-	SCE_KERNEL_ERROR_IO_NAME_TOO_LONG	 = 0x8002A001,
-	SCE_KERNEL_ERROR_IO_REG_DEV			 = 0x8002A002,
-	SCE_KERNEL_ERROR_IO_ALIAS_USED		 = 0x8002A003,
-	SCE_KERNEL_ERROR_IO_DEL_DEV			 = 0x8002A004,
-	SCE_KERNEL_ERROR_IO_WOULD_BLOCK		 = 0x8002A005,
-	SCE_KERNEL_ERROR_MODULEMGR_START_FAILED = 0x8002D000,
-	SCE_KERNEL_ERROR_MODULEMGR_STOP_FAIL = 0x8002D001,
-	SCE_KERNEL_ERROR_MODULEMGR_IN_USE	 = 0x8002D002,
-	SCE_KERNEL_ERROR_MODULEMGR_NO_LIB	 = 0x8002D003,
-	SCE_KERNEL_ERROR_MODULEMGR_SYSCALL_REG = 0x8002D004,
-	SCE_KERNEL_ERROR_MODULEMGR_NOMEM_LIB = 0x8002D005,
-	SCE_KERNEL_ERROR_MODULEMGR_NOMEM_STUB = 0x8002D006,
-	SCE_KERNEL_ERROR_MODULEMGR_NOMEM_SELF = 0x8002D007,
-	SCE_KERNEL_ERROR_MODULEMGR_NOMEM	 = 0x8002D008,
-	SCE_KERNEL_ERROR_MODULEMGR_INVALID_LIB = 0x8002D009,
-	SCE_KERNEL_ERROR_MODULEMGR_INVALID_STUB = 0x8002D00A,
-	SCE_KERNEL_ERROR_MODULEMGR_NO_FUNC_NID = 0x8002D00B,
-	SCE_KERNEL_ERROR_MODULEMGR_NO_VAR_NID = 0x8002D00C,
-	SCE_KERNEL_ERROR_MODULEMGR_INVALID_TYPE = 0x8002D00D,
-	SCE_KERNEL_ERROR_MODULEMGR_NO_MOD_ENTRY = 0x8002D00E,
-	SCE_KERNEL_ERROR_MODULEMGR_INVALID_PROC_PARAM = 0x8002D00F,
-	SCE_KERNEL_ERROR_MODULEMGR_NO_MODOBJ = 0x8002D010,
-	SCE_KERNEL_ERROR_MODULEMGR_NO_MOD	 = 0x8002D011,
-	SCE_KERNEL_ERROR_MODULEMGR_NO_PROCESS = 0x8002D012,
-	SCE_KERNEL_ERROR_MODULEMGR_OLD_LIB	 = 0x8002D013,
-	SCE_KERNEL_ERROR_MODULEMGR_STARTED	 = 0x8002D014,
-	SCE_KERNEL_ERROR_MODULEMGR_NOT_STARTED = 0x8002D015,
-	SCE_KERNEL_ERROR_MODULEMGR_NOT_STOPPED = 0x8002D016,
-	SCE_KERNEL_ERROR_MODULEMGR_INVALID_PROCESS_UID = 0x8002D017,
-	SCE_KERNEL_ERROR_MODULEMGR_CANNOT_EXPORT_LIB_TO_SHARED = 0x8002D018,
-	SCE_KERNEL_ERROR_MODULEMGR_INVALID_REL_INFO = 0x8002D019,
-	SCE_KERNEL_ERROR_MODULEMGR_INVALID_REF_INFO = 0x8002D01A,
-	SCE_KERNEL_ERROR_MODULEMGR_ELINK	 = 0x8002D01B,
-	SCE_KERNEL_ERROR_MODULEMGR_NOENT	 = 0x8002D01C,
-	SCE_KERNEL_ERROR_MODULEMGR_BUSY		 = 0x8002D01D,
-	SCE_KERNEL_ERROR_MODULEMGR_NOEXEC	 = 0x8002D01E,
-	SCE_KERNEL_ERROR_MODULEMGR_NAMETOOLONG = 0x8002D01F,
-	SCE_KERNEL_ERROR_LIBRARYDB_NOENT	 = 0x8002D080,
-	SCE_KERNEL_ERROR_LIBRARYDB_NO_LIB	 = 0x8002D081,
-	SCE_KERNEL_ERROR_LIBRARYDB_NO_MOD	 = 0x8002D082,
-	SCE_KERNEL_ERROR_AUTHFAIL			 = 0x8002F000,
-	SCE_KERNEL_ERROR_NO_AUTH			 = 0x8002F001,
-};
-
-struct SceDateTime
-{
-	u16 year;
-	u16 month;
-	u16 day;
-	u16 hour;
-	u16 minute;
-	u16 second;
-	u32 microsecond;
-};
-
+// Abstract HLE function caller base class
 class psv_func_caller
 {
 public:
@@ -428,6 +41,7 @@ public:
 	virtual ~psv_func_caller(){};
 };
 
+// Utilities for binding ARMv7Context to C++ function arguments received by HLE functions or sent to callbacks
 namespace psv_func_detail
 {
 	enum bind_arg_type
@@ -532,7 +146,7 @@ namespace psv_func_detail
 		__forceinline static T get_arg(ARMv7Context& context)
 		{
 			// TODO: check
-			return cast_from_armv7_gpr<T>(context.get_stack_arg(g_count));
+			return cast_from_armv7_gpr<T>(vm::psv::read32(context.SP + sizeof(u32) * (g_count - 5)));
 		}
 
 		__forceinline static void put_arg(ARMv7Context& context, const T& arg)
@@ -541,7 +155,45 @@ namespace psv_func_detail
 			const int stack_pos = (g_count - 5) * 4 - FIXED_STACK_FRAME_SIZE;
 			static_assert(stack_pos < 0, "TODO: Increase fixed stack frame size (arg count limit broken)");
 
-			context.put_stack_arg(stack_pos, cast_to_armv7_gpr<T>(arg));
+			vm::psv::write32(context.SP + stack_pos, cast_to_armv7_gpr<T>(arg));
+		}
+	};
+
+	template<int g_count, int f_count, int v_count>
+	struct bind_arg<u64, ARG_STACK, g_count, f_count, v_count>
+	{
+		__forceinline static u64 get_arg(ARMv7Context& context)
+		{
+			// TODO: check
+			return vm::psv::read64(context.SP + sizeof(u32) * (g_count - 5));
+		}
+
+		__forceinline static void put_arg(ARMv7Context& context, u64 arg)
+		{
+			// TODO: check
+			const int stack_pos = (g_count - 5) * 4 - FIXED_STACK_FRAME_SIZE;
+			static_assert(stack_pos < -4, "TODO: Increase fixed stack frame size (arg count limit broken)");
+
+			vm::psv::write64(context.SP + stack_pos, arg);
+		}
+	};
+
+	template<int g_count, int f_count, int v_count>
+	struct bind_arg<s64, ARG_STACK, g_count, f_count, v_count>
+	{
+		__forceinline static s64 get_arg(ARMv7Context& context)
+		{
+			// TODO: check
+			return vm::psv::read64(context.SP + sizeof(u32) * (g_count - 5));
+		}
+
+		__forceinline static void put_arg(ARMv7Context& context, s64 arg)
+		{
+			// TODO: check
+			const int stack_pos = (g_count - 5) * 4 - FIXED_STACK_FRAME_SIZE;
+			static_assert(stack_pos < -4, "TODO: Increase fixed stack frame size (arg count limit broken)");
+
+			vm::psv::write64(context.SP + stack_pos, arg);
 		}
 	};
 
@@ -630,14 +282,14 @@ namespace psv_func_detail
 		// TODO: check calculations
 		static const bool is_float = std::is_floating_point<T>::value;
 		static const bool is_vector = std::is_same<T, u128>::value;
-		static const bind_arg_type value = is_float
-			? ((f_count >= 4) ? ARG_STACK : ARG_FLOAT)
-			: (is_vector ? ((v_count >= 4) ? ARG_STACK : ARG_VECTOR): ((g_count >= 4) ? ARG_STACK : ARG_GENERAL));
 		static const int g_align = __alignof(T) > 4 ? __alignof(T) >> 2 : 1;
 		static const int g_pos = (is_float || is_vector) ? g_count : ((g_count + (g_align - 1)) & ~(g_align - 1)) + 1;
 		static const int g_next = g_pos + g_align - 1;
 		static const int f_value = !is_float ? f_count : f_count + 1;
 		static const int v_value = !is_vector ? v_count : v_count + 1;
+		static const bind_arg_type value = is_float
+			? ((f_value > 9000) ? ARG_STACK : ARG_FLOAT)
+			: (is_vector ? ((v_value > 9000) ? ARG_STACK : ARG_VECTOR) : ((g_pos > 4) ? ARG_STACK : ARG_GENERAL));
 	};
 
 	template <typename RT, typename F, typename Tuple, bool Done, int Total, int... N>
@@ -817,18 +469,19 @@ namespace psv_func_detail
 	};
 }
 
+// Basic information about the HLE function
 struct psv_func
 {
-	u32 nid;
-	const char* name;
-	std::shared_ptr<psv_func_caller> func;
-	psv_log_base* module;
+	u32 nid; // Unique function ID only for old PSV executables (should be generated individually for each elf loaded)
+	const char* name; // Function name for information
+	std::shared_ptr<psv_func_caller> func; // Function caller instance
+	psv_log_base* module; // Module for information
 };
 
+// Do not call directly
 void add_psv_func(psv_func& data);
-
-template<typename RT, typename... T>
-void reg_psv_func(u32 nid, psv_log_base* module, const char* name, RT(*func)(T...))
+// Do not call directly
+template<typename RT, typename... T> void reg_psv_func(u32 nid, psv_log_base* module, const char* name, RT(*func)(T...))
 {
 	psv_func f;
 	f.nid = nid;
@@ -838,10 +491,159 @@ void reg_psv_func(u32 nid, psv_log_base* module, const char* name, RT(*func)(T..
 
 	add_psv_func(f);
 }
-
+// Find registered HLE function by its ID
 psv_func* get_psv_func_by_nid(u32 nid);
+// Get index of registered HLE function
 u32 get_psv_func_index(psv_func* func);
-
+// Execute registered HLE function by its index
 void execute_psv_func_by_index(ARMv7Context& context, u32 index);
+// Register all HLE functions
 void initialize_psv_modules();
+// Unregister all HLE functions
 void finalize_psv_modules();
+
+// General definitions
+
+enum psv_error_codes
+{
+	SCE_OK = 0,
+
+	SCE_ERROR_ERRNO_EPERM = 0x80010001,
+	SCE_ERROR_ERRNO_ENOENT = 0x80010002,
+	SCE_ERROR_ERRNO_ESRCH = 0x80010003,
+	SCE_ERROR_ERRNO_EINTR = 0x80010004,
+	SCE_ERROR_ERRNO_EIO = 0x80010005,
+	SCE_ERROR_ERRNO_ENXIO = 0x80010006,
+	SCE_ERROR_ERRNO_E2BIG = 0x80010007,
+	SCE_ERROR_ERRNO_ENOEXEC = 0x80010008,
+	SCE_ERROR_ERRNO_EBADF = 0x80010009,
+	SCE_ERROR_ERRNO_ECHILD = 0x8001000A,
+	SCE_ERROR_ERRNO_EAGAIN = 0x8001000B,
+	SCE_ERROR_ERRNO_ENOMEM = 0x8001000C,
+	SCE_ERROR_ERRNO_EACCES = 0x8001000D,
+	SCE_ERROR_ERRNO_EFAULT = 0x8001000E,
+	SCE_ERROR_ERRNO_ENOTBLK = 0x8001000F,
+	SCE_ERROR_ERRNO_EBUSY = 0x80010010,
+	SCE_ERROR_ERRNO_EEXIST = 0x80010011,
+	SCE_ERROR_ERRNO_EXDEV = 0x80010012,
+	SCE_ERROR_ERRNO_ENODEV = 0x80010013,
+	SCE_ERROR_ERRNO_ENOTDIR = 0x80010014,
+	SCE_ERROR_ERRNO_EISDIR = 0x80010015,
+	SCE_ERROR_ERRNO_EINVAL = 0x80010016,
+	SCE_ERROR_ERRNO_ENFILE = 0x80010017,
+	SCE_ERROR_ERRNO_EMFILE = 0x80010018,
+	SCE_ERROR_ERRNO_ENOTTY = 0x80010019,
+	SCE_ERROR_ERRNO_ETXTBSY = 0x8001001A,
+	SCE_ERROR_ERRNO_EFBIG = 0x8001001B,
+	SCE_ERROR_ERRNO_ENOSPC = 0x8001001C,
+	SCE_ERROR_ERRNO_ESPIPE = 0x8001001D,
+	SCE_ERROR_ERRNO_EROFS = 0x8001001E,
+	SCE_ERROR_ERRNO_EMLINK = 0x8001001F,
+	SCE_ERROR_ERRNO_EPIPE = 0x80010020,
+	SCE_ERROR_ERRNO_EDOM = 0x80010021,
+	SCE_ERROR_ERRNO_ERANGE = 0x80010022,
+	SCE_ERROR_ERRNO_ENOMSG = 0x80010023,
+	SCE_ERROR_ERRNO_EIDRM = 0x80010024,
+	SCE_ERROR_ERRNO_ECHRNG = 0x80010025,
+	SCE_ERROR_ERRNO_EL2NSYNC = 0x80010026,
+	SCE_ERROR_ERRNO_EL3HLT = 0x80010027,
+	SCE_ERROR_ERRNO_EL3RST = 0x80010028,
+	SCE_ERROR_ERRNO_ELNRNG = 0x80010029,
+	SCE_ERROR_ERRNO_EUNATCH = 0x8001002A,
+	SCE_ERROR_ERRNO_ENOCSI = 0x8001002B,
+	SCE_ERROR_ERRNO_EL2HLT = 0x8001002C,
+	SCE_ERROR_ERRNO_EDEADLK = 0x8001002D,
+	SCE_ERROR_ERRNO_ENOLCK = 0x8001002E,
+	SCE_ERROR_ERRNO_EFORMAT = 0x8001002F,
+	SCE_ERROR_ERRNO_EUNSUP = 0x80010030,
+	SCE_ERROR_ERRNO_EBADE = 0x80010032,
+	SCE_ERROR_ERRNO_EBADR = 0x80010033,
+	SCE_ERROR_ERRNO_EXFULL = 0x80010034,
+	SCE_ERROR_ERRNO_ENOANO = 0x80010035,
+	SCE_ERROR_ERRNO_EBADRQC = 0x80010036,
+	SCE_ERROR_ERRNO_EBADSLT = 0x80010037,
+	SCE_ERROR_ERRNO_EDEADLOCK = 0x80010038,
+	SCE_ERROR_ERRNO_EBFONT = 0x80010039,
+	SCE_ERROR_ERRNO_ENOSTR = 0x8001003C,
+	SCE_ERROR_ERRNO_ENODATA = 0x8001003D,
+	SCE_ERROR_ERRNO_ETIME = 0x8001003E,
+	SCE_ERROR_ERRNO_ENOSR = 0x8001003F,
+	SCE_ERROR_ERRNO_ENONET = 0x80010040,
+	SCE_ERROR_ERRNO_ENOPKG = 0x80010041,
+	SCE_ERROR_ERRNO_EREMOTE = 0x80010042,
+	SCE_ERROR_ERRNO_ENOLINK = 0x80010043,
+	SCE_ERROR_ERRNO_EADV = 0x80010044,
+	SCE_ERROR_ERRNO_ESRMNT = 0x80010045,
+	SCE_ERROR_ERRNO_ECOMM = 0x80010046,
+	SCE_ERROR_ERRNO_EPROTO = 0x80010047,
+	SCE_ERROR_ERRNO_EMULTIHOP = 0x8001004A,
+	SCE_ERROR_ERRNO_ELBIN = 0x8001004B,
+	SCE_ERROR_ERRNO_EDOTDOT = 0x8001004C,
+	SCE_ERROR_ERRNO_EBADMSG = 0x8001004D,
+	SCE_ERROR_ERRNO_EFTYPE = 0x8001004F,
+	SCE_ERROR_ERRNO_ENOTUNIQ = 0x80010050,
+	SCE_ERROR_ERRNO_EBADFD = 0x80010051,
+	SCE_ERROR_ERRNO_EREMCHG = 0x80010052,
+	SCE_ERROR_ERRNO_ELIBACC = 0x80010053,
+	SCE_ERROR_ERRNO_ELIBBAD = 0x80010054,
+	SCE_ERROR_ERRNO_ELIBSCN = 0x80010055,
+	SCE_ERROR_ERRNO_ELIBMAX = 0x80010056,
+	SCE_ERROR_ERRNO_ELIBEXEC = 0x80010057,
+	SCE_ERROR_ERRNO_ENOSYS = 0x80010058,
+	SCE_ERROR_ERRNO_ENMFILE = 0x80010059,
+	SCE_ERROR_ERRNO_ENOTEMPTY = 0x8001005A,
+	SCE_ERROR_ERRNO_ENAMETOOLONG = 0x8001005B,
+	SCE_ERROR_ERRNO_ELOOP = 0x8001005C,
+	SCE_ERROR_ERRNO_EOPNOTSUPP = 0x8001005F,
+	SCE_ERROR_ERRNO_EPFNOSUPPORT = 0x80010060,
+	SCE_ERROR_ERRNO_ECONNRESET = 0x80010068,
+	SCE_ERROR_ERRNO_ENOBUFS = 0x80010069,
+	SCE_ERROR_ERRNO_EAFNOSUPPORT = 0x8001006A,
+	SCE_ERROR_ERRNO_EPROTOTYPE = 0x8001006B,
+	SCE_ERROR_ERRNO_ENOTSOCK = 0x8001006C,
+	SCE_ERROR_ERRNO_ENOPROTOOPT = 0x8001006D,
+	SCE_ERROR_ERRNO_ESHUTDOWN = 0x8001006E,
+	SCE_ERROR_ERRNO_ECONNREFUSED = 0x8001006F,
+	SCE_ERROR_ERRNO_EADDRINUSE = 0x80010070,
+	SCE_ERROR_ERRNO_ECONNABORTED = 0x80010071,
+	SCE_ERROR_ERRNO_ENETUNREACH = 0x80010072,
+	SCE_ERROR_ERRNO_ENETDOWN = 0x80010073,
+	SCE_ERROR_ERRNO_ETIMEDOUT = 0x80010074,
+	SCE_ERROR_ERRNO_EHOSTDOWN = 0x80010075,
+	SCE_ERROR_ERRNO_EHOSTUNREACH = 0x80010076,
+	SCE_ERROR_ERRNO_EINPROGRESS = 0x80010077,
+	SCE_ERROR_ERRNO_EALREADY = 0x80010078,
+	SCE_ERROR_ERRNO_EDESTADDRREQ = 0x80010079,
+	SCE_ERROR_ERRNO_EMSGSIZE = 0x8001007A,
+	SCE_ERROR_ERRNO_EPROTONOSUPPORT = 0x8001007B,
+	SCE_ERROR_ERRNO_ESOCKTNOSUPPORT = 0x8001007C,
+	SCE_ERROR_ERRNO_EADDRNOTAVAIL = 0x8001007D,
+	SCE_ERROR_ERRNO_ENETRESET = 0x8001007E,
+	SCE_ERROR_ERRNO_EISCONN = 0x8001007F,
+	SCE_ERROR_ERRNO_ENOTCONN = 0x80010080,
+	SCE_ERROR_ERRNO_ETOOMANYREFS = 0x80010081,
+	SCE_ERROR_ERRNO_EPROCLIM = 0x80010082,
+	SCE_ERROR_ERRNO_EUSERS = 0x80010083,
+	SCE_ERROR_ERRNO_EDQUOT = 0x80010084,
+	SCE_ERROR_ERRNO_ESTALE = 0x80010085,
+	SCE_ERROR_ERRNO_ENOTSUP = 0x80010086,
+	SCE_ERROR_ERRNO_ENOMEDIUM = 0x80010087,
+	SCE_ERROR_ERRNO_ENOSHARE = 0x80010088,
+	SCE_ERROR_ERRNO_ECASECLASH = 0x80010089,
+	SCE_ERROR_ERRNO_EILSEQ = 0x8001008A,
+	SCE_ERROR_ERRNO_EOVERFLOW = 0x8001008B,
+	SCE_ERROR_ERRNO_ECANCELED = 0x8001008C,
+	SCE_ERROR_ERRNO_ENOTRECOVERABLE = 0x8001008D,
+	SCE_ERROR_ERRNO_EOWNERDEAD = 0x8001008E,
+};
+
+struct SceDateTime
+{
+	u16 year;
+	u16 month;
+	u16 day;
+	u16 hour;
+	u16 minute;
+	u16 second;
+	u32 microsecond;
+};

From 6d1c9f2764aa732d923ee4c2faefdca724facac5 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Sun, 25 Jan 2015 19:23:24 +0300
Subject: [PATCH 34/70] Some warnings fixed

---
 Utilities/rFile.cpp                       |  1 +
 Utilities/rMsgBox.cpp                     |  1 +
 Utilities/rPlatform.cpp                   |  1 +
 Utilities/rTime.cpp                       |  2 +-
 rpcs3/Crypto/unpkg.cpp                    |  1 +
 rpcs3/Crypto/unself.cpp                   |  2 +-
 rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp |  4 ++--
 rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h   |  5 ++---
 rpcs3/Emu/CPU/CPUDecoder.h                |  1 -
 rpcs3/Emu/FS/VFS.cpp                      |  4 ++--
 rpcs3/Emu/FS/vfsStreamMemory.cpp          | 20 ++++++++++----------
 rpcs3/Emu/FS/vfsStreamMemory.h            |  6 +++---
 rpcs3/stdafx.h                            |  2 ++
 13 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/Utilities/rFile.cpp b/Utilities/rFile.cpp
index e6f657d39e..39fa91eceb 100644
--- a/Utilities/rFile.cpp
+++ b/Utilities/rFile.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "Log.h"
+#pragma warning(disable : 4996)
 #include <wx/dir.h>
 #include <wx/file.h>
 #include <wx/filename.h>
diff --git a/Utilities/rMsgBox.cpp b/Utilities/rMsgBox.cpp
index cd3a46be0d..cf4c027096 100644
--- a/Utilities/rMsgBox.cpp
+++ b/Utilities/rMsgBox.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "restore_new.h"
+#pragma warning(disable : 4996)
 #include <wx/msgdlg.h>
 #include "define_new_memleakdetect.h"
 #include "rMsgBox.h"
diff --git a/Utilities/rPlatform.cpp b/Utilities/rPlatform.cpp
index a947b7a00f..57a32e1425 100644
--- a/Utilities/rPlatform.cpp
+++ b/Utilities/rPlatform.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "restore_new.h"
+#pragma warning(disable : 4996)
 #include <wx/image.h>
 #include "define_new_memleakdetect.h"
 
diff --git a/Utilities/rTime.cpp b/Utilities/rTime.cpp
index fccb0ac7df..194394317c 100644
--- a/Utilities/rTime.cpp
+++ b/Utilities/rTime.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "rTime.h"
-
+#pragma warning(disable : 4996)
 #include <wx/datetime.h>
 
 std::string rDefaultDateTimeFormat = "%c";
diff --git a/rpcs3/Crypto/unpkg.cpp b/rpcs3/Crypto/unpkg.cpp
index 65e1d3e394..b4d18eb92d 100644
--- a/rpcs3/Crypto/unpkg.cpp
+++ b/rpcs3/Crypto/unpkg.cpp
@@ -5,6 +5,7 @@
 #include "key_vault.h"
 #include "unpkg.h"
 #include "restore_new.h"
+#pragma warning(disable : 4996)
 #include <wx/progdlg.h>
 #include "define_new_memleakdetect.h"
 
diff --git a/rpcs3/Crypto/unself.cpp b/rpcs3/Crypto/unself.cpp
index 28b464c100..954f29eb22 100644
--- a/rpcs3/Crypto/unself.cpp
+++ b/rpcs3/Crypto/unself.cpp
@@ -6,7 +6,7 @@
 #include "utils.h"
 #include "Emu/FS/vfsLocalFile.h"
 #include "unself.h"
-
+#pragma warning(disable : 4996)
 #include <wx/mstream.h>
 #include <wx/zstream.h>
 
diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp
index e8155b89a3..adcb26a2a6 100644
--- a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp
+++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.cpp
@@ -15,7 +15,7 @@ void XAudio2Thread::Init()
 {
 	HRESULT hr = S_OK;
 
-#if (_WIN32_WINNT < 0x0602)
+#if (FORCED_WINVER < 0x0602)
 	hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 	if (FAILED(hr))
 	{
@@ -53,7 +53,7 @@ void XAudio2Thread::Quit()
 	m_xaudio2_instance->Release();
 	m_xaudio2_instance = nullptr;
 
-#if (_WIN32_WINNT < 0x0602)
+#if (FORCED_WINVER < 0x0602)
 	CoUninitialize();
 #endif
 }
diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h
index 3a362714ad..3771f7bd3e 100644
--- a/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h
+++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h
@@ -4,10 +4,9 @@
 #if defined (_WIN32)
 
 // forced define Win7, delete this for using XAudio2 2.8
-#define WINVER 0x0601
-#define _WIN32_WINNT 0x0601
+#define FORCED_WINVER 0x0601
 
-#if (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/)
+#if (FORCED_WINVER >= 0x0602 /*_WIN32_WINNT_WIN8*/)
 #include <xaudio2.h>
 #pragma comment(lib,"xaudio2.lib")
 #else
diff --git a/rpcs3/Emu/CPU/CPUDecoder.h b/rpcs3/Emu/CPU/CPUDecoder.h
index 0a0aea1e0c..68f21cf542 100644
--- a/rpcs3/Emu/CPU/CPUDecoder.h
+++ b/rpcs3/Emu/CPU/CPUDecoder.h
@@ -1,6 +1,5 @@
 #pragma once
 #include "CPUInstrTable.h"
-#pragma warning( disable : 4800 )
 
 class CPUDecoder
 {
diff --git a/rpcs3/Emu/FS/VFS.cpp b/rpcs3/Emu/FS/VFS.cpp
index f65cfbdcb2..11feecb3ef 100644
--- a/rpcs3/Emu/FS/VFS.cpp
+++ b/rpcs3/Emu/FS/VFS.cpp
@@ -325,7 +325,7 @@ vfsDevice* VFS::GetDevice(const std::string& ps3_path, std::string& path) const
 
 		path = m_devices[max_i]->GetLocalPath();
 
-		for (u32 i = max_eq; i < ps3_path_blocks.size(); i++)
+		for (size_t i = max_eq; i < ps3_path_blocks.size(); i++)
 		{
 			path += "/" + ps3_path_blocks[i];
 		}
@@ -382,7 +382,7 @@ vfsDevice* VFS::GetDeviceLocal(const std::string& local_path, std::string& path)
 
 	path = m_devices[max_i]->GetPs3Path();
 
-	for (u32 i = max_eq; i < local_path_blocks.size(); i++)
+	for (size_t i = max_eq; i < local_path_blocks.size(); i++)
 	{
 		path += "/" + local_path_blocks[i];
 	}
diff --git a/rpcs3/Emu/FS/vfsStreamMemory.cpp b/rpcs3/Emu/FS/vfsStreamMemory.cpp
index f385a4ecb3..5ce30c3a7c 100644
--- a/rpcs3/Emu/FS/vfsStreamMemory.cpp
+++ b/rpcs3/Emu/FS/vfsStreamMemory.cpp
@@ -6,15 +6,15 @@ vfsStreamMemory::vfsStreamMemory() : vfsStream()
 {
 }
 
-vfsStreamMemory::vfsStreamMemory(u64 addr, u64 size) : vfsStream()
+vfsStreamMemory::vfsStreamMemory(u32 addr, u32 size) : vfsStream()
 {
 	Open(addr, size);
 }
 
-void vfsStreamMemory::Open(u64 addr, u64 size)
+void vfsStreamMemory::Open(u32 addr, u32 size)
 {
 	m_addr = addr;
-	m_size = size ? size : ~0ULL;
+	m_size = size ? size : 0x100000000ull - addr; // determine max possible size
 
 	vfsStream::Reset();
 }
@@ -26,24 +26,24 @@ u64 vfsStreamMemory::GetSize()
 
 u64 vfsStreamMemory::Write(const void* src, u64 size)
 {
-	if(Tell() + size > GetSize())
+	assert(Tell() < m_size);
+	if (Tell() + size > m_size)
 	{
-		size = GetSize() - Tell();
+		size = m_size - Tell();
 	}
 
-	memcpy(vm::get_ptr<void>(m_addr + Tell()), src, size);
-
+	memcpy(vm::get_ptr<void>(vm::cast(m_addr + Tell())), src, size);
 	return vfsStream::Write(src, size);
 }
 
 u64 vfsStreamMemory::Read(void* dst, u64 size)
 {
-	if(Tell() + size > GetSize())
+	assert(Tell() < GetSize());
+	if (Tell() + size > GetSize())
 	{
 		size = GetSize() - Tell();
 	}
 
-	memcpy(dst, vm::get_ptr<void>(m_addr + Tell()), size);
-
+	memcpy(dst, vm::get_ptr<void>(vm::cast(m_addr + Tell())), size);
 	return vfsStream::Read(dst, size);
 }
diff --git a/rpcs3/Emu/FS/vfsStreamMemory.h b/rpcs3/Emu/FS/vfsStreamMemory.h
index 00cb675013..1e3e06a73b 100644
--- a/rpcs3/Emu/FS/vfsStreamMemory.h
+++ b/rpcs3/Emu/FS/vfsStreamMemory.h
@@ -3,14 +3,14 @@
 
 struct vfsStreamMemory : public vfsStream
 {
-	u64 m_addr;
+	u32 m_addr;
 	u64 m_size;
 
 public:
 	vfsStreamMemory();
-	vfsStreamMemory(u64 addr, u64 size = 0);
+	vfsStreamMemory(u32 addr, u32 size = 0);
 
-	void Open(u64 addr, u64 size = 0);
+	void Open(u32 addr, u32 size = 0);
 
 	virtual u64 GetSize() override;
 
diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h
index 825c1c4007..66792d0ea4 100644
--- a/rpcs3/stdafx.h
+++ b/rpcs3/stdafx.h
@@ -14,6 +14,8 @@
 #endif
 
 // This header should be frontend-agnostic, so don't assume wx includes everything
+#pragma warning( disable : 4800 )
+
 #include <cstdio>
 #include <cstring>
 #include <cassert>

From 93504762632b7152029d44ba3a9d001b4b480f96 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Mon, 26 Jan 2015 01:38:50 +0300
Subject: [PATCH 35/70] psv_object_list_t template concept

---
 rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp |  8 ++
 rpcs3/Emu/ARMv7/Modules/psv_sema_object.h   | 11 +++
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp    | 15 +++-
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.h      | 14 +++
 rpcs3/Emu/ARMv7/PSVObjectList.cpp           |  3 +
 rpcs3/Emu/ARMv7/PSVObjectList.h             | 96 +++++++++++++++++++++
 rpcs3/emucore.vcxproj                       |  4 +
 rpcs3/emucore.vcxproj.filters               | 15 ++++
 8 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/psv_sema_object.h
 create mode 100644 rpcs3/Emu/ARMv7/PSVObjectList.cpp
 create mode 100644 rpcs3/Emu/ARMv7/PSVObjectList.h

diff --git a/rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp b/rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp
new file mode 100644
index 0000000000..4e6046bd25
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp
@@ -0,0 +1,8 @@
+#include "stdafx.h"
+#include "Emu/Memory/Memory.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+#include "Emu/ARMv7/PSVObjectList.h"
+#include "sceLibKernel.h"
+#include "psv_sema_object.h"
+
+psv_object_list_t<psv_sema_t, SCE_KERNEL_THREADMGR_UID_CLASS_SEMA> g_psv_sema_list;
diff --git a/rpcs3/Emu/ARMv7/Modules/psv_sema_object.h b/rpcs3/Emu/ARMv7/Modules/psv_sema_object.h
new file mode 100644
index 0000000000..ee643cab4c
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/psv_sema_object.h
@@ -0,0 +1,11 @@
+#pragma once
+
+struct psv_sema_t
+{
+	char name[32];
+	u32 attr;
+	s32 initCount;
+	s32 maxCount;
+};
+
+extern psv_object_list_t<psv_sema_t, SCE_KERNEL_THREADMGR_UID_CLASS_SEMA> g_psv_sema_list;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index ac2600dc4b..fd852feae7 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -1,12 +1,14 @@
 #include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
+#include "Emu/ARMv7/PSVObjectList.h"
 
 #include "Emu/CPU/CPUThreadManager.h"
 #include "Emu/SysCalls/Callback.h"
 #include "Emu/ARMv7/ARMv7Thread.h"
 
 #include "sceLibKernel.h"
+#include "psv_sema_object.h"
 
 #define RETURN_ERROR(code) { Emu.Pause(); sceLibKernel.Error("%s() failed: %s", __FUNCTION__, #code); return code; }
 
@@ -450,7 +452,18 @@ s32 sceKernelCreateSema(vm::psv::ptr<const 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);
 
-	throw __FUNCTION__;
+	std::shared_ptr<psv_sema_t> sema(new psv_sema_t);
+
+	strcpy_trunc(sema->name, pName.get_ptr());
+	sema->attr = attr;
+	sema->initCount = initCount;
+	sema->maxCount = maxCount;
+
+	const s32 id = g_psv_sema_list.add(sema);
+
+	sceLibKernel.Error("*** semaphore created -> id=0x%x", id);
+
+	return id;
 }
 
 s32 sceKernelDeleteSema(s32 semaId)
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
index dca20547c1..186c470b1c 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
@@ -251,6 +251,20 @@ enum
 	SCE_KERNEL_ERROR_NO_AUTH = 0x8002F001,
 };
 
+enum psv_object_class_t : u32
+{
+	SCE_KERNEL_UID_CLASS_PROCESS = 0,
+	SCE_KERNEL_THREADMGR_UID_CLASS_THREAD = 1,
+	SCE_KERNEL_THREADMGR_UID_CLASS_SEMA = 2,
+	SCE_KERNEL_THREADMGR_UID_CLASS_EVENT_FLAG = 3,
+	SCE_KERNEL_THREADMGR_UID_CLASS_MUTEX = 4,
+	SCE_KERNEL_THREADMGR_UID_CLASS_COND = 5,
+	SCE_KERNEL_THREADMGR_UID_CLASS_TIMER = 6,
+	SCE_KERNEL_THREADMGR_UID_CLASS_MSG_PIPE = 7,
+	SCE_KERNEL_THREADMGR_UID_CLASS_CALLBACK = 8,
+	SCE_KERNEL_THREADMGR_UID_CLASS_THREAD_EVENT = 9,
+};
+
 union SceKernelSysClock
 {
 	struct
diff --git a/rpcs3/Emu/ARMv7/PSVObjectList.cpp b/rpcs3/Emu/ARMv7/PSVObjectList.cpp
new file mode 100644
index 0000000000..d9cb43aeef
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/PSVObjectList.cpp
@@ -0,0 +1,3 @@
+#include "stdafx.h"
+#include "PSVObjectList.h"
+
diff --git a/rpcs3/Emu/ARMv7/PSVObjectList.h b/rpcs3/Emu/ARMv7/PSVObjectList.h
new file mode 100644
index 0000000000..16d026f21e
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/PSVObjectList.h
@@ -0,0 +1,96 @@
+#pragma once
+
+union uid_t
+{
+	// true UID format is partially unknown
+	s32 uid;
+
+	struct
+	{
+		u32 oddness : 1; // always 1 for UIDs (to not mess it up with addresses)
+		u32 number : 15; // ID from 0 to 2^15-1
+		u32 type : 15; // UID class (psv_object_class_t)
+		u32 sign : 1; // UIDs are positive, error codes are negative
+	};
+
+	static uid_t make(s32 uid)
+	{
+		uid_t result;
+		result.uid = uid;
+		return result;
+	}
+};
+
+template<typename T, u32 type>
+class psv_object_list_t // Class for managing object data
+{
+	std::array<std::shared_ptr<T>, 0x8000> m_data;
+
+public:
+	static const u32 uid_class = type;
+
+	// check if UID is potentially valid (will return true if the object doesn't exist)
+	bool check(s32 uid)
+	{
+		const uid_t id = uid_t::make(uid);
+
+		// check sign bit, uid class and ensure that value is odd
+		return !id.sign && id.type == uid_class && id.oddness == 1;
+	}
+
+	// share object with UID specified (will return empty pointer if the object doesn't exist or the UID is invalid)
+	std::shared_ptr<T> find(s32 uid)
+	{
+		if (!check(uid))
+		{
+			return nullptr;
+		}
+
+		return m_data[uid_t::make(uid).number];
+	}
+
+	std::shared_ptr<T> operator [](s32 uid)
+	{
+		return find(uid);
+	}
+
+	// generate UID for newly created object (will return zero if the limit exceeded)
+	s32 add(std::shared_ptr<T>& data)
+	{
+		for (auto& value : m_data)
+		{
+			// find an empty position and move the pointer
+			std::shared_ptr<T> old_ptr = nullptr;
+			if (std::atomic_compare_exchange_strong(&value, &old_ptr, data))
+			{
+				uid_t id = uid_t::make(1); // odd number
+				id.type = uid_class; // set type
+				id.number = &value - m_data.data(); // set position
+				return id.uid;
+			}
+		}
+
+		return 0;
+	}
+
+	// remove object with UID specified and share it for the last time (will return empty pointer if the object doesn't exists or the UID is invalid)
+	std::shared_ptr<T> remove(s32 uid)
+	{
+		if (!check(uid))
+		{
+			return nullptr;
+		}
+
+		return std::atomic_exchange(&m_data[uid_t::make(uid).number], nullptr);
+	}
+
+	// remove all objects
+	void clear()
+	{
+		for (auto& value : m_data)
+		{
+			value = nullptr;
+		}
+	}
+};
+
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 4b4a2d6539..da233b2c30 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -56,11 +56,13 @@
     <ClCompile Include="Emu\ARMv7\ARMv7DisAsm.cpp" />
     <ClCompile Include="Emu\ARMv7\ARMv7Interpreter.cpp" />
     <ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\psv_sema_object.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibKernel.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibc.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibm.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibstdcxx.cpp" />
     <ClCompile Include="Emu\ARMv7\PSVFuncList.cpp" />
+    <ClCompile Include="Emu\ARMv7\PSVObjectList.cpp" />
     <ClCompile Include="Emu\Audio\AL\OpenALThread.cpp" />
     <ClCompile Include="Emu\Audio\AudioDumper.cpp" />
     <ClCompile Include="Emu\Audio\AudioManager.cpp" />
@@ -274,8 +276,10 @@
     <ClInclude Include="Emu\ARMv7\ARMv7Interpreter.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7Opcodes.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7Thread.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\psv_sema_object.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h" />
     <ClInclude Include="Emu\ARMv7\PSVFuncList.h" />
+    <ClInclude Include="Emu\ARMv7\PSVObjectList.h" />
     <ClInclude Include="Emu\Audio\AL\OpenALThread.h" />
     <ClInclude Include="Emu\Audio\AudioDumper.h" />
     <ClInclude Include="Emu\Audio\AudioManager.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index fdd71b410a..887600c974 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -87,6 +87,9 @@
     <Filter Include="Emu\Audio\XAudio2">
       <UniqueIdentifier>{1d6abf72-0f18-43ec-9351-1fed1a3d1a1e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Emu\CPU\ARMv7\Thread Manager">
+      <UniqueIdentifier>{368770cf-c8d9-4f4a-9ac3-5bdf48101ffe}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Crypto\aes.cpp">
@@ -665,6 +668,12 @@
     <ClCompile Include="Emu\ARMv7\ARMv7Decoder.cpp">
       <Filter>Emu\CPU\ARMv7</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\psv_sema_object.cpp">
+      <Filter>Emu\CPU\ARMv7\Thread Manager</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\PSVObjectList.cpp">
+      <Filter>Emu\CPU\ARMv7</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">
@@ -1294,5 +1303,11 @@
     <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h">
       <Filter>Emu\CPU\ARMv7\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\ARMv7\Modules\psv_sema_object.h">
+      <Filter>Emu\CPU\ARMv7\Thread Manager</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\ARMv7\PSVObjectList.h">
+      <Filter>Emu\CPU\ARMv7</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 12c13e619321365c66067cf545dcc143704efd5b Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Mon, 26 Jan 2015 09:13:11 +0300
Subject: [PATCH 36/70] Fix

---
 rpcs3/Emu/ARMv7/PSVObjectList.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/PSVObjectList.h b/rpcs3/Emu/ARMv7/PSVObjectList.h
index 16d026f21e..5fb6b5da93 100644
--- a/rpcs3/Emu/ARMv7/PSVObjectList.h
+++ b/rpcs3/Emu/ARMv7/PSVObjectList.h
@@ -1,6 +1,6 @@
 #pragma once
 
-union uid_t
+union psv_uid_t
 {
 	// true UID format is partially unknown
 	s32 uid;
@@ -13,9 +13,9 @@ union uid_t
 		u32 sign : 1; // UIDs are positive, error codes are negative
 	};
 
-	static uid_t make(s32 uid)
+	static psv_uid_t make(s32 uid)
 	{
-		uid_t result;
+		psv_uid_t result;
 		result.uid = uid;
 		return result;
 	}
@@ -32,7 +32,7 @@ public:
 	// check if UID is potentially valid (will return true if the object doesn't exist)
 	bool check(s32 uid)
 	{
-		const uid_t id = uid_t::make(uid);
+		const psv_uid_t id = psv_uid_t::make(uid);
 
 		// check sign bit, uid class and ensure that value is odd
 		return !id.sign && id.type == uid_class && id.oddness == 1;
@@ -46,7 +46,7 @@ public:
 			return nullptr;
 		}
 
-		return m_data[uid_t::make(uid).number];
+		return m_data[psv_uid_t::make(uid).number];
 	}
 
 	std::shared_ptr<T> operator [](s32 uid)
@@ -63,7 +63,7 @@ public:
 			std::shared_ptr<T> old_ptr = nullptr;
 			if (std::atomic_compare_exchange_strong(&value, &old_ptr, data))
 			{
-				uid_t id = uid_t::make(1); // odd number
+				psv_uid_t id = psv_uid_t::make(1); // odd number
 				id.type = uid_class; // set type
 				id.number = &value - m_data.data(); // set position
 				return id.uid;
@@ -81,7 +81,7 @@ public:
 			return nullptr;
 		}
 
-		return std::atomic_exchange(&m_data[uid_t::make(uid).number], nullptr);
+		return std::atomic_exchange(&m_data[psv_uid_t::make(uid).number], nullptr);
 	}
 
 	// remove all objects

From a7d85480a85b3c632919f6ccee3b3bc4dcfc7dbc Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Mon, 26 Jan 2015 15:55:26 +0300
Subject: [PATCH 37/70] Fixes

---
 rpcs3/Emu/ARMv7/ARMv7Context.h              |  2 +-
 rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp |  2 --
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp    |  9 ++++++++-
 rpcs3/Emu/ARMv7/PSVObjectList.cpp           | 12 +++++++++++-
 rpcs3/Emu/ARMv7/PSVObjectList.h             | 19 ++++++++++++++++---
 rpcs3/Emu/System.cpp                        |  2 ++
 6 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index 491e0a0845..c0aebaff78 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -79,8 +79,8 @@ struct ARMv7Context
 	{
 		struct
 		{
-			u8 cond : 3;
 			u8 state : 5;
+			u8 cond : 3;
 		};
 
 		u8 IT;
diff --git a/rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp b/rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp
index 4e6046bd25..0e67d72444 100644
--- a/rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp
@@ -4,5 +4,3 @@
 #include "Emu/ARMv7/PSVObjectList.h"
 #include "sceLibKernel.h"
 #include "psv_sema_object.h"
-
-psv_object_list_t<psv_sema_t, SCE_KERNEL_THREADMGR_UID_CLASS_SEMA> g_psv_sema_list;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index fd852feae7..e033e4ef22 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -468,7 +468,14 @@ s32 sceKernelCreateSema(vm::psv::ptr<const char> pName, u32 attr, s32 initCount,
 
 s32 sceKernelDeleteSema(s32 semaId)
 {
-	throw __FUNCTION__;
+	sceLibKernel.Error("sceKernelDeleteSema(semaId=0x%x)", semaId);
+
+	if (!g_psv_sema_list.remove(semaId))
+	{
+		RETURN_ERROR(SCE_KERNEL_ERROR_INVALID_UID);
+	}
+
+	throw SCE_OK;
 }
 
 s32 sceKernelOpenSema(vm::psv::ptr<const char> pName)
diff --git a/rpcs3/Emu/ARMv7/PSVObjectList.cpp b/rpcs3/Emu/ARMv7/PSVObjectList.cpp
index d9cb43aeef..c90ebf20da 100644
--- a/rpcs3/Emu/ARMv7/PSVObjectList.cpp
+++ b/rpcs3/Emu/ARMv7/PSVObjectList.cpp
@@ -1,3 +1,13 @@
 #include "stdafx.h"
-#include "PSVObjectList.h"
+#include "Emu/Memory/Memory.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+#include "Emu/ARMv7/PSVObjectList.h"
+#include "Modules/sceLibKernel.h"
+#include "Modules/psv_sema_object.h"
 
+psv_object_list_t<psv_sema_t, SCE_KERNEL_THREADMGR_UID_CLASS_SEMA> g_psv_sema_list;
+
+void clear_all_psv_objects()
+{
+	g_psv_sema_list.clear();
+}
diff --git a/rpcs3/Emu/ARMv7/PSVObjectList.h b/rpcs3/Emu/ARMv7/PSVObjectList.h
index 5fb6b5da93..d25c6e39ce 100644
--- a/rpcs3/Emu/ARMv7/PSVObjectList.h
+++ b/rpcs3/Emu/ARMv7/PSVObjectList.h
@@ -25,6 +25,7 @@ template<typename T, u32 type>
 class psv_object_list_t // Class for managing object data
 {
 	std::array<std::shared_ptr<T>, 0x8000> m_data;
+	std::mutex m_mutex; // TODO: remove it when shared_ptr atomic ops are fully available
 
 public:
 	static const u32 uid_class = type;
@@ -57,12 +58,16 @@ public:
 	// generate UID for newly created object (will return zero if the limit exceeded)
 	s32 add(std::shared_ptr<T>& data)
 	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+
 		for (auto& value : m_data)
 		{
 			// find an empty position and move the pointer
-			std::shared_ptr<T> old_ptr = nullptr;
-			if (std::atomic_compare_exchange_strong(&value, &old_ptr, data))
+			//std::shared_ptr<T> old_ptr = nullptr;
+			//if (std::atomic_compare_exchange_strong(&value, &old_ptr, data))
+			if (!value)
 			{
+				value = data;
 				psv_uid_t id = psv_uid_t::make(1); // odd number
 				id.type = uid_class; // set type
 				id.number = &value - m_data.data(); // set position
@@ -81,12 +86,19 @@ public:
 			return nullptr;
 		}
 
-		return std::atomic_exchange(&m_data[psv_uid_t::make(uid).number], nullptr);
+		std::lock_guard<std::mutex> lock(m_mutex);
+
+		std::shared_ptr<T> old_ptr = nullptr;
+		m_data[psv_uid_t::make(uid).number].swap(old_ptr);
+		return old_ptr;
+		//return std::atomic_exchange<std::shared_ptr<T>>(&m_data[psv_uid_t::make(uid).number], nullptr);
 	}
 
 	// remove all objects
 	void clear()
 	{
+		std::lock_guard<std::mutex> lock(m_mutex);
+
 		for (auto& value : m_data)
 		{
 			value = nullptr;
@@ -94,3 +106,4 @@ public:
 	}
 };
 
+void clear_all_psv_objects();
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 9e17b56ddf..8324e0e54f 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -6,6 +6,7 @@
 
 #include "Emu/GameInfo.h"
 #include "Emu/ARMv7/PSVFuncList.h"
+#include "Emu/ARMv7/PSVObjectList.h"
 #include "Emu/SysCalls/Static.h"
 #include "Emu/SysCalls/ModuleManager.h"
 #include "Emu/Cell/PPUThread.h"
@@ -363,6 +364,7 @@ void Emulator::Stop()
 	LOG_NOTICE(HLE, "All threads stopped...");
 
 	finalize_psv_modules();
+	clear_all_psv_objects();
 	m_rsx_callback = 0;
 
 	// TODO: check finalization order

From 31dcdea27b38eb522987d7dbf2674ad0e46e4bc2 Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Mon, 26 Jan 2015 20:53:00 +0200
Subject: [PATCH 38/70] Add Coveralls badge

Start making unit tests now!
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index b63652fffb..24c073a32b 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,14 @@ RPCS3
 =====
 
 [![Build Status](https://travis-ci.org/DHrpcs3/rpcs3.svg?branch=master)](https://travis-ci.org/DHrpcs3/rpcs3)
+
 <a href="https://scan.coverity.com/projects/3960">
   <img alt="Coverity Scan Build Status"
        src="https://scan.coverity.com/projects/3960/badge.svg"/>
 </a>
 
+[![Coverage Status](https://coveralls.io/repos/DHrpcs3/rpcs3/badge.svg)](https://coveralls.io/r/DHrpcs3/rpcs3)
+
 An open-source PlayStation 3 emulator/debugger written in C++.
 
 You can find some basic information in the [FAQ](https://github.com/DHrpcs3/rpcs3/wiki/FAQ). For discussion about this emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=162).

From 78a92c7d43158b47f1ab0bd9427330a5f8f9b022 Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Mon, 26 Jan 2015 21:01:47 +0200
Subject: [PATCH 39/70] More fixes and fixes to previous fixes

---
 Utilities/StrFmt.h                           |  18 ---
 rpcs3/Emu/FS/vfsDirBase.h                    |   3 +-
 rpcs3/Emu/RSX/RSXTexture.cpp                 |   4 +-
 rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp    |  11 +-
 rpcs3/Emu/SysCalls/Modules/cellKb.cpp        |  60 +++++---
 rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp |   8 +-
 rpcs3/Emu/SysCalls/Modules/cellSync.cpp      |   6 +
 rpcs3/Gui/CompilerELF.cpp                    | 146 +++++++++----------
 8 files changed, 135 insertions(+), 121 deletions(-)

diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h
index 056861c122..3bc464fcb8 100644
--- a/Utilities/StrFmt.h
+++ b/Utilities/StrFmt.h
@@ -206,8 +206,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (u8): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
@@ -228,8 +226,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (u16): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
@@ -250,8 +246,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (u32): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
@@ -272,8 +266,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (u64): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
@@ -294,8 +286,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (s8): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
@@ -316,8 +306,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (s16): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
@@ -378,8 +366,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (float): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
@@ -400,8 +386,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (double): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
@@ -426,8 +410,6 @@ namespace fmt
 				{
 					throw "Invalid formatting (bool): " + std::string(fmt, len);
 				}
-
-				return{};
 			}
 		};
 
diff --git a/rpcs3/Emu/FS/vfsDirBase.h b/rpcs3/Emu/FS/vfsDirBase.h
index 84e4b0c342..c4d515899c 100644
--- a/rpcs3/Emu/FS/vfsDirBase.h
+++ b/rpcs3/Emu/FS/vfsDirBase.h
@@ -62,7 +62,8 @@ public:
 
 	public:
 		iterator(vfsDirBase* parent)
-			: data(parent->First())
+			: parent(parent)
+			, data(parent->First())
 		{
 		}
 
diff --git a/rpcs3/Emu/RSX/RSXTexture.cpp b/rpcs3/Emu/RSX/RSXTexture.cpp
index ce56142468..ba07dfd5a3 100644
--- a/rpcs3/Emu/RSX/RSXTexture.cpp
+++ b/rpcs3/Emu/RSX/RSXTexture.cpp
@@ -289,7 +289,7 @@ u16 RSXVertexTexture::GetMipmap() const
 u8 RSXVertexTexture::GetWrapS() const
 {
 	return 1;
-	return ((methodRegisters[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 32)]) & 0xf);
+	//return ((methodRegisters[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 32)]) & 0xf);
 }
 
 u8 RSXVertexTexture::GetWrapT() const
@@ -301,7 +301,7 @@ u8 RSXVertexTexture::GetWrapT() const
 u8 RSXVertexTexture::GetWrapR() const
 {
 	return 1;
-	return ((methodRegisters[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 32)] >> 16) & 0xf);
+	//return ((methodRegisters[NV4097_SET_VERTEX_TEXTURE_ADDRESS + (m_index * 32)] >> 16) & 0xf);
 }
 
 u8 RSXVertexTexture::GetUnsignedRemap() const
diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
index 17bc0b1460..9250ac1f20 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
@@ -542,16 +542,15 @@ int cellGcmSetSecondVFrequency(u32 freq)
 	switch (freq)
 	{
 	case CELL_GCM_DISPLAY_FREQUENCY_59_94HZ:
-		cellGcmSys->Todo("Unimplemented display frequency: 59.94Hz"); break;
+		Emu.GetGSManager().GetRender().m_frequency_mode = freq; cellGcmSys->Todo("Unimplemented display frequency: 59.94Hz"); break;
 	case CELL_GCM_DISPLAY_FREQUENCY_SCANOUT:
-		cellGcmSys->Todo("Unimplemented display frequency: Scanout"); break;
+		Emu.GetGSManager().GetRender().m_frequency_mode = freq; cellGcmSys->Todo("Unimplemented display frequency: Scanout"); break;
 	case CELL_GCM_DISPLAY_FREQUENCY_DISABLE:
-		Emu.GetGSManager().GetRender().m_frequency_mode = freq; break;
-
-	default: return CELL_EINVAL;
+		Emu.GetGSManager().GetRender().m_frequency_mode = freq; cellGcmSys->Todo("Unimplemented display frequency: Disabled"); break;
+	default: cellGcmSys->Error("Improper display frequency specified!"); return;
 	}
 
-	return CELL_OK;
+	return;
 }
 
 int cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 comp, u16 base, u8 bank)
diff --git a/rpcs3/Emu/SysCalls/Modules/cellKb.cpp b/rpcs3/Emu/SysCalls/Modules/cellKb.cpp
index e8976c0de2..f580155138 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellKb.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellKb.cpp
@@ -11,17 +11,24 @@ extern Module *sys_io;
 int cellKbInit(u32 max_connect)
 {
 	sys_io->Warning("cellKbInit(max_connect=%d)", max_connect);
-	if(Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_ALREADY_INITIALIZED;
-	if(max_connect > 7) return CELL_KB_ERROR_INVALID_PARAMETER;
+
+	if (Emu.GetKeyboardManager().IsInited())
+		return CELL_KB_ERROR_ALREADY_INITIALIZED;
+	if (max_connect > 7)
+		return CELL_KB_ERROR_INVALID_PARAMETER;
 
 	Emu.GetKeyboardManager().Init(max_connect);
+
 	return CELL_OK;
 }
 
 int cellKbEnd()
 {
 	sys_io->Log("cellKbEnd()");
-	if(!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED;
+
+	if (!Emu.GetKeyboardManager().IsInited())
+		return CELL_KB_ERROR_UNINITIALIZED;
+
 	Emu.GetKeyboardManager().Close();
 	return CELL_OK;
 }
@@ -29,8 +36,12 @@ int cellKbEnd()
 int cellKbClearBuf(u32 port_no)
 {
 	sys_io->Log("cellKbClearBuf(port_no=%d)", port_no);
-	if(!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED;
-	if(port_no >= Emu.GetKeyboardManager().GetKeyboards().size()) return CELL_KB_ERROR_INVALID_PARAMETER;
+
+	if (!Emu.GetKeyboardManager().IsInited())
+		return CELL_KB_ERROR_UNINITIALIZED;
+
+	if (port_no >= Emu.GetKeyboardManager().GetKeyboards().size())
+		return CELL_KB_ERROR_INVALID_PARAMETER;
 
 	//?
 
@@ -42,12 +53,10 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
 	sys_io->Log("cellKbCnvRawCode(arrange=%d,mkey=%d,led=%d,rawcode=%d)", arrange, mkey, led, rawcode);
 
 	// CELL_KB_RAWDAT
-	if ((rawcode >= 0x00 && rawcode <= 0x03) || rawcode == 0x29 || rawcode == 0x35 ||
-		(rawcode >= 0x39 && rawcode <= 0x53) || rawcode == 0x65 || rawcode == 0x88 ||
-		rawcode == 0x8A || rawcode == 0x8B)
-		{
-			return rawcode | 0x8000;
-		}
+	if (rawcode <= 0x03 || rawcode == 0x29 || rawcode == 0x35 || (rawcode >= 0x39 && rawcode <= 0x53) || rawcode == 0x65 || rawcode == 0x88 || rawcode == 0x8A || rawcode == 0x8B)
+	{
+		return rawcode | 0x8000;
+	}
 
 	// CELL_KB_NUMPAD
 	if (rawcode >= 0x59 && rawcode <= 0x61) return (rawcode - 0x28) | 0x4000; // '1' - '9'
@@ -88,13 +97,16 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
 int cellKbGetInfo(vm::ptr<CellKbInfo> info)
 {
 	sys_io->Log("cellKbGetInfo(info_addr=0x%x)", info.addr());
-	if(!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED;
+
+	if (!Emu.GetKeyboardManager().IsInited())
+		return CELL_KB_ERROR_UNINITIALIZED;
 
 	const KbInfo& current_info = Emu.GetKeyboardManager().GetInfo();
 	info->max_connect = current_info.max_connect;
 	info->now_connect = current_info.now_connect;
 	info->info = current_info.info;
-	for(u32 i=0; i<CELL_KB_MAX_KEYBOARDS; i++)
+
+	for (u32 i=0; i<CELL_KB_MAX_KEYBOARDS; i++)
 	{
 		info->status[i] = current_info.status[i];
 	}
@@ -107,14 +119,18 @@ int cellKbRead(u32 port_no, vm::ptr<CellKbData> data)
 	sys_io->Log("cellKbRead(port_no=%d,info_addr=0x%x)", port_no, data.addr());
 
 	const std::vector<Keyboard>& keyboards = Emu.GetKeyboardManager().GetKeyboards();
-	if(!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED;
-	if(port_no >= keyboards.size()) return CELL_KB_ERROR_INVALID_PARAMETER;
+	if (!Emu.GetKeyboardManager().IsInited())
+		return CELL_KB_ERROR_UNINITIALIZED;
+
+	if (port_no >= keyboards.size())
+		return CELL_KB_ERROR_INVALID_PARAMETER;
 
 	KbData& current_data = Emu.GetKeyboardManager().GetData(port_no);
 	data->led = current_data.led;
 	data->mkey = current_data.mkey;
 	data->len = std::min((u32)current_data.len, CELL_KB_MAX_KEYCODES);
-	for(s32 i=0; i<current_data.len; i++)
+
+	for (s32 i=0; i<current_data.len; i++)
 	{
 		data->keycode[i] = current_data.keycode[i];
 	}
@@ -127,7 +143,9 @@ int cellKbRead(u32 port_no, vm::ptr<CellKbData> data)
 int cellKbSetCodeType(u32 port_no, u32 type)
 {
 	sys_io->Log("cellKbSetCodeType(port_no=%d,type=%d)", port_no, type);
-	if(!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED;
+
+	if (!Emu.GetKeyboardManager().IsInited())
+		return CELL_KB_ERROR_UNINITIALIZED;
 	
 	KbConfig& current_config = Emu.GetKeyboardManager().GetConfig(port_no);
 	current_config.code_type = type;
@@ -143,7 +161,9 @@ int cellKbSetLEDStatus(u32 port_no, u8 led)
 int cellKbSetReadMode(u32 port_no, u32 rmode)
 {
 	sys_io->Log("cellKbSetReadMode(port_no=%d,rmode=%d)", port_no, rmode);
-	if(!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED;
+
+	if (!Emu.GetKeyboardManager().IsInited())
+		return CELL_KB_ERROR_UNINITIALIZED;
 	
 	KbConfig& current_config = Emu.GetKeyboardManager().GetConfig(port_no);
 	current_config.read_mode = rmode;
@@ -154,7 +174,9 @@ int cellKbSetReadMode(u32 port_no, u32 rmode)
 int cellKbGetConfiguration(u32 port_no, vm::ptr<CellKbConfig> config)
 {
 	sys_io->Log("cellKbGetConfiguration(port_no=%d,config_addr=0x%x)", port_no, config.addr());
-	if(!Emu.GetKeyboardManager().IsInited()) return CELL_KB_ERROR_UNINITIALIZED;
+
+	if (!Emu.GetKeyboardManager().IsInited())
+		return CELL_KB_ERROR_UNINITIALIZED;
 
 	const KbConfig& current_config = Emu.GetKeyboardManager().GetConfig(port_no);
 	config->arrange = current_config.arrange;
diff --git a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
index a26cf637e1..31e3114a3b 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
@@ -127,8 +127,8 @@ s32 cellMsgDialogOpen2(u32 type, vm::ptr<const char> msgString, vm::ptr<CellMsgD
 	{
 		switch (type & CELL_MSGDIALOG_TYPE_SE_TYPE)
 		{
-		case CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL: LOG_WARNING(TTY, "%s\n", msg.c_str()); break;
-		case CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR: LOG_ERROR(TTY, "%s\n", msg.c_str()); break;
+		case CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL: LOG_WARNING(HLE, "%s", msg.c_str()); break;
+		case CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR: LOG_ERROR(HLE, "%s", msg.c_str()); break;
 		}
 
 		switch (type & CELL_MSGDIALOG_TYPE_SE_MUTE) // TODO
@@ -264,7 +264,11 @@ s32 cellMsgDialogOpenErrorCode(u32 errorCode, vm::ptr<CellMsgDialogCallback> cal
 	}
 
 	char errorCodeHex[12];
+#if __STDC_WANT_SECURE_LIB__ && !_WIN32_WCE
 	sprintf_s(errorCodeHex, "\n(%08x)", errorCode);
+#else
+	sprintf(errorCodeHex, "\n(%08x)", errorCode);
+#endif
 	errorMessage.append(errorCodeHex);
 
 	u64 status;
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
index 17d8d18eef..a652921035 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
@@ -1060,8 +1060,11 @@ s32 syncLFQueueGetPushPointer(vm::ptr<CellSyncLFQueue> queue, s32& pointer, u32
 					res = CELL_SYNC_ERROR_AGAIN;
 					if (!push.m_h7.data() || res)
 					{
+						// TODO: This condition is always true - wrong implementation?
 						return res;
 					}
+
+					break;
 				}
 				else if (!useEventQueue)
 				{
@@ -1436,8 +1439,11 @@ s32 syncLFQueueGetPopPointer(vm::ptr<CellSyncLFQueue> queue, s32& pointer, u32 i
 					res = CELL_SYNC_ERROR_AGAIN;
 					if (!pop.m_h3.data() || res)
 					{
+						// TODO: This condition is always true - wrong implementation?
 						return res;
 					}
+
+					break;
 				}
 				else if (!useEventQueue)
 				{
diff --git a/rpcs3/Gui/CompilerELF.cpp b/rpcs3/Gui/CompilerELF.cpp
index d9979dbd70..3fc419f2f1 100644
--- a/rpcs3/Gui/CompilerELF.cpp
+++ b/rpcs3/Gui/CompilerELF.cpp
@@ -210,91 +210,91 @@ void CompilerELF::OnUpdate(wxCommandEvent& event)
 	DoAnalyzeCode(false);
 
 	return;
-	/*asm_list->Freeze();
-	asm_list->SetStyle(0, asm_list->GetValue().Len(), wxTextAttr("Black"));
+	//asm_list->Freeze();
+	//asm_list->SetStyle(0, asm_list->GetValue().Len(), wxTextAttr("Black"));
 
-	/*
-	for(u32 i=0; i<instr_count; ++i)
-	{
-		SetOpStyle(m_instructions[i].name, "Blue");
-	}
-	*/
-	
-	/*SetOpStyle(".int", "Blue");
-	SetOpStyle(".string", "Blue");
-	SetOpStyle(".strlen", "Blue");
-	SetOpStyle(".buf", "Blue");
-	SetOpStyle(".srl", "Blue");
-	SetOpStyle(".srr", "Blue");
-	SetOpStyle(".mul", "Blue");
-	SetOpStyle(".div", "Blue");
-	SetOpStyle(".add", "Blue");
-	SetOpStyle(".sub", "Blue");
-	SetOpStyle(".and", "Blue");
-	SetOpStyle(".or", "Blue");
-	SetOpStyle(".xor", "Blue");
-	SetOpStyle(".not", "Blue");
-	SetOpStyle(".nor", "Blue");
+	///*
+	//for(u32 i=0; i<instr_count; ++i)
+	//{
+	//	SetOpStyle(m_instructions[i].name, "Blue");
+	//}
+	//*/
+	//
+	//SetOpStyle(".int", "Blue");
+	//SetOpStyle(".string", "Blue");
+	//SetOpStyle(".strlen", "Blue");
+	//SetOpStyle(".buf", "Blue");
+	//SetOpStyle(".srl", "Blue");
+	//SetOpStyle(".srr", "Blue");
+	//SetOpStyle(".mul", "Blue");
+	//SetOpStyle(".div", "Blue");
+	//SetOpStyle(".add", "Blue");
+	//SetOpStyle(".sub", "Blue");
+	//SetOpStyle(".and", "Blue");
+	//SetOpStyle(".or", "Blue");
+	//SetOpStyle(".xor", "Blue");
+	//SetOpStyle(".not", "Blue");
+	//SetOpStyle(".nor", "Blue");
 
-	SetTextStyle("[", "Red");
-	SetTextStyle("]", "Red");
-	SetTextStyle(":", "Red");
-	SetTextStyle(",", "Red");
+	//SetTextStyle("[", "Red");
+	//SetTextStyle("]", "Red");
+	//SetTextStyle(":", "Red");
+	//SetTextStyle(",", "Red");
 
-	for(int p=0; (p = asm_list->GetValue().find('#', p)) >= 0;)
-	{
-		const int from = p++;
-		p = asm_list->GetValue().find('\n', p);
+	//for(int p=0; (p = asm_list->GetValue().find('#', p)) >= 0;)
+	//{
+	//	const int from = p++;
+	//	p = asm_list->GetValue().find('\n', p);
 
-		if(p < 0) p = asm_list->GetValue().Len();
+	//	if(p < 0) p = asm_list->GetValue().Len();
 
-		asm_list->SetStyle(from, p, wxTextAttr(0x009900));
-	}
-	
-	for(int p=0; (p = asm_list->GetValue().find('"', p)) >= 0;)
-	{
-		const int from = p++;
-		const int p1 = asm_list->GetValue().find('\n', p);
+	//	asm_list->SetStyle(from, p, wxTextAttr(0x009900));
+	//}
+	//
+	//for(int p=0; (p = asm_list->GetValue().find('"', p)) >= 0;)
+	//{
+	//	const int from = p++;
+	//	const int p1 = asm_list->GetValue().find('\n', p);
 
-		int p2 = p;
-		for(;;)
-		{
-			p2 = asm_list->GetValue().find('"', p2);
-			if(p2 == -1) break;
+	//	int p2 = p;
+	//	for(;;)
+	//	{
+	//		p2 = asm_list->GetValue().find('"', p2);
+	//		if(p2 == -1) break;
 
-			if(asm_list->GetValue()[p2 - 1] == '\\')
-			{
-				if(p2 > 2 && asm_list->GetValue()[p2 - 2] == '\\') break;
+	//		if(asm_list->GetValue()[p2 - 1] == '\\')
+	//		{
+	//			if(p2 > 2 && asm_list->GetValue()[p2 - 2] == '\\') break;
 
-				p2++;
-				continue;
-			}
-			break;
-		}
+	//			p2++;
+	//			continue;
+	//		}
+	//		break;
+	//	}
 
-		if(p1 < 0 && p2 < 0)
-		{
-			p = asm_list->GetValue().Len();
-		}
-		else if(p1 >= 0 && p2 < 0)
-		{
-			p = p1;
-		}
-		else if(p2 >= 0 && p1 < 0)
-		{
-			p = p2 + 1;
-		}
-		else
-		{
-			p = p1 > p2 ? p2 + 1 : p1;
-		}
+	//	if(p1 < 0 && p2 < 0)
+	//	{
+	//		p = asm_list->GetValue().Len();
+	//	}
+	//	else if(p1 >= 0 && p2 < 0)
+	//	{
+	//		p = p1;
+	//	}
+	//	else if(p2 >= 0 && p1 < 0)
+	//	{
+	//		p = p2 + 1;
+	//	}
+	//	else
+	//	{
+	//		p = p1 > p2 ? p2 + 1 : p1;
+	//	}
 
-		asm_list->SetStyle(from, p, wxTextAttr(0x000099));
-	}
+	//	asm_list->SetStyle(from, p, wxTextAttr(0x000099));
+	//}
 
-	asm_list->Thaw();
+	//asm_list->Thaw();
 
-	UpdateScroll(true, wxVERTICAL);*/
+	//UpdateScroll(true, wxVERTICAL);
 }
 
 void CompilerELF::OnScroll(wxScrollWinEvent& event)

From 81340e9d5c3667b108579a71cfcf264158a641d3 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Tue, 27 Jan 2015 03:19:51 +0300
Subject: [PATCH 40/70] scePerf stub, sceSysmodule, sema, ef

---
 rpcs3/Emu/ARMv7/ARMv7Context.h              | 20 +++--
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp            | 57 +++++++------
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp        |  4 +-
 rpcs3/Emu/ARMv7/Modules/psv_event_flag.cpp  | 13 +++
 rpcs3/Emu/ARMv7/Modules/psv_event_flag.h    | 21 +++++
 rpcs3/Emu/ARMv7/Modules/psv_sema.cpp        | 14 ++++
 rpcs3/Emu/ARMv7/Modules/psv_sema.h          | 23 ++++++
 rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp |  6 --
 rpcs3/Emu/ARMv7/Modules/psv_sema_object.h   | 11 ---
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp    | 20 ++---
 rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp    |  9 ++-
 rpcs3/Emu/ARMv7/Modules/scePerf.cpp         | 90 +++++++++++++++++++++
 rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp    | 39 +++++++++
 rpcs3/Emu/ARMv7/PSVFuncList.cpp             |  6 +-
 rpcs3/Emu/ARMv7/PSVObjectList.cpp           |  5 +-
 rpcs3/Emu/Memory/vm_var.h                   |  9 ++-
 rpcs3/Emu/SysCalls/Callback.h               | 16 ++--
 rpcs3/emucore.vcxproj                       |  8 +-
 rpcs3/emucore.vcxproj.filters               | 26 ++++--
 19 files changed, 310 insertions(+), 87 deletions(-)
 create mode 100644 rpcs3/Emu/ARMv7/Modules/psv_event_flag.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/psv_event_flag.h
 create mode 100644 rpcs3/Emu/ARMv7/Modules/psv_sema.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/psv_sema.h
 delete mode 100644 rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp
 delete mode 100644 rpcs3/Emu/ARMv7/Modules/psv_sema_object.h
 create mode 100644 rpcs3/Emu/ARMv7/Modules/scePerf.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp

diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index c0aebaff78..873f039555 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -79,20 +79,26 @@ struct ARMv7Context
 	{
 		struct
 		{
-			u8 state : 5;
-			u8 cond : 3;
+			u8 shift_state : 5;
+			u8 cond_base : 3;
+		};
+
+		struct
+		{
+			u8 check_state : 4;
+			u8 condition : 4;
 		};
 
 		u8 IT;
 
 		u32 advance()
 		{
-			const u32 res = (state & 0xf) ? (cond << 1 | state >> 4) : 0xe /* true */;
+			const u32 res = check_state ? condition : 0xe /* always true */;
 
-			state <<= 1;
-			if ((state & 0xf) == 0) // if no d
+			shift_state <<= 1;
+			if (!check_state)
 			{
-				IT = 0; // clear ITSTATE
+				IT = 0; // clear
 			}
 
 			return res;
@@ -100,7 +106,7 @@ struct ARMv7Context
 
 		operator bool() const
 		{
-			return (state & 0xf) != 0;
+			return check_state;
 		}
 
 	} ITSTATE;
diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index f913bcbb8a..8a361014f4 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -140,7 +140,7 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP4(0x0fe0, 0x0010, 0x0020, 0x0000, A1, EOR_REG),
 	ARMv7_OP4(0x0fe0, 0x0090, 0x0020, 0x0010, A1, EOR_RSR),
 
-	ARMv7_OP2(0xff00, 0xbf00, T1, IT),
+	ARMv7_OP2(0xff00, 0xbf00, T1, IT, SKIP_IF( BF(0, 3) == 0 )),
 
 	ARMv7_OP2(0xf800, 0xc800, T1, LDM),
 	ARMv7_OP4(0xffd0, 0x2000, 0xe890, 0x0000, T2, LDM),
@@ -1208,10 +1208,14 @@ void armv7_decoder_initialize(u32 addr, u32 end_addr, bool dump)
 		{
 			LOG_ERROR(ARMv7, "Unknown instruction found at address 0x%08x: %04x %04x", addr, code.code1, code.code0);
 			addr += 4;
+			continue;
 		}
-		else
+		
+		// Proceed with found:
+
+		if (dump)
 		{
-			if (dump) if (found->length == 2)
+			if (found->length == 2)
 			{
 				LOG_NOTICE(ARMv7, "0x%08x: %04x       %s", addr, code.code0, found->name);
 			}
@@ -1219,34 +1223,39 @@ void armv7_decoder_initialize(u32 addr, u32 end_addr, bool dump)
 			{
 				LOG_NOTICE(ARMv7, "0x%08x: %04x %04x  %s", addr, code.code1, code.code0, found->name);
 			}
+		}
 
-			if (found->func == ARMv7_instrs::BLX && found->type == T2)
+		if (found->func == ARMv7_instrs::BLX && found->type == T2)
+		{
+			const u32 s = (code.data >> 26) & 0x1;
+			const u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
+			const u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
+			const u32 target = (addr + 4 & ~3) + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
+
+			// possibly a call to imported function:
+			if (target >= end_addr && ((target - end_addr) % 16) == 0 && vm::psv::read16(target) == 0xf870)
 			{
-				const u32 s = (code.data >> 26) & 0x1;
-				const u32 i1 = (code.data >> 13) & 0x1 ^ s ^ 1;
-				const u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
-				const u32 target = (addr + 4 & ~3) + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
+				const u32 instr = vm::psv::read32(target);
 
-				// possibly a call to imported function:
-				if (target >= end_addr && ((target - end_addr) % 16) == 0 && vm::psv::read16(target) == 0xf870)
+				// check if not "unimplemented"
+				if (instr >> 16)
 				{
-					const u32 instr = vm::psv::read32(target);
-
-					// check if not "unimplemented"
-					if (instr >> 16)
-					{
-						// replace BLX with "hack" instruction directly, it can help to see where it was called from
-						vm::psv::write32(addr, instr);
-					}
-				}
-				else
-				{
-					LOG_ERROR(ARMv7, "Unrecognized BLX call found at adddress 0x%08x (target=0x%08x)", addr, target);
+					// replace BLX with "hack" instruction directly, it can help to see where it was called from
+					vm::psv::write32(addr, instr);
 				}
 			}
-
-			addr += found->length;
+			else
+			{
+				LOG_ERROR(ARMv7, "Unrecognized BLX call found at adddress 0x%08x (target=0x%08x)", addr, target);
+			}
 		}
+
+		//if (found->func == ARMv7_instrs::IT)
+		//{
+		//	LOG_ERROR(ARMv7, "IT instruction found at address 0x%08x", addr);
+		//}
+
+		addr += found->length;
 	}
 
 	while (vm::psv::read16(addr) == 0xf870)
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index e6cd7dc651..71d91acad9 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -965,7 +965,7 @@ void ARMv7_instrs::BLX(ARMv7Context& context, const ARMv7Code code, const ARMv7_
 	}
 	case A2:
 	{
-		cond = 15;
+		cond = 0xe; // always true
 		newLR = (context.thread.PC + 4) - 4;
 		target = (context.thread.PC + 4 | 1) + sign<25, u32>((code.data & 0xffffff) << 2 | (code.data & 0x1000000) >> 23);
 		break;
@@ -1871,7 +1871,7 @@ void ARMv7_instrs::MOV_REG(ARMv7Context& context, const ARMv7Code code, const AR
 	}
 	case T2:
 	{
-		cond = 15;
+		cond = 0xe; // always true
 		d = (code.data & 0x7);
 		m = (code.data & 0x38) >> 3;
 		set_flags = true;
diff --git a/rpcs3/Emu/ARMv7/Modules/psv_event_flag.cpp b/rpcs3/Emu/ARMv7/Modules/psv_event_flag.cpp
new file mode 100644
index 0000000000..14c9af11bc
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/psv_event_flag.cpp
@@ -0,0 +1,13 @@
+#include "stdafx.h"
+#include "Emu/Memory/Memory.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+#include "Emu/ARMv7/PSVObjectList.h"
+#include "sceLibKernel.h"
+#include "psv_event_flag.h"
+
+psv_event_flag_t::psv_event_flag_t(const char* name, u32 attr, u32 pattern)
+	: attr(attr)
+	, pattern(pattern)
+{
+	strcpy_trunc(this->name, name);
+}
diff --git a/rpcs3/Emu/ARMv7/Modules/psv_event_flag.h b/rpcs3/Emu/ARMv7/Modules/psv_event_flag.h
new file mode 100644
index 0000000000..bc1cb2d4e9
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/psv_event_flag.h
@@ -0,0 +1,21 @@
+#pragma once
+
+struct psv_event_flag_t
+{
+	char name[32];
+	u32 attr;
+	u32 pattern;
+
+private:
+	psv_event_flag_t() = delete;
+	psv_event_flag_t(const psv_event_flag_t&) = delete;
+	psv_event_flag_t(psv_event_flag_t&&) = delete;
+
+	psv_event_flag_t& operator =(const psv_event_flag_t&) = delete;
+	psv_event_flag_t& operator =(psv_event_flag_t&&) = delete;
+
+public:
+	psv_event_flag_t(const char* name, u32 attr, u32 pattern);
+};
+
+extern psv_object_list_t<psv_event_flag_t, SCE_KERNEL_THREADMGR_UID_CLASS_EVENT_FLAG> g_psv_ef_list;
diff --git a/rpcs3/Emu/ARMv7/Modules/psv_sema.cpp b/rpcs3/Emu/ARMv7/Modules/psv_sema.cpp
new file mode 100644
index 0000000000..20527eb5b3
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/psv_sema.cpp
@@ -0,0 +1,14 @@
+#include "stdafx.h"
+#include "Emu/Memory/Memory.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+#include "Emu/ARMv7/PSVObjectList.h"
+#include "sceLibKernel.h"
+#include "psv_sema.h"
+
+psv_sema_t::psv_sema_t(const char* name, u32 attr, s32 init_value, s32 max_value)
+	: attr(attr)
+	, value(init_value)
+	, max(max_value)
+{
+	strcpy_trunc(this->name, name);
+}
diff --git a/rpcs3/Emu/ARMv7/Modules/psv_sema.h b/rpcs3/Emu/ARMv7/Modules/psv_sema.h
new file mode 100644
index 0000000000..30b3fa6c4c
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/psv_sema.h
@@ -0,0 +1,23 @@
+#pragma once
+
+struct psv_sema_t
+{
+	char name[32];
+	u32 attr;
+	s32 value;
+	s32 max;
+
+private:
+	psv_sema_t() = delete;
+	psv_sema_t(const psv_sema_t&) = delete;
+	psv_sema_t(psv_sema_t&&) = delete;
+
+	psv_sema_t& operator =(const psv_sema_t&) = delete;
+	psv_sema_t& operator =(psv_sema_t&&) = delete;
+
+public:
+	psv_sema_t(const char* name, u32 attr, s32 init_value, s32 max_value);
+
+};
+
+extern psv_object_list_t<psv_sema_t, SCE_KERNEL_THREADMGR_UID_CLASS_SEMA> g_psv_sema_list;
diff --git a/rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp b/rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp
deleted file mode 100644
index 0e67d72444..0000000000
--- a/rpcs3/Emu/ARMv7/Modules/psv_sema_object.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "stdafx.h"
-#include "Emu/Memory/Memory.h"
-#include "Emu/ARMv7/PSVFuncList.h"
-#include "Emu/ARMv7/PSVObjectList.h"
-#include "sceLibKernel.h"
-#include "psv_sema_object.h"
diff --git a/rpcs3/Emu/ARMv7/Modules/psv_sema_object.h b/rpcs3/Emu/ARMv7/Modules/psv_sema_object.h
deleted file mode 100644
index ee643cab4c..0000000000
--- a/rpcs3/Emu/ARMv7/Modules/psv_sema_object.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-struct psv_sema_t
-{
-	char name[32];
-	u32 attr;
-	s32 initCount;
-	s32 maxCount;
-};
-
-extern psv_object_list_t<psv_sema_t, SCE_KERNEL_THREADMGR_UID_CLASS_SEMA> g_psv_sema_list;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index e033e4ef22..25fa75c47c 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -8,7 +8,8 @@
 #include "Emu/ARMv7/ARMv7Thread.h"
 
 #include "sceLibKernel.h"
-#include "psv_sema_object.h"
+#include "psv_sema.h"
+#include "psv_event_flag.h"
 
 #define RETURN_ERROR(code) { Emu.Pause(); sceLibKernel.Error("%s() failed: %s", __FUNCTION__, #code); return code; }
 
@@ -393,7 +394,13 @@ s32 sceKernelWaitMultipleEventsCB(vm::psv::ptr<SceKernelWaitEvent> pWaitEventLis
 
 s32 sceKernelCreateEventFlag(vm::psv::ptr<const char> pName, u32 attr, u32 initPattern, vm::psv::ptr<const SceKernelEventFlagOptParam> pOptParam)
 {
-	throw __FUNCTION__;
+	sceLibKernel.Error("sceKernelCreateEventFlag(pName=0x%x, attr=0x%x, initPattern=0x%x, pOptParam=0x%x)", pName, attr, initPattern, pOptParam);
+
+	std::shared_ptr<psv_event_flag_t> ef(new psv_event_flag_t(pName.get_ptr(), attr, initPattern));
+
+	const s32 id = g_psv_ef_list.add(ef);
+
+	return id;
 }
 
 s32 sceKernelDeleteEventFlag(s32 evfId)
@@ -452,17 +459,10 @@ s32 sceKernelCreateSema(vm::psv::ptr<const 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);
 
-	std::shared_ptr<psv_sema_t> sema(new psv_sema_t);
-
-	strcpy_trunc(sema->name, pName.get_ptr());
-	sema->attr = attr;
-	sema->initCount = initCount;
-	sema->maxCount = maxCount;
+	std::shared_ptr<psv_sema_t> sema(new psv_sema_t(pName.get_ptr(), attr, initCount, maxCount));
 
 	const s32 id = g_psv_sema_list.add(sema);
 
-	sceLibKernel.Error("*** semaphore created -> id=0x%x", id);
-
 	return id;
 }
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
index 44b3b75ff8..2342f1f8c5 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
@@ -25,7 +25,8 @@ namespace sce_libstdcxx_func
 	}
 }
 
-#define REG_FUNC(nid, name) reg_psv_func(nid, &sceLibstdcxx, #name, &sce_libstdcxx_func::name)
+// Attention: find and set correct original mangled name in third parameter, for example: REG_FUNC(0xAE71DC3, operator_new_nothrow, "_ZnwjRKSt9nothrow_t");
+#define REG_FUNC(nid, name, orig_name) reg_psv_func(nid, &sceLibstdcxx, orig_name, &sce_libstdcxx_func::name)
 
 psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 {
@@ -376,9 +377,9 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xE7889A5B, _Unwind_VRS_Get);
 	//REG_FUNC(0xF106D050, _Unwind_VRS_Pop);
 	//REG_FUNC(0x91CDA2F9, _Unwind_VRS_Set);
-	REG_FUNC(0x173E7421, __aeabi_unwind_cpp_pr0);
-	REG_FUNC(0x3C78DDE3, __aeabi_unwind_cpp_pr1);
-	REG_FUNC(0xF95BDD36, __aeabi_unwind_cpp_pr2);
+	REG_FUNC(0x173E7421, __aeabi_unwind_cpp_pr0, "__aeabi_unwind_cpp_pr0");
+	REG_FUNC(0x3C78DDE3, __aeabi_unwind_cpp_pr1, "__aeabi_unwind_cpp_pr1");
+	REG_FUNC(0xF95BDD36, __aeabi_unwind_cpp_pr2, "__aeabi_unwind_cpp_pr2");
 	//REG_FUNC(0x8C93EFDA, __cxa_allocate_exception);
 	//REG_FUNC(0x6165EE89, __cxa_begin_catch);
 	//REG_FUNC(0x5D74285C, __cxa_begin_cleanup);
diff --git a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp
new file mode 100644
index 0000000000..d83e6d5f22
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp
@@ -0,0 +1,90 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base scePerf;
+
+s32 scePerfArmPmonReset(s32 threadId)
+{
+	scePerf.Todo("scePerfArmPmonReset(threadId=0x%x)", threadId);
+
+	return SCE_OK;
+}
+
+s32 scePerfArmPmonSelectEvent(s32 threadId, u32 counter, u8 eventCode)
+{
+	throw __FUNCTION__;
+}
+
+s32 scePerfArmPmonStart(s32 threadId)
+{
+	throw __FUNCTION__;
+}
+
+s32 scePerfArmPmonStop(s32 threadId)
+{
+	throw __FUNCTION__;
+}
+
+s32 scePerfArmPmonGetCounterValue(s32 threadId, u32 counter, vm::psv::ptr<u32> pValue)
+{
+	throw __FUNCTION__;
+}
+
+s32 scePerfArmPmonSoftwareIncrement(u32 mask)
+{
+	throw __FUNCTION__;
+}
+
+u64 scePerfGetTimebaseValue()
+{
+	throw __FUNCTION__;
+}
+
+u32 scePerfGetTimebaseFrequency()
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceRazorCpuInit(vm::psv::ptr<const void> pBufferBase, u32 bufferSize, u32 numPerfCounters, vm::psv::ptr<vm::psv::ptr<u32>> psceRazorVars)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRazorCpuPushMarker(vm::psv::ptr<const char> szLabel)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRazorCpuPopMarker()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRazorCpuSync()
+{
+	throw __FUNCTION__;
+}
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &scePerf, #name, name)
+
+psv_log_base scePerf("ScePerf", []()
+{
+	scePerf.on_load = nullptr;
+	scePerf.on_unload = nullptr;
+	scePerf.on_stop = nullptr;
+
+	REG_FUNC(0x35151735, scePerfArmPmonReset);
+	REG_FUNC(0x63CBEA8B, scePerfArmPmonSelectEvent);
+	REG_FUNC(0xC9D969D5, scePerfArmPmonStart);
+	REG_FUNC(0xD1A40F54, scePerfArmPmonStop);
+	REG_FUNC(0x6132A497, scePerfArmPmonGetCounterValue);
+	//REG_FUNC(0x12F6C708, scePerfArmPmonSetCounterValue);
+	REG_FUNC(0x4264B4E7, scePerfArmPmonSoftwareIncrement);
+	REG_FUNC(0xBD9615E5, scePerfGetTimebaseValue);
+	REG_FUNC(0x78EA4FFB, scePerfGetTimebaseFrequency);
+	REG_FUNC(0x7AD6AC30, _sceRazorCpuInit);
+	REG_FUNC(0xC3DE4C0A, sceRazorCpuPushMarker);
+	REG_FUNC(0xDC3224C3, sceRazorCpuPopMarker);
+	REG_FUNC(0x4F1385E3, sceRazorCpuSync);
+});
\ No newline at end of file
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp b/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp
new file mode 100644
index 0000000000..6584de337a
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp
@@ -0,0 +1,39 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceSysmodule;
+
+s32 sceSysmoduleLoadModule(u16 id)
+{
+	sceSysmodule.Todo("sceSysmoduleLoadModule(id=0x%04x)", id);
+
+	return SCE_OK; // loading succeeded
+}
+
+s32 sceSysmoduleUnloadModule(u16 id)
+{
+	sceSysmodule.Todo("sceSysmoduleUnloadModule(id=0x%04x)", id);
+
+	return SCE_OK; // unloading succeeded
+}
+
+s32 sceSysmoduleIsLoaded(u16 id)
+{
+	sceSysmodule.Todo("sceSysmoduleIsLoaded(id=0x%04x)", id);
+
+	return SCE_OK; // module is loaded
+}
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceSysmodule, #name, name)
+
+psv_log_base sceSysmodule("SceSysmodule", []()
+{
+	sceSysmodule.on_load = nullptr;
+	sceSysmodule.on_unload = nullptr;
+	sceSysmodule.on_stop = nullptr;
+
+	REG_FUNC(0x79A0160A, sceSysmoduleLoadModule);
+	REG_FUNC(0x31D87805, sceSysmoduleUnloadModule);
+	REG_FUNC(0x53099B7A, sceSysmoduleIsLoaded);
+});
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.cpp b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
index bd17628f20..05d9b4c483 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.cpp
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
@@ -48,6 +48,8 @@ extern psv_log_base sceLibc;
 extern psv_log_base sceLibm;
 extern psv_log_base sceLibstdcxx;
 extern psv_log_base sceLibKernel;
+extern psv_log_base sceSysmodule;
+extern psv_log_base scePerf;
 
 void initialize_psv_modules()
 {
@@ -58,6 +60,8 @@ void initialize_psv_modules()
 	g_psv_modules.push_back(&sceLibm);
 	g_psv_modules.push_back(&sceLibstdcxx);
 	g_psv_modules.push_back(&sceLibKernel);
+	g_psv_modules.push_back(&sceSysmodule);
+	g_psv_modules.push_back(&scePerf);
 
 	// setup special functions (without NIDs)
 	psv_func unimplemented;
@@ -66,7 +70,7 @@ void initialize_psv_modules()
 	unimplemented.func.reset(new psv_func_detail::func_binder<void, ARMv7Context&>([](ARMv7Context& context)
 	{
 		context.thread.m_last_syscall = vm::psv::read32(context.thread.PC + 4);
-		throw "Unimplemented function executed";
+		throw "Unimplemented function";
 	}));
 	g_psv_func_list.push_back(unimplemented);
 
diff --git a/rpcs3/Emu/ARMv7/PSVObjectList.cpp b/rpcs3/Emu/ARMv7/PSVObjectList.cpp
index c90ebf20da..cc8e97a1c0 100644
--- a/rpcs3/Emu/ARMv7/PSVObjectList.cpp
+++ b/rpcs3/Emu/ARMv7/PSVObjectList.cpp
@@ -3,11 +3,14 @@
 #include "Emu/ARMv7/PSVFuncList.h"
 #include "Emu/ARMv7/PSVObjectList.h"
 #include "Modules/sceLibKernel.h"
-#include "Modules/psv_sema_object.h"
+#include "Modules/psv_sema.h"
+#include "Modules/psv_event_flag.h"
 
 psv_object_list_t<psv_sema_t, SCE_KERNEL_THREADMGR_UID_CLASS_SEMA> g_psv_sema_list;
+psv_object_list_t<psv_event_flag_t, SCE_KERNEL_THREADMGR_UID_CLASS_EVENT_FLAG> g_psv_ef_list;
 
 void clear_all_psv_objects()
 {
 	g_psv_sema_list.clear();
+	g_psv_ef_list.clear();
 }
diff --git a/rpcs3/Emu/Memory/vm_var.h b/rpcs3/Emu/Memory/vm_var.h
index 95ea373f9e..06864950b9 100644
--- a/rpcs3/Emu/Memory/vm_var.h
+++ b/rpcs3/Emu/Memory/vm_var.h
@@ -517,11 +517,12 @@ namespace vm
 				ptr = vm::get_ptr<T>(addr);
 			}
 
+		private:
 			stack_allocation() = delete;
-			stack_allocation(const stack_allocation& r) = delete;
-			stack_allocation(stack_allocation&& r) = delete;
-			stack_allocation& operator = (const stack_allocation& r) = delete;
-			stack_allocation& operator = (stack_allocation&& r) = delete;
+			stack_allocation(const stack_allocation&) = delete;
+			stack_allocation(stack_allocation&&) = delete;
+			stack_allocation& operator = (const stack_allocation&) = delete;
+			stack_allocation& operator = (stack_allocation&&) = delete;
 
 		} const m_data;
 
diff --git a/rpcs3/Emu/SysCalls/Callback.h b/rpcs3/Emu/SysCalls/Callback.h
index 2e8c64cf92..6918d338a3 100644
--- a/rpcs3/Emu/SysCalls/Callback.h
+++ b/rpcs3/Emu/SysCalls/Callback.h
@@ -42,6 +42,14 @@ class PauseCallbackRegisterer
 	CallbackManager& cb_manager;
 	u64 cb_tag;
 
+private:
+	PauseCallbackRegisterer() = delete;
+	PauseCallbackRegisterer(const PauseCallbackRegisterer& right) = delete;
+	PauseCallbackRegisterer(PauseCallbackRegisterer&& right) = delete;
+
+	PauseCallbackRegisterer& operator =(const PauseCallbackRegisterer& right) = delete;
+	PauseCallbackRegisterer& operator =(PauseCallbackRegisterer&& right) = delete;
+
 public:
 	PauseCallbackRegisterer(CallbackManager& cb_manager, const std::function<PauseResumeCB>& func)
 		: cb_manager(cb_manager)
@@ -49,16 +57,8 @@ public:
 	{
 	}
 
-	PauseCallbackRegisterer() = delete;
-	PauseCallbackRegisterer(const PauseCallbackRegisterer& right) = delete;
-	PauseCallbackRegisterer(PauseCallbackRegisterer&& right) = delete;
-
 	~PauseCallbackRegisterer()
 	{
 		cb_manager.RemovePauseCallback(cb_tag);
 	}
-
-	PauseCallbackRegisterer& operator =(const PauseCallbackRegisterer& right) = delete;
-	PauseCallbackRegisterer& operator =(PauseCallbackRegisterer&& right) = delete;
-
 };
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index da233b2c30..407ab81918 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -56,11 +56,14 @@
     <ClCompile Include="Emu\ARMv7\ARMv7DisAsm.cpp" />
     <ClCompile Include="Emu\ARMv7\ARMv7Interpreter.cpp" />
     <ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp" />
-    <ClCompile Include="Emu\ARMv7\Modules\psv_sema_object.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\psv_event_flag.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\psv_sema.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibKernel.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibc.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibm.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibstdcxx.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\scePerf.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceSysmodule.cpp" />
     <ClCompile Include="Emu\ARMv7\PSVFuncList.cpp" />
     <ClCompile Include="Emu\ARMv7\PSVObjectList.cpp" />
     <ClCompile Include="Emu\Audio\AL\OpenALThread.cpp" />
@@ -276,7 +279,8 @@
     <ClInclude Include="Emu\ARMv7\ARMv7Interpreter.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7Opcodes.h" />
     <ClInclude Include="Emu\ARMv7\ARMv7Thread.h" />
-    <ClInclude Include="Emu\ARMv7\Modules\psv_sema_object.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\psv_event_flag.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\psv_sema.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h" />
     <ClInclude Include="Emu\ARMv7\PSVFuncList.h" />
     <ClInclude Include="Emu\ARMv7\PSVObjectList.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 887600c974..d8f1f1b884 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -87,7 +87,7 @@
     <Filter Include="Emu\Audio\XAudio2">
       <UniqueIdentifier>{1d6abf72-0f18-43ec-9351-1fed1a3d1a1e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Emu\CPU\ARMv7\Thread Manager">
+    <Filter Include="Emu\CPU\ARMv7\Objects">
       <UniqueIdentifier>{368770cf-c8d9-4f4a-9ac3-5bdf48101ffe}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -668,12 +668,21 @@
     <ClCompile Include="Emu\ARMv7\ARMv7Decoder.cpp">
       <Filter>Emu\CPU\ARMv7</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\ARMv7\Modules\psv_sema_object.cpp">
-      <Filter>Emu\CPU\ARMv7\Thread Manager</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\ARMv7\PSVObjectList.cpp">
       <Filter>Emu\CPU\ARMv7</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\psv_sema.cpp">
+      <Filter>Emu\CPU\ARMv7\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\psv_event_flag.cpp">
+      <Filter>Emu\CPU\ARMv7\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceSysmodule.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\scePerf.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">
@@ -1303,11 +1312,14 @@
     <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h">
       <Filter>Emu\CPU\ARMv7\Modules</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\ARMv7\Modules\psv_sema_object.h">
-      <Filter>Emu\CPU\ARMv7\Thread Manager</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\ARMv7\PSVObjectList.h">
       <Filter>Emu\CPU\ARMv7</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\ARMv7\Modules\psv_event_flag.h">
+      <Filter>Emu\CPU\ARMv7\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\ARMv7\Modules\psv_sema.h">
+      <Filter>Emu\CPU\ARMv7\Objects</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 3141cc9bc717a6ca0598ac13b586e1f2d2d05e54 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Tue, 27 Jan 2015 04:26:05 +0300
Subject: [PATCH 41/70] NIDs fix

---
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp |  32 ++--
 rpcs3/Emu/ARMv7/Modules/sceLibm.cpp      |  26 +--
 rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp | 224 +++++++++++------------
 3 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index 25fa75c47c..f4705ab1d8 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -990,7 +990,7 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 
 	// REG_FUNC(???, sceKernelGetEventInfo);
 
-	//REG_FUNC(0x23EAA62, sceKernelPuts);
+	//REG_FUNC(0x023EAA62, sceKernelPuts);
 	//REG_FUNC(0xB0335388, sceClibToupper);
 	//REG_FUNC(0x4C5471BC, sceClibTolower);
 	//REG_FUNC(0xD8EBBB7E, sceClibLookCtypeTable);
@@ -1047,11 +1047,11 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	//REG_FUNC(0x4AE9C8E6, sceKernelAtomicGetAndSub64);
 	//REG_FUNC(0x99E1796E, sceKernelAtomicSubAndGet8);
 	//REG_FUNC(0xC26BBBB1, sceKernelAtomicSubAndGet16);
-	//REG_FUNC(0x1C9CD92, sceKernelAtomicSubAndGet32);
+	//REG_FUNC(0x01C9CD92, sceKernelAtomicSubAndGet32);
 	//REG_FUNC(0x9BB4A94B, sceKernelAtomicSubAndGet64);
 	//REG_FUNC(0x53DCA02B, sceKernelAtomicGetAndAnd8);
 	//REG_FUNC(0x7A0CB056, sceKernelAtomicGetAndAnd16);
-	//REG_FUNC(0x8266595, sceKernelAtomicGetAndAnd32);
+	//REG_FUNC(0x08266595, sceKernelAtomicGetAndAnd32);
 	//REG_FUNC(0x4828BC43, sceKernelAtomicGetAndAnd64);
 	//REG_FUNC(0x86B9170F, sceKernelAtomicAndAndGet8);
 	//REG_FUNC(0xF9890F7E, sceKernelAtomicAndAndGet16);
@@ -1103,9 +1103,9 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	//REG_FUNC(0x4C7AD128, sceKernelPowerLock);
 	//REG_FUNC(0xAF8E9C11, sceKernelPowerUnlock);
 	//REG_FUNC(0xB295EB61, sceKernelGetTLSAddr);
-	REG_FUNC(0xFB972F9, sceKernelGetThreadId);
+	REG_FUNC(0x0FB972F9, sceKernelGetThreadId);
 	REG_FUNC(0xA37A6057, sceKernelGetCurrentThreadVfpException);
-	//REG_FUNC(0xCA71EA2, sceKernelSendMsgPipe);
+	//REG_FUNC(0x0CA71EA2, sceKernelSendMsgPipe);
 	//REG_FUNC(0xA5CA74AC, sceKernelSendMsgPipeCB);
 	//REG_FUNC(0xDFC670E0, sceKernelTrySendMsgPipe);
 	//REG_FUNC(0x4E81DD5C, sceKernelReceiveMsgPipe);
@@ -1163,7 +1163,7 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	REG_FUNC(0xC08F5BC5, sceKernelDeleteSema);
 	REG_FUNC(0xB028AB78, sceKernelOpenSema);
 	REG_FUNC(0x817707AB, sceKernelCloseSema);
-	REG_FUNC(0xC7B834B, sceKernelWaitSema);
+	REG_FUNC(0x0C7B834B, sceKernelWaitSema);
 	REG_FUNC(0x174692B4, sceKernelWaitSemaCB);
 	REG_FUNC(0x66D6BF05, sceKernelCancelSema);
 	REG_FUNC(0x595D3FA6, sceKernelGetSemaInfo);
@@ -1188,8 +1188,8 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	REG_FUNC(0x6864DCE2, sceKernelGetCondInfo);
 	REG_FUNC(0x10A4976F, sceKernelSignalCond);
 	REG_FUNC(0x2EB86929, sceKernelSignalCondAll);
-	REG_FUNC(0x87629E6, sceKernelSignalCondTo);
-	//REG_FUNC(0xA10C1C8, sceKernelCreateMsgPipe);
+	REG_FUNC(0x087629E6, sceKernelSignalCondTo);
+	//REG_FUNC(0x0A10C1C8, sceKernelCreateMsgPipe);
 	//REG_FUNC(0x69F6575D, sceKernelDeleteMsgPipe);
 	//REG_FUNC(0x230691DA, sceKernelOpenMsgPipe);
 	//REG_FUNC(0x7E5C0C16, sceKernelCloseMsgPipe);
@@ -1218,7 +1218,7 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	REG_FUNC(0x2F3D35A3, sceKernelOpenTimer);
 	REG_FUNC(0x17283DE6, sceKernelCloseTimer);
 	REG_FUNC(0x1478249B, sceKernelStartTimer);
-	REG_FUNC(0x75B1329, sceKernelStopTimer);
+	REG_FUNC(0x075B1329, sceKernelStopTimer);
 	REG_FUNC(0x1F59E04D, sceKernelGetTimerBase);
 	REG_FUNC(0x3223CCD1, sceKernelGetTimerBaseWide);
 	REG_FUNC(0x381DC300, sceKernelGetTimerTime);
@@ -1241,7 +1241,7 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	REG_FUNC(0x597D4607, sceKernelTryLockWriteRWLock);
 	REG_FUNC(0xD9369DF2, sceKernelUnlockWriteRWLock);
 	REG_FUNC(0x190CA94B, sceKernelCancelRWLock);
-	REG_FUNC(0x79A573B, sceKernelGetRWLockInfo);
+	REG_FUNC(0x079A573B, sceKernelGetRWLockInfo);
 	REG_FUNC(0x8AF15B5F, sceKernelGetSystemTime);
 	//REG_FUNC(0x99B2BF15, sceKernelPMonThreadGetCounter);
 	//REG_FUNC(0x7C21C961, sceKernelPMonCpuGetCounter);
@@ -1265,14 +1265,14 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	REG_FUNC(0xBCA5B623, sceIoGetstat);
 	REG_FUNC(0x29482F7F, sceIoChstat);
 	REG_FUNC(0x98ACED6D, sceIoSync);
-	REG_FUNC(0x4B30CB2, sceIoDevctl);
+	REG_FUNC(0x04B30CB2, sceIoDevctl);
 	REG_FUNC(0x54ABACFA, sceIoIoctl);
 	//REG_FUNC(0x6A7EA9FD, sceIoOpenAsync);
 	//REG_FUNC(0x84201C9B, sceIoCloseAsync);
 	//REG_FUNC(0x7B3BE857, sceIoReadAsync);
 	//REG_FUNC(0x21329B20, sceIoWriteAsync);
 	//REG_FUNC(0xCAC5D672, sceIoLseekAsync);
-	//REG_FUNC(0x99C54B9, sceIoIoctlAsync);
+	//REG_FUNC(0x099C54B9, sceIoIoctlAsync);
 	//REG_FUNC(0x446A60AC, sceIoRemoveAsync);
 	//REG_FUNC(0x73FC184B, sceIoDopenAsync);
 	//REG_FUNC(0x4D0597D7, sceIoDcloseAsync);
@@ -1305,7 +1305,7 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	//REG_FUNC(0xCD248267, sceKernelGetCurrentProcess);
 	//REG_FUNC(0x2252890C, sceKernelPowerTick);
 	//REG_FUNC(0x9E45DA09, sceKernelLibcClock);
-	//REG_FUNC(0x39BE45, sceKernelLibcTime);
+	//REG_FUNC(0x0039BE45, sceKernelLibcTime);
 	//REG_FUNC(0x4B879059, sceKernelLibcGettimeofday);
 	//REG_FUNC(0xC1727F59, sceKernelGetStdin);
 	//REG_FUNC(0xE5AA625C, sceKernelGetStdout);
@@ -1338,12 +1338,12 @@ psv_log_base sceLibKernel("sceLibKernel", []()
 	//REG_FUNC(0x800EDCC1, sceKernelClearDipsw);
 
 	/* SceThreadmgr */
-	REG_FUNC(0xC8A38E1, sceKernelExitThread);
+	REG_FUNC(0x0C8A38E1, sceKernelExitThread);
 	REG_FUNC(0x1D17DECF, sceKernelExitDeleteThread);
 	REG_FUNC(0x4B675D05, sceKernelDelayThread);
 	REG_FUNC(0x9C0180E1, sceKernelDelayThreadCB);
-	//REG_FUNC(0x1173F8, sceKernelChangeActiveCpuMask);
-	REG_FUNC(0x1414F0B, sceKernelGetThreadCurrentPriority);
+	//REG_FUNC(0x001173F8, sceKernelChangeActiveCpuMask);
+	REG_FUNC(0x01414F0B, sceKernelGetThreadCurrentPriority);
 	REG_FUNC(0x751C9B7A, sceKernelChangeCurrentThreadAttr);
 	REG_FUNC(0xD9BD74EB, sceKernelCheckWaitableStatus);
 	REG_FUNC(0x9DCB4B7A, sceKernelGetProcessId);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
index c0b847e6e5..1cbd5cd12e 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibm.cpp
@@ -47,10 +47,10 @@ psv_log_base sceLibm("SceLibm", []()
 	//REG_FUNC(0x63F05BD6, ceil);
 	//REG_FUNC(0x6BBFEC89, ceilf);
 	//REG_FUNC(0x48082D81, ceill);
-	//REG_FUNC(0xB918D13, copysign);
+	//REG_FUNC(0x0B918D13, copysign);
 	//REG_FUNC(0x16EB9E63, copysignf);
 	//REG_FUNC(0x19DFC0AA, copysignl);
-	//REG_FUNC(0x61D0244, cos);
+	//REG_FUNC(0x061D0244, cos);
 	//REG_FUNC(0x127F8302, cosf);
 	//REG_FUNC(0x89B9BE1F, cosl);
 	//REG_FUNC(0x110195E7, cosh);
@@ -59,7 +59,7 @@ psv_log_base sceLibm("SceLibm", []()
 	//REG_FUNC(0x4B84C012, _Cosh);
 	//REG_FUNC(0x15993458, erf);
 	//REG_FUNC(0x524AEBFE, erfc);
-	//REG_FUNC(0x301F113, erfcf);
+	//REG_FUNC(0x0301F113, erfcf);
 	//REG_FUNC(0xD4C92471, erfcl);
 	//REG_FUNC(0x41DD1AB8, erff);
 	//REG_FUNC(0xFD431619, erfl);
@@ -74,7 +74,7 @@ psv_log_base sceLibm("SceLibm", []()
 	//REG_FUNC(0x8BF1866C, expm1l);
 	//REG_FUNC(0x3E672BE3, fabs);
 	//REG_FUNC(0x75348906, fabsf);
-	//REG_FUNC(0x3ECA514, fabsl);
+	//REG_FUNC(0x03ECA514, fabsl);
 	//REG_FUNC(0xA278B20D, _FCosh);
 	//REG_FUNC(0xD6FD5A2E, fdim);
 	//REG_FUNC(0x8B6CC137, fdimf);
@@ -96,19 +96,19 @@ psv_log_base sceLibm("SceLibm", []()
 	//REG_FUNC(0x1CD8F88E, fmodf);
 	//REG_FUNC(0x986011B4, fmodl);
 	//REG_FUNC(0x59197427, frexp);
-	//REG_FUNC(0xA6879AC, frexpf);
+	//REG_FUNC(0x0A6879AC, frexpf);
 	//REG_FUNC(0x6DC8D877, frexpl);
 	//REG_FUNC(0x4A496BC0, _FSin);
 	//REG_FUNC(0x7FBB4C55, _FSinh);
 	//REG_FUNC(0x2D2CD795, hypot);
 	//REG_FUNC(0xA397B929, hypotf);
-	//REG_FUNC(0x5BFBEE8, hypotl);
+	//REG_FUNC(0x05BFBEE8, hypotl);
 	//REG_FUNC(0x667EE864, ilogb);
 	//REG_FUNC(0x80050A43, ilogbf);
 	//REG_FUNC(0x91298DCA, ilogbl);
-	//REG_FUNC(0x197C9D5, _LCosh);
-	//REG_FUNC(0x56061B, ldexp);
-	//REG_FUNC(0xE61E016, ldexpf);
+	//REG_FUNC(0x0197C9D5, _LCosh);
+	//REG_FUNC(0x0056061B, ldexp);
+	//REG_FUNC(0x0E61E016, ldexpf);
 	//REG_FUNC(0x8280A7B1, ldexpl);
 	//REG_FUNC(0x2480AA54, lgamma);
 	//REG_FUNC(0x2D9556D5, lgammaf);
@@ -118,7 +118,7 @@ psv_log_base sceLibm("SceLibm", []()
 	//REG_FUNC(0xC1F6135B, llrintf);
 	//REG_FUNC(0x80558247, llrintl);
 	//REG_FUNC(0xD1251A18, llround);
-	//REG_FUNC(0x4595A04, llroundf);
+	//REG_FUNC(0x04595A04, llroundf);
 	//REG_FUNC(0x9AB5C7AF, llroundl);
 	//REG_FUNC(0x6037C48F, log);
 	//REG_FUNC(0x811ED68B, logf);
@@ -134,7 +134,7 @@ psv_log_base sceLibm("SceLibm", []()
 	//REG_FUNC(0x4095DBDB, log2f);
 	//REG_FUNC(0x720021A9, log2l);
 	//REG_FUNC(0x5EAE8AD4, logb);
-	//REG_FUNC(0x25F51CE, logbf);
+	//REG_FUNC(0x025F51CE, logbf);
 	//REG_FUNC(0x86C4B75F, logbl);
 	//REG_FUNC(0x207307D0, lrint);
 	//REG_FUNC(0xDA903135, lrintf);
@@ -200,8 +200,8 @@ psv_log_base sceLibm("SceLibm", []()
 	//REG_FUNC(0x3A7FE686, tgamma);
 	//REG_FUNC(0xE6067AC0, tgammaf);
 	//REG_FUNC(0x2949109F, tgammal);
-	//REG_FUNC(0x212323E, trunc);
-	//REG_FUNC(0x90B899F, truncf);
+	//REG_FUNC(0x0212323E, trunc);
+	//REG_FUNC(0x090B899F, truncf);
 	//REG_FUNC(0xBC0F1B1A, truncl);
 	//REG_FUNC(0x98BBDAE0, _Dclass);
 	//REG_FUNC(0xBD8EF217, _FDclass);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
index 2342f1f8c5..f0f2674441 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
@@ -56,14 +56,14 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x16F56E8D, std::invalid_argument::_Doraise() const);
 	//REG_FUNC(0x6C568D20, std::_ctype<char>::do_tolower(char*, char const*) const);
 	//REG_FUNC(0xC334DE66, std::_ctype<char>::do_tolower(char) const);
-	//REG_FUNC(0x2DD808E, std::_ctype<char>::do_toupper(char*, char const*) const);
+	//REG_FUNC(0x02DD808E, std::_ctype<char>::do_toupper(char*, char const*) const);
 	//REG_FUNC(0xF6AF33EA, std::_ctype<char>::do_toupper(char) const);
 	//REG_FUNC(0x1B81D726, std::_ctype<char>::do_widen(char const*, char const*, char*) const);
 	//REG_FUNC(0x6471CC01, std::_ctype<char>::do_widen(char) const);
 	//REG_FUNC(0x9CFA56E5, std::_ctype<char>::do_narrow(char const*, char const*, char, char*) const);
 	//REG_FUNC(0x718669AB, std::_ctype<char>::do_narrow(char, char) const);
 	//REG_FUNC(0x759F105D, std::_ctype<wchar_t>::do_scan_is(short, wchar_t const*, wchar_t const*) const);
-	//REG_FUNC(0x56443F, std::_ctype<wchar_t>::do_tolower(wchar_t*, wchar_t const*) const);
+	//REG_FUNC(0x0056443F, std::_ctype<wchar_t>::do_tolower(wchar_t*, wchar_t const*) const);
 	//REG_FUNC(0x33E9ECDD, std::_ctype<wchar_t>::do_tolower(wchar_t) const);
 	//REG_FUNC(0x1256E6A5, std::_ctype<wchar_t>::do_toupper(wchar_t*, wchar_t const*) const);
 	//REG_FUNC(0x64072C2E, std::_ctype<wchar_t>::do_toupper(wchar_t) const);
@@ -91,7 +91,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x664750EE, std::bad_alloc::what() const);
 	//REG_FUNC(0xBA89FBE7, std::bad_alloc::_Doraise() const);
 	//REG_FUNC(0xC133E331, std::exception::what() const);
-	//REG_FUNC(0x656BE32, std::exception::_Raise() const);
+	//REG_FUNC(0x0656BE32, std::exception::_Raise() const);
 	//REG_FUNC(0x47A5CDA2, std::exception::_Doraise() const);
 	//REG_FUNC(0xBAE38DF9, std::type_info::name() const);
 	//REG_FUNC(0x1F260F10, std::type_info::before(std::type_info const&) const);
@@ -119,10 +119,10 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x9CF31703, std::istrstream::~istrstream());
 	//REG_FUNC(0x71D13A36, std::istrstream::~istrstream());
 	//REG_FUNC(0xAF5DF8C3, std::istrstream::~istrstream());
-	//REG_FUNC(0xC1E7C7A, std::ostrstream::ostrstream(char*, int, std::_Iosb<int>::_Openmode));
-	//REG_FUNC(0xC09B290, std::ostrstream::ostrstream(char*, int, std::_Iosb<int>::_Openmode));
+	//REG_FUNC(0x0C1E7C7A, std::ostrstream::ostrstream(char*, int, std::_Iosb<int>::_Openmode));
+	//REG_FUNC(0x0C09B290, std::ostrstream::ostrstream(char*, int, std::_Iosb<int>::_Openmode));
 	//REG_FUNC(0x4B8BA644, std::ostrstream::~ostrstream());
-	//REG_FUNC(0xE463FB3, std::ostrstream::~ostrstream());
+	//REG_FUNC(0x0E463FB3, std::ostrstream::~ostrstream());
 	//REG_FUNC(0xA0A34FEF, std::ostrstream::~ostrstream());
 	//REG_FUNC(0xC9F632FF, std::logic_error::logic_error(std::logic_error const&));
 	//REG_FUNC(0xE6356C5C, std::logic_error::logic_error(std::string const&));
@@ -136,12 +136,12 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x7D5412EF, std::domain_error::domain_error(std::domain_error const&));
 	//REG_FUNC(0x803A7D3E, std::domain_error::~domain_error());
 	//REG_FUNC(0xA6BCA2AD, std::domain_error::~domain_error());
-	//REG_FUNC(0x36F9D2A, std::domain_error::~domain_error());
+	//REG_FUNC(0x036F9D2A, std::domain_error::~domain_error());
 	//REG_FUNC(0x5F3428AD, std::length_error::length_error(std::length_error const&));
 	//REG_FUNC(0xF6FB801D, std::length_error::length_error(std::string const&));
 	//REG_FUNC(0xF83AA7DA, std::length_error::~length_error());
 	//REG_FUNC(0xA873D7F9, std::length_error::~length_error());
-	//REG_FUNC(0xBB12C75, std::length_error::~length_error());
+	//REG_FUNC(0x0BB12C75, std::length_error::~length_error());
 	//REG_FUNC(0x299AA587, std::out_of_range::out_of_range(std::out_of_range const&));
 	//REG_FUNC(0xC8BA5522, std::out_of_range::out_of_range(std::string const&));
 	//REG_FUNC(0xA8C470A4, std::out_of_range::~out_of_range());
@@ -157,7 +157,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xA9F4FABF, std::strstreambuf::underflow());
 	//REG_FUNC(0x1C887DDE, std::strstreambuf::~strstreambuf());
 	//REG_FUNC(0x29E1E930, std::strstreambuf::~strstreambuf());
-	//REG_FUNC(0xA140889, std::strstreambuf::~strstreambuf());
+	//REG_FUNC(0x0A140889, std::strstreambuf::~strstreambuf());
 	//REG_FUNC(0xA8FE6FC4, std::_codecvt_base::~_codecvt_base());
 	//REG_FUNC(0xB0E47AE4, std::_codecvt_base::~_codecvt_base());
 	//REG_FUNC(0xB7EE9CC2, std::bad_exception::bad_exception(std::bad_exception const&));
@@ -174,7 +174,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x413E813E, std::basic_filebuf<char, std::char_traits<char> >::setbuf(char*, int));
 	//REG_FUNC(0x9D193B65, std::basic_filebuf<char, std::char_traits<char> >::_Unlock());
 	//REG_FUNC(0x52E47FB5, std::basic_filebuf<char, std::char_traits<char> >::seekoff(long, std::_Iosb<int>::_Seekdir, std::_Iosb<int>::_Openmode));
-	//REG_FUNC(0xE119B37, std::basic_filebuf<char, std::char_traits<char> >::seekpos(std::fpos<std::_Mbstatet>, std::_Iosb<int>::_Openmode));
+	//REG_FUNC(0x0E119B37, std::basic_filebuf<char, std::char_traits<char> >::seekpos(std::fpos<std::_Mbstatet>, std::_Iosb<int>::_Openmode));
 	//REG_FUNC(0x616754BC, std::basic_filebuf<char, std::char_traits<char> >::overflow(int));
 	//REG_FUNC(0xCD5BD2E1, std::basic_filebuf<char, std::char_traits<char> >::_Endwrite());
 	//REG_FUNC(0xFC1C7F3A, std::basic_filebuf<char, std::char_traits<char> >::pbackfail(int));
@@ -197,7 +197,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xFFFA683E, std::basic_istream<wchar_t, std::char_traits<wchar_t> >::~basic_istream());
 	//REG_FUNC(0xB58839C5, std::basic_istream<wchar_t, std::char_traits<wchar_t> >::~basic_istream());
 	//REG_FUNC(0x9BF8855B, std::basic_ostream<wchar_t, std::char_traits<wchar_t> >::basic_ostream(std::basic_streambuf<wchar_t, std::char_traits<wchar_t> >*, bool));
-	//REG_FUNC(0xD74F56E, std::basic_ostream<wchar_t, std::char_traits<wchar_t> >::~basic_ostream());
+	//REG_FUNC(0x0D74F56E, std::basic_ostream<wchar_t, std::char_traits<wchar_t> >::~basic_ostream());
 	//REG_FUNC(0x9B831B60, std::basic_ostream<wchar_t, std::char_traits<wchar_t> >::~basic_ostream());
 	//REG_FUNC(0x396337CE, std::runtime_error::runtime_error(std::runtime_error const&));
 	//REG_FUNC(0xDAD26367, std::runtime_error::~runtime_error());
@@ -209,20 +209,20 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x4E45F680, std::overflow_error::~overflow_error());
 	//REG_FUNC(0x626515E3, std::basic_streambuf<char, std::char_traits<char> >::sync());
 	//REG_FUNC(0x2E55F15A, std::basic_streambuf<char, std::char_traits<char> >::_Lock());
-	//REG_FUNC(0xF8535AB, std::basic_streambuf<char, std::char_traits<char> >::uflow());
+	//REG_FUNC(0x0F8535AB, std::basic_streambuf<char, std::char_traits<char> >::uflow());
 	//REG_FUNC(0xD7933D06, std::basic_streambuf<char, std::char_traits<char> >::setbuf(char*, int));
 	//REG_FUNC(0xB8BCCC8D, std::basic_streambuf<char, std::char_traits<char> >::xsgetn(char*, int));
 	//REG_FUNC(0x43E5D0F1, std::basic_streambuf<char, std::char_traits<char> >::xsputn(char const*, int));
 	//REG_FUNC(0x149B193A, std::basic_streambuf<char, std::char_traits<char> >::_Unlock());
 	//REG_FUNC(0x600998EC, std::basic_streambuf<char, std::char_traits<char> >::seekoff(long, std::_Iosb<int>::_Seekdir, std::_Iosb<int>::_Openmode));
-	//REG_FUNC(0x1DEFFD6, std::basic_streambuf<char, std::char_traits<char> >::seekpos(std::fpos<std::_Mbstatet>, std::_Iosb<int>::_Openmode));
+	//REG_FUNC(0x01DEFFD6, std::basic_streambuf<char, std::char_traits<char> >::seekpos(std::fpos<std::_Mbstatet>, std::_Iosb<int>::_Openmode));
 	//REG_FUNC(0xF5F44352, std::basic_streambuf<char, std::char_traits<char> >::overflow(int));
 	//REG_FUNC(0xCA79344F, std::basic_streambuf<char, std::char_traits<char> >::pbackfail(int));
 	//REG_FUNC(0x441788B1, std::basic_streambuf<char, std::char_traits<char> >::showmanyc());
 	//REG_FUNC(0x797DAE94, std::basic_streambuf<char, std::char_traits<char> >::underflow());
-	//REG_FUNC(0x74AD52E, std::basic_streambuf<char, std::char_traits<char> >::~basic_streambuf());
+	//REG_FUNC(0x074AD52E, std::basic_streambuf<char, std::char_traits<char> >::~basic_streambuf());
 	//REG_FUNC(0xE449E2BF, std::basic_streambuf<char, std::char_traits<char> >::~basic_streambuf());
-	//REG_FUNC(0x9FAA0AA, std::basic_streambuf<wchar_t, std::char_traits<wchar_t> >::sync());
+	//REG_FUNC(0x09FAA0AA, std::basic_streambuf<wchar_t, std::char_traits<wchar_t> >::sync());
 	//REG_FUNC(0xA596C88C, std::basic_streambuf<wchar_t, std::char_traits<wchar_t> >::_Lock());
 	//REG_FUNC(0x373C2CD8, std::basic_streambuf<wchar_t, std::char_traits<wchar_t> >::uflow());
 	//REG_FUNC(0x3F363796, std::basic_streambuf<wchar_t, std::char_traits<wchar_t> >::setbuf(wchar_t*, int));
@@ -246,7 +246,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x9982A4FC, std::invalid_argument::~invalid_argument());
 	//REG_FUNC(0x1AB2B1AC, std::invalid_argument::~invalid_argument());
 	//REG_FUNC(0xF9FAB558, std::_Mutex::_Lock());
-	//REG_FUNC(0x402C9F8, std::_Mutex::_Unlock());
+	//REG_FUNC(0x0402C9F8, std::_Mutex::_Unlock());
 	//REG_FUNC(0x9DA92617, std::_Mutex::_Mutex(std::_Uninitialized));
 	//REG_FUNC(0xA4F99AE7, std::_Mutex::_Mutex());
 	//REG_FUNC(0x7B5A6B7F, std::_Mutex::_Mutex(std::_Uninitialized));
@@ -279,12 +279,12 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x65D88619, std::ios_base::Init::~Init());
 	//REG_FUNC(0x3483E01D, std::ios_base::Init::~Init());
 	//REG_FUNC(0x78CB190E, std::ios_base::_Init());
-	//REG_FUNC(0x23B8BEE, std::ios_base::_Tidy());
+	//REG_FUNC(0x023B8BEE, std::ios_base::_Tidy());
 	//REG_FUNC(0xC9DE8208, std::ios_base::clear(std::_Iosb<int>::_Iostate, bool));
 	//REG_FUNC(0xAA9171FB, std::ios_base::_Addstd());
-	//REG_FUNC(0xFC58778, std::ios_base::copyfmt(std::ios_base const&));
+	//REG_FUNC(0x0FC58778, std::ios_base::copyfmt(std::ios_base const&));
 	//REG_FUNC(0x2DF76755, std::ios_base::failure::failure(std::ios_base::failure const&));
-	//REG_FUNC(0x94048F7, std::ios_base::failure::failure(std::string const&));
+	//REG_FUNC(0x094048F7, std::ios_base::failure::failure(std::string const&));
 	//REG_FUNC(0x20AAAB95, std::ios_base::failure::~failure());
 	//REG_FUNC(0x31D0197A, std::ios_base::failure::~failure());
 	//REG_FUNC(0x7736E940, std::ios_base::_Callfns(std::ios_base::event));
@@ -297,18 +297,18 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x6AF75467, std::bad_alloc::bad_alloc(std::bad_alloc const&));
 	//REG_FUNC(0x57096162, std::bad_alloc::bad_alloc());
 	//REG_FUNC(0xB2DAA408, std::bad_alloc::~bad_alloc());
-	//REG_FUNC(0x7AEE736, std::bad_alloc::~bad_alloc());
+	//REG_FUNC(0x07AEE736, std::bad_alloc::~bad_alloc());
 	//REG_FUNC(0xA9E9B7B7, std::bad_alloc::~bad_alloc());
 	//REG_FUNC(0x7853E8E5, std::bad_alloc::operator=(std::bad_alloc const&));
 	//REG_FUNC(0xF78468EB, std::basic_ios<char, std::char_traits<char> >::~basic_ios());
-	//REG_FUNC(0x3150182, std::basic_ios<char, std::char_traits<char> >::~basic_ios());
+	//REG_FUNC(0x03150182, std::basic_ios<char, std::char_traits<char> >::~basic_ios());
 	//REG_FUNC(0x9654168A, std::basic_ios<wchar_t, std::char_traits<wchar_t> >::~basic_ios());
 	//REG_FUNC(0x8FFB8524, std::basic_ios<wchar_t, std::char_traits<wchar_t> >::~basic_ios());
 	//REG_FUNC(0x7AF1BB16, std::exception::_Set_raise_handler(void (*)(std::exception const&)));
 	//REG_FUNC(0x8C5A4417, std::exception::exception(std::exception const&));
 	//REG_FUNC(0xFC169D71, std::exception::exception());
 	//REG_FUNC(0x59758E74, std::exception::exception(std::exception const&));
-	//REG_FUNC(0xE08376, std::exception::exception());
+	//REG_FUNC(0x00E08376, std::exception::exception());
 	//REG_FUNC(0x82EEA67E, std::exception::~exception());
 	//REG_FUNC(0x30405D88, std::exception::~exception());
 	//REG_FUNC(0xAF7A7081, std::exception::~exception());
@@ -320,7 +320,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x7D8DFE43, std::strstream::~strstream());
 	//REG_FUNC(0x8D4B1A13, std::type_info::~type_info());
 	//REG_FUNC(0xBD786240, std::type_info::~type_info());
-	//REG_FUNC(0xC04303, std::type_info::~type_info());
+	//REG_FUNC(0x00C04303, std::type_info::~type_info());
 	//REG_FUNC(0x9983D8B9, std::unexpected());
 	//REG_FUNC(0x385D19B2, std::setiosflags(std::_Iosb<int>::_Fmtflags));
 	//REG_FUNC(0xD8A78A61, std::setprecision(int));
@@ -329,7 +329,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x644CBAA2, std::_Debug_message(char const*, char const*));
 	//REG_FUNC(0x9B2F0CA6, std::set_unexpected(void (*)()));
 	//REG_FUNC(0xC107B555, std::set_new_handler(void (*)()));
-	//REG_FUNC(0x11CEB00, std::uncaught_exception());
+	//REG_FUNC(0x011CEB00, std::uncaught_exception());
 	//REG_FUNC(0x36282336, std::__gen_dummy_typeinfos());
 	//REG_FUNC(0x3622003F, std::setw(int));
 	//REG_FUNC(0x6CAFA8EF, std::_Throw(std::exception const&));
@@ -366,7 +366,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xE7FB2BF4, operator new[](unsigned int));
 	//REG_FUNC(0x31C62481, operator new[](unsigned int, std::nothrow_t const&));
 	//REG_FUNC(0xF99ED5AC, operator new(unsigned int));
-	//REG_FUNC(0xAE71DC3, operator new(unsigned int, std::nothrow_t const&));
+	//REG_FUNC(0x0AE71DC3, operator new(unsigned int, std::nothrow_t const&));
 	//REG_FUNC(0x1818C323, _SNC_get_global_vars);
 	//REG_FUNC(0x2CFA1F15, _SNC_get_tlocal_vars);
 	//REG_FUNC(0x7742D916, _Unwind_Backtrace);
@@ -428,12 +428,12 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xBF90A45A, _PJP_CPP_Copyright);
 	//REG_FUNC(0x3B6D9752, std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >::npos);
 	//REG_FUNC(0xA3498140, std::string::npos);
-	//REG_FUNC(0x5273EA3, std::_Num_int_base::is_bounded);
+	//REG_FUNC(0x05273EA3, std::_Num_int_base::is_bounded);
 	//REG_FUNC(0x8A0994F8, std::_Num_int_base::is_integer);
 	//REG_FUNC(0x401F1224, std::_Num_int_base::is_specialized);
 	//REG_FUNC(0xA65FE916, std::_Num_int_base::radix);
 	//REG_FUNC(0xF2AA872E, std::_Num_int_base::is_exact);
-	//REG_FUNC(0x8FE5A4F, std::_Num_int_base::is_modulo);
+	//REG_FUNC(0x08FE5A4F, std::_Num_int_base::is_modulo);
 	//REG_FUNC(0x7D4C55EC, std::numeric_limits<signed char>::digits);
 	//REG_FUNC(0xA4E5BF5E, std::numeric_limits<signed char>::digits10);
 	//REG_FUNC(0xD9938B84, std::numeric_limits<signed char>::is_signed);
@@ -442,7 +442,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x81B82E0E, std::numeric_limits<bool>::is_modulo);
 	//REG_FUNC(0x9E6D2025, std::numeric_limits<bool>::is_signed);
 	//REG_FUNC(0x810ED593, std::numeric_limits<char>::digits);
-	//REG_FUNC(0xAC1A819, std::numeric_limits<char>::digits10);
+	//REG_FUNC(0x0AC1A819, std::numeric_limits<char>::digits10);
 	//REG_FUNC(0x660E14E1, std::numeric_limits<char>::is_signed);
 	//REG_FUNC(0x3EEB3B23, std::numeric_limits<double>::max_exponent);
 	//REG_FUNC(0x13B634BE, std::numeric_limits<double>::min_exponent);
@@ -470,10 +470,10 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x3AB38CDA, std::numeric_limits<int>::is_signed);
 	//REG_FUNC(0xEEB7B642, std::numeric_limits<unsigned int>::digits);
 	//REG_FUNC(0xBCDE68B3, std::numeric_limits<unsigned int>::digits10);
-	//REG_FUNC(0xDA8EFB0, std::numeric_limits<unsigned int>::is_signed);
+	//REG_FUNC(0x0DA8EFB0, std::numeric_limits<unsigned int>::is_signed);
 	//REG_FUNC(0x65DAD8D6, std::numeric_limits<long>::digits);
 	//REG_FUNC(0xFB52BC0A, std::numeric_limits<long>::digits10);
-	//REG_FUNC(0x63544FC, std::numeric_limits<long>::is_signed);
+	//REG_FUNC(0x063544FC, std::numeric_limits<long>::is_signed);
 	//REG_FUNC(0x441D097A, std::numeric_limits<unsigned long>::digits);
 	//REG_FUNC(0xB56F1B07, std::numeric_limits<unsigned long>::digits10);
 	//REG_FUNC(0xA9799886, std::numeric_limits<unsigned long>::is_signed);
@@ -514,13 +514,13 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x759FD02E, std::_Iosb<int>::app);
 	//REG_FUNC(0x6F410A00, std::_Iosb<int>::ate);
 	//REG_FUNC(0xD2A42D0C, std::_Iosb<int>::beg);
-	//REG_FUNC(0x9B45C3B, std::_Iosb<int>::cur);
+	//REG_FUNC(0x09B45C3B, std::_Iosb<int>::cur);
 	//REG_FUNC(0x121A8952, std::_Iosb<int>::dec);
 	//REG_FUNC(0x7CC027CD, std::_Iosb<int>::end);
 	//REG_FUNC(0x6E2FF90B, std::_Iosb<int>::hex);
 	//REG_FUNC(0xB4A55C29, std::_Iosb<int>::oct);
 	//REG_FUNC(0x2CB2DC70, std::_Iosb<int>::out);
-	//REG_FUNC(0x78E34A9, std::_Iosb<int>::trunc);
+	//REG_FUNC(0x078E34A9, std::_Iosb<int>::trunc);
 	//REG_FUNC(0xB5EFA1B3, std::_Iosb<int>::badbit);
 	//REG_FUNC(0x5312A538, std::_Iosb<int>::binary);
 	//REG_FUNC(0xD9D32526, std::_Iosb<int>::skipws);
@@ -540,10 +540,10 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xB11D20E2, std::_Num_base::has_infinity);
 	//REG_FUNC(0x3E169F74, std::_Num_base::max_exponent);
 	//REG_FUNC(0xD7C041E0, std::_Num_base::min_exponent);
-	//REG_FUNC(0x2DA0D59, std::_Num_base::has_quiet_NaN);
+	//REG_FUNC(0x02DA0D59, std::_Num_base::has_quiet_NaN);
 	//REG_FUNC(0xBE06BD79, std::_Num_base::is_specialized);
 	//REG_FUNC(0xEBBC4DDD, std::_Num_base::max_exponent10);
-	//REG_FUNC(0xFFCF7FC, std::_Num_base::min_exponent10);
+	//REG_FUNC(0x0FFCF7FC, std::_Num_base::min_exponent10);
 	//REG_FUNC(0xB317DDDF, std::_Num_base::has_denorm_loss);
 	//REG_FUNC(0x245D399E, std::_Num_base::tinyness_before);
 	//REG_FUNC(0xBD5F0B8A, std::_Num_base::has_signaling_NaN);
@@ -590,7 +590,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xA4018B84, typeinfo for __simd128_float32_t);
 	//REG_FUNC(0xA1FE4058, typeinfo for half);
 	//REG_FUNC(0x5351829B, typeinfo for std::ios_base::failure);
-	//REG_FUNC(0xAC6C8F, typeinfo for __simd64_int8_t*);
+	//REG_FUNC(0x00AC6C8F, typeinfo for __simd64_int8_t*);
 	//REG_FUNC(0xD5B056B8, typeinfo for __simd128_int8_t*);
 	//REG_FUNC(0x13975DAE, typeinfo for __simd64_int16_t*);
 	//REG_FUNC(0x963C04E3, typeinfo for __simd64_int32_t*);
@@ -605,7 +605,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xEE862280, typeinfo for __simd64_uint32_t*);
 	//REG_FUNC(0xB5CEC4FF, typeinfo for __simd128_poly16_t*);
 	//REG_FUNC(0x46124E82, typeinfo for __simd128_uint16_t*);
-	//REG_FUNC(0x7E6CC17, typeinfo for __simd128_uint32_t*);
+	//REG_FUNC(0x07E6CC17, typeinfo for __simd128_uint32_t*);
 	//REG_FUNC(0x588EBCAD, typeinfo for __simd64_float16_t*);
 	//REG_FUNC(0xDFCB2417, typeinfo for __simd64_float32_t*);
 	//REG_FUNC(0x9502D3C0, typeinfo for __simd128_float16_t*);
@@ -616,8 +616,8 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x52A04C47, typeinfo for __simd64_int16_t const*);
 	//REG_FUNC(0xBB64CCF1, typeinfo for __simd64_int32_t const*);
 	//REG_FUNC(0x7C9D0C33, typeinfo for __simd64_poly8_t const*);
-	//REG_FUNC(0x21A57A1, typeinfo for __simd64_uint8_t const*);
-	//REG_FUNC(0x21E3DD1, typeinfo for __simd128_int16_t const*);
+	//REG_FUNC(0x021A57A1, typeinfo for __simd64_uint8_t const*);
+	//REG_FUNC(0x021E3DD1, typeinfo for __simd128_int16_t const*);
 	//REG_FUNC(0xFF8DDBE7, typeinfo for __simd128_int32_t const*);
 	//REG_FUNC(0xB30AB3B5, typeinfo for __simd128_poly8_t const*);
 	//REG_FUNC(0xC8721E86, typeinfo for __simd128_uint8_t const*);
@@ -654,12 +654,12 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xA6C2A25C, typeinfo for long long __vector*);
 	//REG_FUNC(0x81B51915, typeinfo for unsigned long long __vector*);
 	//REG_FUNC(0xA7CB4EAA, typeinfo for signed char*);
-	//REG_FUNC(0x87B0FB6, typeinfo for bool*);
+	//REG_FUNC(0x087B0FB6, typeinfo for bool*);
 	//REG_FUNC(0xE4D24E14, typeinfo for char*);
 	//REG_FUNC(0x6825FFE6, typeinfo for double*);
 	//REG_FUNC(0x926B9A3A, typeinfo for long double*);
 	//REG_FUNC(0x24072F3E, typeinfo for float*);
-	//REG_FUNC(0x8B5247B, typeinfo for unsigned char*);
+	//REG_FUNC(0x08B5247B, typeinfo for unsigned char*);
 	//REG_FUNC(0x15C21CC8, typeinfo for int*);
 	//REG_FUNC(0xD234CF18, typeinfo for unsigned int*);
 	//REG_FUNC(0x50E25810, typeinfo for long*);
@@ -704,7 +704,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xB93721C7, typeinfo for std::ios_base);
 	//REG_FUNC(0x35E135A0, typeinfo for std::bad_alloc);
 	//REG_FUNC(0x7BA61382, typeinfo for std::basic_ios<char, std::char_traits<char> >);
-	//REG_FUNC(0x905B8B0, typeinfo for std::basic_ios<wchar_t, std::char_traits<wchar_t> >);
+	//REG_FUNC(0x0905B8B0, typeinfo for std::basic_ios<wchar_t, std::char_traits<wchar_t> >);
 	//REG_FUNC(0x1E8C6100, typeinfo for std::exception);
 	//REG_FUNC(0x1CC15F54, typeinfo for std::strstream);
 	//REG_FUNC(0x8A026EAD, typeinfo for std::type_info);
@@ -736,16 +736,16 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xC3FA8530, typeinfo name for __simd128_int16_t);
 	//REG_FUNC(0x67A63A08, typeinfo name for __simd128_int32_t);
 	//REG_FUNC(0x6B26EFF8, typeinfo name for __simd128_poly8_t);
-	//REG_FUNC(0x8C4C69F, typeinfo name for __simd128_uint8_t);
+	//REG_FUNC(0x08C4C69F, typeinfo name for __simd128_uint8_t);
 	//REG_FUNC(0x40BC2E0E, typeinfo name for __simd64_poly16_t);
 	//REG_FUNC(0x8D1AE4A7, typeinfo name for __simd64_uint16_t);
 	//REG_FUNC(0xC4096952, typeinfo name for __simd64_uint32_t);
 	//REG_FUNC(0x16D366F1, typeinfo name for __simd128_poly16_t);
-	//REG_FUNC(0x45552A1, typeinfo name for __simd128_uint16_t);
+	//REG_FUNC(0x045552A1, typeinfo name for __simd128_uint16_t);
 	//REG_FUNC(0x7DBF4FFF, typeinfo name for __simd128_uint32_t);
-	//REG_FUNC(0xED26DE1, typeinfo name for __simd64_float16_t);
+	//REG_FUNC(0x0ED26DE1, typeinfo name for __simd64_float16_t);
 	//REG_FUNC(0xAB0D789A, typeinfo name for __simd64_float32_t);
-	//REG_FUNC(0x3200DDB, typeinfo name for __simd128_float16_t);
+	//REG_FUNC(0x03200DDB, typeinfo name for __simd128_float16_t);
 	//REG_FUNC(0xD54CBD7C, typeinfo name for __simd128_float32_t);
 	//REG_FUNC(0xA8E6842E, typeinfo name for half);
 	//REG_FUNC(0x5246E71E, typeinfo name for std::ios_base::failure);
@@ -777,7 +777,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xC356ACF6, typeinfo name for __simd64_poly8_t const*);
 	//REG_FUNC(0x878C75F4, typeinfo name for __simd64_uint8_t const*);
 	//REG_FUNC(0x68B777E3, typeinfo name for __simd128_int16_t const*);
-	//REG_FUNC(0x61188BD, typeinfo name for __simd128_int32_t const*);
+	//REG_FUNC(0x061188BD, typeinfo name for __simd128_int32_t const*);
 	//REG_FUNC(0xC7733F13, typeinfo name for __simd128_poly8_t const*);
 	//REG_FUNC(0x3D8A69EC, typeinfo name for __simd128_uint8_t const*);
 	//REG_FUNC(0xCC081D58, typeinfo name for __simd64_poly16_t const*);
@@ -827,12 +827,12 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xE2A0B0A8, typeinfo name for unsigned short*);
 	//REG_FUNC(0xF7B6B02A, typeinfo name for void*);
 	//REG_FUNC(0xF1C9A755, typeinfo name for wchar_t*);
-	//REG_FUNC(0x968B212, typeinfo name for long long*);
-	//REG_FUNC(0x9787CAD, typeinfo name for unsigned long long*);
+	//REG_FUNC(0x0968B212, typeinfo name for long long*);
+	//REG_FUNC(0x09787CAD, typeinfo name for unsigned long long*);
 	//REG_FUNC(0xF86F5756, typeinfo name for std::iostream);
 	//REG_FUNC(0x999300E0, typeinfo name for std::istream);
 	//REG_FUNC(0x591C25A3, typeinfo name for std::ostream);
-	//REG_FUNC(0xFC9D21B, typeinfo name for std::bad_typeid);
+	//REG_FUNC(0x0FC9D21B, typeinfo name for std::bad_typeid);
 	//REG_FUNC(0x867D109E, typeinfo name for std::istrstream);
 	//REG_FUNC(0x88BFC745, typeinfo name for std::ostrstream);
 	//REG_FUNC(0xB315CE7A, typeinfo name for std::_ctype_base);
@@ -842,7 +842,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x9E317CE1, typeinfo name for std::length_error);
 	//REG_FUNC(0xD8DAD98D, typeinfo name for std::out_of_range);
 	//REG_FUNC(0x1C929309, typeinfo name for std::strstreambuf);
-	//REG_FUNC(0xE17E4D6, typeinfo name for std::_codecvt_base);
+	//REG_FUNC(0x0E17E4D6, typeinfo name for std::_codecvt_base);
 	//REG_FUNC(0x918FE198, typeinfo name for std::bad_exception);
 	//REG_FUNC(0x227B4568, typeinfo name for std::basic_filebuf<char, std::char_traits<char> >);
 	//REG_FUNC(0xD34BAF59, typeinfo name for std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >);
@@ -871,7 +871,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x2856DCD6, typeinfo name for std::type_info);
 	//REG_FUNC(0x75A1CED4, typeinfo name for long long __vector);
 	//REG_FUNC(0x508FF61E, typeinfo name for unsigned long long __vector);
-	//REG_FUNC(0x8E6A51A, typeinfo name for signed char);
+	//REG_FUNC(0x08E6A51A, typeinfo name for signed char);
 	//REG_FUNC(0x491DB7D3, typeinfo name for bool);
 	//REG_FUNC(0xD657B5A0, typeinfo name for char);
 	//REG_FUNC(0x322C7CB5, typeinfo name for double);
@@ -891,7 +891,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x51B29810, VTT for std::iostream);
 	//REG_FUNC(0x52128B13, VTT for std::istream);
 	//REG_FUNC(0x3C508708, VTT for std::ostream);
-	//REG_FUNC(0x87753F6, VTT for std::istrstream);
+	//REG_FUNC(0x087753F6, VTT for std::istrstream);
 	//REG_FUNC(0xE3D7CB30, VTT for std::ostrstream);
 	//REG_FUNC(0xBC326B50, VTT for std::basic_istream<wchar_t, std::char_traits<wchar_t> >);
 	//REG_FUNC(0x16E32018, VTT for std::basic_ostream<wchar_t, std::char_traits<wchar_t> >);
@@ -914,7 +914,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x82A84E5E, vtable for std::logic_error);
 	//REG_FUNC(0x1D583475, vtable for std::range_error);
 	//REG_FUNC(0x80C77E16, vtable for std::domain_error);
-	//REG_FUNC(0x64ADA35, vtable for std::length_error);
+	//REG_FUNC(0x064ADA35, vtable for std::length_error);
 	//REG_FUNC(0xDDAE7CBE, vtable for std::out_of_range);
 	//REG_FUNC(0x11B2781A, vtable for std::strstreambuf);
 	//REG_FUNC(0x75D16BD0, vtable for std::_codecvt_base);
@@ -925,7 +925,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x48F3405B, vtable for std::basic_ostream<wchar_t, std::char_traits<wchar_t> >);
 	//REG_FUNC(0x53F02A18, vtable for std::runtime_error);
 	//REG_FUNC(0x177FCCDC, vtable for std::overflow_error);
-	//REG_FUNC(0x5548FF7, vtable for std::basic_streambuf<char, std::char_traits<char> >);
+	//REG_FUNC(0x05548FF7, vtable for std::basic_streambuf<char, std::char_traits<char> >);
 	//REG_FUNC(0xE8A9F32E, vtable for std::basic_streambuf<wchar_t, std::char_traits<wchar_t> >);
 	//REG_FUNC(0x515AE097, vtable for std::underflow_error);
 	//REG_FUNC(0x23EEDAF0, vtable for std::invalid_argument);
@@ -937,7 +937,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0xD58C5F52, vtable for std::ios_base);
 	//REG_FUNC(0xA27EFBA3, vtable for std::bad_alloc);
 	//REG_FUNC(0x147996ED, vtable for std::basic_ios<char, std::char_traits<char> >);
-	//REG_FUNC(0xDE4AFE9, _ZTVSt9basic_iosIcSt11char_traitsIcEE__Sd__St9strstream);
+	//REG_FUNC(0x0DE4AFE9, _ZTVSt9basic_iosIcSt11char_traitsIcEE__Sd__St9strstream);
 	//REG_FUNC(0x87D18300, _ZTVSt9basic_iosIcSt11char_traitsIcEE__SiSd__St9strstream);
 	//REG_FUNC(0x3D6A38D3, _ZTVSt9basic_iosIcSt11char_traitsIcEE__Si__Sd);
 	//REG_FUNC(0xA8E795AF, _ZTVSt9basic_iosIcSt11char_traitsIcEE__Si__St10istrstream);
@@ -950,7 +950,7 @@ psv_log_base sceLibstdcxx("SceLibstdcxx", []()
 	//REG_FUNC(0x8E9879A7, vtable for std::type_info);
 	//REG_FUNC(0xE63750C1, std::basic_filebuf<char, std::char_traits<char> >::_Init(std::_Dnk_filet*, std::basic_filebuf<char, std::char_traits<char> >::_Initfl)::_Stinit);
 	//REG_FUNC(0x1D4E29BC, std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::_Init(std::_Dnk_filet*, std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::_Initfl)::_Stinit);
-	//REG_FUNC(0x8A37475, typeinfo for __cxxabiv1::__enum_type_info);
+	//REG_FUNC(0x08A37475, typeinfo for __cxxabiv1::__enum_type_info);
 	//REG_FUNC(0x66CC7DBB, typeinfo for __cxxabiv1::__array_type_info);
 	//REG_FUNC(0x81C44513, typeinfo for __cxxabiv1::__class_type_info);
 	//REG_FUNC(0xC35024DA, typeinfo for __cxxabiv1::__pbase_type_info);
@@ -1008,14 +1008,14 @@ REG_FUNC(0xB1AE6F9E, _ZNKSt15underflow_error8_DoraiseEv);
 REG_FUNC(0x16F56E8D, _ZNKSt16invalid_argument8_DoraiseEv);
 REG_FUNC(0x6C568D20, _ZNKSt6_ctypeIcE10do_tolowerEPcPKc);
 REG_FUNC(0xC334DE66, _ZNKSt6_ctypeIcE10do_tolowerEc);
-REG_FUNC(0x2DD808E, _ZNKSt6_ctypeIcE10do_toupperEPcPKc);
+REG_FUNC(0x02DD808E, _ZNKSt6_ctypeIcE10do_toupperEPcPKc);
 REG_FUNC(0xF6AF33EA, _ZNKSt6_ctypeIcE10do_toupperEc);
 REG_FUNC(0x1B81D726, _ZNKSt6_ctypeIcE8do_widenEPKcS2_Pc);
 REG_FUNC(0x6471CC01, _ZNKSt6_ctypeIcE8do_widenEc);
 REG_FUNC(0x9CFA56E5, _ZNKSt6_ctypeIcE9do_narrowEPKcS2_cPc);
 REG_FUNC(0x718669AB, _ZNKSt6_ctypeIcE9do_narrowEcc);
 REG_FUNC(0x759F105D, _ZNKSt6_ctypeIwE10do_scan_isEsPKwS2_);
-REG_FUNC(0x56443F, _ZNKSt6_ctypeIwE10do_tolowerEPwPKw);
+REG_FUNC(0x0056443F, _ZNKSt6_ctypeIwE10do_tolowerEPwPKw);
 REG_FUNC(0x33E9ECDD, _ZNKSt6_ctypeIwE10do_tolowerEw);
 REG_FUNC(0x1256E6A5, _ZNKSt6_ctypeIwE10do_toupperEPwPKw);
 REG_FUNC(0x64072C2E, _ZNKSt6_ctypeIwE10do_toupperEw);
@@ -1043,7 +1043,7 @@ REG_FUNC(0xF877F51E, _ZNKSt8ios_base7failure8_DoraiseEv);
 REG_FUNC(0x664750EE, _ZNKSt9bad_alloc4whatEv);
 REG_FUNC(0xBA89FBE7, _ZNKSt9bad_alloc8_DoraiseEv);
 REG_FUNC(0xC133E331, _ZNKSt9exception4whatEv);
-REG_FUNC(0x656BE32, _ZNKSt9exception6_RaiseEv);
+REG_FUNC(0x0656BE32, _ZNKSt9exception6_RaiseEv);
 REG_FUNC(0x47A5CDA2, _ZNKSt9exception8_DoraiseEv);
 REG_FUNC(0xBAE38DF9, _ZNKSt9type_info4nameEv);
 REG_FUNC(0x1F260F10, _ZNKSt9type_info6beforeERKS_);
@@ -1071,10 +1071,10 @@ REG_FUNC(0x55AAD6A6, _ZNSt10bad_typeidaSERKS_);
 REG_FUNC(0x9CF31703, _ZNSt10istrstreamD0Ev);
 REG_FUNC(0x71D13A36, _ZNSt10istrstreamD1Ev);
 REG_FUNC(0xAF5DF8C3, _ZNSt10istrstreamD2Ev);
-REG_FUNC(0xC1E7C7A, _ZNSt10ostrstreamC1EPciNSt5_IosbIiE9_OpenmodeE);
-REG_FUNC(0xC09B290, _ZNSt10ostrstreamC2EPciNSt5_IosbIiE9_OpenmodeE);
+REG_FUNC(0x0C1E7C7A, _ZNSt10ostrstreamC1EPciNSt5_IosbIiE9_OpenmodeE);
+REG_FUNC(0x0C09B290, _ZNSt10ostrstreamC2EPciNSt5_IosbIiE9_OpenmodeE);
 REG_FUNC(0x4B8BA644, _ZNSt10ostrstreamD0Ev);
-REG_FUNC(0xE463FB3, _ZNSt10ostrstreamD1Ev);
+REG_FUNC(0x0E463FB3, _ZNSt10ostrstreamD1Ev);
 REG_FUNC(0xA0A34FEF, _ZNSt10ostrstreamD2Ev);
 REG_FUNC(0xC9F632FF, _ZNSt11logic_errorC1ERKS_);
 REG_FUNC(0xE6356C5C, _ZNSt11logic_errorC2ERKSs);
@@ -1088,12 +1088,12 @@ REG_FUNC(0xEF754EBD, _ZNSt11range_errorD2Ev);
 REG_FUNC(0x7D5412EF, _ZNSt12domain_errorC1ERKS_);
 REG_FUNC(0x803A7D3E, _ZNSt12domain_errorD0Ev);
 REG_FUNC(0xA6BCA2AD, _ZNSt12domain_errorD1Ev);
-REG_FUNC(0x36F9D2A, _ZNSt12domain_errorD2Ev);
+REG_FUNC(0x036F9D2A, _ZNSt12domain_errorD2Ev);
 REG_FUNC(0x5F3428AD, _ZNSt12length_errorC1ERKS_);
 REG_FUNC(0xF6FB801D, _ZNSt12length_errorC1ERKSs);
 REG_FUNC(0xF83AA7DA, _ZNSt12length_errorD0Ev);
 REG_FUNC(0xA873D7F9, _ZNSt12length_errorD1Ev);
-REG_FUNC(0xBB12C75, _ZNSt12length_errorD2Ev);
+REG_FUNC(0x0BB12C75, _ZNSt12length_errorD2Ev);
 REG_FUNC(0x299AA587, _ZNSt12out_of_rangeC1ERKS_);
 REG_FUNC(0xC8BA5522, _ZNSt12out_of_rangeC1ERKSs);
 REG_FUNC(0xA8C470A4, _ZNSt12out_of_rangeD0Ev);
@@ -1109,7 +1109,7 @@ REG_FUNC(0xC725F896, _ZNSt12strstreambuf9pbackfailEi);
 REG_FUNC(0xA9F4FABF, _ZNSt12strstreambuf9underflowEv);
 REG_FUNC(0x1C887DDE, _ZNSt12strstreambufD0Ev);
 REG_FUNC(0x29E1E930, _ZNSt12strstreambufD1Ev);
-REG_FUNC(0xA140889, _ZNSt12strstreambufD2Ev);
+REG_FUNC(0x0A140889, _ZNSt12strstreambufD2Ev);
 REG_FUNC(0xA8FE6FC4, _ZNSt13_codecvt_baseD0Ev);
 REG_FUNC(0xB0E47AE4, _ZNSt13_codecvt_baseD1Ev);
 REG_FUNC(0xB7EE9CC2, _ZNSt13bad_exceptionC1ERKS_);
@@ -1126,7 +1126,7 @@ REG_FUNC(0xD5F03A74, _ZNSt13basic_filebufIcSt11char_traitsIcEE5uflowEv);
 REG_FUNC(0x413E813E, _ZNSt13basic_filebufIcSt11char_traitsIcEE6setbufEPci);
 REG_FUNC(0x9D193B65, _ZNSt13basic_filebufIcSt11char_traitsIcEE7_UnlockEv);
 REG_FUNC(0x52E47FB5, _ZNSt13basic_filebufIcSt11char_traitsIcEE7seekoffElNSt5_IosbIiE8_SeekdirENS4_9_OpenmodeE);
-REG_FUNC(0xE119B37, _ZNSt13basic_filebufIcSt11char_traitsIcEE7seekposESt4fposISt9_MbstatetENSt5_IosbIiE9_OpenmodeE);
+REG_FUNC(0x0E119B37, _ZNSt13basic_filebufIcSt11char_traitsIcEE7seekposESt4fposISt9_MbstatetENSt5_IosbIiE9_OpenmodeE);
 REG_FUNC(0x616754BC, _ZNSt13basic_filebufIcSt11char_traitsIcEE8overflowEi);
 REG_FUNC(0xCD5BD2E1, _ZNSt13basic_filebufIcSt11char_traitsIcEE9_EndwriteEv);
 REG_FUNC(0xFC1C7F3A, _ZNSt13basic_filebufIcSt11char_traitsIcEE9pbackfailEi);
@@ -1149,7 +1149,7 @@ REG_FUNC(0xD434F085, _ZNSt13basic_filebufIwSt11char_traitsIwEED1Ev);
 REG_FUNC(0xFFFA683E, _ZNSt13basic_istreamIwSt11char_traitsIwEED0Ev);
 REG_FUNC(0xB58839C5, _ZNSt13basic_istreamIwSt11char_traitsIwEED1Ev);
 REG_FUNC(0x9BF8855B, _ZNSt13basic_ostreamIwSt11char_traitsIwEEC1EPSt15basic_streambufIwS1_Eb);
-REG_FUNC(0xD74F56E, _ZNSt13basic_ostreamIwSt11char_traitsIwEED0Ev);
+REG_FUNC(0x0D74F56E, _ZNSt13basic_ostreamIwSt11char_traitsIwEED0Ev);
 REG_FUNC(0x9B831B60, _ZNSt13basic_ostreamIwSt11char_traitsIwEED1Ev);
 REG_FUNC(0x396337CE, _ZNSt13runtime_errorC1ERKS_);
 REG_FUNC(0xDAD26367, _ZNSt13runtime_errorD0Ev);
@@ -1161,20 +1161,20 @@ REG_FUNC(0x5C666F7E, _ZNSt14overflow_errorD1Ev);
 REG_FUNC(0x4E45F680, _ZNSt14overflow_errorD2Ev);
 REG_FUNC(0x626515E3, _ZNSt15basic_streambufIcSt11char_traitsIcEE4syncEv);
 REG_FUNC(0x2E55F15A, _ZNSt15basic_streambufIcSt11char_traitsIcEE5_LockEv);
-REG_FUNC(0xF8535AB, _ZNSt15basic_streambufIcSt11char_traitsIcEE5uflowEv);
+REG_FUNC(0x0F8535AB, _ZNSt15basic_streambufIcSt11char_traitsIcEE5uflowEv);
 REG_FUNC(0xD7933D06, _ZNSt15basic_streambufIcSt11char_traitsIcEE6setbufEPci);
 REG_FUNC(0xB8BCCC8D, _ZNSt15basic_streambufIcSt11char_traitsIcEE6xsgetnEPci);
 REG_FUNC(0x43E5D0F1, _ZNSt15basic_streambufIcSt11char_traitsIcEE6xsputnEPKci);
 REG_FUNC(0x149B193A, _ZNSt15basic_streambufIcSt11char_traitsIcEE7_UnlockEv);
 REG_FUNC(0x600998EC, _ZNSt15basic_streambufIcSt11char_traitsIcEE7seekoffElNSt5_IosbIiE8_SeekdirENS4_9_OpenmodeE);
-REG_FUNC(0x1DEFFD6, _ZNSt15basic_streambufIcSt11char_traitsIcEE7seekposESt4fposISt9_MbstatetENSt5_IosbIiE9_OpenmodeE);
+REG_FUNC(0x01DEFFD6, _ZNSt15basic_streambufIcSt11char_traitsIcEE7seekposESt4fposISt9_MbstatetENSt5_IosbIiE9_OpenmodeE);
 REG_FUNC(0xF5F44352, _ZNSt15basic_streambufIcSt11char_traitsIcEE8overflowEi);
 REG_FUNC(0xCA79344F, _ZNSt15basic_streambufIcSt11char_traitsIcEE9pbackfailEi);
 REG_FUNC(0x441788B1, _ZNSt15basic_streambufIcSt11char_traitsIcEE9showmanycEv);
 REG_FUNC(0x797DAE94, _ZNSt15basic_streambufIcSt11char_traitsIcEE9underflowEv);
-REG_FUNC(0x74AD52E, _ZNSt15basic_streambufIcSt11char_traitsIcEED0Ev);
+REG_FUNC(0x074AD52E, _ZNSt15basic_streambufIcSt11char_traitsIcEED0Ev);
 REG_FUNC(0xE449E2BF, _ZNSt15basic_streambufIcSt11char_traitsIcEED1Ev);
-REG_FUNC(0x9FAA0AA, _ZNSt15basic_streambufIwSt11char_traitsIwEE4syncEv);
+REG_FUNC(0x09FAA0AA, _ZNSt15basic_streambufIwSt11char_traitsIwEE4syncEv);
 REG_FUNC(0xA596C88C, _ZNSt15basic_streambufIwSt11char_traitsIwEE5_LockEv);
 REG_FUNC(0x373C2CD8, _ZNSt15basic_streambufIwSt11char_traitsIwEE5uflowEv);
 REG_FUNC(0x3F363796, _ZNSt15basic_streambufIwSt11char_traitsIwEE6setbufEPwi);
@@ -1198,7 +1198,7 @@ REG_FUNC(0x188D86CF, _ZNSt16invalid_argumentD0Ev);
 REG_FUNC(0x9982A4FC, _ZNSt16invalid_argumentD1Ev);
 REG_FUNC(0x1AB2B1AC, _ZNSt16invalid_argumentD2Ev);
 REG_FUNC(0xF9FAB558, _ZNSt6_Mutex5_LockEv);
-REG_FUNC(0x402C9F8, _ZNSt6_Mutex7_UnlockEv);
+REG_FUNC(0x0402C9F8, _ZNSt6_Mutex7_UnlockEv);
 REG_FUNC(0x9DA92617, _ZNSt6_MutexC1ESt14_Uninitialized);
 REG_FUNC(0xA4F99AE7, _ZNSt6_MutexC1Ev);
 REG_FUNC(0x7B5A6B7F, _ZNSt6_MutexC2ESt14_Uninitialized);
@@ -1231,12 +1231,12 @@ REG_FUNC(0x5ED60DEE, _ZNSt8ios_base4InitC2Ev);
 REG_FUNC(0x65D88619, _ZNSt8ios_base4InitD1Ev);
 REG_FUNC(0x3483E01D, _ZNSt8ios_base4InitD2Ev);
 REG_FUNC(0x78CB190E, _ZNSt8ios_base5_InitEv);
-REG_FUNC(0x23B8BEE, _ZNSt8ios_base5_TidyEv);
+REG_FUNC(0x023B8BEE, _ZNSt8ios_base5_TidyEv);
 REG_FUNC(0xC9DE8208, _ZNSt8ios_base5clearENSt5_IosbIiE8_IostateEb);
 REG_FUNC(0xAA9171FB, _ZNSt8ios_base7_AddstdEv);
-REG_FUNC(0xFC58778, _ZNSt8ios_base7copyfmtERKS_);
+REG_FUNC(0x0FC58778, _ZNSt8ios_base7copyfmtERKS_);
 REG_FUNC(0x2DF76755, _ZNSt8ios_base7failureC1ERKS0_);
-REG_FUNC(0x94048F7, _ZNSt8ios_base7failureC1ERKSs);
+REG_FUNC(0x094048F7, _ZNSt8ios_base7failureC1ERKSs);
 REG_FUNC(0x20AAAB95, _ZNSt8ios_base7failureD0Ev);
 REG_FUNC(0x31D0197A, _ZNSt8ios_base7failureD1Ev);
 REG_FUNC(0x7736E940, _ZNSt8ios_base8_CallfnsENS_5eventE);
@@ -1249,18 +1249,18 @@ REG_FUNC(0xEC3804D2, _ZNSt9bad_allocC1Ev);
 REG_FUNC(0x6AF75467, _ZNSt9bad_allocC2ERKS_);
 REG_FUNC(0x57096162, _ZNSt9bad_allocC2Ev);
 REG_FUNC(0xB2DAA408, _ZNSt9bad_allocD0Ev);
-REG_FUNC(0x7AEE736, _ZNSt9bad_allocD1Ev);
+REG_FUNC(0x07AEE736, _ZNSt9bad_allocD1Ev);
 REG_FUNC(0xA9E9B7B7, _ZNSt9bad_allocD2Ev);
 REG_FUNC(0x7853E8E5, _ZNSt9bad_allocaSERKS_);
 REG_FUNC(0xF78468EB, _ZNSt9basic_iosIcSt11char_traitsIcEED0Ev);
-REG_FUNC(0x3150182, _ZNSt9basic_iosIcSt11char_traitsIcEED1Ev);
+REG_FUNC(0x03150182, _ZNSt9basic_iosIcSt11char_traitsIcEED1Ev);
 REG_FUNC(0x9654168A, _ZNSt9basic_iosIwSt11char_traitsIwEED0Ev);
 REG_FUNC(0x8FFB8524, _ZNSt9basic_iosIwSt11char_traitsIwEED1Ev);
 REG_FUNC(0x7AF1BB16, _ZNSt9exception18_Set_raise_handlerEPFvRKS_E);
 REG_FUNC(0x8C5A4417, _ZNSt9exceptionC1ERKS_);
 REG_FUNC(0xFC169D71, _ZNSt9exceptionC1Ev);
 REG_FUNC(0x59758E74, _ZNSt9exceptionC2ERKS_);
-REG_FUNC(0xE08376, _ZNSt9exceptionC2Ev);
+REG_FUNC(0x00E08376, _ZNSt9exceptionC2Ev);
 REG_FUNC(0x82EEA67E, _ZNSt9exceptionD0Ev);
 REG_FUNC(0x30405D88, _ZNSt9exceptionD1Ev);
 REG_FUNC(0xAF7A7081, _ZNSt9exceptionD2Ev);
@@ -1272,7 +1272,7 @@ REG_FUNC(0x98BD8AE1, _ZNSt9strstreamD1Ev);
 REG_FUNC(0x7D8DFE43, _ZNSt9strstreamD2Ev);
 REG_FUNC(0x8D4B1A13, _ZNSt9type_infoD0Ev);
 REG_FUNC(0xBD786240, _ZNSt9type_infoD1Ev);
-REG_FUNC(0xC04303, _ZNSt9type_infoD2Ev);
+REG_FUNC(0x00C04303, _ZNSt9type_infoD2Ev);
 REG_FUNC(0x9983D8B9, _ZSt10unexpectedv);
 REG_FUNC(0x385D19B2, _ZSt11setiosflagsNSt5_IosbIiE9_FmtflagsE);
 REG_FUNC(0xD8A78A61, _ZSt12setprecisioni);
@@ -1281,7 +1281,7 @@ REG_FUNC(0x13BAEE11, _ZSt13set_terminatePFvvE);
 REG_FUNC(0x644CBAA2, _ZSt14_Debug_messagePKcS0_);
 REG_FUNC(0x9B2F0CA6, _ZSt14set_unexpectedPFvvE);
 REG_FUNC(0xC107B555, _ZSt15set_new_handlerPFvvE);
-REG_FUNC(0x11CEB00, _ZSt18uncaught_exceptionv);
+REG_FUNC(0x011CEB00, _ZSt18uncaught_exceptionv);
 REG_FUNC(0x36282336, _ZSt21__gen_dummy_typeinfosv);
 REG_FUNC(0x3622003F, _ZSt4setwi);
 REG_FUNC(0x6CAFA8EF, _ZSt6_ThrowRKSt9exception);
@@ -1318,7 +1318,7 @@ REG_FUNC(0x1EB89099, _ZdlPvS_);
 REG_FUNC(0xE7FB2BF4, _Znaj);
 REG_FUNC(0x31C62481, _ZnajRKSt9nothrow_t);
 REG_FUNC(0xF99ED5AC, _Znwj);
-REG_FUNC(0xAE71DC3, _ZnwjRKSt9nothrow_t);
+REG_FUNC(0x0AE71DC3, _ZnwjRKSt9nothrow_t);
 REG_FUNC(0x1818C323, _SNC_get_global_vars);
 REG_FUNC(0x2CFA1F15, _SNC_get_tlocal_vars);
 REG_FUNC(0x7742D916, _Unwind_Backtrace);
@@ -1380,12 +1380,12 @@ REG_FUNC(0xD4C11B17, _ZN10__cxxabiv129__pointer_to_member_type_infoD2Ev);
 REG_FUNC(0xBF90A45A, _PJP_CPP_Copyright);
 REG_FUNC(0x3B6D9752, _ZNSbIwSt11char_traitsIwESaIwEE4nposE);
 REG_FUNC(0xA3498140, _ZNSs4nposE);
-REG_FUNC(0x5273EA3, _ZNSt13_Num_int_base10is_boundedE);
+REG_FUNC(0x05273EA3, _ZNSt13_Num_int_base10is_boundedE);
 REG_FUNC(0x8A0994F8, _ZNSt13_Num_int_base10is_integerE);
 REG_FUNC(0x401F1224, _ZNSt13_Num_int_base14is_specializedE);
 REG_FUNC(0xA65FE916, _ZNSt13_Num_int_base5radixE);
 REG_FUNC(0xF2AA872E, _ZNSt13_Num_int_base8is_exactE);
-REG_FUNC(0x8FE5A4F, _ZNSt13_Num_int_base9is_moduloE);
+REG_FUNC(0x08FE5A4F, _ZNSt13_Num_int_base9is_moduloE);
 REG_FUNC(0x7D4C55EC, _ZNSt14numeric_limitsIaE6digitsE);
 REG_FUNC(0xA4E5BF5E, _ZNSt14numeric_limitsIaE8digits10E);
 REG_FUNC(0xD9938B84, _ZNSt14numeric_limitsIaE9is_signedE);
@@ -1394,7 +1394,7 @@ REG_FUNC(0xF52E5F76, _ZNSt14numeric_limitsIbE8digits10E);
 REG_FUNC(0x81B82E0E, _ZNSt14numeric_limitsIbE9is_moduloE);
 REG_FUNC(0x9E6D2025, _ZNSt14numeric_limitsIbE9is_signedE);
 REG_FUNC(0x810ED593, _ZNSt14numeric_limitsIcE6digitsE);
-REG_FUNC(0xAC1A819, _ZNSt14numeric_limitsIcE8digits10E);
+REG_FUNC(0x0AC1A819, _ZNSt14numeric_limitsIcE8digits10E);
 REG_FUNC(0x660E14E1, _ZNSt14numeric_limitsIcE9is_signedE);
 REG_FUNC(0x3EEB3B23, _ZNSt14numeric_limitsIdE12max_exponentE);
 REG_FUNC(0x13B634BE, _ZNSt14numeric_limitsIdE12min_exponentE);
@@ -1422,10 +1422,10 @@ REG_FUNC(0xE8EB3133, _ZNSt14numeric_limitsIiE8digits10E);
 REG_FUNC(0x3AB38CDA, _ZNSt14numeric_limitsIiE9is_signedE);
 REG_FUNC(0xEEB7B642, _ZNSt14numeric_limitsIjE6digitsE);
 REG_FUNC(0xBCDE68B3, _ZNSt14numeric_limitsIjE8digits10E);
-REG_FUNC(0xDA8EFB0, _ZNSt14numeric_limitsIjE9is_signedE);
+REG_FUNC(0x0DA8EFB0, _ZNSt14numeric_limitsIjE9is_signedE);
 REG_FUNC(0x65DAD8D6, _ZNSt14numeric_limitsIlE6digitsE);
 REG_FUNC(0xFB52BC0A, _ZNSt14numeric_limitsIlE8digits10E);
-REG_FUNC(0x63544FC, _ZNSt14numeric_limitsIlE9is_signedE);
+REG_FUNC(0x063544FC, _ZNSt14numeric_limitsIlE9is_signedE);
 REG_FUNC(0x441D097A, _ZNSt14numeric_limitsImE6digitsE);
 REG_FUNC(0xB56F1B07, _ZNSt14numeric_limitsImE8digits10E);
 REG_FUNC(0xA9799886, _ZNSt14numeric_limitsImE9is_signedE);
@@ -1466,13 +1466,13 @@ REG_FUNC(0xE615A657, _ZNSt5_IosbIiE2inE);
 REG_FUNC(0x759FD02E, _ZNSt5_IosbIiE3appE);
 REG_FUNC(0x6F410A00, _ZNSt5_IosbIiE3ateE);
 REG_FUNC(0xD2A42D0C, _ZNSt5_IosbIiE3begE);
-REG_FUNC(0x9B45C3B, _ZNSt5_IosbIiE3curE);
+REG_FUNC(0x09B45C3B, _ZNSt5_IosbIiE3curE);
 REG_FUNC(0x121A8952, _ZNSt5_IosbIiE3decE);
 REG_FUNC(0x7CC027CD, _ZNSt5_IosbIiE3endE);
 REG_FUNC(0x6E2FF90B, _ZNSt5_IosbIiE3hexE);
 REG_FUNC(0xB4A55C29, _ZNSt5_IosbIiE3octE);
 REG_FUNC(0x2CB2DC70, _ZNSt5_IosbIiE3outE);
-REG_FUNC(0x78E34A9, _ZNSt5_IosbIiE5truncE);
+REG_FUNC(0x078E34A9, _ZNSt5_IosbIiE5truncE);
 REG_FUNC(0xB5EFA1B3, _ZNSt5_IosbIiE6badbitE);
 REG_FUNC(0x5312A538, _ZNSt5_IosbIiE6binaryE);
 REG_FUNC(0xD9D32526, _ZNSt5_IosbIiE6skipwsE);
@@ -1492,10 +1492,10 @@ REG_FUNC(0x13B38354, _ZNSt9_Num_base11round_styleE);
 REG_FUNC(0xB11D20E2, _ZNSt9_Num_base12has_infinityE);
 REG_FUNC(0x3E169F74, _ZNSt9_Num_base12max_exponentE);
 REG_FUNC(0xD7C041E0, _ZNSt9_Num_base12min_exponentE);
-REG_FUNC(0x2DA0D59, _ZNSt9_Num_base13has_quiet_NaNE);
+REG_FUNC(0x02DA0D59, _ZNSt9_Num_base13has_quiet_NaNE);
 REG_FUNC(0xBE06BD79, _ZNSt9_Num_base14is_specializedE);
 REG_FUNC(0xEBBC4DDD, _ZNSt9_Num_base14max_exponent10E);
-REG_FUNC(0xFFCF7FC, _ZNSt9_Num_base14min_exponent10E);
+REG_FUNC(0x0FFCF7FC, _ZNSt9_Num_base14min_exponent10E);
 REG_FUNC(0xB317DDDF, _ZNSt9_Num_base15has_denorm_lossE);
 REG_FUNC(0x245D399E, _ZNSt9_Num_base15tinyness_beforeE);
 REG_FUNC(0xBD5F0B8A, _ZNSt9_Num_base17has_signaling_NaNE);
@@ -1542,7 +1542,7 @@ REG_FUNC(0x525557F3, _ZTI19__simd128_float16_t);
 REG_FUNC(0xA4018B84, _ZTI19__simd128_float32_t);
 REG_FUNC(0xA1FE4058, _ZTIDh);
 REG_FUNC(0x5351829B, _ZTINSt8ios_base7failureE);
-REG_FUNC(0xAC6C8F, _ZTIP15__simd64_int8_t);
+REG_FUNC(0x00AC6C8F, _ZTIP15__simd64_int8_t);
 REG_FUNC(0xD5B056B8, _ZTIP16__simd128_int8_t);
 REG_FUNC(0x13975DAE, _ZTIP16__simd64_int16_t);
 REG_FUNC(0x963C04E3, _ZTIP16__simd64_int32_t);
@@ -1557,7 +1557,7 @@ REG_FUNC(0xA96D02B1, _ZTIP17__simd64_uint16_t);
 REG_FUNC(0xEE862280, _ZTIP17__simd64_uint32_t);
 REG_FUNC(0xB5CEC4FF, _ZTIP18__simd128_poly16_t);
 REG_FUNC(0x46124E82, _ZTIP18__simd128_uint16_t);
-REG_FUNC(0x7E6CC17, _ZTIP18__simd128_uint32_t);
+REG_FUNC(0x07E6CC17, _ZTIP18__simd128_uint32_t);
 REG_FUNC(0x588EBCAD, _ZTIP18__simd64_float16_t);
 REG_FUNC(0xDFCB2417, _ZTIP18__simd64_float32_t);
 REG_FUNC(0x9502D3C0, _ZTIP19__simd128_float16_t);
@@ -1568,8 +1568,8 @@ REG_FUNC(0x60D7D920, _ZTIPK16__simd128_int8_t);
 REG_FUNC(0x52A04C47, _ZTIPK16__simd64_int16_t);
 REG_FUNC(0xBB64CCF1, _ZTIPK16__simd64_int32_t);
 REG_FUNC(0x7C9D0C33, _ZTIPK16__simd64_poly8_t);
-REG_FUNC(0x21A57A1, _ZTIPK16__simd64_uint8_t);
-REG_FUNC(0x21E3DD1, _ZTIPK17__simd128_int16_t);
+REG_FUNC(0x021A57A1, _ZTIPK16__simd64_uint8_t);
+REG_FUNC(0x021E3DD1, _ZTIPK17__simd128_int16_t);
 REG_FUNC(0xFF8DDBE7, _ZTIPK17__simd128_int32_t);
 REG_FUNC(0xB30AB3B5, _ZTIPK17__simd128_poly8_t);
 REG_FUNC(0xC8721E86, _ZTIPK17__simd128_uint8_t);
@@ -1606,12 +1606,12 @@ REG_FUNC(0xA0F5E8F5, _ZTIPKy);
 REG_FUNC(0xA6C2A25C, _ZTIPU8__vectorx);
 REG_FUNC(0x81B51915, _ZTIPU8__vectory);
 REG_FUNC(0xA7CB4EAA, _ZTIPa);
-REG_FUNC(0x87B0FB6, _ZTIPb);
+REG_FUNC(0x087B0FB6, _ZTIPb);
 REG_FUNC(0xE4D24E14, _ZTIPc);
 REG_FUNC(0x6825FFE6, _ZTIPd);
 REG_FUNC(0x926B9A3A, _ZTIPe);
 REG_FUNC(0x24072F3E, _ZTIPf);
-REG_FUNC(0x8B5247B, _ZTIPh);
+REG_FUNC(0x08B5247B, _ZTIPh);
 REG_FUNC(0x15C21CC8, _ZTIPi);
 REG_FUNC(0xD234CF18, _ZTIPj);
 REG_FUNC(0x50E25810, _ZTIPl);
@@ -1656,7 +1656,7 @@ REG_FUNC(0xA7CA7C93, _ZTISt8bad_cast);
 REG_FUNC(0xB93721C7, _ZTISt8ios_base);
 REG_FUNC(0x35E135A0, _ZTISt9bad_alloc);
 REG_FUNC(0x7BA61382, _ZTISt9basic_iosIcSt11char_traitsIcEE);
-REG_FUNC(0x905B8B0, _ZTISt9basic_iosIwSt11char_traitsIwEE);
+REG_FUNC(0x0905B8B0, _ZTISt9basic_iosIwSt11char_traitsIwEE);
 REG_FUNC(0x1E8C6100, _ZTISt9exception);
 REG_FUNC(0x1CC15F54, _ZTISt9strstream);
 REG_FUNC(0x8A026EAD, _ZTISt9type_info);
@@ -1688,16 +1688,16 @@ REG_FUNC(0xCD2802B5, _ZTS16__simd64_uint8_t);
 REG_FUNC(0xC3FA8530, _ZTS17__simd128_int16_t);
 REG_FUNC(0x67A63A08, _ZTS17__simd128_int32_t);
 REG_FUNC(0x6B26EFF8, _ZTS17__simd128_poly8_t);
-REG_FUNC(0x8C4C69F, _ZTS17__simd128_uint8_t);
+REG_FUNC(0x08C4C69F, _ZTS17__simd128_uint8_t);
 REG_FUNC(0x40BC2E0E, _ZTS17__simd64_poly16_t);
 REG_FUNC(0x8D1AE4A7, _ZTS17__simd64_uint16_t);
 REG_FUNC(0xC4096952, _ZTS17__simd64_uint32_t);
 REG_FUNC(0x16D366F1, _ZTS18__simd128_poly16_t);
-REG_FUNC(0x45552A1, _ZTS18__simd128_uint16_t);
+REG_FUNC(0x045552A1, _ZTS18__simd128_uint16_t);
 REG_FUNC(0x7DBF4FFF, _ZTS18__simd128_uint32_t);
-REG_FUNC(0xED26DE1, _ZTS18__simd64_float16_t);
+REG_FUNC(0x0ED26DE1, _ZTS18__simd64_float16_t);
 REG_FUNC(0xAB0D789A, _ZTS18__simd64_float32_t);
-REG_FUNC(0x3200DDB, _ZTS19__simd128_float16_t);
+REG_FUNC(0x03200DDB, _ZTS19__simd128_float16_t);
 REG_FUNC(0xD54CBD7C, _ZTS19__simd128_float32_t);
 REG_FUNC(0xA8E6842E, _ZTSDh);
 REG_FUNC(0x5246E71E, _ZTSNSt8ios_base7failureE);
@@ -1729,7 +1729,7 @@ REG_FUNC(0x6A472A63, _ZTSPK16__simd64_int32_t);
 REG_FUNC(0xC356ACF6, _ZTSPK16__simd64_poly8_t);
 REG_FUNC(0x878C75F4, _ZTSPK16__simd64_uint8_t);
 REG_FUNC(0x68B777E3, _ZTSPK17__simd128_int16_t);
-REG_FUNC(0x61188BD, _ZTSPK17__simd128_int32_t);
+REG_FUNC(0x061188BD, _ZTSPK17__simd128_int32_t);
 REG_FUNC(0xC7733F13, _ZTSPK17__simd128_poly8_t);
 REG_FUNC(0x3D8A69EC, _ZTSPK17__simd128_uint8_t);
 REG_FUNC(0xCC081D58, _ZTSPK17__simd64_poly16_t);
@@ -1779,12 +1779,12 @@ REG_FUNC(0x982D9703, _ZTSPs);
 REG_FUNC(0xE2A0B0A8, _ZTSPt);
 REG_FUNC(0xF7B6B02A, _ZTSPv);
 REG_FUNC(0xF1C9A755, _ZTSPw);
-REG_FUNC(0x968B212, _ZTSPx);
-REG_FUNC(0x9787CAD, _ZTSPy);
+REG_FUNC(0x0968B212, _ZTSPx);
+REG_FUNC(0x09787CAD, _ZTSPy);
 REG_FUNC(0xF86F5756, _ZTSSd);
 REG_FUNC(0x999300E0, _ZTSSi);
 REG_FUNC(0x591C25A3, _ZTSSo);
-REG_FUNC(0xFC9D21B, _ZTSSt10bad_typeid);
+REG_FUNC(0x0FC9D21B, _ZTSSt10bad_typeid);
 REG_FUNC(0x867D109E, _ZTSSt10istrstream);
 REG_FUNC(0x88BFC745, _ZTSSt10ostrstream);
 REG_FUNC(0xB315CE7A, _ZTSSt11_ctype_base);
@@ -1794,7 +1794,7 @@ REG_FUNC(0xBE23707A, _ZTSSt12domain_error);
 REG_FUNC(0x9E317CE1, _ZTSSt12length_error);
 REG_FUNC(0xD8DAD98D, _ZTSSt12out_of_range);
 REG_FUNC(0x1C929309, _ZTSSt12strstreambuf);
-REG_FUNC(0xE17E4D6, _ZTSSt13_codecvt_base);
+REG_FUNC(0x0E17E4D6, _ZTSSt13_codecvt_base);
 REG_FUNC(0x918FE198, _ZTSSt13bad_exception);
 REG_FUNC(0x227B4568, _ZTSSt13basic_filebufIcSt11char_traitsIcEE);
 REG_FUNC(0xD34BAF59, _ZTSSt13basic_filebufIwSt11char_traitsIwEE);
@@ -1823,7 +1823,7 @@ REG_FUNC(0xE5C789D4, _ZTSSt9strstream);
 REG_FUNC(0x2856DCD6, _ZTSSt9type_info);
 REG_FUNC(0x75A1CED4, _ZTSU8__vectorx);
 REG_FUNC(0x508FF61E, _ZTSU8__vectory);
-REG_FUNC(0x8E6A51A, _ZTSa);
+REG_FUNC(0x08E6A51A, _ZTSa);
 REG_FUNC(0x491DB7D3, _ZTSb);
 REG_FUNC(0xD657B5A0, _ZTSc);
 REG_FUNC(0x322C7CB5, _ZTSd);
@@ -1843,7 +1843,7 @@ REG_FUNC(0x402717E4, _ZTSy);
 REG_FUNC(0x51B29810, _ZTTSd);
 REG_FUNC(0x52128B13, _ZTTSi);
 REG_FUNC(0x3C508708, _ZTTSo);
-REG_FUNC(0x87753F6, _ZTTSt10istrstream);
+REG_FUNC(0x087753F6, _ZTTSt10istrstream);
 REG_FUNC(0xE3D7CB30, _ZTTSt10ostrstream);
 REG_FUNC(0xBC326B50, _ZTTSt13basic_istreamIwSt11char_traitsIwEE);
 REG_FUNC(0x16E32018, _ZTTSt13basic_ostreamIwSt11char_traitsIwEE);
@@ -1866,7 +1866,7 @@ REG_FUNC(0xA81AD21D, _ZTVSt10ostrstream);
 REG_FUNC(0x82A84E5E, _ZTVSt11logic_error);
 REG_FUNC(0x1D583475, _ZTVSt11range_error);
 REG_FUNC(0x80C77E16, _ZTVSt12domain_error);
-REG_FUNC(0x64ADA35, _ZTVSt12length_error);
+REG_FUNC(0x064ADA35, _ZTVSt12length_error);
 REG_FUNC(0xDDAE7CBE, _ZTVSt12out_of_range);
 REG_FUNC(0x11B2781A, _ZTVSt12strstreambuf);
 REG_FUNC(0x75D16BD0, _ZTVSt13_codecvt_base);
@@ -1877,7 +1877,7 @@ REG_FUNC(0xB952752B, _ZTVSt13basic_istreamIwSt11char_traitsIwEE);
 REG_FUNC(0x48F3405B, _ZTVSt13basic_ostreamIwSt11char_traitsIwEE);
 REG_FUNC(0x53F02A18, _ZTVSt13runtime_error);
 REG_FUNC(0x177FCCDC, _ZTVSt14overflow_error);
-REG_FUNC(0x5548FF7, _ZTVSt15basic_streambufIcSt11char_traitsIcEE);
+REG_FUNC(0x05548FF7, _ZTVSt15basic_streambufIcSt11char_traitsIcEE);
 REG_FUNC(0xE8A9F32E, _ZTVSt15basic_streambufIwSt11char_traitsIwEE);
 REG_FUNC(0x515AE097, _ZTVSt15underflow_error);
 REG_FUNC(0x23EEDAF0, _ZTVSt16invalid_argument);
@@ -1889,7 +1889,7 @@ REG_FUNC(0xAA09FD32, _ZTVSt8bad_cast);
 REG_FUNC(0xD58C5F52, _ZTVSt8ios_base);
 REG_FUNC(0xA27EFBA3, _ZTVSt9bad_alloc);
 REG_FUNC(0x147996ED, _ZTVSt9basic_iosIcSt11char_traitsIcEE);
-REG_FUNC(0xDE4AFE9, _ZTVSt9basic_iosIcSt11char_traitsIcEE__Sd__St9strstream);
+REG_FUNC(0x0DE4AFE9, _ZTVSt9basic_iosIcSt11char_traitsIcEE__Sd__St9strstream);
 REG_FUNC(0x87D18300, _ZTVSt9basic_iosIcSt11char_traitsIcEE__SiSd__St9strstream);
 REG_FUNC(0x3D6A38D3, _ZTVSt9basic_iosIcSt11char_traitsIcEE__Si__Sd);
 REG_FUNC(0xA8E795AF, _ZTVSt9basic_iosIcSt11char_traitsIcEE__Si__St10istrstream);
@@ -1902,7 +1902,7 @@ REG_FUNC(0xFD21E1F1, _ZTVSt9strstream);
 REG_FUNC(0x8E9879A7, _ZTVSt9type_info);
 REG_FUNC(0xE63750C1, _ZZNSt13basic_filebufIcSt11char_traitsIcEE5_InitEPSt10_Dnk_filetNS2_7_InitflEE7_Stinit);
 REG_FUNC(0x1D4E29BC, _ZZNSt13basic_filebufIwSt11char_traitsIwEE5_InitEPSt10_Dnk_filetNS2_7_InitflEE7_Stinit);
-REG_FUNC(0x8A37475, _ZTIN10__cxxabiv116__enum_type_infoE);
+REG_FUNC(0x08A37475, _ZTIN10__cxxabiv116__enum_type_infoE);
 REG_FUNC(0x66CC7DBB, _ZTIN10__cxxabiv117__array_type_infoE);
 REG_FUNC(0x81C44513, _ZTIN10__cxxabiv117__class_type_infoE);
 REG_FUNC(0xC35024DA, _ZTIN10__cxxabiv117__pbase_type_infoE);

From 912e3fc2133ac2af5485b12a86543e2b4dfa3264 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Tue, 27 Jan 2015 04:39:43 +0300
Subject: [PATCH 42/70] sceCtrl stub

---
 rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp | 85 +++++++++++++++++++++++++++++
 rpcs3/Emu/ARMv7/PSVFuncList.cpp     |  2 +
 rpcs3/Loader/ELF32.cpp              |  6 +-
 rpcs3/emucore.vcxproj               |  1 +
 rpcs3/emucore.vcxproj.filters       |  3 +
 5 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp

diff --git a/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp b/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp
new file mode 100644
index 0000000000..1f7d65c5df
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp
@@ -0,0 +1,85 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceCtrl;
+
+struct SceCtrlData
+{
+	u64 timeStamp;
+	u32 buttons;
+	u8 lx;
+	u8 ly;
+	u8 rx;
+	u8 ry;
+	u8 rsrv[16];
+};
+
+struct SceCtrlRapidFireRule
+{
+	u32 uiMask;
+	u32 uiTrigger;
+	u32 uiTarget;
+	u32 uiDelay;
+	u32 uiMake;
+	u32 uiBreak;
+};
+
+s32 sceCtrlSetSamplingMode(u32 uiMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCtrlGetSamplingMode(vm::psv::ptr<u32> puiMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCtrlPeekBufferPositive(s32 port, vm::psv::ptr<SceCtrlData>pData, s32 nBufs)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCtrlPeekBufferNegative(s32 port, vm::psv::ptr<SceCtrlData>pData, s32 nBufs)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCtrlReadBufferPositive(s32 port, vm::psv::ptr<SceCtrlData>pData, s32 nBufs)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCtrlReadBufferNegative(s32 port, vm::psv::ptr<SceCtrlData>pData, s32 nBufs)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCtrlSetRapidFire(s32 port, s32 idx, vm::psv::ptr<const SceCtrlRapidFireRule> pRule)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCtrlClearRapidFire(s32 port, s32 idx)
+{
+	throw __FUNCTION__;
+}
+
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceCtrl, #name, name)
+
+psv_log_base sceCtrl("SceCtrl", []()
+{
+	sceCtrl.on_load = nullptr;
+	sceCtrl.on_unload = nullptr;
+	sceCtrl.on_stop = nullptr;
+
+	REG_FUNC(0xA497B150, sceCtrlSetSamplingMode);
+	REG_FUNC(0xEC752AAF, sceCtrlGetSamplingMode);
+	REG_FUNC(0xA9C3CED6, sceCtrlPeekBufferPositive);
+	REG_FUNC(0x104ED1A7, sceCtrlPeekBufferNegative);
+	REG_FUNC(0x67E7AB83, sceCtrlReadBufferPositive);
+	REG_FUNC(0x15F96FB0, sceCtrlReadBufferNegative);
+	REG_FUNC(0xE9CB69C8, sceCtrlSetRapidFire);
+	REG_FUNC(0xD8294C9C, sceCtrlClearRapidFire);
+});
\ No newline at end of file
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.cpp b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
index 05d9b4c483..b011da905b 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.cpp
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
@@ -50,6 +50,7 @@ extern psv_log_base sceLibstdcxx;
 extern psv_log_base sceLibKernel;
 extern psv_log_base sceSysmodule;
 extern psv_log_base scePerf;
+extern psv_log_base sceCtrl;
 
 void initialize_psv_modules()
 {
@@ -62,6 +63,7 @@ void initialize_psv_modules()
 	g_psv_modules.push_back(&sceLibKernel);
 	g_psv_modules.push_back(&sceSysmodule);
 	g_psv_modules.push_back(&scePerf);
+	g_psv_modules.push_back(&sceCtrl);
 
 	// setup special functions (without NIDs)
 	psv_func unimplemented;
diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp
index 520fb8f991..80cac220ad 100644
--- a/rpcs3/Loader/ELF32.cpp
+++ b/rpcs3/Loader/ELF32.cpp
@@ -215,7 +215,7 @@ namespace loader
 								const u32 addr = *++code;
 								vm::psv::write16(addr + 0, 0xf240 | (data & 0x800) >> 1 | (data & 0xf000) >> 12); // MOVW
 								vm::psv::write16(addr + 2, 0x0c00 | (data & 0x700) << 4 | (data & 0xff));
-								LOG_NOTICE(LOADER, "sceRefs: movw written at 0x%x (data=0x%x)", addr, data);
+								//LOG_NOTICE(LOADER, "sceRefs: movw written at 0x%x (data=0x%x)", addr, data);
 								break;
 							}
 							case 0x00000030:
@@ -224,13 +224,13 @@ namespace loader
 								const u32 addr = *++code;
 								vm::psv::write16(addr + 0, 0xf2c0 | (data & 0x8000000) >> 17 | (data & 0xf0000000) >> 28); // MOVT
 								vm::psv::write16(addr + 2, 0x0c00 | (data & 0x7000000) >> 12 | (data & 0xff0000) >> 16);
-								LOG_NOTICE(LOADER, "sceRefs: movt written at 0x%x (data=0x%x)", addr, data);
+								//LOG_NOTICE(LOADER, "sceRefs: movt written at 0x%x (data=0x%x)", addr, data);
 								break;
 							}
 							case 0x00000000:
 							{
 								// probably, no operation
-								LOG_NOTICE(LOADER, "sceRefs: zero code");
+								//LOG_NOTICE(LOADER, "sceRefs: zero code");
 								break;
 							}
 							default:
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 407ab81918..50c1a279b4 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -58,6 +58,7 @@
     <ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\psv_event_flag.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\psv_sema.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceCtrl.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibKernel.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibc.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibm.cpp" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index d8f1f1b884..beeae1db31 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -683,6 +683,9 @@
     <ClCompile Include="Emu\ARMv7\Modules\scePerf.cpp">
       <Filter>Emu\CPU\ARMv7\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceCtrl.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">

From f15c679fea693368422b2f35897c1b087579506b Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Tue, 27 Jan 2015 17:14:15 +0200
Subject: [PATCH 43/70] Add support for "test mode"

Since @devmapal hasn't made a PR for this and this would be probably
useful for Coveralls and unit tests I'm making a PR for it myself.

More info:

https://github.com/devmapal/rpcs3/commit/c72f5d40f521b955faec024e6b788aa1e027ccfc
---
 rpcs3/rpcs3.cpp | 41 +++++++++++++++++++++++++++++++++++++----
 rpcs3/rpcs3.h   |  7 ++++++-
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp
index d7549972fe..4f2bc92078 100644
--- a/rpcs3/rpcs3.cpp
+++ b/rpcs3/rpcs3.cpp
@@ -202,6 +202,22 @@ void compile_shader(std::string path)
 
 bool Rpcs3App::OnInit()
 {
+	static const wxCmdLineEntryDesc desc[]
+	{
+		{ wxCMD_LINE_SWITCH, "h", "help", "Command line options:\nh (help): Help and commands\nt (test): For directly executing a (S)ELF", wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
+		{ wxCMD_LINE_SWITCH, "t", "test", "Run in test mode on (S)ELF", wxCMD_LINE_VAL_NONE },
+		{ wxCMD_LINE_PARAM, NULL, NULL, "(S)ELF", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+		{ wxCMD_LINE_NONE }
+	};
+	
+	parser.SetDesc(desc);
+	parser.SetCmdLine(argc, argv);
+	if (parser.Parse())
+	{
+		// help was given, terminating
+		this->Exit();
+	}
+
 	SetSendDbgCommandCallback([](DbgCommand id, CPUThread* t)
 	{
 		wxGetApp().SendDbgCommand(id, t);
@@ -296,7 +312,7 @@ bool Rpcs3App::OnInit()
 	m_MainFrame->Show();
 	m_MainFrame->DoSettings(true);
 
-	OnArguments();
+	OnArguments(parser);
 
 	//compile_shader("compile_shader0.spo");
 	//compile_shader("compile_shader1.spo");
@@ -304,14 +320,26 @@ bool Rpcs3App::OnInit()
 	return true;
 }
 
-void Rpcs3App::OnArguments()
+void Rpcs3App::OnArguments(const wxCmdLineParser& parser)
 {
 	// Usage:
 	//   rpcs3-*.exe               Initializes RPCS3
 	//   rpcs3-*.exe [(S)ELF]      Initializes RPCS3, then loads and runs the specified (S)ELF file.
 
-	if (Rpcs3App::argc > 1) {
-		Emu.SetPath(fmt::ToUTF8(argv[1]));
+	if (parser.FoundSwitch("t"))
+	{
+		HLEExitOnStop = Ini.HLEExitOnStop.GetValue();
+		Ini.HLEExitOnStop.SetValue(true);
+		if (parser.GetParamCount() != 1)
+		{
+			wxLogDebug(wxT("A (S)ELF file needs to be given in test mode, exiting."));
+			this->Exit();
+		}
+	}
+	
+	if (parser.GetParamCount() > 0)
+	{
+		Emu.SetPath(fmt::ToUTF8(parser.GetParam(0)));
 		Emu.Load();
 		Emu.Run();
 	}
@@ -319,6 +347,11 @@ void Rpcs3App::OnArguments()
 
 void Rpcs3App::Exit()
 {
+	if (parser.FoundSwitch("t"))
+	{
+		Ini.HLEExitOnStop.SetValue(HLEExitOnStop);
+	}
+
 	Emu.Stop();
 	Ini.Save();
 
diff --git a/rpcs3/rpcs3.h b/rpcs3/rpcs3.h
index 77b35aa7fc..bf745cdfe1 100644
--- a/rpcs3/rpcs3.h
+++ b/rpcs3/rpcs3.h
@@ -3,6 +3,7 @@
 #include "Emu/DbgCommand.h"
 #include "Utilities/Thread.h"
 #include <wx/app.h>
+#include <wx/cmdline.h>
 
 class CPUThread;
 
@@ -11,11 +12,15 @@ wxDECLARE_EVENT(wxEVT_DBG_COMMAND, wxCommandEvent);
 
 class Rpcs3App : public wxApp
 {
+private:
+	wxCmdLineParser parser;
+	// Used to restore the configuration state after a test run
+	bool HLEExitOnStop;
 public:
 	MainFrame* m_MainFrame;
 
 	virtual bool OnInit();       // RPCS3's entry point
-	virtual void OnArguments();  // Handle arguments: Rpcs3App::argc, Rpcs3App::argv
+	virtual void OnArguments(const wxCmdLineParser& parser);  // Handle arguments: Rpcs3App::argc, Rpcs3App::argv
 	virtual void Exit();
 
 	Rpcs3App();

From f81b00d4883c05d5f9dad9f1447b5b15a437b419 Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Tue, 27 Jan 2015 17:34:50 +0200
Subject: [PATCH 44/70] Fix compiling

---
 rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
index 9250ac1f20..96e693d4ea 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
@@ -547,10 +547,10 @@ int cellGcmSetSecondVFrequency(u32 freq)
 		Emu.GetGSManager().GetRender().m_frequency_mode = freq; cellGcmSys->Todo("Unimplemented display frequency: Scanout"); break;
 	case CELL_GCM_DISPLAY_FREQUENCY_DISABLE:
 		Emu.GetGSManager().GetRender().m_frequency_mode = freq; cellGcmSys->Todo("Unimplemented display frequency: Disabled"); break;
-	default: cellGcmSys->Error("Improper display frequency specified!"); return;
+	default: cellGcmSys->Error("Improper display frequency specified!"); return CELL_OK;
 	}
 
-	return;
+	return CELL_OK;
 }
 
 int cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 comp, u16 base, u8 bank)

From 3a51a6ded7be80d0e24052161167218a52e78449 Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Tue, 27 Jan 2015 19:22:56 +0200
Subject: [PATCH 45/70] Revert RSXIO changes

This revert fixes many games, while seeming to break none.
---
 rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
index 96e693d4ea..a279e2b57c 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
@@ -1196,7 +1196,7 @@ s32 cellGcmCallback(vm::ptr<CellGcmContextData> context, u32 count)
 	//cmd[3] = 0; // some incrementing by module value
 	//context->current += 0x10;
 
-	if (1)
+	if (0)
 	{
 		const u32 address = context->begin;
 		const u32 upper = offsetTable.ioAddress[address >> 20]; // 12 bits

From e12cfc89deedc7046d3f5756f504a3ef920ab559 Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Tue, 27 Jan 2015 21:04:40 +0200
Subject: [PATCH 46/70] Experimental DMA implementation, bug fixes

The experimental DMA implementation is ported from Nucleus.
---
 rpcs3/Emu/RSX/RSXDMA.cpp      | 124 ++++++++++++++++++++++++++++++++++
 rpcs3/Emu/RSX/RSXDMA.h        |  45 ++++++++++++
 rpcs3/Emu/RSX/RSXThread.cpp   |  25 ++++---
 rpcs3/Emu/RSX/RSXThread.h     |   3 +
 rpcs3/emucore.vcxproj         |   2 +
 rpcs3/emucore.vcxproj.filters |   6 ++
 6 files changed, 195 insertions(+), 10 deletions(-)
 create mode 100644 rpcs3/Emu/RSX/RSXDMA.cpp
 create mode 100644 rpcs3/Emu/RSX/RSXDMA.h

diff --git a/rpcs3/Emu/RSX/RSXDMA.cpp b/rpcs3/Emu/RSX/RSXDMA.cpp
new file mode 100644
index 0000000000..476448474f
--- /dev/null
+++ b/rpcs3/Emu/RSX/RSXDMA.cpp
@@ -0,0 +1,124 @@
+#include "stdafx.h"
+#include "RSXDMA.h"
+#include "Emu/Memory/Memory.h"
+#include "Utilities/Log.h"
+
+DMAObject dma_address(u32 dma_object)
+{
+	// NOTE: RAMIN is not emulated, therefore DMA Objects are hardcoded in this function
+	switch (dma_object) {
+	case RSX_CONTEXT_DMA_REPORT_LOCATION_LOCAL:
+		return DMAObject{ 0x40300000, 0x8000, DMAObject::READWRITE }; // TODO: Inconsistency: Gitbrew says R starting at 0x1400, test says RW starting at 0x0.
+	case RSX_CONTEXT_DMA_DEVICE_RW:
+		return DMAObject{ 0x40000000, 0x1000, DMAObject::READWRITE };
+	case RSX_CONTEXT_DMA_DEVICE_R:
+		return DMAObject{ 0x40000000, 0x1000, DMAObject::READWRITE }; // TODO: Inconsistency: Gitbrew says R, test says RW
+	case RSX_CONTEXT_DMA_SEMAPHORE_RW:
+		return DMAObject{ 0x40100000, 0x1000, DMAObject::READWRITE };
+	case RSX_CONTEXT_DMA_SEMAPHORE_R:
+		return DMAObject{ 0x40100000, 0x1000, DMAObject::READWRITE }; // TODO: Inconsistency: Gitbrew says R, test says RW
+	default:
+		LOG_WARNING(RSX, "Unknown DMA object (0x%08X)", dma_object);
+		return DMAObject{};
+	}
+}
+
+u8 dma_read8(u32 dma_object, u8 offset)
+{
+	const DMAObject& dma = dma_address(dma_object);
+
+	if (dma.addr && dma.flags & DMAObject::READ)
+	{
+		return vm::read8(dma.addr + offset);
+	}
+
+	LOG_WARNING(RSX, "Illegal DMA 8-bit read");
+	return 0;
+}
+
+u16 dma_read16(u32 dma_object, u16 offset)
+{
+	const DMAObject& dma = dma_address(dma_object);
+
+	if (dma.addr && dma.flags & DMAObject::READ)
+	{
+		return vm::read16(dma.addr + offset);
+	}
+
+	LOG_WARNING(RSX, "Illegal DMA 16-bit read");
+	return 0;
+}
+
+u32 dma_read32(u32 dma_object, u32 offset)
+{
+	const DMAObject& dma = dma_address(dma_object);
+
+	if (dma.addr && dma.flags & DMAObject::READ)
+	{
+		return vm::read32(dma.addr + offset);
+	}
+
+	LOG_WARNING(RSX, "Illegal DMA 32-bit read");
+	return 0;
+}
+
+u64 dma_read64(u32 dma_object, u64 offset)
+{
+	const DMAObject& dma = dma_address(dma_object);
+
+	if (dma.addr && dma.flags & DMAObject::READ)
+	{
+		return vm::read64(dma.addr + offset);
+	}
+
+	LOG_WARNING(RSX, "Illegal DMA 64-bit read");
+	return 0;
+}
+
+void dma_write8(u32 dma_object, u32 offset, u8 value)
+{
+	const DMAObject& dma = dma_address(dma_object);
+
+	if (dma.addr && dma.flags & DMAObject::WRITE)
+	{
+		return vm::write8(dma.addr + offset, value);
+	}
+
+	LOG_WARNING(RSX, "Illegal DMA 32-bit write");
+}
+
+void dma_write16(u32 dma_object, u32 offset, u16 value)
+{
+	const DMAObject& dma = dma_address(dma_object);
+
+	if (dma.addr && dma.flags & DMAObject::WRITE)
+	{
+		return vm::write16(dma.addr + offset, value);
+	}
+
+	LOG_WARNING(RSX, "Illegal DMA 32-bit write");
+}
+
+void dma_write32(u32 dma_object, u32 offset, u32 value)
+{
+	const DMAObject& dma = dma_address(dma_object);
+
+	if (dma.addr && dma.flags & DMAObject::WRITE)
+	{
+		return vm::write32(dma.addr + offset, value);
+	}
+
+	LOG_WARNING(RSX, "Illegal DMA 32-bit write");
+}
+
+void dma_write64(u32 dma_object, u32 offset, u64 value)
+{
+	const DMAObject& dma = dma_address(dma_object);
+
+	if (dma.addr && dma.flags & DMAObject::WRITE)
+	{
+		return vm::write64(dma.addr + offset, value);
+	}
+
+	LOG_WARNING(RSX, "Illegal DMA 64-bit write");
+}
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/RSXDMA.h b/rpcs3/Emu/RSX/RSXDMA.h
new file mode 100644
index 0000000000..b432375506
--- /dev/null
+++ b/rpcs3/Emu/RSX/RSXDMA.h
@@ -0,0 +1,45 @@
+#pragma once
+
+enum {
+	RSX_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY0 = 0x66604200, // Target: lpar_reports[0x1000 : 0x????]
+	RSX_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY1 = 0x66604201, // Target: lpar_reports[0x1000 : 0x????]
+	RSX_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY2 = 0x66604202, // Target: lpar_reports[0x1000 : 0x????]
+	RSX_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY3 = 0x66604203, // Target: lpar_reports[0x1000 : 0x????]
+	RSX_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY4 = 0x66604204, // Target: lpar_reports[0x1000 : 0x????]
+	RSX_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY5 = 0x66604205, // Target: lpar_reports[0x1000 : 0x????]
+	RSX_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY6 = 0x66604206, // Target: lpar_reports[0x1000 : 0x????]
+	RSX_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY7 = 0x66604207, // Target: lpar_reports[0x1000 : 0x????]
+	RSX_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY8 = 0x66604208, // Target: lpar_reports[0x1000 : 0x????]
+	RSX_CONTEXT_DMA_NOTIFY_MAIN_0 = 0x6660420F,
+	RSX_CONTEXT_DMA_SEMAPHORE_RW = 0x66606660, // Target: lpar_reports[0x0000 : 0x1000] (Read/Write)
+	RSX_CONTEXT_DMA_SEMAPHORE_R = 0x66616661, // Target: lpar_reports[0x0000 : 0x1000] (Read)
+	RSX_CONTEXT_DMA_REPORT_LOCATION_LOCAL = 0x66626660, // Target: lpar_reports[0x1400 : 0x9400]
+	RSX_CONTEXT_DMA_REPORT_LOCATION_MAIN = 0xBAD68000,
+	RSX_CONTEXT_DMA_DEVICE_RW = 0x56616660,
+	RSX_CONTEXT_DMA_DEVICE_R = 0x56616661,
+};
+
+struct DMAObject {
+	// Flags
+	enum {
+		READ = 1 << 0,
+		WRITE = 1 << 1,
+		READWRITE = READ | WRITE,
+	};
+	u32 addr;
+	u32 size;
+	u32 flags;
+};
+
+// RSX Direct Memory Access
+DMAObject dma_address(u32 dma_object);
+
+u8 dma_read8(u32 dma_object, u32 offset);
+u16 dma_read16(u32 dma_object, u32 offset);
+u32 dma_read32(u32 dma_object, u32 offset);
+u64 dma_read64(u32 dma_object, u32 offset);
+
+void dma_write8(u32 dma_object, u32 offset, u8 value);
+void dma_write16(u32 dma_object, u32 offset, u16 value);
+void dma_write32(u32 dma_object, u32 offset, u32 value);
+void dma_write64(u32 dma_object, u32 offset, u64 value);
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp
index 906b0281c3..ed7b539005 100644
--- a/rpcs3/Emu/RSX/RSXThread.cpp
+++ b/rpcs3/Emu/RSX/RSXThread.cpp
@@ -4,6 +4,7 @@
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
 #include "Emu/RSX/GSManager.h"
+#include "Emu/RSX/RSXDMA.h"
 #include "RSXThread.h"
 
 #include "Emu/SysCalls/Callback.h"
@@ -333,6 +334,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_CONTEXT_DMA_REPORT: 0x%x", ARGS(0));
 		}
+
+		dma_report = ARGS(0);
 	}
 	break;
 
@@ -891,9 +894,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 
 	case NV4097_CLEAR_SURFACE:
 	{
-		const u32 mask = ARGS(0);
-
-		ClearSurface(mask);
+		ClearSurface(ARGS(0));
 	}
 	break;
 
@@ -901,8 +902,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 	{
 		const u32 value = ARGS(0);
 
-		ClearStencil(value & 0xff);
 		ClearDepth(value >> 8);
+		ClearStencil(value & 0xff);
 	}
 	break;
 
@@ -1076,7 +1077,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 	{
 		m_cur_fragment_prog = &m_fragment_progs[m_cur_fragment_prog_num];
 
-		const  u32 a0 = ARGS(0);
+		const u32 a0 = ARGS(0);
 		m_cur_fragment_prog->offset = a0 & ~0x3;
 		m_cur_fragment_prog->addr = GetAddress(m_cur_fragment_prog->offset, (a0 & 0x3) - 1);
 		m_cur_fragment_prog->ctrl = 0x40;
@@ -1091,8 +1092,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 
 	case NV4097_SET_SHADE_MODE:
 	{
-		const u32 value = ARGS(0);
-		ShadeModel(value);
+		ShadeModel(ARGS(0));
 	}
 	break;
 
@@ -1867,9 +1867,14 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		u64 timestamp = get_system_time() * 1000;
 
 		// TODO: Reports can be written to the main memory or the local memory (controlled by NV4097_SET_CONTEXT_DMA_REPORT)
-		vm::write64(m_local_mem_addr + offset + 0x0, timestamp);
-		vm::write32(m_local_mem_addr + offset + 0x8, value);
-		vm::write32(m_local_mem_addr + offset + 0xc, 0);
+		// NOTE: Uncomment these, if DMA implementation is broken
+		//vm::write64(m_local_mem_addr + offset + 0x0, timestamp);
+		//vm::write32(m_local_mem_addr + offset + 0x8, value);
+		//vm::write32(m_local_mem_addr + offset + 0xc, 0);
+
+		dma_write64(dma_report, offset + 0x0, timestamp);
+		dma_write32(dma_report, offset + 0x8, value);
+		dma_write32(dma_report, offset + 0xc, 0);
 	}
 	break;
 
diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h
index 618573d21a..4a5fe782ca 100644
--- a/rpcs3/Emu/RSX/RSXThread.h
+++ b/rpcs3/Emu/RSX/RSXThread.h
@@ -136,6 +136,9 @@ public:
 	u32 m_ctxt_addr;
 	u32 m_report_main_addr;
 
+	// DMA
+	u32 dma_report;
+
 	u32 m_local_mem_addr, m_main_mem_addr;
 	bool m_strict_ordering[0x1000];
 
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 4b4a2d6539..b52ff1c3ba 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -107,6 +107,7 @@
     <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
     <ClCompile Include="Emu\RSX\GSManager.cpp" />
     <ClCompile Include="Emu\RSX\GSRender.cpp" />
+    <ClCompile Include="Emu\RSX\RSXDMA.cpp" />
     <ClCompile Include="Emu\RSX\RSXTexture.cpp" />
     <ClCompile Include="Emu\RSX\RSXThread.cpp" />
     <ClCompile Include="Emu\Memory\vm.cpp" />
@@ -348,6 +349,7 @@
     <ClInclude Include="Emu\RSX\GSManager.h" />
     <ClInclude Include="Emu\RSX\GSRender.h" />
     <ClInclude Include="Emu\RSX\Null\NullGSRender.h" />
+    <ClInclude Include="Emu\RSX\RSXDMA.h" />
     <ClInclude Include="Emu\RSX\RSXFragmentProgram.h" />
     <ClInclude Include="Emu\RSX\RSXTexture.h" />
     <ClInclude Include="Emu\RSX\RSXThread.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index fdd71b410a..d222f71c07 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -665,6 +665,9 @@
     <ClCompile Include="Emu\ARMv7\ARMv7Decoder.cpp">
       <Filter>Emu\CPU\ARMv7</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\RSXDMA.cpp">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">
@@ -1294,5 +1297,8 @@
     <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h">
       <Filter>Emu\CPU\ARMv7\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\RSXDMA.h">
+      <Filter>Emu\GPU\RSX</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 14efde91900ceab0e02bafc44532eeabe0d5eb20 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Tue, 27 Jan 2015 22:57:44 +0300
Subject: [PATCH 47/70] ARMv7: LDRB_IMM, STRB_IMM

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp         |   8 +-
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp     | 116 +++++++++++++++++++++++
 rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp      |   2 +-
 rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp |   6 +-
 4 files changed, 124 insertions(+), 8 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index 8a361014f4..e5a7b4b87f 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -44,20 +44,20 @@ const ARMv7_opcode_t ARMv7_opcode_table[] =
 	ARMv7_OP2(0xfe00, 0x1c00, T1, ADD_IMM),
 	ARMv7_OP2(0xf800, 0x3000, T2, ADD_IMM),
 	ARMv7_OP4(0xfbe0, 0x8000, 0xf100, 0x0000, T3, ADD_IMM, SKIP_IF( (BF(8, 11) == 15 && BT(20)) || BF(16, 19) == 13 )),
-	ARMv7_OP4(0xfbf0, 0x8000, 0xf200, 0x0000, T4, ADD_IMM),
+	ARMv7_OP4(0xfbf0, 0x8000, 0xf200, 0x0000, T4, ADD_IMM, SKIP_IF( (BF(16, 19) & 13) == 13 )),
 	ARMv7_OP4(0x0fe0, 0x0000, 0x0280, 0x0000, A1, ADD_IMM),
 	ARMv7_OP2(0xfe00, 0x1800, T1, ADD_REG),
 	ARMv7_OP2(0xff00, 0x4400, T2, ADD_REG, SKIP_IF( (c & 0x87) == 0x85 || BF(3, 6) == 13 )),
-	ARMv7_OP4(0xffe0, 0x8000, 0xeb00, 0x0000, T3, ADD_REG),
+	ARMv7_OP4(0xffe0, 0x8000, 0xeb00, 0x0000, T3, ADD_REG, SKIP_IF( (BF(8, 11) == 15 && BT(20)) || BF(16, 19) == 13 )),
 	ARMv7_OP4(0x0fe0, 0x0010, 0x0080, 0x0000, A1, ADD_REG),
 	ARMv7_OP4(0x0fe0, 0x0090, 0x0080, 0x0010, A1, ADD_RSR),
 	ARMv7_OP2(0xf800, 0xa800, T1, ADD_SPI),
 	ARMv7_OP2(0xff80, 0xb000, T2, ADD_SPI),
-	ARMv7_OP4(0xfbef, 0x8000, 0xf10d, 0x0000, T3, ADD_SPI),
+	ARMv7_OP4(0xfbef, 0x8000, 0xf10d, 0x0000, T3, ADD_SPI, SKIP_IF( BF(8, 11) == 15 && BT(20) )),
 	ARMv7_OP4(0xfbff, 0x8000, 0xf20d, 0x0000, T4, ADD_SPI),
 	ARMv7_OP4(0x0fef, 0x0000, 0x028d, 0x0000, A1, ADD_SPI),
 	ARMv7_OP2(0xff78, 0x4468, T1, ADD_SPR),
-	ARMv7_OP2(0xff87, 0x4485, T2, ADD_SPR),
+	ARMv7_OP2(0xff87, 0x4485, T2, ADD_SPR, SKIP_IF( BF(3, 6) == 13 )),
 	ARMv7_OP4(0xffef, 0x8000, 0xeb0d, 0x0000, T3, ADD_SPR),
 	ARMv7_OP4(0x0fef, 0x0010, 0x008d, 0x0000, A1, ADD_SPR),
 
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index 71d91acad9..954e07dfcc 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -1355,6 +1355,7 @@ void ARMv7_instrs::LDR_IMM(ARMv7Context& context, const ARMv7Code code, const AR
 		reject((wback && n == t) || (t == 15 && context.ITSTATE), "UNPREDICTABLE");
 		break;
 	}
+	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
 
@@ -1441,11 +1442,70 @@ void ARMv7_instrs::LDR_REG(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::LDRB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	u32 cond, t, n, imm32;
+	bool index, add, wback;
+
 	switch (type)
 	{
+	case T1:
+	{
+		cond = context.ITSTATE.advance();
+		t = (code.data & 0x7);
+		n = (code.data & 0x38) >> 3;
+		imm32 = (code.data & 0x7c0) >> 4;
+		index = true;
+		add = true;
+		wback = false;
+		break;
+	}
+	case T2:
+	{
+		cond = context.ITSTATE.advance();
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xfff);
+		index = true;
+		add = true;
+		wback = false;
+
+		reject(t == 15, "PLD");
+		reject(n == 15, "LDRB (literal)");
+		reject(t == 13, "UNPREDICTABLE");
+		break;
+	}
+	case T3:
+	{
+		cond = context.ITSTATE.advance();
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xff);
+		index = (code.data & 0x400);
+		add = (code.data & 0x200);
+		wback = (code.data & 0x100);
+
+		reject(t == 15 && index && !add && !wback, "PLD");
+		reject(n == 15, "LDRB (literal)");
+		reject(index && add && !wback, "LDRBT");
+		reject(!index && !wback, "UNDEFINED");
+		reject(t == 13 || t == 15 || (wback && n == t), "UNPREDICTABLE");
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32;
+		const u32 addr = index ? offset_addr : context.read_gpr(n);
+
+		context.write_gpr(t, vm::psv::read8(addr));
+
+		if (wback)
+		{
+			context.write_gpr(n, offset_addr);
+		}
+	}
 }
 
 void ARMv7_instrs::LDRB_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
@@ -2999,11 +3059,67 @@ void ARMv7_instrs::STR_REG(ARMv7Context& context, const ARMv7Code code, const AR
 
 void ARMv7_instrs::STRB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	u32 cond, t, n, imm32;
+	bool index, add, wback;
+
 	switch (type)
 	{
+	case T1:
+	{
+		cond = context.ITSTATE.advance();
+		t = (code.data & 0x7);
+		n = (code.data & 0x38) >> 3;
+		imm32 = (code.data & 0x7c0) >> 4;
+		index = true;
+		add = true;
+		wback = false;
+		break;
+	}
+	case T2:
+	{
+		cond = context.ITSTATE.advance();
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xfff);
+		index = true;
+		add = true;
+		wback = false;
+
+		reject(n == 15, "UNDEFINED");
+		reject(t == 13 || t == 15, "UNPREDICTABLE");
+		break;
+	}
+	case T3:
+	{
+		cond = context.ITSTATE.advance();
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xff);
+		index = (code.data & 0x400);
+		add = (code.data & 0x200);
+		wback = (code.data & 0x100);
+
+		reject(index && add && !wback, "STRBT");
+		reject(n == 15 || (!index && !wback), "UNDEFINED");
+		reject(t == 13 || t == 15 || (wback && n == t), "UNPREDICTABLE");
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32;
+		const u32 addr = index ? offset_addr : context.read_gpr(n);
+
+		vm::psv::write8(addr, (u8)context.read_gpr(t));
+
+		if (wback)
+		{
+			context.write_gpr(n, offset_addr);
+		}
+	}
 }
 
 void ARMv7_instrs::STRB_REG(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp b/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp
index 1f7d65c5df..972bd85d4c 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp
@@ -82,4 +82,4 @@ psv_log_base sceCtrl("SceCtrl", []()
 	REG_FUNC(0x15F96FB0, sceCtrlReadBufferNegative);
 	REG_FUNC(0xE9CB69C8, sceCtrlSetRapidFire);
 	REG_FUNC(0xD8294C9C, sceCtrlClearRapidFire);
-});
\ No newline at end of file
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp b/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp
index 6584de337a..a845595c87 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceSysmodule.cpp
@@ -6,21 +6,21 @@ extern psv_log_base sceSysmodule;
 
 s32 sceSysmoduleLoadModule(u16 id)
 {
-	sceSysmodule.Todo("sceSysmoduleLoadModule(id=0x%04x)", id);
+	sceSysmodule.Error("sceSysmoduleLoadModule(id=0x%04x) -> SCE_OK", id);
 
 	return SCE_OK; // loading succeeded
 }
 
 s32 sceSysmoduleUnloadModule(u16 id)
 {
-	sceSysmodule.Todo("sceSysmoduleUnloadModule(id=0x%04x)", id);
+	sceSysmodule.Error("sceSysmoduleUnloadModule(id=0x%04x) -> SCE_OK", id);
 
 	return SCE_OK; // unloading succeeded
 }
 
 s32 sceSysmoduleIsLoaded(u16 id)
 {
-	sceSysmodule.Todo("sceSysmoduleIsLoaded(id=0x%04x)", id);
+	sceSysmodule.Error("sceSysmoduleIsLoaded(id=0x%04x) -> SCE_OK", id);
 
 	return SCE_OK; // module is loaded
 }

From 1c4db01e196af6ce0549e6f13b69d4553e7474b3 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 28 Jan 2015 01:39:16 +0300
Subject: [PATCH 48/70] sceDisplay, sceDeci4p stub

---
 rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp  |  48 +++++++++++
 rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp | 113 +++++++++++++++++++++++++
 rpcs3/emucore.vcxproj                  |   3 +
 rpcs3/emucore.vcxproj.filters          |   9 ++
 4 files changed, 173 insertions(+)
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp

diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp
new file mode 100644
index 0000000000..bdd5e58e5d
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp
@@ -0,0 +1,48 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceDeci4p;
+
+typedef s32(*SceKernelDeci4pCallback)(s32 notifyId, s32 notifyCount, s32 notifyArg, vm::psv::ptr<void> pCommon);
+
+s32 sceKernelDeci4pOpen(vm::psv::ptr<const char> protoname, u32 protonum, u32 bufsize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeci4pClose(s32 socketid)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeci4pRead(s32 socketid, vm::psv::ptr<void> buffer, u32 size, u32 reserved)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeci4pWrite(s32 socketid, vm::psv::ptr<const void> buffer, u32 size, u32 reserved)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceKernelDeci4pRegisterCallback(s32 socketid, s32 cbid)
+{
+	throw __FUNCTION__;
+}
+
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceDeci4p, #name, name)
+
+psv_log_base sceDeci4p("SceDeci4pUserp", []()
+{
+	sceDeci4p.on_load = nullptr;
+	sceDeci4p.on_unload = nullptr;
+	sceDeci4p.on_stop = nullptr;
+
+	REG_FUNC(0x28578FE8, sceKernelDeci4pOpen);
+	REG_FUNC(0x63B0C50F, sceKernelDeci4pClose);
+	REG_FUNC(0x971E1C66, sceKernelDeci4pRead);
+	REG_FUNC(0xCDA3AAAC, sceKernelDeci4pWrite);
+	REG_FUNC(0x73371F35, sceKernelDeci4pRegisterCallback);
+});
\ No newline at end of file
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp b/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp
new file mode 100644
index 0000000000..c03dbe24dd
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceDisplay.cpp
@@ -0,0 +1,113 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceDisplay;
+
+struct SceDisplayFrameBuf
+{
+	u32 size;
+	vm::psv::ptr<void> base;
+	u32 pitch;
+	u32 pixelformat;
+	u32 width;
+	u32 height;
+};
+
+s32 sceDisplayGetRefreshRate(vm::psv::ptr<float> pFps)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplaySetFrameBuf(vm::psv::ptr<const SceDisplayFrameBuf> pFrameBuf, s32 iUpdateTimingMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayGetFrameBuf(vm::psv::ptr<SceDisplayFrameBuf> pFrameBuf, s32 iUpdateTimingMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayGetVcount()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayWaitVblankStart()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayWaitVblankStartCB()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayWaitVblankStartMulti(u32 vcount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayWaitVblankStartMultiCB(u32 vcount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayWaitSetFrameBuf()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayWaitSetFrameBufCB()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayWaitSetFrameBufMulti(u32 vcount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayWaitSetFrameBufMultiCB(u32 vcount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayRegisterVblankStartCallback(s32 uid)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDisplayUnregisterVblankStartCallback(s32 uid)
+{
+	throw __FUNCTION__;
+}
+
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceDisplay, #name, name)
+
+psv_log_base sceDisplay("SceDisplay", []()
+{
+	sceDisplay.on_load = nullptr;
+	sceDisplay.on_unload = nullptr;
+	sceDisplay.on_stop = nullptr;
+
+	// SceDisplayUser
+	REG_FUNC(0x7A410B64, sceDisplaySetFrameBuf);
+	REG_FUNC(0x42AE6BBC, sceDisplayGetFrameBuf);
+
+	// SceDisplay
+	REG_FUNC(0xA08CA60D, sceDisplayGetRefreshRate);
+	REG_FUNC(0xB6FDE0BA, sceDisplayGetVcount);
+	REG_FUNC(0x5795E898, sceDisplayWaitVblankStart);
+	REG_FUNC(0x78B41B92, sceDisplayWaitVblankStartCB);
+	REG_FUNC(0xDD0A13B8, sceDisplayWaitVblankStartMulti);
+	REG_FUNC(0x05F27764, sceDisplayWaitVblankStartMultiCB);
+	REG_FUNC(0x9423560C, sceDisplayWaitSetFrameBuf);
+	REG_FUNC(0x814C90AF, sceDisplayWaitSetFrameBufCB);
+	REG_FUNC(0x7D9864A8, sceDisplayWaitSetFrameBufMulti);
+	REG_FUNC(0x3E796EF5, sceDisplayWaitSetFrameBufMultiCB);
+	REG_FUNC(0x6BDF4C4D, sceDisplayRegisterVblankStartCallback);
+	REG_FUNC(0x98436A80, sceDisplayUnregisterVblankStartCallback);
+});
\ No newline at end of file
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 50c1a279b4..e70afa794c 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -59,6 +59,9 @@
     <ClCompile Include="Emu\ARMv7\Modules\psv_event_flag.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\psv_sema.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceCtrl.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceDeci4p.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceDisplay.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceGxm.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibKernel.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibc.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibm.cpp" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index beeae1db31..69e962dbfc 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -686,6 +686,15 @@
     <ClCompile Include="Emu\ARMv7\Modules\sceCtrl.cpp">
       <Filter>Emu\CPU\ARMv7\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceDeci4p.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceDisplay.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceGxm.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">

From 579a88b7c43dcc1b005a3eae22a7364125904762 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 28 Jan 2015 15:59:16 +0300
Subject: [PATCH 49/70] vm_ptr: function format changed

---
 Utilities/BEType.h                         |  48 ++++++++--
 rpcs3/Emu/ARMv7/ARMv7Callback.h            |   4 +-
 rpcs3/Emu/ARMv7/ARMv7Context.h             |   2 +-
 rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp        |   8 +-
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.h     |   6 +-
 rpcs3/Emu/ARMv7/Modules/sceLibc.cpp        |   2 +-
 rpcs3/Emu/Cell/PPUThread.h                 |   2 +-
 rpcs3/Emu/Memory/vm_ptr.h                  |  49 ++++++----
 rpcs3/Emu/RSX/GCM.h                        |   2 +-
 rpcs3/Emu/RSX/RSXThread.h                  |   7 +-
 rpcs3/Emu/SysCalls/CB_FUNC.h               |   5 +-
 rpcs3/Emu/SysCalls/Modules.h               |   6 +-
 rpcs3/Emu/SysCalls/Modules/cellAdec.h      |   2 +-
 rpcs3/Emu/SysCalls/Modules/cellDmux.h      |   4 +-
 rpcs3/Emu/SysCalls/Modules/cellGame.cpp    |   4 +-
 rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp  |  16 ++--
 rpcs3/Emu/SysCalls/Modules/cellMsgDialog.h |   2 +-
 rpcs3/Emu/SysCalls/Modules/cellNetCtl.h    |   4 +-
 rpcs3/Emu/SysCalls/Modules/cellPngDec.h    |  12 +--
 rpcs3/Emu/SysCalls/Modules/cellResc.cpp    |  22 ++---
 rpcs3/Emu/SysCalls/Modules/cellResc.h      |   4 +-
 rpcs3/Emu/SysCalls/Modules/cellSail.h      | 102 ++++++++++-----------
 rpcs3/Emu/SysCalls/Modules/cellSaveData.h  |  10 +-
 rpcs3/Emu/SysCalls/Modules/cellSpurs.h     |   2 +-
 rpcs3/Emu/SysCalls/Modules/cellSync.cpp    |   8 +-
 rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp |   6 +-
 rpcs3/Emu/SysCalls/Modules/cellSysutil.h   |  20 ++--
 rpcs3/Emu/SysCalls/Modules/cellVdec.h      |   2 +-
 rpcs3/Emu/SysCalls/Modules/libmixer.h      |   2 +-
 rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h   |   2 +-
 rpcs3/Emu/SysCalls/Modules/sysPrxForUser.h |   2 +-
 rpcs3/Emu/SysCalls/lv2/cellFs.cpp          |   8 +-
 rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp  |   4 +-
 rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h    |   2 +-
 rpcs3/Loader/ELF64.cpp                     |   2 +-
 rpcs3/emucore.vcxproj                      |   1 +
 rpcs3/emucore.vcxproj.filters              |   3 +
 37 files changed, 216 insertions(+), 171 deletions(-)

diff --git a/Utilities/BEType.h b/Utilities/BEType.h
index 27997618bd..4965eac336 100644
--- a/Utilities/BEType.h
+++ b/Utilities/BEType.h
@@ -708,7 +708,7 @@ class to_be_t
 
 public:
 	//true if need swap endianes for be
-	static const bool value = (sizeof(T2) > 1) && (std::is_arithmetic<T>::value || std::is_enum<T>::value);
+	static const bool value = std::is_arithmetic<T>::value || std::is_enum<T>::value;
 
 	//be_t<T, size> if need swap endianes, T otherwise
 	typedef typename _be_type_selector< T, T2, value >::type type;
@@ -716,26 +716,58 @@ public:
 	typedef typename _be_type_selector< T, T2, !is_be_t<T, T2>::value >::type forced_type;
 };
 
+template<typename T, typename T2>
+class to_be_t<T, const T2>
+{
+public:
+	static const bool value = to_be_t<T, T2>::value;
+	typedef const typename to_be_t<T, T2>::type type;
+	typedef const typename to_be_t<T, T2>::forced_type forced_type;
+};
+
 template<typename T>
 class to_be_t<T, void>
 {
 public:
-	//true if need swap endianes for be
 	static const bool value = false;
-
-	//be_t<T, size> if need swap endianes, T otherwise
 	typedef void type;
+	typedef void forced_type;
 };
 
 template<typename T>
-class to_be_t<T, const void>
+class to_be_t<T, u8>
 {
 public:
-	//true if need swap endianes for be
 	static const bool value = false;
+	typedef u8 type;
+	typedef u8 forced_type;
+};
 
-	//be_t<T, size> if need swap endianes, T otherwise
-	typedef const void type;
+template<typename T>
+class to_be_t<T, s8>
+{
+public:
+	static const bool value = false;
+	typedef s8 type;
+	typedef s8 forced_type;
+};
+
+template<typename T>
+class to_be_t<T, char>
+{
+public:
+	static const bool value = false;
+	typedef char type;
+	typedef char forced_type;
+};
+
+template<typename T>
+class to_be_t<T, bool>
+{
+public:
+	static const bool value = false;
+	typedef bool type;
+	typedef bool forced_type;
 };
 
 template<typename T, typename T2 = T>
diff --git a/rpcs3/Emu/ARMv7/ARMv7Callback.h b/rpcs3/Emu/ARMv7/ARMv7Callback.h
index 4f9c72d1e0..18c39fe49d 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Callback.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Callback.h
@@ -5,7 +5,7 @@
 namespace vm
 {
 	template<typename AT, typename RT, typename... T>
-	__forceinline RT _ptr_base<RT(*)(T...), 1, AT>::operator()(ARMv7Context& context, T... args) const
+	__forceinline RT _ptr_base<RT(T...), 1, AT>::operator()(ARMv7Context& context, T... args) const
 	{
 		return psv_func_detail::func_caller<RT, T...>::call(context, vm::cast(this->addr()), args...);
 	}
@@ -15,4 +15,4 @@ template<typename RT, typename... T>
 __forceinline RT cb_call(ARMv7Context& context, u32 addr, T... args)
 {
 	return psv_func_detail::func_caller<RT, T...>::call(context, addr, args...);
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index 873f039555..962f5dcc19 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -266,7 +266,7 @@ struct cast_armv7_gpr<bool, false>
 		return value;
 	}
 
-	__forceinline static bool from_gpr(const u32 reg)
+	__forceinline static bool from_gpr(const u32& reg)
 	{
 		return reinterpret_cast<const bool&>(reg);
 	}
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp b/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp
index 972bd85d4c..b858e40972 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceCtrl.cpp
@@ -35,22 +35,22 @@ s32 sceCtrlGetSamplingMode(vm::psv::ptr<u32> puiMode)
 	throw __FUNCTION__;
 }
 
-s32 sceCtrlPeekBufferPositive(s32 port, vm::psv::ptr<SceCtrlData>pData, s32 nBufs)
+s32 sceCtrlPeekBufferPositive(s32 port, vm::psv::ptr<SceCtrlData> pData, s32 nBufs)
 {
 	throw __FUNCTION__;
 }
 
-s32 sceCtrlPeekBufferNegative(s32 port, vm::psv::ptr<SceCtrlData>pData, s32 nBufs)
+s32 sceCtrlPeekBufferNegative(s32 port, vm::psv::ptr<SceCtrlData> pData, s32 nBufs)
 {
 	throw __FUNCTION__;
 }
 
-s32 sceCtrlReadBufferPositive(s32 port, vm::psv::ptr<SceCtrlData>pData, s32 nBufs)
+s32 sceCtrlReadBufferPositive(s32 port, vm::psv::ptr<SceCtrlData> pData, s32 nBufs)
 {
 	throw __FUNCTION__;
 }
 
-s32 sceCtrlReadBufferNegative(s32 port, vm::psv::ptr<SceCtrlData>pData, s32 nBufs)
+s32 sceCtrlReadBufferNegative(s32 port, vm::psv::ptr<SceCtrlData> pData, s32 nBufs)
 {
 	throw __FUNCTION__;
 }
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
index 186c470b1c..df2bbd3d3d 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.h
@@ -306,7 +306,7 @@ struct SceKernelAllocMemBlockOpt
 
 // Thread Manager definitions (threads)
 
-typedef s32(*SceKernelThreadEntry)(u32 argSize, vm::psv::ptr<void> pArgBlock);
+typedef s32(SceKernelThreadEntry)(u32 argSize, vm::psv::ptr<void> pArgBlock);
 
 struct SceKernelThreadOptParam
 {
@@ -371,7 +371,7 @@ struct SceKernelSystemInfo
 
 // Thread Manager definitions (callbacks)
 
-typedef s32(*SceKernelCallbackFunction)(s32 notifyId, s32 notifyCount, s32 notifyArg, vm::psv::ptr<void> pCommon);
+typedef s32(SceKernelCallbackFunction)(s32 notifyId, s32 notifyCount, s32 notifyArg, vm::psv::ptr<void> pCommon);
 
 struct SceKernelCallbackInfo
 {
@@ -389,7 +389,7 @@ struct SceKernelCallbackInfo
 
 // Thread Manager definitions (events)
 
-typedef s32(*SceKernelThreadEventHandler)(s32 type, s32 threadId, s32 arg, vm::psv::ptr<void> pCommon);
+typedef s32(SceKernelThreadEventHandler)(s32 type, s32 threadId, s32 arg, vm::psv::ptr<void> pCommon);
 
 struct SceKernelEventInfo
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
index f0e596af2b..611be74629 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
@@ -8,7 +8,7 @@ extern psv_log_base sceLibc;
 
 vm::psv::ptr<void> g_dso;
 
-typedef void(*atexit_func_t)(vm::psv::ptr<void>);
+typedef void(atexit_func_t)(vm::psv::ptr<void>);
 
 std::vector<std::function<void(ARMv7Context&)>> g_atexit;
 
diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h
index 2c5c13246d..3def8675d6 100644
--- a/rpcs3/Emu/Cell/PPUThread.h
+++ b/rpcs3/Emu/Cell/PPUThread.h
@@ -969,7 +969,7 @@ struct cast_ppu_gpr<bool, false>
 		return value;
 	}
 
-	__forceinline static bool from_gpr(const u64 reg)
+	__forceinline static bool from_gpr(const u64& reg)
 	{
 		return reinterpret_cast<const bool&>(reg);
 	}
diff --git a/rpcs3/Emu/Memory/vm_ptr.h b/rpcs3/Emu/Memory/vm_ptr.h
index 23c7123b2d..ead6e577a0 100644
--- a/rpcs3/Emu/Memory/vm_ptr.h
+++ b/rpcs3/Emu/Memory/vm_ptr.h
@@ -109,7 +109,11 @@ namespace vm
 		
 	public:
 		typedef typename std::remove_cv<T>::type type;
-		static const u32 data_size = sizeof(T);
+
+		__forceinline static const u32 data_size()
+		{
+			return sizeof(T);
+		}
 
 		__forceinline T* const operator -> () const
 		{
@@ -119,45 +123,45 @@ namespace vm
 		_ptr_base operator++ (int)
 		{
 			AT result = m_addr;
-			m_addr += data_size;
+			m_addr += data_size();
 			return make(result);
 		}
 
 		_ptr_base& operator++ ()
 		{
-			m_addr += data_size;
+			m_addr += data_size();
 			return *this;
 		}
 
 		_ptr_base operator-- (int)
 		{
 			AT result = m_addr;
-			m_addr -= data_size;
+			m_addr -= data_size();
 			return make(result);
 		}
 
 		_ptr_base& operator-- ()
 		{
-			m_addr -= data_size;
+			m_addr -= data_size();
 			return *this;
 		}
 
 		_ptr_base& operator += (AT count)
 		{
-			m_addr += count * data_size;
+			m_addr += count * data_size();
 			return *this;
 		}
 
 		_ptr_base& operator -= (AT count)
 		{
-			m_addr -= count * data_size;
+			m_addr -= count * data_size();
 			return *this;
 		}
 
-		_ptr_base operator + (typename	remove_be_t<AT>::type count) const { return make(m_addr + count * data_size); }
-		_ptr_base operator + (typename		to_be_t<AT>::type count) const { return make(m_addr + count * data_size); }
-		_ptr_base operator - (typename	remove_be_t<AT>::type count) const { return make(m_addr - count * data_size); }
-		_ptr_base operator - (typename		to_be_t<AT>::type count) const { return make(m_addr - count * data_size); }
+		_ptr_base operator + (typename	remove_be_t<AT>::type count) const { return make(m_addr + count * data_size()); }
+		_ptr_base operator + (typename		to_be_t<AT>::type count) const { return make(m_addr + count * data_size()); }
+		_ptr_base operator - (typename	remove_be_t<AT>::type count) const { return make(m_addr - count * data_size()); }
+		_ptr_base operator - (typename		to_be_t<AT>::type count) const { return make(m_addr - count * data_size()); }
 
 		__forceinline T& operator *() const
 		{
@@ -166,12 +170,12 @@ namespace vm
 
 		__forceinline T& operator [](typename remove_be_t<AT>::type index) const
 		{
-			return vm::get_ref<T>(vm::cast(m_addr + data_size * index));
+			return vm::get_ref<T>(vm::cast(m_addr + data_size() * index));
 		}
 
 		__forceinline T& operator [](typename to_be_t<AT>::forced_type index) const
 		{
-			return vm::get_ref<T>(vm::cast(m_addr + data_size * index));
+			return vm::get_ref<T>(vm::cast(m_addr + data_size() * index));
 		}
 
 		__forceinline bool operator <(const _ptr_base& right) const { return m_addr < right.m_addr; }
@@ -326,12 +330,12 @@ namespace vm
 	};
 
 	template<typename AT, typename RT, typename ...T>
-	class _ptr_base<RT(*)(T...), 1, AT>
+	class _ptr_base<RT(T...), 1, AT>
 	{
 		AT m_addr;
 
 	public:
-		typedef RT(*type)(T...);
+		typedef RT(type)(T...);
 
 		RT operator()(CPUThread& CPU, T... args) const; // defined in CB_FUNC.h, call using specified PPU thread context
 
@@ -360,10 +364,10 @@ namespace vm
 		explicit operator bool() const { return m_addr != 0; }
 
 		template<typename AT2>
-		operator const _ptr_base<RT(*)(T...), 1, AT2>() const
+		operator const _ptr_base<type, 1, AT2>() const
 		{
 			const AT2 addr = convert_le_be<AT2>(m_addr);
-			return reinterpret_cast<const _ptr_base<RT(*)(T...), 1, AT2>&>(addr);
+			return reinterpret_cast<const _ptr_base<type, 1, AT2>&>(addr);
 		}
 
 		static const _ptr_base make(const AT& addr)
@@ -371,7 +375,7 @@ namespace vm
 			return reinterpret_cast<const _ptr_base&>(addr);
 		}
 
-		operator const std::function<RT(T...)>() const
+		operator const std::function<type>() const
 		{
 			const AT addr = convert_le_be<AT>(m_addr);
 			return [addr](T... args) -> RT { return make(addr)(args...); };
@@ -380,6 +384,15 @@ namespace vm
 		_ptr_base& operator = (const _ptr_base& right) = default;
 	};
 
+	template<typename AT, typename RT, typename ...T>
+	class _ptr_base<RT(*)(T...), 1, AT>
+	{
+		AT m_addr;
+
+	public:
+		static_assert(!sizeof(AT), "vm::_ptr_base<> error: use RT(T...) format for functions instead of RT(*)(T...)");
+	};
+
 	//BE pointer to LE data
 	template<typename T, int lvl = 1, typename AT = u32> struct bptrl : public _ptr_base<T, lvl, typename to_be_t<AT>::type>
 	{
diff --git a/rpcs3/Emu/RSX/GCM.h b/rpcs3/Emu/RSX/GCM.h
index 7b216aa87f..929b968503 100644
--- a/rpcs3/Emu/RSX/GCM.h
+++ b/rpcs3/Emu/RSX/GCM.h
@@ -220,7 +220,7 @@ struct CellGcmConfig
 
 struct CellGcmContextData;
 
-typedef s32(*CellGcmContextCallback)(vm::ptr<CellGcmContextData>, u32);
+typedef s32(CellGcmContextCallback)(vm::ptr<CellGcmContextData>, u32);
 
 struct CellGcmContextData
 {
diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h
index 618573d21a..c0f412f648 100644
--- a/rpcs3/Emu/RSX/RSXThread.h
+++ b/rpcs3/Emu/RSX/RSXThread.h
@@ -154,10 +154,10 @@ public:
 	SSemaphore m_sem_flush;
 	SSemaphore m_sem_flip;
 	u64 m_last_flip_time;
-	vm::ptr<void(*)(const u32)> m_flip_handler;
-	vm::ptr<void(*)(const u32)> m_user_handler;
+	vm::ptr<void(u32)> m_flip_handler;
+	vm::ptr<void(u32)> m_user_handler;
 	u64 m_vblank_count;
-	vm::ptr<void(*)(const u32)> m_vblank_handler;
+	vm::ptr<void(u32)> m_vblank_handler;
 
 public:
 	// Dither
@@ -442,6 +442,7 @@ protected:
 		, m_flip_mode(CELL_GCM_DISPLAY_VSYNC)
 		, m_debug_level(CELL_GCM_DEBUG_LEVEL0)
 		, m_frequency_mode(CELL_GCM_DISPLAY_FREQUENCY_DISABLE)
+		, m_report_main_addr(0)
 		, m_main_mem_addr(0)
 		, m_local_mem_addr(0)
 		, m_draw_mode(0)
diff --git a/rpcs3/Emu/SysCalls/CB_FUNC.h b/rpcs3/Emu/SysCalls/CB_FUNC.h
index 403a703db5..160eab9559 100644
--- a/rpcs3/Emu/SysCalls/CB_FUNC.h
+++ b/rpcs3/Emu/SysCalls/CB_FUNC.h
@@ -163,7 +163,7 @@ namespace cb_detail
 namespace vm
 {
 	template<typename AT, typename RT, typename... T>
-	__forceinline RT _ptr_base<RT(*)(T...), 1, AT>::operator()(CPUThread& CPU, T... args) const
+	__forceinline RT _ptr_base<RT(T...), 1, AT>::operator()(CPUThread& CPU, T... args) const
 	{
 		auto data = vm::get_ptr<be_t<u32>>(vm::cast(m_addr));
 		const u32 pc = data[0];
@@ -174,7 +174,7 @@ namespace vm
 	}
 
 	template<typename AT, typename RT, typename... T>
-	__forceinline RT _ptr_base<RT(*)(T...), 1, AT>::operator()(T... args) const
+	__forceinline RT _ptr_base<RT(T...), 1, AT>::operator()(T... args) const
 	{
 		return operator()(GetCurrentPPUThread(), args...);
 	}
@@ -186,6 +186,7 @@ __forceinline RT cb_call(PPUThread& CPU, u32 pc, u32 rtoc, T... args)
 	return cb_detail::_func_caller<RT, T...>::call(CPU, pc, rtoc, args...);
 }
 
+// Something is wrong with it (but cb_call<void, ...>() should work anyway)
 //template<typename... T>
 //void cb_call(PPUThread& CPU, u32 pc, u32 rtoc, T... args)
 //{
diff --git a/rpcs3/Emu/SysCalls/Modules.h b/rpcs3/Emu/SysCalls/Modules.h
index 5874dc6fc5..6172e623fc 100644
--- a/rpcs3/Emu/SysCalls/Modules.h
+++ b/rpcs3/Emu/SysCalls/Modules.h
@@ -9,9 +9,9 @@ struct ModuleFunc
 {
 	u32 id;
 	func_caller* func;
-	vm::ptr<void(*)()> lle_func;
+	vm::ptr<void()> lle_func;
 
-	ModuleFunc(u32 id, func_caller* func, vm::ptr<void(*)()> lle_func = vm::ptr<void(*)()>::make(0))
+	ModuleFunc(u32 id, func_caller* func, vm::ptr<void()> lle_func = vm::ptr<void()>::make(0))
 		: id(id)
 		, func(func)
 		, lle_func(lle_func)
@@ -129,7 +129,7 @@ public:
 
 	bool RemoveId(u32 id);
 	
-	void RegisterLLEFunc(u32 id, vm::ptr<void(*)()> func)
+	void RegisterLLEFunc(u32 id, vm::ptr<void()> func)
 	{
 		if (auto f = GetFunc(id))
 		{
diff --git a/rpcs3/Emu/SysCalls/Modules/cellAdec.h b/rpcs3/Emu/SysCalls/Modules/cellAdec.h
index a0a3fb2a8e..00c5a58c3e 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellAdec.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellAdec.h
@@ -366,7 +366,7 @@ enum CellAdecMsgType
 	CELL_ADEC_MSG_TYPE_SEQDONE,
 };
 
-typedef s32(*CellAdecCbMsg)(u32 handle, CellAdecMsgType msgType, s32 msgData, u32 cbArg);
+typedef s32(CellAdecCbMsg)(u32 handle, CellAdecMsgType msgType, s32 msgData, u32 cbArg);
 
 struct CellAdecCb
 {
diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.h b/rpcs3/Emu/SysCalls/Modules/cellDmux.h
index 8a2a70cc5b..edca677727 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellDmux.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.h
@@ -217,7 +217,7 @@ struct CellDmuxResource2
 	be_t<u32> shit[4];
 };
 
-typedef u32(*CellDmuxCbMsg)(u32 demuxerHandle, vm::ptr<CellDmuxMsg> demuxerMsg, u32 cbArg);
+typedef u32(CellDmuxCbMsg)(u32 demuxerHandle, vm::ptr<CellDmuxMsg> demuxerMsg, u32 cbArg);
 
 struct CellDmuxCb
 {
@@ -225,7 +225,7 @@ struct CellDmuxCb
 	be_t<u32> cbArg;
 };
 
-typedef u32(*CellDmuxCbEsMsg)(u32 demuxerHandle, u32 esHandle, vm::ptr<CellDmuxEsMsg> esMsg, u32 cbArg);
+typedef u32(CellDmuxCbEsMsg)(u32 demuxerHandle, u32 esHandle, vm::ptr<CellDmuxEsMsg> esMsg, u32 cbArg);
 
 struct CellDmuxEsCb
 {
diff --git a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp
index 6fb4df09ca..e54aedb7e2 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp
@@ -202,7 +202,7 @@ int cellGameContentPermit(vm::ptr<char[CELL_GAME_PATH_MAX]> contentInfoPath, vm:
 }
 
 int cellGameDataCheckCreate2(PPUThread& CPU, u32 version, vm::ptr<const char> dirName, u32 errDialog,
-	vm::ptr<void(*)(vm::ptr<CellGameDataCBResult> cbResult, vm::ptr<CellGameDataStatGet> get, vm::ptr<CellGameDataStatSet> set)> funcStat, u32 container)
+	vm::ptr<void(vm::ptr<CellGameDataCBResult> cbResult, vm::ptr<CellGameDataStatGet> get, vm::ptr<CellGameDataStatSet> set)> funcStat, u32 container)
 {
 	cellGame->Warning("cellGameDataCheckCreate(2)(version=0x%x, dirName_addr=0x%x, errDialog=0x%x, funcStat_addr=0x%x, container=%d)",
 		version, dirName.addr(), errDialog, funcStat.addr(), container);
@@ -307,7 +307,7 @@ int cellGameDataCheckCreate2(PPUThread& CPU, u32 version, vm::ptr<const char> di
 }
 
 int cellGameDataCheckCreate(PPUThread& CPU, u32 version, vm::ptr<const char> dirName, u32 errDialog,
-	vm::ptr<void(*)(vm::ptr<CellGameDataCBResult> cbResult, vm::ptr<CellGameDataStatGet> get, vm::ptr<CellGameDataStatSet> set)> funcStat, u32 container)
+	vm::ptr<void(vm::ptr<CellGameDataCBResult> cbResult, vm::ptr<CellGameDataStatGet> get, vm::ptr<CellGameDataStatSet> set)> funcStat, u32 container)
 {
 	// TODO: almost identical, the only difference is that this function will always calculate the size of game data
 	return cellGameDataCheckCreate2(CPU, version, dirName, errDialog, funcStat, container);
diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
index f91f4cb1c6..908012920c 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
@@ -125,12 +125,8 @@ u32 cellGcmGetNotifyDataAddress(u32 index)
 {
 	cellGcmSys->Warning("cellGcmGetNotifyDataAddress(index=%d)", index);
 
-	// Get address of 'IO table' and 'EA table'
-	vm::var<CellGcmOffsetTable> table;
-	cellGcmGetOffsetTable(table);
-
 	// If entry not in use, return NULL
-	u16 entry = table->eaAddress[241];
+	u16 entry = offsetTable.eaAddress[241];
 	if (entry == 0xFFFF) {
 		return 0;
 	}
@@ -455,7 +451,7 @@ int cellGcmSetFlip(vm::ptr<CellGcmContextData> ctxt, u32 id)
 	return res < 0 ? CELL_GCM_ERROR_FAILURE : CELL_OK;
 }
 
-void cellGcmSetFlipHandler(vm::ptr<void(*)(const u32)> handler)
+void cellGcmSetFlipHandler(vm::ptr<void(u32)> handler)
 {
 	cellGcmSys->Warning("cellGcmSetFlipHandler(handler_addr=%d)", handler.addr());
 
@@ -596,14 +592,14 @@ int cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u
 	return CELL_OK;
 }
 
-void cellGcmSetUserHandler(vm::ptr<void(*)(const u32)> handler)
+void cellGcmSetUserHandler(vm::ptr<void(u32)> handler)
 {
 	cellGcmSys->Warning("cellGcmSetUserHandler(handler_addr=0x%x)", handler.addr());
 
 	Emu.GetGSManager().GetRender().m_user_handler = handler;
 }
 
-void cellGcmSetVBlankHandler(vm::ptr<void(*)(const u32)> handler)
+void cellGcmSetVBlankHandler(vm::ptr<void(u32)> handler)
 {
 	cellGcmSys->Warning("cellGcmSetVBlankHandler(handler_addr=0x%x)", handler.addr());
 
@@ -1191,7 +1187,7 @@ s32 cellGcmCallback(vm::ptr<CellGcmContextData> context, u32 count)
 	//auto& ctrl = vm::get_ref<CellGcmControl>(gcm_info.control_addr);
 
 	// preparations for changing the place (for optimized FIFO mode)
-	//auto cmd = vm::ptr<u32>::make(context->current.ToLE());
+	//auto cmd = vm::ptr<u32>::make(context->current);
 	//cmd[0] = 0x41D6C;
 	//cmd[1] = 0x20;
 	//cmd[2] = 0x41D74;
@@ -1207,7 +1203,7 @@ s32 cellGcmCallback(vm::ptr<CellGcmContextData> context, u32 count)
 		vm::write32(context->current, CELL_GCM_METHOD_FLAG_JUMP | offset); // set JUMP cmd
 
 		auto& ctrl = vm::get_ref<CellGcmControl>(gcm_info.control_addr);
-		ctrl.put.write_relaxed(be_t<u32>::make(offset));
+		ctrl.put.exchange(be_t<u32>::make(offset));
 	}
 	else
 	{
diff --git a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.h b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.h
index 4b76eb975c..3ce4d78e0b 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.h
@@ -79,7 +79,7 @@ enum
 	CELL_MSGDIALOG_BUTTON_ESCAPE  = 3,
 };
 
-typedef void(*CellMsgDialogCallback)(s32 buttonType, u32 userData);
+typedef void(CellMsgDialogCallback)(s32 buttonType, u32 userData);
 
 s32 cellMsgDialogOpen2(u32 type, vm::ptr<const char> msgString, vm::ptr<CellMsgDialogCallback> callback, u32 userData, u32 extParam);
 s32 cellMsgDialogOpenErrorCode(u32 errorCode, vm::ptr<CellMsgDialogCallback> callback, u32 userData, u32 extParam);
diff --git a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.h b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.h
index 4cb89a6962..a09167848e 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.h
@@ -224,7 +224,7 @@ union CellNetCtlInfo
 	be_t<u32> ip_config;
 	s8 dhcp_hostname[256];
 	s8 pppoe_auth_name[128];
-	s8 ip_address[16];
+	char ip_address[16];
 	s8 netmask[16];
 	s8 default_route[16];
 	s8 primary_dns[16];
@@ -257,4 +257,4 @@ struct CellNetCtlNatInfo
 	be_t<u32> mapped_addr;
 };
 
-typedef void(*cellNetCtlHandler)(s32 prev_state, s32 new_state, s32 event, s32 error_code, vm::ptr<u32> arg);
+typedef void(cellNetCtlHandler)(s32 prev_state, s32 new_state, s32 event, s32 error_code, vm::ptr<u32> arg);
diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.h b/rpcs3/Emu/SysCalls/Modules/cellPngDec.h
index e0a5473584..86170f7508 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.h
@@ -87,8 +87,8 @@ enum CellPngDecDecodeStatus : u32
 };
 
 // Callbacks
-typedef vm::ptr<void>(*CellPngDecCbControlMalloc)(u32 size, vm::ptr<void> cbCtrlMallocArg);
-typedef s32(*CellPngDecCbControlFree)(vm::ptr<void> ptr, vm::ptr<void> cbCtrlFreeArg);
+typedef vm::ptr<void>(CellPngDecCbControlMalloc)(u32 size, vm::ptr<void> cbCtrlMallocArg);
+typedef s32(CellPngDecCbControlFree)(vm::ptr<void> ptr, vm::ptr<void> cbCtrlFreeArg);
 
 // Structs
 struct CellPngDecThreadInParam
@@ -283,11 +283,7 @@ struct CellPngDecStrmParam
 	be_t<u32> strmSize;
 };
 
-typedef s32(*CellPngDecCbControlStream)(
-	vm::ptr<CellPngDecStrmInfo> strmInfo,
-	vm::ptr<CellPngDecStrmParam> strmParam,
-	vm::ptr<void> cbCtrlStrmArg
-	);
+typedef s32(CellPngDecCbControlStream)(vm::ptr<CellPngDecStrmInfo> strmInfo, vm::ptr<CellPngDecStrmParam> strmParam, vm::ptr<void> cbCtrlStrmArg);
 
 struct CellPngDecDispInfo
 {
@@ -310,7 +306,7 @@ struct CellPngDecDispParam
 };
 
 // Callback
-typedef s32(*CellPngDecCbControlDisp)(vm::ptr<CellPngDecDispInfo> dispInfo, vm::ptr<CellPngDecDispParam> dispParam, vm::ptr<void> cbCtrlDispArg);
+typedef s32(CellPngDecCbControlDisp)(vm::ptr<CellPngDecDispInfo> dispInfo, vm::ptr<CellPngDecDispParam> dispParam, vm::ptr<void> cbCtrlDispArg);
 
 // Structs
 struct CellPngDecOpnParam
diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp
index 7cf2717bea..d10da00a1f 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp
@@ -12,8 +12,8 @@ Module *cellResc = nullptr;
 
 extern s32 cellVideoOutConfigure(u32 videoOut, vm::ptr<CellVideoOutConfiguration> config, vm::ptr<CellVideoOutOption> option, u32 waitForEvent);
 extern int cellGcmSetFlipMode(u32 mode);
-extern void cellGcmSetFlipHandler(vm::ptr<void(*)(const u32)> handler);
-extern void cellGcmSetVBlankHandler(vm::ptr<void(*)(const u32)> handler);
+extern void cellGcmSetFlipHandler(vm::ptr<void(u32)> handler);
+extern void cellGcmSetVBlankHandler(vm::ptr<void(u32)> handler);
 extern int cellGcmAddressToOffset(u64 address, vm::ptr<be_t<u32>> offset);
 extern int cellGcmSetDisplayBuffer(u32 id, u32 offset, u32 pitch, u32 width, u32 height);
 extern int cellGcmSetPrepareFlip(vm::ptr<CellGcmContextData> ctx, u32 id);
@@ -603,7 +603,7 @@ void cellRescExit()
 	if (IsPalTemporal())
 	{
 		cellGcmSetSecondVFrequency(CELL_GCM_DISPLAY_FREQUENCY_DISABLE);
-		cellGcmSetVBlankHandler(vm::ptr<void(*)(const u32)>::make(0));
+		cellGcmSetVBlankHandler(vm::ptr<void(u32)>::make(0));
 		//GcmSysTypePrefix::cellGcmSetSecondVHandler(NULL);
 
 		if (IsPalInterpolate())
@@ -667,7 +667,7 @@ int cellRescSetDsts(u32 dstsMode, vm::ptr<CellRescDsts> dsts)
 	return CELL_OK;
 }
 
-void SetVBlankHandler(vm::ptr<void(*)(const u32)> handler)
+void SetVBlankHandler(vm::ptr<void(u32)> handler)
 {
 	if (!s_rescInternalInstance->m_bInitialized || s_rescInternalInstance->m_dstMode == 0) 
 	{
@@ -693,7 +693,7 @@ void SetVBlankHandler(vm::ptr<void(*)(const u32)> handler)
 }
 
 
-void SetFlipHandler(vm::ptr<void(*)(const u32)> handler)
+void SetFlipHandler(vm::ptr<void(u32)> handler)
 {
 	if (!s_rescInternalInstance->m_bInitialized || s_rescInternalInstance->m_dstMode == 0) 
 	{
@@ -780,20 +780,20 @@ int cellRescSetDisplayMode(u32 displayMode)
 		cellGcmSetSecondVFrequency(CELL_GCM_DISPLAY_FREQUENCY_59_94HZ);
 		//cellGcmSetVBlankHandler(IntrHandler50);
 		//cellGcmSetSecondVHandler(IntrHandler60);
-		cellGcmSetFlipHandler(vm::ptr<void(*)(const u32)>::make(0));
+		cellGcmSetFlipHandler(vm::ptr<void(u32)>::make(0));
 	}
 	else if (IsPalDrop())
 	{
 		//InitLabels();
 		cellGcmSetSecondVFrequency(CELL_GCM_DISPLAY_FREQUENCY_59_94HZ);
-		cellGcmSetVBlankHandler(vm::ptr<void(*)(const u32)>::make(0));
+		cellGcmSetVBlankHandler(vm::ptr<void(u32)>::make(0));
 		//cellGcmSetSecondVHandler(IntrHandler60Drop);
-		cellGcmSetFlipHandler(vm::ptr<void(*)(const u32)>::make(0));
+		cellGcmSetFlipHandler(vm::ptr<void(u32)>::make(0));
 	} 
 	else if (IsPal60Hsync())
 	{
 		cellGcmSetSecondVFrequency(CELL_GCM_DISPLAY_FREQUENCY_59_94HZ);
-		cellGcmSetVBlankHandler(vm::ptr<void(*)(const u32)>::make(0));
+		cellGcmSetVBlankHandler(vm::ptr<void(u32)>::make(0));
 	}
 
 	if (s_rescInternalInstance->s_applicationVBlankHandler) SetVBlankHandler(s_rescInternalInstance->s_applicationVBlankHandler);
@@ -1073,7 +1073,7 @@ int cellRescSetBufferAddress(vm::ptr<u32> colorBuffers, vm::ptr<u32> vertexArray
 	return CELL_OK;
 }
 
-void cellRescSetFlipHandler(vm::ptr<void(*)(const u32)> handler)
+void cellRescSetFlipHandler(vm::ptr<void(u32)> handler)
 {
 	cellResc->Warning("cellRescSetFlipHandler(handler_addr=0x%x)", handler.addr());
 
@@ -1113,7 +1113,7 @@ int cellRescSetRegisterCount()
 	return CELL_OK;
 }
 
-void cellRescSetVBlankHandler(vm::ptr<void(*)(const u32)> handler)
+void cellRescSetVBlankHandler(vm::ptr<void(u32)> handler)
 {
 	cellResc->Warning("cellRescSetVBlankHandler(handler_addr=0x%x)", handler.addr());
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.h b/rpcs3/Emu/SysCalls/Modules/cellResc.h
index 74a7652397..a2d577a061 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellResc.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellResc.h
@@ -137,8 +137,8 @@ struct CCellRescInternal
 	bool m_isDummyFlipped;
 	u8 m_cgParamIndex[RESC_PARAM_NUM];
 	u64 m_commandIdxCaF, m_rcvdCmdIdx;
-	vm::ptr<void(*)(const u32)> s_applicationFlipHandler;
-	vm::ptr<void(*)(const u32)> s_applicationVBlankHandler;
+	vm::ptr<void(u32)> s_applicationFlipHandler;
+	vm::ptr<void(u32)> s_applicationVBlankHandler;
 
 	CCellRescInternal()
 		: m_bInitialized(false)
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSail.h b/rpcs3/Emu/SysCalls/Modules/cellSail.h
index d0244fed6d..3f77c94d98 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSail.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellSail.h
@@ -618,64 +618,64 @@ union CellSailEvent
 	};
 };
 
-typedef u32(*CellSailMemAllocatorFuncAlloc)(u32 pArg, u32 boundary, u32 size);
-typedef u32(*CellSailMemAllocatorFuncFree)(u32 pArg, u32 boundary, u32 pMemory);
+typedef u32(CellSailMemAllocatorFuncAlloc)(u32 pArg, u32 boundary, u32 size);
+typedef u32(CellSailMemAllocatorFuncFree)(u32 pArg, u32 boundary, u32 pMemory);
 
-typedef int(*CellSailSoundAdapterFuncMakeup)(u32 pArg);
-typedef int(*CellSailSoundAdapterFuncCleanup)(u32 pArg);
-typedef void(*CellSailSoundAdapterFuncFormatChanged)(u32 pArg, vm::ptr<CellSailAudioFormat> pFormat, u32 sessionId);
+typedef int(CellSailSoundAdapterFuncMakeup)(u32 pArg);
+typedef int(CellSailSoundAdapterFuncCleanup)(u32 pArg);
+typedef void(CellSailSoundAdapterFuncFormatChanged)(u32 pArg, vm::ptr<CellSailAudioFormat> pFormat, u32 sessionId);
 
-typedef int(*CellSailGraphicsAdapterFuncMakeup)(u32 pArg);
-typedef int(*CellSailGraphicsAdapterFuncCleanup)(u32 pArg);
-typedef void(*CellSailGraphicsAdapterFuncFormatChanged)(u32 pArg, vm::ptr<CellSailVideoFormat> pFormat, u32 sessionId);
-typedef int(*CellSailGraphicsAdapterFuncAllocFrame)(u32 pArg, u32 size, s32 num, u8 ppFrame);
-typedef int(*CellSailGraphicsAdapterFuncFreeFrame)(u32 pArg, s32 num, u8 ppFrame);
+typedef int(CellSailGraphicsAdapterFuncMakeup)(u32 pArg);
+typedef int(CellSailGraphicsAdapterFuncCleanup)(u32 pArg);
+typedef void(CellSailGraphicsAdapterFuncFormatChanged)(u32 pArg, vm::ptr<CellSailVideoFormat> pFormat, u32 sessionId);
+typedef int(CellSailGraphicsAdapterFuncAllocFrame)(u32 pArg, u32 size, s32 num, u8 ppFrame);
+typedef int(CellSailGraphicsAdapterFuncFreeFrame)(u32 pArg, s32 num, u8 ppFrame);
 
-typedef int(*CellSailSourceFuncMakeup)(u32 pArg, s8 pProtocolNames);
-typedef int(*CellSailSourceFuncCleanup)(u32 pArg);
-typedef void(*CellSailSourceFuncOpen)(u32 pArg, s32 streamType, u32 pMediaInfo, s8 pUri, vm::ptr<CellSailSourceStreamingProfile> pProfile);
-typedef void(*CellSailSourceFuncClose)(u32 pArg);
-typedef void(*CellSailSourceFuncStart)(u32 pArg, vm::ptr<CellSailSourceStartCommand> pCommand, u32 sessionId);
-typedef void(*CellSailSourceFuncStop)(u32 pArg);
-typedef void(*CellSailSourceFuncCancel)(u32 pArg);
-typedef int(*CellSailSourceFuncCheckout)(u32 pArg, vm::ptr<CellSailSourceBufferItem> ppItem);
-typedef int(*CellSailSourceFuncCheckin)(u32 pArg, vm::ptr<CellSailSourceBufferItem> pItem);
-typedef int(*CellSailSourceFuncClear)(u32 pArg);
-typedef int(*CellSailSourceFuncRead)(u32 pArg, s32 streamType, u32 pMediaInfo, s8 pUri, u64 offset, u8 pBuf, u32 size, u64 pTotalSize);
-typedef int(*CellSailSourceFuncReadSync)(u32 pArg, s32 streamType, u32 pMediaInfo, s8 pUri, u64 offset, u8 pBuf, u32 size, u64 pTotalSize);
-typedef int(*CellSailSourceFuncGetCapabilities)(u32 pArg, s32 streamType, u32 pMediaInfo, s8 pUri, u64 pCapabilities);
-typedef int(*CellSailSourceFuncInquireCapability)(u32 pArg, s32 streamType, u32 pMediaInfo, s8 pUri, vm::ptr<CellSailSourceStartCommand> pCommand);
-typedef void(*CellSailSourceCheckFuncError)(u32 pArg, s8 pMsg, s32 line);
+typedef int(CellSailSourceFuncMakeup)(u32 pArg, s8 pProtocolNames);
+typedef int(CellSailSourceFuncCleanup)(u32 pArg);
+typedef void(CellSailSourceFuncOpen)(u32 pArg, s32 streamType, u32 pMediaInfo, s8 pUri, vm::ptr<CellSailSourceStreamingProfile> pProfile);
+typedef void(CellSailSourceFuncClose)(u32 pArg);
+typedef void(CellSailSourceFuncStart)(u32 pArg, vm::ptr<CellSailSourceStartCommand> pCommand, u32 sessionId);
+typedef void(CellSailSourceFuncStop)(u32 pArg);
+typedef void(CellSailSourceFuncCancel)(u32 pArg);
+typedef int(CellSailSourceFuncCheckout)(u32 pArg, vm::ptr<CellSailSourceBufferItem> ppItem);
+typedef int(CellSailSourceFuncCheckin)(u32 pArg, vm::ptr<CellSailSourceBufferItem> pItem);
+typedef int(CellSailSourceFuncClear)(u32 pArg);
+typedef int(CellSailSourceFuncRead)(u32 pArg, s32 streamType, u32 pMediaInfo, s8 pUri, u64 offset, u8 pBuf, u32 size, u64 pTotalSize);
+typedef int(CellSailSourceFuncReadSync)(u32 pArg, s32 streamType, u32 pMediaInfo, s8 pUri, u64 offset, u8 pBuf, u32 size, u64 pTotalSize);
+typedef int(CellSailSourceFuncGetCapabilities)(u32 pArg, s32 streamType, u32 pMediaInfo, s8 pUri, u64 pCapabilities);
+typedef int(CellSailSourceFuncInquireCapability)(u32 pArg, s32 streamType, u32 pMediaInfo, s8 pUri, vm::ptr<CellSailSourceStartCommand> pCommand);
+typedef void(CellSailSourceCheckFuncError)(u32 pArg, s8 pMsg, s32 line);
 
-typedef int(*CellSailFsFuncOpen)(s8 pPath, s32 flag, s32 pFd, u32 pArg, u64 size);
-typedef int(*CellSailFsFuncOpenSecond)(s8 pPath, s32 flag, s32 fd, u32 pArg, u64 size);
-typedef int(*CellSailFsFuncClose)(s32 fd);
-typedef int(*CellSailFsFuncFstat)(s32 fd, u32 pStat_addr);
-typedef int(*CellSailFsFuncRead)(s32 fd, u32 pBuf, u64 numBytes, u64 pNumRead);
-typedef int(*CellSailFsFuncLseek)(s32 fd, s64 offset, s32 whence, u64 pPosition);
-typedef int(*CellSailFsFuncCancel)(s32 fd);
+typedef int(CellSailFsFuncOpen)(s8 pPath, s32 flag, s32 pFd, u32 pArg, u64 size);
+typedef int(CellSailFsFuncOpenSecond)(s8 pPath, s32 flag, s32 fd, u32 pArg, u64 size);
+typedef int(CellSailFsFuncClose)(s32 fd);
+typedef int(CellSailFsFuncFstat)(s32 fd, u32 pStat_addr);
+typedef int(CellSailFsFuncRead)(s32 fd, u32 pBuf, u64 numBytes, u64 pNumRead);
+typedef int(CellSailFsFuncLseek)(s32 fd, s64 offset, s32 whence, u64 pPosition);
+typedef int(CellSailFsFuncCancel)(s32 fd);
 
-typedef int(*CellSailRendererAudioFuncMakeup)(u32 pArg);
-typedef int(*CellSailRendererAudioFuncCleanup)(u32 pArg);
-typedef void(*CellSailRendererAudioFuncOpen)(u32 pArg, vm::ptr<CellSailAudioFormat> pInfo, u32 frameNum);
-typedef void(*CellSailRendererAudioFuncClose)(u32 pArg);
-typedef void(*CellSailRendererAudioFuncStart)(u32 pArg, bool buffering);
-typedef void(*CellSailRendererAudioFuncStop)(u32 pArg, bool flush);
-typedef void(*CellSailRendererAudioFuncCancel)(u32 pArg);
-typedef int(*CellSailRendererAudioFuncCheckout)(u32 pArg, vm::ptr<CellSailAudioFrameInfo> ppInfo);
-typedef int(*CellSailRendererAudioFuncCheckin)(u32 pArg, vm::ptr<CellSailAudioFrameInfo> pInfo);
+typedef int(CellSailRendererAudioFuncMakeup)(u32 pArg);
+typedef int(CellSailRendererAudioFuncCleanup)(u32 pArg);
+typedef void(CellSailRendererAudioFuncOpen)(u32 pArg, vm::ptr<CellSailAudioFormat> pInfo, u32 frameNum);
+typedef void(CellSailRendererAudioFuncClose)(u32 pArg);
+typedef void(CellSailRendererAudioFuncStart)(u32 pArg, bool buffering);
+typedef void(CellSailRendererAudioFuncStop)(u32 pArg, bool flush);
+typedef void(CellSailRendererAudioFuncCancel)(u32 pArg);
+typedef int(CellSailRendererAudioFuncCheckout)(u32 pArg, vm::ptr<CellSailAudioFrameInfo> ppInfo);
+typedef int(CellSailRendererAudioFuncCheckin)(u32 pArg, vm::ptr<CellSailAudioFrameInfo> pInfo);
 
-typedef int(*CellSailRendererVideoFuncMakeup)(u32 pArg);
-typedef int(*CellSailRendererVideoFuncCleanup)(u32 pArg);
-typedef void(*CellSailRendererVideoFuncOpen)(u32 pArg, vm::ptr<CellSailVideoFormat> pInfo, u32 frameNum, u32 minFrameNum);
-typedef void(*CellSailRendererVideoFuncClose)(u32 pArg);
-typedef void(*CellSailRendererVideoFuncStart)(u32 pArg, bool buffering);
-typedef void(*CellSailRendererVideoFuncStop)(u32 pArg, bool flush, bool keepRendering);
-typedef void(*CellSailRendererVideoFuncCancel)(u32 pArg);
-typedef int(*CellSailRendererVideoFuncCheckout)(u32 pArg, vm::ptr<CellSailVideoFrameInfo> ppInfo);
-typedef int(*CellSailRendererVideoFuncCheckin)(u32 pArg, vm::ptr<CellSailVideoFrameInfo> pInfo);
+typedef int(CellSailRendererVideoFuncMakeup)(u32 pArg);
+typedef int(CellSailRendererVideoFuncCleanup)(u32 pArg);
+typedef void(CellSailRendererVideoFuncOpen)(u32 pArg, vm::ptr<CellSailVideoFormat> pInfo, u32 frameNum, u32 minFrameNum);
+typedef void(CellSailRendererVideoFuncClose)(u32 pArg);
+typedef void(CellSailRendererVideoFuncStart)(u32 pArg, bool buffering);
+typedef void(CellSailRendererVideoFuncStop)(u32 pArg, bool flush, bool keepRendering);
+typedef void(CellSailRendererVideoFuncCancel)(u32 pArg);
+typedef int(CellSailRendererVideoFuncCheckout)(u32 pArg, vm::ptr<CellSailVideoFrameInfo> ppInfo);
+typedef int(CellSailRendererVideoFuncCheckin)(u32 pArg, vm::ptr<CellSailVideoFrameInfo> pInfo);
 
-typedef void(*CellSailPlayerFuncNotified)(u32 pArg, vm::ptr<CellSailEvent> event, u64 arg0, u64 arg1);
+typedef void(CellSailPlayerFuncNotified)(u32 pArg, vm::ptr<CellSailEvent> event, u64 arg0, u64 arg1);
 
 struct CellSailMemAllocatorFuncs
 {
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSaveData.h b/rpcs3/Emu/SysCalls/Modules/cellSaveData.h
index 3daa006334..48a7f0c60f 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSaveData.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellSaveData.h
@@ -256,11 +256,11 @@ struct CellSaveDataDoneGet
 
 
 // Callback Functions
-typedef void(*CellSaveDataFixedCallback)(vm::ptr<CellSaveDataCBResult> cbResult, vm::ptr<CellSaveDataListGet> get, vm::ptr<CellSaveDataFixedSet> set);
-typedef void(*CellSaveDataListCallback)(vm::ptr<CellSaveDataCBResult> cbResult, vm::ptr<CellSaveDataListGet> get, vm::ptr<CellSaveDataListSet> set);
-typedef void(*CellSaveDataStatCallback)(vm::ptr<CellSaveDataCBResult> cbResult, vm::ptr<CellSaveDataStatGet> get, vm::ptr<CellSaveDataStatSet> set);
-typedef void(*CellSaveDataFileCallback)(vm::ptr<CellSaveDataCBResult> cbResult, vm::ptr<CellSaveDataFileGet> get, vm::ptr<CellSaveDataFileSet> set);
-typedef void(*CellSaveDataDoneCallback)(vm::ptr<CellSaveDataCBResult> cbResult, vm::ptr<CellSaveDataDoneGet> get);
+typedef void(CellSaveDataFixedCallback)(vm::ptr<CellSaveDataCBResult> cbResult, vm::ptr<CellSaveDataListGet> get, vm::ptr<CellSaveDataFixedSet> set);
+typedef void(CellSaveDataListCallback)(vm::ptr<CellSaveDataCBResult> cbResult, vm::ptr<CellSaveDataListGet> get, vm::ptr<CellSaveDataListSet> set);
+typedef void(CellSaveDataStatCallback)(vm::ptr<CellSaveDataCBResult> cbResult, vm::ptr<CellSaveDataStatGet> get, vm::ptr<CellSaveDataStatSet> set);
+typedef void(CellSaveDataFileCallback)(vm::ptr<CellSaveDataCBResult> cbResult, vm::ptr<CellSaveDataFileGet> get, vm::ptr<CellSaveDataFileSet> set);
+typedef void(CellSaveDataDoneCallback)(vm::ptr<CellSaveDataCBResult> cbResult, vm::ptr<CellSaveDataDoneGet> get);
 
 
 // Auxiliary Structs
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.h b/rpcs3/Emu/SysCalls/Modules/cellSpurs.h
index 6291ffb3c4..64be4a99cb 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.h
@@ -206,7 +206,7 @@ struct CellSpursWorkloadFlag
 	atomic_t<u32> flag;
 };
 
-typedef void(*CellSpursShutdownCompletionEventHook)(vm::ptr<CellSpurs>, u32 wid, vm::ptr<void> arg);
+typedef void(CellSpursShutdownCompletionEventHook)(vm::ptr<CellSpurs>, u32 wid, vm::ptr<void> arg);
 
 // Core CellSpurs structures
 struct CellSpurs
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
index 0c372e82e8..57ddf51598 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
@@ -1262,7 +1262,7 @@ s32 syncLFQueueCompletePushPointer(vm::ptr<CellSyncLFQueue> queue, s32 pointer,
 	}
 }
 
-s32 _cellSyncLFQueueCompletePushPointer(vm::ptr<CellSyncLFQueue> queue, s32 pointer, vm::ptr<s32(*)(u32 addr, u32 arg)> fpSendSignal)
+s32 _cellSyncLFQueueCompletePushPointer(vm::ptr<CellSyncLFQueue> queue, s32 pointer, vm::ptr<s32(u32 addr, u32 arg)> fpSendSignal)
 {
 	cellSync->Todo("_cellSyncLFQueueCompletePushPointer(queue_addr=0x%x, pointer=%d, fpSendSignal_addr=0x%x)",
 		queue.addr(), pointer, fpSendSignal.addr());
@@ -1278,7 +1278,7 @@ s32 syncLFQueueCompletePushPointer2(vm::ptr<CellSyncLFQueue> queue, s32 pointer,
 	return CELL_OK;
 }
 
-s32 _cellSyncLFQueueCompletePushPointer2(vm::ptr<CellSyncLFQueue> queue, s32 pointer, vm::ptr<s32(*)(u32 addr, u32 arg)> fpSendSignal)
+s32 _cellSyncLFQueueCompletePushPointer2(vm::ptr<CellSyncLFQueue> queue, s32 pointer, vm::ptr<s32(u32 addr, u32 arg)> fpSendSignal)
 {
 	// arguments copied from _cellSyncLFQueueCompletePushPointer
 	cellSync->Todo("_cellSyncLFQueueCompletePushPointer2(queue_addr=0x%x, pointer=%d, fpSendSignal_addr=0x%x)",
@@ -1638,7 +1638,7 @@ s32 syncLFQueueCompletePopPointer(vm::ptr<CellSyncLFQueue> queue, s32 pointer, c
 	}
 }
 
-s32 _cellSyncLFQueueCompletePopPointer(vm::ptr<CellSyncLFQueue> queue, s32 pointer, vm::ptr<s32(*)(u32 addr, u32 arg)> fpSendSignal, u32 noQueueFull)
+s32 _cellSyncLFQueueCompletePopPointer(vm::ptr<CellSyncLFQueue> queue, s32 pointer, vm::ptr<s32(u32 addr, u32 arg)> fpSendSignal, u32 noQueueFull)
 {
 	// arguments copied from _cellSyncLFQueueCompletePushPointer + unknown argument (noQueueFull taken from LFQueue2CompletePopPointer)
 	cellSync->Todo("_cellSyncLFQueueCompletePopPointer(queue_addr=0x%x, pointer=%d, fpSendSignal_addr=0x%x, noQueueFull=%d)",
@@ -1655,7 +1655,7 @@ s32 syncLFQueueCompletePopPointer2(vm::ptr<CellSyncLFQueue> queue, s32 pointer,
 	return CELL_OK;
 }
 
-s32 _cellSyncLFQueueCompletePopPointer2(vm::ptr<CellSyncLFQueue> queue, s32 pointer, vm::ptr<s32(*)(u32 addr, u32 arg)> fpSendSignal, u32 noQueueFull)
+s32 _cellSyncLFQueueCompletePopPointer2(vm::ptr<CellSyncLFQueue> queue, s32 pointer, vm::ptr<s32(u32 addr, u32 arg)> fpSendSignal, u32 noQueueFull)
 {
 	// arguments copied from _cellSyncLFQueueCompletePopPointer
 	cellSync->Todo("_cellSyncLFQueueCompletePopPointer2(queue_addr=0x%x, pointer=%d, fpSendSignal_addr=0x%x, noQueueFull=%d)",
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
index 33059ed1aa..99555c70cf 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
@@ -19,7 +19,7 @@
 #include "cellGame.h"
 #include "cellSysutil.h"
 
-typedef void (*CellHddGameStatCallback)(vm::ptr<CellHddGameCBResult> cbResult, vm::ptr<CellHddGameStatGet> get, vm::ptr<CellHddGameStatSet> set);
+typedef void (CellHddGameStatCallback)(vm::ptr<CellHddGameCBResult> cbResult, vm::ptr<CellHddGameStatGet> get, vm::ptr<CellHddGameStatSet> set);
 
 Module *cellSysutil = nullptr;
 
@@ -835,10 +835,10 @@ int cellWebBrowserEstimate2(const vm::ptr<const CellWebBrowserConfig2> config, v
 }
 
 extern int cellGameDataCheckCreate2(PPUThread& CPU, u32 version, vm::ptr<const char> dirName, u32 errDialog,
-	vm::ptr<void(*)(vm::ptr<CellGameDataCBResult> cbResult, vm::ptr<CellGameDataStatGet> get, vm::ptr<CellGameDataStatSet> set)> funcStat, u32 container);
+	vm::ptr<void(vm::ptr<CellGameDataCBResult> cbResult, vm::ptr<CellGameDataStatGet> get, vm::ptr<CellGameDataStatSet> set)> funcStat, u32 container);
 
 extern int cellGameDataCheckCreate(PPUThread& CPU, u32 version, vm::ptr<const char> dirName, u32 errDialog,
-	vm::ptr<void(*)(vm::ptr<CellGameDataCBResult> cbResult, vm::ptr<CellGameDataStatGet> get, vm::ptr<CellGameDataStatSet> set)> funcStat, u32 container);
+	vm::ptr<void(vm::ptr<CellGameDataCBResult> cbResult, vm::ptr<CellGameDataStatGet> get, vm::ptr<CellGameDataStatSet> set)> funcStat, u32 container);
 
 extern void cellSysutil_SaveData_init();
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.h b/rpcs3/Emu/SysCalls/Modules/cellSysutil.h
index 7b8c4fb8d6..7554b95bf1 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.h
@@ -78,7 +78,7 @@ enum
 	CELL_SYSUTIL_SYSCHAT_VOICE_STREAMING_PAUSED  = 0x0164,
 };
 
-typedef void(*CellSysutilCallback)(u64 status, u64 param, vm::ptr<void> userdata);
+typedef void(CellSysutilCallback)(u64 status, u64 param, vm::ptr<void> userdata);
 
 void sysutilSendSystemCommand(u64 status, u64 param);
 
@@ -238,16 +238,16 @@ struct CellHddGameCBResult
 };
 
 typedef s32 CellWebBrowserId;
-typedef void* CellWebBrowserClientSession;
-typedef void(*CellWebBrowserCallback)(s32 cb_type, vm::ptr<CellWebBrowserClientSession>, vm::ptr<void> usrdata);
-typedef void(*CellWebComponentCallback)(CellWebBrowserId, s32 cb_type, vm::ptr<CellWebBrowserClientSession>, vm::ptr<void> usrdata);
-typedef void(*CellWebBrowserSystemCallback)(s32 cb_type, vm::ptr<void> usrdata);
+typedef vm::ptr<void> CellWebBrowserClientSession;
+typedef void(CellWebBrowserCallback)(s32 cb_type, CellWebBrowserClientSession, vm::ptr<void> usrdata);
+typedef void(CellWebComponentCallback)(CellWebBrowserId, s32 cb_type, CellWebBrowserClientSession, vm::ptr<void> usrdata);
+typedef void(CellWebBrowserSystemCallback)(s32 cb_type, vm::ptr<void> usrdata);
 
-typedef void(*CellWebBrowserMIMETypeCallback)(vm::ptr<const char> mimetype, vm::ptr<const char> url, vm::ptr<void> usrdata);
-typedef void(*CellWebBrowserErrorCallback)(s32 err_type, vm::ptr<void> usrdata);
-typedef void(*CellWebBrowserStatusCallback)(s32 err_type, vm::ptr<void> usrdata);
-typedef void(*CellWebBrowserNotify)(vm::ptr<const char> message, vm::ptr<void> usrdata);
-typedef void(*CellWebBrowserUsrdata)(vm::ptr<void> usrdata);
+typedef void(CellWebBrowserMIMETypeCallback)(vm::ptr<const char> mimetype, vm::ptr<const char> url, vm::ptr<void> usrdata);
+typedef void(CellWebBrowserErrorCallback)(s32 err_type, vm::ptr<void> usrdata);
+typedef void(CellWebBrowserStatusCallback)(s32 err_type, vm::ptr<void> usrdata);
+typedef void(CellWebBrowserNotify)(vm::ptr<const char> message, vm::ptr<void> usrdata);
+typedef void(CellWebBrowserUsrdata)(vm::ptr<void> usrdata);
 
 struct CellWebBrowserMimeSet
 {
diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.h b/rpcs3/Emu/SysCalls/Modules/cellVdec.h
index e53955e70e..4770a10d13 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellVdec.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.h
@@ -163,7 +163,7 @@ struct CellVdecPicFormat
 	u8 alpha;
 };
 
-typedef u32(*CellVdecCbMsg)(u32 handle, CellVdecMsgType msgType, s32 msgData, u32 cbArg);
+typedef u32(CellVdecCbMsg)(u32 handle, CellVdecMsgType msgType, s32 msgData, u32 cbArg);
 
 // Callback Function Information
 struct CellVdecCb
diff --git a/rpcs3/Emu/SysCalls/Modules/libmixer.h b/rpcs3/Emu/SysCalls/Modules/libmixer.h
index 9a7978f9a5..b2f0a19dcd 100644
--- a/rpcs3/Emu/SysCalls/Modules/libmixer.h
+++ b/rpcs3/Emu/SysCalls/Modules/libmixer.h
@@ -110,7 +110,7 @@ enum
 	CELL_SSPLAYER_STATE_ON = 0x20,
 };
 
-typedef s32(*CellSurMixerNotifyCallbackFunction)(vm::ptr<void> arg, u32 counter, u32 samples);
+typedef s32(CellSurMixerNotifyCallbackFunction)(vm::ptr<void> arg, u32 counter, u32 samples);
 
 struct CellSSPlayerConfig
 {
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h
index 4fee4d990c..bcb857cc04 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h
@@ -134,4 +134,4 @@ enum
 	SCE_NP_TROPHY_STATUS_CHANGES_DETECTED    = 9,
 };
 
-typedef s32 (*SceNpTrophyStatusCallback)(u32 context, u32 status, s32 completed, s32 total, u32 arg_addr);
+typedef s32 (SceNpTrophyStatusCallback)(u32 context, u32 status, s32 completed, s32 total, u32 arg_addr);
diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.h b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.h
index 8c020f3ecc..76234c5c4b 100644
--- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.h
+++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.h
@@ -14,7 +14,7 @@ struct HeapInfo
 	}
 };
 
-typedef s32(*spu_printf_cb_t)(u32 arg);
+typedef s32(spu_printf_cb_t)(u32 arg);
 
 // Aux
 extern vm::ptr<spu_printf_cb_t> spu_printf_agcb;
diff --git a/rpcs3/Emu/SysCalls/lv2/cellFs.cpp b/rpcs3/Emu/SysCalls/lv2/cellFs.cpp
index 79df2eece7..218221deab 100644
--- a/rpcs3/Emu/SysCalls/lv2/cellFs.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/cellFs.cpp
@@ -738,7 +738,7 @@ s32 cellFsStReadWait(u32 fd, u64 size)
 	return CELL_OK;
 }
 
-s32 cellFsStReadWaitCallback(u32 fd, u64 size, vm::ptr<void (*)(int xfd, u64 xsize)> func)
+s32 cellFsStReadWaitCallback(u32 fd, u64 size, vm::ptr<void(int xfd, u64 xsize)> func)
 {
 	sys_fs->Todo("cellFsStReadWaitCallback(fd=0x%x, size=0x%llx, func=0x%x)", fd, size, func);
 
@@ -886,7 +886,7 @@ std::atomic<s32> g_FsAioReadID(0);
 std::atomic<s32> g_FsAioReadCur(0);
 bool aio_init = false;
 
-void fsAioRead(u32 fd, vm::ptr<CellFsAio> aio, int xid, vm::ptr<void(*)(vm::ptr<CellFsAio> xaio, int error, int xid, u64 size)> func)
+void fsAioRead(u32 fd, vm::ptr<CellFsAio> aio, int xid, vm::ptr<void(vm::ptr<CellFsAio> xaio, int error, int xid, u64 size)> func)
 {
 	while (g_FsAioReadCur != xid)
 	{
@@ -941,7 +941,7 @@ void fsAioRead(u32 fd, vm::ptr<CellFsAio> aio, int xid, vm::ptr<void(*)(vm::ptr<
 	g_FsAioReadCur++;
 }
 
-s32 cellFsAioRead(vm::ptr<CellFsAio> aio, vm::ptr<s32> id, vm::ptr<void(*)(vm::ptr<CellFsAio> xaio, s32 error, s32 xid, u64 size)> func)
+s32 cellFsAioRead(vm::ptr<CellFsAio> aio, vm::ptr<s32> id, vm::ptr<void(vm::ptr<CellFsAio> xaio, s32 error, s32 xid, u64 size)> func)
 {
 	sys_fs->Warning("cellFsAioRead(aio=0x%x, id=0x%x, func=0x%x)", aio, id, func);
 
@@ -966,7 +966,7 @@ s32 cellFsAioRead(vm::ptr<CellFsAio> aio, vm::ptr<s32> id, vm::ptr<void(*)(vm::p
 	return CELL_OK;
 }
 
-s32 cellFsAioWrite(vm::ptr<CellFsAio> aio, vm::ptr<s32> id, vm::ptr<void(*)(vm::ptr<CellFsAio> xaio, s32 error, s32 xid, u64 size)> func)
+s32 cellFsAioWrite(vm::ptr<CellFsAio> aio, vm::ptr<s32> id, vm::ptr<void(vm::ptr<CellFsAio> xaio, s32 error, s32 xid, u64 size)> func)
 {
 	sys_fs->Todo("cellFsAioWrite(aio=0x%x, id=0x%x, func=0x%x)", aio, id, func);
 
diff --git a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp
index 9a7e1768bc..b182ecd4b5 100644
--- a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.cpp
@@ -210,10 +210,12 @@ s32 sys_ppu_thread_create(vm::ptr<u64> thread_id, u32 entry, u64 arg, s32 prio,
 	return CELL_OK;
 }
 
-void sys_ppu_thread_once(PPUThread& CPU, vm::ptr<atomic_t<u32>> once_ctrl, vm::ptr<void(*)()> init)
+void sys_ppu_thread_once(PPUThread& CPU, vm::ptr<atomic_t<u32>> once_ctrl, vm::ptr<void()> init)
 {
 	sys_ppu_thread.Warning("sys_ppu_thread_once(once_ctrl_addr=0x%x, init_addr=0x%x)", once_ctrl.addr(), init.addr());
 
+	LV2_LOCK(0);
+
 	if (once_ctrl->compare_and_swap_test(be_t<u32>::make(SYS_PPU_THREAD_ONCE_INIT), be_t<u32>::make(SYS_PPU_THREAD_DONE_INIT)))
 	{
 		init(CPU);
diff --git a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h
index 83fe511b8f..eb3e343b97 100644
--- a/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h
+++ b/rpcs3/Emu/SysCalls/lv2/sys_ppu_thread.h
@@ -30,6 +30,6 @@ s32 sys_ppu_thread_get_stack_information(PPUThread& CPU, u32 info_addr);
 s32 sys_ppu_thread_stop(u64 thread_id);
 s32 sys_ppu_thread_restart(u64 thread_id);
 s32 sys_ppu_thread_create(vm::ptr<u64> thread_id, u32 entry, u64 arg, s32 prio, u32 stacksize, u64 flags, vm::ptr<const char> threadname);
-void sys_ppu_thread_once(PPUThread& CPU, vm::ptr<atomic_t<u32>> once_ctrl, vm::ptr<void(*)()> init);
+void sys_ppu_thread_once(PPUThread& CPU, vm::ptr<atomic_t<u32>> once_ctrl, vm::ptr<void()> init);
 s32 sys_ppu_thread_get_id(PPUThread& CPU, vm::ptr<u64> thread_id);
 s32 sys_ppu_thread_rename(u64 thread_id, vm::ptr<const char> name);
diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp
index c943495597..b5d9850335 100644
--- a/rpcs3/Loader/ELF64.cpp
+++ b/rpcs3/Loader/ELF64.cpp
@@ -325,7 +325,7 @@ namespace loader
 
 							for (auto &e : m.second.exports)
 							{
-								module->RegisterLLEFunc(e.first, vm::ptr<void(*)()>::make(e.second));
+								module->RegisterLLEFunc(e.first, vm::ptr<void()>::make(e.second));
 							}
 						}
 					}
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index e70afa794c..9b3c761dde 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -285,6 +285,7 @@
     <ClInclude Include="Emu\ARMv7\ARMv7Thread.h" />
     <ClInclude Include="Emu\ARMv7\Modules\psv_event_flag.h" />
     <ClInclude Include="Emu\ARMv7\Modules\psv_sema.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\sceGxm.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h" />
     <ClInclude Include="Emu\ARMv7\PSVFuncList.h" />
     <ClInclude Include="Emu\ARMv7\PSVObjectList.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 69e962dbfc..9b46ecec23 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -1333,5 +1333,8 @@
     <ClInclude Include="Emu\ARMv7\Modules\psv_sema.h">
       <Filter>Emu\CPU\ARMv7\Objects</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\ARMv7\Modules\sceGxm.h">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 084106ced6808f3e5be4e7ef9280159152da5e80 Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Wed, 28 Jan 2015 15:17:13 +0200
Subject: [PATCH 50/70] Disable DMA writes and add copyright notices

---
 rpcs3/Emu/RSX/RSXDMA.cpp    |  3 ++-
 rpcs3/Emu/RSX/RSXDMA.h      |  1 +
 rpcs3/Emu/RSX/RSXThread.cpp | 15 +++++++--------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/rpcs3/Emu/RSX/RSXDMA.cpp b/rpcs3/Emu/RSX/RSXDMA.cpp
index 476448474f..ad6bc06a74 100644
--- a/rpcs3/Emu/RSX/RSXDMA.cpp
+++ b/rpcs3/Emu/RSX/RSXDMA.cpp
@@ -1,3 +1,4 @@
+// Copyright (C) 2015 AlexAltea (https://github.com/AlexAltea/nucleus)
 #include "stdafx.h"
 #include "RSXDMA.h"
 #include "Emu/Memory/Memory.h"
@@ -18,7 +19,7 @@ DMAObject dma_address(u32 dma_object)
 	case RSX_CONTEXT_DMA_SEMAPHORE_R:
 		return DMAObject{ 0x40100000, 0x1000, DMAObject::READWRITE }; // TODO: Inconsistency: Gitbrew says R, test says RW
 	default:
-		LOG_WARNING(RSX, "Unknown DMA object (0x%08X)", dma_object);
+		LOG_WARNING(RSX, "Unknown DMA object (0x%08x)", dma_object);
 		return DMAObject{};
 	}
 }
diff --git a/rpcs3/Emu/RSX/RSXDMA.h b/rpcs3/Emu/RSX/RSXDMA.h
index b432375506..e5da8918eb 100644
--- a/rpcs3/Emu/RSX/RSXDMA.h
+++ b/rpcs3/Emu/RSX/RSXDMA.h
@@ -1,3 +1,4 @@
+// Copyright (C) 2015 AlexAltea (https://github.com/AlexAltea/nucleus)
 #pragma once
 
 enum {
diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp
index ed7b539005..d4041f8571 100644
--- a/rpcs3/Emu/RSX/RSXThread.cpp
+++ b/rpcs3/Emu/RSX/RSXThread.cpp
@@ -1866,15 +1866,14 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		// Get timestamp, and convert it from microseconds to nanoseconds
 		u64 timestamp = get_system_time() * 1000;
 
-		// TODO: Reports can be written to the main memory or the local memory (controlled by NV4097_SET_CONTEXT_DMA_REPORT)
-		// NOTE: Uncomment these, if DMA implementation is broken
-		//vm::write64(m_local_mem_addr + offset + 0x0, timestamp);
-		//vm::write32(m_local_mem_addr + offset + 0x8, value);
-		//vm::write32(m_local_mem_addr + offset + 0xc, 0);
+		// NOTE: DMA broken, implement proper lpar mapping (sys_rsx)
+		//dma_write64(dma_report, offset + 0x0, timestamp);
+		//dma_write32(dma_report, offset + 0x8, value);
+		//dma_write32(dma_report, offset + 0xc, 0);
 
-		dma_write64(dma_report, offset + 0x0, timestamp);
-		dma_write32(dma_report, offset + 0x8, value);
-		dma_write32(dma_report, offset + 0xc, 0);
+		vm::write64(m_local_mem_addr + offset + 0x0, timestamp);
+		vm::write32(m_local_mem_addr + offset + 0x8, value);
+		vm::write32(m_local_mem_addr + offset + 0xc, 0);
 	}
 	break;
 

From e508d6db5dc7b50013844bd8dc44851ee08a478d Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Wed, 28 Jan 2015 17:17:12 +0300
Subject: [PATCH 51/70] sceGxm stub

---
 rpcs3/Emu/ARMv7/Modules/sceGxm.cpp | 1290 ++++++++++++++++++++++++++++
 rpcs3/Emu/ARMv7/Modules/sceGxm.h   | 1244 +++++++++++++++++++++++++++
 rpcs3/Emu/ARMv7/PSVFuncList.cpp    |    6 +
 3 files changed, 2540 insertions(+)
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceGxm.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceGxm.h

diff --git a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp
new file mode 100644
index 0000000000..3614803537
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp
@@ -0,0 +1,1290 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+#include "sceGxm.h"
+
+s32 sceGxmInitialize(vm::psv::ptr<const SceGxmInitializeParams> params)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTerminate()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<volatile u32> sceGxmGetNotificationRegion()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmNotificationWait(vm::psv::ptr<const SceGxmNotification> notification)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmMapMemory(vm::psv::ptr<void> base, u32 size, SceGxmMemoryAttribFlags attr)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmUnmapMemory(vm::psv::ptr<void> base)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmMapVertexUsseMemory(vm::psv::ptr<void> base, u32 size, vm::psv::ptr<u32> offset)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmUnmapVertexUsseMemory(vm::psv::ptr<void> base)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmMapFragmentUsseMemory(vm::psv::ptr<void> base, u32 size, vm::psv::ptr<u32> offset)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmUnmapFragmentUsseMemory(vm::psv::ptr<void> base)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmDisplayQueueAddEntry(vm::psv::ptr<SceGxmSyncObject> oldBuffer, vm::psv::ptr<SceGxmSyncObject> newBuffer, vm::psv::ptr<const void> callbackData)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmDisplayQueueFinish()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmSyncObjectCreate(vm::psv::ptr<vm::psv::ptr<SceGxmSyncObject>> syncObject)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmSyncObjectDestroy(vm::psv::ptr<SceGxmSyncObject> syncObject)
+{
+	throw __FUNCTION__;
+}
+
+
+s32 sceGxmCreateContext(vm::psv::ptr<const SceGxmContextParams> params, vm::psv::ptr<vm::psv::ptr<SceGxmContext>> context)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmDestroyContext(vm::psv::ptr<SceGxmContext> context)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetValidationEnable(vm::psv::ptr<SceGxmContext> context, bool enable)
+{
+	throw __FUNCTION__;
+}
+
+
+void sceGxmSetVertexProgram(vm::psv::ptr<SceGxmContext> context, vm::psv::ptr<const SceGxmVertexProgram> vertexProgram)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFragmentProgram(vm::psv::ptr<SceGxmContext> context, vm::psv::ptr<const SceGxmFragmentProgram> fragmentProgram)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmReserveVertexDefaultUniformBuffer(vm::psv::ptr<SceGxmContext> context, vm::psv::ptr<vm::psv::ptr<void>> uniformBuffer)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmReserveFragmentDefaultUniformBuffer(vm::psv::ptr<SceGxmContext> context, vm::psv::ptr<vm::psv::ptr<void>> uniformBuffer)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmSetVertexStream(vm::psv::ptr<SceGxmContext> context, u32 streamIndex, vm::psv::ptr<const void> streamData)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmSetVertexTexture(vm::psv::ptr<SceGxmContext> context, u32 textureIndex, vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmSetFragmentTexture(vm::psv::ptr<SceGxmContext> context, u32 textureIndex, vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmSetVertexUniformBuffer(vm::psv::ptr<SceGxmContext> context, u32 bufferIndex, vm::psv::ptr<const void> bufferData)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmSetFragmentUniformBuffer(vm::psv::ptr<SceGxmContext> context, u32 bufferIndex, vm::psv::ptr<const void> bufferData)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmSetAuxiliarySurface(vm::psv::ptr<SceGxmContext> context, u32 surfaceIndex, vm::psv::ptr<const SceGxmAuxiliarySurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+
+void sceGxmSetPrecomputedFragmentState(vm::psv::ptr<SceGxmContext> context, vm::psv::ptr<const SceGxmPrecomputedFragmentState> precomputedState)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetPrecomputedVertexState(vm::psv::ptr<SceGxmContext> context, vm::psv::ptr<const SceGxmPrecomputedVertexState> precomputedState)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmDrawPrecomputed(vm::psv::ptr<SceGxmContext> context, vm::psv::ptr<const SceGxmPrecomputedDraw> precomputedDraw)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmDraw(vm::psv::ptr<SceGxmContext> context, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::psv::ptr<const void> indexData, u32 indexCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmDrawInstanced(vm::psv::ptr<SceGxmContext> context, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::psv::ptr<const void> indexData, u32 indexCount, u32 indexWrap)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmSetVisibilityBuffer(vm::psv::ptr<SceGxmContext> context, vm::psv::ptr<void> bufferBase, u32 stridePerCore)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmBeginScene(vm::psv::ptr<SceGxmContext> context, u32 flags, vm::psv::ptr<const SceGxmRenderTarget> renderTarget, vm::psv::ptr<const SceGxmValidRegion> validRegion, vm::psv::ptr<SceGxmSyncObject> vertexSyncObject, vm::psv::ptr<SceGxmSyncObject> fragmentSyncObject, vm::psv::ptr<const SceGxmColorSurface> colorSurface, vm::psv::ptr<const SceGxmDepthStencilSurface> depthStencil)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmMidSceneFlush(vm::psv::ptr<SceGxmContext> context, u32 flags, vm::psv::ptr<SceGxmSyncObject> vertexSyncObject, vm::psv::ptr<const SceGxmNotification> vertexNotification)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmEndScene(vm::psv::ptr<SceGxmContext> context, vm::psv::ptr<const SceGxmNotification> vertexNotification, vm::psv::ptr<const SceGxmNotification> fragmentNotification)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontDepthFunc(vm::psv::ptr<SceGxmContext> context, SceGxmDepthFunc depthFunc)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetBackDepthFunc(vm::psv::ptr<SceGxmContext> context, SceGxmDepthFunc depthFunc)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontFragmentProgramEnable(vm::psv::ptr<SceGxmContext> context, SceGxmFragmentProgramMode enable)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetBackFragmentProgramEnable(vm::psv::ptr<SceGxmContext> context, SceGxmFragmentProgramMode enable)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontDepthWriteEnable(vm::psv::ptr<SceGxmContext> context, SceGxmDepthWriteMode enable)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetBackDepthWriteEnable(vm::psv::ptr<SceGxmContext> context, SceGxmDepthWriteMode enable)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontLineFillLastPixelEnable(vm::psv::ptr<SceGxmContext> context, SceGxmLineFillLastPixelMode enable)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetBackLineFillLastPixelEnable(vm::psv::ptr<SceGxmContext> context, SceGxmLineFillLastPixelMode enable)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontStencilRef(vm::psv::ptr<SceGxmContext> context, u32 sref)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetBackStencilRef(vm::psv::ptr<SceGxmContext> context, u32 sref)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontPointLineWidth(vm::psv::ptr<SceGxmContext> context, u32 width)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetBackPointLineWidth(vm::psv::ptr<SceGxmContext> context, u32 width)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontPolygonMode(vm::psv::ptr<SceGxmContext> context, SceGxmPolygonMode mode)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetBackPolygonMode(vm::psv::ptr<SceGxmContext> context, SceGxmPolygonMode mode)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontStencilFunc(vm::psv::ptr<SceGxmContext> context, SceGxmStencilFunc func, SceGxmStencilOp stencilFail, SceGxmStencilOp depthFail, SceGxmStencilOp depthPass, uint8_t compareMask, uint8_t writeMask)
+{
+	throw __FUNCTION__;
+}
+
+
+void sceGxmSetBackStencilFunc(vm::psv::ptr<SceGxmContext> context, SceGxmStencilFunc func, SceGxmStencilOp stencilFail, SceGxmStencilOp depthFail, SceGxmStencilOp depthPass, uint8_t compareMask, uint8_t writeMask)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontDepthBias(vm::psv::ptr<SceGxmContext> context, int32_t factor, int32_t units)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetBackDepthBias(vm::psv::ptr<SceGxmContext> context, int32_t factor, int32_t units)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetTwoSidedEnable(vm::psv::ptr<SceGxmContext> context, SceGxmTwoSidedMode enable)
+{
+	throw __FUNCTION__;
+}
+
+//void sceGxmSetViewport(vm::psv::ptr<SceGxmContext> context, float xOffset, float xScale, float yOffset, float yScale, float zOffset, float zScale)
+//{
+//	throw __FUNCTION__;
+//}
+//
+//void sceGxmSetWClampValue(vm::psv::ptr<SceGxmContext> context, float clampValue)
+//{
+//	throw __FUNCTION__;
+//}
+
+void sceGxmSetWClampEnable(vm::psv::ptr<SceGxmContext> context, SceGxmWClampMode enable)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetRegionClip(vm::psv::ptr<SceGxmContext> context, SceGxmRegionClipMode mode, u32 xMin, u32 yMin, u32 xMax, u32 yMax)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetCullMode(vm::psv::ptr<SceGxmContext> context, SceGxmCullMode mode)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetViewportEnable(vm::psv::ptr<SceGxmContext> context, SceGxmViewportMode enable)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetWBufferEnable(vm::psv::ptr<SceGxmContext> context, SceGxmWBufferMode enable)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontVisibilityTestIndex(vm::psv::ptr<SceGxmContext> context, u32 index)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetBackVisibilityTestIndex(vm::psv::ptr<SceGxmContext> context, u32 index)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontVisibilityTestOp(vm::psv::ptr<SceGxmContext> context, SceGxmVisibilityTestOp op)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetBackVisibilityTestOp(vm::psv::ptr<SceGxmContext> context, SceGxmVisibilityTestOp op)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetFrontVisibilityTestEnable(vm::psv::ptr<SceGxmContext> context, SceGxmVisibilityTestMode enable)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmSetBackVisibilityTestEnable(vm::psv::ptr<SceGxmContext> context, SceGxmVisibilityTestMode enable)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmFinish(vm::psv::ptr<SceGxmContext> context)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPushUserMarker(vm::psv::ptr<SceGxmContext> context, vm::psv::ptr<const char> tag)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPopUserMarker(vm::psv::ptr<SceGxmContext> context)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmSetUserMarker(vm::psv::ptr<SceGxmContext> context, vm::psv::ptr<const char> tag)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPadHeartbeat(vm::psv::ptr<const SceGxmColorSurface> displaySurface, vm::psv::ptr<SceGxmSyncObject> displaySyncObject)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPadTriggerGpuPaTrace()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmColorSurfaceInit(vm::psv::ptr<SceGxmColorSurface> surface, SceGxmColorFormat colorFormat, SceGxmColorSurfaceType surfaceType, SceGxmColorSurfaceScaleMode scaleMode, SceGxmOutputRegisterSize outputRegisterSize, u32 width, u32 height, u32 strideInPixels, vm::psv::ptr<void> data)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmColorSurfaceInitDisabled(vm::psv::ptr<SceGxmColorSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+bool sceGxmColorSurfaceIsEnabled(vm::psv::ptr<const SceGxmColorSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmColorSurfaceGetClip(vm::psv::ptr<const SceGxmColorSurface> surface, vm::psv::ptr<u32> xMin, vm::psv::ptr<u32> yMin, vm::psv::ptr<u32> xMax, vm::psv::ptr<u32> yMax)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmColorSurfaceSetClip(vm::psv::ptr<SceGxmColorSurface> surface, u32 xMin, u32 yMin, u32 xMax, u32 yMax)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmColorSurfaceScaleMode sceGxmColorSurfaceGetScaleMode(vm::psv::ptr<const SceGxmColorSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmColorSurfaceSetScaleMode(vm::psv::ptr<SceGxmColorSurface> surface, SceGxmColorSurfaceScaleMode scaleMode)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<void> sceGxmColorSurfaceGetData(vm::psv::ptr<const SceGxmColorSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmColorSurfaceSetData(vm::psv::ptr<SceGxmColorSurface> surface, vm::psv::ptr<void> data)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmColorFormat sceGxmColorSurfaceGetFormat(vm::psv::ptr<const SceGxmColorSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmColorSurfaceSetFormat(vm::psv::ptr<SceGxmColorSurface> surface, SceGxmColorFormat format)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmColorSurfaceType sceGxmColorSurfaceGetType(vm::psv::ptr<const SceGxmColorSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmColorSurfaceGetStrideInPixels(vm::psv::ptr<const SceGxmColorSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmDepthStencilSurfaceInit(vm::psv::ptr<SceGxmDepthStencilSurface> surface, SceGxmDepthStencilFormat depthStencilFormat, SceGxmDepthStencilSurfaceType surfaceType, u32 strideInSamples, vm::psv::ptr<void> depthData, vm::psv::ptr<void> stencilData)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmDepthStencilSurfaceInitDisabled(vm::psv::ptr<SceGxmDepthStencilSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+//float sceGxmDepthStencilSurfaceGetBackgroundDepth(vm::psv::ptr<const SceGxmDepthStencilSurface> surface)
+//{
+//	throw __FUNCTION__;
+//}
+
+//void sceGxmDepthStencilSurfaceSetBackgroundDepth(vm::psv::ptr<SceGxmDepthStencilSurface> surface, float backgroundDepth)
+//{
+//	throw __FUNCTION__;
+//}
+
+uint8_t sceGxmDepthStencilSurfaceGetBackgroundStencil(vm::psv::ptr<const SceGxmDepthStencilSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmDepthStencilSurfaceSetBackgroundStencil(vm::psv::ptr<SceGxmDepthStencilSurface> surface, uint8_t backgroundStencil)
+{
+	throw __FUNCTION__;
+}
+
+bool sceGxmDepthStencilSurfaceIsEnabled(vm::psv::ptr<const SceGxmDepthStencilSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmDepthStencilSurfaceSetForceLoadMode(vm::psv::ptr<SceGxmDepthStencilSurface> surface, SceGxmDepthStencilForceLoadMode forceLoad)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmDepthStencilForceLoadMode sceGxmDepthStencilSurfaceGetForceLoadMode(vm::psv::ptr<const SceGxmDepthStencilSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmDepthStencilSurfaceSetForceStoreMode(vm::psv::ptr<SceGxmDepthStencilSurface> surface, SceGxmDepthStencilForceStoreMode forceStore)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmDepthStencilForceStoreMode sceGxmDepthStencilSurfaceGetForceStoreMode(vm::psv::ptr<const SceGxmDepthStencilSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmColorSurfaceGammaMode sceGxmColorSurfaceGetGammaMode(vm::psv::ptr<const SceGxmColorSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmColorSurfaceSetGammaMode(vm::psv::ptr<SceGxmColorSurface> surface, SceGxmColorSurfaceGammaMode gammaMode)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmColorSurfaceDitherMode sceGxmColorSurfaceGetDitherMode(vm::psv::ptr<const SceGxmColorSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmColorSurfaceSetDitherMode(vm::psv::ptr<SceGxmColorSurface> surface, SceGxmColorSurfaceDitherMode ditherMode)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmDepthStencilFormat sceGxmDepthStencilSurfaceGetFormat(vm::psv::ptr<const SceGxmDepthStencilSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmDepthStencilSurfaceGetStrideInSamples(vm::psv::ptr<const SceGxmDepthStencilSurface> surface)
+{
+	throw __FUNCTION__;
+}
+
+
+s32 sceGxmProgramCheck(vm::psv::ptr<const SceGxmProgram> program)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmProgramGetSize(vm::psv::ptr<const SceGxmProgram> program)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmProgramType sceGxmProgramGetType(vm::psv::ptr<const SceGxmProgram> program)
+{
+	throw __FUNCTION__;
+}
+
+bool sceGxmProgramIsDiscardUsed(vm::psv::ptr<const SceGxmProgram> program)
+{
+	throw __FUNCTION__;
+}
+
+bool sceGxmProgramIsDepthReplaceUsed(vm::psv::ptr<const SceGxmProgram> program)
+{
+	throw __FUNCTION__;
+}
+
+bool sceGxmProgramIsSpriteCoordUsed(vm::psv::ptr<const SceGxmProgram> program)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmProgramGetDefaultUniformBufferSize(vm::psv::ptr<const SceGxmProgram> program)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmProgramGetParameterCount(vm::psv::ptr<const SceGxmProgram> program)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceGxmProgramParameter> sceGxmProgramGetParameter(vm::psv::ptr<const SceGxmProgram> program, u32 index)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceGxmProgramParameter> sceGxmProgramFindParameterByName(vm::psv::ptr<const SceGxmProgram> program, vm::psv::ptr<const char> name)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceGxmProgramParameter> sceGxmProgramFindParameterBySemantic(vm::psv::ptr<const SceGxmProgram> program, SceGxmParameterSemantic semantic, u32 index)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmProgramParameterGetIndex(vm::psv::ptr<const SceGxmProgram> program, vm::psv::ptr<const SceGxmProgramParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmParameterCategory sceGxmProgramParameterGetCategory(vm::psv::ptr<const SceGxmProgramParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const char> sceGxmProgramParameterGetName(vm::psv::ptr<const SceGxmProgramParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmParameterSemantic sceGxmProgramParameterGetSemantic(vm::psv::ptr<const SceGxmProgramParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmProgramParameterGetSemanticIndex(vm::psv::ptr<const SceGxmProgramParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmParameterType sceGxmProgramParameterGetType(vm::psv::ptr<const SceGxmProgramParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmProgramParameterGetComponentCount(vm::psv::ptr<const SceGxmProgramParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmProgramParameterGetArraySize(vm::psv::ptr<const SceGxmProgramParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmProgramParameterGetResourceIndex(vm::psv::ptr<const SceGxmProgramParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmProgramParameterGetContainerIndex(vm::psv::ptr<const SceGxmProgramParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+bool sceGxmProgramParameterIsSamplerCube(vm::psv::ptr<const SceGxmProgramParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceGxmProgram> sceGxmFragmentProgramGetProgram(vm::psv::ptr<const SceGxmFragmentProgram> fragmentProgram)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceGxmProgram> sceGxmVertexProgramGetProgram(vm::psv::ptr<const SceGxmVertexProgram> vertexProgram)
+{
+	throw __FUNCTION__;
+}
+
+
+s32 sceGxmShaderPatcherCreate(vm::psv::ptr<const SceGxmShaderPatcherParams> params, vm::psv::ptr<vm::psv::ptr<SceGxmShaderPatcher>> shaderPatcher)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmShaderPatcherSetUserData(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher, vm::psv::ptr<void> userData)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<void> sceGxmShaderPatcherGetUserData(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmShaderPatcherDestroy(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmShaderPatcherRegisterProgram(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher, vm::psv::ptr<const SceGxmProgram> programHeader, vm::psv::ptr<SceGxmShaderPatcherId> programId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmShaderPatcherUnregisterProgram(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher, SceGxmShaderPatcherId programId)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceGxmProgram> sceGxmShaderPatcherGetProgramFromId(SceGxmShaderPatcherId programId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmShaderPatcherSetAuxiliarySurface(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher, u32 auxSurfaceIndex, vm::psv::ptr<const SceGxmAuxiliarySurface> auxSurface)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmShaderPatcherCreateVertexProgram(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher, SceGxmShaderPatcherId programId, vm::psv::ptr<const SceGxmVertexAttribute> attributes, u32 attributeCount, vm::psv::ptr<const SceGxmVertexStream> streams, u32 streamCount, vm::psv::ptr<vm::psv::ptr<SceGxmVertexProgram>> vertexProgram)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmShaderPatcherCreateFragmentProgram(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher, SceGxmShaderPatcherId programId, SceGxmOutputRegisterFormat outputFormat, SceGxmMultisampleMode multisampleMode, vm::psv::ptr<const SceGxmBlendInfo> blendInfo, vm::psv::ptr<const SceGxmProgram> vertexProgram, vm::psv::ptr<vm::psv::ptr<SceGxmFragmentProgram>> fragmentProgram)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmShaderPatcherAddRefVertexProgram(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher, vm::psv::ptr<SceGxmVertexProgram> vertexProgram)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmShaderPatcherAddRefFragmentProgram(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher, vm::psv::ptr<SceGxmFragmentProgram> fragmentProgram)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmShaderPatcherReleaseVertexProgram(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher, vm::psv::ptr<SceGxmVertexProgram> vertexProgram)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmShaderPatcherReleaseFragmentProgram(vm::psv::ptr<SceGxmShaderPatcher> shaderPatcher, vm::psv::ptr<SceGxmFragmentProgram> fragmentProgram)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmShaderPatcherGetHostMemAllocated(vm::psv::ptr<const SceGxmShaderPatcher> shaderPatcher)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmShaderPatcherGetBufferMemAllocated(vm::psv::ptr<const SceGxmShaderPatcher> shaderPatcher)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmShaderPatcherGetVertexUsseMemAllocated(vm::psv::ptr<const SceGxmShaderPatcher> shaderPatcher)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmShaderPatcherGetFragmentUsseMemAllocated(vm::psv::ptr<const SceGxmShaderPatcher> shaderPatcher)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureInitSwizzled(vm::psv::ptr<SceGxmTexture> texture, vm::psv::ptr<const void> data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureInitLinear(vm::psv::ptr<SceGxmTexture> texture, vm::psv::ptr<const void> data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureInitLinearStrided(vm::psv::ptr<SceGxmTexture> texture, vm::psv::ptr<const void> data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 byteStride)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureInitTiled(vm::psv::ptr<SceGxmTexture> texture, vm::psv::ptr<const void> data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureInitCube(vm::psv::ptr<SceGxmTexture> texture, vm::psv::ptr<const void> data, SceGxmTextureFormat texFormat, u32 width, u32 height, u32 mipCount)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmTextureType sceGxmTextureGetType(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetMinFilter(vm::psv::ptr<SceGxmTexture> texture, SceGxmTextureFilter minFilter)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmTextureFilter sceGxmTextureGetMinFilter(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetMagFilter(vm::psv::ptr<SceGxmTexture> texture, SceGxmTextureFilter magFilter)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmTextureFilter sceGxmTextureGetMagFilter(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetMipFilter(vm::psv::ptr<SceGxmTexture> texture, SceGxmTextureMipFilter mipFilter)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmTextureMipFilter sceGxmTextureGetMipFilter(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetAnisoMode(vm::psv::ptr<SceGxmTexture> texture, SceGxmTextureAnisoMode anisoMode)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmTextureAnisoMode sceGxmTextureGetAnisoMode(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetUAddrMode(vm::psv::ptr<SceGxmTexture> texture, SceGxmTextureAddrMode addrMode)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmTextureAddrMode sceGxmTextureGetUAddrMode(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetVAddrMode(vm::psv::ptr<SceGxmTexture> texture, SceGxmTextureAddrMode addrMode)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmTextureAddrMode sceGxmTextureGetVAddrMode(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetFormat(vm::psv::ptr<SceGxmTexture> texture, SceGxmTextureFormat texFormat)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmTextureFormat sceGxmTextureGetFormat(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetLodBias(vm::psv::ptr<SceGxmTexture> texture, u32 bias)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmTextureGetLodBias(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetStride(vm::psv::ptr<SceGxmTexture> texture, u32 byteStride)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmTextureGetStride(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetWidth(vm::psv::ptr<SceGxmTexture> texture, u32 width)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmTextureGetWidth(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetHeight(vm::psv::ptr<SceGxmTexture> texture, u32 height)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmTextureGetHeight(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetData(vm::psv::ptr<SceGxmTexture> texture, vm::psv::ptr<const void> data)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<void> sceGxmTextureGetData(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetMipmapCount(vm::psv::ptr<SceGxmTexture> texture, u32 mipCount)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmTextureGetMipmapCount(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetPalette(vm::psv::ptr<SceGxmTexture> texture, vm::psv::ptr<const void> paletteData)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<void> sceGxmTextureGetPalette(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+SceGxmTextureGammaMode sceGxmTextureGetGammaMode(vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmTextureSetGammaMode(vm::psv::ptr<SceGxmTexture> texture, SceGxmTextureGammaMode gammaMode)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmGetPrecomputedVertexStateSize(vm::psv::ptr<const SceGxmVertexProgram> vertexProgram)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedVertexStateInit(vm::psv::ptr<SceGxmPrecomputedVertexState> precomputedState, vm::psv::ptr<const SceGxmVertexProgram> vertexProgram, vm::psv::ptr<void> memBlock)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmPrecomputedVertexStateSetDefaultUniformBuffer(vm::psv::ptr<SceGxmPrecomputedVertexState> precomputedState, vm::psv::ptr<void> defaultBuffer)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<void> sceGxmPrecomputedVertexStateGetDefaultUniformBuffer(vm::psv::ptr<const SceGxmPrecomputedVertexState> precomputedState)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedVertexStateSetAllTextures(vm::psv::ptr<SceGxmPrecomputedVertexState> precomputedState, vm::psv::ptr<const SceGxmTexture> textures)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedVertexStateSetTexture(vm::psv::ptr<SceGxmPrecomputedVertexState> precomputedState, u32 textureIndex, vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedVertexStateSetAllUniformBuffers(vm::psv::ptr<SceGxmPrecomputedVertexState> precomputedState, vm::psv::ptr<const vm::psv::ptr<const void>> bufferDataArray)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedVertexStateSetUniformBuffer(vm::psv::ptr<SceGxmPrecomputedVertexState> precomputedState, u32 bufferIndex, vm::psv::ptr<const void> bufferData)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmGetPrecomputedFragmentStateSize(vm::psv::ptr<const SceGxmFragmentProgram> fragmentProgram)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedFragmentStateInit(vm::psv::ptr<SceGxmPrecomputedFragmentState> precomputedState, vm::psv::ptr<const SceGxmFragmentProgram> fragmentProgram, vm::psv::ptr<void> memBlock)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmPrecomputedFragmentStateSetDefaultUniformBuffer(vm::psv::ptr<SceGxmPrecomputedFragmentState> precomputedState, vm::psv::ptr<void> defaultBuffer)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<void> sceGxmPrecomputedFragmentStateGetDefaultUniformBuffer(vm::psv::ptr<const SceGxmPrecomputedFragmentState> precomputedState)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedFragmentStateSetAllTextures(vm::psv::ptr<SceGxmPrecomputedFragmentState> precomputedState, vm::psv::ptr<const SceGxmTexture> textureArray)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedFragmentStateSetTexture(vm::psv::ptr<SceGxmPrecomputedFragmentState> precomputedState, u32 textureIndex, vm::psv::ptr<const SceGxmTexture> texture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedFragmentStateSetAllUniformBuffers(vm::psv::ptr<SceGxmPrecomputedFragmentState> precomputedState, vm::psv::ptr<const vm::psv::ptr<const void>> bufferDataArray)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedFragmentStateSetUniformBuffer(vm::psv::ptr<SceGxmPrecomputedFragmentState> precomputedState, u32 bufferIndex, vm::psv::ptr<const void> bufferData)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedFragmentStateSetAllAuxiliarySurfaces(vm::psv::ptr<SceGxmPrecomputedFragmentState> precomputedState, vm::psv::ptr<const SceGxmAuxiliarySurface> auxSurfaceArray)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceGxmGetPrecomputedDrawSize(vm::psv::ptr<const SceGxmVertexProgram> vertexProgram)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedDrawInit(vm::psv::ptr<SceGxmPrecomputedDraw> precomputedDraw, vm::psv::ptr<const SceGxmVertexProgram> vertexProgram, vm::psv::ptr<void> memBlock)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedDrawSetAllVertexStreams(vm::psv::ptr<SceGxmPrecomputedDraw> precomputedDraw, vm::psv::ptr<const vm::psv::ptr<const void>> streamDataArray)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmPrecomputedDrawSetVertexStream(vm::psv::ptr<SceGxmPrecomputedDraw> precomputedDraw, u32 streamIndex, vm::psv::ptr<const void> streamData)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmPrecomputedDrawSetParams(vm::psv::ptr<SceGxmPrecomputedDraw> precomputedDraw, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::psv::ptr<const void> indexData, u32 indexCount)
+{
+	throw __FUNCTION__;
+}
+
+void sceGxmPrecomputedDrawSetParamsInstanced(vm::psv::ptr<SceGxmPrecomputedDraw> precomputedDraw, SceGxmPrimitiveType primType, SceGxmIndexFormat indexType, vm::psv::ptr<const void> indexData, u32 indexCount, u32 indexWrap)
+{
+	throw __FUNCTION__;
+}
+
+
+s32 sceGxmGetRenderTargetMemSizes(vm::psv::ptr<const SceGxmRenderTargetParams> params, vm::psv::ptr<u32> hostMemSize, vm::psv::ptr<u32> driverMemSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmCreateRenderTarget(vm::psv::ptr<const SceGxmRenderTargetParams> params, vm::psv::ptr<vm::psv::ptr<SceGxmRenderTarget>> renderTarget)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmRenderTargetGetHostMem(vm::psv::ptr<const SceGxmRenderTarget> renderTarget, vm::psv::ptr<vm::psv::ptr<void>> hostMem)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmRenderTargetGetDriverMemBlock(vm::psv::ptr<const SceGxmRenderTarget> renderTarget, vm::psv::ptr<s32> driverMemBlock)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmDestroyRenderTarget(vm::psv::ptr<SceGxmRenderTarget> renderTarget)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGxmSetUniformDataF(vm::psv::ptr<void> uniformBuffer, vm::psv::ptr<const SceGxmProgramParameter> parameter, u32 componentOffset, u32 componentCount, vm::psv::ptr<const float> sourceData)
+{
+	throw __FUNCTION__;
+}
+
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceGxm, #name, name)
+
+psv_log_base sceGxm("SceGxm", []()
+{
+	sceGxm.on_load = nullptr;
+	sceGxm.on_unload = nullptr;
+	sceGxm.on_stop = nullptr;
+
+	REG_FUNC(0xB0F1E4EC, sceGxmInitialize);
+	REG_FUNC(0xB627DE66, sceGxmTerminate);
+	//REG_FUNC(0x48C134AB, sceGxmBug9255RaisePrimitiveSplitThresholdEs2);
+	//REG_FUNC(0xA3A41A42, sceGxmBug9255SetPrimitiveSplitThresholdEs2);
+	REG_FUNC(0xC61E34FC, sceGxmMapMemory);
+	REG_FUNC(0x828C68E8, sceGxmUnmapMemory);
+	REG_FUNC(0xFA437510, sceGxmMapVertexUsseMemory);
+	REG_FUNC(0x008402C6, sceGxmMapFragmentUsseMemory);
+	REG_FUNC(0x099134F5, sceGxmUnmapVertexUsseMemory);
+	REG_FUNC(0x80CCEDBB, sceGxmUnmapFragmentUsseMemory);
+	REG_FUNC(0xEC5C26B5, sceGxmDisplayQueueAddEntry);
+	REG_FUNC(0xB98C5B0D, sceGxmDisplayQueueFinish);
+	REG_FUNC(0x6A6013E1, sceGxmSyncObjectCreate);
+	REG_FUNC(0x889AE88C, sceGxmSyncObjectDestroy);
+	REG_FUNC(0x8BDE825A, sceGxmGetNotificationRegion);
+	REG_FUNC(0x9F448E79, sceGxmNotificationWait);
+	REG_FUNC(0x3D25FCE9, sceGxmPadHeartbeat);
+	REG_FUNC(0x47E06984, sceGxmPadTriggerGpuPaTrace);
+	REG_FUNC(0x2DB6026C, sceGxmColorSurfaceGetData);
+	REG_FUNC(0x200A96E1, sceGxmColorSurfaceGetDitherMode);
+	REG_FUNC(0xF3C1C6C6, sceGxmColorSurfaceGetFormat);
+	REG_FUNC(0x6E3FA74D, sceGxmColorSurfaceGetScaleMode);
+	REG_FUNC(0xF33D9980, sceGxmColorSurfaceGetStrideInPixels);
+	REG_FUNC(0x52FDE962, sceGxmColorSurfaceGetType);
+	REG_FUNC(0xED0F6E25, sceGxmColorSurfaceInit);
+	REG_FUNC(0x613639FA, sceGxmColorSurfaceInitDisabled);
+	REG_FUNC(0x0E0EBB57, sceGxmColorSurfaceIsEnabled);
+	REG_FUNC(0x07DFEE4B, sceGxmColorSurfaceGetClip);
+	REG_FUNC(0x86456F7B, sceGxmColorSurfaceSetClip);
+	REG_FUNC(0x537CA400, sceGxmColorSurfaceSetData);
+	REG_FUNC(0x45027BAB, sceGxmColorSurfaceSetDitherMode);
+	REG_FUNC(0x5F9A3A16, sceGxmColorSurfaceSetFormat);
+	REG_FUNC(0x6B96EDF7, sceGxmColorSurfaceSetScaleMode);
+	//REG_FUNC(0x269B56BE, sceGxmDepthStencilSurfaceGetBackgroundDepth);
+	REG_FUNC(0xAAFC062B, sceGxmDepthStencilSurfaceGetBackgroundStencil);
+	REG_FUNC(0x2F5CC20C, sceGxmDepthStencilSurfaceGetForceLoadMode);
+	REG_FUNC(0x544AA05A, sceGxmDepthStencilSurfaceGetForceStoreMode);
+	REG_FUNC(0x8504038D, sceGxmDepthStencilSurfaceGetFormat);
+	REG_FUNC(0x11628789, sceGxmDepthStencilSurfaceGetStrideInSamples);
+	REG_FUNC(0xCA9D41D1, sceGxmDepthStencilSurfaceInit);
+	REG_FUNC(0xA41DB0D6, sceGxmDepthStencilSurfaceInitDisabled);
+	REG_FUNC(0x082200E1, sceGxmDepthStencilSurfaceIsEnabled);
+	//REG_FUNC(0x32F280F0, sceGxmDepthStencilSurfaceSetBackgroundDepth);
+	REG_FUNC(0xF5D3F3E8, sceGxmDepthStencilSurfaceSetBackgroundStencil);
+	REG_FUNC(0x0C44ACD7, sceGxmDepthStencilSurfaceSetForceLoadMode);
+	REG_FUNC(0x12AAA7AF, sceGxmDepthStencilSurfaceSetForceStoreMode);
+	REG_FUNC(0xF5C89643, sceGxmColorSurfaceSetGammaMode);
+	REG_FUNC(0xEE0B4DF0, sceGxmColorSurfaceGetGammaMode);
+	REG_FUNC(0xE0E3B3F8, sceGxmFragmentProgramGetProgram);
+	REG_FUNC(0xBC52320E, sceGxmVertexProgramGetProgram);
+	REG_FUNC(0xDE9D5911, sceGxmTextureGetAnisoMode);
+	REG_FUNC(0x5341BD46, sceGxmTextureGetData);
+	REG_FUNC(0xE868D2B3, sceGxmTextureGetFormat);
+	REG_FUNC(0x5420A086, sceGxmTextureGetHeight);
+	REG_FUNC(0x2DE55DA5, sceGxmTextureGetLodBias);
+	REG_FUNC(0xAE7FBB51, sceGxmTextureGetMagFilter);
+	REG_FUNC(0x920666C6, sceGxmTextureGetMinFilter);
+	REG_FUNC(0xCE94CA15, sceGxmTextureGetMipFilter);
+	REG_FUNC(0x4CC42929, sceGxmTextureGetMipmapCount);
+	REG_FUNC(0xB0BD52F3, sceGxmTextureGetStride);
+	REG_FUNC(0xF65D4917, sceGxmTextureGetType);
+	REG_FUNC(0xC037DA83, sceGxmTextureGetUAddrMode);
+	REG_FUNC(0xD2F0D9C1, sceGxmTextureGetVAddrMode);
+	REG_FUNC(0x126A3EB3, sceGxmTextureGetWidth);
+	REG_FUNC(0x11DC8DC9, sceGxmTextureInitCube);
+	REG_FUNC(0x4811AECB, sceGxmTextureInitLinear);
+	REG_FUNC(0x6679BEF0, sceGxmTextureInitLinearStrided);
+	REG_FUNC(0xD572D547, sceGxmTextureInitSwizzled);
+	REG_FUNC(0xE6F0DB27, sceGxmTextureInitTiled);
+	REG_FUNC(0xE719CBD4, sceGxmTextureSetAnisoMode);
+	REG_FUNC(0x855814C4, sceGxmTextureSetData);
+	REG_FUNC(0xFC943596, sceGxmTextureSetFormat);
+	REG_FUNC(0x1B20D5DF, sceGxmTextureSetHeight);
+	REG_FUNC(0xB65EE6F7, sceGxmTextureSetLodBias);
+	REG_FUNC(0xFA695FD7, sceGxmTextureSetMagFilter);
+	REG_FUNC(0x416764E3, sceGxmTextureSetMinFilter);
+	REG_FUNC(0x1CA9FE0B, sceGxmTextureSetMipFilter);
+	REG_FUNC(0xD2DC4643, sceGxmTextureSetMipmapCount);
+	REG_FUNC(0x58D0EB0A, sceGxmTextureSetStride);
+	REG_FUNC(0x8699ECF4, sceGxmTextureSetUAddrMode);
+	REG_FUNC(0xFA22F6CC, sceGxmTextureSetVAddrMode);
+	REG_FUNC(0x5A690B60, sceGxmTextureSetWidth);
+	REG_FUNC(0xDD6AABFA, sceGxmTextureSetPalette);
+	REG_FUNC(0x0D189C30, sceGxmTextureGetPalette);
+	REG_FUNC(0xA6D9F4DA, sceGxmTextureSetGammaMode);
+	REG_FUNC(0xF23FCE81, sceGxmTextureGetGammaMode);
+	REG_FUNC(0x85DE8506, sceGxmGetPrecomputedFragmentStateSize);
+	REG_FUNC(0x9D83CA3B, sceGxmGetPrecomputedVertexStateSize);
+	REG_FUNC(0x41BBD792, sceGxmGetPrecomputedDrawSize);
+	REG_FUNC(0xA197F096, sceGxmPrecomputedDrawInit);
+	REG_FUNC(0xB6C6F571, sceGxmPrecomputedDrawSetAllVertexStreams);
+	REG_FUNC(0x884D0D08, sceGxmPrecomputedDrawSetParams);
+	REG_FUNC(0x3A7B1633, sceGxmPrecomputedDrawSetParamsInstanced);
+	REG_FUNC(0x6C936214, sceGxmPrecomputedDrawSetVertexStream);
+	REG_FUNC(0xCECB584A, sceGxmPrecomputedFragmentStateGetDefaultUniformBuffer);
+	REG_FUNC(0x91236858, sceGxmPrecomputedFragmentStateSetDefaultUniformBuffer);
+	REG_FUNC(0xE297D7AF, sceGxmPrecomputedFragmentStateInit);
+	REG_FUNC(0x29118BF1, sceGxmPrecomputedFragmentStateSetTexture);
+	REG_FUNC(0xB452F1FB, sceGxmPrecomputedFragmentStateSetUniformBuffer);
+	REG_FUNC(0xC383DE39, sceGxmPrecomputedFragmentStateSetAllTextures);
+	REG_FUNC(0x5A783DC3, sceGxmPrecomputedFragmentStateSetAllUniformBuffers);
+	REG_FUNC(0x9D93B63A, sceGxmPrecomputedFragmentStateSetAllAuxiliarySurfaces);
+	REG_FUNC(0xBE5A68EF, sceGxmPrecomputedVertexStateGetDefaultUniformBuffer);
+	REG_FUNC(0x34BF64E3, sceGxmPrecomputedVertexStateSetDefaultUniformBuffer);
+	REG_FUNC(0xBE937F8D, sceGxmPrecomputedVertexStateInit);
+	REG_FUNC(0x1625D348, sceGxmPrecomputedVertexStateSetTexture);
+	REG_FUNC(0xDBF97ED6, sceGxmPrecomputedVertexStateSetUniformBuffer);
+	REG_FUNC(0x8FF68274, sceGxmPrecomputedVertexStateSetAllTextures);
+	REG_FUNC(0x0389861D, sceGxmPrecomputedVertexStateSetAllUniformBuffers);
+	REG_FUNC(0x1F856E5D, sceGxmGetRenderTargetMemSizes);
+	REG_FUNC(0xD56CD7B1, sceGxmCreateRenderTarget);
+	REG_FUNC(0x0B94C50A, sceGxmDestroyRenderTarget);
+	REG_FUNC(0xD0EDAB4C, sceGxmRenderTargetGetHostMem);
+	REG_FUNC(0x49553737, sceGxmRenderTargetGetDriverMemBlock);
+	REG_FUNC(0xDBA33160, sceGxmBeginScene);
+	REG_FUNC(0xE84CE5B4, sceGxmCreateContext);
+	REG_FUNC(0xEDDC5FB2, sceGxmDestroyContext);
+	REG_FUNC(0xBC059AFC, sceGxmDraw);
+	REG_FUNC(0x14C4E7D3, sceGxmDrawInstanced);
+	REG_FUNC(0xED3F78B8, sceGxmDrawPrecomputed);
+	REG_FUNC(0xFE300E2F, sceGxmEndScene);
+	REG_FUNC(0x0733D8AE, sceGxmFinish);
+	REG_FUNC(0x51FE0899, sceGxmMidSceneFlush);
+	REG_FUNC(0x4FA073A6, sceGxmPopUserMarker);
+	REG_FUNC(0x3276C475, sceGxmPushUserMarker);
+	REG_FUNC(0x7B1FABB6, sceGxmReserveFragmentDefaultUniformBuffer);
+	REG_FUNC(0x97118913, sceGxmReserveVertexDefaultUniformBuffer);
+	REG_FUNC(0x91B4F7F4, sceGxmSetAuxiliarySurface);
+	REG_FUNC(0x17B3BF86, sceGxmSetBackDepthBias);
+	REG_FUNC(0xB042A4D2, sceGxmSetBackDepthFunc);
+	REG_FUNC(0xC18B706B, sceGxmSetBackDepthWriteEnable);
+	REG_FUNC(0xE26B4834, sceGxmSetBackFragmentProgramEnable);
+	REG_FUNC(0xC88EB702, sceGxmSetBackLineFillLastPixelEnable);
+	REG_FUNC(0x8DCB0EDB, sceGxmSetBackPointLineWidth);
+	REG_FUNC(0xF66EC6FE, sceGxmSetBackPolygonMode);
+	REG_FUNC(0x1A68C8D2, sceGxmSetBackStencilFunc);
+	REG_FUNC(0x866A0517, sceGxmSetBackStencilRef);
+	REG_FUNC(0xE1CA72AE, sceGxmSetCullMode);
+	REG_FUNC(0xAD2F48D9, sceGxmSetFragmentProgram);
+	REG_FUNC(0x29C34DF5, sceGxmSetFragmentTexture);
+	REG_FUNC(0xEA0FC310, sceGxmSetFragmentUniformBuffer);
+	REG_FUNC(0xAAA97F81, sceGxmSetFrontDepthBias);
+	REG_FUNC(0x14BD831F, sceGxmSetFrontDepthFunc);
+	REG_FUNC(0xF32CBF34, sceGxmSetFrontDepthWriteEnable);
+	REG_FUNC(0x575958A8, sceGxmSetFrontFragmentProgramEnable);
+	REG_FUNC(0x5765DE9F, sceGxmSetFrontLineFillLastPixelEnable);
+	REG_FUNC(0x06752183, sceGxmSetFrontPointLineWidth);
+	REG_FUNC(0xFD93209D, sceGxmSetFrontPolygonMode);
+	REG_FUNC(0xB8645A9A, sceGxmSetFrontStencilFunc);
+	REG_FUNC(0x8FA6FE44, sceGxmSetFrontStencilRef);
+	REG_FUNC(0xF8952750, sceGxmSetPrecomputedFragmentState);
+	REG_FUNC(0xB7626A93, sceGxmSetPrecomputedVertexState);
+	REG_FUNC(0x70C86868, sceGxmSetRegionClip);
+	REG_FUNC(0x0DE9AEB7, sceGxmSetTwoSidedEnable);
+	REG_FUNC(0xC7A8CB77, sceGxmSetUserMarker);
+	REG_FUNC(0x8C6A24C9, sceGxmSetValidationEnable);
+	REG_FUNC(0x31FF8ABD, sceGxmSetVertexProgram);
+	REG_FUNC(0x895DF2E9, sceGxmSetVertexStream);
+	REG_FUNC(0x16C9D339, sceGxmSetVertexTexture);
+	REG_FUNC(0xC68015E4, sceGxmSetVertexUniformBuffer);
+	//REG_FUNC(0x3EB3380B, sceGxmSetViewport);
+	REG_FUNC(0x814F61EB, sceGxmSetViewportEnable);
+	REG_FUNC(0x7767EC49, sceGxmSetVisibilityBuffer);
+	REG_FUNC(0xEED86975, sceGxmSetWBufferEnable);
+	REG_FUNC(0x1BF8B853, sceGxmSetWClampEnable);
+	//REG_FUNC(0xD096336E, sceGxmSetWClampValue);
+	REG_FUNC(0x12625C34, sceGxmSetFrontVisibilityTestIndex);
+	REG_FUNC(0xAE7886FE, sceGxmSetBackVisibilityTestIndex);
+	REG_FUNC(0xD0E3CD9A, sceGxmSetFrontVisibilityTestOp);
+	REG_FUNC(0xC83F0AB3, sceGxmSetBackVisibilityTestOp);
+	REG_FUNC(0x30459117, sceGxmSetFrontVisibilityTestEnable);
+	REG_FUNC(0x17CF46B9, sceGxmSetBackVisibilityTestEnable);
+	REG_FUNC(0xED8B6C69, sceGxmProgramCheck);
+	REG_FUNC(0x277794C4, sceGxmProgramFindParameterByName);
+	REG_FUNC(0x7FFFDD7A, sceGxmProgramFindParameterBySemantic);
+	REG_FUNC(0x06FF9151, sceGxmProgramGetParameter);
+	REG_FUNC(0xD5D5FCCD, sceGxmProgramGetParameterCount);
+	REG_FUNC(0xBF5E2090, sceGxmProgramGetSize);
+	REG_FUNC(0x04BB3C59, sceGxmProgramGetType);
+	REG_FUNC(0x89613EF2, sceGxmProgramIsDepthReplaceUsed);
+	REG_FUNC(0x029B4F1C, sceGxmProgramIsDiscardUsed);
+	REG_FUNC(0x8FA3F9C3, sceGxmProgramGetDefaultUniformBufferSize);
+	REG_FUNC(0xDBA8D061, sceGxmProgramParameterGetArraySize);
+	REG_FUNC(0x1997DC17, sceGxmProgramParameterGetCategory);
+	REG_FUNC(0xBD2998D1, sceGxmProgramParameterGetComponentCount);
+	REG_FUNC(0xBB58267D, sceGxmProgramParameterGetContainerIndex);
+	REG_FUNC(0x6E61DDF5, sceGxmProgramParameterGetIndex);
+	REG_FUNC(0x6AF88A5D, sceGxmProgramParameterGetName);
+	REG_FUNC(0x5C79D59A, sceGxmProgramParameterGetResourceIndex);
+	REG_FUNC(0xAAFD61D5, sceGxmProgramParameterGetSemantic);
+	REG_FUNC(0xB85CC13E, sceGxmProgramParameterGetSemanticIndex);
+	REG_FUNC(0x7B9023C3, sceGxmProgramParameterGetType);
+	REG_FUNC(0xF7AA978B, sceGxmProgramParameterIsSamplerCube);
+	REG_FUNC(0x4CD2D19F, sceGxmShaderPatcherAddRefFragmentProgram);
+	REG_FUNC(0x0FD1E589, sceGxmShaderPatcherAddRefVertexProgram);
+	REG_FUNC(0x05032658, sceGxmShaderPatcherCreate);
+	REG_FUNC(0x4ED2E49D, sceGxmShaderPatcherCreateFragmentProgram);
+	REG_FUNC(0xB7BBA6D5, sceGxmShaderPatcherCreateVertexProgram);
+	REG_FUNC(0xEAA5B100, sceGxmShaderPatcherDestroy);
+	REG_FUNC(0xA949A803, sceGxmShaderPatcherGetProgramFromId);
+	REG_FUNC(0x2B528462, sceGxmShaderPatcherRegisterProgram);
+	REG_FUNC(0xBE2743D1, sceGxmShaderPatcherReleaseFragmentProgram);
+	REG_FUNC(0xAC1FF2DA, sceGxmShaderPatcherReleaseVertexProgram);
+	REG_FUNC(0x8E5FCC2A, sceGxmShaderPatcherSetAuxiliarySurface);
+	REG_FUNC(0xF103AF8A, sceGxmShaderPatcherUnregisterProgram);
+	REG_FUNC(0x9DBBC71C, sceGxmShaderPatcherGetHostMemAllocated);
+	REG_FUNC(0xC694D039, sceGxmShaderPatcherGetBufferMemAllocated);
+	REG_FUNC(0x7D2F83C1, sceGxmShaderPatcherGetVertexUsseMemAllocated);
+	REG_FUNC(0x3C9DDB4A, sceGxmShaderPatcherGetFragmentUsseMemAllocated);
+	REG_FUNC(0x96A7E6DD, sceGxmShaderPatcherGetUserData);
+	REG_FUNC(0xF9B8FCFD, sceGxmShaderPatcherSetUserData);
+	REG_FUNC(0x65DD0C84, sceGxmSetUniformDataF);
+});
\ No newline at end of file
diff --git a/rpcs3/Emu/ARMv7/Modules/sceGxm.h b/rpcs3/Emu/ARMv7/Modules/sceGxm.h
new file mode 100644
index 0000000000..28cdac4daf
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceGxm.h
@@ -0,0 +1,1244 @@
+#pragma once
+
+// Error Codes
+
+enum
+{
+	SCE_GXM_ERROR_UNINITIALIZED = 0x805B0000,
+	SCE_GXM_ERROR_ALREADY_INITIALIZED = 0x805B0001,
+	SCE_GXM_ERROR_OUT_OF_MEMORY = 0x805B0002,
+	SCE_GXM_ERROR_INVALID_VALUE = 0x805B0003,
+	SCE_GXM_ERROR_INVALID_POINTER = 0x805B0004,
+	SCE_GXM_ERROR_INVALID_ALIGNMENT = 0x805B0005,
+	SCE_GXM_ERROR_NOT_WITHIN_SCENE = 0x805B0006,
+	SCE_GXM_ERROR_WITHIN_SCENE = 0x805B0007,
+	SCE_GXM_ERROR_NULL_PROGRAM = 0x805B0008,
+	SCE_GXM_ERROR_UNSUPPORTED = 0x805B0009,
+	SCE_GXM_ERROR_PATCHER_INTERNAL = 0x805B000A,
+	SCE_GXM_ERROR_RESERVE_FAILED = 0x805B000B,
+	SCE_GXM_ERROR_PROGRAM_IN_USE = 0x805B000C,
+	SCE_GXM_ERROR_INVALID_INDEX_COUNT = 0x805B000D,
+	SCE_GXM_ERROR_INVALID_POLYGON_MODE = 0x805B000E,
+	SCE_GXM_ERROR_INVALID_SAMPLER_RESULT_TYPE_PRECISION = 0x805B000F,
+	SCE_GXM_ERROR_INVALID_SAMPLER_RESULT_TYPE_COMPONENT_COUNT = 0x805B0010,
+	SCE_GXM_ERROR_UNIFORM_BUFFER_NOT_RESERVED = 0x805B0011,
+	SCE_GXM_ERROR_INVALID_AUXILIARY_SURFACE = 0x805B0013,
+	SCE_GXM_ERROR_INVALID_PRECOMPUTED_DRAW = 0x805B0014,
+	SCE_GXM_ERROR_INVALID_PRECOMPUTED_VERTEX_STATE = 0x805B0015,
+	SCE_GXM_ERROR_INVALID_PRECOMPUTED_FRAGMENT_STATE = 0x805B0016,
+	SCE_GXM_ERROR_DRIVER = 0x805B0017,
+};
+
+typedef void(SceGxmDisplayQueueCallback)(vm::psv::ptr<const void> callbackData);
+
+struct SceGxmInitializeParams
+{
+	u32 flags;
+	u32 displayQueueMaxPendingCount;
+	vm::psv::ptr<SceGxmDisplayQueueCallback> displayQueueCallback;
+	u32 displayQueueCallbackDataSize;
+	s32 parameterBufferSize;
+};
+
+enum SceGxmMemoryAttribFlags : u32
+{
+	SCE_GXM_MEMORY_ATTRIB_READ = 1,
+	SCE_GXM_MEMORY_ATTRIB_WRITE = 2,
+};
+
+enum SceGxmAttributeFormat : u8
+{
+	SCE_GXM_ATTRIBUTE_FORMAT_U8,
+	SCE_GXM_ATTRIBUTE_FORMAT_S8,
+	SCE_GXM_ATTRIBUTE_FORMAT_U16,
+	SCE_GXM_ATTRIBUTE_FORMAT_S16,
+	SCE_GXM_ATTRIBUTE_FORMAT_U8N,
+	SCE_GXM_ATTRIBUTE_FORMAT_S8N,
+	SCE_GXM_ATTRIBUTE_FORMAT_U16N,
+	SCE_GXM_ATTRIBUTE_FORMAT_S16N,
+	SCE_GXM_ATTRIBUTE_FORMAT_F16,
+	SCE_GXM_ATTRIBUTE_FORMAT_F32
+};
+
+enum SceGxmDepthStencilFormat : u32
+{
+	SCE_GXM_DEPTH_STENCIL_FORMAT_DF32 = 0x00044000u,
+	SCE_GXM_DEPTH_STENCIL_FORMAT_S8 = 0x00022000u,
+	SCE_GXM_DEPTH_STENCIL_FORMAT_DF32_S8 = 0x00066000u,
+	SCE_GXM_DEPTH_STENCIL_FORMAT_S8D24 = 0x01266000u,
+	SCE_GXM_DEPTH_STENCIL_FORMAT_D16 = 0x02444000u
+};
+
+enum SceGxmPrimitiveType : u32
+{
+	SCE_GXM_PRIMITIVE_TRIANGLES = 0x00000000u,
+	SCE_GXM_PRIMITIVE_LINES = 0x04000000u,
+	SCE_GXM_PRIMITIVE_POINTS = 0x08000000u,
+	SCE_GXM_PRIMITIVE_TRIANGLE_STRIP = 0x0c000000u,
+	SCE_GXM_PRIMITIVE_TRIANGLE_FAN = 0x10000000u,
+	SCE_GXM_PRIMITIVE_TRIANGLE_EDGES = 0x14000000u
+};
+
+enum SceGxmEdgeEnableFlags : u32
+{
+	SCE_GXM_EDGE_ENABLE_01 = 0x00000100u,
+	SCE_GXM_EDGE_ENABLE_12 = 0x00000200u,
+	SCE_GXM_EDGE_ENABLE_20 = 0x00000400u
+};
+
+enum SceGxmRegionClipMode : u32
+{
+	SCE_GXM_REGION_CLIP_NONE = 0x00000000u,
+	SCE_GXM_REGION_CLIP_ALL = 0x40000000u,
+	SCE_GXM_REGION_CLIP_OUTSIDE = 0x80000000u,
+	SCE_GXM_REGION_CLIP_INSIDE = 0xc0000000u
+};
+
+enum SceGxmDepthFunc : u32
+{
+	SCE_GXM_DEPTH_FUNC_NEVER = 0x00000000u,
+	SCE_GXM_DEPTH_FUNC_LESS = 0x00400000u,
+	SCE_GXM_DEPTH_FUNC_EQUAL = 0x00800000u,
+	SCE_GXM_DEPTH_FUNC_LESS_EQUAL = 0x00c00000u,
+	SCE_GXM_DEPTH_FUNC_GREATER = 0x01000000u,
+	SCE_GXM_DEPTH_FUNC_NOT_EQUAL = 0x01400000u,
+	SCE_GXM_DEPTH_FUNC_GREATER_EQUAL = 0x01800000u,
+	SCE_GXM_DEPTH_FUNC_ALWAYS = 0x01c00000u
+};
+
+enum SceGxmStencilFunc : u32
+{
+	SCE_GXM_STENCIL_FUNC_NEVER = 0x00000000u,
+	SCE_GXM_STENCIL_FUNC_LESS = 0x02000000u,
+	SCE_GXM_STENCIL_FUNC_EQUAL = 0x04000000u,
+	SCE_GXM_STENCIL_FUNC_LESS_EQUAL = 0x06000000u,
+	SCE_GXM_STENCIL_FUNC_GREATER = 0x08000000u,
+	SCE_GXM_STENCIL_FUNC_NOT_EQUAL = 0x0a000000u,
+	SCE_GXM_STENCIL_FUNC_GREATER_EQUAL = 0x0c000000u,
+	SCE_GXM_STENCIL_FUNC_ALWAYS = 0x0e000000u
+};
+
+enum SceGxmStencilOp : u32
+{
+	SCE_GXM_STENCIL_OP_KEEP = 0x00000000u,
+	SCE_GXM_STENCIL_OP_ZERO = 0x00000001u,
+	SCE_GXM_STENCIL_OP_REPLACE = 0x00000002u,
+	SCE_GXM_STENCIL_OP_INCR = 0x00000003u,
+	SCE_GXM_STENCIL_OP_DECR = 0x00000004u,
+	SCE_GXM_STENCIL_OP_INVERT = 0x00000005u,
+	SCE_GXM_STENCIL_OP_INCR_WRAP = 0x00000006u,
+	SCE_GXM_STENCIL_OP_DECR_WRAP = 0x00000007u
+};
+
+enum SceGxmCullMode : u32
+{
+	SCE_GXM_CULL_NONE = 0x00000000u,
+	SCE_GXM_CULL_CW = 0x00000001u,
+	SCE_GXM_CULL_CCW = 0x00000002u
+};
+
+enum SceGxmPolygonMode : u32
+{
+	SCE_GXM_POLYGON_MODE_TRIANGLE_FILL = 0x00000000u,
+	SCE_GXM_POLYGON_MODE_LINE = 0x00008000u,
+	SCE_GXM_POLYGON_MODE_POINT_10UV = 0x00010000u,
+	SCE_GXM_POLYGON_MODE_POINT = 0x00018000u,
+	SCE_GXM_POLYGON_MODE_POINT_01UV = 0x00020000u,
+	SCE_GXM_POLYGON_MODE_TRIANGLE_LINE = 0x00028000u,
+	SCE_GXM_POLYGON_MODE_TRIANGLE_POINT = 0x00030000u
+};
+
+enum SceGxmColorSwizzle4Mode : u32
+{
+	SCE_GXM_COLOR_SWIZZLE4_ABGR = 0x00000000u,
+	SCE_GXM_COLOR_SWIZZLE4_ARGB = 0x00100000u,
+	SCE_GXM_COLOR_SWIZZLE4_RGBA = 0x00200000u,
+	SCE_GXM_COLOR_SWIZZLE4_BGRA = 0x00300000u
+};
+
+enum SceGxmColorSwizzle3Mode : u32
+{
+	SCE_GXM_COLOR_SWIZZLE3_BGR = 0x00000000u,
+	SCE_GXM_COLOR_SWIZZLE3_RGB = 0x00100000u
+};
+
+enum SceGxmColorSwizzle2Mode : u32
+{
+	SCE_GXM_COLOR_SWIZZLE2_GR = 0x00000000u,
+	SCE_GXM_COLOR_SWIZZLE2_RG = 0x00100000u,
+	SCE_GXM_COLOR_SWIZZLE2_RA = 0x00200000u,
+	SCE_GXM_COLOR_SWIZZLE2_AR = 0x00300000u
+};
+
+enum SceGxmColorSwizzle1Mode : u32
+{
+	SCE_GXM_COLOR_SWIZZLE1_R = 0x00000000u,
+	SCE_GXM_COLOR_SWIZZLE1_G = 0x00100000u,
+	SCE_GXM_COLOR_SWIZZLE1_A = 0x00100000u
+};
+
+enum SceGxmColorBaseFormat : u32
+{
+	SCE_GXM_COLOR_BASE_FORMAT_U8U8U8U8 = 0x00000000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U8U8U8 = 0x10000000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U5U6U5 = 0x30000000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U1U5U5U5 = 0x40000000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U4U4U4U4 = 0x50000000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U8U3U3U2 = 0x60000000u,
+	SCE_GXM_COLOR_BASE_FORMAT_F16 = 0xf0000000u,
+	SCE_GXM_COLOR_BASE_FORMAT_F16F16 = 0x00800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_F32 = 0x10800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_S16 = 0x20800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_S16S16 = 0x30800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U16 = 0x40800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U16U16 = 0x50800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U2U10U10U10 = 0x60800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U8 = 0x80800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_S8 = 0x90800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_S5S5U6 = 0xa0800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U8U8 = 0xb0800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_S8S8 = 0xc0800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U8S8S8U8 = 0xd0800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_S8S8S8S8 = 0xe0800000u,
+	SCE_GXM_COLOR_BASE_FORMAT_F16F16F16F16 = 0x01000000u,
+	SCE_GXM_COLOR_BASE_FORMAT_F32F32 = 0x11000000u,
+	SCE_GXM_COLOR_BASE_FORMAT_F11F11F10 = 0x21000000u,
+	SCE_GXM_COLOR_BASE_FORMAT_SE5M9M9M9 = 0x31000000u,
+	SCE_GXM_COLOR_BASE_FORMAT_U2F10F10F10 = 0x41000000u
+};
+
+enum SceGxmColorFormat : u32
+{
+	// Supported formats
+
+	SCE_GXM_COLOR_FORMAT_U8U8U8U8_ABGR = SCE_GXM_COLOR_BASE_FORMAT_U8U8U8U8 | SCE_GXM_COLOR_SWIZZLE4_ABGR,
+	SCE_GXM_COLOR_FORMAT_U8U8U8U8_ARGB = SCE_GXM_COLOR_BASE_FORMAT_U8U8U8U8 | SCE_GXM_COLOR_SWIZZLE4_ARGB,
+	SCE_GXM_COLOR_FORMAT_U8U8U8U8_RGBA = SCE_GXM_COLOR_BASE_FORMAT_U8U8U8U8 | SCE_GXM_COLOR_SWIZZLE4_RGBA,
+	SCE_GXM_COLOR_FORMAT_U8U8U8U8_BGRA = SCE_GXM_COLOR_BASE_FORMAT_U8U8U8U8 | SCE_GXM_COLOR_SWIZZLE4_BGRA,
+
+	SCE_GXM_COLOR_FORMAT_U8U8U8_BGR = SCE_GXM_COLOR_BASE_FORMAT_U8U8U8 | SCE_GXM_COLOR_SWIZZLE3_BGR,
+	SCE_GXM_COLOR_FORMAT_U8U8U8_RGB = SCE_GXM_COLOR_BASE_FORMAT_U8U8U8 | SCE_GXM_COLOR_SWIZZLE3_RGB,
+
+	SCE_GXM_COLOR_FORMAT_U5U6U5_BGR = SCE_GXM_COLOR_BASE_FORMAT_U5U6U5 | SCE_GXM_COLOR_SWIZZLE3_BGR,
+	SCE_GXM_COLOR_FORMAT_U5U6U5_RGB = SCE_GXM_COLOR_BASE_FORMAT_U5U6U5 | SCE_GXM_COLOR_SWIZZLE3_RGB,
+
+	SCE_GXM_COLOR_FORMAT_U1U5U5U5_ABGR = SCE_GXM_COLOR_BASE_FORMAT_U1U5U5U5 | SCE_GXM_COLOR_SWIZZLE4_ABGR,
+	SCE_GXM_COLOR_FORMAT_U1U5U5U5_ARGB = SCE_GXM_COLOR_BASE_FORMAT_U1U5U5U5 | SCE_GXM_COLOR_SWIZZLE4_ARGB,
+	SCE_GXM_COLOR_FORMAT_U5U5U5U1_RGBA = SCE_GXM_COLOR_BASE_FORMAT_U1U5U5U5 | SCE_GXM_COLOR_SWIZZLE4_RGBA,
+	SCE_GXM_COLOR_FORMAT_U5U5U5U1_BGRA = SCE_GXM_COLOR_BASE_FORMAT_U1U5U5U5 | SCE_GXM_COLOR_SWIZZLE4_BGRA,
+
+	SCE_GXM_COLOR_FORMAT_U4U4U4U4_ABGR = SCE_GXM_COLOR_BASE_FORMAT_U4U4U4U4 | SCE_GXM_COLOR_SWIZZLE4_ABGR,
+	SCE_GXM_COLOR_FORMAT_U4U4U4U4_ARGB = SCE_GXM_COLOR_BASE_FORMAT_U4U4U4U4 | SCE_GXM_COLOR_SWIZZLE4_ARGB,
+	SCE_GXM_COLOR_FORMAT_U4U4U4U4_RGBA = SCE_GXM_COLOR_BASE_FORMAT_U4U4U4U4 | SCE_GXM_COLOR_SWIZZLE4_RGBA,
+	SCE_GXM_COLOR_FORMAT_U4U4U4U4_BGRA = SCE_GXM_COLOR_BASE_FORMAT_U4U4U4U4 | SCE_GXM_COLOR_SWIZZLE4_BGRA,
+
+	SCE_GXM_COLOR_FORMAT_U8U3U3U2_ARGB = SCE_GXM_COLOR_BASE_FORMAT_U8U3U3U2,
+
+	SCE_GXM_COLOR_FORMAT_F16_R = SCE_GXM_COLOR_BASE_FORMAT_F16 | SCE_GXM_COLOR_SWIZZLE1_R,
+	SCE_GXM_COLOR_FORMAT_F16_G = SCE_GXM_COLOR_BASE_FORMAT_F16 | SCE_GXM_COLOR_SWIZZLE1_G,
+
+	SCE_GXM_COLOR_FORMAT_F16F16_GR = SCE_GXM_COLOR_BASE_FORMAT_F16F16 | SCE_GXM_COLOR_SWIZZLE2_GR,
+	SCE_GXM_COLOR_FORMAT_F16F16_RG = SCE_GXM_COLOR_BASE_FORMAT_F16F16 | SCE_GXM_COLOR_SWIZZLE2_RG,
+
+	SCE_GXM_COLOR_FORMAT_F32_R = SCE_GXM_COLOR_BASE_FORMAT_F32 | SCE_GXM_COLOR_SWIZZLE1_R,
+
+	SCE_GXM_COLOR_FORMAT_S16_R = SCE_GXM_COLOR_BASE_FORMAT_S16 | SCE_GXM_COLOR_SWIZZLE1_R,
+	SCE_GXM_COLOR_FORMAT_S16_G = SCE_GXM_COLOR_BASE_FORMAT_S16 | SCE_GXM_COLOR_SWIZZLE1_G,
+
+	SCE_GXM_COLOR_FORMAT_S16S16_GR = SCE_GXM_COLOR_BASE_FORMAT_S16S16 | SCE_GXM_COLOR_SWIZZLE2_GR,
+	SCE_GXM_COLOR_FORMAT_S16S16_RG = SCE_GXM_COLOR_BASE_FORMAT_S16S16 | SCE_GXM_COLOR_SWIZZLE2_RG,
+
+	SCE_GXM_COLOR_FORMAT_U16_R = SCE_GXM_COLOR_BASE_FORMAT_U16 | SCE_GXM_COLOR_SWIZZLE1_R,
+	SCE_GXM_COLOR_FORMAT_U16_G = SCE_GXM_COLOR_BASE_FORMAT_U16 | SCE_GXM_COLOR_SWIZZLE1_G,
+
+	SCE_GXM_COLOR_FORMAT_U16U16_GR = SCE_GXM_COLOR_BASE_FORMAT_U16U16 | SCE_GXM_COLOR_SWIZZLE2_GR,
+	SCE_GXM_COLOR_FORMAT_U16U16_RG = SCE_GXM_COLOR_BASE_FORMAT_U16U16 | SCE_GXM_COLOR_SWIZZLE2_RG,
+
+	SCE_GXM_COLOR_FORMAT_U2U10U10U10_ABGR = SCE_GXM_COLOR_BASE_FORMAT_U2U10U10U10 | SCE_GXM_COLOR_SWIZZLE4_ABGR,
+	SCE_GXM_COLOR_FORMAT_U2U10U10U10_ARGB = SCE_GXM_COLOR_BASE_FORMAT_U2U10U10U10 | SCE_GXM_COLOR_SWIZZLE4_ARGB,
+	SCE_GXM_COLOR_FORMAT_U10U10U10U2_RGBA = SCE_GXM_COLOR_BASE_FORMAT_U2U10U10U10 | SCE_GXM_COLOR_SWIZZLE4_RGBA,
+	SCE_GXM_COLOR_FORMAT_U10U10U10U2_BGRA = SCE_GXM_COLOR_BASE_FORMAT_U2U10U10U10 | SCE_GXM_COLOR_SWIZZLE4_BGRA,
+
+	SCE_GXM_COLOR_FORMAT_U8_R = SCE_GXM_COLOR_BASE_FORMAT_U8 | SCE_GXM_COLOR_SWIZZLE1_R,
+	SCE_GXM_COLOR_FORMAT_U8_A = SCE_GXM_COLOR_BASE_FORMAT_U8 | SCE_GXM_COLOR_SWIZZLE1_A,
+
+	SCE_GXM_COLOR_FORMAT_S8_R = SCE_GXM_COLOR_BASE_FORMAT_S8 | SCE_GXM_COLOR_SWIZZLE1_R,
+	SCE_GXM_COLOR_FORMAT_S8_A = SCE_GXM_COLOR_BASE_FORMAT_S8 | SCE_GXM_COLOR_SWIZZLE1_A,
+
+	SCE_GXM_COLOR_FORMAT_U6S5S5_BGR = SCE_GXM_COLOR_BASE_FORMAT_S5S5U6 | SCE_GXM_COLOR_SWIZZLE3_BGR,
+	SCE_GXM_COLOR_FORMAT_S5S5U6_RGB = SCE_GXM_COLOR_BASE_FORMAT_S5S5U6 | SCE_GXM_COLOR_SWIZZLE3_RGB,
+
+	SCE_GXM_COLOR_FORMAT_U8U8_GR = SCE_GXM_COLOR_BASE_FORMAT_U8U8 | SCE_GXM_COLOR_SWIZZLE2_GR,
+	SCE_GXM_COLOR_FORMAT_U8U8_RG = SCE_GXM_COLOR_BASE_FORMAT_U8U8 | SCE_GXM_COLOR_SWIZZLE2_RG,
+	SCE_GXM_COLOR_FORMAT_U8U8_RA = SCE_GXM_COLOR_BASE_FORMAT_U8U8 | SCE_GXM_COLOR_SWIZZLE2_RA,
+	SCE_GXM_COLOR_FORMAT_U8U8_AR = SCE_GXM_COLOR_BASE_FORMAT_U8U8 | SCE_GXM_COLOR_SWIZZLE2_AR,
+
+	SCE_GXM_COLOR_FORMAT_S8S8_GR = SCE_GXM_COLOR_BASE_FORMAT_S8S8 | SCE_GXM_COLOR_SWIZZLE2_GR,
+	SCE_GXM_COLOR_FORMAT_S8S8_RG = SCE_GXM_COLOR_BASE_FORMAT_S8S8 | SCE_GXM_COLOR_SWIZZLE2_RG,
+	SCE_GXM_COLOR_FORMAT_S8S8_RA = SCE_GXM_COLOR_BASE_FORMAT_S8S8 | SCE_GXM_COLOR_SWIZZLE2_RA,
+	SCE_GXM_COLOR_FORMAT_S8S8_AR = SCE_GXM_COLOR_BASE_FORMAT_S8S8 | SCE_GXM_COLOR_SWIZZLE2_AR,
+
+	SCE_GXM_COLOR_FORMAT_U8S8S8U8_ABGR = SCE_GXM_COLOR_BASE_FORMAT_U8S8S8U8 | SCE_GXM_COLOR_SWIZZLE4_ABGR,
+	SCE_GXM_COLOR_FORMAT_U8U8S8S8_ARGB = SCE_GXM_COLOR_BASE_FORMAT_U8S8S8U8 | SCE_GXM_COLOR_SWIZZLE4_ARGB,
+	SCE_GXM_COLOR_FORMAT_U8S8S8U8_RGBA = SCE_GXM_COLOR_BASE_FORMAT_U8S8S8U8 | SCE_GXM_COLOR_SWIZZLE4_RGBA,
+	SCE_GXM_COLOR_FORMAT_S8S8U8U8_BGRA = SCE_GXM_COLOR_BASE_FORMAT_U8S8S8U8 | SCE_GXM_COLOR_SWIZZLE4_BGRA,
+
+	SCE_GXM_COLOR_FORMAT_S8S8S8S8_ABGR = SCE_GXM_COLOR_BASE_FORMAT_S8S8S8S8 | SCE_GXM_COLOR_SWIZZLE4_ABGR,
+	SCE_GXM_COLOR_FORMAT_S8S8S8S8_ARGB = SCE_GXM_COLOR_BASE_FORMAT_S8S8S8S8 | SCE_GXM_COLOR_SWIZZLE4_ARGB,
+	SCE_GXM_COLOR_FORMAT_S8S8S8S8_RGBA = SCE_GXM_COLOR_BASE_FORMAT_S8S8S8S8 | SCE_GXM_COLOR_SWIZZLE4_RGBA,
+	SCE_GXM_COLOR_FORMAT_S8S8S8S8_BGRA = SCE_GXM_COLOR_BASE_FORMAT_S8S8S8S8 | SCE_GXM_COLOR_SWIZZLE4_BGRA,
+
+	SCE_GXM_COLOR_FORMAT_F16F16F16F16_ABGR = SCE_GXM_COLOR_BASE_FORMAT_F16F16F16F16 | SCE_GXM_COLOR_SWIZZLE4_ABGR,
+	SCE_GXM_COLOR_FORMAT_F16F16F16F16_ARGB = SCE_GXM_COLOR_BASE_FORMAT_F16F16F16F16 | SCE_GXM_COLOR_SWIZZLE4_ARGB,
+	SCE_GXM_COLOR_FORMAT_F16F16F16F16_RGBA = SCE_GXM_COLOR_BASE_FORMAT_F16F16F16F16 | SCE_GXM_COLOR_SWIZZLE4_RGBA,
+	SCE_GXM_COLOR_FORMAT_F16F16F16F16_BGRA = SCE_GXM_COLOR_BASE_FORMAT_F16F16F16F16 | SCE_GXM_COLOR_SWIZZLE4_BGRA,
+
+	SCE_GXM_COLOR_FORMAT_F32F32_GR = SCE_GXM_COLOR_BASE_FORMAT_F32F32 | SCE_GXM_COLOR_SWIZZLE2_GR,
+	SCE_GXM_COLOR_FORMAT_F32F32_RG = SCE_GXM_COLOR_BASE_FORMAT_F32F32 | SCE_GXM_COLOR_SWIZZLE2_RG,
+
+	SCE_GXM_COLOR_FORMAT_F10F11F11_BGR = SCE_GXM_COLOR_BASE_FORMAT_F11F11F10 | SCE_GXM_COLOR_SWIZZLE3_BGR,
+	SCE_GXM_COLOR_FORMAT_F11F11F10_RGB = SCE_GXM_COLOR_BASE_FORMAT_F11F11F10 | SCE_GXM_COLOR_SWIZZLE3_RGB,
+
+	SCE_GXM_COLOR_FORMAT_SE5M9M9M9_BGR = SCE_GXM_COLOR_BASE_FORMAT_SE5M9M9M9 | SCE_GXM_COLOR_SWIZZLE3_BGR,
+	SCE_GXM_COLOR_FORMAT_SE5M9M9M9_RGB = SCE_GXM_COLOR_BASE_FORMAT_SE5M9M9M9 | SCE_GXM_COLOR_SWIZZLE3_RGB,
+
+	SCE_GXM_COLOR_FORMAT_U2F10F10F10_ABGR = SCE_GXM_COLOR_BASE_FORMAT_U2F10F10F10 | SCE_GXM_COLOR_SWIZZLE4_ABGR,
+	SCE_GXM_COLOR_FORMAT_U2F10F10F10_ARGB = SCE_GXM_COLOR_BASE_FORMAT_U2F10F10F10 | SCE_GXM_COLOR_SWIZZLE4_ARGB,
+	SCE_GXM_COLOR_FORMAT_F10F10F10U2_RGBA = SCE_GXM_COLOR_BASE_FORMAT_U2F10F10F10 | SCE_GXM_COLOR_SWIZZLE4_RGBA,
+	SCE_GXM_COLOR_FORMAT_F10F10F10U2_BGRA = SCE_GXM_COLOR_BASE_FORMAT_U2F10F10F10 | SCE_GXM_COLOR_SWIZZLE4_BGRA,
+
+	// Legacy formats
+
+	SCE_GXM_COLOR_FORMAT_A8B8G8R8 = SCE_GXM_COLOR_FORMAT_U8U8U8U8_ABGR,
+	SCE_GXM_COLOR_FORMAT_A8R8G8B8 = SCE_GXM_COLOR_FORMAT_U8U8U8U8_ARGB,
+	SCE_GXM_COLOR_FORMAT_R5G6B5 = SCE_GXM_COLOR_FORMAT_U5U6U5_RGB,
+	SCE_GXM_COLOR_FORMAT_A1R5G5B5 = SCE_GXM_COLOR_FORMAT_U1U5U5U5_ARGB,
+	SCE_GXM_COLOR_FORMAT_A4R4G4B4 = SCE_GXM_COLOR_FORMAT_U4U4U4U4_ARGB,
+	SCE_GXM_COLOR_FORMAT_A8 = SCE_GXM_COLOR_FORMAT_U8_A
+};
+
+enum SceGxmColorSurfaceType : u32
+{
+	SCE_GXM_COLOR_SURFACE_LINEAR = 0x00000000u,
+	SCE_GXM_COLOR_SURFACE_TILED = 0x04000000u,
+	SCE_GXM_COLOR_SURFACE_SWIZZLED = 0x08000000u
+};
+
+enum SceGxmColorSurfaceGammaMode : u32
+{
+	SCE_GXM_COLOR_SURFACE_GAMMA_NONE = 0x00000000u,
+	SCE_GXM_COLOR_SURFACE_GAMMA_R = 0x00001000u,
+	SCE_GXM_COLOR_SURFACE_GAMMA_GR = 0x00003000u,
+	SCE_GXM_COLOR_SURFACE_GAMMA_BGR = 0x00001000u
+};
+
+enum SceGxmColorSurfaceDitherMode : u32
+{
+	SCE_GXM_COLOR_SURFACE_DITHER_DISABLED = 0x00000000u,
+	SCE_GXM_COLOR_SURFACE_DITHER_ENABLED = 0x00000008u
+};
+
+enum SceGxmDepthStencilSurfaceType : u32
+{
+	SCE_GXM_DEPTH_STENCIL_SURFACE_LINEAR = 0x00000000u,
+	SCE_GXM_DEPTH_STENCIL_SURFACE_TILED = 0x00011000u
+};
+
+enum SceGxmOutputRegisterFormat : s32
+{
+	SCE_GXM_OUTPUT_REGISTER_FORMAT_DECLARED,
+	SCE_GXM_OUTPUT_REGISTER_FORMAT_UCHAR4,
+	SCE_GXM_OUTPUT_REGISTER_FORMAT_CHAR4,
+	SCE_GXM_OUTPUT_REGISTER_FORMAT_USHORT2,
+	SCE_GXM_OUTPUT_REGISTER_FORMAT_SHORT2,
+	SCE_GXM_OUTPUT_REGISTER_FORMAT_HALF4,
+	SCE_GXM_OUTPUT_REGISTER_FORMAT_HALF2,
+	SCE_GXM_OUTPUT_REGISTER_FORMAT_FLOAT2,
+	SCE_GXM_OUTPUT_REGISTER_FORMAT_FLOAT
+};
+
+enum SceGxmMultisampleMode : u16
+{
+	SCE_GXM_MULTISAMPLE_NONE,
+	SCE_GXM_MULTISAMPLE_2X,
+	SCE_GXM_MULTISAMPLE_4X
+};
+
+enum SceGxmTextureSwizzle4Mode : u32
+{
+	SCE_GXM_TEXTURE_SWIZZLE4_ABGR = 0x00000000u,
+	SCE_GXM_TEXTURE_SWIZZLE4_ARGB = 0x00001000u,
+	SCE_GXM_TEXTURE_SWIZZLE4_RGBA = 0x00002000u,
+	SCE_GXM_TEXTURE_SWIZZLE4_BGRA = 0x00003000u,
+	SCE_GXM_TEXTURE_SWIZZLE4_1BGR = 0x00004000u,
+	SCE_GXM_TEXTURE_SWIZZLE4_1RGB = 0x00005000u,
+	SCE_GXM_TEXTURE_SWIZZLE4_RGB1 = 0x00006000u,
+	SCE_GXM_TEXTURE_SWIZZLE4_BGR1 = 0x00007000u
+};
+
+enum SceGxmTextureSwizzle3Mode : u32
+{
+	SCE_GXM_TEXTURE_SWIZZLE3_BGR = 0x00000000u,
+	SCE_GXM_TEXTURE_SWIZZLE3_RGB = 0x00001000u
+};
+
+enum SceGxmTextureSwizzle2Mode : u32
+{
+	SCE_GXM_TEXTURE_SWIZZLE2_GR = 0x00000000u,
+	SCE_GXM_TEXTURE_SWIZZLE2_00GR = 0x00001000u,
+	SCE_GXM_TEXTURE_SWIZZLE2_GRRR = 0x00002000u,
+	SCE_GXM_TEXTURE_SWIZZLE2_RGGG = 0x00003000u,
+	SCE_GXM_TEXTURE_SWIZZLE2_GRGR = 0x00004000u,
+	SCE_GXM_TEXTURE_SWIZZLE2_00RG = 0x00005000u
+};
+
+enum SceGxmTextureSwizzle2ModeAlt : u32
+{
+	SCE_GXM_TEXTURE_SWIZZLE2_SD = 0x00000000u,
+	SCE_GXM_TEXTURE_SWIZZLE2_DS = 0x00001000u
+};
+
+enum SceGxmTextureSwizzle1Mode : u32
+{
+	SCE_GXM_TEXTURE_SWIZZLE1_R = 0x00000000u,
+	SCE_GXM_TEXTURE_SWIZZLE1_000R = 0x00001000u,
+	SCE_GXM_TEXTURE_SWIZZLE1_111R = 0x00002000u,
+	SCE_GXM_TEXTURE_SWIZZLE1_RRRR = 0x00003000u,
+	SCE_GXM_TEXTURE_SWIZZLE1_0RRR = 0x00004000u,
+	SCE_GXM_TEXTURE_SWIZZLE1_1RRR = 0x00005000u,
+	SCE_GXM_TEXTURE_SWIZZLE1_R000 = 0x00006000u,
+	SCE_GXM_TEXTURE_SWIZZLE1_R111 = 0x00007000u
+};
+
+enum SceGxmTextureSwizzleYUV422Mode : u32
+{
+	SCE_GXM_TEXTURE_SWIZZLE_YUYV_CSC0 = 0x00000000u,
+	SCE_GXM_TEXTURE_SWIZZLE_YVYU_CSC0 = 0x00001000u,
+	SCE_GXM_TEXTURE_SWIZZLE_UYVY_CSC0 = 0x00002000u,
+	SCE_GXM_TEXTURE_SWIZZLE_VYUY_CSC0 = 0x00003000u,
+	SCE_GXM_TEXTURE_SWIZZLE_YUYV_CSC1 = 0x00004000u,
+	SCE_GXM_TEXTURE_SWIZZLE_YVYU_CSC1 = 0x00005000u,
+	SCE_GXM_TEXTURE_SWIZZLE_UYVY_CSC1 = 0x00006000u,
+	SCE_GXM_TEXTURE_SWIZZLE_VYUY_CSC1 = 0x00007000u
+};
+
+enum SceGxmTextureSwizzleYUV420Mode : u32
+{
+	SCE_GXM_TEXTURE_SWIZZLE_YUV_CSC0 = 0x00000000u,
+	SCE_GXM_TEXTURE_SWIZZLE_YVU_CSC0 = 0x00001000u,
+	SCE_GXM_TEXTURE_SWIZZLE_YUV_CSC1 = 0x00002000u,
+	SCE_GXM_TEXTURE_SWIZZLE_YVU_CSC1 = 0x00003000u
+};
+
+enum SceGxmTextureBaseFormat : u32
+{
+	SCE_GXM_TEXTURE_BASE_FORMAT_U8 = 0x00000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_S8 = 0x01000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U4U4U4U4 = 0x02000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U8U3U3U2 = 0x03000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U1U5U5U5 = 0x04000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U5U6U5 = 0x05000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_S5S5U6 = 0x06000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U8U8 = 0x07000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_S8S8 = 0x08000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U16 = 0x09000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_S16 = 0x0a000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_F16 = 0x0b000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8U8 = 0x0c000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8S8 = 0x0d000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U2U10U10U10 = 0x0e000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U16U16 = 0x0f000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_S16S16 = 0x10000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_F16F16 = 0x11000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_F32 = 0x12000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_F32M = 0x13000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_X8S8S8U8 = 0x14000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_X8U24 = 0x15000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U32 = 0x17000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_S32 = 0x18000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_SE5M9M9M9 = 0x19000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_F11F11F10 = 0x1a000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_F16F16F16F16 = 0x1b000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U16U16U16U16 = 0x1c000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_S16S16S16S16 = 0x1d000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_F32F32 = 0x1e000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U32U32 = 0x1f000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_PVRT2BPP = 0x80000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_PVRT4BPP = 0x81000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_PVRTII2BPP = 0x82000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_PVRTII4BPP = 0x83000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_UBC1 = 0x85000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_UBC2 = 0x86000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_UBC3 = 0x87000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_YUV420P2 = 0x90000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_YUV420P3 = 0x91000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_YUV422 = 0x92000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_P4 = 0x94000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_P8 = 0x95000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8 = 0x98000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8 = 0x99000000u,
+	SCE_GXM_TEXTURE_BASE_FORMAT_U2F10F10F10 = 0x9a000000u
+};
+
+enum SceGxmTextureFormat : u32
+{
+	// Supported formats
+
+	SCE_GXM_TEXTURE_FORMAT_U8_000R = SCE_GXM_TEXTURE_BASE_FORMAT_U8 | SCE_GXM_TEXTURE_SWIZZLE1_000R,
+	SCE_GXM_TEXTURE_FORMAT_U8_111R = SCE_GXM_TEXTURE_BASE_FORMAT_U8 | SCE_GXM_TEXTURE_SWIZZLE1_111R,
+	SCE_GXM_TEXTURE_FORMAT_U8_RRRR = SCE_GXM_TEXTURE_BASE_FORMAT_U8 | SCE_GXM_TEXTURE_SWIZZLE1_RRRR,
+	SCE_GXM_TEXTURE_FORMAT_U8_0RRR = SCE_GXM_TEXTURE_BASE_FORMAT_U8 | SCE_GXM_TEXTURE_SWIZZLE1_0RRR,
+	SCE_GXM_TEXTURE_FORMAT_U8_1RRR = SCE_GXM_TEXTURE_BASE_FORMAT_U8 | SCE_GXM_TEXTURE_SWIZZLE1_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_U8_R000 = SCE_GXM_TEXTURE_BASE_FORMAT_U8 | SCE_GXM_TEXTURE_SWIZZLE1_R000,
+	SCE_GXM_TEXTURE_FORMAT_U8_R111 = SCE_GXM_TEXTURE_BASE_FORMAT_U8 | SCE_GXM_TEXTURE_SWIZZLE1_R111,
+	SCE_GXM_TEXTURE_FORMAT_U8_R = SCE_GXM_TEXTURE_BASE_FORMAT_U8 | SCE_GXM_TEXTURE_SWIZZLE1_R,
+
+	SCE_GXM_TEXTURE_FORMAT_S8_000R = SCE_GXM_TEXTURE_BASE_FORMAT_S8 | SCE_GXM_TEXTURE_SWIZZLE1_000R,
+	SCE_GXM_TEXTURE_FORMAT_S8_111R = SCE_GXM_TEXTURE_BASE_FORMAT_S8 | SCE_GXM_TEXTURE_SWIZZLE1_111R,
+	SCE_GXM_TEXTURE_FORMAT_S8_RRRR = SCE_GXM_TEXTURE_BASE_FORMAT_S8 | SCE_GXM_TEXTURE_SWIZZLE1_RRRR,
+	SCE_GXM_TEXTURE_FORMAT_S8_0RRR = SCE_GXM_TEXTURE_BASE_FORMAT_S8 | SCE_GXM_TEXTURE_SWIZZLE1_0RRR,
+	SCE_GXM_TEXTURE_FORMAT_S8_1RRR = SCE_GXM_TEXTURE_BASE_FORMAT_S8 | SCE_GXM_TEXTURE_SWIZZLE1_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_S8_R000 = SCE_GXM_TEXTURE_BASE_FORMAT_S8 | SCE_GXM_TEXTURE_SWIZZLE1_R000,
+	SCE_GXM_TEXTURE_FORMAT_S8_R111 = SCE_GXM_TEXTURE_BASE_FORMAT_S8 | SCE_GXM_TEXTURE_SWIZZLE1_R111,
+	SCE_GXM_TEXTURE_FORMAT_S8_R = SCE_GXM_TEXTURE_BASE_FORMAT_S8 | SCE_GXM_TEXTURE_SWIZZLE1_R,
+
+	SCE_GXM_TEXTURE_FORMAT_U4U4U4U4_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_U4U4U4U4 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_U4U4U4U4_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_U4U4U4U4 | SCE_GXM_TEXTURE_SWIZZLE4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_U4U4U4U4_RGBA = SCE_GXM_TEXTURE_BASE_FORMAT_U4U4U4U4 | SCE_GXM_TEXTURE_SWIZZLE4_RGBA,
+	SCE_GXM_TEXTURE_FORMAT_U4U4U4U4_BGRA = SCE_GXM_TEXTURE_BASE_FORMAT_U4U4U4U4 | SCE_GXM_TEXTURE_SWIZZLE4_BGRA,
+	SCE_GXM_TEXTURE_FORMAT_X4U4U4U4_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_U4U4U4U4 | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+	SCE_GXM_TEXTURE_FORMAT_X4U4U4U4_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_U4U4U4U4 | SCE_GXM_TEXTURE_SWIZZLE4_1RGB,
+	SCE_GXM_TEXTURE_FORMAT_U4U4U4X4_RGB1 = SCE_GXM_TEXTURE_BASE_FORMAT_U4U4U4U4 | SCE_GXM_TEXTURE_SWIZZLE4_RGB1,
+	SCE_GXM_TEXTURE_FORMAT_U4U4U4X4_BGR1 = SCE_GXM_TEXTURE_BASE_FORMAT_U4U4U4U4 | SCE_GXM_TEXTURE_SWIZZLE4_BGR1,
+
+	SCE_GXM_TEXTURE_FORMAT_U8U3U3U2_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_U8U3U3U2,
+
+	SCE_GXM_TEXTURE_FORMAT_U1U5U5U5_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_U1U5U5U5 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_U1U5U5U5_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_U1U5U5U5 | SCE_GXM_TEXTURE_SWIZZLE4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_U5U5U5U1_RGBA = SCE_GXM_TEXTURE_BASE_FORMAT_U1U5U5U5 | SCE_GXM_TEXTURE_SWIZZLE4_RGBA,
+	SCE_GXM_TEXTURE_FORMAT_U5U5U5U1_BGRA = SCE_GXM_TEXTURE_BASE_FORMAT_U1U5U5U5 | SCE_GXM_TEXTURE_SWIZZLE4_BGRA,
+	SCE_GXM_TEXTURE_FORMAT_X1U5U5U5_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_U1U5U5U5 | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+	SCE_GXM_TEXTURE_FORMAT_X1U5U5U5_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_U1U5U5U5 | SCE_GXM_TEXTURE_SWIZZLE4_1RGB,
+	SCE_GXM_TEXTURE_FORMAT_U5U5U5X1_RGB1 = SCE_GXM_TEXTURE_BASE_FORMAT_U1U5U5U5 | SCE_GXM_TEXTURE_SWIZZLE4_RGB1,
+	SCE_GXM_TEXTURE_FORMAT_U5U5U5X1_BGR1 = SCE_GXM_TEXTURE_BASE_FORMAT_U1U5U5U5 | SCE_GXM_TEXTURE_SWIZZLE4_BGR1,
+
+	SCE_GXM_TEXTURE_FORMAT_U5U6U5_BGR = SCE_GXM_TEXTURE_BASE_FORMAT_U5U6U5 | SCE_GXM_TEXTURE_SWIZZLE3_BGR,
+	SCE_GXM_TEXTURE_FORMAT_U5U6U5_RGB = SCE_GXM_TEXTURE_BASE_FORMAT_U5U6U5 | SCE_GXM_TEXTURE_SWIZZLE3_RGB,
+
+	SCE_GXM_TEXTURE_FORMAT_U6S5S5_BGR = SCE_GXM_TEXTURE_BASE_FORMAT_S5S5U6 | SCE_GXM_TEXTURE_SWIZZLE3_BGR,
+	SCE_GXM_TEXTURE_FORMAT_S5S5U6_RGB = SCE_GXM_TEXTURE_BASE_FORMAT_S5S5U6 | SCE_GXM_TEXTURE_SWIZZLE3_RGB,
+
+	SCE_GXM_TEXTURE_FORMAT_U8U8_00GR = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8 | SCE_GXM_TEXTURE_SWIZZLE2_00GR,
+	SCE_GXM_TEXTURE_FORMAT_U8U8_GRRR = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8 | SCE_GXM_TEXTURE_SWIZZLE2_GRRR,
+	SCE_GXM_TEXTURE_FORMAT_U8U8_RGGG = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8 | SCE_GXM_TEXTURE_SWIZZLE2_RGGG,
+	SCE_GXM_TEXTURE_FORMAT_U8U8_GRGR = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8 | SCE_GXM_TEXTURE_SWIZZLE2_GRGR,
+	SCE_GXM_TEXTURE_FORMAT_U8U8_00RG = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8 | SCE_GXM_TEXTURE_SWIZZLE2_00RG,
+	SCE_GXM_TEXTURE_FORMAT_U8U8_GR = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8 | SCE_GXM_TEXTURE_SWIZZLE2_GR,
+
+	SCE_GXM_TEXTURE_FORMAT_S8S8_00GR = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8 | SCE_GXM_TEXTURE_SWIZZLE2_00GR,
+	SCE_GXM_TEXTURE_FORMAT_S8S8_GRRR = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8 | SCE_GXM_TEXTURE_SWIZZLE2_GRRR,
+	SCE_GXM_TEXTURE_FORMAT_S8S8_RGGG = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8 | SCE_GXM_TEXTURE_SWIZZLE2_RGGG,
+	SCE_GXM_TEXTURE_FORMAT_S8S8_GRGR = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8 | SCE_GXM_TEXTURE_SWIZZLE2_GRGR,
+	SCE_GXM_TEXTURE_FORMAT_S8S8_00RG = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8 | SCE_GXM_TEXTURE_SWIZZLE2_00RG,
+	SCE_GXM_TEXTURE_FORMAT_S8S8_GR = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8 | SCE_GXM_TEXTURE_SWIZZLE2_GR,
+
+	SCE_GXM_TEXTURE_FORMAT_U16_000R = SCE_GXM_TEXTURE_BASE_FORMAT_U16 | SCE_GXM_TEXTURE_SWIZZLE1_000R,
+	SCE_GXM_TEXTURE_FORMAT_U16_111R = SCE_GXM_TEXTURE_BASE_FORMAT_U16 | SCE_GXM_TEXTURE_SWIZZLE1_111R,
+	SCE_GXM_TEXTURE_FORMAT_U16_RRRR = SCE_GXM_TEXTURE_BASE_FORMAT_U16 | SCE_GXM_TEXTURE_SWIZZLE1_RRRR,
+	SCE_GXM_TEXTURE_FORMAT_U16_0RRR = SCE_GXM_TEXTURE_BASE_FORMAT_U16 | SCE_GXM_TEXTURE_SWIZZLE1_0RRR,
+	SCE_GXM_TEXTURE_FORMAT_U16_1RRR = SCE_GXM_TEXTURE_BASE_FORMAT_U16 | SCE_GXM_TEXTURE_SWIZZLE1_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_U16_R000 = SCE_GXM_TEXTURE_BASE_FORMAT_U16 | SCE_GXM_TEXTURE_SWIZZLE1_R000,
+	SCE_GXM_TEXTURE_FORMAT_U16_R111 = SCE_GXM_TEXTURE_BASE_FORMAT_U16 | SCE_GXM_TEXTURE_SWIZZLE1_R111,
+	SCE_GXM_TEXTURE_FORMAT_U16_R = SCE_GXM_TEXTURE_BASE_FORMAT_U16 | SCE_GXM_TEXTURE_SWIZZLE1_R,
+
+	SCE_GXM_TEXTURE_FORMAT_S16_000R = SCE_GXM_TEXTURE_BASE_FORMAT_S16 | SCE_GXM_TEXTURE_SWIZZLE1_000R,
+	SCE_GXM_TEXTURE_FORMAT_S16_111R = SCE_GXM_TEXTURE_BASE_FORMAT_S16 | SCE_GXM_TEXTURE_SWIZZLE1_111R,
+	SCE_GXM_TEXTURE_FORMAT_S16_RRRR = SCE_GXM_TEXTURE_BASE_FORMAT_S16 | SCE_GXM_TEXTURE_SWIZZLE1_RRRR,
+	SCE_GXM_TEXTURE_FORMAT_S16_0RRR = SCE_GXM_TEXTURE_BASE_FORMAT_S16 | SCE_GXM_TEXTURE_SWIZZLE1_0RRR,
+	SCE_GXM_TEXTURE_FORMAT_S16_1RRR = SCE_GXM_TEXTURE_BASE_FORMAT_S16 | SCE_GXM_TEXTURE_SWIZZLE1_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_S16_R000 = SCE_GXM_TEXTURE_BASE_FORMAT_S16 | SCE_GXM_TEXTURE_SWIZZLE1_R000,
+	SCE_GXM_TEXTURE_FORMAT_S16_R111 = SCE_GXM_TEXTURE_BASE_FORMAT_S16 | SCE_GXM_TEXTURE_SWIZZLE1_R111,
+	SCE_GXM_TEXTURE_FORMAT_S16_R = SCE_GXM_TEXTURE_BASE_FORMAT_S16 | SCE_GXM_TEXTURE_SWIZZLE1_R,
+
+	SCE_GXM_TEXTURE_FORMAT_F16_000R = SCE_GXM_TEXTURE_BASE_FORMAT_F16 | SCE_GXM_TEXTURE_SWIZZLE1_000R,
+	SCE_GXM_TEXTURE_FORMAT_F16_111R = SCE_GXM_TEXTURE_BASE_FORMAT_F16 | SCE_GXM_TEXTURE_SWIZZLE1_111R,
+	SCE_GXM_TEXTURE_FORMAT_F16_RRRR = SCE_GXM_TEXTURE_BASE_FORMAT_F16 | SCE_GXM_TEXTURE_SWIZZLE1_RRRR,
+	SCE_GXM_TEXTURE_FORMAT_F16_0RRR = SCE_GXM_TEXTURE_BASE_FORMAT_F16 | SCE_GXM_TEXTURE_SWIZZLE1_0RRR,
+	SCE_GXM_TEXTURE_FORMAT_F16_1RRR = SCE_GXM_TEXTURE_BASE_FORMAT_F16 | SCE_GXM_TEXTURE_SWIZZLE1_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_F16_R000 = SCE_GXM_TEXTURE_BASE_FORMAT_F16 | SCE_GXM_TEXTURE_SWIZZLE1_R000,
+	SCE_GXM_TEXTURE_FORMAT_F16_R111 = SCE_GXM_TEXTURE_BASE_FORMAT_F16 | SCE_GXM_TEXTURE_SWIZZLE1_R111,
+	SCE_GXM_TEXTURE_FORMAT_F16_R = SCE_GXM_TEXTURE_BASE_FORMAT_F16 | SCE_GXM_TEXTURE_SWIZZLE1_R,
+
+	SCE_GXM_TEXTURE_FORMAT_U8U8U8U8_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8U8 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_U8U8U8U8_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8U8 | SCE_GXM_TEXTURE_SWIZZLE4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_U8U8U8U8_RGBA = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8U8 | SCE_GXM_TEXTURE_SWIZZLE4_RGBA,
+	SCE_GXM_TEXTURE_FORMAT_U8U8U8U8_BGRA = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8U8 | SCE_GXM_TEXTURE_SWIZZLE4_BGRA,
+	SCE_GXM_TEXTURE_FORMAT_X8U8U8U8_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8U8 | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+	SCE_GXM_TEXTURE_FORMAT_X8U8U8U8_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8U8 | SCE_GXM_TEXTURE_SWIZZLE4_1RGB,
+	SCE_GXM_TEXTURE_FORMAT_U8U8U8X8_RGB1 = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8U8 | SCE_GXM_TEXTURE_SWIZZLE4_RGB1,
+	SCE_GXM_TEXTURE_FORMAT_U8U8U8X8_BGR1 = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8U8 | SCE_GXM_TEXTURE_SWIZZLE4_BGR1,
+
+	SCE_GXM_TEXTURE_FORMAT_S8S8S8S8_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8S8 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_S8S8S8S8_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8S8 | SCE_GXM_TEXTURE_SWIZZLE4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_S8S8S8S8_RGBA = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8S8 | SCE_GXM_TEXTURE_SWIZZLE4_RGBA,
+	SCE_GXM_TEXTURE_FORMAT_S8S8S8S8_BGRA = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8S8 | SCE_GXM_TEXTURE_SWIZZLE4_BGRA,
+	SCE_GXM_TEXTURE_FORMAT_X8S8S8S8_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8S8 | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+	SCE_GXM_TEXTURE_FORMAT_X8S8S8S8_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8S8 | SCE_GXM_TEXTURE_SWIZZLE4_1RGB,
+	SCE_GXM_TEXTURE_FORMAT_S8S8S8X8_RGB1 = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8S8 | SCE_GXM_TEXTURE_SWIZZLE4_RGB1,
+	SCE_GXM_TEXTURE_FORMAT_S8S8S8X8_BGR1 = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8S8 | SCE_GXM_TEXTURE_SWIZZLE4_BGR1,
+
+	SCE_GXM_TEXTURE_FORMAT_U2U10U10U10_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_U2U10U10U10 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_U2U10U10U10_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_U2U10U10U10 | SCE_GXM_TEXTURE_SWIZZLE4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_U10U10U10U2_RGBA = SCE_GXM_TEXTURE_BASE_FORMAT_U2U10U10U10 | SCE_GXM_TEXTURE_SWIZZLE4_RGBA,
+	SCE_GXM_TEXTURE_FORMAT_U10U10U10U2_BGRA = SCE_GXM_TEXTURE_BASE_FORMAT_U2U10U10U10 | SCE_GXM_TEXTURE_SWIZZLE4_BGRA,
+	SCE_GXM_TEXTURE_FORMAT_X2U10U10U10_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_U2U10U10U10 | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+	SCE_GXM_TEXTURE_FORMAT_X2U10U10U10_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_U2U10U10U10 | SCE_GXM_TEXTURE_SWIZZLE4_1RGB,
+	SCE_GXM_TEXTURE_FORMAT_U10U10U10X2_RGB1 = SCE_GXM_TEXTURE_BASE_FORMAT_U2U10U10U10 | SCE_GXM_TEXTURE_SWIZZLE4_RGB1,
+	SCE_GXM_TEXTURE_FORMAT_U10U10U10X2_BGR1 = SCE_GXM_TEXTURE_BASE_FORMAT_U2U10U10U10 | SCE_GXM_TEXTURE_SWIZZLE4_BGR1,
+
+	SCE_GXM_TEXTURE_FORMAT_U16U16_00GR = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16 | SCE_GXM_TEXTURE_SWIZZLE2_00GR,
+	SCE_GXM_TEXTURE_FORMAT_U16U16_GRRR = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16 | SCE_GXM_TEXTURE_SWIZZLE2_GRRR,
+	SCE_GXM_TEXTURE_FORMAT_U16U16_RGGG = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16 | SCE_GXM_TEXTURE_SWIZZLE2_RGGG,
+	SCE_GXM_TEXTURE_FORMAT_U16U16_GRGR = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16 | SCE_GXM_TEXTURE_SWIZZLE2_GRGR,
+	SCE_GXM_TEXTURE_FORMAT_U16U16_00RG = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16 | SCE_GXM_TEXTURE_SWIZZLE2_00RG,
+	SCE_GXM_TEXTURE_FORMAT_U16U16_GR = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16 | SCE_GXM_TEXTURE_SWIZZLE2_GR,
+
+	SCE_GXM_TEXTURE_FORMAT_S16S16_00GR = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16 | SCE_GXM_TEXTURE_SWIZZLE2_00GR,
+	SCE_GXM_TEXTURE_FORMAT_S16S16_GRRR = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16 | SCE_GXM_TEXTURE_SWIZZLE2_GRRR,
+	SCE_GXM_TEXTURE_FORMAT_S16S16_RGGG = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16 | SCE_GXM_TEXTURE_SWIZZLE2_RGGG,
+	SCE_GXM_TEXTURE_FORMAT_S16S16_GRGR = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16 | SCE_GXM_TEXTURE_SWIZZLE2_GRGR,
+	SCE_GXM_TEXTURE_FORMAT_S16S16_00RG = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16 | SCE_GXM_TEXTURE_SWIZZLE2_00RG,
+	SCE_GXM_TEXTURE_FORMAT_S16S16_GR = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16 | SCE_GXM_TEXTURE_SWIZZLE2_GR,
+
+	SCE_GXM_TEXTURE_FORMAT_F16F16_00GR = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16 | SCE_GXM_TEXTURE_SWIZZLE2_00GR,
+	SCE_GXM_TEXTURE_FORMAT_F16F16_GRRR = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16 | SCE_GXM_TEXTURE_SWIZZLE2_GRRR,
+	SCE_GXM_TEXTURE_FORMAT_F16F16_RGGG = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16 | SCE_GXM_TEXTURE_SWIZZLE2_RGGG,
+	SCE_GXM_TEXTURE_FORMAT_F16F16_GRGR = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16 | SCE_GXM_TEXTURE_SWIZZLE2_GRGR,
+	SCE_GXM_TEXTURE_FORMAT_F16F16_00RG = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16 | SCE_GXM_TEXTURE_SWIZZLE2_00RG,
+	SCE_GXM_TEXTURE_FORMAT_F16F16_GR = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16 | SCE_GXM_TEXTURE_SWIZZLE2_GR,
+
+	SCE_GXM_TEXTURE_FORMAT_F32_000R = SCE_GXM_TEXTURE_BASE_FORMAT_F32 | SCE_GXM_TEXTURE_SWIZZLE1_000R,
+	SCE_GXM_TEXTURE_FORMAT_F32_111R = SCE_GXM_TEXTURE_BASE_FORMAT_F32 | SCE_GXM_TEXTURE_SWIZZLE1_111R,
+	SCE_GXM_TEXTURE_FORMAT_F32_RRRR = SCE_GXM_TEXTURE_BASE_FORMAT_F32 | SCE_GXM_TEXTURE_SWIZZLE1_RRRR,
+	SCE_GXM_TEXTURE_FORMAT_F32_0RRR = SCE_GXM_TEXTURE_BASE_FORMAT_F32 | SCE_GXM_TEXTURE_SWIZZLE1_0RRR,
+	SCE_GXM_TEXTURE_FORMAT_F32_1RRR = SCE_GXM_TEXTURE_BASE_FORMAT_F32 | SCE_GXM_TEXTURE_SWIZZLE1_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_F32_R000 = SCE_GXM_TEXTURE_BASE_FORMAT_F32 | SCE_GXM_TEXTURE_SWIZZLE1_R000,
+	SCE_GXM_TEXTURE_FORMAT_F32_R111 = SCE_GXM_TEXTURE_BASE_FORMAT_F32 | SCE_GXM_TEXTURE_SWIZZLE1_R111,
+	SCE_GXM_TEXTURE_FORMAT_F32_R = SCE_GXM_TEXTURE_BASE_FORMAT_F32 | SCE_GXM_TEXTURE_SWIZZLE1_R,
+
+	SCE_GXM_TEXTURE_FORMAT_F32M_000R = SCE_GXM_TEXTURE_BASE_FORMAT_F32M | SCE_GXM_TEXTURE_SWIZZLE1_000R,
+	SCE_GXM_TEXTURE_FORMAT_F32M_111R = SCE_GXM_TEXTURE_BASE_FORMAT_F32M | SCE_GXM_TEXTURE_SWIZZLE1_111R,
+	SCE_GXM_TEXTURE_FORMAT_F32M_RRRR = SCE_GXM_TEXTURE_BASE_FORMAT_F32M | SCE_GXM_TEXTURE_SWIZZLE1_RRRR,
+	SCE_GXM_TEXTURE_FORMAT_F32M_0RRR = SCE_GXM_TEXTURE_BASE_FORMAT_F32M | SCE_GXM_TEXTURE_SWIZZLE1_0RRR,
+	SCE_GXM_TEXTURE_FORMAT_F32M_1RRR = SCE_GXM_TEXTURE_BASE_FORMAT_F32M | SCE_GXM_TEXTURE_SWIZZLE1_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_F32M_R000 = SCE_GXM_TEXTURE_BASE_FORMAT_F32M | SCE_GXM_TEXTURE_SWIZZLE1_R000,
+	SCE_GXM_TEXTURE_FORMAT_F32M_R111 = SCE_GXM_TEXTURE_BASE_FORMAT_F32M | SCE_GXM_TEXTURE_SWIZZLE1_R111,
+	SCE_GXM_TEXTURE_FORMAT_F32M_R = SCE_GXM_TEXTURE_BASE_FORMAT_F32M | SCE_GXM_TEXTURE_SWIZZLE1_R,
+
+	SCE_GXM_TEXTURE_FORMAT_X8S8S8U8_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_X8S8S8U8 | SCE_GXM_TEXTURE_SWIZZLE3_BGR,
+	SCE_GXM_TEXTURE_FORMAT_X8U8S8S8_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_X8S8S8U8 | SCE_GXM_TEXTURE_SWIZZLE3_RGB,
+
+	SCE_GXM_TEXTURE_FORMAT_X8U24_SD = SCE_GXM_TEXTURE_BASE_FORMAT_X8U24 | SCE_GXM_TEXTURE_SWIZZLE2_SD,
+	SCE_GXM_TEXTURE_FORMAT_U24X8_DS = SCE_GXM_TEXTURE_BASE_FORMAT_X8U24 | SCE_GXM_TEXTURE_SWIZZLE2_DS,
+
+	SCE_GXM_TEXTURE_FORMAT_U32_000R = SCE_GXM_TEXTURE_BASE_FORMAT_U32 | SCE_GXM_TEXTURE_SWIZZLE1_000R,
+	SCE_GXM_TEXTURE_FORMAT_U32_111R = SCE_GXM_TEXTURE_BASE_FORMAT_U32 | SCE_GXM_TEXTURE_SWIZZLE1_111R,
+	SCE_GXM_TEXTURE_FORMAT_U32_RRRR = SCE_GXM_TEXTURE_BASE_FORMAT_U32 | SCE_GXM_TEXTURE_SWIZZLE1_RRRR,
+	SCE_GXM_TEXTURE_FORMAT_U32_0RRR = SCE_GXM_TEXTURE_BASE_FORMAT_U32 | SCE_GXM_TEXTURE_SWIZZLE1_0RRR,
+	SCE_GXM_TEXTURE_FORMAT_U32_1RRR = SCE_GXM_TEXTURE_BASE_FORMAT_U32 | SCE_GXM_TEXTURE_SWIZZLE1_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_U32_R000 = SCE_GXM_TEXTURE_BASE_FORMAT_U32 | SCE_GXM_TEXTURE_SWIZZLE1_R000,
+	SCE_GXM_TEXTURE_FORMAT_U32_R111 = SCE_GXM_TEXTURE_BASE_FORMAT_U32 | SCE_GXM_TEXTURE_SWIZZLE1_R111,
+	SCE_GXM_TEXTURE_FORMAT_U32_R = SCE_GXM_TEXTURE_BASE_FORMAT_U32 | SCE_GXM_TEXTURE_SWIZZLE1_R,
+
+	SCE_GXM_TEXTURE_FORMAT_S32_000R = SCE_GXM_TEXTURE_BASE_FORMAT_S32 | SCE_GXM_TEXTURE_SWIZZLE1_000R,
+	SCE_GXM_TEXTURE_FORMAT_S32_111R = SCE_GXM_TEXTURE_BASE_FORMAT_S32 | SCE_GXM_TEXTURE_SWIZZLE1_111R,
+	SCE_GXM_TEXTURE_FORMAT_S32_RRRR = SCE_GXM_TEXTURE_BASE_FORMAT_S32 | SCE_GXM_TEXTURE_SWIZZLE1_RRRR,
+	SCE_GXM_TEXTURE_FORMAT_S32_0RRR = SCE_GXM_TEXTURE_BASE_FORMAT_S32 | SCE_GXM_TEXTURE_SWIZZLE1_0RRR,
+	SCE_GXM_TEXTURE_FORMAT_S32_1RRR = SCE_GXM_TEXTURE_BASE_FORMAT_S32 | SCE_GXM_TEXTURE_SWIZZLE1_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_S32_R000 = SCE_GXM_TEXTURE_BASE_FORMAT_S32 | SCE_GXM_TEXTURE_SWIZZLE1_R000,
+	SCE_GXM_TEXTURE_FORMAT_S32_R111 = SCE_GXM_TEXTURE_BASE_FORMAT_S32 | SCE_GXM_TEXTURE_SWIZZLE1_R111,
+	SCE_GXM_TEXTURE_FORMAT_S32_R = SCE_GXM_TEXTURE_BASE_FORMAT_S32 | SCE_GXM_TEXTURE_SWIZZLE1_R,
+
+	SCE_GXM_TEXTURE_FORMAT_SE5M9M9M9_BGR = SCE_GXM_TEXTURE_BASE_FORMAT_SE5M9M9M9 | SCE_GXM_TEXTURE_SWIZZLE3_BGR,
+	SCE_GXM_TEXTURE_FORMAT_SE5M9M9M9_RGB = SCE_GXM_TEXTURE_BASE_FORMAT_SE5M9M9M9 | SCE_GXM_TEXTURE_SWIZZLE3_RGB,
+
+	SCE_GXM_TEXTURE_FORMAT_F10F11F11_BGR = SCE_GXM_TEXTURE_BASE_FORMAT_F11F11F10 | SCE_GXM_TEXTURE_SWIZZLE3_BGR,
+	SCE_GXM_TEXTURE_FORMAT_F11F11F10_RGB = SCE_GXM_TEXTURE_BASE_FORMAT_F11F11F10 | SCE_GXM_TEXTURE_SWIZZLE3_RGB,
+
+	SCE_GXM_TEXTURE_FORMAT_F16F16F16F16_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16F16F16 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_F16F16F16F16_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16F16F16 | SCE_GXM_TEXTURE_SWIZZLE4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_F16F16F16F16_RGBA = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16F16F16 | SCE_GXM_TEXTURE_SWIZZLE4_RGBA,
+	SCE_GXM_TEXTURE_FORMAT_F16F16F16F16_BGRA = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16F16F16 | SCE_GXM_TEXTURE_SWIZZLE4_BGRA,
+	SCE_GXM_TEXTURE_FORMAT_X16F16F16F16_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16F16F16 | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+	SCE_GXM_TEXTURE_FORMAT_X16F16F16F16_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16F16F16 | SCE_GXM_TEXTURE_SWIZZLE4_1RGB,
+	SCE_GXM_TEXTURE_FORMAT_F16F16F16X16_RGB1 = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16F16F16 | SCE_GXM_TEXTURE_SWIZZLE4_RGB1,
+	SCE_GXM_TEXTURE_FORMAT_F16F16F16X16_BGR1 = SCE_GXM_TEXTURE_BASE_FORMAT_F16F16F16F16 | SCE_GXM_TEXTURE_SWIZZLE4_BGR1,
+
+	SCE_GXM_TEXTURE_FORMAT_U16U16U16U16_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16U16U16 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_U16U16U16U16_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16U16U16 | SCE_GXM_TEXTURE_SWIZZLE4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_U16U16U16U16_RGBA = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16U16U16 | SCE_GXM_TEXTURE_SWIZZLE4_RGBA,
+	SCE_GXM_TEXTURE_FORMAT_U16U16U16U16_BGRA = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16U16U16 | SCE_GXM_TEXTURE_SWIZZLE4_BGRA,
+	SCE_GXM_TEXTURE_FORMAT_X16U16U16U16_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16U16U16 | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+	SCE_GXM_TEXTURE_FORMAT_X16U16U16U16_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16U16U16 | SCE_GXM_TEXTURE_SWIZZLE4_1RGB,
+	SCE_GXM_TEXTURE_FORMAT_U16U16U16X16_RGB1 = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16U16U16 | SCE_GXM_TEXTURE_SWIZZLE4_RGB1,
+	SCE_GXM_TEXTURE_FORMAT_U16U16U16X16_BGR1 = SCE_GXM_TEXTURE_BASE_FORMAT_U16U16U16U16 | SCE_GXM_TEXTURE_SWIZZLE4_BGR1,
+
+	SCE_GXM_TEXTURE_FORMAT_S16S16S16S16_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16S16S16 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_S16S16S16S16_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16S16S16 | SCE_GXM_TEXTURE_SWIZZLE4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_S16S16S16S16_RGBA = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16S16S16 | SCE_GXM_TEXTURE_SWIZZLE4_RGBA,
+	SCE_GXM_TEXTURE_FORMAT_S16S16S16S16_BGRA = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16S16S16 | SCE_GXM_TEXTURE_SWIZZLE4_BGRA,
+	SCE_GXM_TEXTURE_FORMAT_X16S16S16S16_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16S16S16 | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+	SCE_GXM_TEXTURE_FORMAT_X16S16S16S16_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16S16S16 | SCE_GXM_TEXTURE_SWIZZLE4_1RGB,
+	SCE_GXM_TEXTURE_FORMAT_S16S16S16X16_RGB1 = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16S16S16 | SCE_GXM_TEXTURE_SWIZZLE4_RGB1,
+	SCE_GXM_TEXTURE_FORMAT_S16S16S16X16_BGR1 = SCE_GXM_TEXTURE_BASE_FORMAT_S16S16S16S16 | SCE_GXM_TEXTURE_SWIZZLE4_BGR1,
+
+	SCE_GXM_TEXTURE_FORMAT_F32F32_00GR = SCE_GXM_TEXTURE_BASE_FORMAT_F32F32 | SCE_GXM_TEXTURE_SWIZZLE2_00GR,
+	SCE_GXM_TEXTURE_FORMAT_F32F32_GRRR = SCE_GXM_TEXTURE_BASE_FORMAT_F32F32 | SCE_GXM_TEXTURE_SWIZZLE2_GRRR,
+	SCE_GXM_TEXTURE_FORMAT_F32F32_RGGG = SCE_GXM_TEXTURE_BASE_FORMAT_F32F32 | SCE_GXM_TEXTURE_SWIZZLE2_RGGG,
+	SCE_GXM_TEXTURE_FORMAT_F32F32_GRGR = SCE_GXM_TEXTURE_BASE_FORMAT_F32F32 | SCE_GXM_TEXTURE_SWIZZLE2_GRGR,
+	SCE_GXM_TEXTURE_FORMAT_F32F32_00RG = SCE_GXM_TEXTURE_BASE_FORMAT_F32F32 | SCE_GXM_TEXTURE_SWIZZLE2_00RG,
+	SCE_GXM_TEXTURE_FORMAT_F32F32_GR = SCE_GXM_TEXTURE_BASE_FORMAT_F32F32 | SCE_GXM_TEXTURE_SWIZZLE2_GR,
+
+	SCE_GXM_TEXTURE_FORMAT_U32U32_00GR = SCE_GXM_TEXTURE_BASE_FORMAT_U32U32 | SCE_GXM_TEXTURE_SWIZZLE2_00GR,
+	SCE_GXM_TEXTURE_FORMAT_U32U32_GRRR = SCE_GXM_TEXTURE_BASE_FORMAT_U32U32 | SCE_GXM_TEXTURE_SWIZZLE2_GRRR,
+	SCE_GXM_TEXTURE_FORMAT_U32U32_RGGG = SCE_GXM_TEXTURE_BASE_FORMAT_U32U32 | SCE_GXM_TEXTURE_SWIZZLE2_RGGG,
+	SCE_GXM_TEXTURE_FORMAT_U32U32_GRGR = SCE_GXM_TEXTURE_BASE_FORMAT_U32U32 | SCE_GXM_TEXTURE_SWIZZLE2_GRGR,
+	SCE_GXM_TEXTURE_FORMAT_U32U32_00RG = SCE_GXM_TEXTURE_BASE_FORMAT_U32U32 | SCE_GXM_TEXTURE_SWIZZLE2_00RG,
+	SCE_GXM_TEXTURE_FORMAT_U32U32_GR = SCE_GXM_TEXTURE_BASE_FORMAT_U32U32 | SCE_GXM_TEXTURE_SWIZZLE2_GR,
+
+	SCE_GXM_TEXTURE_FORMAT_PVRT2BPP_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_PVRT2BPP | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_PVRT2BPP_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_PVRT2BPP | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+
+	SCE_GXM_TEXTURE_FORMAT_PVRT4BPP_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_PVRT4BPP | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_PVRT4BPP_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_PVRT4BPP | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+
+	SCE_GXM_TEXTURE_FORMAT_PVRTII2BPP_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_PVRTII2BPP | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_PVRTII2BPP_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_PVRTII2BPP | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+
+	SCE_GXM_TEXTURE_FORMAT_PVRTII4BPP_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_PVRTII4BPP | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_PVRTII4BPP_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_PVRTII4BPP | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+
+	SCE_GXM_TEXTURE_FORMAT_UBC1_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_UBC1 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+
+	SCE_GXM_TEXTURE_FORMAT_UBC2_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_UBC2 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+
+	SCE_GXM_TEXTURE_FORMAT_UBC3_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_UBC3 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+
+	SCE_GXM_TEXTURE_FORMAT_YUV420P2_CSC0 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV420P2 | SCE_GXM_TEXTURE_SWIZZLE_YUV_CSC0,
+	SCE_GXM_TEXTURE_FORMAT_YVU420P2_CSC0 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV420P2 | SCE_GXM_TEXTURE_SWIZZLE_YVU_CSC0,
+	SCE_GXM_TEXTURE_FORMAT_YUV420P2_CSC1 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV420P2 | SCE_GXM_TEXTURE_SWIZZLE_YUV_CSC1,
+	SCE_GXM_TEXTURE_FORMAT_YVU420P2_CSC1 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV420P2 | SCE_GXM_TEXTURE_SWIZZLE_YVU_CSC1,
+
+	SCE_GXM_TEXTURE_FORMAT_YUV420P3_CSC0 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV420P3 | SCE_GXM_TEXTURE_SWIZZLE_YUV_CSC0,
+	SCE_GXM_TEXTURE_FORMAT_YVU420P3_CSC0 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV420P3 | SCE_GXM_TEXTURE_SWIZZLE_YVU_CSC0,
+	SCE_GXM_TEXTURE_FORMAT_YUV420P3_CSC1 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV420P3 | SCE_GXM_TEXTURE_SWIZZLE_YUV_CSC1,
+	SCE_GXM_TEXTURE_FORMAT_YVU420P3_CSC1 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV420P3 | SCE_GXM_TEXTURE_SWIZZLE_YVU_CSC1,
+
+	SCE_GXM_TEXTURE_FORMAT_YUYV422_CSC0 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV422 | SCE_GXM_TEXTURE_SWIZZLE_YUYV_CSC0,
+	SCE_GXM_TEXTURE_FORMAT_YVYU422_CSC0 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV422 | SCE_GXM_TEXTURE_SWIZZLE_YVYU_CSC0,
+	SCE_GXM_TEXTURE_FORMAT_UYVY422_CSC0 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV422 | SCE_GXM_TEXTURE_SWIZZLE_UYVY_CSC0,
+	SCE_GXM_TEXTURE_FORMAT_VYUY422_CSC0 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV422 | SCE_GXM_TEXTURE_SWIZZLE_VYUY_CSC0,
+	SCE_GXM_TEXTURE_FORMAT_YUYV422_CSC1 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV422 | SCE_GXM_TEXTURE_SWIZZLE_YUYV_CSC1,
+	SCE_GXM_TEXTURE_FORMAT_YVYU422_CSC1 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV422 | SCE_GXM_TEXTURE_SWIZZLE_YVYU_CSC1,
+	SCE_GXM_TEXTURE_FORMAT_UYVY422_CSC1 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV422 | SCE_GXM_TEXTURE_SWIZZLE_UYVY_CSC1,
+	SCE_GXM_TEXTURE_FORMAT_VYUY422_CSC1 = SCE_GXM_TEXTURE_BASE_FORMAT_YUV422 | SCE_GXM_TEXTURE_SWIZZLE_VYUY_CSC1,
+
+	SCE_GXM_TEXTURE_FORMAT_P4_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_P4 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_P4_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_P4 | SCE_GXM_TEXTURE_SWIZZLE4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_P4_RGBA = SCE_GXM_TEXTURE_BASE_FORMAT_P4 | SCE_GXM_TEXTURE_SWIZZLE4_RGBA,
+	SCE_GXM_TEXTURE_FORMAT_P4_BGRA = SCE_GXM_TEXTURE_BASE_FORMAT_P4 | SCE_GXM_TEXTURE_SWIZZLE4_BGRA,
+	SCE_GXM_TEXTURE_FORMAT_P4_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_P4 | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+	SCE_GXM_TEXTURE_FORMAT_P4_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_P4 | SCE_GXM_TEXTURE_SWIZZLE4_1RGB,
+	SCE_GXM_TEXTURE_FORMAT_P4_RGB1 = SCE_GXM_TEXTURE_BASE_FORMAT_P4 | SCE_GXM_TEXTURE_SWIZZLE4_RGB1,
+	SCE_GXM_TEXTURE_FORMAT_P4_BGR1 = SCE_GXM_TEXTURE_BASE_FORMAT_P4 | SCE_GXM_TEXTURE_SWIZZLE4_BGR1,
+
+	SCE_GXM_TEXTURE_FORMAT_P8_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_P8 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_P8_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_P8 | SCE_GXM_TEXTURE_SWIZZLE4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_P8_RGBA = SCE_GXM_TEXTURE_BASE_FORMAT_P8 | SCE_GXM_TEXTURE_SWIZZLE4_RGBA,
+	SCE_GXM_TEXTURE_FORMAT_P8_BGRA = SCE_GXM_TEXTURE_BASE_FORMAT_P8 | SCE_GXM_TEXTURE_SWIZZLE4_BGRA,
+	SCE_GXM_TEXTURE_FORMAT_P8_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_P8 | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+	SCE_GXM_TEXTURE_FORMAT_P8_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_P8 | SCE_GXM_TEXTURE_SWIZZLE4_1RGB,
+	SCE_GXM_TEXTURE_FORMAT_P8_RGB1 = SCE_GXM_TEXTURE_BASE_FORMAT_P8 | SCE_GXM_TEXTURE_SWIZZLE4_RGB1,
+	SCE_GXM_TEXTURE_FORMAT_P8_BGR1 = SCE_GXM_TEXTURE_BASE_FORMAT_P8 | SCE_GXM_TEXTURE_SWIZZLE4_BGR1,
+
+	SCE_GXM_TEXTURE_FORMAT_U8U8U8_BGR = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8 | SCE_GXM_TEXTURE_SWIZZLE3_BGR,
+	SCE_GXM_TEXTURE_FORMAT_U8U8U8_RGB = SCE_GXM_TEXTURE_BASE_FORMAT_U8U8U8 | SCE_GXM_TEXTURE_SWIZZLE3_RGB,
+
+	SCE_GXM_TEXTURE_FORMAT_S8S8S8_BGR = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8 | SCE_GXM_TEXTURE_SWIZZLE3_BGR,
+	SCE_GXM_TEXTURE_FORMAT_S8S8S8_RGB = SCE_GXM_TEXTURE_BASE_FORMAT_S8S8S8 | SCE_GXM_TEXTURE_SWIZZLE3_RGB,
+
+	SCE_GXM_TEXTURE_FORMAT_U2F10F10F10_ABGR = SCE_GXM_TEXTURE_BASE_FORMAT_U2F10F10F10 | SCE_GXM_TEXTURE_SWIZZLE4_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_U2F10F10F10_ARGB = SCE_GXM_TEXTURE_BASE_FORMAT_U2F10F10F10 | SCE_GXM_TEXTURE_SWIZZLE4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_F10F10F10U2_RGBA = SCE_GXM_TEXTURE_BASE_FORMAT_U2F10F10F10 | SCE_GXM_TEXTURE_SWIZZLE4_RGBA,
+	SCE_GXM_TEXTURE_FORMAT_F10F10F10U2_BGRA = SCE_GXM_TEXTURE_BASE_FORMAT_U2F10F10F10 | SCE_GXM_TEXTURE_SWIZZLE4_BGRA,
+	SCE_GXM_TEXTURE_FORMAT_X2F10F10F10_1BGR = SCE_GXM_TEXTURE_BASE_FORMAT_U2F10F10F10 | SCE_GXM_TEXTURE_SWIZZLE4_1BGR,
+	SCE_GXM_TEXTURE_FORMAT_X2F10F10F10_1RGB = SCE_GXM_TEXTURE_BASE_FORMAT_U2F10F10F10 | SCE_GXM_TEXTURE_SWIZZLE4_1RGB,
+	SCE_GXM_TEXTURE_FORMAT_F10F10F10X2_RGB1 = SCE_GXM_TEXTURE_BASE_FORMAT_U2F10F10F10 | SCE_GXM_TEXTURE_SWIZZLE4_RGB1,
+	SCE_GXM_TEXTURE_FORMAT_F10F10F10X2_BGR1 = SCE_GXM_TEXTURE_BASE_FORMAT_U2F10F10F10 | SCE_GXM_TEXTURE_SWIZZLE4_BGR1,
+
+	// Legacy formats
+
+	SCE_GXM_TEXTURE_FORMAT_L8 = SCE_GXM_TEXTURE_FORMAT_U8_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_A8 = SCE_GXM_TEXTURE_FORMAT_U8_R000,
+	SCE_GXM_TEXTURE_FORMAT_R8 = SCE_GXM_TEXTURE_FORMAT_U8_000R,
+	SCE_GXM_TEXTURE_FORMAT_A4R4G4B4 = SCE_GXM_TEXTURE_FORMAT_U4U4U4U4_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_A1R5G5B5 = SCE_GXM_TEXTURE_FORMAT_U1U5U5U5_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_R5G6B5 = SCE_GXM_TEXTURE_FORMAT_U5U6U5_RGB,
+	SCE_GXM_TEXTURE_FORMAT_A8L8 = SCE_GXM_TEXTURE_FORMAT_U8U8_GRRR,
+	SCE_GXM_TEXTURE_FORMAT_L8A8 = SCE_GXM_TEXTURE_FORMAT_U8U8_RGGG,
+	SCE_GXM_TEXTURE_FORMAT_G8R8 = SCE_GXM_TEXTURE_FORMAT_U8U8_00GR,
+	SCE_GXM_TEXTURE_FORMAT_L16 = SCE_GXM_TEXTURE_FORMAT_U16_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_A16 = SCE_GXM_TEXTURE_FORMAT_U16_R000,
+	SCE_GXM_TEXTURE_FORMAT_R16 = SCE_GXM_TEXTURE_FORMAT_U16_000R,
+	SCE_GXM_TEXTURE_FORMAT_D16 = SCE_GXM_TEXTURE_FORMAT_U16_R,
+	SCE_GXM_TEXTURE_FORMAT_LF16 = SCE_GXM_TEXTURE_FORMAT_F16_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_AF16 = SCE_GXM_TEXTURE_FORMAT_F16_R000,
+	SCE_GXM_TEXTURE_FORMAT_RF16 = SCE_GXM_TEXTURE_FORMAT_F16_000R,
+	SCE_GXM_TEXTURE_FORMAT_A8R8G8B8 = SCE_GXM_TEXTURE_FORMAT_U8U8U8U8_ARGB,
+	SCE_GXM_TEXTURE_FORMAT_A8B8G8R8 = SCE_GXM_TEXTURE_FORMAT_U8U8U8U8_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_AF16LF16 = SCE_GXM_TEXTURE_FORMAT_F16F16_GRRR,
+	SCE_GXM_TEXTURE_FORMAT_LF16AF16 = SCE_GXM_TEXTURE_FORMAT_F16F16_RGGG,
+	SCE_GXM_TEXTURE_FORMAT_GF16RF16 = SCE_GXM_TEXTURE_FORMAT_F16F16_00GR,
+	SCE_GXM_TEXTURE_FORMAT_LF32M = SCE_GXM_TEXTURE_FORMAT_F32M_1RRR,
+	SCE_GXM_TEXTURE_FORMAT_AF32M = SCE_GXM_TEXTURE_FORMAT_F32M_R000,
+	SCE_GXM_TEXTURE_FORMAT_RF32M = SCE_GXM_TEXTURE_FORMAT_F32M_000R,
+	SCE_GXM_TEXTURE_FORMAT_DF32M = SCE_GXM_TEXTURE_FORMAT_F32M_R,
+	SCE_GXM_TEXTURE_FORMAT_VYUY = SCE_GXM_TEXTURE_FORMAT_VYUY422_CSC0,
+	SCE_GXM_TEXTURE_FORMAT_YVYU = SCE_GXM_TEXTURE_FORMAT_YVYU422_CSC0,
+	SCE_GXM_TEXTURE_FORMAT_UBC1 = SCE_GXM_TEXTURE_FORMAT_UBC1_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_UBC2 = SCE_GXM_TEXTURE_FORMAT_UBC2_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_UBC3 = SCE_GXM_TEXTURE_FORMAT_UBC3_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_PVRT2BPP = SCE_GXM_TEXTURE_FORMAT_PVRT2BPP_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_PVRT4BPP = SCE_GXM_TEXTURE_FORMAT_PVRT4BPP_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_PVRTII2BPP = SCE_GXM_TEXTURE_FORMAT_PVRTII2BPP_ABGR,
+	SCE_GXM_TEXTURE_FORMAT_PVRTII4BPP = SCE_GXM_TEXTURE_FORMAT_PVRTII4BPP_ABGR
+};
+
+enum SceGxmTextureAnisoMode : u32
+{
+	SCE_GXM_TEXTURE_ANISO_DISABLED = 0x00000000u,
+	SCE_GXM_TEXTURE_ANISO_ENABLED = 0x00004000u
+};
+
+enum SceGxmTextureType : u32
+{
+	SCE_GXM_TEXTURE_SWIZZLED = 0x00000000u,
+	SCE_GXM_TEXTURE_CUBE = 0x40000000u,
+	SCE_GXM_TEXTURE_LINEAR = 0x60000000u,
+	SCE_GXM_TEXTURE_TILED = 0x80000000u,
+	SCE_GXM_TEXTURE_LINEAR_STRIDED = 0xc0000000u
+};
+
+enum SceGxmTextureFilter : u32
+{
+	SCE_GXM_TEXTURE_FILTER_POINT = 0x00000000u,
+	SCE_GXM_TEXTURE_FILTER_LINEAR = 0x00000001u,
+	SCE_GXM_TEXTURE_FILTER_ANISO_LINEAR = 0x00000002u,
+	SCE_GXM_TEXTURE_FILTER_ANISO_POINT = 0x00000003u
+};
+
+enum SceGxmTextureMipFilter : u32
+{
+	SCE_GXM_TEXTURE_MIP_FILTER_DISABLED = 0x00000000u,
+	SCE_GXM_TEXTURE_MIP_FILTER_ENABLED = 0x00000200u
+};
+
+enum SceGxmTextureAddrMode : u32
+{
+	SCE_GXM_TEXTURE_ADDR_REPEAT = 0x00000000u,
+	SCE_GXM_TEXTURE_ADDR_MIRROR = 0x00000001u,
+	SCE_GXM_TEXTURE_ADDR_CLAMP = 0x00000002u,
+	SCE_GXM_TEXTURE_ADDR_MIRROR_CLAMP = 0x00000003u,
+	SCE_GXM_TEXTURE_ADDR_REPEAT_IGNORE_BORDER = 0x00000004u,
+	SCE_GXM_TEXTURE_ADDR_CLAMP_FULL_BORDER = 0x00000005u,
+	SCE_GXM_TEXTURE_ADDR_CLAMP_IGNORE_BORDER = 0x00000006u,
+	SCE_GXM_TEXTURE_ADDR_CLAMP_HALF_BORDER = 0x00000007u
+};
+
+enum SceGxmTextureGammaMode : u32
+{
+	SCE_GXM_TEXTURE_GAMMA_NONE = 0x00000000u,
+	SCE_GXM_TEXTURE_GAMMA_R = 0x08000000u,
+	SCE_GXM_TEXTURE_GAMMA_GR = 0x18000000u,
+	SCE_GXM_TEXTURE_GAMMA_BGR = 0x08000000u
+};
+
+enum SceGxmIndexFormat : u32
+{
+	SCE_GXM_INDEX_FORMAT_U16 = 0x00000000u,
+	SCE_GXM_INDEX_FORMAT_U32 = 0x01000000u
+};
+
+enum SceGxmIndexSource : u16
+{
+	SCE_GXM_INDEX_SOURCE_INDEX_16BIT = 0x00000000u,
+	SCE_GXM_INDEX_SOURCE_INDEX_32BIT = 0x00000001u,
+	SCE_GXM_INDEX_SOURCE_INSTANCE_16BIT = 0x00000002u,
+	SCE_GXM_INDEX_SOURCE_INSTANCE_32BIT = 0x00000003u
+};
+
+enum SceGxmFragmentProgramMode : u32
+{
+	SCE_GXM_FRAGMENT_PROGRAM_DISABLED = 0x00200000u,
+	SCE_GXM_FRAGMENT_PROGRAM_ENABLED = 0x00000000u
+};
+
+enum SceGxmDepthWriteMode : u32
+{
+	SCE_GXM_DEPTH_WRITE_DISABLED = 0x00100000u,
+	SCE_GXM_DEPTH_WRITE_ENABLED = 0x00000000u
+};
+
+enum SceGxmLineFillLastPixelMode : u32
+{
+	SCE_GXM_LINE_FILL_LAST_PIXEL_DISABLED = 0x00000000u,
+	SCE_GXM_LINE_FILL_LAST_PIXEL_ENABLED = 0x00080000u
+};
+
+enum SceGxmTwoSidedMode : u32
+{
+	SCE_GXM_TWO_SIDED_DISABLED = 0x00000000u,
+	SCE_GXM_TWO_SIDED_ENABLED = 0x00000800u
+};
+
+enum SceGxmWClampMode : u32
+{
+	SCE_GXM_WCLAMP_MODE_DISABLED = 0x00000000u,
+	SCE_GXM_WCLAMP_MODE_ENABLED = 0x00008000u
+};
+
+enum SceGxmViewportMode : u32
+{
+	SCE_GXM_VIEWPORT_DISABLED = 0x00010000u,
+	SCE_GXM_VIEWPORT_ENABLED = 0x00000000u
+};
+
+enum SceGxmWBufferMode : u32
+{
+	SCE_GXM_WBUFFER_DISABLED = 0x00000000u,
+	SCE_GXM_WBUFFER_ENABLED = 0x00004000u
+};
+
+enum SceGxmDepthStencilForceLoadMode : u32
+{
+	SCE_GXM_DEPTH_STENCIL_FORCE_LOAD_DISABLED = 0x00000000u,
+	SCE_GXM_DEPTH_STENCIL_FORCE_LOAD_ENABLED = 0x00000002u
+};
+
+enum SceGxmDepthStencilForceStoreMode : u32
+{
+	SCE_GXM_DEPTH_STENCIL_FORCE_STORE_DISABLED = 0x00000000u,
+	SCE_GXM_DEPTH_STENCIL_FORCE_STORE_ENABLED = 0x00000004u
+};
+
+enum SceGxmSceneFlags : u32
+{
+	SCE_GXM_SCENE_FRAGMENT_SET_DEPENDENCY = 0x00000001u,
+	SCE_GXM_SCENE_VERTEX_WAIT_FOR_DEPENDENCY = 0x00000002u
+};
+
+enum SceGxmMidSceneFlags : u32
+{
+	SCE_GXM_MIDSCENE_PRESERVE_DEFAULT_UNIFORM_BUFFERS = 0x00000001u
+};
+
+enum SceGxmColorSurfaceScaleMode : u32
+{
+	SCE_GXM_COLOR_SURFACE_SCALE_NONE = 0x00000000u,
+	SCE_GXM_COLOR_SURFACE_SCALE_MSAA_DOWNSCALE = 0x00000001u
+};
+
+enum SceGxmOutputRegisterSize : u32
+{
+	SCE_GXM_OUTPUT_REGISTER_SIZE_32BIT = 0x00000000u,
+	SCE_GXM_OUTPUT_REGISTER_SIZE_64BIT = 0x00000001u
+};
+
+enum SceGxmVisibilityTestMode : u32
+{
+	SCE_GXM_VISIBILITY_TEST_DISABLED = 0x00000000u,
+	SCE_GXM_VISIBILITY_TEST_ENABLED = 0x00004000u
+};
+
+enum SceGxmVisibilityTestOp : u32
+{
+	SCE_GXM_VISIBILITY_TEST_OP_INCREMENT = 0x00000000u,
+	SCE_GXM_VISIBILITY_TEST_OP_SET = 0x00040000u
+};
+
+enum SceGxmBlendFunc : u8
+{
+	SCE_GXM_BLEND_FUNC_NONE,
+	SCE_GXM_BLEND_FUNC_ADD,
+	SCE_GXM_BLEND_FUNC_SUBTRACT,
+	SCE_GXM_BLEND_FUNC_REVERSE_SUBTRACT
+};
+
+enum SceGxmBlendFactor : u8
+{
+	SCE_GXM_BLEND_FACTOR_ZERO,
+	SCE_GXM_BLEND_FACTOR_ONE,
+	SCE_GXM_BLEND_FACTOR_SRC_COLOR,
+	SCE_GXM_BLEND_FACTOR_ONE_MINUS_SRC_COLOR,
+	SCE_GXM_BLEND_FACTOR_SRC_ALPHA,
+	SCE_GXM_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA,
+	SCE_GXM_BLEND_FACTOR_DST_COLOR,
+	SCE_GXM_BLEND_FACTOR_ONE_MINUS_DST_COLOR,
+	SCE_GXM_BLEND_FACTOR_DST_ALPHA,
+	SCE_GXM_BLEND_FACTOR_ONE_MINUS_DST_ALPHA,
+	SCE_GXM_BLEND_FACTOR_SRC_ALPHA_SATURATE,
+	SCE_GXM_BLEND_FACTOR_DST_ALPHA_SATURATE
+};
+
+enum SceGxmColorMask : u8
+{
+	SCE_GXM_COLOR_MASK_NONE = 0,
+	SCE_GXM_COLOR_MASK_A = (1 << 0),
+	SCE_GXM_COLOR_MASK_R = (1 << 1),
+	SCE_GXM_COLOR_MASK_G = (1 << 2),
+	SCE_GXM_COLOR_MASK_B = (1 << 3),
+	SCE_GXM_COLOR_MASK_ALL = (SCE_GXM_COLOR_MASK_A | SCE_GXM_COLOR_MASK_B | SCE_GXM_COLOR_MASK_G | SCE_GXM_COLOR_MASK_R)
+};
+
+struct SceGxmBlendInfo
+{
+	SceGxmColorMask	colorMask;
+	SceGxmBlendFunc	colorFunc : 4;
+	SceGxmBlendFunc	alphaFunc : 4;
+	SceGxmBlendFactor colorSrc : 4;
+	SceGxmBlendFactor colorDst : 4;
+	SceGxmBlendFactor alphaSrc : 4;
+	SceGxmBlendFactor alphaDst : 4;
+};
+
+struct SceGxmRenderTarget;
+
+struct SceGxmSyncObject;
+
+struct SceGxmVertexAttribute
+{
+	u16 streamIndex;
+	u16 offset;
+	SceGxmAttributeFormat format;
+	u8 componentCount;
+	u16 regIndex;
+};
+
+struct SceGxmVertexStream
+{
+	u16 stride;
+	u16 indexSource;
+};
+
+struct SceGxmTexture
+{
+	u32 controlWords[4];
+};
+
+struct SceGxmColorSurface
+{
+	u32 pbeSidebandWord;
+	u32 pbeEmitWords[6];
+	u32 outputRegisterSize;
+	SceGxmTexture backgroundTex;
+};
+
+struct SceGxmDepthStencilSurface
+{
+	u32 zlsControl;
+	vm::psv::ptr<void> depthData;
+	vm::psv::ptr<void> stencilData;
+	float backgroundDepth;
+	u32 backgroundControl;
+};
+
+struct SceGxmAuxiliarySurface
+{
+	SceGxmColorFormat colorFormat;
+	SceGxmColorSurfaceType type;
+	u32 width;
+	u32 height;
+	u32 stride;
+	vm::psv::ptr<void> data;
+};
+
+struct SceGxmNotification
+{
+	vm::psv::ptr<volatile u32> address;
+	u32 value;
+};
+
+struct SceGxmValidRegion
+{
+	u32 xMin;
+	u32 yMin;
+	u32 xMax;
+	u32 yMax;
+};
+
+struct SceGxmContext;
+
+enum
+{
+	SCE_GXM_MINIMUM_CONTEXT_HOST_MEM_SIZE = 2048,
+	SCE_GXM_DEFAULT_VDM_RING_BUFFER_SIZE = (128 * 1024),
+	SCE_GXM_DEFAULT_VERTEX_RING_BUFFER_SIZE = (2 * 1024 * 1024),
+	SCE_GXM_DEFAULT_FRAGMENT_RING_BUFFER_SIZE = (512 * 1024),
+	SCE_GXM_DEFAULT_FRAGMENT_USSE_RING_BUFFER_SIZE = (16 * 1024),
+};
+
+struct SceGxmContextParams
+{
+	vm::psv::ptr<void> hostMem;
+	u32 hostMemSize;
+	vm::psv::ptr<void> vdmRingBufferMem;
+	u32 vdmRingBufferMemSize;
+	vm::psv::ptr<void> vertexRingBufferMem;
+	u32 vertexRingBufferMemSize;
+	vm::psv::ptr<void> fragmentRingBufferMem;
+	u32 fragmentRingBufferMemSize;
+	vm::psv::ptr<void> fragmentUsseRingBufferMem;
+	u32 fragmentUsseRingBufferMemSize;
+	u32 fragmentUsseRingBufferOffset;
+};
+
+struct SceGxmVertexProgram;
+
+struct SceGxmFragmentProgram;
+
+enum
+{
+	SCE_GXM_PRECOMPUTED_VERTEX_STATE_WORD_COUNT = 7,
+	SCE_GXM_PRECOMPUTED_FRAGMENT_STATE_WORD_COUNT = 9,
+	SCE_GXM_PRECOMPUTED_DRAW_WORD_COUNT = 11,
+};
+
+struct SceGxmPrecomputedVertexState
+{
+	u32 data[SCE_GXM_PRECOMPUTED_VERTEX_STATE_WORD_COUNT];
+};
+
+struct SceGxmPrecomputedFragmentState
+{
+	u32 data[SCE_GXM_PRECOMPUTED_FRAGMENT_STATE_WORD_COUNT];
+};
+
+struct SceGxmPrecomputedDraw
+{
+	u32 data[SCE_GXM_PRECOMPUTED_DRAW_WORD_COUNT];
+};
+
+enum : u32
+{
+	SCE_GXM_MAX_VERTEX_ATTRIBUTES = 16,
+	SCE_GXM_MAX_VERTEX_STREAMS = 4,
+	SCE_GXM_MAX_TEXTURE_UNITS = 16,
+	SCE_GXM_MAX_UNIFORM_BUFFERS = 8,
+	SCE_GXM_MAX_AUXILIARY_SURFACES = 3,
+};
+
+struct SceGxmProgram;
+
+struct SceGxmProgramParameter;
+
+enum SceGxmProgramType : s32
+{
+	SCE_GXM_VERTEX_PROGRAM,
+	SCE_GXM_FRAGMENT_PROGRAM
+};
+
+enum SceGxmParameterCategory : s32
+{
+	SCE_GXM_PARAMETER_CATEGORY_ATTRIBUTE,
+	SCE_GXM_PARAMETER_CATEGORY_UNIFORM,
+	SCE_GXM_PARAMETER_CATEGORY_SAMPLER,
+	SCE_GXM_PARAMETER_CATEGORY_AUXILIARY_SURFACE,
+	SCE_GXM_PARAMETER_CATEGORY_UNIFORM_BUFFER
+};
+
+enum SceGxmParameterType : s32
+{
+	SCE_GXM_PARAMETER_TYPE_F32,
+	SCE_GXM_PARAMETER_TYPE_F16,
+	SCE_GXM_PARAMETER_TYPE_C10,
+	SCE_GXM_PARAMETER_TYPE_U32,
+	SCE_GXM_PARAMETER_TYPE_S32,
+	SCE_GXM_PARAMETER_TYPE_U16,
+	SCE_GXM_PARAMETER_TYPE_S16,
+	SCE_GXM_PARAMETER_TYPE_U8,
+	SCE_GXM_PARAMETER_TYPE_S8,
+	SCE_GXM_PARAMETER_TYPE_AGGREGATE
+};
+
+enum SceGxmParameterSemantic : s32
+{
+	SCE_GXM_PARAMETER_SEMANTIC_NONE,
+	SCE_GXM_PARAMETER_SEMANTIC_ATTR,
+	SCE_GXM_PARAMETER_SEMANTIC_BCOL,
+	SCE_GXM_PARAMETER_SEMANTIC_BINORMAL,
+	SCE_GXM_PARAMETER_SEMANTIC_BLENDINDICES,
+	SCE_GXM_PARAMETER_SEMANTIC_BLENDWEIGHT,
+	SCE_GXM_PARAMETER_SEMANTIC_COLOR,
+	SCE_GXM_PARAMETER_SEMANTIC_DIFFUSE,
+	SCE_GXM_PARAMETER_SEMANTIC_FOGCOORD,
+	SCE_GXM_PARAMETER_SEMANTIC_NORMAL,
+	SCE_GXM_PARAMETER_SEMANTIC_POINTSIZE,
+	SCE_GXM_PARAMETER_SEMANTIC_POSITION,
+	SCE_GXM_PARAMETER_SEMANTIC_SPECULAR,
+	SCE_GXM_PARAMETER_SEMANTIC_TANGENT,
+	SCE_GXM_PARAMETER_SEMANTIC_TEXCOORD
+};
+
+struct SceGxmShaderPatcher;
+
+struct SceGxmRegisteredProgram;
+
+typedef vm::psv::ptr<SceGxmRegisteredProgram> SceGxmShaderPatcherId;
+
+typedef vm::psv::ptr<void>(SceGxmShaderPatcherHostAllocCallback)(vm::psv::ptr<void> userData, u32 size);
+typedef void(SceGxmShaderPatcherHostFreeCallback)(vm::psv::ptr<void> userData, vm::psv::ptr<void> mem);
+typedef vm::psv::ptr<void>(SceGxmShaderPatcherBufferAllocCallback)(vm::psv::ptr<void> userData, u32 size);
+typedef void(SceGxmShaderPatcherBufferFreeCallback)(vm::psv::ptr<void> userData, vm::psv::ptr<void> mem);
+typedef vm::psv::ptr<void>(SceGxmShaderPatcherUsseAllocCallback)(vm::psv::ptr<void> userData, u32 size, vm::psv::ptr<u32> usseOffset);
+typedef void(SceGxmShaderPatcherUsseFreeCallback)(vm::psv::ptr<void> userData, vm::psv::ptr<void> mem);
+
+struct SceGxmShaderPatcherParams
+{
+	vm::psv::ptr<void> userData;
+	vm::psv::ptr<SceGxmShaderPatcherHostAllocCallback> hostAllocCallback;
+	vm::psv::ptr<SceGxmShaderPatcherHostFreeCallback> hostFreeCallback;
+	vm::psv::ptr<SceGxmShaderPatcherBufferAllocCallback> bufferAllocCallback;
+	vm::psv::ptr<SceGxmShaderPatcherBufferFreeCallback> bufferFreeCallback;
+	vm::psv::ptr<void> bufferMem;
+	u32 bufferMemSize;
+	vm::psv::ptr<SceGxmShaderPatcherUsseAllocCallback> vertexUsseAllocCallback;
+	vm::psv::ptr<SceGxmShaderPatcherUsseFreeCallback> vertexUsseFreeCallback;
+	vm::psv::ptr<void> vertexUsseMem;
+	u32 vertexUsseMemSize;
+	u32 vertexUsseOffset;
+	vm::psv::ptr<SceGxmShaderPatcherUsseAllocCallback> fragmentUsseAllocCallback;
+	vm::psv::ptr<SceGxmShaderPatcherUsseFreeCallback> fragmentUsseFreeCallback;
+	vm::psv::ptr<void> fragmentUsseMem;
+	u32 fragmentUsseMemSize;
+	u32 fragmentUsseOffset;
+};
+
+enum SceGxmRenderTargetFlags : u32
+{
+	SCE_GXM_RENDER_TARGET_CUSTOM_MULTISAMPLE_LOCATIONS = 1 << 0,
+};
+
+struct SceGxmRenderTargetParams
+{
+	SceGxmRenderTargetFlags flags;
+	u16 width;
+	u16 height;
+	u16 scenesPerFrame;
+	SceGxmMultisampleMode multisampleMode;
+	u32 multisampleLocations;
+	vm::psv::ptr<void> hostMem;
+	u32 hostMemSize;
+	s32 driverMemBlock;
+};
+
+extern psv_log_base sceGxm;
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.cpp b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
index b011da905b..4ca94b42a6 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.cpp
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
@@ -51,6 +51,9 @@ extern psv_log_base sceLibKernel;
 extern psv_log_base sceSysmodule;
 extern psv_log_base scePerf;
 extern psv_log_base sceCtrl;
+extern psv_log_base sceDeci4p;
+extern psv_log_base sceDisplay;
+extern psv_log_base sceGxm;
 
 void initialize_psv_modules()
 {
@@ -64,6 +67,9 @@ void initialize_psv_modules()
 	g_psv_modules.push_back(&sceSysmodule);
 	g_psv_modules.push_back(&scePerf);
 	g_psv_modules.push_back(&sceCtrl);
+	g_psv_modules.push_back(&sceDeci4p);
+	g_psv_modules.push_back(&sceDisplay);
+	g_psv_modules.push_back(&sceGxm);
 
 	// setup special functions (without NIDs)
 	psv_func unimplemented;

From 62c8f2ac342527d75c64c123ead8186e2fafbe1a Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Thu, 29 Jan 2015 18:48:05 +0300
Subject: [PATCH 52/70] ARMv7: stubs for other modules, loader improved

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp             |   2 -
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp         |   5 -
 rpcs3/Emu/ARMv7/ARMv7Interpreter.h           |   3 -
 rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp        |  20 ++
 rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp       |  28 +++
 rpcs3/Emu/ARMv7/Modules/sceAudio.cpp         |  24 +++
 rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp       |  19 ++
 rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp      |  22 ++
 rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp      |  23 +++
 rpcs3/Emu/ARMv7/Modules/sceCamera.cpp        |  56 ++++++
 rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp   |  19 ++
 rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp  |  55 +++++
 rpcs3/Emu/ARMv7/Modules/sceDbg.cpp           |  19 ++
 rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp        |   2 +-
 rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp         |  27 +++
 rpcs3/Emu/ARMv7/Modules/sceFiber.cpp         |  26 +++
 rpcs3/Emu/ARMv7/Modules/sceFios.cpp          | 147 ++++++++++++++
 rpcs3/Emu/ARMv7/Modules/sceFpu.cpp           |  29 +++
 rpcs3/Emu/ARMv7/Modules/sceHttp.cpp          |  82 ++++++++
 rpcs3/Emu/ARMv7/Modules/sceIme.cpp           |  20 ++
 rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp          |  24 +++
 rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp       |  24 +++
 rpcs3/Emu/ARMv7/Modules/sceLibc.cpp          |   2 +-
 rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp      |  17 ++
 rpcs3/Emu/ARMv7/Modules/sceLocation.cpp      |  34 ++++
 rpcs3/Emu/ARMv7/Modules/sceMd5.cpp           |  19 ++
 rpcs3/Emu/ARMv7/Modules/sceMotion.cpp        |  31 +++
 rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp       |  17 ++
 rpcs3/Emu/ARMv7/Modules/sceNet.cpp           |  73 +++++++
 rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp        |  31 +++
 rpcs3/Emu/ARMv7/Modules/sceNgs.cpp           |  78 +++++++
 rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp       |  33 +++
 rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp      |  26 +++
 rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp     |  25 +++
 rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp    |  46 +++++
 rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp       |  44 ++++
 rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp     |  35 ++++
 rpcs3/Emu/ARMv7/Modules/scePgf.cpp           |  38 ++++
 rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp   |  17 ++
 rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp  |  18 ++
 rpcs3/Emu/ARMv7/Modules/sceRtc.cpp           |  52 +++++
 rpcs3/Emu/ARMv7/Modules/sceSas.cpp           |  64 ++++++
 rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp    |  19 ++
 rpcs3/Emu/ARMv7/Modules/sceSfmt.cpp          |  84 ++++++++
 rpcs3/Emu/ARMv7/Modules/sceSha.cpp           |  44 ++++
 rpcs3/Emu/ARMv7/Modules/sceSqlite.cpp        | 187 +++++++++++++++++
 rpcs3/Emu/ARMv7/Modules/sceSsl.cpp           |  26 +++
 rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp        |  38 ++++
 rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp |  32 +++
 rpcs3/Emu/ARMv7/Modules/sceTouch.cpp         |  20 ++
 rpcs3/Emu/ARMv7/Modules/sceUlt.cpp           |  68 +++++++
 rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp      |  34 ++++
 rpcs3/Emu/ARMv7/Modules/sceVoice.cpp         |  40 ++++
 rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp      |  32 +++
 rpcs3/Emu/ARMv7/Modules/sceXml.cpp           | 201 +++++++++++++++++++
 rpcs3/Emu/ARMv7/PSVFuncList.cpp              | 124 ++++++++++--
 rpcs3/Emu/FS/vfsDirBase.h                    |  11 +-
 rpcs3/Emu/Memory/Memory.cpp                  |   9 +-
 rpcs3/Emu/Memory/Memory.h                    |   2 -
 rpcs3/Emu/Memory/vm.cpp                      |   5 +
 rpcs3/Emu/Memory/vm.h                        |   4 +-
 rpcs3/Emu/SysCalls/Modules/cellSysutil.h     |   4 +-
 rpcs3/Loader/ELF32.cpp                       | 114 +++++++++--
 rpcs3/Loader/ELF64.cpp                       |   1 +
 rpcs3/emucore.vcxproj                        |  50 +++++
 rpcs3/emucore.vcxproj.filters                | 150 ++++++++++++++
 66 files changed, 2616 insertions(+), 59 deletions(-)
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceAudio.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceCamera.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceDbg.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceFiber.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceFios.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceFpu.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceHttp.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceIme.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceLocation.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceMd5.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceMotion.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceNet.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceNgs.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/scePgf.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceRtc.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceSas.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceSfmt.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceSha.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceSqlite.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceSsl.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceTouch.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceUlt.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceVoice.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceXml.cpp

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index e5a7b4b87f..fac6873a33 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -29,8 +29,6 @@ struct ARMv7_opcode_t
 
 const ARMv7_opcode_t ARMv7_opcode_table[] =
 {
-	ARMv7_OP2(0xffff, 0x0000, T1, NULL_OP), // ???
-
 	ARMv7_OP4(0xffff, 0x0000, 0xf870, 0x0000, T1, HACK), // "Undefined" Thumb opcode used
 	ARMv7_OP4(0x0ff0, 0x00f0, 0x0070, 0x0090, A1, HACK), // "Undefined" ARM opcode used
 
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index 954e07dfcc..ea01bcecc9 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -283,11 +283,6 @@ void ARMv7_instrs::UNK(ARMv7Context& context, const ARMv7Code code)
 	throw fmt::format("Unknown/illegal opcode: 0x%04x 0x%04x", code.code1, code.code0);
 }
 
-void ARMv7_instrs::NULL_OP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
-{
-	throw fmt::format("Null opcode found: 0x%04x 0x%04x", code.code1, code.code0);
-}
-
 void ARMv7_instrs::HACK(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
 	u32 cond, func;
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
index 4e4b8b6dc1..2a18646d42 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.h
@@ -30,10 +30,7 @@ namespace ARMv7_instrs
 {
 	void UNK(ARMv7Context& context, const ARMv7Code code);
 
-	void NULL_OP(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-
 	void HACK(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
-
 	void MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
 
 	void ADC_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp b/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp
new file mode 100644
index 0000000000..0d9aa8a072
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp
@@ -0,0 +1,20 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceAppMgr;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceAppMgr, #name, name)
+
+psv_log_base sceAppMgr("SceAppMgr", []()
+{
+	sceAppMgr.on_load = nullptr;
+	sceAppMgr.on_unload = nullptr;
+	sceAppMgr.on_stop = nullptr;
+
+	//REG_FUNC(0x47E5DD7D, sceAppMgrReceiveEventNum);
+	//REG_FUNC(0xCFAD5A3A, sceAppMgrReceiveEvent);
+	//REG_FUNC(0xF3D65520, sceAppMgrAcquireBgmPort);
+	//REG_FUNC(0x96CBE713, sceAppMgrReleaseBgmPort);
+	//REG_FUNC(0x49255C91, sceAppMgrGetRunStatus);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp
new file mode 100644
index 0000000000..567f6c4f3e
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp
@@ -0,0 +1,28 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceAppUtil;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceAppUtil, #name, name)
+
+psv_log_base sceAppUtil("SceAppUtil", []()
+{
+	sceAppUtil.on_load = nullptr;
+	sceAppUtil.on_unload = nullptr;
+	sceAppUtil.on_stop = nullptr;
+
+	//REG_FUNC(0xDAFFE671, sceAppUtilInit);
+	//REG_FUNC(0xB220B00B, sceAppUtilShutdown);
+	//REG_FUNC(0x7E8FE96A, sceAppUtilSaveDataSlotCreate);
+	//REG_FUNC(0x266A7646, sceAppUtilSaveDataSlotDelete);
+	//REG_FUNC(0x98630136, sceAppUtilSaveDataSlotSetParam);
+	//REG_FUNC(0x93F0D89F, sceAppUtilSaveDataSlotGetParam);
+	//REG_FUNC(0x1E2A6158, sceAppUtilSaveDataFileSave);
+	//REG_FUNC(0xEE85804D, sceAppUtilPhotoMount);
+	//REG_FUNC(0x9651B941, sceAppUtilPhotoUmount);
+	//REG_FUNC(0x5DFB9CA0, sceAppUtilSystemParamGetInt);
+	//REG_FUNC(0x6E6AA267, sceAppUtilSystemParamGetString);
+	//REG_FUNC(0x9D8AC677, sceAppUtilSaveSafeMemory);
+	//REG_FUNC(0x3424D772, sceAppUtilLoadSafeMemory);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp
new file mode 100644
index 0000000000..36920a8e59
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp
@@ -0,0 +1,24 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceAudio;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceAudio, #name, name)
+
+psv_log_base sceAudio("SceAudio", []()
+{
+	sceAudio.on_load = nullptr;
+	sceAudio.on_unload = nullptr;
+	sceAudio.on_stop = nullptr;
+
+	//REG_FUNC(0x5BC341E4, sceAudioOutOpenPort);
+	//REG_FUNC(0x69E2E6B5, sceAudioOutReleasePort);
+	//REG_FUNC(0x02DB3F5F, sceAudioOutOutput);
+	//REG_FUNC(0x64167F11, sceAudioOutSetVolume);
+	//REG_FUNC(0xB8BA0D07, sceAudioOutSetConfig);
+	//REG_FUNC(0x9C8EDAEA, sceAudioOutGetConfig);
+	//REG_FUNC(0x9A5370C4, sceAudioOutGetRestSample);
+	//REG_FUNC(0x12FB1767, sceAudioOutGetAdopt);
+	//REG_FUNC(0xC6D8D775, sceAudioInRaw);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp
new file mode 100644
index 0000000000..0ae64a168d
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp
@@ -0,0 +1,19 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceAudioIn;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceAudioIn, #name, name)
+
+psv_log_base sceAudioIn("SceAudioIn", []()
+{
+	sceAudioIn.on_load = nullptr;
+	sceAudioIn.on_unload = nullptr;
+	sceAudioIn.on_stop = nullptr;
+
+	//REG_FUNC(0x638ADD2D, sceAudioInInput);
+	//REG_FUNC(0x39B50DC1, sceAudioInOpenPort);
+	//REG_FUNC(0x3A61B8C4, sceAudioInReleasePort);
+	//REG_FUNC(0x566AC433, sceAudioInGetAdopt);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp
new file mode 100644
index 0000000000..f8e3952dec
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp
@@ -0,0 +1,22 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceAudiodec;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceAudiodec, #name, name)
+
+psv_log_base sceAudiodec("SceAudiodec", []()
+{
+	sceAudiodec.on_load = nullptr;
+	sceAudiodec.on_unload = nullptr;
+	sceAudiodec.on_stop = nullptr;
+
+	//REG_FUNC(0x445C2CEF, sceAudiodecInitLibrary);
+	//REG_FUNC(0x45719B9D, sceAudiodecTermLibrary);
+	//REG_FUNC(0x4DFD3AAA, sceAudiodecCreateDecoder);
+	//REG_FUNC(0xE7A24E16, sceAudiodecDeleteDecoder);
+	//REG_FUNC(0xCCDABA04, sceAudiodecDecode);
+	//REG_FUNC(0xF72F9B64, sceAudiodecClearContext);
+	//REG_FUNC(0x883B0CF5, sceAudiodecGetInternalError);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp
new file mode 100644
index 0000000000..a3bf58617c
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp
@@ -0,0 +1,23 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceAudioenc;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceAudioenc, #name, name)
+
+psv_log_base sceAudioenc("SceAudioenc", []()
+{
+	sceAudioenc.on_load = nullptr;
+	sceAudioenc.on_unload = nullptr;
+	sceAudioenc.on_stop = nullptr;
+
+	//REG_FUNC(0x76EE4DC6, sceAudioencInitLibrary);
+	//REG_FUNC(0xAB32D022, sceAudioencTermLibrary);
+	//REG_FUNC(0x64C04AE8, sceAudioencCreateEncoder);
+	//REG_FUNC(0xC6BA5EE6, sceAudioencDeleteEncoder);
+	//REG_FUNC(0xD85DB29C, sceAudioencEncode);
+	//REG_FUNC(0x9386F42D, sceAudioencClearContext);
+	//REG_FUNC(0xD01C63A3, sceAudioencGetOptInfo);
+	//REG_FUNC(0x452246D0, sceAudioencGetInternalError);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp b/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp
new file mode 100644
index 0000000000..79c219443c
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp
@@ -0,0 +1,56 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceCamera;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceCamera, #name, name)
+
+psv_log_base sceCamera("SceCamera", []()
+{
+	sceCamera.on_load = nullptr;
+	sceCamera.on_unload = nullptr;
+	sceCamera.on_stop = nullptr;
+
+	//REG_FUNC(0xA462F801, sceCameraOpen);
+	//REG_FUNC(0xCD6E1CFC, sceCameraClose);
+	//REG_FUNC(0xA8FEAE35, sceCameraStart);
+	//REG_FUNC(0x1DD9C9CE, sceCameraStop);
+	//REG_FUNC(0x79B5C2DE, sceCameraRead);
+	//REG_FUNC(0x103A75B8, sceCameraIsActive);
+	//REG_FUNC(0x624F7653, sceCameraGetSaturation);
+	//REG_FUNC(0xF9F7CA3D, sceCameraSetSaturation);
+	//REG_FUNC(0x85D5951D, sceCameraGetBrightness);
+	//REG_FUNC(0x98D71588, sceCameraSetBrightness);
+	//REG_FUNC(0x8FBE84BE, sceCameraGetContrast);
+	//REG_FUNC(0x06FB2900, sceCameraSetContrast);
+	//REG_FUNC(0xAA72C3DC, sceCameraGetSharpness);
+	//REG_FUNC(0xD1A5BB0B, sceCameraSetSharpness);
+	//REG_FUNC(0x44F6043F, sceCameraGetReverse);
+	//REG_FUNC(0x1175F477, sceCameraSetReverse);
+	//REG_FUNC(0x7E8EF3B2, sceCameraGetEffect);
+	//REG_FUNC(0xE9D2CFB1, sceCameraSetEffect);
+	//REG_FUNC(0x8B5E6147, sceCameraGetEV);
+	//REG_FUNC(0x62AFF0B8, sceCameraSetEV);
+	//REG_FUNC(0x06D3816C, sceCameraGetZoom);
+	//REG_FUNC(0xF7464216, sceCameraSetZoom);
+	//REG_FUNC(0x9FDACB99, sceCameraGetAntiFlicker);
+	//REG_FUNC(0xE312958A, sceCameraSetAntiFlicker);
+	//REG_FUNC(0x4EBD5C68, sceCameraGetISO);
+	//REG_FUNC(0x3CF630A1, sceCameraSetISO);
+	//REG_FUNC(0x2C36D6F3, sceCameraGetGain);
+	//REG_FUNC(0xE65CFE86, sceCameraSetGain);
+	//REG_FUNC(0xDBFFA1DA, sceCameraGetWhiteBalance);
+	//REG_FUNC(0x4D4514AC, sceCameraSetWhiteBalance);
+	//REG_FUNC(0x8DD1292B, sceCameraGetBacklight);
+	//REG_FUNC(0xAE071044, sceCameraSetBacklight);
+	//REG_FUNC(0x12B6FF26, sceCameraGetNightmode);
+	//REG_FUNC(0x3F26233E, sceCameraSetNightmode);
+	//REG_FUNC(0xD02CFA5C, sceCameraLedSwitch);
+	//REG_FUNC(0x89B16030, sceCameraLedBlink);
+	//REG_FUNC(0x7670474C, sceCameraUseCacheMemoryForTrial);
+	//REG_FUNC(0x27BB0528, sceCameraGetNoiseReductionForDebug);
+	//REG_FUNC(0x233C9E27, sceCameraSetNoiseReductionForDebug);
+	//REG_FUNC(0xC387F4DC, sceCameraGetSharpnessOffForDebug);
+	//REG_FUNC(0xE22C2375, sceCameraSetSharpnessOffForDebug);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp b/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp
new file mode 100644
index 0000000000..013f4ff52b
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp
@@ -0,0 +1,19 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceCodecEngine;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceCodecEngine, #name, name)
+
+psv_log_base sceCodecEngine("SceCodecEngine", []()
+{
+	sceCodecEngine.on_load = nullptr;
+	sceCodecEngine.on_unload = nullptr;
+	sceCodecEngine.on_stop = nullptr;
+
+	//REG_FUNC(0x3E718890, sceCodecEnginePmonStart);
+	//REG_FUNC(0x268B1EF5, sceCodecEnginePmonStop);
+	//REG_FUNC(0x859E4A68, sceCodecEnginePmonGetProcessorLoad);
+	//REG_FUNC(0xA097E4C8, sceCodecEnginePmonReset);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp b/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp
new file mode 100644
index 0000000000..1f5a4863a3
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp
@@ -0,0 +1,55 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceCommonDialog;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceCommonDialog, #name, name)
+
+psv_log_base sceCommonDialog("SceCommonDialog", []()
+{
+	sceCommonDialog.on_load = nullptr;
+	sceCommonDialog.on_unload = nullptr;
+	sceCommonDialog.on_stop = nullptr;
+
+	//REG_FUNC(0x90530F2F, sceCommonDialogUpdate);
+	//REG_FUNC(0x755FF270, sceMsgDialogInit);
+	//REG_FUNC(0x4107019E, sceMsgDialogGetStatus);
+	//REG_FUNC(0xC296D396, sceMsgDialogClose);
+	//REG_FUNC(0x0CC66115, sceMsgDialogAbort);
+	//REG_FUNC(0xBB3BFC89, sceMsgDialogGetResult);
+	//REG_FUNC(0x81ACF695, sceMsgDialogTerm);
+	//REG_FUNC(0x7BE0E08B, sceMsgDialogProgressBarInc);
+	//REG_FUNC(0x9CDA5E0D, sceMsgDialogProgressBarSetValue);
+	//REG_FUNC(0xA38A4A0D, sceNetCheckDialogInit);
+	//REG_FUNC(0x8027292A, sceNetCheckDialogGetStatus);
+	//REG_FUNC(0x2D8EDF09, sceNetCheckDialogAbort);
+	//REG_FUNC(0xB05FCE9E, sceNetCheckDialogGetResult);
+	//REG_FUNC(0x8BE51C15, sceNetCheckDialogTerm);
+	//REG_FUNC(0xBF5248FA, sceSaveDataDialogInit);
+	//REG_FUNC(0x6E258046, sceSaveDataDialogGetStatus);
+	//REG_FUNC(0x013E7F74, sceSaveDataDialogAbort);
+	//REG_FUNC(0xB2FF576E, sceSaveDataDialogGetResult);
+	//REG_FUNC(0x2192A10A, sceSaveDataDialogTerm);
+	//REG_FUNC(0x19192C8B, sceSaveDataDialogContinue);
+	//REG_FUNC(0xBA0542CA, sceSaveDataDialogGetSubStatus);
+	//REG_FUNC(0x415D6068, sceSaveDataDialogSubClose);
+	//REG_FUNC(0x6C49924B, sceSaveDataDialogFinish);
+	//REG_FUNC(0xBDE00A83, sceSaveDataDialogProgressBarInc);
+	//REG_FUNC(0x5C322D1E, sceSaveDataDialogProgressBarSetValue);
+	//REG_FUNC(0x1E7043BF, sceImeDialogInit);
+	//REG_FUNC(0xCF0431FD, sceImeDialogGetStatus);
+	//REG_FUNC(0x594A220E, sceImeDialogAbort);
+	//REG_FUNC(0x2EB3D046, sceImeDialogGetResult);
+	//REG_FUNC(0x838A3AF4, sceImeDialogTerm);
+	//REG_FUNC(0x73EE7C9C, scePhotoImportDialogInit);
+	//REG_FUNC(0x032206D8, scePhotoImportDialogGetStatus);
+	//REG_FUNC(0xD855414C, scePhotoImportDialogGetResult);
+	//REG_FUNC(0x7FE5BD77, scePhotoImportDialogTerm);
+	//REG_FUNC(0x4B125581, scePhotoImportDialogAbort);
+	//REG_FUNC(0xCD990375, scePhotoReviewDialogInit);
+	//REG_FUNC(0xF4F600CA, scePhotoReviewDialogGetStatus);
+	//REG_FUNC(0xFFA35858, scePhotoReviewDialogGetResult);
+	//REG_FUNC(0xC700B2DF, scePhotoReviewDialogTerm);
+	//REG_FUNC(0x74FF2A8B, scePhotoReviewDialogAbort);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp b/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp
new file mode 100644
index 0000000000..6fe3856b9c
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp
@@ -0,0 +1,19 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceDbg;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceDbg, #name, name)
+
+psv_log_base sceDbg("SceDbg", []()
+{
+	sceDbg.on_load = nullptr;
+	sceDbg.on_unload = nullptr;
+	sceDbg.on_stop = nullptr;
+
+	//REG_FUNC(0x941622FA, sceDbgSetMinimumLogLevel);
+	//REG_FUNC(0x1AF3678B, sceDbgAssertionHandler);
+	//REG_FUNC(0x6605AB19, sceDbgLoggingHandler);
+	//REG_FUNC(0xED4A00BA, sceDbgSetBreakOnErrorState);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp
index bdd5e58e5d..d90fcca74f 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp
@@ -45,4 +45,4 @@ psv_log_base sceDeci4p("SceDeci4pUserp", []()
 	REG_FUNC(0x971E1C66, sceKernelDeci4pRead);
 	REG_FUNC(0xCDA3AAAC, sceKernelDeci4pWrite);
 	REG_FUNC(0x73371F35, sceKernelDeci4pRegisterCallback);
-});
\ No newline at end of file
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp b/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp
new file mode 100644
index 0000000000..6d7e440c2f
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp
@@ -0,0 +1,27 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceDeflt;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceDeflt, #name, name)
+
+psv_log_base sceDeflt("SceDeflt", []()
+{
+	sceDeflt.on_load = nullptr;
+	sceDeflt.on_unload = nullptr;
+	sceDeflt.on_stop = nullptr;
+
+	//REG_FUNC(0xCD83A464, sceZlibAdler32);
+	//REG_FUNC(0x110D5050, sceDeflateDecompress);
+	//REG_FUNC(0xE3CB51A3, sceGzipDecompress);
+	//REG_FUNC(0xBABCF5CF, sceGzipGetComment);
+	//REG_FUNC(0xE1844802, sceGzipGetCompressedData);
+	//REG_FUNC(0x1B8E5862, sceGzipGetInfo);
+	//REG_FUNC(0xAEBAABE6, sceGzipGetName);
+	//REG_FUNC(0xDEDADC31, sceGzipIsValid);
+	//REG_FUNC(0xE38F754D, sceZlibDecompress);
+	//REG_FUNC(0xE680A65A, sceZlibGetCompressedData);
+	//REG_FUNC(0x4C0A685D, sceZlibGetInfo);
+	//REG_FUNC(0x14A0698D, sceZlibIsValid);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp
new file mode 100644
index 0000000000..73678a396c
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp
@@ -0,0 +1,26 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceFiber;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceFiber, #name, name)
+
+psv_log_base sceFiber("SceFiber", []()
+{
+	sceFiber.on_load = nullptr;
+	sceFiber.on_unload = nullptr;
+	sceFiber.on_stop = nullptr;
+
+	//REG_FUNC(0xF24A298C, _sceFiberInitializeImpl);
+	//REG_FUNC(0xC6A3F9BB, _sceFiberInitializeWithInternalOptionImpl);
+	//REG_FUNC(0x7D0C7DDB, _sceFiberAttachContextAndRun);
+	//REG_FUNC(0xE00B9AFE, _sceFiberAttachContextAndSwitch);
+	//REG_FUNC(0x801AB334, sceFiberOptParamInitialize);
+	//REG_FUNC(0xE160F844, sceFiberFinalize);
+	//REG_FUNC(0x7DF23243, sceFiberRun);
+	//REG_FUNC(0xE4283144, sceFiberSwitch);
+	//REG_FUNC(0x414D8CA5, sceFiberGetSelf);
+	//REG_FUNC(0x3B42921F, sceFiberReturnToThread);
+	//REG_FUNC(0x189599B4, sceFiberGetInfo);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp
new file mode 100644
index 0000000000..d04af5b3cd
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp
@@ -0,0 +1,147 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceFios;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceFios, #name, name)
+
+psv_log_base sceFios("SceFios2", []()
+{
+	sceFios.on_load = nullptr;
+	sceFios.on_unload = nullptr;
+	sceFios.on_stop = nullptr;
+
+	//REG_FUNC(0x15857180, sceFiosArchiveGetMountBufferSize);
+	//REG_FUNC(0xDF3352FC, sceFiosArchiveGetMountBufferSizeSync);
+	//REG_FUNC(0x92E76BBD, sceFiosArchiveMount);
+	//REG_FUNC(0xC4822276, sceFiosArchiveMountSync);
+	//REG_FUNC(0xFE1E1D28, sceFiosArchiveUnmount);
+	//REG_FUNC(0xB26DC24D, sceFiosArchiveUnmountSync);
+	//REG_FUNC(0x1E920B1D, sceFiosCancelAllOps);
+	//REG_FUNC(0xF85C208B, sceFiosCloseAllFiles);
+	//REG_FUNC(0xF6CACFC7, sceFiosDHClose);
+	//REG_FUNC(0x1F3CC428, sceFiosDHCloseSync);
+	//REG_FUNC(0x2B406DEB, sceFiosDHGetPath);
+	//REG_FUNC(0xEA9855BA, sceFiosDHOpen);
+	//REG_FUNC(0x34BC3713, sceFiosDHOpenSync);
+	//REG_FUNC(0x72A0A851, sceFiosDHRead);
+	//REG_FUNC(0xB7E79CAD, sceFiosDHReadSync);
+	//REG_FUNC(0x280D284A, sceFiosDateFromComponents);
+	//REG_FUNC(0x5C593C1E, sceFiosDateGetCurrent);
+	//REG_FUNC(0x5CFF6EA0, sceFiosDateToComponents);
+	//REG_FUNC(0x44B9F8EB, sceFiosDebugDumpDH);
+	//REG_FUNC(0x159B1FA8, sceFiosDebugDumpDate);
+	//REG_FUNC(0x51E677DF, sceFiosDebugDumpError);
+	//REG_FUNC(0x5506ACAB, sceFiosDebugDumpFH);
+	//REG_FUNC(0xE438D4F0, sceFiosDebugDumpOp);
+	//REG_FUNC(0x764DFA7A, sceFiosDelete);
+	//REG_FUNC(0xAAC54B44, sceFiosDeleteSync);
+	//REG_FUNC(0x9198ED8B, sceFiosDirectoryCreate);
+	//REG_FUNC(0xE037B076, sceFiosDirectoryCreateSync);
+	//REG_FUNC(0xDA93677C, sceFiosDirectoryDelete);
+	//REG_FUNC(0xB9573146, sceFiosDirectoryDeleteSync);
+	//REG_FUNC(0x48D50D97, sceFiosDirectoryExists);
+	//REG_FUNC(0x726E01BE, sceFiosDirectoryExistsSync);
+	//REG_FUNC(0x6F12D8A5, sceFiosExists);
+	//REG_FUNC(0x125EFD34, sceFiosExistsSync);
+	//REG_FUNC(0xA88EDCA8, sceFiosFHClose);
+	//REG_FUNC(0x45182328, sceFiosFHCloseSync);
+	//REG_FUNC(0xC55DB73B, sceFiosFHGetOpenParams);
+	//REG_FUNC(0x37143AE3, sceFiosFHGetPath);
+	//REG_FUNC(0xC5C26581, sceFiosFHGetSize);
+	//REG_FUNC(0xBF699BD4, sceFiosFHOpen);
+	//REG_FUNC(0xC3E7C3DB, sceFiosFHOpenSync);
+	//REG_FUNC(0x6A51E688, sceFiosFHPread);
+	//REG_FUNC(0xE2805059, sceFiosFHPreadSync);
+	//REG_FUNC(0x7C4E0C42, sceFiosFHPreadv);
+	//REG_FUNC(0x4D42F95C, sceFiosFHPreadvSync);
+	//REG_FUNC(0xCF1FAA6F, sceFiosFHPwrite);
+	//REG_FUNC(0x1E962F57, sceFiosFHPwriteSync);
+	//REG_FUNC(0xBBC9AFD5, sceFiosFHPwritev);
+	//REG_FUNC(0x742ADDC4, sceFiosFHPwritevSync);
+	//REG_FUNC(0xB09AFBDF, sceFiosFHRead);
+	//REG_FUNC(0x76945919, sceFiosFHReadSync);
+	//REG_FUNC(0x7DB0AFAF, sceFiosFHReadv);
+	//REG_FUNC(0x1BC977FA, sceFiosFHReadvSync);
+	//REG_FUNC(0xA75F3C4A, sceFiosFHSeek);
+	//REG_FUNC(0xD97C4DF7, sceFiosFHStat);
+	//REG_FUNC(0xF8BEAC88, sceFiosFHStatSync);
+	//REG_FUNC(0xE485F35E, sceFiosFHSync);
+	//REG_FUNC(0xA909CCE3, sceFiosFHSyncSync);
+	//REG_FUNC(0xD7F33130, sceFiosFHTell);
+	//REG_FUNC(0x2B39453B, sceFiosFHTruncate);
+	//REG_FUNC(0xFEF940B7, sceFiosFHTruncateSync);
+	//REG_FUNC(0xE663138E, sceFiosFHWrite);
+	//REG_FUNC(0x984024E5, sceFiosFHWriteSync);
+	//REG_FUNC(0x988DD7FF, sceFiosFHWritev);
+	//REG_FUNC(0x267E6CE3, sceFiosFHWritevSync);
+	//REG_FUNC(0xB647278B, sceFiosFileDelete);
+	//REG_FUNC(0xB5302E30, sceFiosFileDeleteSync);
+	//REG_FUNC(0x8758E62F, sceFiosFileExists);
+	//REG_FUNC(0x233B070C, sceFiosFileExistsSync);
+	//REG_FUNC(0x79D9BB50, sceFiosFileGetSize);
+	//REG_FUNC(0x789215C3, sceFiosFileGetSizeSync);
+	//REG_FUNC(0x84080161, sceFiosFileRead);
+	//REG_FUNC(0x1C488B32, sceFiosFileReadSync);
+	//REG_FUNC(0xC5513E13, sceFiosFileTruncate);
+	//REG_FUNC(0x6E1252B8, sceFiosFileTruncateSync);
+	//REG_FUNC(0x42C278E5, sceFiosFileWrite);
+	//REG_FUNC(0x132B6DE6, sceFiosFileWriteSync);
+	//REG_FUNC(0x681184A2, sceFiosGetAllDHs);
+	//REG_FUNC(0x90AB9195, sceFiosGetAllFHs);
+	//REG_FUNC(0x8F62832C, sceFiosGetAllOps);
+	//REG_FUNC(0xC897F6A7, sceFiosGetDefaultOpAttr);
+	//REG_FUNC(0x30583FCB, sceFiosGetGlobalDefaultOpAttr);
+	//REG_FUNC(0x156EAFDC, sceFiosGetSuspendCount);
+	//REG_FUNC(0xD55B8555, sceFiosIOFilterAdd);
+	//REG_FUNC(0x7C9B14EB, sceFiosIOFilterGetInfo);
+	//REG_FUNC(0x057252F2, sceFiosIOFilterPsarcDearchiver);
+	//REG_FUNC(0x22E35018, sceFiosIOFilterRemove);
+	//REG_FUNC(0x774C2C05, sceFiosInitialize);
+	//REG_FUNC(0x29104BF3, sceFiosIsIdle);
+	//REG_FUNC(0xF4F54E09, sceFiosIsInitialized);
+	//REG_FUNC(0xD2466EA5, sceFiosIsSuspended);
+	//REG_FUNC(0xB309E327, sceFiosIsValidHandle);
+	//REG_FUNC(0x3904F205, sceFiosOpCancel);
+	//REG_FUNC(0xE4EA92FA, sceFiosOpDelete);
+	//REG_FUNC(0x218A43EE, sceFiosOpGetActualCount);
+	//REG_FUNC(0xABFEE706, sceFiosOpGetAttr);
+	//REG_FUNC(0x68C436E4, sceFiosOpGetBuffer);
+	//REG_FUNC(0xBF099E16, sceFiosOpGetError);
+	//REG_FUNC(0xF21213B9, sceFiosOpGetOffset);
+	//REG_FUNC(0x157515CB, sceFiosOpGetPath);
+	//REG_FUNC(0x9C1084C5, sceFiosOpGetRequestCount);
+	//REG_FUNC(0x0C81D80E, sceFiosOpIsCancelled);
+	//REG_FUNC(0x1B9A575E, sceFiosOpIsDone);
+	//REG_FUNC(0x968CADBD, sceFiosOpReschedule);
+	//REG_FUNC(0xE6A66C70, sceFiosOpSyncWait);
+	//REG_FUNC(0x202079F9, sceFiosOpSyncWaitForIO);
+	//REG_FUNC(0x2AC79DFC, sceFiosOpWait);
+	//REG_FUNC(0xCC823B47, sceFiosOpWaitUntil);
+	//REG_FUNC(0x27AE468B, sceFiosOverlayAdd);
+	//REG_FUNC(0xF4C6B72A, sceFiosOverlayGetInfo);
+	//REG_FUNC(0x1C0BCAD5, sceFiosOverlayGetList);
+	//REG_FUNC(0x30F56704, sceFiosOverlayModify);
+	//REG_FUNC(0xF3C84D0F, sceFiosOverlayRemove);
+	//REG_FUNC(0x8A243E74, sceFiosOverlayResolveSync);
+	//REG_FUNC(0x5E75937A, sceFiosPathcmp);
+	//REG_FUNC(0xCC21C849, sceFiosPathncmp);
+	//REG_FUNC(0xAF7FAADF, sceFiosPrintf);
+	//REG_FUNC(0x25E399E5, sceFiosRename);
+	//REG_FUNC(0x030306F4, sceFiosRenameSync);
+	//REG_FUNC(0xD0B19C9F, sceFiosResolve);
+	//REG_FUNC(0x7FF33797, sceFiosResolveSync);
+	//REG_FUNC(0xBF2D3CC1, sceFiosResume);
+	//REG_FUNC(0x4E2FD311, sceFiosSetGlobalDefaultOpAttr);
+	//REG_FUNC(0x5B8D48C4, sceFiosShutdownAndCancelOps);
+	//REG_FUNC(0xFF04AF72, sceFiosStat);
+	//REG_FUNC(0xACBAF3E0, sceFiosStatSync);
+	//REG_FUNC(0x510953DC, sceFiosSuspend);
+	//REG_FUNC(0x2904B539, sceFiosTerminate);
+	//REG_FUNC(0xE76C8EC3, sceFiosTimeGetCurrent);
+	//REG_FUNC(0x35A82737, sceFiosTimeIntervalFromNanoseconds);
+	//REG_FUNC(0x397BF626, sceFiosTimeIntervalToNanoseconds);
+	//REG_FUNC(0x1915052A, sceFiosUpdateParameters);
+	//REG_FUNC(0x5BA4BD6D, sceFiosVprintf);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceFpu.cpp b/rpcs3/Emu/ARMv7/Modules/sceFpu.cpp
new file mode 100644
index 0000000000..2992c6fc58
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceFpu.cpp
@@ -0,0 +1,29 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceFpu;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceFpu, #name, name)
+
+psv_log_base sceFpu("SceFpu", []()
+{
+	sceFpu.on_load = nullptr;
+	sceFpu.on_unload = nullptr;
+	sceFpu.on_stop = nullptr;
+
+	//REG_FUNC(0x33E1AC14, sceFpuSinf);
+	//REG_FUNC(0xDB66BA89, sceFpuCosf);
+	//REG_FUNC(0x6FBDA1C9, sceFpuTanf);
+	//REG_FUNC(0x53FF26AF, sceFpuAtanf);
+	//REG_FUNC(0xC8A4989B, sceFpuAtan2f);
+	//REG_FUNC(0x4D1AE0F1, sceFpuAsinf);
+	//REG_FUNC(0x64A8F9FE, sceFpuAcosf);
+	//REG_FUNC(0x936F0D27, sceFpuLogf);
+	//REG_FUNC(0x19881EC8, sceFpuLog2f);
+	//REG_FUNC(0xABBB6168, sceFpuLog10f);
+	//REG_FUNC(0xEFA16C6E, sceFpuExpf);
+	//REG_FUNC(0xA3A88AD0, sceFpuExp2f);
+	//REG_FUNC(0x35652326, sceFpuExp10f);
+	//REG_FUNC(0xDF622E56, sceFpuPowf);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp
new file mode 100644
index 0000000000..4f23c935cd
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp
@@ -0,0 +1,82 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceHttp;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceHttp, #name, name)
+
+psv_log_base sceHttp("SceHttp", []()
+{
+	sceHttp.on_load = nullptr;
+	sceHttp.on_unload = nullptr;
+	sceHttp.on_stop = nullptr;
+
+	//REG_FUNC(0x214926D9, sceHttpInit);
+	//REG_FUNC(0xC9076666, sceHttpTerm);
+	//REG_FUNC(0xF98CDFA9, sceHttpGetMemoryPoolStats);
+	//REG_FUNC(0x62241DAB, sceHttpCreateTemplate);
+	//REG_FUNC(0xEC85ECFB, sceHttpDeleteTemplate);
+	//REG_FUNC(0xC616C200, sceHttpCreateConnectionWithURL);
+	//REG_FUNC(0xAEB3307E, sceHttpCreateConnection);
+	//REG_FUNC(0xF0F65C15, sceHttpDeleteConnection);
+	//REG_FUNC(0xBD5DA1D0, sceHttpCreateRequestWithURL);
+	//REG_FUNC(0xB0284270, sceHttpCreateRequest);
+	//REG_FUNC(0x3D3D29AD, sceHttpDeleteRequest);
+	//REG_FUNC(0x9CA58B99, sceHttpSendRequest);
+	//REG_FUNC(0x7EDE3979, sceHttpReadData);
+	//REG_FUNC(0xF580D304, sceHttpGetResponseContentLength);
+	//REG_FUNC(0x27071691, sceHttpGetStatusCode);
+	//REG_FUNC(0xEA61662F, sceHttpAbortRequest);
+	//REG_FUNC(0x7B51B122, sceHttpAddRequestHeader);
+	//REG_FUNC(0x5EB5F548, sceHttpRemoveRequestHeader);
+	//REG_FUNC(0x11F6C27F, sceHttpGetAllResponseHeaders);
+	//REG_FUNC(0x03A6C89E, sceHttpParseResponseHeader);
+	//REG_FUNC(0x179C56DB, sceHttpParseStatusLine);
+	//REG_FUNC(0x1DA2A673, sceHttpUriEscape);
+	//REG_FUNC(0x1274D318, sceHttpUriUnescape);
+	//REG_FUNC(0x1D45F24E, sceHttpUriParse);
+	//REG_FUNC(0x47664424, sceHttpUriBuild);
+	//REG_FUNC(0x75027D1D, sceHttpUriMerge);
+	//REG_FUNC(0x50737A3F, sceHttpUriSweepPath);
+	//REG_FUNC(0x37C30C90, sceHttpSetRequestContentLength);
+	//REG_FUNC(0x11EC42D0, sceHttpSetAuthEnabled);
+	//REG_FUNC(0x6727874C, sceHttpGetAuthEnabled);
+	//REG_FUNC(0x34891C3F, sceHttpSetAutoRedirect);
+	//REG_FUNC(0x6EAD73EB, sceHttpGetAutoRedirect);
+	//REG_FUNC(0xE0A3A88D, sceHttpSetAuthInfoCallback);
+	//REG_FUNC(0x4E08167D, sceHttpSetRedirectCallback);
+	//REG_FUNC(0x8455B5B3, sceHttpSetResolveTimeOut);
+	//REG_FUNC(0x9AB56EA7, sceHttpSetResolveRetry);
+	//REG_FUNC(0x237CA86E, sceHttpSetConnectTimeOut);
+	//REG_FUNC(0x8AE3F008, sceHttpSetSendTimeOut);
+	//REG_FUNC(0x94BF196E, sceHttpSetRecvTimeOut);
+	//REG_FUNC(0x27A98BDA, sceHttpSetNonblock);
+	//REG_FUNC(0xD65746BC, sceHttpGetNonblock);
+	//REG_FUNC(0x5CEB6554, sceHttpSetEpollId);
+	//REG_FUNC(0x9E031D7C, sceHttpGetEpollId);
+	//REG_FUNC(0x94F7256A, sceHttpWaitRequest);
+	//REG_FUNC(0x7C99AF67, sceHttpCreateEpoll);
+	//REG_FUNC(0x0F1FD1B3, sceHttpSetEpoll);
+	//REG_FUNC(0xCFB1DA4B, sceHttpUnsetEpoll);
+	//REG_FUNC(0x65FE983F, sceHttpGetEpoll);
+	//REG_FUNC(0x07D9F8BB, sceHttpDestroyEpoll);
+	//REG_FUNC(0xAEE573A3, sceHttpSetCookieEnabled);
+	//REG_FUNC(0x1B6EF66E, sceHttpGetCookieEnabled);
+	//REG_FUNC(0x70220BFA, sceHttpGetCookie);
+	//REG_FUNC(0xBEDB988D, sceHttpAddCookie);
+	//REG_FUNC(0x4259FB9E, sceHttpCookieExport);
+	//REG_FUNC(0x9DF48282, sceHttpCookieImport);
+	//REG_FUNC(0xD4F32A23, sceHttpSetCookieRecvCallback);
+	//REG_FUNC(0x11C03867, sceHttpSetCookieSendCallback);
+	//REG_FUNC(0xAE8D7C33, sceHttpsLoadCert);
+	//REG_FUNC(0x8577833F, sceHttpsUnloadCert);
+	//REG_FUNC(0x9FBE2869, sceHttpsEnableOption);
+	//REG_FUNC(0xC6D60403, sceHttpsDisableOption);
+	//REG_FUNC(0x72CB0741, sceHttpsEnableOptionPrivate);
+	//REG_FUNC(0x00659635, sceHttpsDisableOptionPrivate);
+	//REG_FUNC(0x2B79BDE0, sceHttpsGetSslError);
+	//REG_FUNC(0xA0926037, sceHttpsSetSslCallback);
+	//REG_FUNC(0xF71AA58D, sceHttpsGetCaList);
+	//REG_FUNC(0x56C95D94, sceHttpsFreeCaList);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceIme.cpp b/rpcs3/Emu/ARMv7/Modules/sceIme.cpp
new file mode 100644
index 0000000000..d0e90298d9
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceIme.cpp
@@ -0,0 +1,20 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceIme;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceIme, #name, name)
+
+psv_log_base sceIme("SceIme", []()
+{
+	sceIme.on_load = nullptr;
+	sceIme.on_unload = nullptr;
+	sceIme.on_stop = nullptr;
+
+	//REG_FUNC(0x0E050613, sceImeOpen);
+	//REG_FUNC(0x71D6898A, sceImeUpdate);
+	//REG_FUNC(0x889A8421, sceImeClose);
+	//REG_FUNC(0xD8342D2A, sceImeSetCaret);
+	//REG_FUNC(0x7B1EFAA5, sceImeSetPreeditGeometry);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp b/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp
new file mode 100644
index 0000000000..5ec6f79614
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp
@@ -0,0 +1,24 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceJpeg;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceJpeg, #name, name)
+
+psv_log_base sceJpeg("SceJpeg", []()
+{
+	sceJpeg.on_load = nullptr;
+	sceJpeg.on_unload = nullptr;
+	sceJpeg.on_stop = nullptr;
+
+	//REG_FUNC(0xB030773B, sceJpegInitMJpeg);
+	//REG_FUNC(0x62842598, sceJpegFinishMJpeg);
+	//REG_FUNC(0x6215B095, sceJpegDecodeMJpeg);
+	//REG_FUNC(0x2A769BD8, sceJpegDecodeMJpegYCbCr);
+	//REG_FUNC(0xC2380E3A, sceJpegMJpegCsc);
+	//REG_FUNC(0x353BA9B0, sceJpegGetOutputInfo);
+	//REG_FUNC(0x123B4734, sceJpegCreateSplitDecoder);
+	//REG_FUNC(0xDE8D5FA1, sceJpegDeleteSplitDecoder);
+	//REG_FUNC(0x4598EC9C, sceJpegSplitDecodeMJpeg);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp b/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp
new file mode 100644
index 0000000000..1567f5487d
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp
@@ -0,0 +1,24 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceJpegEnc;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceJpegEnc, #name, name)
+
+psv_log_base sceJpegEnc("SceJpegEnc", []()
+{
+	sceJpegEnc.on_load = nullptr;
+	sceJpegEnc.on_unload = nullptr;
+	sceJpegEnc.on_stop = nullptr;
+
+	//REG_FUNC(0x2B55844D, sceJpegEncoderGetContextSize);
+	//REG_FUNC(0x88DA92B4, sceJpegEncoderInit);
+	//REG_FUNC(0xC60DE94C, sceJpegEncoderEncode);
+	//REG_FUNC(0xC87AA849, sceJpegEncoderEnd);
+	//REG_FUNC(0x9511F3BC, sceJpegEncoderSetValidRegion);
+	//REG_FUNC(0xB2B828EC, sceJpegEncoderSetCompressionRatio);
+	//REG_FUNC(0x2F58B12C, sceJpegEncoderSetHeaderMode);
+	//REG_FUNC(0x25D52D97, sceJpegEncoderSetOutputAddr);
+	//REG_FUNC(0x824A7D4F, sceJpegEncoderCsc);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
index 611be74629..abb831ae32 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
@@ -156,7 +156,7 @@ namespace sce_libc_func
 	{
 		sceLibc.Error("_Assert(text=0x%x, func=0x%x)", text, func);
 
-		LOG_ERROR(TTY, "%s : %s", func.get_ptr(), text.get_ptr());
+		LOG_ERROR(TTY, "%s : %s\n", func.get_ptr(), text.get_ptr());
 		Emu.Pause();
 	}
 }
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp b/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp
new file mode 100644
index 0000000000..4511ca2ae7
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp
@@ -0,0 +1,17 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceLiveArea;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceLiveArea, #name, name)
+
+psv_log_base sceLiveArea("SceLiveArea", []()
+{
+	sceLiveArea.on_load = nullptr;
+	sceLiveArea.on_unload = nullptr;
+	sceLiveArea.on_stop = nullptr;
+
+	//REG_FUNC(0xA4B506F9, sceLiveAreaResourceReplaceAll);
+	//REG_FUNC(0x54A395FB, sceLiveAreaResourceGetStatus);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp b/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp
new file mode 100644
index 0000000000..734f7f62e1
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp
@@ -0,0 +1,34 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceLocation;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceLocation, #name, name)
+
+psv_log_base sceLocation("SceLibLocation", []()
+{
+	sceLocation.on_load = nullptr;
+	sceLocation.on_unload = nullptr;
+	sceLocation.on_stop = nullptr;
+
+	//REG_FUNC(0xDD271661, sceLocationOpen);
+	//REG_FUNC(0x14FE76E8, sceLocationClose);
+	//REG_FUNC(0xB1F55065, sceLocationReopen);
+	//REG_FUNC(0x188CE004, sceLocationGetMethod);
+	//REG_FUNC(0x15BC27C8, sceLocationGetLocation);
+	//REG_FUNC(0x71503251, sceLocationCancelGetLocation);
+	//REG_FUNC(0x12D1F0EA, sceLocationStartLocationCallback);
+	//REG_FUNC(0xED378700, sceLocationStopLocationCallback);
+	//REG_FUNC(0x4E9E5ED9, sceLocationGetHeading);
+	//REG_FUNC(0x07D4DFE0, sceLocationStartHeadingCallback);
+	//REG_FUNC(0x92E53F94, sceLocationStopHeadingCallback);
+	//REG_FUNC(0xE055BCF5, sceLocationSetHeapAllocator);
+	//REG_FUNC(0xC895E567, sceLocationConfirm);
+	//REG_FUNC(0x730FF842, sceLocationConfirmGetStatus);
+	//REG_FUNC(0xFF016C13, sceLocationConfirmGetResult);
+	//REG_FUNC(0xE3CBF875, sceLocationConfirmAbort);
+	//REG_FUNC(0x482622C6, sceLocationGetPermission);
+	//REG_FUNC(0xDE0A9EA4, sceLocationSetGpsEmulationFile);
+	//REG_FUNC(0x760D08FF, sceLocationConfirmSetMessage);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp b/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp
new file mode 100644
index 0000000000..aed0422ed4
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp
@@ -0,0 +1,19 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceMd5;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceMd5, #name, name)
+
+psv_log_base sceMd5("SceMd5", []()
+{
+	sceMd5.on_load = nullptr;
+	sceMd5.on_unload = nullptr;
+	sceMd5.on_stop = nullptr;
+
+	//REG_FUNC(0xB845BCCB, sceMd5Digest);
+	//REG_FUNC(0x4D6436F9, sceMd5BlockInit);
+	//REG_FUNC(0x094A4902, sceMd5BlockUpdate);
+	//REG_FUNC(0xB94ABF83, sceMd5BlockResult);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp b/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp
new file mode 100644
index 0000000000..bc86726bb2
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp
@@ -0,0 +1,31 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceMotion;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceMotion, #name, name)
+
+psv_log_base sceMotion("SceMotion", []()
+{
+	sceMotion.on_load = nullptr;
+	sceMotion.on_unload = nullptr;
+	sceMotion.on_stop = nullptr;
+
+	//REG_FUNC(0xBDB32767, sceMotionGetState);
+	//REG_FUNC(0x47D679EA, sceMotionGetSensorState);
+	//REG_FUNC(0xC1652201, sceMotionGetTiltCorrection);
+	//REG_FUNC(0xAF09FCDB, sceMotionSetTiltCorrection);
+	//REG_FUNC(0x112E0EAE, sceMotionGetDeadband);
+	//REG_FUNC(0x917EA390, sceMotionSetDeadband);
+	//REG_FUNC(0x20F00078, sceMotionRotateYaw);
+	//REG_FUNC(0x0FD2CDA2, sceMotionReset);
+	//REG_FUNC(0x28034AC9, sceMotionStartSampling);
+	//REG_FUNC(0xAF32CB1D, sceMotionStopSampling);
+	//REG_FUNC(0xDACB2A41, sceMotionSetAngleThreshold);
+	//REG_FUNC(0x499B6C87, sceMotionGetAngleThreshold);
+	//REG_FUNC(0x4F28BFE0, sceMotionGetBasicOrientation);
+	//REG_FUNC(0x122A79F8, sceMotionMagnetometerOn);
+	//REG_FUNC(0xC1A7395A, sceMotionMagnetometerOff);
+	//REG_FUNC(0x3D4813AE, sceMotionGetMagnetometerState);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp b/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp
new file mode 100644
index 0000000000..3893d344bf
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp
@@ -0,0 +1,17 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceMt19937;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceMt19937, #name, name)
+
+psv_log_base sceMt19937("SceMt19937", []()
+{
+	sceMt19937.on_load = nullptr;
+	sceMt19937.on_unload = nullptr;
+	sceMt19937.on_stop = nullptr;
+
+	//REG_FUNC(0xEE5BA27C, sceMt19937Init);
+	//REG_FUNC(0x29E43BB5, sceMt19937UInt);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNet.cpp b/rpcs3/Emu/ARMv7/Modules/sceNet.cpp
new file mode 100644
index 0000000000..f68a283618
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceNet.cpp
@@ -0,0 +1,73 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceNet;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceNet, #name, name)
+
+psv_log_base sceNet("SceNet", []()
+{
+	sceNet.on_load = nullptr;
+	sceNet.on_unload = nullptr;
+	sceNet.on_stop = nullptr;
+
+	//REG_FUNC(0xD62EF218, sceNetSetDnsInfo);
+	//REG_FUNC(0xFEC1166D, sceNetClearDnsCache);
+	//REG_FUNC(0xAFF9FA4D, sceNetDumpCreate);
+	//REG_FUNC(0x04042925, sceNetDumpRead);
+	//REG_FUNC(0x82DDCF63, sceNetDumpDestroy);
+	//REG_FUNC(0x3B24E75F, sceNetDumpAbort);
+	//REG_FUNC(0xF9D102AE, sceNetEpollCreate);
+	//REG_FUNC(0x4C8764AC, sceNetEpollControl);
+	//REG_FUNC(0x45CE337D, sceNetEpollWait);
+	//REG_FUNC(0x92D3E767, sceNetEpollWaitCB);
+	//REG_FUNC(0x7915CAF3, sceNetEpollDestroy);
+	//REG_FUNC(0x93FCC4E8, sceNetEpollAbort);
+	//REG_FUNC(0xE37F34AA, sceNetErrnoLoc);
+	//REG_FUNC(0xEEC6D75F, sceNetEtherStrton);
+	//REG_FUNC(0x84334EB2, sceNetEtherNtostr);
+	//REG_FUNC(0x06C05518, sceNetGetMacAddress);
+	//REG_FUNC(0x98839B74, sceNetInetNtop);
+	//REG_FUNC(0xD5EEB048, sceNetInetPton);
+	//REG_FUNC(0x12C19209, sceNetHtonll);
+	//REG_FUNC(0x4C30B03C, sceNetHtonl);
+	//REG_FUNC(0x9FA3207B, sceNetHtons);
+	//REG_FUNC(0xFB3336A6, sceNetNtohll);
+	//REG_FUNC(0xD2EAA645, sceNetNtohl);
+	//REG_FUNC(0x07845128, sceNetNtohs);
+	//REG_FUNC(0xEB03E265, sceNetInit);
+	//REG_FUNC(0xEA3CC286, sceNetTerm);
+	//REG_FUNC(0x658B903B, sceNetShowIfconfig);
+	//REG_FUNC(0x6AB3B74B, sceNetShowRoute);
+	//REG_FUNC(0x338EDC2E, sceNetShowNetstat);
+	//REG_FUNC(0x561DFD03, sceNetEmulationSet);
+	//REG_FUNC(0xAE3F4AC6, sceNetEmulationGet);
+	//REG_FUNC(0x6DA29319, sceNetResolverCreate);
+	//REG_FUNC(0x1EB11857, sceNetResolverStartNtoa);
+	//REG_FUNC(0x0424AE26, sceNetResolverStartAton);
+	//REG_FUNC(0x874EF500, sceNetResolverGetError);
+	//REG_FUNC(0x3559F098, sceNetResolverDestroy);
+	//REG_FUNC(0x38EBBD57, sceNetResolverAbort);
+	//REG_FUNC(0xF084FCE3, sceNetSocket);
+	//REG_FUNC(0x1ADF9BB1, sceNetAccept);
+	//REG_FUNC(0x1296A94B, sceNetBind);
+	//REG_FUNC(0x11E5B6F6, sceNetConnect);
+	//REG_FUNC(0x2348D353, sceNetGetpeername);
+	//REG_FUNC(0x1C66A6DB, sceNetGetsockname);
+	//REG_FUNC(0xBA652062, sceNetGetsockopt);
+	//REG_FUNC(0x7A8DA094, sceNetListen);
+	//REG_FUNC(0x023643B7, sceNetRecv);
+	//REG_FUNC(0xB226138B, sceNetRecvfrom);
+	//REG_FUNC(0xDE94C6FE, sceNetRecvmsg);
+	//REG_FUNC(0xE3DD8CD9, sceNetSend);
+	//REG_FUNC(0x52DB31D5, sceNetSendto);
+	//REG_FUNC(0x99C579AE, sceNetSendmsg);
+	//REG_FUNC(0x065505CA, sceNetSetsockopt);
+	//REG_FUNC(0x69E50BB5, sceNetShutdown);
+	//REG_FUNC(0x29822B4D, sceNetSocketClose);
+	//REG_FUNC(0x891C1B9B, sceNetSocketAbort);
+	//REG_FUNC(0xB1AF6840, sceNetGetSockInfo);
+	//REG_FUNC(0x138CF1D6, sceNetGetSockIdInfo);
+	//REG_FUNC(0xA86F8FE5, sceNetGetStatisticsInfo);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp b/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp
new file mode 100644
index 0000000000..cde7d28916
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp
@@ -0,0 +1,31 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceNetCtl;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceNetCtl, #name, name)
+
+psv_log_base sceNetCtl("SceNetCtl", []()
+{
+	sceNetCtl.on_load = nullptr;
+	sceNetCtl.on_unload = nullptr;
+	sceNetCtl.on_stop = nullptr;
+
+	//REG_FUNC(0x495CA1DB, sceNetCtlInit);
+	//REG_FUNC(0xCD188648, sceNetCtlTerm);
+	//REG_FUNC(0xDFFC3ED4, sceNetCtlCheckCallback);
+	//REG_FUNC(0x6B20EC02, sceNetCtlInetGetResult);
+	//REG_FUNC(0x7AE0ED19, sceNetCtlAdhocGetResult);
+	//REG_FUNC(0xB26D07F3, sceNetCtlInetGetInfo);
+	//REG_FUNC(0x6D26AC68, sceNetCtlInetGetState);
+	//REG_FUNC(0xEAEE6185, sceNetCtlInetRegisterCallback);
+	//REG_FUNC(0xD0C3BF3F, sceNetCtlInetUnregisterCallback);
+	//REG_FUNC(0x4DDD6149, sceNetCtlGetNatInfo);
+	//REG_FUNC(0x0961A561, sceNetCtlAdhocGetState);
+	//REG_FUNC(0xFFA9D594, sceNetCtlAdhocRegisterCallback);
+	//REG_FUNC(0xA4471E10, sceNetCtlAdhocUnregisterCallback);
+	//REG_FUNC(0xED43B79A, sceNetCtlAdhocDisconnect);
+	//REG_FUNC(0x77586C59, sceNetCtlAdhocGetPeerList);
+	//REG_FUNC(0x7118C99D, sceNetCtlAdhocGetInAddr);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp b/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp
new file mode 100644
index 0000000000..5798792b12
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp
@@ -0,0 +1,78 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceNgs;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceNgs, #name, name)
+
+psv_log_base sceNgs("SceNgs", []()
+{
+	sceNgs.on_load = nullptr;
+	sceNgs.on_unload = nullptr;
+	sceNgs.on_stop = nullptr;
+
+	//REG_FUNC(0x6CE8B36F, sceNgsSystemGetRequiredMemorySize);
+	//REG_FUNC(0xED14CF4A, sceNgsSystemInit);
+	//REG_FUNC(0x684F080C, sceNgsSystemUpdate);
+	//REG_FUNC(0x4A25BEBC, sceNgsSystemRelease);
+	//REG_FUNC(0xB9D971F2, sceNgsSystemLock);
+	//REG_FUNC(0x0A93EA96, sceNgsSystemUnlock);
+	//REG_FUNC(0x5ADD22DC, sceNgsSystemSetParamErrorCallback);
+	//REG_FUNC(0x64D80013, sceNgsSystemSetFlags);
+	//REG_FUNC(0x477318C0, sceNgsRackGetRequiredMemorySize);
+	//REG_FUNC(0x0A92E4EC, sceNgsRackInit);
+	//REG_FUNC(0xFE1A98E9, sceNgsRackGetVoiceHandle);
+	//REG_FUNC(0xDD5CA10B, sceNgsRackRelease);
+	//REG_FUNC(0x534B6E3F, sceNgsRackSetParamErrorCallback);
+	//REG_FUNC(0x1DDBEBEB, sceNgsVoiceInit);
+	//REG_FUNC(0xFA0A0F34, sceNgsVoicePlay);
+	//REG_FUNC(0xBB13373D, sceNgsVoiceKeyOff);
+	//REG_FUNC(0x0E291AAD, sceNgsVoiceKill);
+	//REG_FUNC(0xD7786E99, sceNgsVoicePause);
+	//REG_FUNC(0x54CFB981, sceNgsVoiceResume);
+	//REG_FUNC(0x8A88E665, sceNgsVoiceSetPreset);
+	//REG_FUNC(0xAB6BEF8F, sceNgsVoiceLockParams);
+	//REG_FUNC(0x3D46D8A7, sceNgsVoiceUnlockParams);
+	//REG_FUNC(0xFB8174B1, sceNgsVoiceSetParamsBlock);
+	//REG_FUNC(0x9AB87E71, sceNgsVoiceBypassModule);
+	//REG_FUNC(0x24E909A8, sceNgsVoiceSetModuleCallback);
+	//REG_FUNC(0x17A6F564, sceNgsVoiceSetFinishedCallback);
+	//REG_FUNC(0xC9B8C0B4, sceNgsVoiceGetStateData);
+	//REG_FUNC(0x5551410D, sceNgsVoiceGetInfo);
+	//REG_FUNC(0xB307185E, sceNgsVoiceGetModuleType);
+	//REG_FUNC(0x431BF3AB, sceNgsVoiceGetModuleBypass);
+	//REG_FUNC(0xD668B49C, sceNgsPatchCreateRouting);
+	//REG_FUNC(0x98703DBC, sceNgsPatchGetInfo);
+	//REG_FUNC(0x01A52E3A, sceNgsVoiceGetOutputPatch);
+	//REG_FUNC(0xD0C9AE5A, sceNgsPatchRemoveRouting);
+	//REG_FUNC(0xA3C807BC, sceNgsVoicePatchSetVolume);
+	//REG_FUNC(0xBD6F57F0, sceNgsVoicePatchSetVolumes);
+	//REG_FUNC(0xA0F5402D, sceNgsVoicePatchSetVolumesMatrix);
+	//REG_FUNC(0xF6B68C31, sceNgsVoiceDefGetEnvelopeBuss);
+	//REG_FUNC(0x9DCF50F5, sceNgsVoiceDefGetReverbBuss);
+	//REG_FUNC(0x214485D6, sceNgsVoiceDefGetPauserBuss);
+	//REG_FUNC(0xE0AC8776, sceNgsVoiceDefGetMixerBuss);
+	//REG_FUNC(0x79A121D1, sceNgsVoiceDefGetMasterBuss);
+	//REG_FUNC(0x0E0ACB68, sceNgsVoiceDefGetCompressorBuss);
+	//REG_FUNC(0x1AF83512, sceNgsVoiceDefGetCompressorSideChainBuss);
+	//REG_FUNC(0xAAD90DEB, sceNgsVoiceDefGetDistortionBuss);
+	//REG_FUNC(0xF964120E, sceNgsVoiceDefGetEqBuss);
+	//REG_FUNC(0xE9B572B7, sceNgsVoiceDefGetTemplate1);
+	//REG_FUNC(0x0D5399CF, sceNgsVoiceDefGetSimpleVoice);
+	//REG_FUNC(0x1F51C2BA, sceNgsVoiceDefGetSasEmuVoice);
+	//REG_FUNC(0x4CBE08F3, sceNgsVoiceGetParamsOutOfRange);
+	//REG_FUNC(0x14EF65A0, sceNgsVoiceDefGetAtrac9Voice);
+	//REG_FUNC(0x4D705E3E, sceNgsVoiceDefGetDelayBuss);
+	//REG_FUNC(0x5FD8AEDB, sceSulphaNgsGetDefaultConfig);
+	//REG_FUNC(0x793E3E8C, sceSulphaNgsGetNeededMemory);
+	//REG_FUNC(0xAFCD824F, sceSulphaNgsInit);
+	//REG_FUNC(0xD124BFB1, sceSulphaNgsShutdown);
+	//REG_FUNC(0x2F3F7515, sceSulphaNgsSetSynthName);
+	//REG_FUNC(0x251AF6A9, sceSulphaNgsSetRackName);
+	//REG_FUNC(0x508975BD, sceSulphaNgsSetVoiceName);
+	//REG_FUNC(0x54EC5B8D, sceSulphaNgsSetSampleName);
+	//REG_FUNC(0xDC7C0F05, sceSulphaNgsTrace);
+	//REG_FUNC(0x5C71FE09, sceNgsModuleGetNumPresets);
+	//REG_FUNC(0xC58298A7, sceNgsModuleGetPreset);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp
new file mode 100644
index 0000000000..1afa85a9cc
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp
@@ -0,0 +1,33 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceNpBasic;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpBasic, #name, name)
+
+psv_log_base sceNpBasic("SceNpBasic", []()
+{
+	sceNpBasic.on_load = nullptr;
+	sceNpBasic.on_unload = nullptr;
+	sceNpBasic.on_stop = nullptr;
+
+	//REG_FUNC(0xEFB91A99, sceNpBasicInit);
+	//REG_FUNC(0x389BCB3B, sceNpBasicTerm);
+	//REG_FUNC(0x26E6E048, sceNpBasicRegisterHandler);
+	//REG_FUNC(0x050AE072, sceNpBasicUnregisterHandler);
+	//REG_FUNC(0x20146AEC, sceNpBasicCheckCallback);
+	//REG_FUNC(0x5183A4B5, sceNpBasicGetFriendOnlineStatus);
+	//REG_FUNC(0xEF8A91BC, sceNpBasicGetGamePresenceOfFriend);
+	//REG_FUNC(0xDF41F308, sceNpBasicGetFriendListEntryCount);
+	//REG_FUNC(0xFF07E787, sceNpBasicGetFriendListEntries);
+	//REG_FUNC(0x407E1E6F, sceNpBasicGetBlockListEntryCount);
+	//REG_FUNC(0x1211AE8E, sceNpBasicGetBlockListEntries);
+	//REG_FUNC(0xF51545D8, sceNpBasicCheckIfPlayerIsBlocked);
+	//REG_FUNC(0x51D75562, sceNpBasicSetInGamePresence);
+	//REG_FUNC(0xD20C2370, sceNpBasicUnsetInGamePresence);
+	//REG_FUNC(0x7A5020A5, sceNpBasicSendInGameDataMessage);
+	//REG_FUNC(0x3B0A7F47, sceNpBasicRecordPlaySessionLog);
+	//REG_FUNC(0xFB0F7FDF, sceNpBasicGetPlaySessionLogSize);
+	//REG_FUNC(0x364531A8, sceNpBasicGetPlaySessionLog);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp
new file mode 100644
index 0000000000..4422bee950
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp
@@ -0,0 +1,26 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceNpCommon;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpCommon, #name, name)
+
+psv_log_base sceNpCommon("SceNpCommon", []()
+{
+	sceNpCommon.on_load = nullptr;
+	sceNpCommon.on_unload = nullptr;
+	sceNpCommon.on_stop = nullptr;
+
+	//REG_FUNC(0x441D8B4E, sceNpAuthInit);
+	//REG_FUNC(0x6093B689, sceNpAuthTerm);
+	//REG_FUNC(0xED42079F, sceNpAuthCreateStartRequest);
+	//REG_FUNC(0x14FC18AF, sceNpAuthDestroyRequest);
+	//REG_FUNC(0xE2582575, sceNpAuthAbortRequest);
+	//REG_FUNC(0x59608D1C, sceNpAuthGetTicket);
+	//REG_FUNC(0xC1E23E01, sceNpAuthGetTicketParam);
+	//REG_FUNC(0x3377CD37, sceNpAuthGetEntitlementIdList);
+	//REG_FUNC(0xF93842F0, sceNpAuthGetEntitlementById);
+	//REG_FUNC(0xFB8D82E5, sceNpCmpNpId);
+	//REG_FUNC(0x6BC8150A, sceNpCmpNpIdInOrder);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp
new file mode 100644
index 0000000000..4771107b92
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp
@@ -0,0 +1,25 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceNpManager;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpManager, #name, name)
+
+psv_log_base sceNpManager("SceNpManager", []()
+{
+	sceNpManager.on_load = nullptr;
+	sceNpManager.on_unload = nullptr;
+	sceNpManager.on_stop = nullptr;
+
+	//REG_FUNC(0x04D9F484, sceNpInit);
+	//REG_FUNC(0x19E40AE1, sceNpTerm);
+	//REG_FUNC(0x3C94B4B4, sceNpManagerGetNpId);
+	//REG_FUNC(0x54060DF6, sceNpGetServiceState);
+	//REG_FUNC(0x44239C35, sceNpRegisterServiceStateCallback);
+	//REG_FUNC(0xD9E6E56C, sceNpUnregisterServiceStateCallback);
+	//REG_FUNC(0x3B0AE9A9, sceNpCheckCallback);
+	//REG_FUNC(0xFE835967, sceNpManagerGetAccountRegion);
+	//REG_FUNC(0xAF0073B2, sceNpManagerGetContentRatingFlag);
+	//REG_FUNC(0x60C575B1, sceNpManagerGetChatRestrictionFlag);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp
new file mode 100644
index 0000000000..ffc7d962a7
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp
@@ -0,0 +1,46 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceNpMatching;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpMatching, #name, name)
+
+psv_log_base sceNpMatching("SceNpMatching2", []()
+{
+	sceNpMatching.on_load = nullptr;
+	sceNpMatching.on_unload = nullptr;
+	sceNpMatching.on_stop = nullptr;
+
+	//REG_FUNC(0xEBB1FE74, sceNpMatching2Init);
+	//REG_FUNC(0x0124641C, sceNpMatching2Term);
+	//REG_FUNC(0xADF578E1, sceNpMatching2CreateContext);
+	//REG_FUNC(0x368AA759, sceNpMatching2DestroyContext);
+	//REG_FUNC(0xBB2E7559, sceNpMatching2ContextStart);
+	//REG_FUNC(0xF2847E3B, sceNpMatching2AbortContextStart);
+	//REG_FUNC(0x506454DE, sceNpMatching2ContextStop);
+	//REG_FUNC(0xF3A43C50, sceNpMatching2SetDefaultRequestOptParam);
+	//REG_FUNC(0xF486991B, sceNpMatching2RegisterRoomEventCallback);
+	//REG_FUNC(0xFA51949B, sceNpMatching2RegisterRoomMessageCallback);
+	//REG_FUNC(0xF9E35566, sceNpMatching2RegisterContextCallback);
+	//REG_FUNC(0x74EB6CE9, sceNpMatching2AbortRequest);
+	//REG_FUNC(0x7BD39E50, sceNpMatching2GetMemoryInfo);
+	//REG_FUNC(0x65C0FEED, sceNpMatching2GetServerLocal);
+	//REG_FUNC(0xC086B560, sceNpMatching2GetWorldInfoList);
+	//REG_FUNC(0x818A9499, sceNpMatching2CreateJoinRoom);
+	//REG_FUNC(0xD48BAF13, sceNpMatching2SearchRoom);
+	//REG_FUNC(0x33F7D5AE, sceNpMatching2JoinRoom);
+	//REG_FUNC(0xC8B0C9EE, sceNpMatching2LeaveRoom);
+	//REG_FUNC(0x495D2B46, sceNpMatching2GetSignalingOptParamLocal);
+	//REG_FUNC(0xE0BE0510, sceNpMatching2SendRoomChatMessage);
+	//REG_FUNC(0x7B908D99, sceNpMatching2SendRoomMessage);
+	//REG_FUNC(0x4E4C55BD, sceNpMatching2SignalingGetConnectionStatus);
+	//REG_FUNC(0x20598618, sceNpMatching2SignalingGetConnectionInfo);
+	//REG_FUNC(0x79310806, sceNpMatching2SignalingGetLocalNetInfo);
+	//REG_FUNC(0xF0CB1DD3, sceNpMatching2SignalingGetPeerNetInfo);
+	//REG_FUNC(0xADCD102C, sceNpMatching2SignalingCancelPeerNetInfo);
+	//REG_FUNC(0xFDC7B2C9, sceNpMatching2SignalingGetPeerNetInfoResult);
+	//REG_FUNC(0x1C60BC5B, sceNpMatching2RegisterSignalingCallback);
+	//REG_FUNC(0x8F88AC7E, sceNpMatching2SetRoomDataExternal);
+	//REG_FUNC(0xA8021394, sceNpMatching2KickoutRoomMember);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp
new file mode 100644
index 0000000000..612114af70
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp
@@ -0,0 +1,44 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceNpScore;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpScore, #name, name)
+
+psv_log_base sceNpScore("SceNpScore", []()
+{
+	sceNpScore.on_load = nullptr;
+	sceNpScore.on_unload = nullptr;
+	sceNpScore.on_stop = nullptr;
+
+	//REG_FUNC(0x0433069F, sceNpScoreInit);
+	//REG_FUNC(0x2050F98F, sceNpScoreTerm);
+	//REG_FUNC(0x5685F225, sceNpScoreCreateTitleCtx);
+	//REG_FUNC(0xD30D1993, sceNpScoreCreateRequest);
+	//REG_FUNC(0xF52EA88A, sceNpScoreDeleteTitleCtx);
+	//REG_FUNC(0xFFF24BB1, sceNpScoreDeleteRequest);
+	//REG_FUNC(0x320C0277, sceNpScoreRecordScore);
+	//REG_FUNC(0x24B09634, sceNpScoreRecordScoreAsync);
+	//REG_FUNC(0xC2862B67, sceNpScoreRecordGameData);
+	//REG_FUNC(0x40573917, sceNpScoreRecordGameDataAsync);
+	//REG_FUNC(0xDFAD64D3, sceNpScoreGetGameData);
+	//REG_FUNC(0xCE416993, sceNpScoreGetGameDataAsync);
+	//REG_FUNC(0x427D3412, sceNpScoreGetRankingByRange);
+	//REG_FUNC(0xC45E3FCD, sceNpScoreGetRankingByRangeAsync);
+	//REG_FUNC(0xBAE55B34, sceNpScoreGetRankingByNpId);
+	//REG_FUNC(0x45CD1D00, sceNpScoreGetRankingByNpIdAsync);
+	//REG_FUNC(0x871F28AA, sceNpScoreGetRankingByNpIdPcId);
+	//REG_FUNC(0xCE3A9544, sceNpScoreGetRankingByNpIdPcIdAsync);
+	//REG_FUNC(0xA7E93CE1, sceNpScoreAbortRequest);
+	//REG_FUNC(0x31733BF3, sceNpScoreWaitAsync);
+	//REG_FUNC(0x9F2A7AC9, sceNpScorePollAsync);
+	//REG_FUNC(0x00F90E7B, sceNpScoreGetBoardInfo);
+	//REG_FUNC(0x3CD9974E, sceNpScoreGetBoardInfoAsync);
+	//REG_FUNC(0xA0C94D46, sceNpScoreCensorComment);
+	//REG_FUNC(0xAA0BBF8E, sceNpScoreCensorCommentAsync);
+	//REG_FUNC(0x6FD2041A, sceNpScoreSanitizeComment);
+	//REG_FUNC(0x15981858, sceNpScoreSanitizeCommentAsync);
+	//REG_FUNC(0x5EF44841, sceNpScoreSetTimeout);
+	//REG_FUNC(0x53D77883, sceNpScoreSetPlayerCharacterId);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp
new file mode 100644
index 0000000000..5ce2ca80ad
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp
@@ -0,0 +1,35 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceNpUtility;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpUtility, #name, name)
+
+psv_log_base sceNpUtility("SceNpUtility", []()
+{
+	sceNpUtility.on_load = nullptr;
+	sceNpUtility.on_unload = nullptr;
+	sceNpUtility.on_stop = nullptr;
+
+	//REG_FUNC(0x9246A673, sceNpLookupInit);
+	//REG_FUNC(0x0158B61B, sceNpLookupTerm);
+	//REG_FUNC(0x5110E17E, sceNpLookupCreateTitleCtx);
+	//REG_FUNC(0x33B64699, sceNpLookupDeleteTitleCtx);
+	//REG_FUNC(0x9E42E922, sceNpLookupCreateRequest);
+	//REG_FUNC(0x8B608BF6, sceNpLookupDeleteRequest);
+	//REG_FUNC(0x027587C4, sceNpLookupAbortRequest);
+	//REG_FUNC(0xB0C9DC45, sceNpLookupSetTimeout);
+	//REG_FUNC(0xCF956F23, sceNpLookupWaitAsync);
+	//REG_FUNC(0xFCDBA234, sceNpLookupPollAsync);
+	//REG_FUNC(0xB1A14879, sceNpLookupNpId);
+	//REG_FUNC(0x5387BABB, sceNpLookupNpIdAsync);
+	//REG_FUNC(0x6A1BF429, sceNpLookupUserProfile);
+	//REG_FUNC(0xE5285E0F, sceNpLookupUserProfileAsync);
+	//REG_FUNC(0xFDB0AE47, sceNpLookupAvatarImage);
+	//REG_FUNC(0x282BD43C, sceNpLookupAvatarImageAsync);
+	//REG_FUNC(0x081FA13C, sceNpBandwidthTestInitStart);
+	//REG_FUNC(0xE0EBFBF6, sceNpBandwidthTestGetStatus);
+	//REG_FUNC(0x58D92EFD, sceNpBandwidthTestShutdown);
+	//REG_FUNC(0x32B068C4, sceNpBandwidthTestAbort);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/scePgf.cpp b/rpcs3/Emu/ARMv7/Modules/scePgf.cpp
new file mode 100644
index 0000000000..c4a1f21065
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/scePgf.cpp
@@ -0,0 +1,38 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base scePgf;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &scePgf, #name, name)
+
+psv_log_base scePgf("ScePgf", []()
+{
+	scePgf.on_load = nullptr;
+	scePgf.on_unload = nullptr;
+	scePgf.on_stop = nullptr;
+
+	//REG_FUNC(0x1055ABA3, sceFontNewLib);
+	//REG_FUNC(0x07EE1733, sceFontDoneLib);
+	//REG_FUNC(0xDE47674C, sceFontSetResolution);
+	//REG_FUNC(0x9F842307, sceFontGetNumFontList);
+	//REG_FUNC(0xD56DCCEA, sceFontGetFontList);
+	//REG_FUNC(0x8DFBAE1B, sceFontFindOptimumFont);
+	//REG_FUNC(0x51061D87, sceFontFindFont);
+	//REG_FUNC(0xAB034738, sceFontGetFontInfoByIndexNumber);
+	//REG_FUNC(0xBD2DFCFF, sceFontOpen);
+	//REG_FUNC(0xE260E740, sceFontOpenUserFile);
+	//REG_FUNC(0xB23ED47C, sceFontOpenUserMemory);
+	//REG_FUNC(0x4A7293E9, sceFontClose);
+	//REG_FUNC(0xF9414FA2, sceFontGetFontInfo);
+	//REG_FUNC(0x6FD1BA65, sceFontGetCharInfo);
+	//REG_FUNC(0x70C86B3E, sceFontGetCharImageRect);
+	//REG_FUNC(0xAB45AAD3, sceFontGetCharGlyphImage);
+	//REG_FUNC(0xEB589530, sceFontGetCharGlyphImage_Clip);
+	//REG_FUNC(0x9E38F4D6, sceFontPixelToPointH);
+	//REG_FUNC(0x7B45E2D1, sceFontPixelToPointV);
+	//REG_FUNC(0x39B9AEFF, sceFontPointToPixelH);
+	//REG_FUNC(0x03F10EC8, sceFontPointToPixelV);
+	//REG_FUNC(0x8D5B44DF, sceFontSetAltCharacterCode);
+	//REG_FUNC(0x7D8CB13B, sceFontFlush);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp b/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp
new file mode 100644
index 0000000000..2fab7c29d4
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp
@@ -0,0 +1,17 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base scePhotoExport;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &scePhotoExport, #name, name)
+
+psv_log_base scePhotoExport("ScePhotoExport", []()
+{
+	scePhotoExport.on_load = nullptr;
+	scePhotoExport.on_unload = nullptr;
+	scePhotoExport.on_stop = nullptr;
+
+	//REG_FUNC(0x70512321, scePhotoExportFromData);
+	//REG_FUNC(0x84FD9FC5, scePhotoExportFromFile);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp b/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp
new file mode 100644
index 0000000000..4eaeb11070
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp
@@ -0,0 +1,18 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceRazorCapture;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceRazorCapture, #name, name)
+
+psv_log_base sceRazorCapture("SceRazorCapture", []()
+{
+	sceRazorCapture.on_load = nullptr;
+	sceRazorCapture.on_unload = nullptr;
+	sceRazorCapture.on_stop = nullptr;
+
+	//REG_FUNC(0x911E0AA0, sceRazorCaptureIsInProgress);
+	//REG_FUNC(0xE916B538, sceRazorCaptureSetTrigger);
+	//REG_FUNC(0x3D4B7E68, sceRazorCaptureSetTriggerNextFrame);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp b/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp
new file mode 100644
index 0000000000..72d81d8e15
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp
@@ -0,0 +1,52 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceRtc;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceRtc, #name, name)
+
+psv_log_base sceRtc("SceRtc", []()
+{
+	sceRtc.on_load = nullptr;
+	sceRtc.on_unload = nullptr;
+	sceRtc.on_stop = nullptr;
+
+	//REG_FUNC(0x23F79274, sceRtcGetCurrentTick);
+	//REG_FUNC(0xCDDD25FE, sceRtcGetCurrentNetworkTick);
+	//REG_FUNC(0x70FDE8F1, sceRtcGetCurrentClock);
+	//REG_FUNC(0x0572EDDC, sceRtcGetCurrentClockLocalTime);
+	//REG_FUNC(0x1282C436, sceRtcConvertUtcToLocalTime);
+	//REG_FUNC(0x0A05E201, sceRtcConvertLocalTimeToUtc);
+	//REG_FUNC(0x42CA8EB5, sceRtcFormatRFC2822LocalTime);
+	//REG_FUNC(0x147F2138, sceRtcFormatRFC2822);
+	//REG_FUNC(0x742250A9, sceRtcFormatRFC3339LocalTime);
+	//REG_FUNC(0xCCEA2B54, sceRtcFormatRFC3339);
+	//REG_FUNC(0xF17FD8B5, sceRtcIsLeapYear);
+	//REG_FUNC(0x49EB4556, sceRtcGetDaysInMonth);
+	//REG_FUNC(0x2F3531EB, sceRtcGetDayOfWeek);
+	//REG_FUNC(0xD7622935, sceRtcCheckValid);
+	//REG_FUNC(0x3A332F81, sceRtcSetTime_t);
+	//REG_FUNC(0xA6C36B6A, sceRtcSetTime64_t);
+	//REG_FUNC(0x8DE6FEB7, sceRtcGetTime_t);
+	//REG_FUNC(0xC995DE02, sceRtcGetTime64_t);
+	//REG_FUNC(0xF8B22B07, sceRtcSetDosTime);
+	//REG_FUNC(0x92ABEBAF, sceRtcGetDosTime);
+	//REG_FUNC(0xA79A8846, sceRtcSetWin32FileTime);
+	//REG_FUNC(0x8A95E119, sceRtcGetWin32FileTime);
+	//REG_FUNC(0x811313B3, sceRtcGetTickResolution);
+	//REG_FUNC(0xCD89F464, sceRtcSetTick);
+	//REG_FUNC(0xF2B238E2, sceRtcGetTick);
+	//REG_FUNC(0xC7385158, sceRtcCompareTick);
+	//REG_FUNC(0x4559E2DB, sceRtcTickAddTicks);
+	//REG_FUNC(0xAE26D920, sceRtcTickAddMicroseconds);
+	//REG_FUNC(0x979AFD79, sceRtcTickAddSeconds);
+	//REG_FUNC(0x4C358871, sceRtcTickAddMinutes);
+	//REG_FUNC(0x6F193F55, sceRtcTickAddHours);
+	//REG_FUNC(0x58DE3C70, sceRtcTickAddDays);
+	//REG_FUNC(0xE713C640, sceRtcTickAddWeeks);
+	//REG_FUNC(0x6321B4AA, sceRtcTickAddMonths);
+	//REG_FUNC(0xDF6C3E1B, sceRtcTickAddYears);
+	//REG_FUNC(0x2347CE12, sceRtcParseDateTime);
+	//REG_FUNC(0x2D18AEEC, sceRtcParseRFC3339);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSas.cpp b/rpcs3/Emu/ARMv7/Modules/sceSas.cpp
new file mode 100644
index 0000000000..0db6b65e16
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceSas.cpp
@@ -0,0 +1,64 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceSas;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceSas, #name, name)
+
+psv_log_base sceSas("SceSas", []()
+{
+	sceSas.on_load = nullptr;
+	sceSas.on_unload = nullptr;
+	sceSas.on_stop = nullptr;
+
+	//REG_FUNC(0xA2209C58, sceAsSetRegisterReportHandler);
+	//REG_FUNC(0xBB635544, sceAsSetUnregisterReportHandler);
+	//REG_FUNC(0xF578F0EF, sceAsGetSystemNeededMemory);
+	//REG_FUNC(0xAA8D4541, sceAsCreateSystem);
+	//REG_FUNC(0x139D29C0, sceAsDestroySystem);
+	//REG_FUNC(0xBE843EEC, sceAsLockParam);
+	//REG_FUNC(0xFF2380C4, sceAsUnlockParam);
+	//REG_FUNC(0x2549F436, sceAsSetEvent);
+	//REG_FUNC(0xDC26B9F2, sceAsGetState);
+	//REG_FUNC(0xB6220E73, sceAsSetBuss);
+	//REG_FUNC(0x1E608068, sceAsSetRacks);
+	//REG_FUNC(0x5835B473, sceAsSetGranularity);
+	//REG_FUNC(0xDFE6502F, sceAsGetGranularity);
+	//REG_FUNC(0xC72F1EEF, sceAsRender);
+	//REG_FUNC(0xCE23F057, sceAsLockUpdate);
+	//REG_FUNC(0x8BEF3C92, sceAsUnlockUpdate);
+	//REG_FUNC(0x180C6824, sceSasGetNeededMemorySize);
+	//REG_FUNC(0x449B5974, sceSasInit);
+	//REG_FUNC(0x820D5F82, sceSasInitWithGrain);
+	//REG_FUNC(0xBB7D6790, sceSasExit);
+	//REG_FUNC(0x2B4A207C, sceSasSetGrain);
+	//REG_FUNC(0x2BEA45BC, sceSasGetGrain);
+	//REG_FUNC(0x44DDB3C4, sceSasSetOutputmode);
+	//REG_FUNC(0x2C36E150, sceSasGetOutputmode);
+	//REG_FUNC(0x7A4672B2, sceSasCore);
+	//REG_FUNC(0xBD496983, sceSasCoreWithMix);
+	//REG_FUNC(0x2B75F9BC, sceSasSetVoice);
+	//REG_FUNC(0xB1756EFC, sceSasSetVoicePCM);
+	//REG_FUNC(0xF1C63CB9, sceSasSetNoise);
+	//REG_FUNC(0x0BE8204D, sceSasSetVolume);
+	//REG_FUNC(0x011788BE, sceSasSetDistortion);
+	//REG_FUNC(0x2C48A08C, sceSasSetPitch);
+	//REG_FUNC(0x18A5EFA2, sceSasSetADSR);
+	//REG_FUNC(0x5207F9D2, sceSasSetADSRmode);
+	//REG_FUNC(0xDE6227B8, sceSasSetSL);
+	//REG_FUNC(0xECCE0DB8, sceSasSetSimpleADSR);
+	//REG_FUNC(0xC838DB6F, sceSasSetKeyOn);
+	//REG_FUNC(0x5E42ADAB, sceSasSetKeyOff);
+	//REG_FUNC(0x59C7A9DF, sceSasSetPause);
+	//REG_FUNC(0x007E63E6, sceSasGetEndState);
+	//REG_FUNC(0xFD1A0CBF, sceSasGetPauseState);
+	//REG_FUNC(0x296A9910, sceSasGetEnvelope);
+	//REG_FUNC(0xB0444E69, sceSasSetEffect);
+	//REG_FUNC(0xCDF2DDD5, sceSasSetEffectType);
+	//REG_FUNC(0x55EDDBFA, sceSasSetEffectVolume);
+	//REG_FUNC(0xBAD546A0, sceSasSetEffectParam);
+	//REG_FUNC(0xB6642276, sceSasGetDryPeak);
+	//REG_FUNC(0x4314F0E9, sceSasGetWetPeak);
+	//REG_FUNC(0x1568017A, sceSasGetPreMasterPeak);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp b/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp
new file mode 100644
index 0000000000..47ab0d614c
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp
@@ -0,0 +1,19 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceScreenShot;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceScreenShot, #name, name)
+
+psv_log_base sceScreenShot("SceScreenShot", []()
+{
+	sceScreenShot.on_load = nullptr;
+	sceScreenShot.on_unload = nullptr;
+	sceScreenShot.on_stop = nullptr;
+
+	//REG_FUNC(0x05DB59C7, sceScreenShotSetParam);
+	//REG_FUNC(0x7061665B, sceScreenShotSetOverlayImage);
+	//REG_FUNC(0x50AE9FF9, sceScreenShotDisable);
+	//REG_FUNC(0x76E674D1, sceScreenShotEnable);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSfmt.cpp b/rpcs3/Emu/ARMv7/Modules/sceSfmt.cpp
new file mode 100644
index 0000000000..e6d2f2a4be
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceSfmt.cpp
@@ -0,0 +1,84 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceSfmt;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceSfmt, #name, name)
+
+psv_log_base sceSfmt("SceSfmt", []()
+{
+	sceSfmt.on_load = nullptr;
+	sceSfmt.on_unload = nullptr;
+	sceSfmt.on_stop = nullptr;
+
+	//REG_FUNC(0x8FF464C9, sceSfmt11213InitGenRand);
+	//REG_FUNC(0xBAF5F058, sceSfmt11213InitByArray);
+	//REG_FUNC(0xFB281CD7, sceSfmt11213GenRand32);
+	//REG_FUNC(0xAFEDD6E1, sceSfmt11213GenRand64);
+	//REG_FUNC(0xFD696585, sceSfmt11213FillArray32);
+	//REG_FUNC(0x7A412A29, sceSfmt11213FillArray64);
+
+	//REG_FUNC(0x02E8D906, sceSfmt1279InitGenRand);
+	//REG_FUNC(0xC25D9ACE, sceSfmt1279InitByArray);
+	//REG_FUNC(0x9B4A48DF, sceSfmt1279GenRand32);
+	//REG_FUNC(0xA2C5EE14, sceSfmt1279GenRand64);
+	//REG_FUNC(0xE7F63838, sceSfmt1279FillArray32);
+	//REG_FUNC(0xDB3832EB, sceSfmt1279FillArray64);
+
+	//REG_FUNC(0xDC6B23B0, sceSfmt132049InitGenRand);
+	//REG_FUNC(0xDC69294A, sceSfmt132049InitByArray);
+	//REG_FUNC(0x795F9644, sceSfmt132049GenRand32);
+	//REG_FUNC(0xBBD80AC4, sceSfmt132049GenRand64);
+	//REG_FUNC(0xD891A99F, sceSfmt132049FillArray32);
+	//REG_FUNC(0x68AD7866, sceSfmt132049FillArray64);
+
+	//REG_FUNC(0x2AFACB0B, sceSfmt19937InitGenRand);
+	//REG_FUNC(0xAC496C8C, sceSfmt19937InitByArray);
+	//REG_FUNC(0xF0557157, sceSfmt19937GenRand32);
+	//REG_FUNC(0xE66F2502, sceSfmt19937GenRand64);
+	//REG_FUNC(0xA1C654D8, sceSfmt19937FillArray32);
+	//REG_FUNC(0xE74BA81C, sceSfmt19937FillArray64);
+
+	//REG_FUNC(0x86DDE4A7, sceSfmt216091InitGenRand);
+	//REG_FUNC(0xA9CF6616, sceSfmt216091InitByArray);
+	//REG_FUNC(0x4A972DCD, sceSfmt216091GenRand32);
+	//REG_FUNC(0x23369ABF, sceSfmt216091GenRand64);
+	//REG_FUNC(0xDD4256F0, sceSfmt216091FillArray32);
+	//REG_FUNC(0xA1CE5628, sceSfmt216091FillArray64);
+
+	//REG_FUNC(0xB8E5A0BB, sceSfmt2281InitGenRand);
+	//REG_FUNC(0xAB3AD459, sceSfmt2281InitByArray);
+	//REG_FUNC(0x84BB4ADB, sceSfmt2281GenRand32);
+	//REG_FUNC(0x3CC47146, sceSfmt2281GenRand64);
+	//REG_FUNC(0xBB89D8F0, sceSfmt2281FillArray32);
+	//REG_FUNC(0x17C10E2D, sceSfmt2281FillArray64);
+
+	//REG_FUNC(0xE9F8CB9A, sceSfmt4253InitGenRand);
+	//REG_FUNC(0xC4D7AA2D, sceSfmt4253InitByArray);
+	//REG_FUNC(0x8791E2EF, sceSfmt4253GenRand32);
+	//REG_FUNC(0x6C0E5E3C, sceSfmt4253GenRand64);
+	//REG_FUNC(0x59A1B9FC, sceSfmt4253FillArray32);
+	//REG_FUNC(0x01683CDD, sceSfmt4253FillArray64);
+
+	//REG_FUNC(0xCF1C8C38, sceSfmt44497InitGenRand);
+	//REG_FUNC(0x16D8AA5E, sceSfmt44497InitByArray);
+	//REG_FUNC(0xF869DFDC, sceSfmt44497GenRand32);
+	//REG_FUNC(0xD411A9A6, sceSfmt44497GenRand64);
+	//REG_FUNC(0x1C38322A, sceSfmt44497FillArray32);
+	//REG_FUNC(0x908F1122, sceSfmt44497FillArray64);
+
+	//REG_FUNC(0x76A5D8CA, sceSfmt607InitGenRand);
+	//REG_FUNC(0xCC6DABA0, sceSfmt607InitByArray);
+	//REG_FUNC(0x8A0BF859, sceSfmt607GenRand32);
+	//REG_FUNC(0x5E880862, sceSfmt607GenRand64);
+	//REG_FUNC(0xA288ADB9, sceSfmt607FillArray32);
+	//REG_FUNC(0x1520D408, sceSfmt607FillArray64);
+
+	//REG_FUNC(0x2FF42588, sceSfmt86243InitGenRand);
+	//REG_FUNC(0x81B67AB5, sceSfmt86243InitByArray);
+	//REG_FUNC(0x569BF903, sceSfmt86243GenRand32);
+	//REG_FUNC(0x8E25CBA8, sceSfmt86243GenRand64);
+	//REG_FUNC(0xC297E6B1, sceSfmt86243FillArray32);
+	//REG_FUNC(0xF7FFE87C, sceSfmt86243FillArray64);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSha.cpp b/rpcs3/Emu/ARMv7/Modules/sceSha.cpp
new file mode 100644
index 0000000000..5ec792b06d
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceSha.cpp
@@ -0,0 +1,44 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceSha;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceSha, #name, name)
+
+psv_log_base sceSha("SceSha", []()
+{
+	sceSha.on_load = nullptr;
+	sceSha.on_unload = nullptr;
+	sceSha.on_stop = nullptr;
+
+	//REG_FUNC(0xD19A9AA8, sceSha0Digest);
+	//REG_FUNC(0xBCF6DB3A, sceSha0BlockInit);
+	//REG_FUNC(0x37EF2AFC, sceSha0BlockUpdate);
+	//REG_FUNC(0xBF0158C4, sceSha0BlockResult);
+
+	//REG_FUNC(0xE1215C9D, sceSha1Digest);
+	//REG_FUNC(0xB13D65AA, sceSha1BlockInit);
+	//REG_FUNC(0x9007205E, sceSha1BlockUpdate);
+	//REG_FUNC(0x0195DADF, sceSha1BlockResult);
+
+	//REG_FUNC(0x1346D270, sceSha224Digest);
+	//REG_FUNC(0x538F04CE, sceSha224BlockInit);
+	//REG_FUNC(0xB5FD0160, sceSha224BlockUpdate);
+	//REG_FUNC(0xA36ECF65, sceSha224BlockResult);
+
+	//REG_FUNC(0xA337079C, sceSha256Digest);
+	//REG_FUNC(0xE281374F, sceSha256BlockInit);
+	//REG_FUNC(0xDAECA1F8, sceSha256BlockUpdate);
+	//REG_FUNC(0x9B5BB4BA, sceSha256BlockResult);
+
+	//REG_FUNC(0xA602C694, sceSha384Digest);
+	//REG_FUNC(0x037AABE7, sceSha384BlockInit);
+	//REG_FUNC(0x4B99DBB8, sceSha384BlockUpdate);
+	//REG_FUNC(0x30D5C919, sceSha384BlockResult);
+
+	//REG_FUNC(0x5DC0B916, sceSha512Digest);
+	//REG_FUNC(0xE017A9CD, sceSha512BlockInit);
+	//REG_FUNC(0x669281E8, sceSha512BlockUpdate);
+	//REG_FUNC(0x26146A16, sceSha512BlockResult);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSqlite.cpp b/rpcs3/Emu/ARMv7/Modules/sceSqlite.cpp
new file mode 100644
index 0000000000..19f560c963
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceSqlite.cpp
@@ -0,0 +1,187 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceSqlite;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceSqlite, #name, name)
+
+psv_log_base sceSqlite("SceSqlite", []()
+{
+	sceSqlite.on_load = nullptr;
+	sceSqlite.on_unload = nullptr;
+	sceSqlite.on_stop = nullptr;
+
+	//REG_FUNC(0x26E46324, sqlite3_libversion);
+	//REG_FUNC(0x4CCB58A2, sqlite3_sourceid);
+	//REG_FUNC(0x5982F404, sqlite3_libversion_number);
+	//REG_FUNC(0xA3B818DA, sqlite3_threadsafe);
+	//REG_FUNC(0x7DF94B79, sqlite3_close);
+	//REG_FUNC(0x2371E86A, sqlite3_exec);
+	//REG_FUNC(0xC22AF627, sqlite3_initialize);
+	//REG_FUNC(0x99B5A4A3, sqlite3_shutdown);
+	//REG_FUNC(0xBD304836, sqlite3_os_init);
+	//REG_FUNC(0x9CE7C4C3, sqlite3_os_end);
+	//REG_FUNC(0x96C5D388, sqlite3_config);
+	//REG_FUNC(0xADFB25C0, sqlite3_db_config);
+	//REG_FUNC(0x3892C4B8, sqlite3_extended_result_codes);
+	//REG_FUNC(0x301851A1, sqlite3_last_insert_rowid);
+	//REG_FUNC(0xF206FBA1, sqlite3_changes);
+	//REG_FUNC(0x02ADA92D, sqlite3_total_changes);
+	//REG_FUNC(0x3CB771AC, sqlite3_interrupt);
+	//REG_FUNC(0x2E28B2A7, sqlite3_complete);
+	//REG_FUNC(0x4EAB317B, sqlite3_complete16);
+	//REG_FUNC(0xB5B5D287, sqlite3_busy_handler);
+	//REG_FUNC(0xAE8E3630, sqlite3_busy_timeout);
+	//REG_FUNC(0xF2AB9C89, sqlite3_get_table);
+	//REG_FUNC(0x1FEC6959, sqlite3_free_table);
+	//REG_FUNC(0xE630216C, sqlite3_mprintf);
+	//REG_FUNC(0xC6372184, sqlite3_vmprintf);
+	//REG_FUNC(0xCC189941, sqlite3_snprintf);
+	//REG_FUNC(0xF01DEB95, sqlite3_malloc);
+	//REG_FUNC(0xD1CF5631, sqlite3_realloc);
+	//REG_FUNC(0xCBF0CA8A, sqlite3_free);
+	//REG_FUNC(0x8E4F6ED5, sqlite3_memory_used);
+	//REG_FUNC(0x2F33DAD6, sqlite3_memory_highwater);
+	//REG_FUNC(0x5A2590BF, sqlite3_randomness);
+	//REG_FUNC(0x77FB3458, sqlite3_set_authorizer);
+	//REG_FUNC(0xFC127A83, sqlite3_trace);
+	//REG_FUNC(0x48B789A1, sqlite3_profile);
+	//REG_FUNC(0x19165D04, sqlite3_progress_handler);
+	//REG_FUNC(0x8E506859, sqlite3_open);
+	//REG_FUNC(0x881EEDD8, sqlite3_open16);
+	//REG_FUNC(0xA1E98A41, sqlite3_open_v2);
+	//REG_FUNC(0xA7AAE2E7, sqlite3_errcode);
+	//REG_FUNC(0x91187282, sqlite3_extended_errcode);
+	//REG_FUNC(0xABFB8B6E, sqlite3_errmsg);
+	//REG_FUNC(0xF0DE1A97, sqlite3_errmsg16);
+	//REG_FUNC(0xDED2D517, sqlite3_limit);
+	//REG_FUNC(0x0C1B5509, sqlite3_prepare);
+	//REG_FUNC(0xBC4BDCF4, sqlite3_prepare_v2);
+	//REG_FUNC(0xC657CFB8, sqlite3_prepare16);
+	//REG_FUNC(0x426D81D2, sqlite3_prepare16_v2);
+	//REG_FUNC(0x082C36D4, sqlite3_sql);
+	//REG_FUNC(0x3F225D62, sqlite3_bind_blob);
+	//REG_FUNC(0xDE007F1B, sqlite3_bind_double);
+	//REG_FUNC(0x14ABCBCC, sqlite3_bind_int);
+	//REG_FUNC(0x43D967EF, sqlite3_bind_int64);
+	//REG_FUNC(0xFF8A9974, sqlite3_bind_null);
+	//REG_FUNC(0x613AB709, sqlite3_bind_text);
+	//REG_FUNC(0x9D0FEAEF, sqlite3_bind_text16);
+	//REG_FUNC(0x8A667D2A, sqlite3_bind_value);
+	//REG_FUNC(0x78FBA2D0, sqlite3_bind_zeroblob);
+	//REG_FUNC(0x17D4F00B, sqlite3_bind_parameter_count);
+	//REG_FUNC(0x96D3B5F9, sqlite3_bind_parameter_name);
+	//REG_FUNC(0xD4D2A5D8, sqlite3_bind_parameter_index);
+	//REG_FUNC(0x690947E2, sqlite3_clear_bindings);
+	//REG_FUNC(0x8567A8DE, sqlite3_column_count);
+	//REG_FUNC(0xBC422DF6, sqlite3_column_name);
+	//REG_FUNC(0x6EF9A642, sqlite3_column_name16);
+	//REG_FUNC(0x5AE92D67, sqlite3_column_decltype);
+	//REG_FUNC(0xE058DE60, sqlite3_column_decltype16);
+	//REG_FUNC(0xCA8755B7, sqlite3_step);
+	//REG_FUNC(0x61911935, sqlite3_data_count);
+	//REG_FUNC(0xFE237ED7, sqlite3_column_blob);
+	//REG_FUNC(0x36013FE4, sqlite3_column_bytes);
+	//REG_FUNC(0x439F160B, sqlite3_column_bytes16);
+	//REG_FUNC(0xC4866097, sqlite3_column_double);
+	//REG_FUNC(0xE5B6BA01, sqlite3_column_int);
+	//REG_FUNC(0x90BA0B88, sqlite3_column_int64);
+	//REG_FUNC(0x8E68D270, sqlite3_column_text);
+	//REG_FUNC(0xD7BD6B76, sqlite3_column_text16);
+	//REG_FUNC(0xDBB25C43, sqlite3_column_type);
+	//REG_FUNC(0x2227F21D, sqlite3_column_value);
+	//REG_FUNC(0xB656B7E2, sqlite3_finalize);
+	//REG_FUNC(0xA6ECC214, sqlite3_reset);
+	//REG_FUNC(0xB0543897, sqlite3_create_function);
+	//REG_FUNC(0x7655FA45, sqlite3_create_function16);
+	//REG_FUNC(0x6AB02532, sqlite3_aggregate_count);
+	//REG_FUNC(0xF8AA518B, sqlite3_expired);
+	//REG_FUNC(0x6EC012E5, sqlite3_transfer_bindings);
+	//REG_FUNC(0xF48E021B, sqlite3_global_recover);
+	//REG_FUNC(0x173C9C0B, sqlite3_thread_cleanup);
+	//REG_FUNC(0x56EDF517, sqlite3_memory_alarm);
+	//REG_FUNC(0xC9962B31, sqlite3_value_blob);
+	//REG_FUNC(0x5368EF1F, sqlite3_value_bytes);
+	//REG_FUNC(0x4D10900D, sqlite3_value_bytes16);
+	//REG_FUNC(0xF1F2C9BE, sqlite3_value_double);
+	//REG_FUNC(0x4809A520, sqlite3_value_int);
+	//REG_FUNC(0xA6581C04, sqlite3_value_int64);
+	//REG_FUNC(0x7EB97356, sqlite3_value_text);
+	//REG_FUNC(0x5BBE38C2, sqlite3_value_text16);
+	//REG_FUNC(0x014863A6, sqlite3_value_text16le);
+	//REG_FUNC(0x3B89AA8D, sqlite3_value_text16be);
+	//REG_FUNC(0xC5EEBB5D, sqlite3_value_type);
+	//REG_FUNC(0x81B7D43D, sqlite3_value_numeric_type);
+	//REG_FUNC(0xAA8BE477, sqlite3_aggregate_context);
+	//REG_FUNC(0x78FF81FB, sqlite3_user_data);
+	//REG_FUNC(0x74259C09, sqlite3_context_db_handle);
+	//REG_FUNC(0x394FC1CB, sqlite3_get_auxdata);
+	//REG_FUNC(0x129E01C9, sqlite3_set_auxdata);
+	//REG_FUNC(0x90CDF8C1, sqlite3_result_blob);
+	//REG_FUNC(0xC2A5C2F8, sqlite3_result_double);
+	//REG_FUNC(0x063BFACA, sqlite3_result_error);
+	//REG_FUNC(0xAB2AEB4A, sqlite3_result_error16);
+	//REG_FUNC(0xAB9EFF96, sqlite3_result_error_toobig);
+	//REG_FUNC(0x944E747A, sqlite3_result_error_nomem);
+	//REG_FUNC(0x1165223C, sqlite3_result_error_code);
+	//REG_FUNC(0x5C9CD9D4, sqlite3_result_int);
+	//REG_FUNC(0x0EF1AA07, sqlite3_result_int64);
+	//REG_FUNC(0x6DE09482, sqlite3_result_null);
+	//REG_FUNC(0x696B5E6A, sqlite3_result_text);
+	//REG_FUNC(0x3AF5D206, sqlite3_result_text16);
+	//REG_FUNC(0x845B4FC2, sqlite3_result_text16le);
+	//REG_FUNC(0xEE3E906A, sqlite3_result_text16be);
+	//REG_FUNC(0x09664492, sqlite3_result_value);
+	//REG_FUNC(0x3D463CF7, sqlite3_result_zeroblob);
+	//REG_FUNC(0xC61B63FB, sqlite3_create_collation);
+	//REG_FUNC(0x4B110AF2, sqlite3_create_collation_v2);
+	//REG_FUNC(0xF7FE99C8, sqlite3_create_collation16);
+	//REG_FUNC(0x836C99A3, sqlite3_collation_needed);
+	//REG_FUNC(0x537066CE, sqlite3_collation_needed16);
+	//REG_FUNC(0x6B88D1D4, sqlite3_sleep);
+	//REG_FUNC(0x0910C3CB, sqlite3_get_autocommit);
+	//REG_FUNC(0x2C62429E, sqlite3_db_handle);
+	//REG_FUNC(0xD257592A, sqlite3_next_stmt);
+	//REG_FUNC(0x4BAE6E3B, sqlite3_commit_hook);
+	//REG_FUNC(0x67F53D6B, sqlite3_rollback_hook);
+	//REG_FUNC(0xEB05FE87, sqlite3_update_hook);
+	//REG_FUNC(0xF0094BED, sqlite3_enable_shared_cache);
+	//REG_FUNC(0x8F99FBE5, sqlite3_release_memory);
+	//REG_FUNC(0xD1458BA7, sqlite3_soft_heap_limit);
+	//REG_FUNC(0xC9EA8E1F, sqlite3_load_extension);
+	//REG_FUNC(0x9BFC6F07, sqlite3_enable_load_extension);
+	//REG_FUNC(0x24738263, sqlite3_auto_extension);
+	//REG_FUNC(0xC4296FFD, sqlite3_reset_auto_extension);
+	//REG_FUNC(0x8970C45F, sqlite3_create_module);
+	//REG_FUNC(0x1AA3BC1A, sqlite3_create_module_v2);
+	//REG_FUNC(0x7E2A5E8F, sqlite3_declare_vtab);
+	//REG_FUNC(0xAF680D40, sqlite3_overload_function);
+	//REG_FUNC(0xD35B3E55, sqlite3_blob_open);
+	//REG_FUNC(0xC085A15D, sqlite3_blob_close);
+	//REG_FUNC(0xA07AEEE3, sqlite3_blob_bytes);
+	//REG_FUNC(0x71393AA4, sqlite3_blob_read);
+	//REG_FUNC(0xBDB46BCF, sqlite3_blob_write);
+	//REG_FUNC(0x0C6DD8C3, sqlite3_vfs_find);
+	//REG_FUNC(0x65F53B9C, sqlite3_vfs_register);
+	//REG_FUNC(0x69CF4171, sqlite3_vfs_unregister);
+	//REG_FUNC(0xEEB7839F, sqlite3_mutex_alloc);
+	//REG_FUNC(0x38E933E2, sqlite3_mutex_free);
+	//REG_FUNC(0x60DB89C0, sqlite3_mutex_enter);
+	//REG_FUNC(0x218D700E, sqlite3_mutex_try);
+	//REG_FUNC(0x545ABDDB, sqlite3_mutex_leave);
+	//REG_FUNC(0xA8E53D26, sqlite3_db_mutex);
+	//REG_FUNC(0xBB096FBD, sqlite3_file_control);
+	//REG_FUNC(0x324D4EFD, sqlite3_test_control);
+	//REG_FUNC(0xD8C435AA, sqlite3_status);
+	//REG_FUNC(0xB5DFAF6A, sqlite3_db_status);
+	//REG_FUNC(0xF7ABF5FA, sqlite3_stmt_status);
+	//REG_FUNC(0x91DDB12A, sqlite3_backup_init);
+	//REG_FUNC(0x2A15E081, sqlite3_backup_step);
+	//REG_FUNC(0x93A6B7EF, sqlite3_backup_finish);
+	//REG_FUNC(0x9962540B, sqlite3_backup_remaining);
+	//REG_FUNC(0x20D054CF, sqlite3_backup_pagecount);
+	//REG_FUNC(0x12E2FC18, sqlite3_strnicmp);
+	//REG_FUNC(0xB80D43C7, sqlite3_version);
+	//REG_FUNC(0x1AEC1F74, sqlite3_temp_directory);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp b/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp
new file mode 100644
index 0000000000..51032ab5fd
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp
@@ -0,0 +1,26 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceSsl;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceSsl, #name, name)
+
+psv_log_base sceSsl("SceSsl", []()
+{
+	sceSsl.on_load = nullptr;
+	sceSsl.on_unload = nullptr;
+	sceSsl.on_stop = nullptr;
+
+	//REG_FUNC(0x3C733316, sceSslInit);
+	//REG_FUNC(0x03CE6E3A, sceSslTerm);
+	//REG_FUNC(0xBD203262, sceSslGetMemoryPoolStats);
+	//REG_FUNC(0x901C5C15, sceSslGetSerialNumber);
+	//REG_FUNC(0x9B2F1BC1, sceSslGetSubjectName);
+	//REG_FUNC(0x412711E5, sceSslGetIssuerName);
+	//REG_FUNC(0x70DEA174, sceSslGetNotBefore);
+	//REG_FUNC(0xF5ED7B68, sceSslGetNotAfter);
+	//REG_FUNC(0x95E14CA6, sceSslGetNameEntryCount);
+	//REG_FUNC(0x2A857867, sceSslGetNameEntryInfo);
+	//REG_FUNC(0xC73687E4, sceSslFreeSslCertName);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp b/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp
new file mode 100644
index 0000000000..09c50ce4e9
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp
@@ -0,0 +1,38 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceSulpha;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceSulpha, #name, name)
+
+psv_log_base sceSulpha("SceSulpha", []()
+{
+	sceSulpha.on_load = nullptr;
+	sceSulpha.on_unload = nullptr;
+	sceSulpha.on_stop = nullptr;
+
+	//REG_FUNC(0xB4668AEA, sceSulphaNetworkInit);
+	//REG_FUNC(0x0FC71B72, sceSulphaNetworkShutdown);
+	//REG_FUNC(0xA6A05C50, sceSulphaGetDefaultConfig);
+	//REG_FUNC(0xD52E5A5A, sceSulphaGetNeededMemory);
+	//REG_FUNC(0x324F158F, sceSulphaInit);
+	//REG_FUNC(0x10770BA7, sceSulphaShutdown);
+	//REG_FUNC(0x920EC7BF, sceSulphaUpdate);
+	//REG_FUNC(0x7968A138, sceSulphaFileConnect);
+	//REG_FUNC(0xB16E7B88, sceSulphaFileDisconnect);
+	//REG_FUNC(0x5E15E164, sceSulphaSetBookmark);
+	//REG_FUNC(0xC5752B6B, sceSulphaAgentsGetNeededMemory);
+	//REG_FUNC(0x7ADB454D, sceSulphaAgentsRegister);
+	//REG_FUNC(0x2A8B74D7, sceSulphaAgentsUnregister);
+	//REG_FUNC(0xDE7E2911, sceSulphaGetAgent);
+	//REG_FUNC(0xA41B7402, sceSulphaNodeNew);
+	//REG_FUNC(0xD44C9F86, sceSulphaNodeDelete);
+	//REG_FUNC(0xBF61F3B8, sceSulphaEventNew);
+	//REG_FUNC(0xD5D995A9, sceSulphaEventDelete);
+	//REG_FUNC(0xB0C2B9CE, sceSulphaEventAdd);
+	//REG_FUNC(0xBC6A2833, sceSulphaEventReport);
+	//REG_FUNC(0x29F0DA12, sceSulphaGetTimestamp);
+	//REG_FUNC(0x951D159D, sceSulphaLogSetLevel);
+	//REG_FUNC(0x5C6815C6, sceSulphaLogHandler);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp b/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp
new file mode 100644
index 0000000000..b70a5a27c4
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp
@@ -0,0 +1,32 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceSystemGesture;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceSystemGesture, #name, name)
+
+psv_log_base sceSystemGesture("SceSystemGesture", []()
+{
+	sceSystemGesture.on_load = nullptr;
+	sceSystemGesture.on_unload = nullptr;
+	sceSystemGesture.on_stop = nullptr;
+
+	//REG_FUNC(0x6078A08B, sceSystemGestureInitializePrimitiveTouchRecognizer);
+	//REG_FUNC(0xFD5A6504, sceSystemGestureResetPrimitiveTouchRecognizer);
+	//REG_FUNC(0xB3875104, sceSystemGestureFinalizePrimitiveTouchRecognizer);
+	//REG_FUNC(0xDF4C665A, sceSystemGestureUpdatePrimitiveTouchRecognizer);
+	//REG_FUNC(0xC750D3DA, sceSystemGestureGetPrimitiveTouchEvents);
+	//REG_FUNC(0xBAB8ECCB, sceSystemGestureGetPrimitiveTouchEventsCount);
+	//REG_FUNC(0xE0577765, sceSystemGestureGetPrimitiveTouchEventByIndex);
+	//REG_FUNC(0x480564C9, sceSystemGestureGetPrimitiveTouchEventByPrimitiveID);
+	//REG_FUNC(0xC3367370, sceSystemGestureCreateTouchRecognizer);
+	//REG_FUNC(0xF0DB1AE5, sceSystemGestureGetTouchRecognizerInformation);
+	//REG_FUNC(0x0D941B90, sceSystemGestureResetTouchRecognizer);
+	//REG_FUNC(0x851FB144, sceSystemGestureUpdateTouchRecognizer);
+	//REG_FUNC(0xA9DB29F6, sceSystemGestureUpdateTouchRecognizerRectangle);
+	//REG_FUNC(0x789D867C, sceSystemGestureGetTouchEvents);
+	//REG_FUNC(0x13AD2218, sceSystemGestureGetTouchEventsCount);
+	//REG_FUNC(0x74724147, sceSystemGestureGetTouchEventByIndex);
+	//REG_FUNC(0x5570B83E, sceSystemGestureGetTouchEventByEventID);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp b/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp
new file mode 100644
index 0000000000..6636644e0d
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp
@@ -0,0 +1,20 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceTouch;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceTouch, #name, name)
+
+psv_log_base sceTouch("SceTouch", []()
+{
+	sceTouch.on_load = nullptr;
+	sceTouch.on_unload = nullptr;
+	sceTouch.on_stop = nullptr;
+
+	//REG_FUNC(0x169A1D58, sceTouchRead);
+	//REG_FUNC(0xFF082DF0, sceTouchPeek);
+	//REG_FUNC(0x1B9C5D14, sceTouchSetSamplingState);
+	//REG_FUNC(0x26531526, sceTouchGetSamplingState);
+	//REG_FUNC(0x10A2CA25, sceTouchGetPanelInfo);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp b/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp
new file mode 100644
index 0000000000..6fb390fbd8
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp
@@ -0,0 +1,68 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceUlt;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceUlt, #name, name)
+
+psv_log_base sceUlt("SceUlt", []()
+{
+	sceUlt.on_load = nullptr;
+	sceUlt.on_unload = nullptr;
+	sceUlt.on_stop = nullptr;
+
+	//REG_FUNC(0xEF094E35, _sceUltWaitingQueueResourcePoolOptParamInitialize);
+	//REG_FUNC(0x644DA029, sceUltWaitingQueueResourcePoolGetWorkAreaSize);
+	//REG_FUNC(0x62F9493E, _sceUltWaitingQueueResourcePoolCreate);
+	//REG_FUNC(0xC9E96714, sceUltWaitingQueueResourcePoolDestroy);
+	//REG_FUNC(0x8A4F88A2, _sceUltQueueDataResourcePoolOptParamInitialize);
+	//REG_FUNC(0xECDA7FEE, sceUltQueueDataResourcePoolGetWorkAreaSize);
+	//REG_FUNC(0x40856827, _sceUltQueueDataResourcePoolCreate);
+	//REG_FUNC(0x2B8D33F1, sceUltQueueDataResourcePoolDestroy);
+	//REG_FUNC(0x24D87E05, _sceUltMutexOptParamInitialize);
+	//REG_FUNC(0x5AFEC7A1, _sceUltMutexCreate);
+	//REG_FUNC(0x001EAC8A, sceUltMutexLock);
+	//REG_FUNC(0xE5936A69, sceUltMutexTryLock);
+	//REG_FUNC(0x897C9097, sceUltMutexUnlock);
+	//REG_FUNC(0xEEBD9052, sceUltMutexDestroy);
+	//REG_FUNC(0x0603FCC1, _sceUltConditionVariableOptParamInitialize);
+	//REG_FUNC(0xD76A156C, _sceUltConditionVariableCreate);
+	//REG_FUNC(0x9FE7CB9F, sceUltConditionVariableSignal);
+	//REG_FUNC(0xEBB6FC1E, sceUltConditionVariableSignalAll);
+	//REG_FUNC(0x2CD0F57C, sceUltConditionVariableWait);
+	//REG_FUNC(0x53420ED2, sceUltConditionVariableDestroy);
+	//REG_FUNC(0xF7A83023, _sceUltQueueOptParamInitialize);
+	//REG_FUNC(0x14DA1BB4, _sceUltQueueCreate);
+	//REG_FUNC(0xA7E78FF9, sceUltQueuePush);
+	//REG_FUNC(0x6D356B29, sceUltQueueTryPush);
+	//REG_FUNC(0x1AD58A53, sceUltQueuePop);
+	//REG_FUNC(0x2A1A8EA6, sceUltQueueTryPop);
+	//REG_FUNC(0xF37862DE, sceUltQueueDestroy);
+	//REG_FUNC(0xD8334A1F, _sceUltReaderWriterLockOptParamInitialize);
+	//REG_FUNC(0x2FB0EB32, _sceUltReaderWriterLockCreate);
+	//REG_FUNC(0x9AD07630, sceUltReaderWriterLockLockRead);
+	//REG_FUNC(0x2629C055, sceUltReaderWriterLockTryLockRead);
+	//REG_FUNC(0x218D4743, sceUltReaderWriterLockUnlockRead);
+	//REG_FUNC(0xF5F63E2C, sceUltReaderWriterLockLockWrite);
+	//REG_FUNC(0x944FB222, sceUltReaderWriterLockTryLockWrite);
+	//REG_FUNC(0x2A5741F5, sceUltReaderWriterLockUnlockWrite);
+	//REG_FUNC(0xB1FEB79B, sceUltReaderWriterLockDestroy);
+	//REG_FUNC(0x8E31B9FE, _sceUltSemaphoreOptParamInitialize);
+	//REG_FUNC(0xDD59562C, _sceUltSemaphoreCreate);
+	//REG_FUNC(0xF220D3AE, sceUltSemaphoreAcquire);
+	//REG_FUNC(0xAF15606D, sceUltSemaphoreTryAcquire);
+	//REG_FUNC(0x65376E2D, sceUltSemaphoreRelease);
+	//REG_FUNC(0x8EC57420, sceUltSemaphoreDestroy);
+	//REG_FUNC(0x8486DDE6, _sceUltUlthreadRuntimeOptParamInitialize);
+	//REG_FUNC(0x5435C586, sceUltUlthreadRuntimeGetWorkAreaSize);
+	//REG_FUNC(0x86DDA3AE, _sceUltUlthreadRuntimeCreate);
+	//REG_FUNC(0x4E9A745C, sceUltUlthreadRuntimeDestroy);
+	//REG_FUNC(0x7F373376, _sceUltUlthreadOptParamInitialize);
+	//REG_FUNC(0xB1290375, _sceUltUlthreadCreate);
+	//REG_FUNC(0xCAD57BAD, sceUltUlthreadYield);
+	//REG_FUNC(0x1E401DF8, sceUltUlthreadExit);
+	//REG_FUNC(0x63483381, sceUltUlthreadJoin);
+	//REG_FUNC(0xB4CF88AC, sceUltUlthreadTryJoin);
+	//REG_FUNC(0xA798C5D7, sceUltUlthreadGetSelf);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp b/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp
new file mode 100644
index 0000000000..472c7bbfb3
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp
@@ -0,0 +1,34 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceVideodec;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceVideodec, #name, name)
+
+psv_log_base sceVideodec("SceVideodec", []()
+{
+	sceVideodec.on_load = nullptr;
+	sceVideodec.on_unload = nullptr;
+	sceVideodec.on_stop = nullptr;
+
+	//REG_FUNC(0xF1AF65A3, sceVideodecInitLibrary);
+	//REG_FUNC(0x3A5F4924, sceVideodecTermLibrary);
+	//REG_FUNC(0x97E95EDB, sceAvcdecQueryDecoderMemSize);
+	//REG_FUNC(0xE82BB69B, sceAvcdecCreateDecoder);
+	//REG_FUNC(0x8A0E359E, sceAvcdecDeleteDecoder);
+	//REG_FUNC(0x441673E3, sceAvcdecDecodeAvailableSize);
+	//REG_FUNC(0xD6190A06, sceAvcdecDecode);
+	//REG_FUNC(0x9648D853, sceAvcdecDecodeStop);
+	//REG_FUNC(0x25F31020, sceAvcdecDecodeFlush);
+	//REG_FUNC(0xB2A428DB, sceAvcdecCsc);
+	//REG_FUNC(0x6C68A38F, sceAvcdecDecodeNalAu);
+	//REG_FUNC(0xC67C1A80, sceM4vdecQueryDecoderMemSize);
+	//REG_FUNC(0x17C6AC9E, sceM4vdecCreateDecoder);
+	//REG_FUNC(0x0EB2E4E7, sceM4vdecDeleteDecoder);
+	//REG_FUNC(0xA8CF1942, sceM4vdecDecodeAvailableSize);
+	//REG_FUNC(0x624664DB, sceM4vdecDecode);
+	//REG_FUNC(0x87CFD23B, sceM4vdecDecodeStop);
+	//REG_FUNC(0x7C460D75, sceM4vdecDecodeFlush);
+	//REG_FUNC(0xB4BC325B, sceM4vdecCsc);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp b/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp
new file mode 100644
index 0000000000..072f3d3303
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp
@@ -0,0 +1,40 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceVoice;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceVoice, #name, name)
+
+psv_log_base sceVoice("SceVoice", []()
+{
+	sceVoice.on_load = nullptr;
+	sceVoice.on_unload = nullptr;
+	sceVoice.on_stop = nullptr;
+
+	//REG_FUNC(0xD02C00B4, sceVoiceGetBitRate);
+	//REG_FUNC(0xC913F7E9, sceVoiceGetMuteFlag);
+	//REG_FUNC(0x875CC80D, sceVoiceGetVolume);
+	//REG_FUNC(0x02F58D6F, sceVoiceSetBitRate);
+	//REG_FUNC(0x0B9E4AE2, sceVoiceSetMuteFlag);
+	//REG_FUNC(0xDB90EAC4, sceVoiceSetMuteFlagAll);
+	//REG_FUNC(0xD93769E6, sceVoiceSetVolume);
+	//REG_FUNC(0x6E46950E, sceVoiceGetResourceInfo);
+	//REG_FUNC(0xAC98853E, sceVoiceEnd);
+	//REG_FUNC(0x805CC20F, sceVoiceInit);
+	//REG_FUNC(0xB2ED725B, sceVoiceStart);
+	//REG_FUNC(0xC3868DF6, sceVoiceStop);
+	//REG_FUNC(0x698BDAAE, sceVoiceConnectIPortToOPort);
+	//REG_FUNC(0xFA4E57B1, sceVoiceCreatePort);
+	//REG_FUNC(0xAE46564D, sceVoiceDeletePort);
+	//REG_FUNC(0x5F0260F4, sceVoiceDisconnectIPortFromOPort);
+	//REG_FUNC(0x5933CCFB, sceVoiceGetPortInfo);
+	//REG_FUNC(0x23C6B16B, sceVoicePausePort);
+	//REG_FUNC(0x39AA3884, sceVoicePausePortAll);
+	//REG_FUNC(0x09E4D18C, sceVoiceReadFromOPort);
+	//REG_FUNC(0x5E1CE910, sceVoiceResetPort);
+	//REG_FUNC(0x2DE35411, sceVoiceResumePort);
+	//REG_FUNC(0x1F93FC0C, sceVoiceResumePortAll);
+	//REG_FUNC(0xCE855C50, sceVoiceUpdatePort);
+	//REG_FUNC(0x0A22EC0E, sceVoiceWriteToIPort);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp b/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp
new file mode 100644
index 0000000000..bc5fb062a3
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp
@@ -0,0 +1,32 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceVoiceQoS;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceVoiceQoS, #name, name)
+
+psv_log_base sceVoiceQoS("SceVoiceQos", []()
+{
+	sceVoiceQoS.on_load = nullptr;
+	sceVoiceQoS.on_unload = nullptr;
+	sceVoiceQoS.on_stop = nullptr;
+
+	//REG_FUNC(0x4B5FFF1C, sceVoiceQoSInit);
+	//REG_FUNC(0xFB0B747B, sceVoiceQoSEnd);
+	//REG_FUNC(0xAAB54BE4, sceVoiceQoSCreateLocalEndpoint);
+	//REG_FUNC(0x68FABF6F, sceVoiceQoSDeleteLocalEndpoint);
+	//REG_FUNC(0xBAB98727, sceVoiceQoSCreateRemoteEndpoint);
+	//REG_FUNC(0xC2F2C771, sceVoiceQoSDeleteRemoteEndpoint);
+	//REG_FUNC(0xE0C5CEEE, sceVoiceQoSConnect);
+	//REG_FUNC(0x3C7A08B0, sceVoiceQoSDisconnect);
+	//REG_FUNC(0xE5B4527D, sceVoiceQoSGetLocalEndpoint);
+	//REG_FUNC(0x876A9B9C, sceVoiceQoSGetRemoteEndpoint);
+	//REG_FUNC(0x540CEBA5, sceVoiceQoSSetLocalEndpointAttribute);
+	//REG_FUNC(0xC981AB3B, sceVoiceQoSGetLocalEndpointAttribute);
+	//REG_FUNC(0xE757806F, sceVoiceQoSSetConnectionAttribute);
+	//REG_FUNC(0xE81B8D44, sceVoiceQoSGetConnectionAttribute);
+	//REG_FUNC(0xC9DC1425, sceVoiceQoSGetStatus);
+	//REG_FUNC(0x2FE1F28F, sceVoiceQoSWritePacket);
+	//REG_FUNC(0x2D613549, sceVoiceQoSReadPacket);
+});
diff --git a/rpcs3/Emu/ARMv7/Modules/sceXml.cpp b/rpcs3/Emu/ARMv7/Modules/sceXml.cpp
new file mode 100644
index 0000000000..525ce21565
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceXml.cpp
@@ -0,0 +1,201 @@
+#include "stdafx.h"
+#include "Emu/System.h"
+#include "Emu/ARMv7/PSVFuncList.h"
+
+extern psv_log_base sceXml;
+
+#define REG_FUNC(nid, name) reg_psv_func(nid, &sceXml, #name, name)
+
+psv_log_base sceXml("SceXml", []()
+{
+	sceXml.on_load = nullptr;
+	sceXml.on_unload = nullptr;
+	sceXml.on_stop = nullptr;
+
+	//REG_FUNC(0x57400A1A, _ZN3sce3Xml10SimpleDataC1EPKcj);
+	//REG_FUNC(0x7E582075, _ZN3sce3Xml10SimpleDataC1Ev);
+	//REG_FUNC(0x4CF0656B, _ZN3sce3Xml10SimpleDataC2EPKcj);
+	//REG_FUNC(0x95077028, _ZN3sce3Xml10SimpleDataC2Ev);
+	//REG_FUNC(0xECFA6A2A, _ZN3sce3Xml11Initializer10initializeEPKNS0_13InitParameterE);
+	//REG_FUNC(0x29824CD5, _ZN3sce3Xml11Initializer9terminateEv);
+	//REG_FUNC(0xBF13FDE6, _ZN3sce3Xml11InitializerC1Ev);
+	//REG_FUNC(0x94AAA71D, _ZN3sce3Xml11InitializerC2Ev);
+	//REG_FUNC(0xB4547C88, _ZN3sce3Xml11InitializerD1Ev);
+	//REG_FUNC(0xAAA08FA8, _ZN3sce3Xml11InitializerD2Ev);
+	//REG_FUNC(0x8D387E01, _ZN3sce3Xml12MemAllocatorC1Ev);
+	//REG_FUNC(0xE982E681, _ZN3sce3Xml12MemAllocatorC2Ev);
+	//REG_FUNC(0x90B82579, _ZN3sce3Xml12MemAllocatorD0Ev);
+	//REG_FUNC(0x56002B9D, _ZN3sce3Xml12MemAllocatorD1Ev);
+	//REG_FUNC(0x1BE022EA, _ZN3sce3Xml12MemAllocatorD2Ev);
+	//REG_FUNC(0x89AA847E, _ZN3sce3Xml13AttributeList10initializeEPKNS0_11InitializerE);
+	//REG_FUNC(0xD08EE434, _ZN3sce3Xml13AttributeList12addAttributeEPKNS0_6StringES4_);
+	//REG_FUNC(0xCCEE4E7C, _ZN3sce3Xml13AttributeList5clearEv);
+	//REG_FUNC(0x11FE5A65, _ZN3sce3Xml13AttributeList9terminateEv);
+	//REG_FUNC(0x9CBD82D4, _ZN3sce3Xml13AttributeListC1ERKS1_);
+	//REG_FUNC(0x542076D8, _ZN3sce3Xml13AttributeListC1Ev);
+	//REG_FUNC(0x87C89447, _ZN3sce3Xml13AttributeListC2ERKS1_);
+	//REG_FUNC(0x5D49542A, _ZN3sce3Xml13AttributeListC2Ev);
+	//REG_FUNC(0x38861841, _ZN3sce3Xml13AttributeListD1Ev);
+	//REG_FUNC(0x1B0B3976, _ZN3sce3Xml13AttributeListD2Ev);
+	//REG_FUNC(0x30520B78, _ZN3sce3Xml14VarAllocBuffer4copyEPKhjb);
+	//REG_FUNC(0x7D5A0041, _ZN3sce3Xml14VarAllocBuffer5clearEv);
+	//REG_FUNC(0xD95D3824, _ZN3sce3Xml14VarAllocBuffer7copyStrEPKcj);
+	//REG_FUNC(0xFE99676E, _ZN3sce3Xml14VarAllocBuffer7copyStrERKNS0_6StringE);
+	//REG_FUNC(0x82747F92, _ZN3sce3Xml14VarAllocBuffer7reserveEj);
+	//REG_FUNC(0xE93EACFC, _ZN3sce3Xml14VarAllocBuffer9terminateEv);
+	//REG_FUNC(0x8045D9C2, _ZN3sce3Xml14VarAllocBufferC1EPKNS0_11InitializerE);
+	//REG_FUNC(0xEF4FA027, _ZN3sce3Xml14VarAllocBufferC2EPKNS0_11InitializerE);
+	//REG_FUNC(0xD61CAAFC, _ZN3sce3Xml14VarAllocBufferD0Ev);
+	//REG_FUNC(0xD9217FC8, _ZN3sce3Xml14VarAllocBufferD1Ev);
+	//REG_FUNC(0x8A4B9379, _ZN3sce3Xml14VarAllocBufferD2Ev);
+	//REG_FUNC(0xB7770E5E, _ZN3sce3Xml18SerializeParameterC1Ev);
+	//REG_FUNC(0xF65270FC, _ZN3sce3Xml18SerializeParameterC2Ev);
+	//REG_FUNC(0x2CB61A7C, _ZN3sce3Xml20bXResultToResultTypeEi);
+	//REG_FUNC(0x59C5E9B2, _ZN3sce3Xml23getMemManagerDebugLevelEv);
+	//REG_FUNC(0xBA8B7374, _ZN3sce3Xml23setMemManagerDebugLevelEi);
+	//REG_FUNC(0xBBACFE87, _ZN3sce3Xml3Dom15DocumentBuilder10initializeEPKNS0_11InitializerE);
+	//REG_FUNC(0x1A29526B, _ZN3sce3Xml3Dom15DocumentBuilder11getDocumentEv);
+	//REG_FUNC(0xA2431C2B, _ZN3sce3Xml3Dom15DocumentBuilder16setResolveEntityEb);
+	//REG_FUNC(0xB8C4D13C, _ZN3sce3Xml3Dom15DocumentBuilder20setSkipIgnorableTextEb);
+	//REG_FUNC(0xF351D753, _ZN3sce3Xml3Dom15DocumentBuilder26setSkipIgnorableWhiteSpaceEb);
+	//REG_FUNC(0x7744DD14, _ZN3sce3Xml3Dom15DocumentBuilder5parseEPKNS0_6StringEb);
+	//REG_FUNC(0x42D59053, _ZN3sce3Xml3Dom15DocumentBuilder9terminateEv);
+	//REG_FUNC(0x702492EA, _ZN3sce3Xml3Dom15DocumentBuilderC1Ev);
+	//REG_FUNC(0x36F6BDF2, _ZN3sce3Xml3Dom15DocumentBuilderC2Ev);
+	//REG_FUNC(0x79C9322E, _ZN3sce3Xml3Dom15DocumentBuilderD0Ev);
+	//REG_FUNC(0x19D0E024, _ZN3sce3Xml3Dom15DocumentBuilderD1Ev);
+	//REG_FUNC(0x99C58389, _ZN3sce3Xml3Dom15DocumentBuilderD2Ev);
+	//REG_FUNC(0x3CA958D3, _ZN3sce3Xml3Dom4Node11removeChildEy);
+	//REG_FUNC(0x1B98BDBE, _ZN3sce3Xml3Dom4Node12insertBeforeEyy);
+	//REG_FUNC(0x26BA1E6E, _ZNK3sce3Xml3Dom4Node13hasAttributesEv);
+	//REG_FUNC(0xC6F4F6A8, _ZN3sce3Xml3Dom4Node13hasChildNodesEv);
+	//REG_FUNC(0x088C100E, _ZN3sce3Xml3Dom4NodeC1Ey);
+	//REG_FUNC(0x44CAF9E1, _ZN3sce3Xml3Dom4NodeC2Ey);
+	//REG_FUNC(0x8F2EB967, _ZN3sce3Xml3Dom4NodeD1Ev);
+	//REG_FUNC(0x241EFC0E, _ZN3sce3Xml3Dom4NodeD2Ev);
+	//REG_FUNC(0x6A16C2FF, _ZN3sce3Xml3Dom8Document10importNodeEyyPKS2_y);
+	//REG_FUNC(0xB4A33B78, _ZN3sce3Xml3Dom8Document10initializeEPKNS0_11InitializerE);
+	//REG_FUNC(0x18686B94, _ZN3sce3Xml3Dom8Document10insertNodeEyyy);
+	//REG_FUNC(0x49263CE5, _ZN3sce3Xml3Dom8Document11removeChildEyy);
+	//REG_FUNC(0xD945184A, _ZN3sce3Xml3Dom8Document11resetStatusEv);
+	//REG_FUNC(0x7B0A8F6C, _ZN3sce3Xml3Dom8Document11setWritableEv);
+	//REG_FUNC(0x0CBC1C3F, _ZN3sce3Xml3Dom8Document12importParentEPKS2_y);
+	//REG_FUNC(0x016A9ADB, _ZN3sce3Xml3Dom8Document12setAttrValueEyPKNS0_6StringES5_);
+	//REG_FUNC(0xEA19C7CF, _ZN3sce3Xml3Dom8Document12setAttributeEyPKNS0_6StringES5_);
+	//REG_FUNC(0x35C50B8B, _ZN3sce3Xml3Dom8Document13createElementEPKNS0_6StringEPKNS0_13AttributeListES5_);
+	//REG_FUNC(0xBCA5E62A, _ZN3sce3Xml3Dom8Document13recurseDeleteEy);
+	//REG_FUNC(0x8D19723F, _ZN3sce3Xml3Dom8Document14createTextNodeEPKNS0_6StringE);
+	//REG_FUNC(0x6220E98B, _ZN3sce3Xml3Dom8Document15addElementChildEyPKNS0_6StringEPKNS0_13AttributeListES5_);
+	//REG_FUNC(0xF1DB18B1, _ZN3sce3Xml3Dom8Document15removeAttributeEyPKNS0_6StringE);
+	//REG_FUNC(0x779036AB, _ZN3sce3Xml3Dom8Document16removeAttributesEy);
+	//REG_FUNC(0x0667B08D, _ZN3sce3Xml3Dom8Document16setAttributeListEyPKNS0_13AttributeListE);
+	//REG_FUNC(0xD2BFBC47, _ZNK3sce3Xml3Dom8Document20getElementsByTagNameEyPKNS0_6StringEPNS1_8NodeListE);
+	//REG_FUNC(0xDEFEAFD2, _ZN3sce3Xml3Dom8Document7setTextEyPKNS0_6StringE);
+	//REG_FUNC(0x87F8B4DA, _ZN3sce3Xml3Dom8Document9serializeEPKNS0_18SerializeParameterEPNS0_6StringE);
+	//REG_FUNC(0x4B7321FB, _ZN3sce3Xml3Dom8Document9terminateEv);
+	//REG_FUNC(0x1DD41C7A, _ZN3sce3Xml3Dom8DocumentC1ERKS2_);
+	//REG_FUNC(0x7B7107AD, _ZN3sce3Xml3Dom8DocumentC1Ev);
+	//REG_FUNC(0xF399F763, _ZN3sce3Xml3Dom8DocumentC2ERKS2_);
+	//REG_FUNC(0xE6BA9C73, _ZN3sce3Xml3Dom8DocumentC2Ev);
+	//REG_FUNC(0xFB207925, _ZN3sce3Xml3Dom8DocumentD1Ev);
+	//REG_FUNC(0x11A5F0A3, _ZN3sce3Xml3Dom8DocumentD2Ev);
+	//REG_FUNC(0xD622A7FE, _ZN3sce3Xml3Dom8DocumentaSERKS2_);
+	//REG_FUNC(0x860CC706, _ZN3sce3Xml3Dom8NodeList10initializeEPKNS0_11InitializerE);
+	//REG_FUNC(0x7A889374, _ZN3sce3Xml3Dom8NodeList10insertLastEy);
+	//REG_FUNC(0xE9995F58, _ZN3sce3Xml3Dom8NodeList10removeItemEy);
+	//REG_FUNC(0xFA921C6E, _ZN3sce3Xml3Dom8NodeList11insertFirstEy);
+	//REG_FUNC(0xCDD1D418, _ZNK3sce3Xml3Dom8NodeList4itemEj);
+	//REG_FUNC(0x508E9150, _ZN3sce3Xml3Dom8NodeList5clearEv);
+	//REG_FUNC(0xA41ED241, _ZNK3sce3Xml3Dom8NodeList8findItemEPKNS0_6StringE);
+	//REG_FUNC(0xE1AB441D, _ZNK3sce3Xml3Dom8NodeList8findItemEy);
+	//REG_FUNC(0xFB9EDBF9, _ZNK3sce3Xml3Dom8NodeList9getLengthEv);
+	//REG_FUNC(0x32B396AD, _ZN3sce3Xml3Dom8NodeList9terminateEv);
+	//REG_FUNC(0xB1CA0E34, _ZN3sce3Xml3Dom8NodeListC1ERKS2_);
+	//REG_FUNC(0x0580C02E, _ZN3sce3Xml3Dom8NodeListC1Ev);
+	//REG_FUNC(0xB97BF737, _ZN3sce3Xml3Dom8NodeListC2ERKS2_);
+	//REG_FUNC(0x684E57B9, _ZN3sce3Xml3Dom8NodeListC2Ev);
+	//REG_FUNC(0x92EBC9F8, _ZN3sce3Xml3Dom8NodeListD1Ev);
+	//REG_FUNC(0x2DF80037, _ZN3sce3Xml3Dom8NodeListD2Ev);
+	//REG_FUNC(0xBAD4AAFA, _ZNK3sce3Xml3Dom8NodeListixEj);
+	//REG_FUNC(0x874C8331, _ZN3sce3Xml3Sax6Parser10initializeEPKNS0_11InitializerE);
+	//REG_FUNC(0x4DB998E6, _ZN3sce3Xml3Sax6Parser11setUserDataEPv);
+	//REG_FUNC(0xB77BF8A0, _ZN3sce3Xml3Sax6Parser16setResolveEntityEb);
+	//REG_FUNC(0x1B2442A0, _ZN3sce3Xml3Sax6Parser18setDocumentHandlerEPNS1_15DocumentHandlerE);
+	//REG_FUNC(0xCE1DAE23, _ZN3sce3Xml3Sax6Parser26setSkipIgnorableWhiteSpaceEb);
+	//REG_FUNC(0x70D9FC8E, _ZN3sce3Xml3Sax6Parser5parseEPKNS0_6StringEb);
+	//REG_FUNC(0xA2B40FA7, _ZN3sce3Xml3Sax6Parser5resetEv);
+	//REG_FUNC(0xF2C8950D, _ZN3sce3Xml3Sax6Parser9terminateEv);
+	//REG_FUNC(0x60BF9988, _ZN3sce3Xml3Sax6ParserC1Ev);
+	//REG_FUNC(0x56390CA0, _ZN3sce3Xml3Sax6ParserC2Ev);
+	//REG_FUNC(0xA11C2AED, _ZN3sce3Xml3Sax6ParserD1Ev);
+	//REG_FUNC(0x02E8F7FA, _ZN3sce3Xml3Sax6ParserD2Ev);
+	//REG_FUNC(0xE5314387, _ZN3sce3Xml4Attr10initializeEPKNS0_11InitializerE);
+	//REG_FUNC(0x66D1B605, _ZN3sce3Xml4Attr7setNameEPKNS0_6StringE);
+	//REG_FUNC(0x7DD3059D, _ZN3sce3Xml4Attr8setValueEPKNS0_6StringE);
+	//REG_FUNC(0x67E0DF2B, _ZN3sce3Xml4Attr9terminateEv);
+	//REG_FUNC(0xC09ABF87, _ZN3sce3Xml4AttrC1ERKS1_);
+	//REG_FUNC(0xD016F1BC, _ZN3sce3Xml4AttrC1Ev);
+	//REG_FUNC(0xB4851BEC, _ZN3sce3Xml4AttrC2ERKS1_);
+	//REG_FUNC(0x0B3AE81B, _ZN3sce3Xml4AttrC2Ev);
+	//REG_FUNC(0x58E349A5, _ZN3sce3Xml4AttrD1Ev);
+	//REG_FUNC(0xB9E6F81A, _ZN3sce3Xml4AttrD2Ev);
+	//REG_FUNC(0xA5B902D4, _ZN3sce3Xml4AttraSERKS1_);
+	//REG_FUNC(0xA7E983E2, _ZN3sce3Xml4Util9strResultEi);
+	//REG_FUNC(0x035F013B, _ZN3sce3Xml6StringC1EPKc);
+	//REG_FUNC(0x0B5461E0, _ZN3sce3Xml6StringC1EPKcj);
+	//REG_FUNC(0x67191CC6, _ZN3sce3Xml6StringC1ERKS1_);
+	//REG_FUNC(0xA17502C1, _ZN3sce3Xml6StringC1Ev);
+	//REG_FUNC(0xECC1F1A4, _ZN3sce3Xml6StringC2EPKc);
+	//REG_FUNC(0x457CCE55, _ZN3sce3Xml6StringC2EPKcj);
+	//REG_FUNC(0xD785BA85, _ZN3sce3Xml6StringC2ERKS1_);
+	//REG_FUNC(0x8816F7EF, _ZN3sce3Xml6StringC2Ev);
+	//REG_FUNC(0x18758863, _ZN3sce3Xml6StringaSERKS1_);
+	//REG_FUNC(0x4F30F0CC, _ZNK3sce3Xml13AttributeList12getAttributeEPKNS0_6StringE);
+	//REG_FUNC(0x5ED0B2F9, _ZNK3sce3Xml13AttributeList12getAttributeEj);
+	//REG_FUNC(0x38AEB52E, _ZNK3sce3Xml13AttributeList9getLengthEv);
+	//REG_FUNC(0xEC96BFC6, _ZNK3sce3Xml3Dom13DocumentDebug13getStructSizeEv);
+	//REG_FUNC(0xE1100FC0, _ZNK3sce3Xml3Dom13DocumentDebug16getAttrTableSizeEv);
+	//REG_FUNC(0x6E1F1FFB, _ZNK3sce3Xml3Dom13DocumentDebug16getCharTableSizeEv);
+	//REG_FUNC(0x8F9CEE10, _ZNK3sce3Xml3Dom13DocumentDebug19getElementTableSizeEv);
+	//REG_FUNC(0xE1269956, _ZNK3sce3Xml3Dom4Node11getNodeNameEv);
+	//REG_FUNC(0xCED5E0FF, _ZNK3sce3Xml3Dom4Node11getNodeTypeEv);
+	//REG_FUNC(0x4F2D5541, _ZNK3sce3Xml3Dom4Node12getNodeValueEv);
+	//REG_FUNC(0xB405A149, _ZNK3sce3Xml3Dom4Node13getAttributesEv);
+	//REG_FUNC(0x117BEA8A, _ZNK3sce3Xml3Dom4Node13getChildNodesEv);
+	//REG_FUNC(0x639D219C, _ZNK3sce3Xml3Dom4Node13getFirstChildEv);
+	//REG_FUNC(0x3FD63FB8, _ZNK3sce3Xml3Dom4Node12getLastChildEv);
+	//REG_FUNC(0x1A46C0E1, _ZNK3sce3Xml3Dom4Node14getNextSiblingEv);
+	//REG_FUNC(0xD9757BC8, _ZNK3sce3Xml3Dom4Node14getParenetNodeEv);
+	//REG_FUNC(0x3E8122AB, _ZNK3sce3Xml3Dom4Node16getOwnerDocumentEv);
+	//REG_FUNC(0x22DBB221, _ZNK3sce3Xml3Dom8Document10getDocRootEv);
+	//REG_FUNC(0xE3D0A78A, _ZNK3sce3Xml3Dom8Document10getSiblingEy);
+	//REG_FUNC(0x2D370226, _ZNK3sce3Xml3Dom8Document10getXmlMetaEv);
+	//REG_FUNC(0xA4D99D40, _ZNK3sce3Xml3Dom8Document10isReadOnlyEv);
+	//REG_FUNC(0xCD65B91F, _ZNK3sce3Xml3Dom8Document11getAttrNameEy);
+	//REG_FUNC(0x883E1BFC, _ZNK3sce3Xml3Dom8Document11getNextAttrEy);
+	//REG_FUNC(0x471A22E8, _ZNK3sce3Xml3Dom8Document11getNodeNameEy);
+	//REG_FUNC(0x62D3CB44, _ZNK3sce3Xml3Dom8Document11getNodeTypeEy);
+	//REG_FUNC(0x28FD79E3, _ZNK3sce3Xml3Dom8Document11isAvailableEv);
+	//REG_FUNC(0x7C6A03FD, _ZNK3sce3Xml3Dom8Document12getAttrValueEy);
+	//REG_FUNC(0x9531C3CD, _ZNK3sce3Xml3Dom8Document12getAttributeEyPKNS0_6StringE);
+	//REG_FUNC(0xEC856072, _ZNK3sce3Xml3Dom8Document12getFirstAttrEy);
+	//REG_FUNC(0xFBCF0D3E, _ZNK3sce3Xml3Dom8Document12getLastChildEy);
+	//REG_FUNC(0xCDEC3F43, _ZNK3sce3Xml3Dom8Document13getAttributesEyPNS1_8NodeListE);
+	//REG_FUNC(0xFC61FDF1, _ZNK3sce3Xml3Dom8Document13getChildNodesEyPNS1_8NodeListE);
+	//REG_FUNC(0xDAC75E49, _ZNK3sce3Xml3Dom8Document13getEntityTypeEy);
+	//REG_FUNC(0xEA805296, _ZNK3sce3Xml3Dom8Document13hasAttributesEy);
+	//REG_FUNC(0xC5E7431A, _ZNK3sce3Xml3Dom8Document13hasChildNodesEy);
+	//REG_FUNC(0x0C1DDEC5, _ZNK3sce3Xml3Dom8Document14getSkippedTextEy);
+	//REG_FUNC(0xB34D9672, _ZNK3sce3Xml3Dom8Document7getRootEv);
+	//REG_FUNC(0x36ACFF5E, _ZNK3sce3Xml3Dom8Document7getTextEy);
+	//REG_FUNC(0x3028E05D, _ZNK3sce3Xml3Dom8Document13getFirstChildEy);
+	//REG_FUNC(0x161BA85E, _ZNK3sce3Xml3Dom8Document9getEntityEy);
+	//REG_FUNC(0xA98B5758, _ZNK3sce3Xml3Dom8Document9getParentEy);
+	//REG_FUNC(0xD428753A, _ZNK3sce3Xml3Dom8Document9getStatusEv);
+	//REG_FUNC(0x10530611, _ZNK3sce3Xml3Dom8NodeList11isAvailableEv);
+	//REG_FUNC(0x35134B85, _ZNK3sce3Xml4Attr7getNameEv);
+	//REG_FUNC(0x7834A2F7, _ZNK3sce3Xml4Attr8getValueEv);
+	//REG_FUNC(0x0D119AB3, _ZNK3sce3Xml3Dom4Node11isAvailableEv);
+	//REG_FUNC(0x1633846D, _ZNK3sce3Xml4Attr11isAvailableEv);
+	//REG_FUNC(0x58854322, _ZNK3sce3Xml13AttributeList11isAvailableEv);
+});
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.cpp b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
index 4ca94b42a6..29990a3208 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.cpp
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.cpp
@@ -44,32 +44,132 @@ void execute_psv_func_by_index(ARMv7Context& context, u32 index)
 	context.thread.m_last_syscall = old_last_syscall;
 }
 
+extern psv_log_base sceAppMgr;
+extern psv_log_base sceAppUtil;
+extern psv_log_base sceAudio;
+extern psv_log_base sceAudiodec;
+extern psv_log_base sceAudioenc;
+extern psv_log_base sceAudioIn;
+extern psv_log_base sceCamera;
+extern psv_log_base sceCodecEngine;
+extern psv_log_base sceCommonDialog;
+extern psv_log_base sceCtrl;
+extern psv_log_base sceDbg;
+extern psv_log_base sceDeci4p;
+extern psv_log_base sceDeflt;
+extern psv_log_base sceDisplay;
+extern psv_log_base sceFiber;
+extern psv_log_base sceFios;
+extern psv_log_base sceFpu;
+extern psv_log_base sceGxm;
+extern psv_log_base sceHttp;
+extern psv_log_base sceIme;
+extern psv_log_base sceJpeg;
+extern psv_log_base sceJpegEnc;
 extern psv_log_base sceLibc;
+extern psv_log_base sceLibKernel;
 extern psv_log_base sceLibm;
 extern psv_log_base sceLibstdcxx;
-extern psv_log_base sceLibKernel;
-extern psv_log_base sceSysmodule;
+extern psv_log_base sceLiveArea;
+extern psv_log_base sceLocation;
+extern psv_log_base sceMd5;
+extern psv_log_base sceMotion;
+extern psv_log_base sceMt19937;
+extern psv_log_base sceNet;
+extern psv_log_base sceNetCtl;
+extern psv_log_base sceNgs;
+extern psv_log_base sceNpBasic;
+extern psv_log_base sceNpCommon;
+extern psv_log_base sceNpManager;
+extern psv_log_base sceNpMatching;
+extern psv_log_base sceNpScore;
+extern psv_log_base sceNpUtility;
 extern psv_log_base scePerf;
-extern psv_log_base sceCtrl;
-extern psv_log_base sceDeci4p;
-extern psv_log_base sceDisplay;
-extern psv_log_base sceGxm;
+extern psv_log_base scePgf;
+extern psv_log_base scePhotoExport;
+extern psv_log_base sceRazorCapture;
+extern psv_log_base sceRtc;
+extern psv_log_base sceSas;
+extern psv_log_base sceScreenShot;
+extern psv_log_base sceSfmt;
+extern psv_log_base sceSha;
+extern psv_log_base sceSqlite;
+extern psv_log_base sceSsl;
+extern psv_log_base sceSulpha;
+extern psv_log_base sceSysmodule;
+extern psv_log_base sceSystemGesture;
+extern psv_log_base sceTouch;
+extern psv_log_base sceUlt;
+extern psv_log_base sceVideodec;
+extern psv_log_base sceVoice;
+extern psv_log_base sceVoiceQoS;
+extern psv_log_base sceXml;
 
 void initialize_psv_modules()
 {
 	assert(!g_psv_func_list.size() && !g_psv_modules.size());
 
 	// fill module list
+	g_psv_modules.push_back(&sceAppMgr);
+	g_psv_modules.push_back(&sceAppUtil);
+	g_psv_modules.push_back(&sceAudio);
+	g_psv_modules.push_back(&sceAudiodec);
+	g_psv_modules.push_back(&sceAudioenc);
+	g_psv_modules.push_back(&sceAudioIn);
+	g_psv_modules.push_back(&sceCamera);
+	g_psv_modules.push_back(&sceCodecEngine);
+	g_psv_modules.push_back(&sceCommonDialog);
+	g_psv_modules.push_back(&sceCtrl);
+	g_psv_modules.push_back(&sceDbg);
+	g_psv_modules.push_back(&sceDeci4p);
+	g_psv_modules.push_back(&sceDeflt);
+	g_psv_modules.push_back(&sceDisplay);
+	g_psv_modules.push_back(&sceFiber);
+	g_psv_modules.push_back(&sceFios);
+	g_psv_modules.push_back(&sceFpu);
+	g_psv_modules.push_back(&sceGxm);
+	g_psv_modules.push_back(&sceHttp);
+	g_psv_modules.push_back(&sceIme);
+	g_psv_modules.push_back(&sceJpeg);
+	g_psv_modules.push_back(&sceJpegEnc);
 	g_psv_modules.push_back(&sceLibc);
+	g_psv_modules.push_back(&sceLibKernel);
 	g_psv_modules.push_back(&sceLibm);
 	g_psv_modules.push_back(&sceLibstdcxx);
-	g_psv_modules.push_back(&sceLibKernel);
-	g_psv_modules.push_back(&sceSysmodule);
+	g_psv_modules.push_back(&sceLiveArea);
+	g_psv_modules.push_back(&sceLocation);
+	g_psv_modules.push_back(&sceMd5);
+	g_psv_modules.push_back(&sceMotion);
+	g_psv_modules.push_back(&sceMt19937);
+	g_psv_modules.push_back(&sceNet);
+	g_psv_modules.push_back(&sceNetCtl);
+	g_psv_modules.push_back(&sceNgs);
+	g_psv_modules.push_back(&sceNpBasic);
+	g_psv_modules.push_back(&sceNpCommon);
+	g_psv_modules.push_back(&sceNpManager);
+	g_psv_modules.push_back(&sceNpMatching);
+	g_psv_modules.push_back(&sceNpScore);
+	g_psv_modules.push_back(&sceNpUtility);
 	g_psv_modules.push_back(&scePerf);
-	g_psv_modules.push_back(&sceCtrl);
-	g_psv_modules.push_back(&sceDeci4p);
-	g_psv_modules.push_back(&sceDisplay);
-	g_psv_modules.push_back(&sceGxm);
+	g_psv_modules.push_back(&scePgf);
+	g_psv_modules.push_back(&scePhotoExport);
+	g_psv_modules.push_back(&sceRazorCapture);
+	g_psv_modules.push_back(&sceRtc);
+	g_psv_modules.push_back(&sceSas);
+	g_psv_modules.push_back(&sceScreenShot);
+	g_psv_modules.push_back(&sceSfmt);
+	g_psv_modules.push_back(&sceSha);
+	g_psv_modules.push_back(&sceSqlite);
+	g_psv_modules.push_back(&sceSsl);
+	g_psv_modules.push_back(&sceSulpha);
+	g_psv_modules.push_back(&sceSysmodule);
+	g_psv_modules.push_back(&sceSystemGesture);
+	g_psv_modules.push_back(&sceTouch);
+	g_psv_modules.push_back(&sceUlt);
+	g_psv_modules.push_back(&sceVideodec);
+	g_psv_modules.push_back(&sceVoice);
+	g_psv_modules.push_back(&sceVoiceQoS);
+	g_psv_modules.push_back(&sceXml);
 
 	// setup special functions (without NIDs)
 	psv_func unimplemented;
diff --git a/rpcs3/Emu/FS/vfsDirBase.h b/rpcs3/Emu/FS/vfsDirBase.h
index c4d515899c..654cc72d01 100644
--- a/rpcs3/Emu/FS/vfsDirBase.h
+++ b/rpcs3/Emu/FS/vfsDirBase.h
@@ -67,8 +67,9 @@ public:
 		{
 		}
 
-		iterator(const DirEntryInfo* data)
-			: data(data)
+		iterator(vfsDirBase* parent, const DirEntryInfo* data)
+			: parent(parent)
+			, data(data)
 		{
 		}
 
@@ -82,7 +83,7 @@ public:
 		{
 			const DirEntryInfo* olddata = data;
 			data = parent->Read();
-			return iterator(olddata);
+			return iterator(parent, olddata);
 		}
 
 		const DirEntryInfo* operator *()
@@ -90,7 +91,7 @@ public:
 			return data;
 		}
 
-		bool operator!=(iterator other) const
+		bool operator !=(iterator other) const
 		{
 			return data != other.data;
 		}
@@ -103,6 +104,6 @@ public:
 
 	iterator end()
 	{
-		return iterator((const DirEntryInfo*)nullptr);
+		return iterator(this, nullptr);
 	}
 };
diff --git a/rpcs3/Emu/Memory/Memory.cpp b/rpcs3/Emu/Memory/Memory.cpp
index 6c5d405eab..84f75c6fff 100644
--- a/rpcs3/Emu/Memory/Memory.cpp
+++ b/rpcs3/Emu/Memory/Memory.cpp
@@ -17,11 +17,6 @@
 
 MemoryBase Memory;
 
-void MemoryBase::InvalidAddress(const char* func, const u64 addr)
-{
-	LOG_ERROR(MEMORY, "%s(): invalid address (0x%llx)", func, addr);
-}
-
 void MemoryBase::RegisterPages(u64 addr, u32 size)
 {
 	LV2_LOCK(0);
@@ -31,7 +26,7 @@ void MemoryBase::RegisterPages(u64 addr, u32 size)
 	{
 		if (i >= sizeof(m_pages) / sizeof(m_pages[0]))
 		{
-			InvalidAddress(__FUNCTION__, i * 4096);
+			LOG_ERROR(MEMORY, "%s(): invalid address 0x%llx", __FUNCTION__, i * 4096);
 			break;
 		}
 		if (m_pages[i])
@@ -52,7 +47,7 @@ void MemoryBase::UnregisterPages(u64 addr, u32 size)
 	{
 		if (i >= sizeof(m_pages) / sizeof(m_pages[0]))
 		{
-			InvalidAddress(__FUNCTION__, i * 4096);
+			LOG_ERROR(MEMORY, "%s(): invalid address 0x%llx", __FUNCTION__, i * 4096);
 			break;
 		}
 		if (!m_pages[i])
diff --git a/rpcs3/Emu/Memory/Memory.h b/rpcs3/Emu/Memory/Memory.h
index 5ba0e1dd7b..3f9a981041 100644
--- a/rpcs3/Emu/Memory/Memory.h
+++ b/rpcs3/Emu/Memory/Memory.h
@@ -77,8 +77,6 @@ public:
 		return vm::g_base_addr;
 	}
 
-	__noinline void InvalidAddress(const char* func, const u64 addr);
-
 	void RegisterPages(u64 addr, u32 size);
 
 	void UnregisterPages(u64 addr, u32 size);
diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp
index 25a4d8c0e7..2c23ecdb66 100644
--- a/rpcs3/Emu/Memory/vm.cpp
+++ b/rpcs3/Emu/Memory/vm.cpp
@@ -66,6 +66,11 @@ namespace vm
 		return 0;
 	}
 
+	void error(const u64 addr, const char* func)
+	{
+		throw fmt::format("%s(): invalid address 0x%llx", func, addr);
+	}
+
 	namespace ps3
 	{
 		u32 main_alloc(u32 size)
diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/Emu/Memory/vm.h
index 38735da8ba..7cc958c3ba 100644
--- a/rpcs3/Emu/Memory/vm.h
+++ b/rpcs3/Emu/Memory/vm.h
@@ -42,6 +42,8 @@ namespace vm
 
 	u32 get_addr(const void* real_pointer);
 
+	__noinline void error(const u64 addr, const char* func);
+
 	template<typename T>
 	struct cast_ptr
 	{
@@ -70,7 +72,7 @@ namespace vm
 			const u32 res = static_cast<u32>(addr);
 			if (res != addr)
 			{
-				throw fmt::format("%s(): invalid address 0x%llx", func, addr);
+				vm::error(addr, func);
 			}
 
 			return res;
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.h b/rpcs3/Emu/SysCalls/Modules/cellSysutil.h
index 7554b95bf1..1e919b12f9 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.h
@@ -251,8 +251,8 @@ typedef void(CellWebBrowserUsrdata)(vm::ptr<void> usrdata);
 
 struct CellWebBrowserMimeSet
 {
-	vm::bptr<const char> const type;
-	vm::bptr<const char> const directory;
+	const vm::bptr<const char> type;
+	const vm::bptr<const char> directory;
 };
 
 struct CellWebBrowserPos
diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp
index 80cac220ad..6a4884798b 100644
--- a/rpcs3/Loader/ELF32.cpp
+++ b/rpcs3/Loader/ELF32.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "Ini.h"
 #include "Utilities/Log.h"
 #include "Utilities/rFile.h"
 #include "Emu/FS/vfsStream.h"
@@ -102,6 +103,9 @@ namespace loader
 				u32 code_start = 0;
 				u32 code_end = 0;
 
+				u32 vnid_addr = 0;
+				std::unordered_map<u32, u32> vnid_list;
+
 				for (auto& shdr : m_shdrs)
 				{
 					// get secton name
@@ -165,15 +169,19 @@ namespace loader
 
 						for (u32 j = 0; j < shdr.data_le.sh_size / 4; j++)
 						{
-							u32 nid = fnid[j];
-							u32 addr = fstub[j];
+							const u32 nid = fnid[j];
+							const u32 addr = fstub[j];
 
 							if (auto func = get_psv_func_by_nid(nid))
 							{
 								if (func->module)
+								{
 									func->module->Notice("Imported function %s (nid=0x%08x, addr=0x%x)", func->name, nid, addr);
+								}
 								else
+								{
 									LOG_NOTICE(LOADER, "Imported function %s (nid=0x%08x, addr=0x%x)", func->name, nid, addr);
+								}
 
 								// writing Thumb code (temporarily, because it should be ARM)
 								vm::psv::write16(addr + 0, 0xf870); // HACK instruction (Thumb)
@@ -183,7 +191,7 @@ namespace loader
 							}
 							else
 							{
-								LOG_ERROR(LOADER, "Unimplemented function 0x%08x (addr=0x%x)", nid, addr);
+								LOG_ERROR(LOADER, "Unknown function 0x%08x (addr=0x%x)", nid, addr);
 
 								vm::psv::write16(addr + 0, 0xf870); // HACK instruction (Thumb)
 								vm::psv::write16(addr + 2, 0); // index 0 (unimplemented stub)
@@ -193,6 +201,44 @@ namespace loader
 							code_end = std::min<u32>(addr, code_end);
 						}
 					}
+					else if (!strcmp(name.c_str(), ".sceVNID.rodata"))
+					{
+						LOG_NOTICE(LOADER, ".sceVNID.rodata analysis...");
+
+						vnid_addr = shdr.data_le.sh_addr;
+					}
+					else if (!strcmp(name.c_str(), ".sceVStub.rodata"))
+					{
+						LOG_NOTICE(LOADER, ".sceVStub.rodata analysis...");
+
+						if (!vnid_addr)
+						{
+							if (shdr.data_le.sh_size)
+							{
+								LOG_ERROR(LOADER, ".sceVNID.rodata address not found, unable to process imports");
+							}
+							continue;
+						}
+
+						auto vnid = vm::psv::ptr<const u32>::make(vnid_addr);
+						auto vstub = vm::psv::ptr<const u32>::make(shdr.data_le.sh_addr);
+
+						for (u32 j = 0; j < shdr.data_le.sh_size / 4; j++)
+						{
+							const u32 nid = vnid[j];
+							const u32 addr = vstub[j];
+
+							LOG_ERROR(LOADER, "Unknown object 0x%08x (ref_addr=0x%x)", nid, addr);
+
+							// TODO: find imported object (vtable, typeinfo or something), assign it to vnid_list[addr]
+						}
+					}
+					else if (!strcmp(name.c_str(), ".tbss"))
+					{
+						LOG_NOTICE(LOADER, ".tbss analysis");
+
+						LOG_ERROR(LOADER, "TLS: size=0x%08x", shdr.data_le.sh_size);
+					}
 					else if (!strcmp(name.c_str(), ".sceRefs.rodata"))
 					{
 						LOG_NOTICE(LOADER, ".sceRefs.rodata analysis...");
@@ -203,39 +249,71 @@ namespace loader
 						{
 							switch (*code)
 							{
-							case 0x000000ff:
+							case 0x000000ff: // save address for future use
 							{
-								// save address for future use
 								data = *++code;
 								break;
 							}
-							case 0x0000002f:
+							case 0x0000002f: // movw r*,# instruction is replaced
 							{
-								// movw r12,# instruction will be replaced
 								const u32 addr = *++code;
-								vm::psv::write16(addr + 0, 0xf240 | (data & 0x800) >> 1 | (data & 0xf000) >> 12); // MOVW
-								vm::psv::write16(addr + 2, 0x0c00 | (data & 0x700) << 4 | (data & 0xff));
-								//LOG_NOTICE(LOADER, "sceRefs: movw written at 0x%x (data=0x%x)", addr, data);
+
+								if (!data)
+								{
+									auto found = vnid_list.find(code.addr());
+									if (found != vnid_list.end())
+									{
+										data = found->second;
+									}
+								}
+
+								if (!data)
+								{
+									LOG_ERROR(LOADER, ".sceRefs: movw writing failed (code=0x%x, addr=0x%x)", code, addr);
+									break;
+								}
+
+								vm::psv::write16(addr + 0, vm::psv::read16(addr + 0) | (data & 0x800) >> 1 | (data & 0xf000) >> 12);
+								vm::psv::write16(addr + 2, vm::psv::read16(addr + 2) | (data & 0x700) << 4 | (data & 0xff));
+
+								//if (Ini.HLELogging.GetValue())
+								{
+									LOG_NOTICE(LOADER, ".sceRefs: movw written at 0x%x (data=0x%x)", addr, data);
+								}
 								break;
 							}
-							case 0x00000030:
+							case 0x00000030: // movt r*,# instruction is replaced
 							{
-								// movt r12,# instruction will be replaced
 								const u32 addr = *++code;
-								vm::psv::write16(addr + 0, 0xf2c0 | (data & 0x8000000) >> 17 | (data & 0xf0000000) >> 28); // MOVT
-								vm::psv::write16(addr + 2, 0x0c00 | (data & 0x7000000) >> 12 | (data & 0xff0000) >> 16);
-								//LOG_NOTICE(LOADER, "sceRefs: movt written at 0x%x (data=0x%x)", addr, data);
+
+								if (!data)
+								{
+									LOG_ERROR(LOADER, ".sceRefs: movt writing failed (code=0x%x, addr=0x%x)", code, addr);
+									break;
+								}
+								
+								vm::psv::write16(addr + 0, vm::psv::read16(addr + 0) | (data & 0x8000000) >> 17 | (data & 0xf0000000) >> 28);
+								vm::psv::write16(addr + 2, vm::psv::read16(addr + 2) | (data & 0x7000000) >> 12 | (data & 0xff0000) >> 16);
+
+								//if (Ini.HLELogging.GetValue())
+								{
+									LOG_NOTICE(LOADER, ".sceRefs: movt written at 0x%x (data=0x%x)", addr, data);
+								}
 								break;
 							}
 							case 0x00000000:
 							{
-								// probably, no operation
-								//LOG_NOTICE(LOADER, "sceRefs: zero code");
+								data = 0;
+
+								if (Ini.HLELogging.GetValue())
+								{
+									LOG_NOTICE(LOADER, ".sceRefs: zero code found");
+								}
 								break;
 							}
 							default:
 							{
-								LOG_ERROR(LOADER, "sceRefs: unknown code found (0x%08x)", *code);
+								LOG_ERROR(LOADER, "Unknown code in .sceRefs section (0x%08x)", *code);
 							}
 							}
 						}
diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp
index b5d9850335..c71e8cb5f7 100644
--- a/rpcs3/Loader/ELF64.cpp
+++ b/rpcs3/Loader/ELF64.cpp
@@ -423,6 +423,7 @@ namespace loader
 
 				case 0x00000007: //TLS
 					Emu.SetTLSData(phdr.p_vaddr.addr(), phdr.p_filesz.value(), phdr.p_memsz.value());
+					LOG_ERROR(LOADER, "TLS: addr=0x%x, filesz=0x%x, memsz=0x%x", Emu.GetTLSAddr(), Emu.GetTLSFilesz(), Emu.GetTLSMemsz());
 					break;
 
 				case 0x60000001: //LOOS+1
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 9b3c761dde..ca94bcbcc5 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -58,16 +58,66 @@
     <ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\psv_event_flag.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\psv_sema.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceAppMgr.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceAppUtil.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceAudio.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceAudiodec.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceAudioenc.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceAudioIn.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceCamera.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceCodecEngine.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceCommonDialog.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceCtrl.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceDbg.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceDeci4p.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceDeflt.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceDisplay.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceFiber.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceFios.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceFpu.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceGxm.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceHttp.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceIme.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceJpeg.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceJpegEnc.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibKernel.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibc.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibm.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceLibstdcxx.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceLiveArea.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceLocation.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceMd5.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceMotion.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceMt19937.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceNet.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceNetCtl.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceNgs.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpBasic.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpCommon.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpManager.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpMatching.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpScore.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpUtility.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\scePerf.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\scePgf.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\scePhotoExport.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceRazorCapture.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceRtc.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceSas.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceScreenShot.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceSfmt.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceSha.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceSqlite.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceSsl.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceSulpha.cpp" />
     <ClCompile Include="Emu\ARMv7\Modules\sceSysmodule.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceSystemGesture.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceTouch.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceUlt.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceVideodec.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceVoice.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceVoiceQoS.cpp" />
+    <ClCompile Include="Emu\ARMv7\Modules\sceXml.cpp" />
     <ClCompile Include="Emu\ARMv7\PSVFuncList.cpp" />
     <ClCompile Include="Emu\ARMv7\PSVObjectList.cpp" />
     <ClCompile Include="Emu\Audio\AL\OpenALThread.cpp" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 9b46ecec23..ba692d9a05 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -695,6 +695,156 @@
     <ClCompile Include="Emu\ARMv7\Modules\sceGxm.cpp">
       <Filter>Emu\CPU\ARMv7\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceAppMgr.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceAppUtil.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceAudio.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceAudiodec.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceAudioenc.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceAudioIn.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceCamera.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceCodecEngine.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceCommonDialog.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceDbg.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceDeflt.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceFiber.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceFios.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceFpu.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceHttp.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceIme.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceJpeg.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceJpegEnc.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceLiveArea.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceLocation.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceMd5.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceMotion.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceMt19937.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceNet.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceNetCtl.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceNgs.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpBasic.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpCommon.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpManager.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpMatching.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpScore.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceNpUtility.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\scePgf.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\scePhotoExport.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceRazorCapture.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceRtc.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceSas.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceScreenShot.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceSqlite.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceSsl.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceSulpha.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceSystemGesture.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceTouch.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceUlt.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceVideodec.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceVoice.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceVoiceQoS.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceXml.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceSfmt.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\ARMv7\Modules\sceSha.cpp">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">

From 6c40dc0631e83ce819eef6c3305b9221fd8ffae6 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Thu, 29 Jan 2015 20:42:51 +0300
Subject: [PATCH 53/70] Some functions added

---
 rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp   |  36 +++++-
 rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp  | 158 ++++++++++++++++++++++--
 rpcs3/Emu/ARMv7/Modules/sceAudio.cpp    |  57 +++++++--
 rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp  |  22 +++-
 rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp | 130 +++++++++++++++++--
 rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp | 114 +++++++++++++++--
 6 files changed, 474 insertions(+), 43 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp b/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp
index 0d9aa8a072..5b39017a62 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceAppMgr.cpp
@@ -4,6 +4,34 @@
 
 extern psv_log_base sceAppMgr;
 
+struct SceAppMgrEvent
+{
+	s32 event;
+	s32 appId;
+	char param[56];
+};
+
+s32 sceAppMgrReceiveEventNum(vm::psv::ptr<s32> eventNum)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppMgrReceiveEvent(vm::psv::ptr<SceAppMgrEvent> appEvent)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppMgrAcquireBgmPort()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppMgrReleaseBgmPort()
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceAppMgr, #name, name)
 
 psv_log_base sceAppMgr("SceAppMgr", []()
@@ -12,9 +40,9 @@ psv_log_base sceAppMgr("SceAppMgr", []()
 	sceAppMgr.on_unload = nullptr;
 	sceAppMgr.on_stop = nullptr;
 
-	//REG_FUNC(0x47E5DD7D, sceAppMgrReceiveEventNum);
-	//REG_FUNC(0xCFAD5A3A, sceAppMgrReceiveEvent);
-	//REG_FUNC(0xF3D65520, sceAppMgrAcquireBgmPort);
-	//REG_FUNC(0x96CBE713, sceAppMgrReleaseBgmPort);
+	REG_FUNC(0x47E5DD7D, sceAppMgrReceiveEventNum);
+	REG_FUNC(0xCFAD5A3A, sceAppMgrReceiveEvent);
+	REG_FUNC(0xF3D65520, sceAppMgrAcquireBgmPort);
+	REG_FUNC(0x96CBE713, sceAppMgrReleaseBgmPort);
 	//REG_FUNC(0x49255C91, sceAppMgrGetRunStatus);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp
index 567f6c4f3e..6d1739d789 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp
@@ -4,6 +4,138 @@
 
 extern psv_log_base sceAppUtil;
 
+struct SceAppUtilInitParam
+{
+	u32 workBufSize;
+	char reserved[60];
+};
+
+struct SceAppUtilBootParam
+{
+	u32 attr;
+	u32 appVersion;
+	char reserved[32];
+};
+
+struct SceAppUtilSaveDataMountPoint
+{
+	char data[16];
+};
+
+struct SceAppUtilSaveDataSlotParam
+{
+	u32 status;
+	char title[64];
+	char subTitle[128];
+	char detail[512];
+	char iconPath[64];
+	s32 userParam;
+	u32 sizeKB;
+	SceDateTime modifiedTime;
+	char reserved[48];
+};
+
+struct SceAppUtilSaveDataSlotEmptyParam
+{
+	vm::psv::ptr<char> title;
+	vm::psv::ptr<char> iconPath;
+	vm::psv::ptr<void> iconBuf;
+	u32 iconBufSize;
+	char reserved[32];
+};
+
+struct SceAppUtilSaveDataSlot
+{
+	u32 id;
+	u32 status;
+	s32 userParam;
+	vm::psv::ptr<SceAppUtilSaveDataSlotEmptyParam> emptyParam;
+};
+
+struct SceAppUtilSaveDataFile
+{
+	vm::psv::ptr<const char> filePath;
+	vm::psv::ptr<void> buf;
+	u32 bufSize;
+	s64 offset;
+	u32 mode;
+	u32 progDelta;
+	char reserved[32];
+};
+
+struct SceAppUtilSaveDataFileSlot
+{
+	u32 id;
+	vm::psv::ptr<SceAppUtilSaveDataSlotParam> slotParam;
+	char reserved[32];
+};
+
+s32 sceAppUtilInit(vm::psv::ptr<const SceAppUtilInitParam> initParam, vm::psv::ptr<SceAppUtilBootParam> bootParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilShutdown()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilSaveDataSlotCreate(u32 slotId, vm::psv::ptr<const SceAppUtilSaveDataSlotParam> param, vm::psv::ptr<const SceAppUtilSaveDataMountPoint> mountPoint)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilSaveDataSlotDelete(u32 slotId, vm::psv::ptr<const SceAppUtilSaveDataMountPoint> mountPoint)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilSaveDataSlotSetParam(u32 slotId, vm::psv::ptr<const SceAppUtilSaveDataSlotParam> param, vm::psv::ptr<const SceAppUtilSaveDataMountPoint> mountPoint)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilSaveDataSlotGetParam(u32 slotId, vm::psv::ptr<SceAppUtilSaveDataSlotParam> param, vm::psv::ptr<const SceAppUtilSaveDataMountPoint> mountPoint)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilSaveDataFileSave(vm::psv::ptr<const SceAppUtilSaveDataFileSlot> slot, vm::psv::ptr<const SceAppUtilSaveDataFile> files, u32 fileNum, vm::psv::ptr<const SceAppUtilSaveDataMountPoint> mountPoint, vm::psv::ptr<u32> requiredSizeKB)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilPhotoMount()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilPhotoUmount()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilSystemParamGetInt(u32 paramId, vm::psv::ptr<s32> value)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilSystemParamGetString(u32 paramId, vm::psv::ptr<char> buf, u32 bufSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilSaveSafeMemory(vm::psv::ptr<const void> buf, u32 bufSize, s64 offset)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAppUtilLoadSafeMemory(vm::psv::ptr<void> buf, u32 bufSize, s64 offset)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceAppUtil, #name, name)
 
 psv_log_base sceAppUtil("SceAppUtil", []()
@@ -12,17 +144,17 @@ psv_log_base sceAppUtil("SceAppUtil", []()
 	sceAppUtil.on_unload = nullptr;
 	sceAppUtil.on_stop = nullptr;
 
-	//REG_FUNC(0xDAFFE671, sceAppUtilInit);
-	//REG_FUNC(0xB220B00B, sceAppUtilShutdown);
-	//REG_FUNC(0x7E8FE96A, sceAppUtilSaveDataSlotCreate);
-	//REG_FUNC(0x266A7646, sceAppUtilSaveDataSlotDelete);
-	//REG_FUNC(0x98630136, sceAppUtilSaveDataSlotSetParam);
-	//REG_FUNC(0x93F0D89F, sceAppUtilSaveDataSlotGetParam);
-	//REG_FUNC(0x1E2A6158, sceAppUtilSaveDataFileSave);
-	//REG_FUNC(0xEE85804D, sceAppUtilPhotoMount);
-	//REG_FUNC(0x9651B941, sceAppUtilPhotoUmount);
-	//REG_FUNC(0x5DFB9CA0, sceAppUtilSystemParamGetInt);
-	//REG_FUNC(0x6E6AA267, sceAppUtilSystemParamGetString);
-	//REG_FUNC(0x9D8AC677, sceAppUtilSaveSafeMemory);
-	//REG_FUNC(0x3424D772, sceAppUtilLoadSafeMemory);
+	REG_FUNC(0xDAFFE671, sceAppUtilInit);
+	REG_FUNC(0xB220B00B, sceAppUtilShutdown);
+	REG_FUNC(0x7E8FE96A, sceAppUtilSaveDataSlotCreate);
+	REG_FUNC(0x266A7646, sceAppUtilSaveDataSlotDelete);
+	REG_FUNC(0x98630136, sceAppUtilSaveDataSlotSetParam);
+	REG_FUNC(0x93F0D89F, sceAppUtilSaveDataSlotGetParam);
+	REG_FUNC(0x1E2A6158, sceAppUtilSaveDataFileSave);
+	REG_FUNC(0xEE85804D, sceAppUtilPhotoMount);
+	REG_FUNC(0x9651B941, sceAppUtilPhotoUmount);
+	REG_FUNC(0x5DFB9CA0, sceAppUtilSystemParamGetInt);
+	REG_FUNC(0x6E6AA267, sceAppUtilSystemParamGetString);
+	REG_FUNC(0x9D8AC677, sceAppUtilSaveSafeMemory);
+	REG_FUNC(0x3424D772, sceAppUtilLoadSafeMemory);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp
index 36920a8e59..ad0ab8d9af 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceAudio.cpp
@@ -4,6 +4,47 @@
 
 extern psv_log_base sceAudio;
 
+s32 sceAudioOutOpenPort(s32 portType, s32 len, s32 freq, s32 param)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioOutReleasePort(s32 port)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioOutOutput(s32 port, vm::psv::ptr<void> ptr)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioOutSetVolume(s32 port, s32 flag, vm::psv::ptr<s32> vol)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioOutSetConfig(s32 port, s32 len, s32 freq, s32 param)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioOutGetConfig(s32 port, s32 configType)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioOutGetRestSample(s32 port)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioOutGetAdopt(s32 portType)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceAudio, #name, name)
 
 psv_log_base sceAudio("SceAudio", []()
@@ -12,13 +53,13 @@ psv_log_base sceAudio("SceAudio", []()
 	sceAudio.on_unload = nullptr;
 	sceAudio.on_stop = nullptr;
 
-	//REG_FUNC(0x5BC341E4, sceAudioOutOpenPort);
-	//REG_FUNC(0x69E2E6B5, sceAudioOutReleasePort);
-	//REG_FUNC(0x02DB3F5F, sceAudioOutOutput);
-	//REG_FUNC(0x64167F11, sceAudioOutSetVolume);
-	//REG_FUNC(0xB8BA0D07, sceAudioOutSetConfig);
-	//REG_FUNC(0x9C8EDAEA, sceAudioOutGetConfig);
-	//REG_FUNC(0x9A5370C4, sceAudioOutGetRestSample);
-	//REG_FUNC(0x12FB1767, sceAudioOutGetAdopt);
+	REG_FUNC(0x5BC341E4, sceAudioOutOpenPort);
+	REG_FUNC(0x69E2E6B5, sceAudioOutReleasePort);
+	REG_FUNC(0x02DB3F5F, sceAudioOutOutput);
+	REG_FUNC(0x64167F11, sceAudioOutSetVolume);
+	REG_FUNC(0xB8BA0D07, sceAudioOutSetConfig);
+	REG_FUNC(0x9C8EDAEA, sceAudioOutGetConfig);
+	REG_FUNC(0x9A5370C4, sceAudioOutGetRestSample);
+	REG_FUNC(0x12FB1767, sceAudioOutGetAdopt);
 	//REG_FUNC(0xC6D8D775, sceAudioInRaw);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp
index 0ae64a168d..29c7378b33 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceAudioIn.cpp
@@ -4,6 +4,22 @@
 
 extern psv_log_base sceAudioIn;
 
+s32 sceAudioInOpenPort(s32 portType, s32 grain, s32 freq, s32 param)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioInReleasePort(s32 port)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioInInput(s32 port, vm::psv::ptr<void> destPtr)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceAudioIn, #name, name)
 
 psv_log_base sceAudioIn("SceAudioIn", []()
@@ -12,8 +28,8 @@ psv_log_base sceAudioIn("SceAudioIn", []()
 	sceAudioIn.on_unload = nullptr;
 	sceAudioIn.on_stop = nullptr;
 
-	//REG_FUNC(0x638ADD2D, sceAudioInInput);
-	//REG_FUNC(0x39B50DC1, sceAudioInOpenPort);
-	//REG_FUNC(0x3A61B8C4, sceAudioInReleasePort);
+	REG_FUNC(0x638ADD2D, sceAudioInInput);
+	REG_FUNC(0x39B50DC1, sceAudioInOpenPort);
+	REG_FUNC(0x3A61B8C4, sceAudioInReleasePort);
 	//REG_FUNC(0x566AC433, sceAudioInGetAdopt);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp
index f8e3952dec..bf0d1a6bf9 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceAudiodec.cpp
@@ -4,6 +4,122 @@
 
 extern psv_log_base sceAudiodec;
 
+struct SceAudiodecInitStreamParam
+{
+	u32 size;
+	u32 totalStreams;
+};
+
+struct SceAudiodecInitChParam
+{
+	u32 size;
+	u32 totalCh;
+};
+
+union SceAudiodecInitParam
+{
+	u32 size;
+	SceAudiodecInitChParam     at9;
+	SceAudiodecInitStreamParam mp3;
+	SceAudiodecInitStreamParam aac;
+	SceAudiodecInitStreamParam celp;
+};
+
+struct SceAudiodecInfoAt9
+{
+	u32 size;
+	u8 configData[4];
+	u32 ch;
+	u32 bitRate;
+	u32 samplingRate;
+	u32 superFrameSize;
+	u32 framesInSuperFrame;
+};
+
+struct SceAudiodecInfoMp3
+{
+	u32 size;
+	u32 ch;
+	u32 version;
+};
+
+struct SceAudiodecInfoAac
+{
+	u32 size;
+	u32 isAdts;
+	u32 ch;
+	u32 samplingRate;
+	u32 isSbr;
+};
+
+struct SceAudiodecInfoCelp
+{
+	u32 size;
+	u32 excitationMode;
+	u32 samplingRate;
+	u32 bitRate;
+	u32 lostCount;
+};
+
+union SceAudiodecInfo
+{
+	u32 size;
+	SceAudiodecInfoAt9  at9;
+	SceAudiodecInfoMp3  mp3;
+	SceAudiodecInfoAac  aac;
+	SceAudiodecInfoCelp celp;
+};
+
+struct SceAudiodecCtrl
+{
+	u32 size;
+	s32 handle;
+	vm::psv::ptr<u8> pEs;
+	u32 inputEsSize;
+	u32 maxEsSize;
+	vm::psv::ptr<void> pPcm;
+	u32 outputPcmSize;
+	u32 maxPcmSize;
+	u32 wordLength;
+	vm::psv::ptr<SceAudiodecInfo> pInfo;
+};
+
+s32 sceAudiodecInitLibrary(u32 codecType, vm::psv::ptr<SceAudiodecInitParam> pInitParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudiodecTermLibrary(u32 codecType)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudiodecCreateDecoder(vm::psv::ptr<SceAudiodecCtrl> pCtrl, u32 codecType)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudiodecDeleteDecoder(vm::psv::ptr<SceAudiodecCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudiodecDecode(vm::psv::ptr<SceAudiodecCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudiodecClearContext(vm::psv::ptr<SceAudiodecCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudiodecGetInternalError(vm::psv::ptr<SceAudiodecCtrl> pCtrl, vm::psv::ptr<s32> pInternalError)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceAudiodec, #name, name)
 
 psv_log_base sceAudiodec("SceAudiodec", []()
@@ -12,11 +128,11 @@ psv_log_base sceAudiodec("SceAudiodec", []()
 	sceAudiodec.on_unload = nullptr;
 	sceAudiodec.on_stop = nullptr;
 
-	//REG_FUNC(0x445C2CEF, sceAudiodecInitLibrary);
-	//REG_FUNC(0x45719B9D, sceAudiodecTermLibrary);
-	//REG_FUNC(0x4DFD3AAA, sceAudiodecCreateDecoder);
-	//REG_FUNC(0xE7A24E16, sceAudiodecDeleteDecoder);
-	//REG_FUNC(0xCCDABA04, sceAudiodecDecode);
-	//REG_FUNC(0xF72F9B64, sceAudiodecClearContext);
-	//REG_FUNC(0x883B0CF5, sceAudiodecGetInternalError);
+	REG_FUNC(0x445C2CEF, sceAudiodecInitLibrary);
+	REG_FUNC(0x45719B9D, sceAudiodecTermLibrary);
+	REG_FUNC(0x4DFD3AAA, sceAudiodecCreateDecoder);
+	REG_FUNC(0xE7A24E16, sceAudiodecDeleteDecoder);
+	REG_FUNC(0xCCDABA04, sceAudiodecDecode);
+	REG_FUNC(0xF72F9B64, sceAudiodecClearContext);
+	REG_FUNC(0x883B0CF5, sceAudiodecGetInternalError);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp b/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp
index a3bf58617c..d507170248 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceAudioenc.cpp
@@ -4,6 +4,104 @@
 
 extern psv_log_base sceAudioenc;
 
+struct SceAudioencInitStreamParam
+{
+	u32 size;
+	u32 totalStreams;
+};
+
+struct SceAudioencInfoCelp
+{
+	u32 size;
+	u32 excitationMode;
+	u32 samplingRate;
+	u32 bitRate;
+};
+
+struct SceAudioencOptInfoCelp
+{
+	u32 size;
+	u8 header[32];
+	u32 headerSize;
+	u32 encoderVersion;
+};
+
+
+union SceAudioencInitParam
+{
+	u32 size;
+	SceAudioencInitStreamParam celp;
+};
+
+union SceAudioencInfo
+{
+	u32 size;
+	SceAudioencInfoCelp celp;
+};
+
+union SceAudioencOptInfo
+{
+	u32 size;
+	SceAudioencOptInfoCelp celp;
+};
+
+struct SceAudioencCtrl
+{
+	u32 size;
+	s32 handle;
+	vm::psv::ptr<u8> pInputPcm;
+	u32 inputPcmSize;
+	u32 maxPcmSize;
+	vm::psv::ptr<void> pOutputEs;
+	u32 outputEsSize;
+	u32 maxEsSize;
+	u32 wordLength;
+	vm::psv::ptr<SceAudioencInfo> pInfo;
+	vm::psv::ptr<SceAudioencOptInfo> pOptInfo;
+};
+
+
+s32 sceAudioencInitLibrary(u32 codecType, vm::psv::ptr<SceAudioencInitParam> pInitParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioencTermLibrary(u32 codecType)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioencCreateEncoder(vm::psv::ptr<SceAudioencCtrl> pCtrl, u32 codecType)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioencDeleteEncoder(vm::psv::ptr<SceAudioencCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioencEncode(vm::psv::ptr<SceAudioencCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioencClearContext(vm::psv::ptr<SceAudioencCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioencGetOptInfo(vm::psv::ptr<SceAudioencCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAudioencGetInternalError(vm::psv::ptr<SceAudioencCtrl> pCtrl, vm::psv::ptr<s32> pInternalError)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceAudioenc, #name, name)
 
 psv_log_base sceAudioenc("SceAudioenc", []()
@@ -12,12 +110,12 @@ psv_log_base sceAudioenc("SceAudioenc", []()
 	sceAudioenc.on_unload = nullptr;
 	sceAudioenc.on_stop = nullptr;
 
-	//REG_FUNC(0x76EE4DC6, sceAudioencInitLibrary);
-	//REG_FUNC(0xAB32D022, sceAudioencTermLibrary);
-	//REG_FUNC(0x64C04AE8, sceAudioencCreateEncoder);
-	//REG_FUNC(0xC6BA5EE6, sceAudioencDeleteEncoder);
-	//REG_FUNC(0xD85DB29C, sceAudioencEncode);
-	//REG_FUNC(0x9386F42D, sceAudioencClearContext);
-	//REG_FUNC(0xD01C63A3, sceAudioencGetOptInfo);
-	//REG_FUNC(0x452246D0, sceAudioencGetInternalError);
+	REG_FUNC(0x76EE4DC6, sceAudioencInitLibrary);
+	REG_FUNC(0xAB32D022, sceAudioencTermLibrary);
+	REG_FUNC(0x64C04AE8, sceAudioencCreateEncoder);
+	REG_FUNC(0xC6BA5EE6, sceAudioencDeleteEncoder);
+	REG_FUNC(0xD85DB29C, sceAudioencEncode);
+	REG_FUNC(0x9386F42D, sceAudioencClearContext);
+	REG_FUNC(0xD01C63A3, sceAudioencGetOptInfo);
+	REG_FUNC(0x452246D0, sceAudioencGetInternalError);
 });

From 74b6d5c2eda6255ce346debb3cdedd54aa65287b Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 30 Jan 2015 00:42:53 +0300
Subject: [PATCH 54/70] Some functions added

---
 rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp      |   68 +-
 rpcs3/Emu/ARMv7/Modules/sceAppUtil.h        |   69 ++
 rpcs3/Emu/ARMv7/Modules/sceCamera.cpp       |  325 +++++-
 rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp  |   35 +-
 rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp |  581 +++++++++-
 rpcs3/Emu/ARMv7/Modules/sceDbg.cpp          |   35 +-
 rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp       |    2 +-
 rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp        |   90 +-
 rpcs3/Emu/ARMv7/Modules/sceFiber.cpp        |   89 +-
 rpcs3/Emu/ARMv7/Modules/sceFios.cpp         | 1054 ++++++++++++++++---
 rpcs3/Emu/ARMv7/Modules/sceIme.cpp          |   38 +-
 rpcs3/Emu/ARMv7/Modules/sceIme.h            |   70 ++
 rpcs3/Loader/ELF32.cpp                      |   34 +-
 rpcs3/emucore.vcxproj                       |    2 +
 rpcs3/emucore.vcxproj.filters               |    6 +
 15 files changed, 2167 insertions(+), 331 deletions(-)
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceAppUtil.h
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceIme.h

diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp
index 6d1739d789..815efa0461 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.cpp
@@ -2,73 +2,7 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
-extern psv_log_base sceAppUtil;
-
-struct SceAppUtilInitParam
-{
-	u32 workBufSize;
-	char reserved[60];
-};
-
-struct SceAppUtilBootParam
-{
-	u32 attr;
-	u32 appVersion;
-	char reserved[32];
-};
-
-struct SceAppUtilSaveDataMountPoint
-{
-	char data[16];
-};
-
-struct SceAppUtilSaveDataSlotParam
-{
-	u32 status;
-	char title[64];
-	char subTitle[128];
-	char detail[512];
-	char iconPath[64];
-	s32 userParam;
-	u32 sizeKB;
-	SceDateTime modifiedTime;
-	char reserved[48];
-};
-
-struct SceAppUtilSaveDataSlotEmptyParam
-{
-	vm::psv::ptr<char> title;
-	vm::psv::ptr<char> iconPath;
-	vm::psv::ptr<void> iconBuf;
-	u32 iconBufSize;
-	char reserved[32];
-};
-
-struct SceAppUtilSaveDataSlot
-{
-	u32 id;
-	u32 status;
-	s32 userParam;
-	vm::psv::ptr<SceAppUtilSaveDataSlotEmptyParam> emptyParam;
-};
-
-struct SceAppUtilSaveDataFile
-{
-	vm::psv::ptr<const char> filePath;
-	vm::psv::ptr<void> buf;
-	u32 bufSize;
-	s64 offset;
-	u32 mode;
-	u32 progDelta;
-	char reserved[32];
-};
-
-struct SceAppUtilSaveDataFileSlot
-{
-	u32 id;
-	vm::psv::ptr<SceAppUtilSaveDataSlotParam> slotParam;
-	char reserved[32];
-};
+#include "sceAppUtil.h"
 
 s32 sceAppUtilInit(vm::psv::ptr<const SceAppUtilInitParam> initParam, vm::psv::ptr<SceAppUtilBootParam> bootParam)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceAppUtil.h b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.h
new file mode 100644
index 0000000000..2e489cab22
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceAppUtil.h
@@ -0,0 +1,69 @@
+#pragma once
+
+struct SceAppUtilInitParam
+{
+	u32 workBufSize;
+	char reserved[60];
+};
+
+struct SceAppUtilBootParam
+{
+	u32 attr;
+	u32 appVersion;
+	char reserved[32];
+};
+
+struct SceAppUtilSaveDataMountPoint
+{
+	char data[16];
+};
+
+struct SceAppUtilSaveDataSlotParam
+{
+	u32 status;
+	char title[64];
+	char subTitle[128];
+	char detail[512];
+	char iconPath[64];
+	s32 userParam;
+	u32 sizeKB;
+	SceDateTime modifiedTime;
+	char reserved[48];
+};
+
+struct SceAppUtilSaveDataSlotEmptyParam
+{
+	vm::psv::ptr<char> title;
+	vm::psv::ptr<char> iconPath;
+	vm::psv::ptr<void> iconBuf;
+	u32 iconBufSize;
+	char reserved[32];
+};
+
+struct SceAppUtilSaveDataSlot
+{
+	u32 id;
+	u32 status;
+	s32 userParam;
+	vm::psv::ptr<SceAppUtilSaveDataSlotEmptyParam> emptyParam;
+};
+
+struct SceAppUtilSaveDataFile
+{
+	vm::psv::ptr<const char> filePath;
+	vm::psv::ptr<void> buf;
+	u32 bufSize;
+	s64 offset;
+	u32 mode;
+	u32 progDelta;
+	char reserved[32];
+};
+
+struct SceAppUtilSaveDataFileSlot
+{
+	u32 id;
+	vm::psv::ptr<SceAppUtilSaveDataSlotParam> slotParam;
+	char reserved[32];
+};
+
+extern psv_log_base sceAppUtil;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp b/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp
index 79c219443c..e341d6d75f 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceCamera.cpp
@@ -4,6 +4,249 @@
 
 extern psv_log_base sceCamera;
 
+struct SceCameraInfo
+{
+	u32 sizeThis;
+	u32 wPriority;
+	u32 wFormat;
+	u32 wResolution;
+	u32 wFramerate;
+	u32 wWidth;
+	u32 wHeight;
+	u32 wRange;
+	u32 _padding_0;
+	u32 sizeIBase;
+	u32 sizeUBase;
+	u32 sizeVBase;
+	vm::psv::ptr<void> pvIBase;
+	vm::psv::ptr<void> pvUBase;
+	vm::psv::ptr<void> pvVBase;
+	u32 wPitch;
+	u32 wBuffer;
+};
+
+struct SceCameraRead
+{
+	u32 sizeThis;
+	s32 dwMode;
+	s32 _padding_0;
+	s32 dwStatus;
+	u32 qwFrame;
+	u32 qwTimestamp;
+	u32 sizeIBase;
+	u32 sizeUBase;
+	u32 sizeVBase;
+	vm::psv::ptr<void> pvIBase;
+	vm::psv::ptr<void> pvUBase;
+	vm::psv::ptr<void> pvVBase;
+};
+
+s32 sceCameraOpen(s32 devnum, vm::psv::ptr<SceCameraInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraClose(s32 devnum)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraStart(s32 devnum)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraStop(s32 devnum)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraRead(s32 devnum, vm::psv::ptr<SceCameraRead> pRead)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraIsActive(s32 devnum)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetSaturation(s32 devnum, vm::psv::ptr<s32> pLevel)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetSaturation(s32 devnum, s32 level)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetBrightness(s32 devnum, vm::psv::ptr<s32> pLevel)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetBrightness(s32 devnum, s32 level)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetContrast(s32 devnum, vm::psv::ptr<s32> pLevel)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetContrast(s32 devnum, s32 level)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetSharpness(s32 devnum, vm::psv::ptr<s32> pLevel)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetSharpness(s32 devnum, s32 level)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetReverse(s32 devnum, vm::psv::ptr<s32> pMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetReverse(s32 devnum, s32 mode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetEffect(s32 devnum, vm::psv::ptr<s32> pMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetEffect(s32 devnum, s32 mode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetEV(s32 devnum, vm::psv::ptr<s32> pLevel)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetEV(s32 devnum, s32 level)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetZoom(s32 devnum, vm::psv::ptr<s32> pLevel)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetZoom(s32 devnum, s32 level)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetAntiFlicker(s32 devnum, vm::psv::ptr<s32> pMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetAntiFlicker(s32 devnum, s32 mode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetISO(s32 devnum, vm::psv::ptr<s32> pMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetISO(s32 devnum, s32 mode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetGain(s32 devnum, vm::psv::ptr<s32> pMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetGain(s32 devnum, s32 mode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetWhiteBalance(s32 devnum, vm::psv::ptr<s32> pMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetWhiteBalance(s32 devnum, s32 mode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetBacklight(s32 devnum, vm::psv::ptr<s32> pMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetBacklight(s32 devnum, s32 mode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetNightmode(s32 devnum, vm::psv::ptr<s32> pMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetNightmode(s32 devnum, s32 mode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraLedSwitch(s32 devnum, s32 iSwitch)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraLedBlink(s32 devnum, s32 iOnCount, s32 iOffCount, s32 iBlinkCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetNoiseReductionForDebug(s32 devnum, vm::psv::ptr<s32> pLevel)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetNoiseReductionForDebug(s32 devnum, s32 level)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraGetSharpnessOffForDebug(s32 devnum, vm::psv::ptr<s32> pLevel)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCameraSetSharpnessOffForDebug(s32 devnum, s32 level)
+{
+	throw __FUNCTION__;
+}
+
+void sceCameraUseCacheMemoryForTrial(s32 isCache)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceCamera, #name, name)
 
 psv_log_base sceCamera("SceCamera", []()
@@ -12,45 +255,45 @@ psv_log_base sceCamera("SceCamera", []()
 	sceCamera.on_unload = nullptr;
 	sceCamera.on_stop = nullptr;
 
-	//REG_FUNC(0xA462F801, sceCameraOpen);
-	//REG_FUNC(0xCD6E1CFC, sceCameraClose);
-	//REG_FUNC(0xA8FEAE35, sceCameraStart);
-	//REG_FUNC(0x1DD9C9CE, sceCameraStop);
-	//REG_FUNC(0x79B5C2DE, sceCameraRead);
-	//REG_FUNC(0x103A75B8, sceCameraIsActive);
-	//REG_FUNC(0x624F7653, sceCameraGetSaturation);
-	//REG_FUNC(0xF9F7CA3D, sceCameraSetSaturation);
-	//REG_FUNC(0x85D5951D, sceCameraGetBrightness);
-	//REG_FUNC(0x98D71588, sceCameraSetBrightness);
-	//REG_FUNC(0x8FBE84BE, sceCameraGetContrast);
-	//REG_FUNC(0x06FB2900, sceCameraSetContrast);
-	//REG_FUNC(0xAA72C3DC, sceCameraGetSharpness);
-	//REG_FUNC(0xD1A5BB0B, sceCameraSetSharpness);
-	//REG_FUNC(0x44F6043F, sceCameraGetReverse);
-	//REG_FUNC(0x1175F477, sceCameraSetReverse);
-	//REG_FUNC(0x7E8EF3B2, sceCameraGetEffect);
-	//REG_FUNC(0xE9D2CFB1, sceCameraSetEffect);
-	//REG_FUNC(0x8B5E6147, sceCameraGetEV);
-	//REG_FUNC(0x62AFF0B8, sceCameraSetEV);
-	//REG_FUNC(0x06D3816C, sceCameraGetZoom);
-	//REG_FUNC(0xF7464216, sceCameraSetZoom);
-	//REG_FUNC(0x9FDACB99, sceCameraGetAntiFlicker);
-	//REG_FUNC(0xE312958A, sceCameraSetAntiFlicker);
-	//REG_FUNC(0x4EBD5C68, sceCameraGetISO);
-	//REG_FUNC(0x3CF630A1, sceCameraSetISO);
-	//REG_FUNC(0x2C36D6F3, sceCameraGetGain);
-	//REG_FUNC(0xE65CFE86, sceCameraSetGain);
-	//REG_FUNC(0xDBFFA1DA, sceCameraGetWhiteBalance);
-	//REG_FUNC(0x4D4514AC, sceCameraSetWhiteBalance);
-	//REG_FUNC(0x8DD1292B, sceCameraGetBacklight);
-	//REG_FUNC(0xAE071044, sceCameraSetBacklight);
-	//REG_FUNC(0x12B6FF26, sceCameraGetNightmode);
-	//REG_FUNC(0x3F26233E, sceCameraSetNightmode);
-	//REG_FUNC(0xD02CFA5C, sceCameraLedSwitch);
-	//REG_FUNC(0x89B16030, sceCameraLedBlink);
-	//REG_FUNC(0x7670474C, sceCameraUseCacheMemoryForTrial);
-	//REG_FUNC(0x27BB0528, sceCameraGetNoiseReductionForDebug);
-	//REG_FUNC(0x233C9E27, sceCameraSetNoiseReductionForDebug);
-	//REG_FUNC(0xC387F4DC, sceCameraGetSharpnessOffForDebug);
-	//REG_FUNC(0xE22C2375, sceCameraSetSharpnessOffForDebug);
+	REG_FUNC(0xA462F801, sceCameraOpen);
+	REG_FUNC(0xCD6E1CFC, sceCameraClose);
+	REG_FUNC(0xA8FEAE35, sceCameraStart);
+	REG_FUNC(0x1DD9C9CE, sceCameraStop);
+	REG_FUNC(0x79B5C2DE, sceCameraRead);
+	REG_FUNC(0x103A75B8, sceCameraIsActive);
+	REG_FUNC(0x624F7653, sceCameraGetSaturation);
+	REG_FUNC(0xF9F7CA3D, sceCameraSetSaturation);
+	REG_FUNC(0x85D5951D, sceCameraGetBrightness);
+	REG_FUNC(0x98D71588, sceCameraSetBrightness);
+	REG_FUNC(0x8FBE84BE, sceCameraGetContrast);
+	REG_FUNC(0x06FB2900, sceCameraSetContrast);
+	REG_FUNC(0xAA72C3DC, sceCameraGetSharpness);
+	REG_FUNC(0xD1A5BB0B, sceCameraSetSharpness);
+	REG_FUNC(0x44F6043F, sceCameraGetReverse);
+	REG_FUNC(0x1175F477, sceCameraSetReverse);
+	REG_FUNC(0x7E8EF3B2, sceCameraGetEffect);
+	REG_FUNC(0xE9D2CFB1, sceCameraSetEffect);
+	REG_FUNC(0x8B5E6147, sceCameraGetEV);
+	REG_FUNC(0x62AFF0B8, sceCameraSetEV);
+	REG_FUNC(0x06D3816C, sceCameraGetZoom);
+	REG_FUNC(0xF7464216, sceCameraSetZoom);
+	REG_FUNC(0x9FDACB99, sceCameraGetAntiFlicker);
+	REG_FUNC(0xE312958A, sceCameraSetAntiFlicker);
+	REG_FUNC(0x4EBD5C68, sceCameraGetISO);
+	REG_FUNC(0x3CF630A1, sceCameraSetISO);
+	REG_FUNC(0x2C36D6F3, sceCameraGetGain);
+	REG_FUNC(0xE65CFE86, sceCameraSetGain);
+	REG_FUNC(0xDBFFA1DA, sceCameraGetWhiteBalance);
+	REG_FUNC(0x4D4514AC, sceCameraSetWhiteBalance);
+	REG_FUNC(0x8DD1292B, sceCameraGetBacklight);
+	REG_FUNC(0xAE071044, sceCameraSetBacklight);
+	REG_FUNC(0x12B6FF26, sceCameraGetNightmode);
+	REG_FUNC(0x3F26233E, sceCameraSetNightmode);
+	REG_FUNC(0xD02CFA5C, sceCameraLedSwitch);
+	REG_FUNC(0x89B16030, sceCameraLedBlink);
+	REG_FUNC(0x7670474C, sceCameraUseCacheMemoryForTrial);
+	REG_FUNC(0x27BB0528, sceCameraGetNoiseReductionForDebug);
+	REG_FUNC(0x233C9E27, sceCameraSetNoiseReductionForDebug);
+	REG_FUNC(0xC387F4DC, sceCameraGetSharpnessOffForDebug);
+	REG_FUNC(0xE22C2375, sceCameraSetSharpnessOffForDebug);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp b/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp
index 013f4ff52b..cda018a995 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceCodecEngine.cpp
@@ -4,6 +4,33 @@
 
 extern psv_log_base sceCodecEngine;
 
+struct SceCodecEnginePmonProcessorLoad
+{
+	u32 size;
+	u32 average;
+};
+
+s32 sceCodecEnginePmonStart()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCodecEnginePmonStop()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCodecEnginePmonGetProcessorLoad(vm::psv::ptr<SceCodecEnginePmonProcessorLoad> pProcessorLoad)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceCodecEnginePmonReset()
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceCodecEngine, #name, name)
 
 psv_log_base sceCodecEngine("SceCodecEngine", []()
@@ -12,8 +39,8 @@ psv_log_base sceCodecEngine("SceCodecEngine", []()
 	sceCodecEngine.on_unload = nullptr;
 	sceCodecEngine.on_stop = nullptr;
 
-	//REG_FUNC(0x3E718890, sceCodecEnginePmonStart);
-	//REG_FUNC(0x268B1EF5, sceCodecEnginePmonStop);
-	//REG_FUNC(0x859E4A68, sceCodecEnginePmonGetProcessorLoad);
-	//REG_FUNC(0xA097E4C8, sceCodecEnginePmonReset);
+	REG_FUNC(0x3E718890, sceCodecEnginePmonStart);
+	REG_FUNC(0x268B1EF5, sceCodecEnginePmonStop);
+	REG_FUNC(0x859E4A68, sceCodecEnginePmonGetProcessorLoad);
+	REG_FUNC(0xA097E4C8, sceCodecEnginePmonReset);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp b/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp
index 1f5a4863a3..3e7b998f63 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceCommonDialog.cpp
@@ -2,8 +2,509 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
+#include "sceGxm.h"
+#include "sceAppUtil.h"
+#include "sceIme.h"
+
 extern psv_log_base sceCommonDialog;
 
+enum SceCommonDialogStatus : s32
+{
+	SCE_COMMON_DIALOG_STATUS_NONE = 0,
+	SCE_COMMON_DIALOG_STATUS_RUNNING = 1,
+	SCE_COMMON_DIALOG_STATUS_FINISHED = 2
+};
+
+enum SceCommonDialogResult : s32
+{
+	SCE_COMMON_DIALOG_RESULT_OK,
+	SCE_COMMON_DIALOG_RESULT_USER_CANCELED,
+	SCE_COMMON_DIALOG_RESULT_ABORTED
+};
+
+struct SceCommonDialogRenderTargetInfo
+{
+	vm::psv::ptr<void> depthSurfaceData;
+	vm::psv::ptr<void> colorSurfaceData;
+	SceGxmColorSurfaceType surfaceType;
+	SceGxmColorFormat colorFormat;
+	u32 width;
+	u32 height;
+	u32 strideInPixels;
+	u8 reserved[32];
+};
+
+struct SceCommonDialogUpdateParam
+{
+	SceCommonDialogRenderTargetInfo renderTarget;
+	vm::psv::ptr<SceGxmSyncObject> displaySyncObject;
+	u8 reserved[32];
+};
+
+struct SceMsgDialogUserMessageParam
+{
+	s32 buttonType;
+	vm::psv::ptr<const char> msg;
+	char reserved[32];
+};
+
+struct SceMsgDialogSystemMessageParam
+{
+	s32 sysMsgType;
+	s32 value;
+	char reserved[32];
+};
+
+struct SceMsgDialogErrorCodeParam
+{
+	s32 errorCode;
+	char reserved[32];
+};
+
+struct SceMsgDialogProgressBarParam
+{
+	s32 barType;
+	SceMsgDialogSystemMessageParam sysMsgParam;
+	vm::psv::ptr<const char> msg;
+	char reserved[32];
+};
+
+struct SceMsgDialogParam
+{
+	u32 sdkVersion;
+	s32 mode;
+	vm::psv::ptr<SceMsgDialogUserMessageParam> userMsgParam;
+	vm::psv::ptr<SceMsgDialogSystemMessageParam> sysMsgParam;
+	vm::psv::ptr<SceMsgDialogErrorCodeParam> errorCodeParam;
+	vm::psv::ptr<SceMsgDialogProgressBarParam> progBarParam;
+	u32 flag;
+	char reserved[32];
+};
+
+struct SceMsgDialogResult
+{
+	s32 mode;
+	s32 result;
+	s32 buttonId;
+	u8 reserved[32];
+};
+
+
+struct SceNetCheckDialogParam
+{
+	u32 sdkVersion;
+	s32 mode;
+	u8 reserved[128];
+};
+
+struct SceNetCheckDialogResult
+{
+	s32 result;
+	u8 reserved[128];
+};
+
+struct SceSaveDataDialogFixedParam
+{
+	u32 targetSlot;
+	char reserved[32];
+};
+
+struct SceSaveDataDialogListParam
+{
+	vm::psv::ptr<const u32> slotList;
+	u32 slotListSize;
+	s32 focusPos;
+	u32 focusId;
+	vm::psv::ptr<const char> listTitle;
+	char reserved[32];
+};
+
+struct SceSaveDataDialogUserMessageParam
+{
+	s32 buttonType;
+	vm::psv::ptr<const char> msg;
+	u32 targetSlot;
+	char reserved[32];
+};
+
+struct SceSaveDataDialogSystemMessageParam
+{
+	s32 sysMsgType;
+	s32 value;
+	u32 targetSlot;
+	char reserved[32];
+};
+
+struct SceSaveDataDialogErrorCodeParam
+{
+	s32 errorCode;
+	u32 targetSlot;
+	char reserved[32];
+};
+
+struct SceSaveDataDialogProgressBarParam
+{
+	s32 barType;
+	SceSaveDataDialogSystemMessageParam sysMsgParam;
+	vm::psv::ptr<const char> msg;
+	u32 targetSlot;
+	char reserved[32];
+};
+
+struct SceSaveDataDialogSlotConfigParam
+{
+	vm::psv::ptr<const SceAppUtilSaveDataMountPoint> mountPoint;
+	vm::psv::ptr<const char> appSubDir;
+	char reserved[32];
+};
+
+struct SceSaveDataDialogParam
+{
+	u32 sdkVersion;
+	s32 mode;
+	s32 dispType;
+	vm::psv::ptr<SceSaveDataDialogFixedParam> fixedParam;
+	vm::psv::ptr<SceSaveDataDialogListParam> listParam;
+	vm::psv::ptr<SceSaveDataDialogUserMessageParam> userMsgParam;
+	vm::psv::ptr<SceSaveDataDialogSystemMessageParam> sysMsgParam;
+	vm::psv::ptr<SceSaveDataDialogErrorCodeParam> errorCodeParam;
+	vm::psv::ptr<SceSaveDataDialogProgressBarParam> progBarParam;
+	vm::psv::ptr<SceSaveDataDialogSlotConfigParam> slotConfParam;
+	u32 flag;
+	vm::psv::ptr<void> userdata;
+	char reserved[32];
+};
+
+struct SceSaveDataDialogFinishParam
+{
+	u32 flag;
+	char reserved[32];
+};
+
+struct SceSaveDataDialogSlotInfo
+{
+	u32 isExist;
+	vm::psv::ptr<SceAppUtilSaveDataSlotParam> slotParam;
+	u8 reserved[32];
+};
+
+struct SceSaveDataDialogResult
+{
+	s32 mode;
+	s32 result;
+	s32 buttonId;
+	u32 slotId;
+	vm::psv::ptr<SceSaveDataDialogSlotInfo> slotInfo;
+	vm::psv::ptr<void> userdata;
+	char reserved[32];
+};
+
+
+struct SceImeDialogParam
+{
+	u32 sdkVersion;
+	u32 inputMethod;
+	u64 supportedLanguages;
+	s32 languagesForced;
+	u32 type;
+	u32 option;
+	vm::psv::ptr<SceImeCharFilter> filter;
+	u32 dialogMode;
+	u32 textBoxMode;
+	vm::psv::ptr<const u16> title;
+	u32 maxTextLength;
+	vm::psv::ptr<u16> initialText;
+	vm::psv::ptr<u16> inputTextBuffer;
+	char reserved[32];
+};
+
+struct SceImeDialogResult
+{
+	s32 result;
+	char reserved[32];
+};
+
+enum ScePhotoImportDialogFormatType : s32
+{
+	SCE_PHOTOIMPORT_DIALOG_FORMAT_TYPE_UNKNOWN = 0,
+	SCE_PHOTOIMPORT_DIALOG_FORMAT_TYPE_JPEG,
+	SCE_PHOTOIMPORT_DIALOG_FORMAT_TYPE_PNG,
+	SCE_PHOTOIMPORT_DIALOG_FORMAT_TYPE_GIF,
+	SCE_PHOTOIMPORT_DIALOG_FORMAT_TYPE_BMP,
+	SCE_PHOTOIMPORT_DIALOG_FORMAT_TYPE_TIFF
+};
+
+enum ScePhotoImportDialogOrientation : s32
+{
+	SCE_PHOTOIMPORT_DIALOG_ORIENTATION_UNKNOWN = 0,
+	SCE_PHOTOIMPORT_DIALOG_ORIENTATION_TOP_LEFT,
+	SCE_PHOTOIMPORT_DIALOG_ORIENTATION_TOP_RIGHT,
+	SCE_PHOTOIMPORT_DIALOG_ORIENTATION_BOTTOM_RIGHT,
+	SCE_PHOTOIMPORT_DIALOG_ORIENTATION_BOTTOM_LEFT,
+	SCE_PHOTOIMPORT_DIALOG_ORIENTATION_LEFT_TOP,
+	SCE_PHOTOIMPORT_DIALOG_ORIENTATION_RIGHT_TOP,
+	SCE_PHOTOIMPORT_DIALOG_ORIENTATION_RIGHT_BOTTOM,
+	SCE_PHOTOIMPORT_DIALOG_ORIENTATION_LEFT_BOTTOM
+};
+
+struct ScePhotoImportDialogFileDataSub
+{
+	u32 width;
+	u32 height;
+	ScePhotoImportDialogFormatType format;
+	ScePhotoImportDialogOrientation orientation;
+	char reserved[32];
+};
+
+struct ScePhotoImportDialogFileData
+{
+	char fileName[1024];
+	char photoTitle[256];
+	char reserved[32];
+};
+
+struct ScePhotoImportDialogItemData
+{
+	ScePhotoImportDialogFileData fileData;
+	ScePhotoImportDialogFileDataSub dataSub;
+	char reserved[32];
+};
+
+struct ScePhotoImportDialogResult
+{
+	s32 result;
+	u32 importedItemNum;
+	char reserved[32];
+};
+
+struct ScePhotoImportDialogParam
+{
+	u32 sdkVersion;
+	s32 mode;
+	u32 visibleCategory;
+	u32 itemCount;
+	vm::psv::ptr<ScePhotoImportDialogItemData> itemData;
+	char reserved[32];
+};
+
+struct ScePhotoReviewDialogParam
+{
+	u32 sdkVersion;
+	s32 mode;
+	char fileName[1024];
+	vm::psv::ptr<void> workMemory;
+	u32 workMemorySize;
+	char reserved[32];
+};
+
+struct ScePhotoReviewDialogResult
+{
+	s32 result;
+	char reserved[32];
+};
+
+
+s32 sceCommonDialogUpdate(vm::psv::ptr<const SceCommonDialogUpdateParam> updateParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMsgDialogInit(vm::psv::ptr<const SceMsgDialogParam> param)
+{
+	throw __FUNCTION__;
+}
+
+SceCommonDialogStatus sceMsgDialogGetStatus()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMsgDialogAbort()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMsgDialogGetResult(vm::psv::ptr<SceMsgDialogResult> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMsgDialogTerm()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMsgDialogClose()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMsgDialogProgressBarInc(s32 target, u32 delta)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMsgDialogProgressBarSetValue(s32 target, u32 rate)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCheckDialogInit(vm::psv::ptr<SceNetCheckDialogParam> param)
+{
+	throw __FUNCTION__;
+}
+
+SceCommonDialogStatus sceNetCheckDialogGetStatus()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCheckDialogAbort()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCheckDialogGetResult(vm::psv::ptr<SceNetCheckDialogResult> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCheckDialogTerm()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSaveDataDialogInit(vm::psv::ptr<const SceSaveDataDialogParam> param)
+{
+	throw __FUNCTION__;
+}
+
+SceCommonDialogStatus sceSaveDataDialogGetStatus()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSaveDataDialogAbort()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSaveDataDialogGetResult(vm::psv::ptr<SceSaveDataDialogResult> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSaveDataDialogTerm()
+{
+	throw __FUNCTION__;
+}
+
+SceCommonDialogStatus sceSaveDataDialogGetSubStatus()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSaveDataDialogSubClose()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSaveDataDialogContinue(vm::psv::ptr<const SceSaveDataDialogParam> param)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSaveDataDialogFinish(vm::psv::ptr<const SceSaveDataDialogFinishParam> param)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSaveDataDialogProgressBarInc(s32 target, u32 delta)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSaveDataDialogProgressBarSetValue(s32 target, u32 rate)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceImeDialogInit(vm::psv::ptr<const SceImeDialogParam> param)
+{
+	throw __FUNCTION__;
+}
+
+SceCommonDialogStatus sceImeDialogGetStatus()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceImeDialogAbort()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceImeDialogGetResult(vm::psv::ptr<SceImeDialogResult> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceImeDialogTerm()
+{
+	throw __FUNCTION__;
+}
+
+s32 scePhotoImportDialogInit(vm::psv::ptr<const ScePhotoImportDialogParam> param)
+{
+	throw __FUNCTION__;
+}
+
+SceCommonDialogStatus scePhotoImportDialogGetStatus()
+{
+	throw __FUNCTION__;
+}
+
+s32 scePhotoImportDialogGetResult(vm::psv::ptr<ScePhotoImportDialogResult> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 scePhotoImportDialogTerm()
+{
+	throw __FUNCTION__;
+}
+
+s32 scePhotoImportDialogAbort()
+{
+	throw __FUNCTION__;
+}
+
+s32 scePhotoReviewDialogInit(vm::psv::ptr<const ScePhotoReviewDialogParam> param)
+{
+	throw __FUNCTION__;
+}
+
+SceCommonDialogStatus scePhotoReviewDialogGetStatus()
+{
+	throw __FUNCTION__;
+}
+
+s32 scePhotoReviewDialogGetResult(vm::psv::ptr<ScePhotoReviewDialogResult> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 scePhotoReviewDialogTerm()
+{
+	throw __FUNCTION__;
+}
+
+s32 scePhotoReviewDialogAbort()
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceCommonDialog, #name, name)
 
 psv_log_base sceCommonDialog("SceCommonDialog", []()
@@ -12,44 +513,44 @@ psv_log_base sceCommonDialog("SceCommonDialog", []()
 	sceCommonDialog.on_unload = nullptr;
 	sceCommonDialog.on_stop = nullptr;
 
-	//REG_FUNC(0x90530F2F, sceCommonDialogUpdate);
-	//REG_FUNC(0x755FF270, sceMsgDialogInit);
-	//REG_FUNC(0x4107019E, sceMsgDialogGetStatus);
-	//REG_FUNC(0xC296D396, sceMsgDialogClose);
-	//REG_FUNC(0x0CC66115, sceMsgDialogAbort);
-	//REG_FUNC(0xBB3BFC89, sceMsgDialogGetResult);
-	//REG_FUNC(0x81ACF695, sceMsgDialogTerm);
-	//REG_FUNC(0x7BE0E08B, sceMsgDialogProgressBarInc);
-	//REG_FUNC(0x9CDA5E0D, sceMsgDialogProgressBarSetValue);
-	//REG_FUNC(0xA38A4A0D, sceNetCheckDialogInit);
-	//REG_FUNC(0x8027292A, sceNetCheckDialogGetStatus);
-	//REG_FUNC(0x2D8EDF09, sceNetCheckDialogAbort);
-	//REG_FUNC(0xB05FCE9E, sceNetCheckDialogGetResult);
-	//REG_FUNC(0x8BE51C15, sceNetCheckDialogTerm);
-	//REG_FUNC(0xBF5248FA, sceSaveDataDialogInit);
-	//REG_FUNC(0x6E258046, sceSaveDataDialogGetStatus);
-	//REG_FUNC(0x013E7F74, sceSaveDataDialogAbort);
-	//REG_FUNC(0xB2FF576E, sceSaveDataDialogGetResult);
-	//REG_FUNC(0x2192A10A, sceSaveDataDialogTerm);
-	//REG_FUNC(0x19192C8B, sceSaveDataDialogContinue);
-	//REG_FUNC(0xBA0542CA, sceSaveDataDialogGetSubStatus);
-	//REG_FUNC(0x415D6068, sceSaveDataDialogSubClose);
-	//REG_FUNC(0x6C49924B, sceSaveDataDialogFinish);
-	//REG_FUNC(0xBDE00A83, sceSaveDataDialogProgressBarInc);
-	//REG_FUNC(0x5C322D1E, sceSaveDataDialogProgressBarSetValue);
-	//REG_FUNC(0x1E7043BF, sceImeDialogInit);
-	//REG_FUNC(0xCF0431FD, sceImeDialogGetStatus);
-	//REG_FUNC(0x594A220E, sceImeDialogAbort);
-	//REG_FUNC(0x2EB3D046, sceImeDialogGetResult);
-	//REG_FUNC(0x838A3AF4, sceImeDialogTerm);
-	//REG_FUNC(0x73EE7C9C, scePhotoImportDialogInit);
-	//REG_FUNC(0x032206D8, scePhotoImportDialogGetStatus);
-	//REG_FUNC(0xD855414C, scePhotoImportDialogGetResult);
-	//REG_FUNC(0x7FE5BD77, scePhotoImportDialogTerm);
-	//REG_FUNC(0x4B125581, scePhotoImportDialogAbort);
-	//REG_FUNC(0xCD990375, scePhotoReviewDialogInit);
-	//REG_FUNC(0xF4F600CA, scePhotoReviewDialogGetStatus);
-	//REG_FUNC(0xFFA35858, scePhotoReviewDialogGetResult);
-	//REG_FUNC(0xC700B2DF, scePhotoReviewDialogTerm);
-	//REG_FUNC(0x74FF2A8B, scePhotoReviewDialogAbort);
+	REG_FUNC(0x90530F2F, sceCommonDialogUpdate);
+	REG_FUNC(0x755FF270, sceMsgDialogInit);
+	REG_FUNC(0x4107019E, sceMsgDialogGetStatus);
+	REG_FUNC(0xC296D396, sceMsgDialogClose);
+	REG_FUNC(0x0CC66115, sceMsgDialogAbort);
+	REG_FUNC(0xBB3BFC89, sceMsgDialogGetResult);
+	REG_FUNC(0x81ACF695, sceMsgDialogTerm);
+	REG_FUNC(0x7BE0E08B, sceMsgDialogProgressBarInc);
+	REG_FUNC(0x9CDA5E0D, sceMsgDialogProgressBarSetValue);
+	REG_FUNC(0xA38A4A0D, sceNetCheckDialogInit);
+	REG_FUNC(0x8027292A, sceNetCheckDialogGetStatus);
+	REG_FUNC(0x2D8EDF09, sceNetCheckDialogAbort);
+	REG_FUNC(0xB05FCE9E, sceNetCheckDialogGetResult);
+	REG_FUNC(0x8BE51C15, sceNetCheckDialogTerm);
+	REG_FUNC(0xBF5248FA, sceSaveDataDialogInit);
+	REG_FUNC(0x6E258046, sceSaveDataDialogGetStatus);
+	REG_FUNC(0x013E7F74, sceSaveDataDialogAbort);
+	REG_FUNC(0xB2FF576E, sceSaveDataDialogGetResult);
+	REG_FUNC(0x2192A10A, sceSaveDataDialogTerm);
+	REG_FUNC(0x19192C8B, sceSaveDataDialogContinue);
+	REG_FUNC(0xBA0542CA, sceSaveDataDialogGetSubStatus);
+	REG_FUNC(0x415D6068, sceSaveDataDialogSubClose);
+	REG_FUNC(0x6C49924B, sceSaveDataDialogFinish);
+	REG_FUNC(0xBDE00A83, sceSaveDataDialogProgressBarInc);
+	REG_FUNC(0x5C322D1E, sceSaveDataDialogProgressBarSetValue);
+	REG_FUNC(0x1E7043BF, sceImeDialogInit);
+	REG_FUNC(0xCF0431FD, sceImeDialogGetStatus);
+	REG_FUNC(0x594A220E, sceImeDialogAbort);
+	REG_FUNC(0x2EB3D046, sceImeDialogGetResult);
+	REG_FUNC(0x838A3AF4, sceImeDialogTerm);
+	REG_FUNC(0x73EE7C9C, scePhotoImportDialogInit);
+	REG_FUNC(0x032206D8, scePhotoImportDialogGetStatus);
+	REG_FUNC(0xD855414C, scePhotoImportDialogGetResult);
+	REG_FUNC(0x7FE5BD77, scePhotoImportDialogTerm);
+	REG_FUNC(0x4B125581, scePhotoImportDialogAbort);
+	REG_FUNC(0xCD990375, scePhotoReviewDialogInit);
+	REG_FUNC(0xF4F600CA, scePhotoReviewDialogGetStatus);
+	REG_FUNC(0xFFA35858, scePhotoReviewDialogGetResult);
+	REG_FUNC(0xC700B2DF, scePhotoReviewDialogTerm);
+	REG_FUNC(0x74FF2A8B, scePhotoReviewDialogAbort);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp b/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp
index 6fe3856b9c..6a2cc4c9a2 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceDbg.cpp
@@ -4,6 +4,33 @@
 
 extern psv_log_base sceDbg;
 
+enum SceDbgBreakOnErrorState : s32
+{
+	SCE_DBG_DISABLE_BREAK_ON_ERROR = 0,
+	SCE_DBG_ENABLE_BREAK_ON_ERROR
+};
+
+s32 sceDbgSetMinimumLogLevel(s32 minimumLogLevel)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDbgSetBreakOnErrorState(SceDbgBreakOnErrorState state)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDbgAssertionHandler(vm::psv::ptr<const char> pFile, s32 line, bool stop, vm::psv::ptr<const char> pComponent, vm::psv::ptr<const char> pMessage) // va_args...
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDbgLoggingHandler(vm::psv::ptr<const char> pFile, s32 line, s32 severity, vm::psv::ptr<const char> pComponent, vm::psv::ptr<const char> pMessage) // va_args...
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceDbg, #name, name)
 
 psv_log_base sceDbg("SceDbg", []()
@@ -12,8 +39,8 @@ psv_log_base sceDbg("SceDbg", []()
 	sceDbg.on_unload = nullptr;
 	sceDbg.on_stop = nullptr;
 
-	//REG_FUNC(0x941622FA, sceDbgSetMinimumLogLevel);
-	//REG_FUNC(0x1AF3678B, sceDbgAssertionHandler);
-	//REG_FUNC(0x6605AB19, sceDbgLoggingHandler);
-	//REG_FUNC(0xED4A00BA, sceDbgSetBreakOnErrorState);
+	REG_FUNC(0x941622FA, sceDbgSetMinimumLogLevel);
+	REG_FUNC(0x1AF3678B, sceDbgAssertionHandler);
+	REG_FUNC(0x6605AB19, sceDbgLoggingHandler);
+	REG_FUNC(0xED4A00BA, sceDbgSetBreakOnErrorState);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp
index d90fcca74f..f0cf7e3c8e 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceDeci4p.cpp
@@ -4,7 +4,7 @@
 
 extern psv_log_base sceDeci4p;
 
-typedef s32(*SceKernelDeci4pCallback)(s32 notifyId, s32 notifyCount, s32 notifyArg, vm::psv::ptr<void> pCommon);
+typedef vm::psv::ptr<s32(s32 notifyId, s32 notifyCount, s32 notifyArg, vm::psv::ptr<void> pCommon)> SceKernelDeci4pCallback;
 
 s32 sceKernelDeci4pOpen(vm::psv::ptr<const char> protoname, u32 protonum, u32 bufsize)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp b/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp
index 6d7e440c2f..8e31b95c72 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp
@@ -4,6 +4,72 @@
 
 extern psv_log_base sceDeflt;
 
+s32 sceGzipIsValid(vm::psv::ptr<const void> pSrcGzip)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGzipGetInfo(vm::psv::ptr<const void> pSrcGzip, vm::psv::ptr<vm::psv::ptr<const void>> ppvExtra, vm::psv::ptr<vm::psv::ptr<const char>> ppszName, vm::psv::ptr<vm::psv::ptr<const char>> ppszComment, vm::psv::ptr<u16> pusCrc, vm::psv::ptr<vm::psv::ptr<const void>> ppvData)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const char> sceGzipGetName(vm::psv::ptr<const void> pSrcGzip)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const char> sceGzipGetComment(vm::psv::ptr<const void> pSrcGzip)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const void> sceGzipGetCompressedData(vm::psv::ptr<const void> pSrcGzip)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceGzipDecompress(vm::psv::ptr<void> pDst, u32 uiBufSize, vm::psv::ptr<const void> pSrcGzip, vm::psv::ptr<u32> puiCrc32)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceZlibIsValid(vm::psv::ptr<const void> pSrcZlib)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceZlibGetInfo(vm::psv::ptr<const void> pSrcZlib, vm::psv::ptr<u8> pbCmf, vm::psv::ptr<u8> pbFlg, vm::psv::ptr<u32> puiDictId, vm::psv::ptr<vm::psv::ptr<const void>> ppvData)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const void> sceZlibGetCompressedData(vm::psv::ptr<const void> pSrcZlib)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceZlibDecompress(vm::psv::ptr<void> pDst, u32 uiBufSize, vm::psv::ptr<const void> pSrcZlib, vm::psv::ptr<u32> puiAdler32)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceZlibAdler32(u32 uiAdler, vm::psv::ptr<const u8> pSrc, u32 uiSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceDeflateDecompress(vm::psv::ptr<void> pDst, u32 uiBufSize, vm::psv::ptr<const void> pSrcDeflate, vm::psv::ptr<vm::psv::ptr<const void>> ppNext)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceZipGetInfo(vm::psv::ptr<const void> pSrc, vm::psv::ptr<vm::psv::ptr<const void>> ppvExtra, vm::psv::ptr<u32> puiCrc, vm::psv::ptr<vm::psv::ptr<const void>> ppvData)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceDeflt, #name, name)
 
 psv_log_base sceDeflt("SceDeflt", []()
@@ -12,16 +78,16 @@ psv_log_base sceDeflt("SceDeflt", []()
 	sceDeflt.on_unload = nullptr;
 	sceDeflt.on_stop = nullptr;
 
-	//REG_FUNC(0xCD83A464, sceZlibAdler32);
-	//REG_FUNC(0x110D5050, sceDeflateDecompress);
-	//REG_FUNC(0xE3CB51A3, sceGzipDecompress);
-	//REG_FUNC(0xBABCF5CF, sceGzipGetComment);
-	//REG_FUNC(0xE1844802, sceGzipGetCompressedData);
-	//REG_FUNC(0x1B8E5862, sceGzipGetInfo);
-	//REG_FUNC(0xAEBAABE6, sceGzipGetName);
-	//REG_FUNC(0xDEDADC31, sceGzipIsValid);
-	//REG_FUNC(0xE38F754D, sceZlibDecompress);
-	//REG_FUNC(0xE680A65A, sceZlibGetCompressedData);
-	//REG_FUNC(0x4C0A685D, sceZlibGetInfo);
-	//REG_FUNC(0x14A0698D, sceZlibIsValid);
+	REG_FUNC(0xCD83A464, sceZlibAdler32);
+	REG_FUNC(0x110D5050, sceDeflateDecompress);
+	REG_FUNC(0xE3CB51A3, sceGzipDecompress);
+	REG_FUNC(0xBABCF5CF, sceGzipGetComment);
+	REG_FUNC(0xE1844802, sceGzipGetCompressedData);
+	REG_FUNC(0x1B8E5862, sceGzipGetInfo);
+	REG_FUNC(0xAEBAABE6, sceGzipGetName);
+	REG_FUNC(0xDEDADC31, sceGzipIsValid);
+	REG_FUNC(0xE38F754D, sceZlibDecompress);
+	REG_FUNC(0xE680A65A, sceZlibGetCompressedData);
+	REG_FUNC(0x4C0A685D, sceZlibGetInfo);
+	REG_FUNC(0x14A0698D, sceZlibIsValid);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp
index 73678a396c..8d21dc8f66 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp
@@ -4,6 +4,79 @@
 
 extern psv_log_base sceFiber;
 
+typedef vm::psv::ptr<void(u32 argOnInitialize, u32 argOnRun)> SceFiberEntry;
+
+union SceFiber
+{
+	static const uint size = 128;
+	static const uint align = 8;
+	u64 padding[size / sizeof(u64)];
+};
+
+union SceFiberOptParam 
+{
+	static const uint size = 128;
+	static const uint align = 8;
+	u64 padding[size / sizeof(u64)];
+};
+
+union SceFiberInfo
+{
+	static const uint size = 128;
+	static const uint align = 8;
+	u64 padding[size / sizeof(u64)];
+
+	struct
+	{
+		SceFiberEntry entry;
+		u32 argOnInitialize;
+		vm::psv::ptr<void> addrContext;
+		s32 sizeContext;
+		char name[32];
+	};
+};
+
+s32 _sceFiberInitializeImpl(vm::psv::ptr<SceFiber> fiber, vm::psv::ptr<const char> name, SceFiberEntry entry, u32 argOnInitialize, vm::psv::ptr<void> addrContext, u32 sizeContext, vm::psv::ptr<const SceFiberOptParam> optParam, u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiberOptParamInitialize(vm::psv::ptr<SceFiberOptParam> optParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiberFinalize(vm::psv::ptr<SceFiber> fiber)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiberRun(vm::psv::ptr<SceFiber> fiber, u32 argOnRunTo, vm::psv::ptr<u32> argOnReturn)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiberSwitch(vm::psv::ptr<SceFiber> fiber, u32 argOnRunTo, vm::psv::ptr<u32> argOnRun)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiberGetSelf(vm::psv::ptr<vm::psv::ptr<SceFiber>> fiber)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiberReturnToThread(u32 argOnReturn, vm::psv::ptr<u32> argOnRun)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiberGetInfo(vm::psv::ptr<SceFiber> fiber, vm::psv::ptr<SceFiberInfo> fiberInfo)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceFiber, #name, name)
 
 psv_log_base sceFiber("SceFiber", []()
@@ -12,15 +85,15 @@ psv_log_base sceFiber("SceFiber", []()
 	sceFiber.on_unload = nullptr;
 	sceFiber.on_stop = nullptr;
 
-	//REG_FUNC(0xF24A298C, _sceFiberInitializeImpl);
+	REG_FUNC(0xF24A298C, _sceFiberInitializeImpl);
 	//REG_FUNC(0xC6A3F9BB, _sceFiberInitializeWithInternalOptionImpl);
 	//REG_FUNC(0x7D0C7DDB, _sceFiberAttachContextAndRun);
 	//REG_FUNC(0xE00B9AFE, _sceFiberAttachContextAndSwitch);
-	//REG_FUNC(0x801AB334, sceFiberOptParamInitialize);
-	//REG_FUNC(0xE160F844, sceFiberFinalize);
-	//REG_FUNC(0x7DF23243, sceFiberRun);
-	//REG_FUNC(0xE4283144, sceFiberSwitch);
-	//REG_FUNC(0x414D8CA5, sceFiberGetSelf);
-	//REG_FUNC(0x3B42921F, sceFiberReturnToThread);
-	//REG_FUNC(0x189599B4, sceFiberGetInfo);
+	REG_FUNC(0x801AB334, sceFiberOptParamInitialize);
+	REG_FUNC(0xE160F844, sceFiberFinalize);
+	REG_FUNC(0x7DF23243, sceFiberRun);
+	REG_FUNC(0xE4283144, sceFiberSwitch);
+	REG_FUNC(0x414D8CA5, sceFiberGetSelf);
+	REG_FUNC(0x3B42921F, sceFiberReturnToThread);
+	REG_FUNC(0x189599B4, sceFiberGetInfo);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp
index d04af5b3cd..d542e97549 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp
@@ -4,6 +4,804 @@
 
 extern psv_log_base sceFios;
 
+typedef s64 SceFiosOffset;
+typedef s64 SceFiosSize;
+typedef u8 SceFiosOpEvent;
+typedef s32 SceFiosHandle;
+typedef SceFiosHandle SceFiosOp;
+typedef SceFiosHandle SceFiosFH;
+typedef SceFiosHandle SceFiosDH;
+typedef s64 SceFiosTime;
+typedef s8 SceFiosPriority;
+typedef SceFiosTime SceFiosTimeInterval;
+typedef u64 SceFiosDate;
+typedef s32 SceFiosOverlayID;
+
+typedef vm::psv::ptr<s32(vm::psv::ptr<void> pContext, SceFiosOp op, SceFiosOpEvent event, s32 err)> SceFiosOpCallback;
+typedef vm::psv::ptr<s32(vm::psv::ptr<const char> fmt, va_list ap)> SceFiosVprintfCallback;
+typedef vm::psv::ptr<vm::psv::ptr<void>(vm::psv::ptr<void> dst, vm::psv::ptr<const void> src, u32 len)> SceFiosMemcpyCallback;
+
+enum SceFiosWhence : s32
+{
+	SCE_FIOS_SEEK_SET = 0,
+	SCE_FIOS_SEEK_CUR = 1,
+	SCE_FIOS_SEEK_END = 2
+};
+
+struct SceFiosBuffer
+{
+	vm::psv::ptr<void> pPtr;
+	u32 length;
+};
+
+struct SceFiosOpAttr
+{
+	SceFiosTime deadline;
+	SceFiosOpCallback pCallback;
+	vm::psv::ptr<void> pCallbackContext;
+	s32 priority : 8;
+	u32 opflags : 24;
+	u32 userTag;
+	vm::psv::ptr<void> userPtr;
+	vm::psv::ptr<void> pReserved;
+};
+
+struct SceFiosDirEntry
+{
+	SceFiosOffset fileSize;
+	u32 statFlags;
+	u16 nameLength;
+	u16 fullPathLength;
+	u16 offsetToName;
+	u16 reserved[3];
+	char fullPath[1024];
+};
+
+struct SceFiosStat
+{
+	SceFiosOffset fileSize;
+	SceFiosDate accessDate;
+	SceFiosDate modificationDate;
+	SceFiosDate creationDate;
+	u32 statFlags;
+	u32 reserved;
+	s64 uid;
+	s64 gid;
+	s64 dev;
+	s64 ino;
+	s64 mode;
+};
+
+struct SceFiosOpenParams
+{
+	u32 openFlags;
+	u32 reserved;
+	SceFiosBuffer buffer;
+};
+
+struct SceFiosTuple
+{
+	SceFiosOffset offset;
+	SceFiosSize size;
+	char path[1024];
+};
+
+struct SceFiosParams
+{
+	u32 initialized : 1;
+	u32 paramsSize : 14;
+	u32 pathMax : 16;
+	u32 profiling;
+	SceFiosBuffer opStorage;
+	SceFiosBuffer fhStorage;
+	SceFiosBuffer dhStorage;
+	SceFiosBuffer chunkStorage;
+	SceFiosVprintfCallback pVprintf;
+	SceFiosMemcpyCallback pMemcpy;
+	s32 threadPriority[2];
+	s32 threadAffinity[2];
+};
+
+struct SceFiosOverlay
+{
+	u8 type;
+	u8 order;
+	u8 reserved[10];
+	SceFiosOverlayID id;
+	char dst[292];
+	char src[292];
+};
+
+typedef vm::psv::ptr<void()> SceFiosIOFilterCallback;
+
+struct SceFiosPsarcDearchiverContext
+{
+	u32 sizeOfContext;
+	u32 workBufferSize;
+	vm::psv::ptr<void> pWorkBuffer;
+	s32 reserved[4];
+};
+
+s32 sceFiosInitialize(vm::psv::ptr<const SceFiosParams> pParameters)
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosTerminate()
+{
+	throw __FUNCTION__;
+}
+
+bool sceFiosIsInitialized(vm::psv::ptr<SceFiosParams> pOutParameters)
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosUpdateParameters(vm::psv::ptr<const SceFiosParams> pParameters)
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosSetGlobalDefaultOpAttr(vm::psv::ptr<const SceFiosOpAttr> pAttr)
+{
+	throw __FUNCTION__;
+}
+
+bool sceFiosGetGlobalDefaultOpAttr(vm::psv::ptr<SceFiosOpAttr> pOutAttr)
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosSetThreadDefaultOpAttr(vm::psv::ptr<const SceFiosOpAttr> pAttr)
+{
+	throw __FUNCTION__;
+}
+
+bool sceFiosGetThreadDefaultOpAttr(vm::psv::ptr<SceFiosOpAttr> pOutAttr)
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosGetDefaultOpAttr(vm::psv::ptr<SceFiosOpAttr> pOutAttr)
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosSuspend()
+{
+	throw __FUNCTION__;
+}
+
+u32 sceFiosGetSuspendCount()
+{
+	throw __FUNCTION__;
+}
+
+bool sceFiosIsSuspended()
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosResume()
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosShutdownAndCancelOps()
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosCancelAllOps()
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosCloseAllFiles()
+{
+	throw __FUNCTION__;
+}
+
+bool sceFiosIsIdle()
+{
+	throw __FUNCTION__;
+}
+
+u32 sceFiosGetAllFHs(vm::psv::ptr<SceFiosFH> pOutArray, u32 arraySize)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceFiosGetAllDHs(vm::psv::ptr<SceFiosDH> pOutArray, u32 arraySize)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceFiosGetAllOps(vm::psv::ptr<SceFiosOp> pOutArray, u32 arraySize)
+{
+	throw __FUNCTION__;
+}
+
+bool sceFiosIsValidHandle(SceFiosHandle h)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosPathcmp(vm::psv::ptr<const char> pA, vm::psv::ptr<const char> pB)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosPathncmp(vm::psv::ptr<const char> pA, vm::psv::ptr<const char> pB, u32 n)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosPrintf(vm::psv::ptr<const char> pFormat) // va_args...
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosVprintf(vm::psv::ptr<const char> pFormat) // va_list
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFileExists(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, vm::psv::ptr<bool> pOutExists)
+{
+	throw __FUNCTION__;
+}
+
+bool sceFiosFileExistsSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFileGetSize(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, vm::psv::ptr<SceFiosSize> pOutSize)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFileGetSizeSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFileDelete(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosFileDeleteSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosDirectoryExists(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, vm::psv::ptr<bool> pOutExists)
+{
+	throw __FUNCTION__;
+}
+
+bool sceFiosDirectoryExistsSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosDirectoryCreate(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosDirectoryCreateSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosDirectoryDelete(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosDirectoryDeleteSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosExists(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, vm::psv::ptr<bool> pOutExists)
+{
+	throw __FUNCTION__;
+}
+
+bool sceFiosExistsSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosStat(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, vm::psv::ptr<SceFiosStat> pOutStatus)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosStatSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, vm::psv::ptr<SceFiosStat> pOutStatus)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosDelete(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosDeleteSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosResolve(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const SceFiosTuple> pInTuple, vm::psv::ptr<SceFiosTuple> pOutTuple)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosResolveSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const SceFiosTuple> pInTuple, vm::psv::ptr<SceFiosTuple> pOutTuple)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosRename(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pOldPath, vm::psv::ptr<const char> pNewPath)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosRenameSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pOldPath, vm::psv::ptr<const char> pNewPath)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFileRead(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, vm::psv::ptr<void> pBuf, SceFiosSize length, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFileReadSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, vm::psv::ptr<void> pBuf, SceFiosSize length, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFileWrite(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, vm::psv::ptr<const void> pBuf, SceFiosSize length, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFileWriteSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, vm::psv::ptr<const void> pBuf, SceFiosSize length, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFileTruncate(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, SceFiosSize length)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosFileTruncateSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pPath, SceFiosSize length)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHOpen(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<SceFiosFH> pOutFH, vm::psv::ptr<const char> pPath, vm::psv::ptr<const SceFiosOpenParams> pOpenParams)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosFHOpenSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<SceFiosFH> pOutFH, vm::psv::ptr<const char> pPath, vm::psv::ptr<const SceFiosOpenParams> pOpenParams)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHStat(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<SceFiosStat> pOutStatus)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosFHStatSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<SceFiosStat> pOutStatus)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHTruncate(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, SceFiosSize length)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosFHTruncateSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, SceFiosSize length)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosFHSyncSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHRead(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<void> pBuf, SceFiosSize length)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFHReadSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<void> pBuf, SceFiosSize length)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHWrite(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const void> pBuf, SceFiosSize length)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFHWriteSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const void> pBuf, SceFiosSize length)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHReadv(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const SceFiosBuffer> iov, s32 iovcnt)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFHReadvSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const SceFiosBuffer> iov, s32 iovcnt)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHWritev(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const SceFiosBuffer> iov, s32 iovcnt)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFHWritevSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const SceFiosBuffer> iov, s32 iovcnt)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHPread(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<void> pBuf, SceFiosSize length, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFHPreadSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<void> pBuf, SceFiosSize length, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHPwrite(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const void> pBuf, SceFiosSize length, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFHPwriteSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const void> pBuf, SceFiosSize length, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHPreadv(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const SceFiosBuffer> iov, s32 iovcnt, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFHPreadvSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const SceFiosBuffer> iov, s32 iovcnt, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHPwritev(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const SceFiosBuffer> iov, s32 iovcnt, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFHPwritevSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh, vm::psv::ptr<const SceFiosBuffer> iov, s32 iovcnt, SceFiosOffset offset)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosFHClose(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosFHCloseSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOffset sceFiosFHSeek(SceFiosFH fh, SceFiosOffset offset, SceFiosWhence whence)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOffset sceFiosFHTell(SceFiosFH fh)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const char> sceFiosFHGetPath(SceFiosFH fh)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosFHGetSize(SceFiosFH fh)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<SceFiosOpenParams> sceFiosFHGetOpenParams(SceFiosFH fh)
+{
+	throw __FUNCTION__;
+}
+
+//SceFiosOp sceFiosDHOpen(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<SceFiosDH> pOutDH, vm::psv::ptr<const char> pPath, SceFiosBuffer buf)
+//{
+//	throw __FUNCTION__;
+//}
+//
+//s32 sceFiosDHOpenSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<SceFiosDH> pOutDH, vm::psv::ptr<const char> pPath, SceFiosBuffer buf)
+//{
+//	throw __FUNCTION__;
+//}
+
+SceFiosOp sceFiosDHRead(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosDH dh, vm::psv::ptr<SceFiosDirEntry> pOutEntry)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosDHReadSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosDH dh, vm::psv::ptr<SceFiosDirEntry> pOutEntry)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosDHClose(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosDH dh)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosDHCloseSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosDH dh)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const char> sceFiosDHGetPath(SceFiosDH dh)
+{
+	throw __FUNCTION__;
+}
+
+bool sceFiosOpIsDone(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosOpWait(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosOpWaitUntil(SceFiosOp op, SceFiosTime deadline)
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosOpDelete(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosOpSyncWait(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosOpSyncWaitForIO(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosOpGetError(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosOpCancel(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+bool sceFiosOpIsCancelled(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceFiosOpAttr> sceFiosOpGetAttr(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const char> sceFiosOpGetPath(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<void> sceFiosOpGetBuffer(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOffset sceFiosOpGetOffset(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosOpGetRequestCount(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosOpGetActualCount(SceFiosOp op)
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosOpReschedule(SceFiosOp op, SceFiosTime newDeadline)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosTime sceFiosTimeGetCurrent()
+{
+	throw __FUNCTION__;
+}
+
+s64 sceFiosTimeIntervalToNanoseconds(SceFiosTimeInterval interval)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosTimeInterval sceFiosTimeIntervalFromNanoseconds(s64 ns)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosDate sceFiosDateGetCurrent()
+{
+	throw __FUNCTION__;
+}
+
+SceFiosDate sceFiosDateFromComponents(const struct vm::psv::ptr<tm> pComponents)
+{
+	throw __FUNCTION__;
+}
+
+struct vm::psv::ptr<tm> sceFiosDateToComponents(SceFiosDate date, struct vm::psv::ptr<tm> pOutComponents)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosDate sceFiosDateFromSceDateTime(vm::psv::ptr<const SceDateTime> pSceDateTime)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<SceDateTime> sceFiosDateToSceDateTime(SceFiosDate date, vm::psv::ptr<SceDateTime> pSceDateTime)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosOverlayAdd(vm::psv::ptr<const SceFiosOverlay> pOverlay, vm::psv::ptr<SceFiosOverlayID> pOutID)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosOverlayRemove(SceFiosOverlayID id)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosOverlayGetInfo(SceFiosOverlayID id, vm::psv::ptr<SceFiosOverlay> pOutOverlay)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosOverlayModify(SceFiosOverlayID id, vm::psv::ptr<const SceFiosOverlay> pNewValue)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosOverlayGetList(vm::psv::ptr<SceFiosOverlayID> pOutIDs, u32 maxIDs, vm::psv::ptr<u32> pActualIDs)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosOverlayResolveSync(s32 resolveFlag, vm::psv::ptr<const char> pInPath, vm::psv::ptr<char> pOutPath, u32 maxPath)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosOp sceFiosArchiveGetMountBufferSize(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pArchivePath, vm::psv::ptr<const SceFiosOpenParams> pOpenParams)
+{
+	throw __FUNCTION__;
+}
+
+SceFiosSize sceFiosArchiveGetMountBufferSizeSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<const char> pArchivePath, vm::psv::ptr<const SceFiosOpenParams> pOpenParams)
+{
+	throw __FUNCTION__;
+}
+
+//SceFiosOp sceFiosArchiveMount(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<SceFiosFH> pOutFH, vm::psv::ptr<const char> pArchivePath, vm::psv::ptr<const char> pMountPoint, SceFiosBuffer mountBuffer, vm::psv::ptr<const SceFiosOpenParams> pOpenParams)
+//{
+//	throw __FUNCTION__;
+//}
+//
+//s32 sceFiosArchiveMountSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, vm::psv::ptr<SceFiosFH> pOutFH, vm::psv::ptr<const char> pArchivePath, vm::psv::ptr<const char> pMountPoint, SceFiosBuffer mountBuffer, vm::psv::ptr<const SceFiosOpenParams> pOpenParams)
+//{
+//	throw __FUNCTION__;
+//}
+
+SceFiosOp sceFiosArchiveUnmount(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosArchiveUnmountSync(vm::psv::ptr<const SceFiosOpAttr> pAttr, SceFiosFH fh)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<char> sceFiosDebugDumpError(s32 err, vm::psv::ptr<char> pBuffer, u32 bufferSize)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<char> sceFiosDebugDumpOp(SceFiosOp op, vm::psv::ptr<char> pBuffer, u32 bufferSize)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<char> sceFiosDebugDumpFH(SceFiosFH fh, vm::psv::ptr<char> pBuffer, u32 bufferSize)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<char> sceFiosDebugDumpDH(SceFiosDH dh, vm::psv::ptr<char> pBuffer, u32 bufferSize)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<char> sceFiosDebugDumpDate(SceFiosDate date, vm::psv::ptr<char> pBuffer, u32 bufferSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosIOFilterAdd(s32 index, SceFiosIOFilterCallback pFilterCallback, vm::psv::ptr<void> pFilterContext)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosIOFilterGetInfo(s32 index, vm::psv::ptr<SceFiosIOFilterCallback> pOutFilterCallback, vm::psv::ptr<vm::psv::ptr<void>> pOutFilterContext)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceFiosIOFilterRemove(s32 index)
+{
+	throw __FUNCTION__;
+}
+
+void sceFiosIOFilterPsarcDearchiver()
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceFios, #name, name)
 
 psv_log_base sceFios("SceFios2", []()
@@ -12,136 +810,136 @@ psv_log_base sceFios("SceFios2", []()
 	sceFios.on_unload = nullptr;
 	sceFios.on_stop = nullptr;
 
-	//REG_FUNC(0x15857180, sceFiosArchiveGetMountBufferSize);
-	//REG_FUNC(0xDF3352FC, sceFiosArchiveGetMountBufferSizeSync);
+	REG_FUNC(0x15857180, sceFiosArchiveGetMountBufferSize);
+	REG_FUNC(0xDF3352FC, sceFiosArchiveGetMountBufferSizeSync);
 	//REG_FUNC(0x92E76BBD, sceFiosArchiveMount);
 	//REG_FUNC(0xC4822276, sceFiosArchiveMountSync);
-	//REG_FUNC(0xFE1E1D28, sceFiosArchiveUnmount);
-	//REG_FUNC(0xB26DC24D, sceFiosArchiveUnmountSync);
-	//REG_FUNC(0x1E920B1D, sceFiosCancelAllOps);
-	//REG_FUNC(0xF85C208B, sceFiosCloseAllFiles);
-	//REG_FUNC(0xF6CACFC7, sceFiosDHClose);
-	//REG_FUNC(0x1F3CC428, sceFiosDHCloseSync);
-	//REG_FUNC(0x2B406DEB, sceFiosDHGetPath);
+	REG_FUNC(0xFE1E1D28, sceFiosArchiveUnmount);
+	REG_FUNC(0xB26DC24D, sceFiosArchiveUnmountSync);
+	REG_FUNC(0x1E920B1D, sceFiosCancelAllOps);
+	REG_FUNC(0xF85C208B, sceFiosCloseAllFiles);
+	REG_FUNC(0xF6CACFC7, sceFiosDHClose);
+	REG_FUNC(0x1F3CC428, sceFiosDHCloseSync);
+	REG_FUNC(0x2B406DEB, sceFiosDHGetPath);
 	//REG_FUNC(0xEA9855BA, sceFiosDHOpen);
 	//REG_FUNC(0x34BC3713, sceFiosDHOpenSync);
-	//REG_FUNC(0x72A0A851, sceFiosDHRead);
-	//REG_FUNC(0xB7E79CAD, sceFiosDHReadSync);
-	//REG_FUNC(0x280D284A, sceFiosDateFromComponents);
-	//REG_FUNC(0x5C593C1E, sceFiosDateGetCurrent);
-	//REG_FUNC(0x5CFF6EA0, sceFiosDateToComponents);
-	//REG_FUNC(0x44B9F8EB, sceFiosDebugDumpDH);
-	//REG_FUNC(0x159B1FA8, sceFiosDebugDumpDate);
-	//REG_FUNC(0x51E677DF, sceFiosDebugDumpError);
-	//REG_FUNC(0x5506ACAB, sceFiosDebugDumpFH);
-	//REG_FUNC(0xE438D4F0, sceFiosDebugDumpOp);
-	//REG_FUNC(0x764DFA7A, sceFiosDelete);
-	//REG_FUNC(0xAAC54B44, sceFiosDeleteSync);
-	//REG_FUNC(0x9198ED8B, sceFiosDirectoryCreate);
-	//REG_FUNC(0xE037B076, sceFiosDirectoryCreateSync);
-	//REG_FUNC(0xDA93677C, sceFiosDirectoryDelete);
-	//REG_FUNC(0xB9573146, sceFiosDirectoryDeleteSync);
-	//REG_FUNC(0x48D50D97, sceFiosDirectoryExists);
-	//REG_FUNC(0x726E01BE, sceFiosDirectoryExistsSync);
-	//REG_FUNC(0x6F12D8A5, sceFiosExists);
-	//REG_FUNC(0x125EFD34, sceFiosExistsSync);
-	//REG_FUNC(0xA88EDCA8, sceFiosFHClose);
-	//REG_FUNC(0x45182328, sceFiosFHCloseSync);
-	//REG_FUNC(0xC55DB73B, sceFiosFHGetOpenParams);
-	//REG_FUNC(0x37143AE3, sceFiosFHGetPath);
-	//REG_FUNC(0xC5C26581, sceFiosFHGetSize);
-	//REG_FUNC(0xBF699BD4, sceFiosFHOpen);
-	//REG_FUNC(0xC3E7C3DB, sceFiosFHOpenSync);
-	//REG_FUNC(0x6A51E688, sceFiosFHPread);
-	//REG_FUNC(0xE2805059, sceFiosFHPreadSync);
-	//REG_FUNC(0x7C4E0C42, sceFiosFHPreadv);
-	//REG_FUNC(0x4D42F95C, sceFiosFHPreadvSync);
-	//REG_FUNC(0xCF1FAA6F, sceFiosFHPwrite);
-	//REG_FUNC(0x1E962F57, sceFiosFHPwriteSync);
-	//REG_FUNC(0xBBC9AFD5, sceFiosFHPwritev);
-	//REG_FUNC(0x742ADDC4, sceFiosFHPwritevSync);
-	//REG_FUNC(0xB09AFBDF, sceFiosFHRead);
-	//REG_FUNC(0x76945919, sceFiosFHReadSync);
-	//REG_FUNC(0x7DB0AFAF, sceFiosFHReadv);
-	//REG_FUNC(0x1BC977FA, sceFiosFHReadvSync);
-	//REG_FUNC(0xA75F3C4A, sceFiosFHSeek);
-	//REG_FUNC(0xD97C4DF7, sceFiosFHStat);
-	//REG_FUNC(0xF8BEAC88, sceFiosFHStatSync);
-	//REG_FUNC(0xE485F35E, sceFiosFHSync);
-	//REG_FUNC(0xA909CCE3, sceFiosFHSyncSync);
-	//REG_FUNC(0xD7F33130, sceFiosFHTell);
-	//REG_FUNC(0x2B39453B, sceFiosFHTruncate);
-	//REG_FUNC(0xFEF940B7, sceFiosFHTruncateSync);
-	//REG_FUNC(0xE663138E, sceFiosFHWrite);
-	//REG_FUNC(0x984024E5, sceFiosFHWriteSync);
-	//REG_FUNC(0x988DD7FF, sceFiosFHWritev);
-	//REG_FUNC(0x267E6CE3, sceFiosFHWritevSync);
-	//REG_FUNC(0xB647278B, sceFiosFileDelete);
-	//REG_FUNC(0xB5302E30, sceFiosFileDeleteSync);
-	//REG_FUNC(0x8758E62F, sceFiosFileExists);
-	//REG_FUNC(0x233B070C, sceFiosFileExistsSync);
-	//REG_FUNC(0x79D9BB50, sceFiosFileGetSize);
-	//REG_FUNC(0x789215C3, sceFiosFileGetSizeSync);
-	//REG_FUNC(0x84080161, sceFiosFileRead);
-	//REG_FUNC(0x1C488B32, sceFiosFileReadSync);
-	//REG_FUNC(0xC5513E13, sceFiosFileTruncate);
-	//REG_FUNC(0x6E1252B8, sceFiosFileTruncateSync);
-	//REG_FUNC(0x42C278E5, sceFiosFileWrite);
-	//REG_FUNC(0x132B6DE6, sceFiosFileWriteSync);
-	//REG_FUNC(0x681184A2, sceFiosGetAllDHs);
-	//REG_FUNC(0x90AB9195, sceFiosGetAllFHs);
-	//REG_FUNC(0x8F62832C, sceFiosGetAllOps);
-	//REG_FUNC(0xC897F6A7, sceFiosGetDefaultOpAttr);
-	//REG_FUNC(0x30583FCB, sceFiosGetGlobalDefaultOpAttr);
-	//REG_FUNC(0x156EAFDC, sceFiosGetSuspendCount);
-	//REG_FUNC(0xD55B8555, sceFiosIOFilterAdd);
-	//REG_FUNC(0x7C9B14EB, sceFiosIOFilterGetInfo);
-	//REG_FUNC(0x057252F2, sceFiosIOFilterPsarcDearchiver);
-	//REG_FUNC(0x22E35018, sceFiosIOFilterRemove);
-	//REG_FUNC(0x774C2C05, sceFiosInitialize);
-	//REG_FUNC(0x29104BF3, sceFiosIsIdle);
-	//REG_FUNC(0xF4F54E09, sceFiosIsInitialized);
-	//REG_FUNC(0xD2466EA5, sceFiosIsSuspended);
-	//REG_FUNC(0xB309E327, sceFiosIsValidHandle);
-	//REG_FUNC(0x3904F205, sceFiosOpCancel);
-	//REG_FUNC(0xE4EA92FA, sceFiosOpDelete);
-	//REG_FUNC(0x218A43EE, sceFiosOpGetActualCount);
-	//REG_FUNC(0xABFEE706, sceFiosOpGetAttr);
-	//REG_FUNC(0x68C436E4, sceFiosOpGetBuffer);
-	//REG_FUNC(0xBF099E16, sceFiosOpGetError);
-	//REG_FUNC(0xF21213B9, sceFiosOpGetOffset);
-	//REG_FUNC(0x157515CB, sceFiosOpGetPath);
-	//REG_FUNC(0x9C1084C5, sceFiosOpGetRequestCount);
-	//REG_FUNC(0x0C81D80E, sceFiosOpIsCancelled);
-	//REG_FUNC(0x1B9A575E, sceFiosOpIsDone);
-	//REG_FUNC(0x968CADBD, sceFiosOpReschedule);
-	//REG_FUNC(0xE6A66C70, sceFiosOpSyncWait);
-	//REG_FUNC(0x202079F9, sceFiosOpSyncWaitForIO);
-	//REG_FUNC(0x2AC79DFC, sceFiosOpWait);
-	//REG_FUNC(0xCC823B47, sceFiosOpWaitUntil);
-	//REG_FUNC(0x27AE468B, sceFiosOverlayAdd);
-	//REG_FUNC(0xF4C6B72A, sceFiosOverlayGetInfo);
-	//REG_FUNC(0x1C0BCAD5, sceFiosOverlayGetList);
-	//REG_FUNC(0x30F56704, sceFiosOverlayModify);
-	//REG_FUNC(0xF3C84D0F, sceFiosOverlayRemove);
-	//REG_FUNC(0x8A243E74, sceFiosOverlayResolveSync);
-	//REG_FUNC(0x5E75937A, sceFiosPathcmp);
-	//REG_FUNC(0xCC21C849, sceFiosPathncmp);
-	//REG_FUNC(0xAF7FAADF, sceFiosPrintf);
-	//REG_FUNC(0x25E399E5, sceFiosRename);
-	//REG_FUNC(0x030306F4, sceFiosRenameSync);
-	//REG_FUNC(0xD0B19C9F, sceFiosResolve);
-	//REG_FUNC(0x7FF33797, sceFiosResolveSync);
-	//REG_FUNC(0xBF2D3CC1, sceFiosResume);
-	//REG_FUNC(0x4E2FD311, sceFiosSetGlobalDefaultOpAttr);
-	//REG_FUNC(0x5B8D48C4, sceFiosShutdownAndCancelOps);
-	//REG_FUNC(0xFF04AF72, sceFiosStat);
-	//REG_FUNC(0xACBAF3E0, sceFiosStatSync);
-	//REG_FUNC(0x510953DC, sceFiosSuspend);
-	//REG_FUNC(0x2904B539, sceFiosTerminate);
-	//REG_FUNC(0xE76C8EC3, sceFiosTimeGetCurrent);
-	//REG_FUNC(0x35A82737, sceFiosTimeIntervalFromNanoseconds);
-	//REG_FUNC(0x397BF626, sceFiosTimeIntervalToNanoseconds);
-	//REG_FUNC(0x1915052A, sceFiosUpdateParameters);
-	//REG_FUNC(0x5BA4BD6D, sceFiosVprintf);
+	REG_FUNC(0x72A0A851, sceFiosDHRead);
+	REG_FUNC(0xB7E79CAD, sceFiosDHReadSync);
+	REG_FUNC(0x280D284A, sceFiosDateFromComponents);
+	REG_FUNC(0x5C593C1E, sceFiosDateGetCurrent);
+	REG_FUNC(0x5CFF6EA0, sceFiosDateToComponents);
+	REG_FUNC(0x44B9F8EB, sceFiosDebugDumpDH);
+	REG_FUNC(0x159B1FA8, sceFiosDebugDumpDate);
+	REG_FUNC(0x51E677DF, sceFiosDebugDumpError);
+	REG_FUNC(0x5506ACAB, sceFiosDebugDumpFH);
+	REG_FUNC(0xE438D4F0, sceFiosDebugDumpOp);
+	REG_FUNC(0x764DFA7A, sceFiosDelete);
+	REG_FUNC(0xAAC54B44, sceFiosDeleteSync);
+	REG_FUNC(0x9198ED8B, sceFiosDirectoryCreate);
+	REG_FUNC(0xE037B076, sceFiosDirectoryCreateSync);
+	REG_FUNC(0xDA93677C, sceFiosDirectoryDelete);
+	REG_FUNC(0xB9573146, sceFiosDirectoryDeleteSync);
+	REG_FUNC(0x48D50D97, sceFiosDirectoryExists);
+	REG_FUNC(0x726E01BE, sceFiosDirectoryExistsSync);
+	REG_FUNC(0x6F12D8A5, sceFiosExists);
+	REG_FUNC(0x125EFD34, sceFiosExistsSync);
+	REG_FUNC(0xA88EDCA8, sceFiosFHClose);
+	REG_FUNC(0x45182328, sceFiosFHCloseSync);
+	REG_FUNC(0xC55DB73B, sceFiosFHGetOpenParams);
+	REG_FUNC(0x37143AE3, sceFiosFHGetPath);
+	REG_FUNC(0xC5C26581, sceFiosFHGetSize);
+	REG_FUNC(0xBF699BD4, sceFiosFHOpen);
+	REG_FUNC(0xC3E7C3DB, sceFiosFHOpenSync);
+	REG_FUNC(0x6A51E688, sceFiosFHPread);
+	REG_FUNC(0xE2805059, sceFiosFHPreadSync);
+	REG_FUNC(0x7C4E0C42, sceFiosFHPreadv);
+	REG_FUNC(0x4D42F95C, sceFiosFHPreadvSync);
+	REG_FUNC(0xCF1FAA6F, sceFiosFHPwrite);
+	REG_FUNC(0x1E962F57, sceFiosFHPwriteSync);
+	REG_FUNC(0xBBC9AFD5, sceFiosFHPwritev);
+	REG_FUNC(0x742ADDC4, sceFiosFHPwritevSync);
+	REG_FUNC(0xB09AFBDF, sceFiosFHRead);
+	REG_FUNC(0x76945919, sceFiosFHReadSync);
+	REG_FUNC(0x7DB0AFAF, sceFiosFHReadv);
+	REG_FUNC(0x1BC977FA, sceFiosFHReadvSync);
+	REG_FUNC(0xA75F3C4A, sceFiosFHSeek);
+	REG_FUNC(0xD97C4DF7, sceFiosFHStat);
+	REG_FUNC(0xF8BEAC88, sceFiosFHStatSync);
+	REG_FUNC(0xE485F35E, sceFiosFHSync);
+	REG_FUNC(0xA909CCE3, sceFiosFHSyncSync);
+	REG_FUNC(0xD7F33130, sceFiosFHTell);
+	REG_FUNC(0x2B39453B, sceFiosFHTruncate);
+	REG_FUNC(0xFEF940B7, sceFiosFHTruncateSync);
+	REG_FUNC(0xE663138E, sceFiosFHWrite);
+	REG_FUNC(0x984024E5, sceFiosFHWriteSync);
+	REG_FUNC(0x988DD7FF, sceFiosFHWritev);
+	REG_FUNC(0x267E6CE3, sceFiosFHWritevSync);
+	REG_FUNC(0xB647278B, sceFiosFileDelete);
+	REG_FUNC(0xB5302E30, sceFiosFileDeleteSync);
+	REG_FUNC(0x8758E62F, sceFiosFileExists);
+	REG_FUNC(0x233B070C, sceFiosFileExistsSync);
+	REG_FUNC(0x79D9BB50, sceFiosFileGetSize);
+	REG_FUNC(0x789215C3, sceFiosFileGetSizeSync);
+	REG_FUNC(0x84080161, sceFiosFileRead);
+	REG_FUNC(0x1C488B32, sceFiosFileReadSync);
+	REG_FUNC(0xC5513E13, sceFiosFileTruncate);
+	REG_FUNC(0x6E1252B8, sceFiosFileTruncateSync);
+	REG_FUNC(0x42C278E5, sceFiosFileWrite);
+	REG_FUNC(0x132B6DE6, sceFiosFileWriteSync);
+	REG_FUNC(0x681184A2, sceFiosGetAllDHs);
+	REG_FUNC(0x90AB9195, sceFiosGetAllFHs);
+	REG_FUNC(0x8F62832C, sceFiosGetAllOps);
+	REG_FUNC(0xC897F6A7, sceFiosGetDefaultOpAttr);
+	REG_FUNC(0x30583FCB, sceFiosGetGlobalDefaultOpAttr);
+	REG_FUNC(0x156EAFDC, sceFiosGetSuspendCount);
+	REG_FUNC(0xD55B8555, sceFiosIOFilterAdd);
+	REG_FUNC(0x7C9B14EB, sceFiosIOFilterGetInfo);
+	REG_FUNC(0x057252F2, sceFiosIOFilterPsarcDearchiver);
+	REG_FUNC(0x22E35018, sceFiosIOFilterRemove);
+	REG_FUNC(0x774C2C05, sceFiosInitialize);
+	REG_FUNC(0x29104BF3, sceFiosIsIdle);
+	REG_FUNC(0xF4F54E09, sceFiosIsInitialized);
+	REG_FUNC(0xD2466EA5, sceFiosIsSuspended);
+	REG_FUNC(0xB309E327, sceFiosIsValidHandle);
+	REG_FUNC(0x3904F205, sceFiosOpCancel);
+	REG_FUNC(0xE4EA92FA, sceFiosOpDelete);
+	REG_FUNC(0x218A43EE, sceFiosOpGetActualCount);
+	REG_FUNC(0xABFEE706, sceFiosOpGetAttr);
+	REG_FUNC(0x68C436E4, sceFiosOpGetBuffer);
+	REG_FUNC(0xBF099E16, sceFiosOpGetError);
+	REG_FUNC(0xF21213B9, sceFiosOpGetOffset);
+	REG_FUNC(0x157515CB, sceFiosOpGetPath);
+	REG_FUNC(0x9C1084C5, sceFiosOpGetRequestCount);
+	REG_FUNC(0x0C81D80E, sceFiosOpIsCancelled);
+	REG_FUNC(0x1B9A575E, sceFiosOpIsDone);
+	REG_FUNC(0x968CADBD, sceFiosOpReschedule);
+	REG_FUNC(0xE6A66C70, sceFiosOpSyncWait);
+	REG_FUNC(0x202079F9, sceFiosOpSyncWaitForIO);
+	REG_FUNC(0x2AC79DFC, sceFiosOpWait);
+	REG_FUNC(0xCC823B47, sceFiosOpWaitUntil);
+	REG_FUNC(0x27AE468B, sceFiosOverlayAdd);
+	REG_FUNC(0xF4C6B72A, sceFiosOverlayGetInfo);
+	REG_FUNC(0x1C0BCAD5, sceFiosOverlayGetList);
+	REG_FUNC(0x30F56704, sceFiosOverlayModify);
+	REG_FUNC(0xF3C84D0F, sceFiosOverlayRemove);
+	REG_FUNC(0x8A243E74, sceFiosOverlayResolveSync);
+	REG_FUNC(0x5E75937A, sceFiosPathcmp);
+	REG_FUNC(0xCC21C849, sceFiosPathncmp);
+	REG_FUNC(0xAF7FAADF, sceFiosPrintf);
+	REG_FUNC(0x25E399E5, sceFiosRename);
+	REG_FUNC(0x030306F4, sceFiosRenameSync);
+	REG_FUNC(0xD0B19C9F, sceFiosResolve);
+	REG_FUNC(0x7FF33797, sceFiosResolveSync);
+	REG_FUNC(0xBF2D3CC1, sceFiosResume);
+	REG_FUNC(0x4E2FD311, sceFiosSetGlobalDefaultOpAttr);
+	REG_FUNC(0x5B8D48C4, sceFiosShutdownAndCancelOps);
+	REG_FUNC(0xFF04AF72, sceFiosStat);
+	REG_FUNC(0xACBAF3E0, sceFiosStatSync);
+	REG_FUNC(0x510953DC, sceFiosSuspend);
+	REG_FUNC(0x2904B539, sceFiosTerminate);
+	REG_FUNC(0xE76C8EC3, sceFiosTimeGetCurrent);
+	REG_FUNC(0x35A82737, sceFiosTimeIntervalFromNanoseconds);
+	REG_FUNC(0x397BF626, sceFiosTimeIntervalToNanoseconds);
+	REG_FUNC(0x1915052A, sceFiosUpdateParameters);
+	REG_FUNC(0x5BA4BD6D, sceFiosVprintf);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceIme.cpp b/rpcs3/Emu/ARMv7/Modules/sceIme.cpp
index d0e90298d9..797e282ace 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceIme.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceIme.cpp
@@ -2,7 +2,33 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
-extern psv_log_base sceIme;
+#include "sceIme.h"
+
+s32 sceImeOpen(vm::psv::ptr<SceImeParam> param)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceImeUpdate()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceImeSetCaret(vm::psv::ptr<const SceImeCaret> caret)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceImeSetPreeditGeometry(vm::psv::ptr<const SceImePreeditGeometry> preedit)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceImeClose()
+{
+	throw __FUNCTION__;
+}
+
 
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceIme, #name, name)
 
@@ -12,9 +38,9 @@ psv_log_base sceIme("SceIme", []()
 	sceIme.on_unload = nullptr;
 	sceIme.on_stop = nullptr;
 
-	//REG_FUNC(0x0E050613, sceImeOpen);
-	//REG_FUNC(0x71D6898A, sceImeUpdate);
-	//REG_FUNC(0x889A8421, sceImeClose);
-	//REG_FUNC(0xD8342D2A, sceImeSetCaret);
-	//REG_FUNC(0x7B1EFAA5, sceImeSetPreeditGeometry);
+	REG_FUNC(0x0E050613, sceImeOpen);
+	REG_FUNC(0x71D6898A, sceImeUpdate);
+	REG_FUNC(0x889A8421, sceImeClose);
+	REG_FUNC(0xD8342D2A, sceImeSetCaret);
+	REG_FUNC(0x7B1EFAA5, sceImeSetPreeditGeometry);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceIme.h b/rpcs3/Emu/ARMv7/Modules/sceIme.h
new file mode 100644
index 0000000000..7e7fffb429
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceIme.h
@@ -0,0 +1,70 @@
+#pragma once
+
+typedef s32(SceImeCharFilter)(u16 ch);
+
+struct SceImeRect
+{
+	u32 x;
+	u32 y;
+	u32 width;
+	u32 height;
+};
+
+struct SceImeEditText
+{
+	u32 preeditIndex;
+	u32 preeditLength;
+	u32 caretIndex;
+	vm::psv::ptr<u16> str;
+};
+
+union SceImeEventParam
+{
+	SceImeRect rect;
+	SceImeEditText text;
+	u32 caretIndex;
+};
+
+struct SceImeEvent
+{
+	u32 id;
+	SceImeEventParam param;
+};
+
+struct SceImeCaret
+{
+	u32 x;
+	u32 y;
+	u32 height;
+	u32 index;
+};
+
+struct SceImePreeditGeometry
+{
+	u32 x;
+	u32 y;
+	u32 height;
+};
+
+typedef void(SceImeEventHandler)(vm::psv::ptr<void> arg, vm::psv::ptr<const SceImeEvent> e);
+
+struct SceImeParam
+{
+	u32 size;
+	u32 inputMethod;
+	u64 supportedLanguages;
+	s32 languagesForced;
+	u32 type;
+	u32 option;
+	vm::psv::ptr<void> work;
+	vm::psv::ptr<void> arg;
+	vm::psv::ptr<SceImeEventHandler> handler;
+	vm::psv::ptr<SceImeCharFilter> filter;
+	vm::psv::ptr<u32> initialText;
+	u32 maxTextLength;
+	vm::psv::ptr<u32> inputTextBuffer;
+	u32 reserved0;
+	u32 reserved1;
+};
+
+extern psv_log_base sceIme;
diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp
index 6a4884798b..01232eb579 100644
--- a/rpcs3/Loader/ELF32.cpp
+++ b/rpcs3/Loader/ELF32.cpp
@@ -256,9 +256,7 @@ namespace loader
 							}
 							case 0x0000002f: // movw r*,# instruction is replaced
 							{
-								const u32 addr = *++code;
-
-								if (!data)
+								if (!data) // probably, imported object
 								{
 									auto found = vnid_list.find(code.addr());
 									if (found != vnid_list.end())
@@ -269,36 +267,32 @@ namespace loader
 
 								if (!data)
 								{
-									LOG_ERROR(LOADER, ".sceRefs: movw writing failed (code=0x%x, addr=0x%x)", code, addr);
-									break;
+									LOG_ERROR(LOADER, ".sceRefs: movw writing failed (ref_addr=0x%x, addr=0x%x)", code, code[1]);
+								}
+								else //if (Ini.HLELogging.GetValue())
+								{
+									LOG_NOTICE(LOADER, ".sceRefs: movw written at 0x%x (ref_addr=0x%x, data=0x%x)", code[1], code, data);
 								}
 
+								const u32 addr = *++code;
 								vm::psv::write16(addr + 0, vm::psv::read16(addr + 0) | (data & 0x800) >> 1 | (data & 0xf000) >> 12);
 								vm::psv::write16(addr + 2, vm::psv::read16(addr + 2) | (data & 0x700) << 4 | (data & 0xff));
-
-								//if (Ini.HLELogging.GetValue())
-								{
-									LOG_NOTICE(LOADER, ".sceRefs: movw written at 0x%x (data=0x%x)", addr, data);
-								}
 								break;
 							}
 							case 0x00000030: // movt r*,# instruction is replaced
 							{
-								const u32 addr = *++code;
-
 								if (!data)
 								{
-									LOG_ERROR(LOADER, ".sceRefs: movt writing failed (code=0x%x, addr=0x%x)", code, addr);
-									break;
+									LOG_ERROR(LOADER, ".sceRefs: movt writing failed (ref_addr=0x%x, addr=0x%x)", code, code[1]);
 								}
-								
+								else //if (Ini.HLELogging.GetValue())
+								{
+									LOG_NOTICE(LOADER, ".sceRefs: movt written at 0x%x (ref_addr=0x%x, data=0x%x)", code[1], code, data);
+								}
+
+								const u32 addr = *++code;
 								vm::psv::write16(addr + 0, vm::psv::read16(addr + 0) | (data & 0x8000000) >> 17 | (data & 0xf0000000) >> 28);
 								vm::psv::write16(addr + 2, vm::psv::read16(addr + 2) | (data & 0x7000000) >> 12 | (data & 0xff0000) >> 16);
-
-								//if (Ini.HLELogging.GetValue())
-								{
-									LOG_NOTICE(LOADER, ".sceRefs: movt written at 0x%x (data=0x%x)", addr, data);
-								}
 								break;
 							}
 							case 0x00000000:
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index ca94bcbcc5..fb672d63a6 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -335,7 +335,9 @@
     <ClInclude Include="Emu\ARMv7\ARMv7Thread.h" />
     <ClInclude Include="Emu\ARMv7\Modules\psv_event_flag.h" />
     <ClInclude Include="Emu\ARMv7\Modules\psv_sema.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\sceAppUtil.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceGxm.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\sceIme.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h" />
     <ClInclude Include="Emu\ARMv7\PSVFuncList.h" />
     <ClInclude Include="Emu\ARMv7\PSVObjectList.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index ba692d9a05..6e45634fea 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -1486,5 +1486,11 @@
     <ClInclude Include="Emu\ARMv7\Modules\sceGxm.h">
       <Filter>Emu\CPU\ARMv7\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\ARMv7\Modules\sceAppUtil.h">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\ARMv7\Modules\sceIme.h">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 35898a6cdf3d4afcff106342d31876eb305a3264 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 30 Jan 2015 02:58:53 +0300
Subject: [PATCH 55/70] Some functions added

---
 rpcs3/Emu/ARMv7/Modules/sceFiber.cpp    |  24 +-
 rpcs3/Emu/ARMv7/Modules/sceGxm.h        |   6 +-
 rpcs3/Emu/ARMv7/Modules/sceHttp.cpp     | 455 +++++++++++++++++++++---
 rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp     | 120 ++++++-
 rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp  |  89 ++++-
 rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp |  14 +-
 rpcs3/Emu/ARMv7/Modules/sceLocation.cpp | 202 ++++++++++-
 rpcs3/Emu/ARMv7/Modules/sceMd5.cpp      |  39 +-
 rpcs3/Emu/ARMv7/Modules/sceMotion.cpp   | 133 ++++++-
 rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp  |  21 +-
 rpcs3/Emu/ARMv7/PSVFuncList.h           |  16 +
 11 files changed, 997 insertions(+), 122 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp
index 8d21dc8f66..ab35f7a9be 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp
@@ -6,33 +6,37 @@ extern psv_log_base sceFiber;
 
 typedef vm::psv::ptr<void(u32 argOnInitialize, u32 argOnRun)> SceFiberEntry;
 
-union SceFiber
+struct SceFiber
 {
 	static const uint size = 128;
 	static const uint align = 8;
 	u64 padding[size / sizeof(u64)];
 };
 
-union SceFiberOptParam 
+struct SceFiberOptParam 
 {
 	static const uint size = 128;
 	static const uint align = 8;
 	u64 padding[size / sizeof(u64)];
 };
 
-union SceFiberInfo
+struct SceFiberInfo
 {
 	static const uint size = 128;
 	static const uint align = 8;
-	u64 padding[size / sizeof(u64)];
 
-	struct
+	union
 	{
-		SceFiberEntry entry;
-		u32 argOnInitialize;
-		vm::psv::ptr<void> addrContext;
-		s32 sizeContext;
-		char name[32];
+		u64 padding[size / sizeof(u64)];
+
+		struct
+		{
+			SceFiberEntry entry;
+			u32 argOnInitialize;
+			vm::psv::ptr<void> addrContext;
+			s32 sizeContext;
+			char name[32];
+		};
 	};
 };
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceGxm.h b/rpcs3/Emu/ARMv7/Modules/sceGxm.h
index 28cdac4daf..390c7ed1e7 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceGxm.h
+++ b/rpcs3/Emu/ARMv7/Modules/sceGxm.h
@@ -1002,9 +1002,9 @@ enum SceGxmColorMask : u8
 
 struct SceGxmBlendInfo
 {
-	SceGxmColorMask	colorMask;
-	SceGxmBlendFunc	colorFunc : 4;
-	SceGxmBlendFunc	alphaFunc : 4;
+	SceGxmColorMask colorMask;
+	SceGxmBlendFunc colorFunc : 4;
+	SceGxmBlendFunc alphaFunc : 4;
 	SceGxmBlendFactor colorSrc : 4;
 	SceGxmBlendFactor colorDst : 4;
 	SceGxmBlendFactor alphaSrc : 4;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp
index 4f23c935cd..814159303e 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp
@@ -4,6 +4,355 @@
 
 extern psv_log_base sceHttp;
 
+enum SceHttpHttpVersion : s32
+{
+	SCE_HTTP_VERSION_1_0 = 1,
+	SCE_HTTP_VERSION_1_1
+};
+
+enum SceHttpProxyMode : s32
+{
+	SCE_HTTP_PROXY_AUTO,
+	SCE_HTTP_PROXY_MANUAL
+};
+
+enum SceHttpAddHeaderMode : s32
+{
+	SCE_HTTP_HEADER_OVERWRITE,
+	SCE_HTTP_HEADER_ADD
+};
+
+enum SceHttpAuthType : s32
+{
+	SCE_HTTP_AUTH_BASIC,
+	SCE_HTTP_AUTH_DIGEST,
+	SCE_HTTP_AUTH_RESERVED0,
+	SCE_HTTP_AUTH_RESERVED1,
+	SCE_HTTP_AUTH_RESERVED2
+};
+
+typedef vm::psv::ptr<s32(s32 request, SceHttpAuthType authType, vm::psv::ptr<const char> realm, vm::psv::ptr<char> username, vm::psv::ptr<char> password, s32 needEntity, vm::psv::ptr<vm::psv::ptr<u8>> entityBody, vm::psv::ptr<u32> entitySize, vm::psv::ptr<s32> save, vm::psv::ptr<void> userArg)> SceHttpAuthInfoCallback;
+
+typedef vm::psv::ptr<s32(s32 request, s32 statusCode, vm::psv::ptr<s32> method, vm::psv::ptr<const char> location, vm::psv::ptr<void> userArg)> SceHttpRedirectCallback;
+
+struct SceHttpMemoryPoolStats
+{
+	u32 poolSize;
+	u32 maxInuseSize;
+	u32 currentInuseSize;
+	s32 reserved;
+};
+
+struct SceHttpUriElement
+{
+	s32 opaque;
+	vm::psv::ptr<char> scheme;
+	vm::psv::ptr<char> username;
+	vm::psv::ptr<char> password;
+	vm::psv::ptr<char> hostname;
+	vm::psv::ptr<char> path;
+	vm::psv::ptr<char> query;
+	vm::psv::ptr<char> fragment;
+	u16 port;
+	u8 reserved[10];
+};
+
+typedef vm::psv::ptr<s32(s32 request, vm::psv::ptr<const char> url, vm::psv::ptr<const char> cookieHeader, u32 headerLen, vm::psv::ptr<void> userArg)> SceHttpCookieRecvCallback;
+
+typedef vm::psv::ptr<s32(s32 request, vm::psv::ptr<const char> url, vm::psv::ptr<const char> cookieHeader, vm::psv::ptr<void> userArg)> SceHttpCookieSendCallback;
+
+struct SceSslCert;
+
+struct SceHttpsData
+{
+	vm::psv::ptr<char> ptr;
+	u32 size;
+};
+
+struct SceHttpsCaList
+{
+	vm::psv::ptr<vm::psv::ptr<SceSslCert>> caCerts;
+	s32 caNum;
+};
+
+typedef vm::psv::ptr<s32(u32 verifyEsrr, vm::psv::ptr<const vm::psv::ptr<SceSslCert>> sslCert, s32 certNum, vm::psv::ptr<void> userArg)> SceHttpsCallback;
+
+s32 sceHttpInit(u32 poolSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpTerm()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpGetMemoryPoolStats(vm::psv::ptr<SceHttpMemoryPoolStats> currentStat)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpCreateTemplate(vm::psv::ptr<const char> userAgent, s32 httpVer, s32 autoProxyConf)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpDeleteTemplate(s32 tmplId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpCreateConnection(s32 tmplId, vm::psv::ptr<const char> serverName, vm::psv::ptr<const char> scheme, u16 port, s32 enableKeepalive)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpCreateConnectionWithURL(s32 tmplId, vm::psv::ptr<const char> url, s32 enableKeepalive)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpDeleteConnection(s32 connId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpCreateRequest(s32 connId, s32 method, vm::psv::ptr<const char> path, u64 contentLength)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpCreateRequestWithURL(s32 connId, s32 method, vm::psv::ptr<const char> url, u64 contentLength)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpDeleteRequest(s32 reqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetResponseHeaderMaxSize(s32 id, u32 headerSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetRecvBlockSize(s32 id, u32 blockSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetRequestContentLength(s32 id, u64 contentLength)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSendRequest(s32 reqId, vm::psv::ptr<const void> postData, u32 size)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpAbortRequest(s32 reqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpGetResponseContentLength(s32 reqId, vm::psv::ptr<u64> contentLength)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpGetStatusCode(s32 reqId, vm::psv::ptr<s32> statusCode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpGetAllResponseHeaders(s32 reqId, vm::psv::ptr<vm::psv::ptr<char>> header, vm::psv::ptr<u32> headerSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpReadData(s32 reqId, vm::psv::ptr<void> data, u32 size)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpAddRequestHeader(s32 id, vm::psv::ptr<const char> name, vm::psv::ptr<const char> value, u32 mode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpRemoveRequestHeader(s32 id, vm::psv::ptr<const char> name)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpParseResponseHeader(vm::psv::ptr<const char> header, u32 headerLen, vm::psv::ptr<const char> fieldStr, vm::psv::ptr<vm::psv::ptr<const char>> fieldValue, vm::psv::ptr<u32> valueLen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpParseStatusLine(vm::psv::ptr<const char> statusLine, u32 lineLen, vm::psv::ptr<s32> httpMajorVer, vm::psv::ptr<s32> httpMinorVer, vm::psv::ptr<s32> responseCode, vm::psv::ptr<vm::psv::ptr<const char>> reasonPhrase, vm::psv::ptr<u32> phraseLen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetAuthInfoCallback(s32 id, SceHttpAuthInfoCallback cbfunc, vm::psv::ptr<void> userArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetAuthEnabled(s32 id, s32 enable)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpGetAuthEnabled(s32 id, vm::psv::ptr<s32> enable)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetRedirectCallback(s32 id, SceHttpRedirectCallback cbfunc, vm::psv::ptr<void> userArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetAutoRedirect(s32 id, s32 enable)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpGetAutoRedirect(s32 id, vm::psv::ptr<s32> enable)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetResolveTimeOut(s32 id, u32 usec)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetResolveRetry(s32 id, s32 retry)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetConnectTimeOut(s32 id, u32 usec)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetSendTimeOut(s32 id, u32 usec)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetRecvTimeOut(s32 id, u32 usec)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpUriEscape(vm::psv::ptr<char> out, vm::psv::ptr<u32> require, u32 prepare, vm::psv::ptr<const char> in)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpUriUnescape(vm::psv::ptr<char> out, vm::psv::ptr<u32> require, u32 prepare, vm::psv::ptr<const char> in)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpUriParse(vm::psv::ptr<SceHttpUriElement> out, vm::psv::ptr<const char> srcUrl, vm::psv::ptr<void> pool, vm::psv::ptr<u32> require, u32 prepare)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpUriBuild(vm::psv::ptr<char> out, vm::psv::ptr<u32> require, u32 prepare, vm::psv::ptr<const SceHttpUriElement> srcElement, u32 option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpUriMerge(vm::psv::ptr<char> mergedUrl, vm::psv::ptr<const char> url, vm::psv::ptr<const char> relativeUrl, vm::psv::ptr<u32> require, u32 prepare, u32 option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpUriSweepPath(vm::psv::ptr<char> dst, vm::psv::ptr<const char> src, u32 srcSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetCookieEnabled(s32 id, s32 enable)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpGetCookieEnabled(s32 id, vm::psv::ptr<s32> enable)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpGetCookie(vm::psv::ptr<const char> url, vm::psv::ptr<char> cookie, vm::psv::ptr<u32> cookieLength, u32 prepare, s32 secure)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpAddCookie(vm::psv::ptr<const char> url, vm::psv::ptr<const char> cookie, u32 cookieLength)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetCookieRecvCallback(s32 id, SceHttpCookieRecvCallback cbfunc, vm::psv::ptr<void> userArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpSetCookieSendCallback(s32 id, SceHttpCookieSendCallback cbfunc, vm::psv::ptr<void> userArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpsLoadCert(s32 caCertNum, vm::psv::ptr<vm::psv::ptr<const SceHttpsData>> caList, vm::psv::ptr<const SceHttpsData> cert, vm::psv::ptr<const SceHttpsData> privKey)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpsUnloadCert()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpsEnableOption(u32 sslFlags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpsDisableOption(u32 sslFlags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpsGetSslError(s32 id, vm::psv::ptr<s32> errNum, vm::psv::ptr<u32> detail)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpsSetSslCallback(s32 id, SceHttpsCallback cbfunc, vm::psv::ptr<void> userArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpsGetCaList(vm::psv::ptr<SceHttpsCaList> caList)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceHttpsFreeCaList(vm::psv::ptr<SceHttpsCaList> caList)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceHttp, #name, name)
 
 psv_log_base sceHttp("SceHttp", []()
@@ -12,45 +361,45 @@ psv_log_base sceHttp("SceHttp", []()
 	sceHttp.on_unload = nullptr;
 	sceHttp.on_stop = nullptr;
 
-	//REG_FUNC(0x214926D9, sceHttpInit);
-	//REG_FUNC(0xC9076666, sceHttpTerm);
-	//REG_FUNC(0xF98CDFA9, sceHttpGetMemoryPoolStats);
-	//REG_FUNC(0x62241DAB, sceHttpCreateTemplate);
-	//REG_FUNC(0xEC85ECFB, sceHttpDeleteTemplate);
-	//REG_FUNC(0xC616C200, sceHttpCreateConnectionWithURL);
-	//REG_FUNC(0xAEB3307E, sceHttpCreateConnection);
-	//REG_FUNC(0xF0F65C15, sceHttpDeleteConnection);
-	//REG_FUNC(0xBD5DA1D0, sceHttpCreateRequestWithURL);
-	//REG_FUNC(0xB0284270, sceHttpCreateRequest);
-	//REG_FUNC(0x3D3D29AD, sceHttpDeleteRequest);
-	//REG_FUNC(0x9CA58B99, sceHttpSendRequest);
-	//REG_FUNC(0x7EDE3979, sceHttpReadData);
-	//REG_FUNC(0xF580D304, sceHttpGetResponseContentLength);
-	//REG_FUNC(0x27071691, sceHttpGetStatusCode);
-	//REG_FUNC(0xEA61662F, sceHttpAbortRequest);
-	//REG_FUNC(0x7B51B122, sceHttpAddRequestHeader);
-	//REG_FUNC(0x5EB5F548, sceHttpRemoveRequestHeader);
-	//REG_FUNC(0x11F6C27F, sceHttpGetAllResponseHeaders);
-	//REG_FUNC(0x03A6C89E, sceHttpParseResponseHeader);
-	//REG_FUNC(0x179C56DB, sceHttpParseStatusLine);
-	//REG_FUNC(0x1DA2A673, sceHttpUriEscape);
-	//REG_FUNC(0x1274D318, sceHttpUriUnescape);
-	//REG_FUNC(0x1D45F24E, sceHttpUriParse);
-	//REG_FUNC(0x47664424, sceHttpUriBuild);
-	//REG_FUNC(0x75027D1D, sceHttpUriMerge);
-	//REG_FUNC(0x50737A3F, sceHttpUriSweepPath);
-	//REG_FUNC(0x37C30C90, sceHttpSetRequestContentLength);
-	//REG_FUNC(0x11EC42D0, sceHttpSetAuthEnabled);
-	//REG_FUNC(0x6727874C, sceHttpGetAuthEnabled);
-	//REG_FUNC(0x34891C3F, sceHttpSetAutoRedirect);
-	//REG_FUNC(0x6EAD73EB, sceHttpGetAutoRedirect);
-	//REG_FUNC(0xE0A3A88D, sceHttpSetAuthInfoCallback);
-	//REG_FUNC(0x4E08167D, sceHttpSetRedirectCallback);
-	//REG_FUNC(0x8455B5B3, sceHttpSetResolveTimeOut);
-	//REG_FUNC(0x9AB56EA7, sceHttpSetResolveRetry);
-	//REG_FUNC(0x237CA86E, sceHttpSetConnectTimeOut);
-	//REG_FUNC(0x8AE3F008, sceHttpSetSendTimeOut);
-	//REG_FUNC(0x94BF196E, sceHttpSetRecvTimeOut);
+	REG_FUNC(0x214926D9, sceHttpInit);
+	REG_FUNC(0xC9076666, sceHttpTerm);
+	REG_FUNC(0xF98CDFA9, sceHttpGetMemoryPoolStats);
+	REG_FUNC(0x62241DAB, sceHttpCreateTemplate);
+	REG_FUNC(0xEC85ECFB, sceHttpDeleteTemplate);
+	REG_FUNC(0xC616C200, sceHttpCreateConnectionWithURL);
+	REG_FUNC(0xAEB3307E, sceHttpCreateConnection);
+	REG_FUNC(0xF0F65C15, sceHttpDeleteConnection);
+	REG_FUNC(0xBD5DA1D0, sceHttpCreateRequestWithURL);
+	REG_FUNC(0xB0284270, sceHttpCreateRequest);
+	REG_FUNC(0x3D3D29AD, sceHttpDeleteRequest);
+	REG_FUNC(0x9CA58B99, sceHttpSendRequest);
+	REG_FUNC(0x7EDE3979, sceHttpReadData);
+	REG_FUNC(0xF580D304, sceHttpGetResponseContentLength);
+	REG_FUNC(0x27071691, sceHttpGetStatusCode);
+	REG_FUNC(0xEA61662F, sceHttpAbortRequest);
+	REG_FUNC(0x7B51B122, sceHttpAddRequestHeader);
+	REG_FUNC(0x5EB5F548, sceHttpRemoveRequestHeader);
+	REG_FUNC(0x11F6C27F, sceHttpGetAllResponseHeaders);
+	REG_FUNC(0x03A6C89E, sceHttpParseResponseHeader);
+	REG_FUNC(0x179C56DB, sceHttpParseStatusLine);
+	REG_FUNC(0x1DA2A673, sceHttpUriEscape);
+	REG_FUNC(0x1274D318, sceHttpUriUnescape);
+	REG_FUNC(0x1D45F24E, sceHttpUriParse);
+	REG_FUNC(0x47664424, sceHttpUriBuild);
+	REG_FUNC(0x75027D1D, sceHttpUriMerge);
+	REG_FUNC(0x50737A3F, sceHttpUriSweepPath);
+	REG_FUNC(0x37C30C90, sceHttpSetRequestContentLength);
+	REG_FUNC(0x11EC42D0, sceHttpSetAuthEnabled);
+	REG_FUNC(0x6727874C, sceHttpGetAuthEnabled);
+	REG_FUNC(0x34891C3F, sceHttpSetAutoRedirect);
+	REG_FUNC(0x6EAD73EB, sceHttpGetAutoRedirect);
+	REG_FUNC(0xE0A3A88D, sceHttpSetAuthInfoCallback);
+	REG_FUNC(0x4E08167D, sceHttpSetRedirectCallback);
+	REG_FUNC(0x8455B5B3, sceHttpSetResolveTimeOut);
+	REG_FUNC(0x9AB56EA7, sceHttpSetResolveRetry);
+	REG_FUNC(0x237CA86E, sceHttpSetConnectTimeOut);
+	REG_FUNC(0x8AE3F008, sceHttpSetSendTimeOut);
+	REG_FUNC(0x94BF196E, sceHttpSetRecvTimeOut);
 	//REG_FUNC(0x27A98BDA, sceHttpSetNonblock);
 	//REG_FUNC(0xD65746BC, sceHttpGetNonblock);
 	//REG_FUNC(0x5CEB6554, sceHttpSetEpollId);
@@ -61,22 +410,22 @@ psv_log_base sceHttp("SceHttp", []()
 	//REG_FUNC(0xCFB1DA4B, sceHttpUnsetEpoll);
 	//REG_FUNC(0x65FE983F, sceHttpGetEpoll);
 	//REG_FUNC(0x07D9F8BB, sceHttpDestroyEpoll);
-	//REG_FUNC(0xAEE573A3, sceHttpSetCookieEnabled);
-	//REG_FUNC(0x1B6EF66E, sceHttpGetCookieEnabled);
-	//REG_FUNC(0x70220BFA, sceHttpGetCookie);
-	//REG_FUNC(0xBEDB988D, sceHttpAddCookie);
+	REG_FUNC(0xAEE573A3, sceHttpSetCookieEnabled);
+	REG_FUNC(0x1B6EF66E, sceHttpGetCookieEnabled);
+	REG_FUNC(0x70220BFA, sceHttpGetCookie);
+	REG_FUNC(0xBEDB988D, sceHttpAddCookie);
 	//REG_FUNC(0x4259FB9E, sceHttpCookieExport);
 	//REG_FUNC(0x9DF48282, sceHttpCookieImport);
-	//REG_FUNC(0xD4F32A23, sceHttpSetCookieRecvCallback);
-	//REG_FUNC(0x11C03867, sceHttpSetCookieSendCallback);
-	//REG_FUNC(0xAE8D7C33, sceHttpsLoadCert);
-	//REG_FUNC(0x8577833F, sceHttpsUnloadCert);
-	//REG_FUNC(0x9FBE2869, sceHttpsEnableOption);
-	//REG_FUNC(0xC6D60403, sceHttpsDisableOption);
+	REG_FUNC(0xD4F32A23, sceHttpSetCookieRecvCallback);
+	REG_FUNC(0x11C03867, sceHttpSetCookieSendCallback);
+	REG_FUNC(0xAE8D7C33, sceHttpsLoadCert);
+	REG_FUNC(0x8577833F, sceHttpsUnloadCert);
+	REG_FUNC(0x9FBE2869, sceHttpsEnableOption);
+	REG_FUNC(0xC6D60403, sceHttpsDisableOption);
 	//REG_FUNC(0x72CB0741, sceHttpsEnableOptionPrivate);
 	//REG_FUNC(0x00659635, sceHttpsDisableOptionPrivate);
-	//REG_FUNC(0x2B79BDE0, sceHttpsGetSslError);
-	//REG_FUNC(0xA0926037, sceHttpsSetSslCallback);
-	//REG_FUNC(0xF71AA58D, sceHttpsGetCaList);
-	//REG_FUNC(0x56C95D94, sceHttpsFreeCaList);
+	REG_FUNC(0x2B79BDE0, sceHttpsGetSslError);
+	REG_FUNC(0xA0926037, sceHttpsSetSslCallback);
+	REG_FUNC(0xF71AA58D, sceHttpsGetCaList);
+	REG_FUNC(0x56C95D94, sceHttpsFreeCaList);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp b/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp
index 5ec6f79614..06e8e0ec00 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceJpeg.cpp
@@ -4,6 +4,108 @@
 
 extern psv_log_base sceJpeg;
 
+struct SceJpegOutputInfo
+{
+	s32 colorSpace;
+	u16 imageWidth;
+	u16 imageHeight;
+	u32 outputBufferSize;
+	u32 tempBufferSize;
+	u32 coefBufferSize;
+
+	struct { u32 x, y; } pitch[4];
+};
+
+struct SceJpegSplitDecodeCtrl
+{
+	vm::psv::ptr<u8> pStreamBuffer;
+	u32 streamBufferSize;
+	vm::psv::ptr<u8> pWriteBuffer;
+	u32 writeBufferSize;
+	s32 isEndOfStream;
+	s32 decodeMode;
+
+	SceJpegOutputInfo outputInfo;
+
+	vm::psv::ptr<void> pOutputBuffer;
+	vm::psv::ptr<void> pCoefBuffer;
+
+	u32 internalData[3];
+};
+
+s32 sceJpegInitMJpeg(s32 maxSplitDecoder)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegFinishMJpeg()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegDecodeMJpeg(
+	vm::psv::ptr<const u8> pJpeg,
+	u32 isize,
+	vm::psv::ptr<void> pRGBA,
+	u32 osize,
+	s32 decodeMode,
+	vm::psv::ptr<void> pTempBuffer,
+	u32 tempBufferSize,
+	vm::psv::ptr<void> pCoefBuffer,
+	u32 coefBufferSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegDecodeMJpegYCbCr(
+	vm::psv::ptr<const u8> pJpeg,
+	u32 isize,
+	vm::psv::ptr<u8> pYCbCr,
+	u32 osize,
+	s32 decodeMode,
+	vm::psv::ptr<void> pCoefBuffer,
+	u32 coefBufferSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegMJpegCsc(
+	vm::psv::ptr<void> pRGBA,
+	vm::psv::ptr<const u8> pYCbCr,
+	s32 xysize,
+	s32 iFrameWidth,
+	s32 colorOption,
+	s32 sampling)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegGetOutputInfo(
+	vm::psv::ptr<const u8> pJpeg,
+	u32 isize,
+	s32 outputFormat,
+	s32 decodeMode,
+	vm::psv::ptr<SceJpegOutputInfo> pOutputInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegCreateSplitDecoder(vm::psv::ptr<SceJpegSplitDecodeCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegDeleteSplitDecoder(vm::psv::ptr<SceJpegSplitDecodeCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegSplitDecodeMJpeg(vm::psv::ptr<SceJpegSplitDecodeCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceJpeg, #name, name)
 
 psv_log_base sceJpeg("SceJpeg", []()
@@ -12,13 +114,13 @@ psv_log_base sceJpeg("SceJpeg", []()
 	sceJpeg.on_unload = nullptr;
 	sceJpeg.on_stop = nullptr;
 
-	//REG_FUNC(0xB030773B, sceJpegInitMJpeg);
-	//REG_FUNC(0x62842598, sceJpegFinishMJpeg);
-	//REG_FUNC(0x6215B095, sceJpegDecodeMJpeg);
-	//REG_FUNC(0x2A769BD8, sceJpegDecodeMJpegYCbCr);
-	//REG_FUNC(0xC2380E3A, sceJpegMJpegCsc);
-	//REG_FUNC(0x353BA9B0, sceJpegGetOutputInfo);
-	//REG_FUNC(0x123B4734, sceJpegCreateSplitDecoder);
-	//REG_FUNC(0xDE8D5FA1, sceJpegDeleteSplitDecoder);
-	//REG_FUNC(0x4598EC9C, sceJpegSplitDecodeMJpeg);
+	REG_FUNC(0xB030773B, sceJpegInitMJpeg);
+	REG_FUNC(0x62842598, sceJpegFinishMJpeg);
+	REG_FUNC(0x6215B095, sceJpegDecodeMJpeg);
+	REG_FUNC(0x2A769BD8, sceJpegDecodeMJpegYCbCr);
+	REG_FUNC(0xC2380E3A, sceJpegMJpegCsc);
+	REG_FUNC(0x353BA9B0, sceJpegGetOutputInfo);
+	REG_FUNC(0x123B4734, sceJpegCreateSplitDecoder);
+	REG_FUNC(0xDE8D5FA1, sceJpegDeleteSplitDecoder);
+	REG_FUNC(0x4598EC9C, sceJpegSplitDecodeMJpeg);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp b/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp
index 1567f5487d..690afd9e04 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceJpegEnc.cpp
@@ -4,6 +4,77 @@
 
 extern psv_log_base sceJpegEnc;
 
+typedef vm::psv::ptr<void> SceJpegEncoderContext;
+
+s32 sceJpegEncoderGetContextSize()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegEncoderInit(
+	SceJpegEncoderContext context,
+	s32 iFrameWidth,
+	s32 iFrameHeight,
+	s32 pixelFormat,
+	vm::psv::ptr<void> pJpeg,
+	u32 oJpegbufSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegEncoderEncode(
+	SceJpegEncoderContext context,
+	vm::psv::ptr<const void> pYCbCr)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegEncoderEnd(SceJpegEncoderContext context)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegEncoderSetValidRegion(
+	SceJpegEncoderContext context,
+	s32 iFrameWidth,
+	s32 iFrameHeight)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegEncoderSetCompressionRatio(
+	SceJpegEncoderContext context,
+	s32 compratio)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegEncoderSetHeaderMode(
+	SceJpegEncoderContext context,
+	s32 headerMode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegEncoderSetOutputAddr(
+	SceJpegEncoderContext context,
+	vm::psv::ptr<void> pJpeg,
+	u32 oJpegbufSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceJpegEncoderCsc(
+	SceJpegEncoderContext context,
+	vm::psv::ptr<void> pYCbCr,
+	vm::psv::ptr<const void> pRGBA,
+	s32 iFrameWidth,
+	s32 inputPixelFormat)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceJpegEnc, #name, name)
 
 psv_log_base sceJpegEnc("SceJpegEnc", []()
@@ -12,13 +83,13 @@ psv_log_base sceJpegEnc("SceJpegEnc", []()
 	sceJpegEnc.on_unload = nullptr;
 	sceJpegEnc.on_stop = nullptr;
 
-	//REG_FUNC(0x2B55844D, sceJpegEncoderGetContextSize);
-	//REG_FUNC(0x88DA92B4, sceJpegEncoderInit);
-	//REG_FUNC(0xC60DE94C, sceJpegEncoderEncode);
-	//REG_FUNC(0xC87AA849, sceJpegEncoderEnd);
-	//REG_FUNC(0x9511F3BC, sceJpegEncoderSetValidRegion);
-	//REG_FUNC(0xB2B828EC, sceJpegEncoderSetCompressionRatio);
-	//REG_FUNC(0x2F58B12C, sceJpegEncoderSetHeaderMode);
-	//REG_FUNC(0x25D52D97, sceJpegEncoderSetOutputAddr);
-	//REG_FUNC(0x824A7D4F, sceJpegEncoderCsc);
+	REG_FUNC(0x2B55844D, sceJpegEncoderGetContextSize);
+	REG_FUNC(0x88DA92B4, sceJpegEncoderInit);
+	REG_FUNC(0xC60DE94C, sceJpegEncoderEncode);
+	REG_FUNC(0xC87AA849, sceJpegEncoderEnd);
+	REG_FUNC(0x9511F3BC, sceJpegEncoderSetValidRegion);
+	REG_FUNC(0xB2B828EC, sceJpegEncoderSetCompressionRatio);
+	REG_FUNC(0x2F58B12C, sceJpegEncoderSetHeaderMode);
+	REG_FUNC(0x25D52D97, sceJpegEncoderSetOutputAddr);
+	REG_FUNC(0x824A7D4F, sceJpegEncoderCsc);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp b/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp
index 4511ca2ae7..62eea18429 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLiveArea.cpp
@@ -4,6 +4,16 @@
 
 extern psv_log_base sceLiveArea;
 
+s32 sceLiveAreaResourceReplaceAll(vm::psv::ptr<const char> dirpath)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLiveAreaResourceGetStatus()
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLiveArea, #name, name)
 
 psv_log_base sceLiveArea("SceLiveArea", []()
@@ -12,6 +22,6 @@ psv_log_base sceLiveArea("SceLiveArea", []()
 	sceLiveArea.on_unload = nullptr;
 	sceLiveArea.on_stop = nullptr;
 
-	//REG_FUNC(0xA4B506F9, sceLiveAreaResourceReplaceAll);
-	//REG_FUNC(0x54A395FB, sceLiveAreaResourceGetStatus);
+	REG_FUNC(0xA4B506F9, sceLiveAreaResourceReplaceAll);
+	REG_FUNC(0x54A395FB, sceLiveAreaResourceGetStatus);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp b/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp
index 734f7f62e1..8b61bca224 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLocation.cpp
@@ -4,6 +4,174 @@
 
 extern psv_log_base sceLocation;
 
+typedef u8 SceLocationHandle;
+
+enum SceLocationLocationMethod : s32
+{
+	SCE_LOCATION_LMETHOD_NONE = 0,
+	SCE_LOCATION_LMETHOD_AGPS_AND_3G_AND_WIFI = 1,
+	SCE_LOCATION_LMETHOD_GPS_AND_WIFI = 2,
+	SCE_LOCATION_LMETHOD_WIFI = 3,
+	SCE_LOCATION_LMETHOD_3G = 4,
+	SCE_LOCATION_LMETHOD_GPS = 5
+};
+
+enum SceLocationHeadingMethod : s32
+{
+	SCE_LOCATION_HMETHOD_NONE = 0,
+	SCE_LOCATION_HMETHOD_AUTO = 1,
+	SCE_LOCATION_HMETHOD_VERTICAL = 2,
+	SCE_LOCATION_HMETHOD_HORIZONTAL = 3,
+	SCE_LOCATION_HMETHOD_CAMERA = 4
+};
+
+enum SceLocationDialogStatus : s32
+{
+	SCE_LOCATION_DIALOG_STATUS_IDLE = 0,
+	SCE_LOCATION_DIALOG_STATUS_RUNNING = 1,
+	SCE_LOCATION_DIALOG_STATUS_FINISHED = 2
+};
+
+enum SceLocationDialogResult : s32
+{
+	SCE_LOCATION_DIALOG_RESULT_NONE = 0,
+	SCE_LOCATION_DIALOG_RESULT_DISABLE = 1,
+	SCE_LOCATION_DIALOG_RESULT_ENABLE = 2
+};
+
+enum SceLocationPermissionApplicationStatus : s32
+{
+	SCE_LOCATION_PERMISSION_APPLICATION_NONE = 0,
+	SCE_LOCATION_PERMISSION_APPLICATION_INIT = 1,
+	SCE_LOCATION_PERMISSION_APPLICATION_DENY = 2,
+	SCE_LOCATION_PERMISSION_APPLICATION_ALLOW = 3
+};
+
+enum SceLocationPermissionStatus : s32
+{
+	SCE_LOCATION_PERMISSION_DENY = 0,
+	SCE_LOCATION_PERMISSION_ALLOW = 1
+};
+
+struct SceLocationLocationInfo
+{
+	double latitude;
+	double longitude;
+	double altitude;
+	float accuracy;
+	float reserve;
+	float direction;
+	float speed;
+	u64 timestamp;
+};
+
+struct SceLocationHeadingInfo
+{
+	float trueHeading;
+	float headingVectorX;
+	float headingVectorY;
+	float headingVectorZ;
+	float reserve;
+	float reserve2;
+	u64 timestamp;
+};
+
+typedef vm::psv::ptr<void(s32 result, SceLocationHandle handle, vm::psv::ptr<const SceLocationLocationInfo> location, vm::psv::ptr<void> userdata)> SceLocationLocationInfoCallback;
+typedef vm::psv::ptr<void(s32 result, SceLocationHandle handle, vm::psv::ptr<const SceLocationHeadingInfo> heading, vm::psv::ptr<void> userdata)> SceLocationHeadingInfoCallback;
+
+struct SceLocationPermissionInfo
+{
+	SceLocationPermissionStatus parentalstatus;
+	SceLocationPermissionStatus mainstatus;
+	SceLocationPermissionApplicationStatus applicationstatus;
+};
+
+s32 sceLocationOpen(vm::psv::ptr<SceLocationHandle> handle, SceLocationLocationMethod lmethod, SceLocationHeadingMethod hmethod)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationClose(SceLocationHandle handle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationReopen(SceLocationHandle handle, SceLocationLocationMethod lmethod, SceLocationHeadingMethod hmethod)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationGetMethod(SceLocationHandle handle, vm::psv::ptr<SceLocationLocationMethod> lmethod, vm::psv::ptr<SceLocationHeadingMethod> hmethod)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationGetLocation(SceLocationHandle handle, vm::psv::ptr<SceLocationLocationInfo> linfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationCancelGetLocation(SceLocationHandle handle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationStartLocationCallback(SceLocationHandle handle, u32 distance, SceLocationLocationInfoCallback callback, vm::psv::ptr<void> userdata)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationStopLocationCallback(SceLocationHandle handle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationGetHeading(SceLocationHandle handle, vm::psv::ptr<SceLocationHeadingInfo> hinfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationStartHeadingCallback(SceLocationHandle handle, u32 difference, SceLocationHeadingInfoCallback callback, vm::psv::ptr<void> userdata)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationStopHeadingCallback(SceLocationHandle handle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationConfirm(SceLocationHandle handle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationConfirmGetStatus(SceLocationHandle handle, vm::psv::ptr<SceLocationDialogStatus> status)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationConfirmGetResult(SceLocationHandle handle, vm::psv::ptr<SceLocationDialogResult> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationConfirmAbort(SceLocationHandle handle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationGetPermission(SceLocationHandle handle, vm::psv::ptr<SceLocationPermissionInfo> info)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceLocationSetGpsEmulationFile(vm::psv::ptr<char> filename)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceLocation, #name, name)
 
 psv_log_base sceLocation("SceLibLocation", []()
@@ -12,23 +180,23 @@ psv_log_base sceLocation("SceLibLocation", []()
 	sceLocation.on_unload = nullptr;
 	sceLocation.on_stop = nullptr;
 
-	//REG_FUNC(0xDD271661, sceLocationOpen);
-	//REG_FUNC(0x14FE76E8, sceLocationClose);
-	//REG_FUNC(0xB1F55065, sceLocationReopen);
-	//REG_FUNC(0x188CE004, sceLocationGetMethod);
-	//REG_FUNC(0x15BC27C8, sceLocationGetLocation);
-	//REG_FUNC(0x71503251, sceLocationCancelGetLocation);
-	//REG_FUNC(0x12D1F0EA, sceLocationStartLocationCallback);
-	//REG_FUNC(0xED378700, sceLocationStopLocationCallback);
-	//REG_FUNC(0x4E9E5ED9, sceLocationGetHeading);
-	//REG_FUNC(0x07D4DFE0, sceLocationStartHeadingCallback);
-	//REG_FUNC(0x92E53F94, sceLocationStopHeadingCallback);
+	REG_FUNC(0xDD271661, sceLocationOpen);
+	REG_FUNC(0x14FE76E8, sceLocationClose);
+	REG_FUNC(0xB1F55065, sceLocationReopen);
+	REG_FUNC(0x188CE004, sceLocationGetMethod);
+	REG_FUNC(0x15BC27C8, sceLocationGetLocation);
+	REG_FUNC(0x71503251, sceLocationCancelGetLocation);
+	REG_FUNC(0x12D1F0EA, sceLocationStartLocationCallback);
+	REG_FUNC(0xED378700, sceLocationStopLocationCallback);
+	REG_FUNC(0x4E9E5ED9, sceLocationGetHeading);
+	REG_FUNC(0x07D4DFE0, sceLocationStartHeadingCallback);
+	REG_FUNC(0x92E53F94, sceLocationStopHeadingCallback);
 	//REG_FUNC(0xE055BCF5, sceLocationSetHeapAllocator);
-	//REG_FUNC(0xC895E567, sceLocationConfirm);
-	//REG_FUNC(0x730FF842, sceLocationConfirmGetStatus);
-	//REG_FUNC(0xFF016C13, sceLocationConfirmGetResult);
-	//REG_FUNC(0xE3CBF875, sceLocationConfirmAbort);
-	//REG_FUNC(0x482622C6, sceLocationGetPermission);
-	//REG_FUNC(0xDE0A9EA4, sceLocationSetGpsEmulationFile);
+	REG_FUNC(0xC895E567, sceLocationConfirm);
+	REG_FUNC(0x730FF842, sceLocationConfirmGetStatus);
+	REG_FUNC(0xFF016C13, sceLocationConfirmGetResult);
+	REG_FUNC(0xE3CBF875, sceLocationConfirmAbort);
+	REG_FUNC(0x482622C6, sceLocationGetPermission);
+	REG_FUNC(0xDE0A9EA4, sceLocationSetGpsEmulationFile);
 	//REG_FUNC(0x760D08FF, sceLocationConfirmSetMessage);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp b/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp
index aed0422ed4..d31e193e81 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceMd5.cpp
@@ -4,6 +4,37 @@
 
 extern psv_log_base sceMd5;
 
+struct SceMd5Context
+{
+	u32 h[4];
+	u32 pad;
+	u16 usRemains;
+	u16 usComputed;
+	u64 ullTotalLen;
+	u8 buf[64];
+	u8 result[64];
+};
+
+s32 sceMd5Digest(vm::psv::ptr<const void> plain, u32 len, vm::psv::ptr<u8> digest)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMd5BlockInit(vm::psv::ptr<SceMd5Context> pContext)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMd5BlockUpdate(vm::psv::ptr<SceMd5Context> pContext, vm::psv::ptr<const void> plain, u32 len)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMd5BlockResult(vm::psv::ptr<SceMd5Context> pContext, vm::psv::ptr<u8> digest)
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceMd5, #name, name)
 
 psv_log_base sceMd5("SceMd5", []()
@@ -12,8 +43,8 @@ psv_log_base sceMd5("SceMd5", []()
 	sceMd5.on_unload = nullptr;
 	sceMd5.on_stop = nullptr;
 
-	//REG_FUNC(0xB845BCCB, sceMd5Digest);
-	//REG_FUNC(0x4D6436F9, sceMd5BlockInit);
-	//REG_FUNC(0x094A4902, sceMd5BlockUpdate);
-	//REG_FUNC(0xB94ABF83, sceMd5BlockResult);
+	REG_FUNC(0xB845BCCB, sceMd5Digest);
+	REG_FUNC(0x4D6436F9, sceMd5BlockInit);
+	REG_FUNC(0x094A4902, sceMd5BlockUpdate);
+	REG_FUNC(0xB94ABF83, sceMd5BlockResult);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp b/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp
index bc86726bb2..4128c78a65 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceMotion.cpp
@@ -4,6 +4,113 @@
 
 extern psv_log_base sceMotion;
 
+struct SceMotionState
+{
+	u32 timestamp;
+	SceFVector3 acceleration;
+	SceFVector3 angularVelocity;
+	u8 reserve1[12];
+	SceFQuaternion deviceQuat;
+	SceUMatrix4 rotationMatrix;
+	SceUMatrix4 nedMatrix;
+	u8 reserve2[4];
+	SceFVector3 basicOrientation;
+	u64 hostTimestamp;
+	u8 reserve3[40];
+};
+
+struct SceMotionSensorState
+{
+	SceFVector3 accelerometer;
+	SceFVector3 gyro;
+	u8 reserve1[12];
+	u32 timestamp;
+	u32 counter;
+	u8 reserve2[4];
+	u64 hostTimestamp;
+	u8 reserve3[8];
+};
+
+s32 sceMotionGetState(vm::psv::ptr<SceMotionState> motionState)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMotionGetSensorState(vm::psv::ptr<SceMotionSensorState> sensorState, s32 numRecords)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMotionGetBasicOrientation(vm::psv::ptr<SceFVector3> basicOrientation)
+{
+	throw __FUNCTION__;
+}
+
+//s32 sceMotionRotateYaw(const float radians)
+//{
+//	throw __FUNCTION__;
+//}
+
+s32 sceMotionGetTiltCorrection()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMotionSetTiltCorrection(s32 setValue)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMotionGetDeadband()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMotionSetDeadband(s32 setValue)
+{
+	throw __FUNCTION__;
+}
+
+//s32 sceMotionSetAngleThreshold(const float angle)
+//{
+//	throw __FUNCTION__;
+//}
+
+//float sceMotionGetAngleThreshold()
+//{
+//	throw __FUNCTION__;
+//}
+
+s32 sceMotionReset()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMotionMagnetometerOn()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMotionMagnetometerOff()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMotionGetMagnetometerState()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMotionStartSampling()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceMotionStopSampling()
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceMotion, #name, name)
 
 psv_log_base sceMotion("SceMotion", []()
@@ -12,20 +119,20 @@ psv_log_base sceMotion("SceMotion", []()
 	sceMotion.on_unload = nullptr;
 	sceMotion.on_stop = nullptr;
 
-	//REG_FUNC(0xBDB32767, sceMotionGetState);
-	//REG_FUNC(0x47D679EA, sceMotionGetSensorState);
-	//REG_FUNC(0xC1652201, sceMotionGetTiltCorrection);
-	//REG_FUNC(0xAF09FCDB, sceMotionSetTiltCorrection);
-	//REG_FUNC(0x112E0EAE, sceMotionGetDeadband);
-	//REG_FUNC(0x917EA390, sceMotionSetDeadband);
+	REG_FUNC(0xBDB32767, sceMotionGetState);
+	REG_FUNC(0x47D679EA, sceMotionGetSensorState);
+	REG_FUNC(0xC1652201, sceMotionGetTiltCorrection);
+	REG_FUNC(0xAF09FCDB, sceMotionSetTiltCorrection);
+	REG_FUNC(0x112E0EAE, sceMotionGetDeadband);
+	REG_FUNC(0x917EA390, sceMotionSetDeadband);
 	//REG_FUNC(0x20F00078, sceMotionRotateYaw);
-	//REG_FUNC(0x0FD2CDA2, sceMotionReset);
-	//REG_FUNC(0x28034AC9, sceMotionStartSampling);
-	//REG_FUNC(0xAF32CB1D, sceMotionStopSampling);
+	REG_FUNC(0x0FD2CDA2, sceMotionReset);
+	REG_FUNC(0x28034AC9, sceMotionStartSampling);
+	REG_FUNC(0xAF32CB1D, sceMotionStopSampling);
 	//REG_FUNC(0xDACB2A41, sceMotionSetAngleThreshold);
 	//REG_FUNC(0x499B6C87, sceMotionGetAngleThreshold);
-	//REG_FUNC(0x4F28BFE0, sceMotionGetBasicOrientation);
-	//REG_FUNC(0x122A79F8, sceMotionMagnetometerOn);
-	//REG_FUNC(0xC1A7395A, sceMotionMagnetometerOff);
-	//REG_FUNC(0x3D4813AE, sceMotionGetMagnetometerState);
+	REG_FUNC(0x4F28BFE0, sceMotionGetBasicOrientation);
+	REG_FUNC(0x122A79F8, sceMotionMagnetometerOn);
+	REG_FUNC(0xC1A7395A, sceMotionMagnetometerOff);
+	REG_FUNC(0x3D4813AE, sceMotionGetMagnetometerState);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp b/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp
index 3893d344bf..6a125206ec 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceMt19937.cpp
@@ -4,6 +4,23 @@
 
 extern psv_log_base sceMt19937;
 
+struct SceMt19937Context
+{
+	u32 count;
+	u32 state[624];
+};
+
+s32 sceMt19937Init(vm::psv::ptr<SceMt19937Context> pCtx, u32 seed)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceMt19937UInt(vm::psv::ptr<SceMt19937Context> pCtx)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceMt19937, #name, name)
 
 psv_log_base sceMt19937("SceMt19937", []()
@@ -12,6 +29,6 @@ psv_log_base sceMt19937("SceMt19937", []()
 	sceMt19937.on_unload = nullptr;
 	sceMt19937.on_stop = nullptr;
 
-	//REG_FUNC(0xEE5BA27C, sceMt19937Init);
-	//REG_FUNC(0x29E43BB5, sceMt19937UInt);
+	REG_FUNC(0xEE5BA27C, sceMt19937Init);
+	REG_FUNC(0x29E43BB5, sceMt19937UInt);
 });
diff --git a/rpcs3/Emu/ARMv7/PSVFuncList.h b/rpcs3/Emu/ARMv7/PSVFuncList.h
index 0326208f9f..a1948dcbec 100644
--- a/rpcs3/Emu/ARMv7/PSVFuncList.h
+++ b/rpcs3/Emu/ARMv7/PSVFuncList.h
@@ -647,3 +647,19 @@ struct SceDateTime
 	u16 second;
 	u32 microsecond;
 };
+
+struct SceFVector3
+{
+	float x, y, z;
+};
+
+struct SceFQuaternion
+{
+	float x, y, z, w;
+};
+
+union SceUMatrix4
+{
+	float f[4][4];
+	s32 i[4][4];
+};

From cd6f95c90d6e09d9ddbd7740f2234d5e3ce92a34 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 30 Jan 2015 13:48:12 +0300
Subject: [PATCH 56/70] Some functions added

---
 rpcs3/Emu/ARMv7/Modules/sceHttp.cpp         |   4 +-
 rpcs3/Emu/ARMv7/Modules/sceNet.cpp          | 409 +++++++++++++++++---
 rpcs3/Emu/ARMv7/Modules/sceNet.h            | 187 +++++++++
 rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp       | 156 +++++++-
 rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp  |  40 +-
 rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp |  21 +-
 rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp   |  37 +-
 rpcs3/Emu/ARMv7/Modules/sceSsl.cpp          |  80 +++-
 rpcs3/Emu/ARMv7/Modules/sceSsl.h            |  14 +
 rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp       | 104 ++++-
 rpcs3/Emu/ARMv7/Modules/sceTouch.cpp        |  69 +++-
 rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp     | 190 ++++++++-
 rpcs3/Emu/ARMv7/Modules/sceVoice.cpp        | 294 ++++++++++++--
 rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp     | 142 ++++++-
 rpcs3/emucore.vcxproj                       |   2 +
 rpcs3/emucore.vcxproj.filters               |   6 +
 16 files changed, 1589 insertions(+), 166 deletions(-)
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceNet.h
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceSsl.h

diff --git a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp
index 814159303e..c98509fac4 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp
@@ -2,6 +2,8 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
+#include "sceSsl.h"
+
 extern psv_log_base sceHttp;
 
 enum SceHttpHttpVersion : s32
@@ -61,8 +63,6 @@ typedef vm::psv::ptr<s32(s32 request, vm::psv::ptr<const char> url, vm::psv::ptr
 
 typedef vm::psv::ptr<s32(s32 request, vm::psv::ptr<const char> url, vm::psv::ptr<const char> cookieHeader, vm::psv::ptr<void> userArg)> SceHttpCookieSendCallback;
 
-struct SceSslCert;
-
 struct SceHttpsData
 {
 	vm::psv::ptr<char> ptr;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNet.cpp b/rpcs3/Emu/ARMv7/Modules/sceNet.cpp
index f68a283618..347ba76df5 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNet.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceNet.cpp
@@ -2,7 +2,298 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
-extern psv_log_base sceNet;
+#include "sceNet.h"
+
+s32 sceNetSetDnsInfo(vm::psv::ptr<SceNetDnsInfo> info, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetClearDnsCache(s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetDumpCreate(vm::psv::ptr<const char> name, s32 len, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetDumpRead(s32 id, vm::psv::ptr<void> buf, s32 len, vm::psv::ptr<s32> pflags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetDumpDestroy(s32 id)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetDumpAbort(s32 id, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetEpollCreate(vm::psv::ptr<const char> name, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetEpollControl(s32 eid, s32 op, s32 id, vm::psv::ptr<SceNetEpollEvent> event)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetEpollWait(s32 eid, vm::psv::ptr<SceNetEpollEvent> events, s32 maxevents, s32 timeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetEpollWaitCB(s32 eid, vm::psv::ptr<SceNetEpollEvent> events, s32 maxevents, s32 timeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetEpollDestroy(s32 eid)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetEpollAbort(s32 eid, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<s32> sceNetErrnoLoc()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetEtherStrton(vm::psv::ptr<const char> str, vm::psv::ptr<SceNetEtherAddr> n)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetEtherNtostr(vm::psv::ptr<const SceNetEtherAddr> n, vm::psv::ptr<char> str, u32 len)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetGetMacAddress(vm::psv::ptr<SceNetEtherAddr> addr, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const char> sceNetInetNtop(s32 af, vm::psv::ptr<const void> src, vm::psv::ptr<char> dst, SceNetSocklen_t size)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetInetPton(s32 af, vm::psv::ptr<const char> src, vm::psv::ptr<void> dst)
+{
+	throw __FUNCTION__;
+}
+
+u64 sceNetHtonll(u64 host64)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceNetHtonl(u32 host32)
+{
+	throw __FUNCTION__;
+}
+
+u16 sceNetHtons(u16 host16)
+{
+	throw __FUNCTION__;
+}
+
+u64 sceNetNtohll(u64 net64)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceNetNtohl(u32 net32)
+{
+	throw __FUNCTION__;
+}
+
+u16 sceNetNtohs(u16 net16)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetInit(vm::psv::ptr<SceNetInitParam> param)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetTerm()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetShowIfconfig()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetShowRoute()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetShowNetstat()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetEmulationSet(vm::psv::ptr<SceNetEmulationParam> param, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetEmulationGet(vm::psv::ptr<SceNetEmulationParam> param, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetResolverCreate(vm::psv::ptr<const char> name, vm::psv::ptr<SceNetResolverParam> param, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetResolverStartNtoa(s32 rid, vm::psv::ptr<const char> hostname, vm::psv::ptr<SceNetInAddr> addr, s32 timeout, s32 retry, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetResolverStartAton(s32 rid, vm::psv::ptr<const SceNetInAddr> addr, vm::psv::ptr<char> hostname, s32 len, s32 timeout, s32 retry, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetResolverGetError(s32 rid, vm::psv::ptr<s32> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetResolverDestroy(s32 rid)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetResolverAbort(s32 rid, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetSocket(vm::psv::ptr<const char> name, s32 domain, s32 type, s32 protocol)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetAccept(s32 s, vm::psv::ptr<SceNetSockaddr> addr, vm::psv::ptr<SceNetSocklen_t> addrlen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetBind(s32 s, vm::psv::ptr<const SceNetSockaddr> addr, SceNetSocklen_t addrlen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetConnect(s32 s, vm::psv::ptr<const SceNetSockaddr> name, SceNetSocklen_t namelen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetGetpeername(s32 s, vm::psv::ptr<SceNetSockaddr> name, vm::psv::ptr<SceNetSocklen_t> namelen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetGetsockname(s32 s, vm::psv::ptr<SceNetSockaddr> name, vm::psv::ptr<SceNetSocklen_t> namelen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetGetsockopt(s32 s, s32 level, s32 optname, vm::psv::ptr<void> optval, vm::psv::ptr<SceNetSocklen_t> optlen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetListen(s32 s, s32 backlog)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetRecv(s32 s, vm::psv::ptr<void> buf, u32 len, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetRecvfrom(s32 s, vm::psv::ptr<void> buf, u32 len, s32 flags, vm::psv::ptr<SceNetSockaddr> from, vm::psv::ptr<SceNetSocklen_t> fromlen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetRecvmsg(s32 s, vm::psv::ptr<SceNetMsghdr> msg, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetSend(s32 s, vm::psv::ptr<const void> msg, u32 len, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetSendto(s32 s, vm::psv::ptr<const void> msg, u32 len, s32 flags, vm::psv::ptr<const SceNetSockaddr> to, SceNetSocklen_t tolen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetSendmsg(s32 s, vm::psv::ptr<const SceNetMsghdr> msg, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetSetsockopt(s32 s, s32 level, s32 optname, vm::psv::ptr<const void> optval, SceNetSocklen_t optlen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetShutdown(s32 s, s32 how)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetSocketClose(s32 s)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetSocketAbort(s32 s, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetGetSockInfo(s32 s, vm::psv::ptr<SceNetSockInfo> info, s32 n, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetGetSockIdInfo(vm::psv::ptr<SceNetFdSet> fds, s32 sockinfoflags, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetGetStatisticsInfo(vm::psv::ptr<SceNetStatisticsInfo> info, s32 flags)
+{
+	throw __FUNCTION__;
+}
+
 
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNet, #name, name)
 
@@ -12,62 +303,62 @@ psv_log_base sceNet("SceNet", []()
 	sceNet.on_unload = nullptr;
 	sceNet.on_stop = nullptr;
 
-	//REG_FUNC(0xD62EF218, sceNetSetDnsInfo);
-	//REG_FUNC(0xFEC1166D, sceNetClearDnsCache);
-	//REG_FUNC(0xAFF9FA4D, sceNetDumpCreate);
-	//REG_FUNC(0x04042925, sceNetDumpRead);
-	//REG_FUNC(0x82DDCF63, sceNetDumpDestroy);
-	//REG_FUNC(0x3B24E75F, sceNetDumpAbort);
-	//REG_FUNC(0xF9D102AE, sceNetEpollCreate);
-	//REG_FUNC(0x4C8764AC, sceNetEpollControl);
-	//REG_FUNC(0x45CE337D, sceNetEpollWait);
-	//REG_FUNC(0x92D3E767, sceNetEpollWaitCB);
-	//REG_FUNC(0x7915CAF3, sceNetEpollDestroy);
-	//REG_FUNC(0x93FCC4E8, sceNetEpollAbort);
-	//REG_FUNC(0xE37F34AA, sceNetErrnoLoc);
-	//REG_FUNC(0xEEC6D75F, sceNetEtherStrton);
-	//REG_FUNC(0x84334EB2, sceNetEtherNtostr);
-	//REG_FUNC(0x06C05518, sceNetGetMacAddress);
-	//REG_FUNC(0x98839B74, sceNetInetNtop);
-	//REG_FUNC(0xD5EEB048, sceNetInetPton);
-	//REG_FUNC(0x12C19209, sceNetHtonll);
-	//REG_FUNC(0x4C30B03C, sceNetHtonl);
-	//REG_FUNC(0x9FA3207B, sceNetHtons);
-	//REG_FUNC(0xFB3336A6, sceNetNtohll);
-	//REG_FUNC(0xD2EAA645, sceNetNtohl);
-	//REG_FUNC(0x07845128, sceNetNtohs);
-	//REG_FUNC(0xEB03E265, sceNetInit);
-	//REG_FUNC(0xEA3CC286, sceNetTerm);
-	//REG_FUNC(0x658B903B, sceNetShowIfconfig);
-	//REG_FUNC(0x6AB3B74B, sceNetShowRoute);
-	//REG_FUNC(0x338EDC2E, sceNetShowNetstat);
-	//REG_FUNC(0x561DFD03, sceNetEmulationSet);
-	//REG_FUNC(0xAE3F4AC6, sceNetEmulationGet);
-	//REG_FUNC(0x6DA29319, sceNetResolverCreate);
-	//REG_FUNC(0x1EB11857, sceNetResolverStartNtoa);
-	//REG_FUNC(0x0424AE26, sceNetResolverStartAton);
-	//REG_FUNC(0x874EF500, sceNetResolverGetError);
-	//REG_FUNC(0x3559F098, sceNetResolverDestroy);
-	//REG_FUNC(0x38EBBD57, sceNetResolverAbort);
-	//REG_FUNC(0xF084FCE3, sceNetSocket);
-	//REG_FUNC(0x1ADF9BB1, sceNetAccept);
-	//REG_FUNC(0x1296A94B, sceNetBind);
-	//REG_FUNC(0x11E5B6F6, sceNetConnect);
-	//REG_FUNC(0x2348D353, sceNetGetpeername);
-	//REG_FUNC(0x1C66A6DB, sceNetGetsockname);
-	//REG_FUNC(0xBA652062, sceNetGetsockopt);
-	//REG_FUNC(0x7A8DA094, sceNetListen);
-	//REG_FUNC(0x023643B7, sceNetRecv);
-	//REG_FUNC(0xB226138B, sceNetRecvfrom);
-	//REG_FUNC(0xDE94C6FE, sceNetRecvmsg);
-	//REG_FUNC(0xE3DD8CD9, sceNetSend);
-	//REG_FUNC(0x52DB31D5, sceNetSendto);
-	//REG_FUNC(0x99C579AE, sceNetSendmsg);
-	//REG_FUNC(0x065505CA, sceNetSetsockopt);
-	//REG_FUNC(0x69E50BB5, sceNetShutdown);
-	//REG_FUNC(0x29822B4D, sceNetSocketClose);
-	//REG_FUNC(0x891C1B9B, sceNetSocketAbort);
-	//REG_FUNC(0xB1AF6840, sceNetGetSockInfo);
-	//REG_FUNC(0x138CF1D6, sceNetGetSockIdInfo);
-	//REG_FUNC(0xA86F8FE5, sceNetGetStatisticsInfo);
+	REG_FUNC(0xD62EF218, sceNetSetDnsInfo);
+	REG_FUNC(0xFEC1166D, sceNetClearDnsCache);
+	REG_FUNC(0xAFF9FA4D, sceNetDumpCreate);
+	REG_FUNC(0x04042925, sceNetDumpRead);
+	REG_FUNC(0x82DDCF63, sceNetDumpDestroy);
+	REG_FUNC(0x3B24E75F, sceNetDumpAbort);
+	REG_FUNC(0xF9D102AE, sceNetEpollCreate);
+	REG_FUNC(0x4C8764AC, sceNetEpollControl);
+	REG_FUNC(0x45CE337D, sceNetEpollWait);
+	REG_FUNC(0x92D3E767, sceNetEpollWaitCB);
+	REG_FUNC(0x7915CAF3, sceNetEpollDestroy);
+	REG_FUNC(0x93FCC4E8, sceNetEpollAbort);
+	REG_FUNC(0xE37F34AA, sceNetErrnoLoc);
+	REG_FUNC(0xEEC6D75F, sceNetEtherStrton);
+	REG_FUNC(0x84334EB2, sceNetEtherNtostr);
+	REG_FUNC(0x06C05518, sceNetGetMacAddress);
+	REG_FUNC(0x98839B74, sceNetInetNtop);
+	REG_FUNC(0xD5EEB048, sceNetInetPton);
+	REG_FUNC(0x12C19209, sceNetHtonll);
+	REG_FUNC(0x4C30B03C, sceNetHtonl);
+	REG_FUNC(0x9FA3207B, sceNetHtons);
+	REG_FUNC(0xFB3336A6, sceNetNtohll);
+	REG_FUNC(0xD2EAA645, sceNetNtohl);
+	REG_FUNC(0x07845128, sceNetNtohs);
+	REG_FUNC(0xEB03E265, sceNetInit);
+	REG_FUNC(0xEA3CC286, sceNetTerm);
+	REG_FUNC(0x658B903B, sceNetShowIfconfig);
+	REG_FUNC(0x6AB3B74B, sceNetShowRoute);
+	REG_FUNC(0x338EDC2E, sceNetShowNetstat);
+	REG_FUNC(0x561DFD03, sceNetEmulationSet);
+	REG_FUNC(0xAE3F4AC6, sceNetEmulationGet);
+	REG_FUNC(0x6DA29319, sceNetResolverCreate);
+	REG_FUNC(0x1EB11857, sceNetResolverStartNtoa);
+	REG_FUNC(0x0424AE26, sceNetResolverStartAton);
+	REG_FUNC(0x874EF500, sceNetResolverGetError);
+	REG_FUNC(0x3559F098, sceNetResolverDestroy);
+	REG_FUNC(0x38EBBD57, sceNetResolverAbort);
+	REG_FUNC(0xF084FCE3, sceNetSocket);
+	REG_FUNC(0x1ADF9BB1, sceNetAccept);
+	REG_FUNC(0x1296A94B, sceNetBind);
+	REG_FUNC(0x11E5B6F6, sceNetConnect);
+	REG_FUNC(0x2348D353, sceNetGetpeername);
+	REG_FUNC(0x1C66A6DB, sceNetGetsockname);
+	REG_FUNC(0xBA652062, sceNetGetsockopt);
+	REG_FUNC(0x7A8DA094, sceNetListen);
+	REG_FUNC(0x023643B7, sceNetRecv);
+	REG_FUNC(0xB226138B, sceNetRecvfrom);
+	REG_FUNC(0xDE94C6FE, sceNetRecvmsg);
+	REG_FUNC(0xE3DD8CD9, sceNetSend);
+	REG_FUNC(0x52DB31D5, sceNetSendto);
+	REG_FUNC(0x99C579AE, sceNetSendmsg);
+	REG_FUNC(0x065505CA, sceNetSetsockopt);
+	REG_FUNC(0x69E50BB5, sceNetShutdown);
+	REG_FUNC(0x29822B4D, sceNetSocketClose);
+	REG_FUNC(0x891C1B9B, sceNetSocketAbort);
+	REG_FUNC(0xB1AF6840, sceNetGetSockInfo);
+	REG_FUNC(0x138CF1D6, sceNetGetSockIdInfo);
+	REG_FUNC(0xA86F8FE5, sceNetGetStatisticsInfo);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNet.h b/rpcs3/Emu/ARMv7/Modules/sceNet.h
new file mode 100644
index 0000000000..1d30bdfdd0
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceNet.h
@@ -0,0 +1,187 @@
+#pragma once
+
+typedef u32 SceNetInAddr_t;
+typedef u16 SceNetInPort_t;
+typedef u8 SceNetSaFamily_t;
+typedef u32 SceNetSocklen_t;
+
+struct SceNetInAddr
+{
+	SceNetInAddr_t s_addr;
+};
+
+struct SceNetSockaddrIn
+{
+	u8 sin_len;
+	SceNetSaFamily_t sin_family;
+	SceNetInPort_t sin_port;
+	SceNetInAddr sin_addr;
+	SceNetInPort_t sin_vport;
+	char sin_zero[6];
+};
+
+struct SceNetDnsInfo
+{
+	SceNetInAddr dns_addr[2];
+};
+
+struct SceNetSockaddr
+{
+	u8 sa_len;
+	SceNetSaFamily_t sa_family;
+	char sa_data[14];
+};
+
+struct SceNetEpollDataExt
+{
+	s32 id;
+	u32 u32;
+};
+
+union SceNetEpollData
+{
+	vm::psv::ptr<void> ptr;
+	s32 fd;
+	u32 u32;
+	u64 u64;
+	SceNetEpollDataExt ext;
+};
+
+struct SceNetEpollSystemData
+{
+	u32 system[4];
+};
+
+struct SceNetEpollEvent
+{
+	u32 events;
+	u32 reserved;
+	SceNetEpollSystemData system;
+	SceNetEpollData data;
+};
+
+struct SceNetEtherAddr
+{
+	u8 data[6];
+};
+
+typedef u32 SceNetIdMask;
+
+struct SceNetFdSet
+{
+	SceNetIdMask bits[32];
+};
+
+struct SceNetIpMreq
+{
+	SceNetInAddr imr_multiaddr;
+	SceNetInAddr imr_interface;
+};
+
+struct SceNetInitParam
+{
+	vm::psv::ptr<void> memory;
+	s32 size;
+	s32 flags;
+};
+
+struct SceNetEmulationData
+{
+	u16 drop_rate;
+	u16 drop_duration;
+	u16 pass_duration;
+	u16 delay_time;
+	u16 delay_jitter;
+	u16 order_rate;
+	u16 order_delay_time;
+	u16 duplication_rate;
+	u32 bps_limit;
+	u16 lower_size_limit;
+	u16 upper_size_limit;
+	u32 system_policy_pattern;
+	u32 game_policy_pattern;
+	u16 policy_flags[64];
+	u8 reserved[64];
+};
+
+struct SceNetEmulationParam
+{
+	u16 version;
+	u16 option_number;
+	u16 current_version;
+	u16 result;
+	u32 flags;
+	u32 reserved1;
+	SceNetEmulationData send;
+	SceNetEmulationData recv;
+	u32 seed;
+	u8 reserved[44];
+};
+
+typedef vm::psv::ptr<vm::psv::ptr<void>(u32 size, s32 rid, vm::psv::ptr<const char> name, vm::psv::ptr<void> user)> SceNetResolverFunctionAllocate;
+
+typedef vm::psv::ptr<void(vm::psv::ptr<void> ptr, s32 rid, vm::psv::ptr<const char> name, vm::psv::ptr<void> user)> SceNetResolverFunctionFree;
+
+struct SceNetResolverParam
+{
+	SceNetResolverFunctionAllocate allocate;
+	SceNetResolverFunctionFree free;
+	vm::psv::ptr<void> user;
+};
+
+struct SceNetLinger
+{
+	s32 l_onoff;
+	s32 l_linger;
+};
+
+struct SceNetIovec
+{
+	vm::psv::ptr<void> iov_base;
+	u32 iov_len;
+};
+
+struct SceNetMsghdr
+{
+	vm::psv::ptr<void> msg_name;
+	SceNetSocklen_t msg_namelen;
+	vm::psv::ptr<SceNetIovec> msg_iov;
+	s32 msg_iovlen;
+	vm::psv::ptr<void> msg_control;
+	SceNetSocklen_t msg_controllen;
+	s32 msg_flags;
+};
+
+struct SceNetSockInfo
+{
+	char name[32];
+	s32 pid;
+	s32 s;
+	s8 socket_type;
+	s8 policy;
+	s16 reserved16;
+	s32 recv_queue_length;
+	s32 send_queue_length;
+	SceNetInAddr local_adr;
+	SceNetInAddr remote_adr;
+	SceNetInPort_t local_port;
+	SceNetInPort_t remote_port;
+	SceNetInPort_t local_vport;
+	SceNetInPort_t remote_vport;
+	s32 state;
+	s32 flags;
+	s32 reserved[8];
+};
+
+struct SceNetStatisticsInfo
+{
+	s32 kernel_mem_free_size;
+	s32 kernel_mem_free_min;
+	s32 packet_count;
+	s32 packet_qos_count;
+	s32 libnet_mem_free_size;
+	s32 libnet_mem_free_min;
+};
+
+
+extern psv_log_base sceNet;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp b/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp
index cde7d28916..7f15d6bf1f 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceNetCtl.cpp
@@ -2,8 +2,132 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
+#include "sceNet.h"
+
 extern psv_log_base sceNetCtl;
 
+union SceNetCtlInfo
+{
+	char cnf_name[65];
+	u32 device;
+	SceNetEtherAddr ether_addr;
+	u32 mtu;
+	u32 link;
+	SceNetEtherAddr bssid;
+	char ssid[33];
+	u32 wifi_security;
+	u32 rssi_dbm;
+	u32 rssi_percentage;
+	u32 channel;
+	u32 ip_config;
+	char dhcp_hostname[256];
+	char pppoe_auth_name[128];
+	char ip_address[16];
+	char netmask[16];
+	char default_route[16];
+	char primary_dns[16];
+	char secondary_dns[16];
+	u32 http_proxy_config;
+	char http_proxy_server[256];
+	u32 http_proxy_port;
+};
+
+struct SceNetCtlNatInfo
+{
+	u32 size;
+	s32 stun_status;
+	s32 nat_type;
+	SceNetInAddr mapped_addr;
+};
+
+struct SceNetCtlAdhocPeerInfo
+{
+	vm::psv::ptr<SceNetCtlAdhocPeerInfo> next;
+	SceNetInAddr inet_addr;
+};
+
+typedef vm::psv::ptr<void(s32 event_type, vm::psv::ptr<void> arg)> SceNetCtlCallback;
+
+s32 sceNetCtlInit()
+{
+	throw __FUNCTION__;
+}
+
+void sceNetCtlTerm()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlCheckCallback()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlInetGetResult(s32 eventType, vm::psv::ptr<s32> errorCode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlAdhocGetResult(s32 eventType, vm::psv::ptr<s32> errorCode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlInetGetInfo(s32 code, vm::psv::ptr<SceNetCtlInfo> info)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlInetGetState(vm::psv::ptr<s32> state)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlGetNatInfo(vm::psv::ptr<SceNetCtlNatInfo> natinfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlInetRegisterCallback(SceNetCtlCallback func, vm::psv::ptr<void> arg, vm::psv::ptr<s32> cid)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlInetUnregisterCallback(s32 cid)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlAdhocRegisterCallback(SceNetCtlCallback func, vm::psv::ptr<void> arg, vm::psv::ptr<s32> cid)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlAdhocUnregisterCallback(s32 cid)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlAdhocGetState(vm::psv::ptr<s32> state)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlAdhocDisconnect()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlAdhocGetPeerList(vm::psv::ptr<u32> buflen, vm::psv::ptr<void> buf)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNetCtlAdhocGetInAddr(vm::psv::ptr<SceNetInAddr> inaddr)
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNetCtl, #name, name)
 
 psv_log_base sceNetCtl("SceNetCtl", []()
@@ -12,20 +136,20 @@ psv_log_base sceNetCtl("SceNetCtl", []()
 	sceNetCtl.on_unload = nullptr;
 	sceNetCtl.on_stop = nullptr;
 
-	//REG_FUNC(0x495CA1DB, sceNetCtlInit);
-	//REG_FUNC(0xCD188648, sceNetCtlTerm);
-	//REG_FUNC(0xDFFC3ED4, sceNetCtlCheckCallback);
-	//REG_FUNC(0x6B20EC02, sceNetCtlInetGetResult);
-	//REG_FUNC(0x7AE0ED19, sceNetCtlAdhocGetResult);
-	//REG_FUNC(0xB26D07F3, sceNetCtlInetGetInfo);
-	//REG_FUNC(0x6D26AC68, sceNetCtlInetGetState);
-	//REG_FUNC(0xEAEE6185, sceNetCtlInetRegisterCallback);
-	//REG_FUNC(0xD0C3BF3F, sceNetCtlInetUnregisterCallback);
-	//REG_FUNC(0x4DDD6149, sceNetCtlGetNatInfo);
-	//REG_FUNC(0x0961A561, sceNetCtlAdhocGetState);
-	//REG_FUNC(0xFFA9D594, sceNetCtlAdhocRegisterCallback);
-	//REG_FUNC(0xA4471E10, sceNetCtlAdhocUnregisterCallback);
-	//REG_FUNC(0xED43B79A, sceNetCtlAdhocDisconnect);
-	//REG_FUNC(0x77586C59, sceNetCtlAdhocGetPeerList);
-	//REG_FUNC(0x7118C99D, sceNetCtlAdhocGetInAddr);
+	REG_FUNC(0x495CA1DB, sceNetCtlInit);
+	REG_FUNC(0xCD188648, sceNetCtlTerm);
+	REG_FUNC(0xDFFC3ED4, sceNetCtlCheckCallback);
+	REG_FUNC(0x6B20EC02, sceNetCtlInetGetResult);
+	REG_FUNC(0x7AE0ED19, sceNetCtlAdhocGetResult);
+	REG_FUNC(0xB26D07F3, sceNetCtlInetGetInfo);
+	REG_FUNC(0x6D26AC68, sceNetCtlInetGetState);
+	REG_FUNC(0xEAEE6185, sceNetCtlInetRegisterCallback);
+	REG_FUNC(0xD0C3BF3F, sceNetCtlInetUnregisterCallback);
+	REG_FUNC(0x4DDD6149, sceNetCtlGetNatInfo);
+	REG_FUNC(0x0961A561, sceNetCtlAdhocGetState);
+	REG_FUNC(0xFFA9D594, sceNetCtlAdhocRegisterCallback);
+	REG_FUNC(0xA4471E10, sceNetCtlAdhocUnregisterCallback);
+	REG_FUNC(0xED43B79A, sceNetCtlAdhocDisconnect);
+	REG_FUNC(0x77586C59, sceNetCtlAdhocGetPeerList);
+	REG_FUNC(0x7118C99D, sceNetCtlAdhocGetInAddr);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp b/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp
index 2fab7c29d4..2046dff9ca 100644
--- a/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/scePhotoExport.cpp
@@ -4,6 +4,42 @@
 
 extern psv_log_base scePhotoExport;
 
+struct ScePhotoExportParam
+{
+	u32 version;
+	vm::psv::ptr<const char> photoTitle;
+	vm::psv::ptr<const char> gameTitle;
+	vm::psv::ptr<const char> gameComment;
+	char reserved[32];
+};
+
+typedef vm::psv::ptr<s32(vm::psv::ptr<void>)> ScePhotoExportCancelFunc;
+
+s32 scePhotoExportFromData(
+	vm::psv::ptr<const void> photodata,
+	s32 photodataSize,
+	vm::psv::ptr<const ScePhotoExportParam> param,
+	vm::psv::ptr<void> workMemory,
+	ScePhotoExportCancelFunc cancelFunc,
+	vm::psv::ptr<void> userdata,
+	vm::psv::ptr<char> exportedPath,
+	s32 exportedPathLength)
+{
+	throw __FUNCTION__;
+}
+
+s32 scePhotoExportFromFile(
+	vm::psv::ptr<const char> photodataPath,
+	vm::psv::ptr<const ScePhotoExportParam> param,
+	vm::psv::ptr<void> workMemory,
+	ScePhotoExportCancelFunc cancelFunc,
+	vm::psv::ptr<void> userdata,
+	vm::psv::ptr<char> exportedPath,
+	s32 exportedPathLength)
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &scePhotoExport, #name, name)
 
 psv_log_base scePhotoExport("ScePhotoExport", []()
@@ -12,6 +48,6 @@ psv_log_base scePhotoExport("ScePhotoExport", []()
 	scePhotoExport.on_unload = nullptr;
 	scePhotoExport.on_stop = nullptr;
 
-	//REG_FUNC(0x70512321, scePhotoExportFromData);
-	//REG_FUNC(0x84FD9FC5, scePhotoExportFromFile);
+	REG_FUNC(0x70512321, scePhotoExportFromData);
+	REG_FUNC(0x84FD9FC5, scePhotoExportFromFile);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp b/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp
index 4eaeb11070..c14fba50b6 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceRazorCapture.cpp
@@ -4,6 +4,21 @@
 
 extern psv_log_base sceRazorCapture;
 
+void sceRazorCaptureSetTrigger(u32 frameIndex, vm::psv::ptr<const char> captureFilename)
+{
+	throw __FUNCTION__;
+}
+
+void sceRazorCaptureSetTriggerNextFrame(vm::psv::ptr<const char> captureFilename)
+{
+	throw __FUNCTION__;
+}
+
+bool sceRazorCaptureIsInProgress()
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceRazorCapture, #name, name)
 
 psv_log_base sceRazorCapture("SceRazorCapture", []()
@@ -12,7 +27,7 @@ psv_log_base sceRazorCapture("SceRazorCapture", []()
 	sceRazorCapture.on_unload = nullptr;
 	sceRazorCapture.on_stop = nullptr;
 
-	//REG_FUNC(0x911E0AA0, sceRazorCaptureIsInProgress);
-	//REG_FUNC(0xE916B538, sceRazorCaptureSetTrigger);
-	//REG_FUNC(0x3D4B7E68, sceRazorCaptureSetTriggerNextFrame);
+	REG_FUNC(0x911E0AA0, sceRazorCaptureIsInProgress);
+	REG_FUNC(0xE916B538, sceRazorCaptureSetTrigger);
+	REG_FUNC(0x3D4B7E68, sceRazorCaptureSetTriggerNextFrame);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp b/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp
index 47ab0d614c..07b3f0a467 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceScreenShot.cpp
@@ -4,6 +4,35 @@
 
 extern psv_log_base sceScreenShot;
 
+struct SceScreenShotParam
+{
+	vm::psv::ptr<const char> photoTitle;
+	vm::psv::ptr<const char> gameTitle;
+	vm::psv::ptr<const char> gameComment;
+	vm::psv::ptr<void> reserved;
+};
+
+s32 sceScreenShotSetParam(vm::psv::ptr<const SceScreenShotParam> param)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceScreenShotSetOverlayImage(vm::psv::ptr<const char> filePath, s32 offsetX, s32 offsetY)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceScreenShotDisable()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceScreenShotEnable()
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceScreenShot, #name, name)
 
 psv_log_base sceScreenShot("SceScreenShot", []()
@@ -12,8 +41,8 @@ psv_log_base sceScreenShot("SceScreenShot", []()
 	sceScreenShot.on_unload = nullptr;
 	sceScreenShot.on_stop = nullptr;
 
-	//REG_FUNC(0x05DB59C7, sceScreenShotSetParam);
-	//REG_FUNC(0x7061665B, sceScreenShotSetOverlayImage);
-	//REG_FUNC(0x50AE9FF9, sceScreenShotDisable);
-	//REG_FUNC(0x76E674D1, sceScreenShotEnable);
+	REG_FUNC(0x05DB59C7, sceScreenShotSetParam);
+	REG_FUNC(0x7061665B, sceScreenShotSetOverlayImage);
+	REG_FUNC(0x50AE9FF9, sceScreenShotDisable);
+	REG_FUNC(0x76E674D1, sceScreenShotEnable);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp b/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp
index 51032ab5fd..02a377996a 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp
@@ -2,7 +2,63 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
-extern psv_log_base sceSsl;
+#include "sceSsl.h"
+
+s32 sceSslInit(u32 poolSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSslTerm()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSslGetMemoryPoolStats(vm::psv::ptr<SceSslMemoryPoolStats> currentStat)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSslGetSerialNumber(vm::psv::ptr<SceSslCert> sslCert, vm::psv::ptr<vm::psv::ptr<const u8>> sboData, vm::psv::ptr<u32> sboLen)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<SceSslCertName> sceSslGetSubjectName(vm::psv::ptr<SceSslCert> sslCert)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<SceSslCertName> sceSslGetIssuerName(vm::psv::ptr<SceSslCert> sslCert)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSslGetNotBefore(vm::psv::ptr<SceSslCert> sslCert, vm::psv::ptr<u64> begin)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSslGetNotAfter(vm::psv::ptr<SceSslCert> sslCert, vm::psv::ptr<u64> limit)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSslGetNameEntryCount(vm::psv::ptr<SceSslCertName> certName)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSslGetNameEntryInfo(vm::psv::ptr<SceSslCertName> certName, s32 entryNum, vm::psv::ptr<char> oidname, u32 maxOidnameLen, vm::psv::ptr<u8> value, u32 maxValueLen, vm::psv::ptr<u32> valueLen)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSslFreeSslCertName(vm::psv::ptr<SceSslCertName> certName)
+{
+	throw __FUNCTION__;
+}
+
 
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceSsl, #name, name)
 
@@ -12,15 +68,15 @@ psv_log_base sceSsl("SceSsl", []()
 	sceSsl.on_unload = nullptr;
 	sceSsl.on_stop = nullptr;
 
-	//REG_FUNC(0x3C733316, sceSslInit);
-	//REG_FUNC(0x03CE6E3A, sceSslTerm);
-	//REG_FUNC(0xBD203262, sceSslGetMemoryPoolStats);
-	//REG_FUNC(0x901C5C15, sceSslGetSerialNumber);
-	//REG_FUNC(0x9B2F1BC1, sceSslGetSubjectName);
-	//REG_FUNC(0x412711E5, sceSslGetIssuerName);
-	//REG_FUNC(0x70DEA174, sceSslGetNotBefore);
-	//REG_FUNC(0xF5ED7B68, sceSslGetNotAfter);
-	//REG_FUNC(0x95E14CA6, sceSslGetNameEntryCount);
-	//REG_FUNC(0x2A857867, sceSslGetNameEntryInfo);
-	//REG_FUNC(0xC73687E4, sceSslFreeSslCertName);
+	REG_FUNC(0x3C733316, sceSslInit);
+	REG_FUNC(0x03CE6E3A, sceSslTerm);
+	REG_FUNC(0xBD203262, sceSslGetMemoryPoolStats);
+	REG_FUNC(0x901C5C15, sceSslGetSerialNumber);
+	REG_FUNC(0x9B2F1BC1, sceSslGetSubjectName);
+	REG_FUNC(0x412711E5, sceSslGetIssuerName);
+	REG_FUNC(0x70DEA174, sceSslGetNotBefore);
+	REG_FUNC(0xF5ED7B68, sceSslGetNotAfter);
+	REG_FUNC(0x95E14CA6, sceSslGetNameEntryCount);
+	REG_FUNC(0x2A857867, sceSslGetNameEntryInfo);
+	REG_FUNC(0xC73687E4, sceSslFreeSslCertName);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSsl.h b/rpcs3/Emu/ARMv7/Modules/sceSsl.h
new file mode 100644
index 0000000000..3d60ac45e5
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceSsl.h
@@ -0,0 +1,14 @@
+#pragma once
+
+typedef void SceSslCert;
+typedef void SceSslCertName;
+
+struct SceSslMemoryPoolStats
+{
+	u32 poolSize;
+	u32 maxInuseSize;
+	u32 currentInuseSize;
+	s32 reserved;
+};
+
+extern psv_log_base sceSsl;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp b/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp
index 09c50ce4e9..3df26668a4 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceSulpha.cpp
@@ -4,6 +4,84 @@
 
 extern psv_log_base sceSulpha;
 
+typedef vm::psv::ptr<void(vm::psv::ptr<void> arg)> SceSulphaCallback;
+
+struct SceSulphaConfig
+{
+	SceSulphaCallback notifyCallback;
+	u32 port;
+	u32 bookmarkCount;
+};
+
+struct SceSulphaAgentsRegister;
+typedef void SceSulphaHandle;
+
+s32 sceSulphaNetworkInit()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaNetworkShutdown()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaGetDefaultConfig(vm::psv::ptr<SceSulphaConfig> config)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaGetNeededMemory(vm::psv::ptr<const SceSulphaConfig> config, vm::psv::ptr<u32> sizeInBytes)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaInit(vm::psv::ptr<const SceSulphaConfig> config, vm::psv::ptr<void> buffer, u32 sizeInBytes)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaShutdown()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaUpdate()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaFileConnect(vm::psv::ptr<const char> filename)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaFileDisconnect()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaSetBookmark(vm::psv::ptr<const char> name, s32 id)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaAgentsGetNeededMemory(vm::psv::ptr<const SceSulphaAgentsRegister> config, vm::psv::ptr<u32> sizeInBytes)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaAgentsRegister(vm::psv::ptr<const SceSulphaAgentsRegister> config, vm::psv::ptr<void> buffer, u32 sizeInBytes, vm::psv::ptr<SceSulphaHandle> handles)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaAgentsUnregister(vm::psv::ptr<const SceSulphaHandle> handles, u32 agentCount)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceSulpha, #name, name)
 
 psv_log_base sceSulpha("SceSulpha", []()
@@ -12,19 +90,19 @@ psv_log_base sceSulpha("SceSulpha", []()
 	sceSulpha.on_unload = nullptr;
 	sceSulpha.on_stop = nullptr;
 
-	//REG_FUNC(0xB4668AEA, sceSulphaNetworkInit);
-	//REG_FUNC(0x0FC71B72, sceSulphaNetworkShutdown);
-	//REG_FUNC(0xA6A05C50, sceSulphaGetDefaultConfig);
-	//REG_FUNC(0xD52E5A5A, sceSulphaGetNeededMemory);
-	//REG_FUNC(0x324F158F, sceSulphaInit);
-	//REG_FUNC(0x10770BA7, sceSulphaShutdown);
-	//REG_FUNC(0x920EC7BF, sceSulphaUpdate);
-	//REG_FUNC(0x7968A138, sceSulphaFileConnect);
-	//REG_FUNC(0xB16E7B88, sceSulphaFileDisconnect);
-	//REG_FUNC(0x5E15E164, sceSulphaSetBookmark);
-	//REG_FUNC(0xC5752B6B, sceSulphaAgentsGetNeededMemory);
-	//REG_FUNC(0x7ADB454D, sceSulphaAgentsRegister);
-	//REG_FUNC(0x2A8B74D7, sceSulphaAgentsUnregister);
+	REG_FUNC(0xB4668AEA, sceSulphaNetworkInit);
+	REG_FUNC(0x0FC71B72, sceSulphaNetworkShutdown);
+	REG_FUNC(0xA6A05C50, sceSulphaGetDefaultConfig);
+	REG_FUNC(0xD52E5A5A, sceSulphaGetNeededMemory);
+	REG_FUNC(0x324F158F, sceSulphaInit);
+	REG_FUNC(0x10770BA7, sceSulphaShutdown);
+	REG_FUNC(0x920EC7BF, sceSulphaUpdate);
+	REG_FUNC(0x7968A138, sceSulphaFileConnect);
+	REG_FUNC(0xB16E7B88, sceSulphaFileDisconnect);
+	REG_FUNC(0x5E15E164, sceSulphaSetBookmark);
+	REG_FUNC(0xC5752B6B, sceSulphaAgentsGetNeededMemory);
+	REG_FUNC(0x7ADB454D, sceSulphaAgentsRegister);
+	REG_FUNC(0x2A8B74D7, sceSulphaAgentsUnregister);
 	//REG_FUNC(0xDE7E2911, sceSulphaGetAgent);
 	//REG_FUNC(0xA41B7402, sceSulphaNodeNew);
 	//REG_FUNC(0xD44C9F86, sceSulphaNodeDelete);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp b/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp
index 6636644e0d..ee13162e61 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp
@@ -4,6 +4,65 @@
 
 extern psv_log_base sceTouch;
 
+struct SceTouchPanelInfo
+{
+	s16 minAaX;
+	s16 minAaY;
+	s16 maxAaX;
+	s16 maxAaY;
+	s16 minDispX;
+	s16 minDispY;
+	s16 maxDispX;
+	s16 maxDispY;
+	u8 minForce;
+	u8 maxForce;
+	u8 rsv[30];
+};
+
+struct SceTouchReport
+{
+	u8 id;
+	u8 force;
+	s16 x;
+	s16 y;
+	s8 rsv[8];
+	u16 info;
+};
+
+struct SceTouchData
+{
+	u64 timeStamp;
+	u32 status;
+	u32 reportNum;
+	SceTouchReport report[8];
+};
+
+s32 sceTouchGetPanelInfo(u32 port, vm::psv::ptr<SceTouchPanelInfo> pPanelInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceTouchRead(u32 port, vm::psv::ptr<SceTouchData> pData, u32 nBufs)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceTouchPeek(u32 port, vm::psv::ptr<SceTouchData> pData, u32 nBufs)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceTouchSetSamplingState(u32 port, u32 state)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceTouchGetSamplingState(u32 port, vm::psv::ptr<u32> pState)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceTouch, #name, name)
 
 psv_log_base sceTouch("SceTouch", []()
@@ -12,9 +71,9 @@ psv_log_base sceTouch("SceTouch", []()
 	sceTouch.on_unload = nullptr;
 	sceTouch.on_stop = nullptr;
 
-	//REG_FUNC(0x169A1D58, sceTouchRead);
-	//REG_FUNC(0xFF082DF0, sceTouchPeek);
-	//REG_FUNC(0x1B9C5D14, sceTouchSetSamplingState);
-	//REG_FUNC(0x26531526, sceTouchGetSamplingState);
-	//REG_FUNC(0x10A2CA25, sceTouchGetPanelInfo);
+	REG_FUNC(0x169A1D58, sceTouchRead);
+	REG_FUNC(0xFF082DF0, sceTouchPeek);
+	REG_FUNC(0x1B9C5D14, sceTouchSetSamplingState);
+	REG_FUNC(0x26531526, sceTouchGetSamplingState);
+	REG_FUNC(0x10A2CA25, sceTouchGetPanelInfo);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp b/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp
index 472c7bbfb3..bec390ebe1 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp
@@ -4,6 +4,178 @@
 
 extern psv_log_base sceVideodec;
 
+struct SceVideodecQueryInitInfoHwAvcdec
+{
+	u32 size;
+	u32 horizontal;
+	u32 vertical;
+	u32 numOfRefFrames;
+	u32 numOfStreams;
+};
+
+union SceVideodecQueryInitInfo
+{
+	u8 reserved[32];
+	SceVideodecQueryInitInfoHwAvcdec hwAvc;
+};
+
+struct SceVideodecTimeStamp
+{
+	u32 upper;
+	u32 lower;
+};
+
+struct SceAvcdecQueryDecoderInfo
+{
+	u32 horizontal;
+	u32 vertical;
+	u32 numOfRefFrames;
+
+};
+
+struct SceAvcdecDecoderInfo
+{
+	u32 frameMemSize;
+
+};
+
+struct SceAvcdecBuf
+{
+	vm::psv::ptr<void> pBuf;
+	u32 size;
+};
+
+struct SceAvcdecCtrl
+{
+	u32 handle;
+	SceAvcdecBuf frameBuf;
+};
+
+struct SceAvcdecAu
+{
+	SceVideodecTimeStamp pts;
+	SceVideodecTimeStamp dts;
+	SceAvcdecBuf es;
+};
+
+struct SceAvcdecInfo
+{
+	u32 numUnitsInTick;
+	u32 timeScale;
+	u8 fixedFrameRateFlag;
+
+	u8 aspectRatioIdc;
+	u16 sarWidth;
+	u16 sarHeight;
+
+	u8 colourPrimaries;
+	u8 transferCharacteristics;
+	u8 matrixCoefficients;
+
+	u8 videoFullRangeFlag;
+
+	u8 picStruct[2];
+	u8 ctType;
+
+	u8 padding[3];
+};
+
+struct SceAvcdecFrameOptionRGBA
+{
+	u8 alpha;
+	u8 cscCoefficient;
+	u8 reserved[14];
+};
+
+union SceAvcdecFrameOption
+{
+	u8 reserved[16];
+	SceAvcdecFrameOptionRGBA rgba;
+};
+
+
+struct SceAvcdecFrame
+{
+	u32 pixelType;
+	u32 framePitch;
+	u32 frameWidth;
+	u32 frameHeight;
+
+	u32 horizontalSize;
+	u32 verticalSize;
+
+	u32 frameCropLeftOffset;
+	u32 frameCropRightOffset;
+	u32 frameCropTopOffset;
+	u32 frameCropBottomOffset;
+
+	SceAvcdecFrameOption opt;
+
+	vm::psv::ptr<void> pPicture[2];
+};
+
+
+struct SceAvcdecPicture
+{
+	u32 size;
+	SceAvcdecFrame frame;
+	SceAvcdecInfo info;
+};
+
+struct SceAvcdecArrayPicture
+{
+	u32 numOfOutput;
+	u32 numOfElm;
+	vm::psv::ptr<vm::psv::ptr<SceAvcdecPicture>> pPicture;
+};
+
+
+s32 sceVideodecInitLibrary(u32 codecType, vm::psv::ptr<const SceVideodecQueryInitInfo> pInitInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVideodecTermLibrary(u32 codecType)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAvcdecQueryDecoderMemSize(u32 codecType, vm::psv::ptr<const SceAvcdecQueryDecoderInfo> pDecoderInfo, vm::psv::ptr<SceAvcdecDecoderInfo> pMemInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAvcdecCreateDecoder(u32 codecType, vm::psv::ptr<SceAvcdecCtrl> pCtrl, vm::psv::ptr<const SceAvcdecQueryDecoderInfo> pDecoderInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAvcdecDeleteDecoder(vm::psv::ptr<SceAvcdecCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAvcdecDecodeAvailableSize(vm::psv::ptr<SceAvcdecCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAvcdecDecode(vm::psv::ptr<SceAvcdecCtrl> pCtrl, vm::psv::ptr<const SceAvcdecAu> pAu, vm::psv::ptr<SceAvcdecArrayPicture> pArrayPicture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAvcdecDecodeStop(vm::psv::ptr<SceAvcdecCtrl> pCtrl, vm::psv::ptr<SceAvcdecArrayPicture> pArrayPicture)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceAvcdecDecodeFlush(vm::psv::ptr<SceAvcdecCtrl> pCtrl)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceVideodec, #name, name)
 
 psv_log_base sceVideodec("SceVideodec", []()
@@ -12,15 +184,15 @@ psv_log_base sceVideodec("SceVideodec", []()
 	sceVideodec.on_unload = nullptr;
 	sceVideodec.on_stop = nullptr;
 
-	//REG_FUNC(0xF1AF65A3, sceVideodecInitLibrary);
-	//REG_FUNC(0x3A5F4924, sceVideodecTermLibrary);
-	//REG_FUNC(0x97E95EDB, sceAvcdecQueryDecoderMemSize);
-	//REG_FUNC(0xE82BB69B, sceAvcdecCreateDecoder);
-	//REG_FUNC(0x8A0E359E, sceAvcdecDeleteDecoder);
-	//REG_FUNC(0x441673E3, sceAvcdecDecodeAvailableSize);
-	//REG_FUNC(0xD6190A06, sceAvcdecDecode);
-	//REG_FUNC(0x9648D853, sceAvcdecDecodeStop);
-	//REG_FUNC(0x25F31020, sceAvcdecDecodeFlush);
+	REG_FUNC(0xF1AF65A3, sceVideodecInitLibrary);
+	REG_FUNC(0x3A5F4924, sceVideodecTermLibrary);
+	REG_FUNC(0x97E95EDB, sceAvcdecQueryDecoderMemSize);
+	REG_FUNC(0xE82BB69B, sceAvcdecCreateDecoder);
+	REG_FUNC(0x8A0E359E, sceAvcdecDeleteDecoder);
+	REG_FUNC(0x441673E3, sceAvcdecDecodeAvailableSize);
+	REG_FUNC(0xD6190A06, sceAvcdecDecode);
+	REG_FUNC(0x9648D853, sceAvcdecDecodeStop);
+	REG_FUNC(0x25F31020, sceAvcdecDecodeFlush);
 	//REG_FUNC(0xB2A428DB, sceAvcdecCsc);
 	//REG_FUNC(0x6C68A38F, sceAvcdecDecodeNalAu);
 	//REG_FUNC(0xC67C1A80, sceM4vdecQueryDecoderMemSize);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp b/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp
index 072f3d3303..cb0cfc8f53 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp
@@ -4,6 +4,252 @@
 
 extern psv_log_base sceVoice;
 
+enum SceVoicePortType : s32
+{
+	SCEVOICE_PORTTYPE_NULL = -1,
+	SCEVOICE_PORTTYPE_IN_DEVICE = 0,
+	SCEVOICE_PORTTYPE_IN_PCMAUDIO = 1,
+	SCEVOICE_PORTTYPE_IN_VOICE = 2,
+	SCEVOICE_PORTTYPE_OUT_PCMAUDIO = 3,
+	SCEVOICE_PORTTYPE_OUT_VOICE = 4,
+	SCEVOICE_PORTTYPE_OUT_DEVICE = 5
+};
+
+enum SceVoicePortState : s32
+{
+	SCEVOICE_PORTSTATE_NULL = -1,
+	SCEVOICE_PORTSTATE_IDLE = 0,
+	SCEVOICE_PORTSTATE_READY = 1,
+	SCEVOICE_PORTSTATE_BUFFERING = 2,
+	SCEVOICE_PORTSTATE_RUNNING = 3
+};
+
+enum SceVoiceBitRate : s32
+{
+	SCEVOICE_BITRATE_NULL = -1,
+	SCEVOICE_BITRATE_3850 = 3850,
+	SCEVOICE_BITRATE_4650 = 4650,
+	SCEVOICE_BITRATE_5700 = 5700,
+	SCEVOICE_BITRATE_7300 = 7300
+};
+
+enum SceVoiceSamplingRate : s32
+{
+	SCEVOICE_SAMPLINGRATE_NULL = -1,
+	SCEVOICE_SAMPLINGRATE_16000 = 16000
+};
+
+enum SceVoicePcmDataType : s32
+{
+	SCEVOICE_PCM_NULL = -1,
+	SCEVOICE_PCM_SHORT_LITTLE_ENDIAN = 0
+};
+
+enum SceVoiceVersion : s32
+{
+	SCEVOICE_VERSION_100 = 100
+};
+
+enum SceVoiceAppType : s32
+{
+	SCEVOICE_APPTYPE_GAME = 1 << 29
+};
+
+struct SceVoicePCMFormat
+{
+	SceVoicePcmDataType dataType;
+	SceVoiceSamplingRate sampleRate;
+};
+
+struct SceVoiceResourceInfo
+{
+	u16 maxInVoicePort;
+	u16 maxOutVoicePort;
+	u16 maxInDevicePort;
+	u16 maxOutDevicePort;
+	u16 maxTotalPort;
+};
+
+struct SceVoiceBasePortInfo
+{
+	SceVoicePortType portType;
+	SceVoicePortState state;
+	vm::psv::ptr<u32> pEdge;
+	u32 numByte;
+	u32 frameSize;
+	u16 numEdge;
+	u16 reserved;
+};
+
+struct SceVoicePortParam
+{
+	SceVoicePortType portType;
+	u16 threshold;
+	u16 bMute;
+	float volume;
+
+	union
+	{
+		struct
+		{
+			SceVoiceBitRate bitrate;
+		} voice;
+
+		struct
+		{
+			u32 bufSize;
+			SceVoicePCMFormat format;
+		} pcmaudio;
+
+
+		struct
+		{
+			u32 playerId;
+		} device;
+	};
+};
+
+typedef vm::psv::ptr<void(vm::psv::ptr<void> event)> SceVoiceEventCallback;
+
+struct SceVoiceInitParam
+{
+	s32 appType;
+	SceVoiceEventCallback onEvent;
+	u8 reserved[24];
+};
+
+struct SceVoiceStartParam
+{
+	s32 container;
+	u8 reserved[28];
+};
+
+s32 sceVoiceInit(vm::psv::ptr<SceVoiceInitParam> pArg, SceVoiceVersion version)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceEnd()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceStart(vm::psv::ptr<SceVoiceStartParam> pArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceStop()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceResetPort(u32 portId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceCreatePort(vm::psv::ptr<u32> portId, vm::psv::ptr<const SceVoicePortParam> pArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceUpdatePort(u32 portId, vm::psv::ptr<const SceVoicePortParam> pArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceConnectIPortToOPort(u32 ips, u32 ops)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceDisconnectIPortFromOPort(u32 ips, u32 ops)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceDeletePort(u32 portId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceWriteToIPort(u32 ips, vm::psv::ptr<const void> data, vm::psv::ptr<u32> size, int16_t frameGaps)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceReadFromOPort(u32 ops, vm::psv::ptr<void> data, vm::psv::ptr<u32> size)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceSetMuteFlagAll(u16 bMuted)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceSetMuteFlag(u32 portId, u16 bMuted)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceGetMuteFlag(u32 portId, vm::psv::ptr<u16> bMuted)
+{
+	throw __FUNCTION__;
+}
+
+//s32 sceVoiceSetVolume(u32 portId, float volume)
+//{
+//	throw __FUNCTION__;
+//}
+
+s32 sceVoiceGetVolume(u32 portId, vm::psv::ptr<float> volume)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceSetBitRate(u32 portId, SceVoiceBitRate bitrate)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceGetBitRate(u32 portId, vm::psv::ptr<u32> bitrate)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceGetPortInfo(u32 portId, vm::psv::ptr<SceVoiceBasePortInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoicePausePort(u32 portId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceResumePort(u32 portId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoicePausePortAll()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceResumePortAll()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceGetResourceInfo(vm::psv::ptr<SceVoiceResourceInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceVoice, #name, name)
 
 psv_log_base sceVoice("SceVoice", []()
@@ -12,29 +258,29 @@ psv_log_base sceVoice("SceVoice", []()
 	sceVoice.on_unload = nullptr;
 	sceVoice.on_stop = nullptr;
 
-	//REG_FUNC(0xD02C00B4, sceVoiceGetBitRate);
-	//REG_FUNC(0xC913F7E9, sceVoiceGetMuteFlag);
-	//REG_FUNC(0x875CC80D, sceVoiceGetVolume);
-	//REG_FUNC(0x02F58D6F, sceVoiceSetBitRate);
-	//REG_FUNC(0x0B9E4AE2, sceVoiceSetMuteFlag);
-	//REG_FUNC(0xDB90EAC4, sceVoiceSetMuteFlagAll);
+	REG_FUNC(0xD02C00B4, sceVoiceGetBitRate);
+	REG_FUNC(0xC913F7E9, sceVoiceGetMuteFlag);
+	REG_FUNC(0x875CC80D, sceVoiceGetVolume);
+	REG_FUNC(0x02F58D6F, sceVoiceSetBitRate);
+	REG_FUNC(0x0B9E4AE2, sceVoiceSetMuteFlag);
+	REG_FUNC(0xDB90EAC4, sceVoiceSetMuteFlagAll);
 	//REG_FUNC(0xD93769E6, sceVoiceSetVolume);
-	//REG_FUNC(0x6E46950E, sceVoiceGetResourceInfo);
-	//REG_FUNC(0xAC98853E, sceVoiceEnd);
-	//REG_FUNC(0x805CC20F, sceVoiceInit);
-	//REG_FUNC(0xB2ED725B, sceVoiceStart);
-	//REG_FUNC(0xC3868DF6, sceVoiceStop);
-	//REG_FUNC(0x698BDAAE, sceVoiceConnectIPortToOPort);
-	//REG_FUNC(0xFA4E57B1, sceVoiceCreatePort);
-	//REG_FUNC(0xAE46564D, sceVoiceDeletePort);
-	//REG_FUNC(0x5F0260F4, sceVoiceDisconnectIPortFromOPort);
-	//REG_FUNC(0x5933CCFB, sceVoiceGetPortInfo);
-	//REG_FUNC(0x23C6B16B, sceVoicePausePort);
-	//REG_FUNC(0x39AA3884, sceVoicePausePortAll);
-	//REG_FUNC(0x09E4D18C, sceVoiceReadFromOPort);
-	//REG_FUNC(0x5E1CE910, sceVoiceResetPort);
-	//REG_FUNC(0x2DE35411, sceVoiceResumePort);
-	//REG_FUNC(0x1F93FC0C, sceVoiceResumePortAll);
-	//REG_FUNC(0xCE855C50, sceVoiceUpdatePort);
-	//REG_FUNC(0x0A22EC0E, sceVoiceWriteToIPort);
+	REG_FUNC(0x6E46950E, sceVoiceGetResourceInfo);
+	REG_FUNC(0xAC98853E, sceVoiceEnd);
+	REG_FUNC(0x805CC20F, sceVoiceInit);
+	REG_FUNC(0xB2ED725B, sceVoiceStart);
+	REG_FUNC(0xC3868DF6, sceVoiceStop);
+	REG_FUNC(0x698BDAAE, sceVoiceConnectIPortToOPort);
+	REG_FUNC(0xFA4E57B1, sceVoiceCreatePort);
+	REG_FUNC(0xAE46564D, sceVoiceDeletePort);
+	REG_FUNC(0x5F0260F4, sceVoiceDisconnectIPortFromOPort);
+	REG_FUNC(0x5933CCFB, sceVoiceGetPortInfo);
+	REG_FUNC(0x23C6B16B, sceVoicePausePort);
+	REG_FUNC(0x39AA3884, sceVoicePausePortAll);
+	REG_FUNC(0x09E4D18C, sceVoiceReadFromOPort);
+	REG_FUNC(0x5E1CE910, sceVoiceResetPort);
+	REG_FUNC(0x2DE35411, sceVoiceResumePort);
+	REG_FUNC(0x1F93FC0C, sceVoiceResumePortAll);
+	REG_FUNC(0xCE855C50, sceVoiceUpdatePort);
+	REG_FUNC(0x0A22EC0E, sceVoiceWriteToIPort);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp b/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp
index bc5fb062a3..050570aaa9 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceVoiceQoS.cpp
@@ -4,6 +4,114 @@
 
 extern psv_log_base sceVoiceQoS;
 
+typedef s32 SceVoiceQoSLocalId;
+typedef s32 SceVoiceQoSRemoteId;
+typedef s32 SceVoiceQoSConnectionId;
+
+enum SceVoiceQoSAttributeId : s32
+{
+	SCE_VOICE_QOS_ATTR_MIC_VOLUME,
+	SCE_VOICE_QOS_ATTR_MIC_MUTE,
+	SCE_VOICE_QOS_ATTR_SPEAKER_VOLUME,
+	SCE_VOICE_QOS_ATTR_SPEAKER_MUTE,
+	SCE_VOICE_QOS_ATTR_DESIRED_OUT_BIT_RATE
+};
+
+enum SceVoiceQoSStatusId : s32
+{
+	SCE_VOICE_QOS_IN_BITRATE,
+	SCE_VOICE_QOS_OUT_BITRATE,
+	SCE_VOICE_QOS_OUT_READ_BITRATE,
+	SCE_VOICE_QOS_IN_FRAME_RECEIVED_RATIO,
+	SCE_VOICE_QOS_HEARTBEAT_FLAG
+};
+
+s32 sceVoiceQoSInit()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSEnd()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSCreateLocalEndpoint(vm::psv::ptr<SceVoiceQoSLocalId> pLocalId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSDeleteLocalEndpoint(SceVoiceQoSLocalId localId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSCreateRemoteEndpoint(vm::psv::ptr<SceVoiceQoSRemoteId> pRemoteId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSDeleteRemoteEndpoint(SceVoiceQoSRemoteId remoteId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSConnect(vm::psv::ptr<SceVoiceQoSConnectionId> pConnectionId, SceVoiceQoSLocalId localId, SceVoiceQoSRemoteId remoteId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSDisconnect(SceVoiceQoSConnectionId connectionId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSGetLocalEndpoint(SceVoiceQoSConnectionId connectionId, vm::psv::ptr<SceVoiceQoSLocalId> pLocalId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSGetRemoteEndpoint(SceVoiceQoSConnectionId connectionId, vm::psv::ptr<SceVoiceQoSRemoteId> pRemoteId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSSetLocalEndpointAttribute(SceVoiceQoSLocalId localId, SceVoiceQoSAttributeId attributeId, vm::psv::ptr<const void> pAttributeValue, s32 attributeSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSGetLocalEndpointAttribute(SceVoiceQoSLocalId localId, SceVoiceQoSAttributeId attributeId, vm::psv::ptr<void> pAttributeValue, s32 attributeSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSSetConnectionAttribute(SceVoiceQoSConnectionId connectionId, SceVoiceQoSAttributeId attributeId, vm::psv::ptr<const void> pAttributeValue, s32 attributeSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSGetConnectionAttribute(SceVoiceQoSConnectionId connectionId, SceVoiceQoSAttributeId attributeId, vm::psv::ptr<void> pAttributeValue, s32 attributeSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSGetStatus(SceVoiceQoSConnectionId connectionId, SceVoiceQoSStatusId statusId, vm::psv::ptr<void> pStatusValue, s32 statusSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSWritePacket(SceVoiceQoSConnectionId connectionId, vm::psv::ptr<const void> pData, vm::psv::ptr<u32> pSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceVoiceQoSReadPacket(SceVoiceQoSConnectionId connectionId, vm::psv::ptr<void> pData, vm::psv::ptr<u32> pSize)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceVoiceQoS, #name, name)
 
 psv_log_base sceVoiceQoS("SceVoiceQos", []()
@@ -12,21 +120,21 @@ psv_log_base sceVoiceQoS("SceVoiceQos", []()
 	sceVoiceQoS.on_unload = nullptr;
 	sceVoiceQoS.on_stop = nullptr;
 
-	//REG_FUNC(0x4B5FFF1C, sceVoiceQoSInit);
-	//REG_FUNC(0xFB0B747B, sceVoiceQoSEnd);
-	//REG_FUNC(0xAAB54BE4, sceVoiceQoSCreateLocalEndpoint);
-	//REG_FUNC(0x68FABF6F, sceVoiceQoSDeleteLocalEndpoint);
-	//REG_FUNC(0xBAB98727, sceVoiceQoSCreateRemoteEndpoint);
-	//REG_FUNC(0xC2F2C771, sceVoiceQoSDeleteRemoteEndpoint);
-	//REG_FUNC(0xE0C5CEEE, sceVoiceQoSConnect);
-	//REG_FUNC(0x3C7A08B0, sceVoiceQoSDisconnect);
-	//REG_FUNC(0xE5B4527D, sceVoiceQoSGetLocalEndpoint);
-	//REG_FUNC(0x876A9B9C, sceVoiceQoSGetRemoteEndpoint);
-	//REG_FUNC(0x540CEBA5, sceVoiceQoSSetLocalEndpointAttribute);
-	//REG_FUNC(0xC981AB3B, sceVoiceQoSGetLocalEndpointAttribute);
-	//REG_FUNC(0xE757806F, sceVoiceQoSSetConnectionAttribute);
-	//REG_FUNC(0xE81B8D44, sceVoiceQoSGetConnectionAttribute);
-	//REG_FUNC(0xC9DC1425, sceVoiceQoSGetStatus);
-	//REG_FUNC(0x2FE1F28F, sceVoiceQoSWritePacket);
-	//REG_FUNC(0x2D613549, sceVoiceQoSReadPacket);
+	REG_FUNC(0x4B5FFF1C, sceVoiceQoSInit);
+	REG_FUNC(0xFB0B747B, sceVoiceQoSEnd);
+	REG_FUNC(0xAAB54BE4, sceVoiceQoSCreateLocalEndpoint);
+	REG_FUNC(0x68FABF6F, sceVoiceQoSDeleteLocalEndpoint);
+	REG_FUNC(0xBAB98727, sceVoiceQoSCreateRemoteEndpoint);
+	REG_FUNC(0xC2F2C771, sceVoiceQoSDeleteRemoteEndpoint);
+	REG_FUNC(0xE0C5CEEE, sceVoiceQoSConnect);
+	REG_FUNC(0x3C7A08B0, sceVoiceQoSDisconnect);
+	REG_FUNC(0xE5B4527D, sceVoiceQoSGetLocalEndpoint);
+	REG_FUNC(0x876A9B9C, sceVoiceQoSGetRemoteEndpoint);
+	REG_FUNC(0x540CEBA5, sceVoiceQoSSetLocalEndpointAttribute);
+	REG_FUNC(0xC981AB3B, sceVoiceQoSGetLocalEndpointAttribute);
+	REG_FUNC(0xE757806F, sceVoiceQoSSetConnectionAttribute);
+	REG_FUNC(0xE81B8D44, sceVoiceQoSGetConnectionAttribute);
+	REG_FUNC(0xC9DC1425, sceVoiceQoSGetStatus);
+	REG_FUNC(0x2FE1F28F, sceVoiceQoSWritePacket);
+	REG_FUNC(0x2D613549, sceVoiceQoSReadPacket);
 });
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index fb672d63a6..69cbaaf944 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -339,6 +339,8 @@
     <ClInclude Include="Emu\ARMv7\Modules\sceGxm.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceIme.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\sceNet.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\sceSsl.h" />
     <ClInclude Include="Emu\ARMv7\PSVFuncList.h" />
     <ClInclude Include="Emu\ARMv7\PSVObjectList.h" />
     <ClInclude Include="Emu\Audio\AL\OpenALThread.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 6e45634fea..7935e1ddc6 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -1492,5 +1492,11 @@
     <ClInclude Include="Emu\ARMv7\Modules\sceIme.h">
       <Filter>Emu\CPU\ARMv7\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\ARMv7\Modules\sceNet.h">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\ARMv7\Modules\sceSsl.h">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 6cab4d7100abdd7c7bd41dcb18355cf2c8fb49d1 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 30 Jan 2015 15:19:01 +0300
Subject: [PATCH 57/70] Some functions added

---
 rpcs3/Emu/ARMv7/Modules/sceGxm.cpp           |  12 +-
 rpcs3/Emu/ARMv7/Modules/sceNet.h             |   6 +-
 rpcs3/Emu/ARMv7/Modules/sceNgs.cpp           | 549 ++++++++++++++++---
 rpcs3/Emu/ARMv7/Modules/sceRtc.cpp           | 260 +++++++--
 rpcs3/Emu/ARMv7/Modules/sceSas.cpp           | 204 ++++++-
 rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp | 276 +++++++++-
 rpcs3/Emu/ARMv7/Modules/sceTouch.cpp         |  35 +-
 rpcs3/Emu/ARMv7/Modules/sceTouch.h           |  36 ++
 rpcs3/Emu/ARMv7/Modules/sceVoice.cpp         |   2 +-
 rpcs3/Emu/Memory/vm_ptr.h                    |   2 +
 rpcs3/Emu/SysCalls/Modules/sceNp.h           |   2 +-
 rpcs3/Emu/SysCalls/Modules/sceNpClans.h      |   2 +-
 rpcs3/emucore.vcxproj                        |   1 +
 rpcs3/emucore.vcxproj.filters                |   3 +
 14 files changed, 1199 insertions(+), 191 deletions(-)
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceTouch.h

diff --git a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp
index 3614803537..f65f49b349 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp
@@ -257,23 +257,23 @@ void sceGxmSetBackPolygonMode(vm::psv::ptr<SceGxmContext> context, SceGxmPolygon
 	throw __FUNCTION__;
 }
 
-void sceGxmSetFrontStencilFunc(vm::psv::ptr<SceGxmContext> context, SceGxmStencilFunc func, SceGxmStencilOp stencilFail, SceGxmStencilOp depthFail, SceGxmStencilOp depthPass, uint8_t compareMask, uint8_t writeMask)
+void sceGxmSetFrontStencilFunc(vm::psv::ptr<SceGxmContext> context, SceGxmStencilFunc func, SceGxmStencilOp stencilFail, SceGxmStencilOp depthFail, SceGxmStencilOp depthPass, u8 compareMask, u8 writeMask)
 {
 	throw __FUNCTION__;
 }
 
 
-void sceGxmSetBackStencilFunc(vm::psv::ptr<SceGxmContext> context, SceGxmStencilFunc func, SceGxmStencilOp stencilFail, SceGxmStencilOp depthFail, SceGxmStencilOp depthPass, uint8_t compareMask, uint8_t writeMask)
+void sceGxmSetBackStencilFunc(vm::psv::ptr<SceGxmContext> context, SceGxmStencilFunc func, SceGxmStencilOp stencilFail, SceGxmStencilOp depthFail, SceGxmStencilOp depthPass, u8 compareMask, u8 writeMask)
 {
 	throw __FUNCTION__;
 }
 
-void sceGxmSetFrontDepthBias(vm::psv::ptr<SceGxmContext> context, int32_t factor, int32_t units)
+void sceGxmSetFrontDepthBias(vm::psv::ptr<SceGxmContext> context, s32 factor, s32 units)
 {
 	throw __FUNCTION__;
 }
 
-void sceGxmSetBackDepthBias(vm::psv::ptr<SceGxmContext> context, int32_t factor, int32_t units)
+void sceGxmSetBackDepthBias(vm::psv::ptr<SceGxmContext> context, s32 factor, s32 units)
 {
 	throw __FUNCTION__;
 }
@@ -463,12 +463,12 @@ s32 sceGxmDepthStencilSurfaceInitDisabled(vm::psv::ptr<SceGxmDepthStencilSurface
 //	throw __FUNCTION__;
 //}
 
-uint8_t sceGxmDepthStencilSurfaceGetBackgroundStencil(vm::psv::ptr<const SceGxmDepthStencilSurface> surface)
+u8 sceGxmDepthStencilSurfaceGetBackgroundStencil(vm::psv::ptr<const SceGxmDepthStencilSurface> surface)
 {
 	throw __FUNCTION__;
 }
 
-void sceGxmDepthStencilSurfaceSetBackgroundStencil(vm::psv::ptr<SceGxmDepthStencilSurface> surface, uint8_t backgroundStencil)
+void sceGxmDepthStencilSurfaceSetBackgroundStencil(vm::psv::ptr<SceGxmDepthStencilSurface> surface, u8 backgroundStencil)
 {
 	throw __FUNCTION__;
 }
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNet.h b/rpcs3/Emu/ARMv7/Modules/sceNet.h
index 1d30bdfdd0..6dc25e1ea9 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNet.h
+++ b/rpcs3/Emu/ARMv7/Modules/sceNet.h
@@ -35,15 +35,15 @@ struct SceNetSockaddr
 struct SceNetEpollDataExt
 {
 	s32 id;
-	u32 u32;
+	u32 data;
 };
 
 union SceNetEpollData
 {
 	vm::psv::ptr<void> ptr;
 	s32 fd;
-	u32 u32;
-	u64 u64;
+	u32 _u32;
+	u64 _u64;
 	SceNetEpollDataExt ext;
 };
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp b/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp
index 5798792b12..f09993ba24 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceNgs.cpp
@@ -4,6 +4,431 @@
 
 extern psv_log_base sceNgs;
 
+struct SceNgsVoiceDefinition;
+
+typedef u32 SceNgsModuleID;
+typedef u32 SceNgsParamsID;
+typedef vm::psv::ptr<void> SceNgsHVoice;
+typedef vm::psv::ptr<void> SceNgsHPatch;
+typedef vm::psv::ptr<void> SceNgsHSynSystem;
+typedef vm::psv::ptr<void> SceNgsHRack;
+
+struct SceNgsModuleParamHeader
+{
+	s32 moduleId;
+	s32 chan;
+};
+
+struct SceNgsParamsDescriptor
+{
+	SceNgsParamsID id;
+	u32 size;
+};
+
+struct SceNgsBufferInfo
+{
+	vm::psv::ptr<void> data;
+	u32 size;
+};
+
+struct SceNgsVoicePreset
+{
+	s32 nNameOffset;
+	u32 uNameLength;
+	s32 nPresetDataOffset;
+	u32 uSizePresetData;
+	s32 nBypassFlagsOffset;
+	u32 uNumBypassFlags;
+};
+
+struct SceNgsSystemInitParams
+{
+	s32 nMaxRacks;
+	s32 nMaxVoices;
+	s32 nGranularity;
+	s32 nSampleRate;
+	s32 nMaxModules;
+};
+
+struct SceNgsRackDescription
+{
+	vm::psv::ptr<const SceNgsVoiceDefinition> pVoiceDefn;
+	s32 nVoices;
+	s32 nChannelsPerVoice;
+	s32 nMaxPatchesPerInput;
+	s32 nPatchesPerOutput;
+	vm::psv::ptr<void> pUserReleaseData;
+};
+
+struct SceNgsPatchSetupInfo
+{
+	SceNgsHVoice hVoiceSource;
+	s32 nSourceOutputIndex;
+	s32 nSourceOutputSubIndex;
+	SceNgsHVoice hVoiceDestination;
+	s32 nTargetInputIndex;
+};
+
+struct SceNgsVolumeMatrix
+{
+	float m[2][2];
+};
+
+struct SceNgsPatchRouteInfo
+{
+	s32 nOutputChannels;
+	s32 nInputChannels;
+	SceNgsVolumeMatrix vols;
+};
+
+struct SceNgsVoiceInfo
+{
+	u32 uVoiceState;
+	u32 uNumModules;
+	u32 uNumInputs;
+	u32 uNumOutputs;
+	u32 uNumPatchesPerOutput;
+};
+
+struct SceNgsCallbackInfo
+{
+	SceNgsHVoice hVoiceHandle;
+	SceNgsHRack hRackHandle;
+	SceNgsModuleID uModuleID;
+	s32 nCallbackData;
+	s32 nCallbackData2;
+	vm::psv::ptr<void> pCallbackPtr;
+	vm::psv::ptr<void> pUserData;
+};
+
+typedef vm::psv::ptr<void(vm::psv::ptr<const SceNgsCallbackInfo> pCallbackInfo)> SceNgsCallbackFunc;
+
+typedef SceNgsCallbackFunc SceNgsRackReleaseCallbackFunc;
+typedef SceNgsCallbackFunc SceNgsModuleCallbackFunc;
+typedef SceNgsCallbackFunc SceNgsParamsErrorCallbackFunc;
+
+struct SceSulphaNgsConfig
+{
+	u32 maxNamedObjects;
+	u32 maxTraceBufferBytes;
+};
+
+s32 sceNgsSystemGetRequiredMemorySize(vm::psv::ptr<const SceNgsSystemInitParams> pSynthParams, vm::psv::ptr<u32> pnSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsSystemInit(vm::psv::ptr<void> pSynthSysMemory, const u32 uMemSize, vm::psv::ptr<const SceNgsSystemInitParams> pSynthParams, vm::psv::ptr<SceNgsHSynSystem> pSystemHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsSystemUpdate(SceNgsHSynSystem hSystemHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsSystemRelease(SceNgsHSynSystem hSystemHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsSystemLock(SceNgsHSynSystem hSystemHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsSystemUnlock(SceNgsHSynSystem hSystemHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsSystemSetParamErrorCallback(SceNgsHSynSystem hSystemHandle, const SceNgsParamsErrorCallbackFunc callbackFuncPtr)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsSystemSetFlags(SceNgsHSynSystem hSystemHandle, const u32 uSystemFlags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsRackGetRequiredMemorySize(SceNgsHSynSystem hSystemHandle, vm::psv::ptr<const SceNgsRackDescription> pRackDesc, vm::psv::ptr<u32> pnSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsRackInit(SceNgsHSynSystem hSystemHandle, vm::psv::ptr<SceNgsBufferInfo> pRackBuffer, vm::psv::ptr<const SceNgsRackDescription> pRackDesc, vm::psv::ptr<SceNgsHRack> pRackHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsRackGetVoiceHandle(SceNgsHRack hRackHandle, const u32 uIndex, vm::psv::ptr<SceNgsHVoice> pVoiceHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsRackRelease(SceNgsHRack hRackHandle, const SceNgsRackReleaseCallbackFunc callbackFuncPtr)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsRackSetParamErrorCallback(SceNgsHRack hRackHandle, const SceNgsParamsErrorCallbackFunc callbackFuncPtr)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceInit(SceNgsHVoice hVoiceHandle, vm::psv::ptr<const SceNgsVoicePreset> pPreset, const u32 uInitFlags)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoicePlay(SceNgsHVoice hVoiceHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceKeyOff(SceNgsHVoice hVoiceHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceKill(SceNgsHVoice hVoiceHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoicePause(SceNgsHVoice hVoiceHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceResume(SceNgsHVoice hVoiceHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceSetPreset(SceNgsHVoice hVoiceHandle, vm::psv::ptr<const SceNgsVoicePreset> pVoicePreset)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceLockParams(SceNgsHVoice hVoiceHandle, const u32 uModule, const SceNgsParamsID uParamsInterfaceId, vm::psv::ptr<SceNgsBufferInfo> pParamsBuffer)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceUnlockParams(SceNgsHVoice hVoiceHandle, const u32 uModule)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceSetParamsBlock(SceNgsHVoice hVoiceHandle, vm::psv::ptr<const SceNgsModuleParamHeader> pParamData, const u32 uSize, vm::psv::ptr<s32> pnErrorCount)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceBypassModule(SceNgsHVoice hVoiceHandle, const u32 uModule, const u32 uBypassFlag)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceSetModuleCallback(SceNgsHVoice hVoiceHandle, const u32 uModule, const SceNgsModuleCallbackFunc callbackFuncPtr, vm::psv::ptr<void> pUserData)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceSetFinishedCallback(SceNgsHVoice hVoiceHandle, const SceNgsCallbackFunc callbackFuncPtr, vm::psv::ptr<void> pUserData)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceGetStateData(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::psv::ptr<void> pMem, const u32 uMemSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceGetInfo(SceNgsHVoice hVoiceHandle, vm::psv::ptr<SceNgsVoiceInfo> pInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceGetModuleType(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::psv::ptr<SceNgsModuleID> pModuleType)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceGetModuleBypass(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::psv::ptr<u32> puBypassFlag)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceGetParamsOutOfRange(SceNgsHVoice hVoiceHandle, const u32 uModule, vm::psv::ptr<char> pszMessageBuffer)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsPatchCreateRouting(vm::psv::ptr<const SceNgsPatchSetupInfo> pPatchInfo, vm::psv::ptr<SceNgsHPatch> pPatchHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsPatchGetInfo(SceNgsHPatch hPatchHandle, vm::psv::ptr<SceNgsPatchRouteInfo> pRouteInfo, vm::psv::ptr<SceNgsPatchSetupInfo> pSetup)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoiceGetOutputPatch(SceNgsHVoice hVoiceHandle, const s32 nOutputIndex, const s32 nSubIndex, vm::psv::ptr<SceNgsHPatch> pPatchHandle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsPatchRemoveRouting(SceNgsHPatch hPatchHandle)
+{
+	throw __FUNCTION__;
+}
+
+//s32 sceNgsVoicePatchSetVolume(SceNgsHPatch hPatchHandle, const s32 nOutputChannel, const s32 nInputChannel, const float fVol)
+//{
+//	throw __FUNCTION__;
+//}
+
+s32 sceNgsVoicePatchSetVolumes(SceNgsHPatch hPatchHandle, const s32 nOutputChannel, vm::psv::ptr<const float> pVolumes, const s32 nVols)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsVoicePatchSetVolumesMatrix(SceNgsHPatch hPatchHandle, vm::psv::ptr<const SceNgsVolumeMatrix> pMatrix)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsModuleGetNumPresets(SceNgsHSynSystem hSystemHandle, const SceNgsModuleID uModuleID, vm::psv::ptr<u32> puNumPresets)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNgsModuleGetPreset(SceNgsHSynSystem hSystemHandle, const SceNgsModuleID uModuleID, const u32 uPresetIndex, vm::psv::ptr<SceNgsBufferInfo> pParamsBuffer)
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetCompressorBuss()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetCompressorSideChainBuss()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetDelayBuss()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetDistortionBuss()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetEnvelopeBuss()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetEqBuss()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetMasterBuss()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetMixerBuss()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetPauserBuss()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetReverbBuss()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetSasEmuVoice()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetSimpleVoice()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetTemplate1()
+{
+	throw __FUNCTION__;
+}
+
+vm::psv::ptr<const SceNgsVoiceDefinition> sceNgsVoiceDefGetAtrac9Voice()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaNgsGetDefaultConfig(vm::psv::ptr<SceSulphaNgsConfig> config)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaNgsGetNeededMemory(vm::psv::ptr<const SceSulphaNgsConfig> config, vm::psv::ptr<u32> sizeInBytes)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaNgsInit(vm::psv::ptr<const SceSulphaNgsConfig> config, vm::psv::ptr<void> buffer, u32 sizeInBytes)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaNgsShutdown()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaNgsSetSynthName(SceNgsHSynSystem synthHandle, vm::psv::ptr<const char> name)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaNgsSetRackName(SceNgsHRack rackHandle, vm::psv::ptr<const char> name)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaNgsSetVoiceName(SceNgsHVoice voiceHandle, vm::psv::ptr<const char> name)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaNgsSetSampleName(vm::psv::ptr<const void> location, u32 length, vm::psv::ptr<const char> name)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSulphaNgsTrace(vm::psv::ptr<const char> message)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNgs, #name, name)
 
 psv_log_base sceNgs("SceNgs", []()
@@ -12,67 +437,67 @@ psv_log_base sceNgs("SceNgs", []()
 	sceNgs.on_unload = nullptr;
 	sceNgs.on_stop = nullptr;
 
-	//REG_FUNC(0x6CE8B36F, sceNgsSystemGetRequiredMemorySize);
-	//REG_FUNC(0xED14CF4A, sceNgsSystemInit);
-	//REG_FUNC(0x684F080C, sceNgsSystemUpdate);
-	//REG_FUNC(0x4A25BEBC, sceNgsSystemRelease);
-	//REG_FUNC(0xB9D971F2, sceNgsSystemLock);
-	//REG_FUNC(0x0A93EA96, sceNgsSystemUnlock);
-	//REG_FUNC(0x5ADD22DC, sceNgsSystemSetParamErrorCallback);
-	//REG_FUNC(0x64D80013, sceNgsSystemSetFlags);
-	//REG_FUNC(0x477318C0, sceNgsRackGetRequiredMemorySize);
-	//REG_FUNC(0x0A92E4EC, sceNgsRackInit);
-	//REG_FUNC(0xFE1A98E9, sceNgsRackGetVoiceHandle);
-	//REG_FUNC(0xDD5CA10B, sceNgsRackRelease);
-	//REG_FUNC(0x534B6E3F, sceNgsRackSetParamErrorCallback);
-	//REG_FUNC(0x1DDBEBEB, sceNgsVoiceInit);
-	//REG_FUNC(0xFA0A0F34, sceNgsVoicePlay);
-	//REG_FUNC(0xBB13373D, sceNgsVoiceKeyOff);
-	//REG_FUNC(0x0E291AAD, sceNgsVoiceKill);
-	//REG_FUNC(0xD7786E99, sceNgsVoicePause);
-	//REG_FUNC(0x54CFB981, sceNgsVoiceResume);
-	//REG_FUNC(0x8A88E665, sceNgsVoiceSetPreset);
-	//REG_FUNC(0xAB6BEF8F, sceNgsVoiceLockParams);
-	//REG_FUNC(0x3D46D8A7, sceNgsVoiceUnlockParams);
-	//REG_FUNC(0xFB8174B1, sceNgsVoiceSetParamsBlock);
-	//REG_FUNC(0x9AB87E71, sceNgsVoiceBypassModule);
-	//REG_FUNC(0x24E909A8, sceNgsVoiceSetModuleCallback);
-	//REG_FUNC(0x17A6F564, sceNgsVoiceSetFinishedCallback);
-	//REG_FUNC(0xC9B8C0B4, sceNgsVoiceGetStateData);
-	//REG_FUNC(0x5551410D, sceNgsVoiceGetInfo);
-	//REG_FUNC(0xB307185E, sceNgsVoiceGetModuleType);
-	//REG_FUNC(0x431BF3AB, sceNgsVoiceGetModuleBypass);
-	//REG_FUNC(0xD668B49C, sceNgsPatchCreateRouting);
-	//REG_FUNC(0x98703DBC, sceNgsPatchGetInfo);
-	//REG_FUNC(0x01A52E3A, sceNgsVoiceGetOutputPatch);
-	//REG_FUNC(0xD0C9AE5A, sceNgsPatchRemoveRouting);
+	REG_FUNC(0x6CE8B36F, sceNgsSystemGetRequiredMemorySize);
+	REG_FUNC(0xED14CF4A, sceNgsSystemInit);
+	REG_FUNC(0x684F080C, sceNgsSystemUpdate);
+	REG_FUNC(0x4A25BEBC, sceNgsSystemRelease);
+	REG_FUNC(0xB9D971F2, sceNgsSystemLock);
+	REG_FUNC(0x0A93EA96, sceNgsSystemUnlock);
+	REG_FUNC(0x5ADD22DC, sceNgsSystemSetParamErrorCallback);
+	REG_FUNC(0x64D80013, sceNgsSystemSetFlags);
+	REG_FUNC(0x477318C0, sceNgsRackGetRequiredMemorySize);
+	REG_FUNC(0x0A92E4EC, sceNgsRackInit);
+	REG_FUNC(0xFE1A98E9, sceNgsRackGetVoiceHandle);
+	REG_FUNC(0xDD5CA10B, sceNgsRackRelease);
+	REG_FUNC(0x534B6E3F, sceNgsRackSetParamErrorCallback);
+	REG_FUNC(0x1DDBEBEB, sceNgsVoiceInit);
+	REG_FUNC(0xFA0A0F34, sceNgsVoicePlay);
+	REG_FUNC(0xBB13373D, sceNgsVoiceKeyOff);
+	REG_FUNC(0x0E291AAD, sceNgsVoiceKill);
+	REG_FUNC(0xD7786E99, sceNgsVoicePause);
+	REG_FUNC(0x54CFB981, sceNgsVoiceResume);
+	REG_FUNC(0x8A88E665, sceNgsVoiceSetPreset);
+	REG_FUNC(0xAB6BEF8F, sceNgsVoiceLockParams);
+	REG_FUNC(0x3D46D8A7, sceNgsVoiceUnlockParams);
+	REG_FUNC(0xFB8174B1, sceNgsVoiceSetParamsBlock);
+	REG_FUNC(0x9AB87E71, sceNgsVoiceBypassModule);
+	REG_FUNC(0x24E909A8, sceNgsVoiceSetModuleCallback);
+	REG_FUNC(0x17A6F564, sceNgsVoiceSetFinishedCallback);
+	REG_FUNC(0xC9B8C0B4, sceNgsVoiceGetStateData);
+	REG_FUNC(0x5551410D, sceNgsVoiceGetInfo);
+	REG_FUNC(0xB307185E, sceNgsVoiceGetModuleType);
+	REG_FUNC(0x431BF3AB, sceNgsVoiceGetModuleBypass);
+	REG_FUNC(0xD668B49C, sceNgsPatchCreateRouting);
+	REG_FUNC(0x98703DBC, sceNgsPatchGetInfo);
+	REG_FUNC(0x01A52E3A, sceNgsVoiceGetOutputPatch);
+	REG_FUNC(0xD0C9AE5A, sceNgsPatchRemoveRouting);
 	//REG_FUNC(0xA3C807BC, sceNgsVoicePatchSetVolume);
-	//REG_FUNC(0xBD6F57F0, sceNgsVoicePatchSetVolumes);
-	//REG_FUNC(0xA0F5402D, sceNgsVoicePatchSetVolumesMatrix);
-	//REG_FUNC(0xF6B68C31, sceNgsVoiceDefGetEnvelopeBuss);
-	//REG_FUNC(0x9DCF50F5, sceNgsVoiceDefGetReverbBuss);
-	//REG_FUNC(0x214485D6, sceNgsVoiceDefGetPauserBuss);
-	//REG_FUNC(0xE0AC8776, sceNgsVoiceDefGetMixerBuss);
-	//REG_FUNC(0x79A121D1, sceNgsVoiceDefGetMasterBuss);
-	//REG_FUNC(0x0E0ACB68, sceNgsVoiceDefGetCompressorBuss);
-	//REG_FUNC(0x1AF83512, sceNgsVoiceDefGetCompressorSideChainBuss);
-	//REG_FUNC(0xAAD90DEB, sceNgsVoiceDefGetDistortionBuss);
-	//REG_FUNC(0xF964120E, sceNgsVoiceDefGetEqBuss);
-	//REG_FUNC(0xE9B572B7, sceNgsVoiceDefGetTemplate1);
-	//REG_FUNC(0x0D5399CF, sceNgsVoiceDefGetSimpleVoice);
-	//REG_FUNC(0x1F51C2BA, sceNgsVoiceDefGetSasEmuVoice);
-	//REG_FUNC(0x4CBE08F3, sceNgsVoiceGetParamsOutOfRange);
-	//REG_FUNC(0x14EF65A0, sceNgsVoiceDefGetAtrac9Voice);
-	//REG_FUNC(0x4D705E3E, sceNgsVoiceDefGetDelayBuss);
-	//REG_FUNC(0x5FD8AEDB, sceSulphaNgsGetDefaultConfig);
-	//REG_FUNC(0x793E3E8C, sceSulphaNgsGetNeededMemory);
-	//REG_FUNC(0xAFCD824F, sceSulphaNgsInit);
-	//REG_FUNC(0xD124BFB1, sceSulphaNgsShutdown);
-	//REG_FUNC(0x2F3F7515, sceSulphaNgsSetSynthName);
-	//REG_FUNC(0x251AF6A9, sceSulphaNgsSetRackName);
-	//REG_FUNC(0x508975BD, sceSulphaNgsSetVoiceName);
-	//REG_FUNC(0x54EC5B8D, sceSulphaNgsSetSampleName);
-	//REG_FUNC(0xDC7C0F05, sceSulphaNgsTrace);
-	//REG_FUNC(0x5C71FE09, sceNgsModuleGetNumPresets);
-	//REG_FUNC(0xC58298A7, sceNgsModuleGetPreset);
+	REG_FUNC(0xBD6F57F0, sceNgsVoicePatchSetVolumes);
+	REG_FUNC(0xA0F5402D, sceNgsVoicePatchSetVolumesMatrix);
+	REG_FUNC(0xF6B68C31, sceNgsVoiceDefGetEnvelopeBuss);
+	REG_FUNC(0x9DCF50F5, sceNgsVoiceDefGetReverbBuss);
+	REG_FUNC(0x214485D6, sceNgsVoiceDefGetPauserBuss);
+	REG_FUNC(0xE0AC8776, sceNgsVoiceDefGetMixerBuss);
+	REG_FUNC(0x79A121D1, sceNgsVoiceDefGetMasterBuss);
+	REG_FUNC(0x0E0ACB68, sceNgsVoiceDefGetCompressorBuss);
+	REG_FUNC(0x1AF83512, sceNgsVoiceDefGetCompressorSideChainBuss);
+	REG_FUNC(0xAAD90DEB, sceNgsVoiceDefGetDistortionBuss);
+	REG_FUNC(0xF964120E, sceNgsVoiceDefGetEqBuss);
+	REG_FUNC(0xE9B572B7, sceNgsVoiceDefGetTemplate1);
+	REG_FUNC(0x0D5399CF, sceNgsVoiceDefGetSimpleVoice);
+	REG_FUNC(0x1F51C2BA, sceNgsVoiceDefGetSasEmuVoice);
+	REG_FUNC(0x4CBE08F3, sceNgsVoiceGetParamsOutOfRange);
+	REG_FUNC(0x14EF65A0, sceNgsVoiceDefGetAtrac9Voice);
+	REG_FUNC(0x4D705E3E, sceNgsVoiceDefGetDelayBuss);
+	REG_FUNC(0x5FD8AEDB, sceSulphaNgsGetDefaultConfig);
+	REG_FUNC(0x793E3E8C, sceSulphaNgsGetNeededMemory);
+	REG_FUNC(0xAFCD824F, sceSulphaNgsInit);
+	REG_FUNC(0xD124BFB1, sceSulphaNgsShutdown);
+	REG_FUNC(0x2F3F7515, sceSulphaNgsSetSynthName);
+	REG_FUNC(0x251AF6A9, sceSulphaNgsSetRackName);
+	REG_FUNC(0x508975BD, sceSulphaNgsSetVoiceName);
+	REG_FUNC(0x54EC5B8D, sceSulphaNgsSetSampleName);
+	REG_FUNC(0xDC7C0F05, sceSulphaNgsTrace);
+	REG_FUNC(0x5C71FE09, sceNgsModuleGetNumPresets);
+	REG_FUNC(0xC58298A7, sceNgsModuleGetPreset);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp b/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp
index 72d81d8e15..96d44a3686 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp
@@ -4,6 +4,192 @@
 
 extern psv_log_base sceRtc;
 
+u32 sceRtcGetTickResolution()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcGetCurrentTick(vm::psv::ptr<u64> pTick)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcGetCurrentClock(vm::psv::ptr<SceDateTime> pTime, s32 iTimeZone)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcGetCurrentClockLocalTime(vm::psv::ptr<SceDateTime> pTime)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcGetCurrentNetworkTick(vm::psv::ptr<u64> pTick)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcConvertUtcToLocalTime(vm::psv::ptr<const u64> pUtc, vm::psv::ptr<u64> pLocalTime)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcConvertLocalTimeToUtc(vm::psv::ptr<const u64> pLocalTime, vm::psv::ptr<u64> pUtc)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcIsLeapYear(s32 year)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcGetDaysInMonth(s32 year, s32 month)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcGetDayOfWeek(s32 year, s32 month, s32 day)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcCheckValid(vm::psv::ptr<const SceDateTime> pTime)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcSetTime_t(vm::psv::ptr<SceDateTime> pTime, time_t iTime)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcSetTime64_t(vm::psv::ptr<SceDateTime> pTime, u64 ullTime)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcGetTime_t(vm::psv::ptr<const SceDateTime> pTime, vm::psv::ptr<time_t> piTime)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcGetTime64_t(vm::psv::ptr<const SceDateTime> pTime, vm::psv::ptr<u64> pullTime)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcSetDosTime(vm::psv::ptr<SceDateTime> pTime, u32 uiDosTime)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcGetDosTime(vm::psv::ptr<const SceDateTime> pTime, vm::psv::ptr<u32> puiDosTime)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcSetWin32FileTime(vm::psv::ptr<SceDateTime> pTime, u64 ulWin32Time)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcGetWin32FileTime(vm::psv::ptr<const SceDateTime> pTime, vm::psv::ptr<u64> ulWin32Time)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcSetTick(vm::psv::ptr<SceDateTime> pTime, vm::psv::ptr<const u64> pTick)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcGetTick(vm::psv::ptr<const SceDateTime> pTime, vm::psv::ptr<u64> pTick)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcCompareTick(vm::psv::ptr<const u64> pTick1, vm::psv::ptr<const u64> pTick2)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcTickAddTicks(vm::psv::ptr<u64> pTick0, vm::psv::ptr<const u64> pTick1, u64 lAdd)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcTickAddMicroseconds(vm::psv::ptr<u64> pTick0, vm::psv::ptr<const u64> pTick1, u64 lAdd)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcTickAddSeconds(vm::psv::ptr<u64> pTick0, vm::psv::ptr<const u64> pTick1, u64 lAdd)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcTickAddMinutes(vm::psv::ptr<u64> pTick0, vm::psv::ptr<const u64> pTick1, u64 lAdd)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcTickAddHours(vm::psv::ptr<u64> pTick0, vm::psv::ptr<const u64> pTick1, s32 lAdd)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcTickAddDays(vm::psv::ptr<u64> pTick0, vm::psv::ptr<const u64> pTick1, s32 lAdd)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcTickAddWeeks(vm::psv::ptr<u64> pTick0, vm::psv::ptr<const u64> pTick1, s32 lAdd)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcTickAddMonths(vm::psv::ptr<u64> pTick0, vm::psv::ptr<const u64> pTick1, s32 lAdd)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcTickAddYears(vm::psv::ptr<u64> pTick0, vm::psv::ptr<const u64> pTick1, s32 lAdd)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcFormatRFC2822(vm::psv::ptr<char> pszDateTime, vm::psv::ptr<const u64> pUtc, s32 iTimeZoneMinutes)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcFormatRFC2822LocalTime(vm::psv::ptr<char> pszDateTime, vm::psv::ptr<const u64> pUtc)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcFormatRFC3339(vm::psv::ptr<char> pszDateTime, vm::psv::ptr<const u64> pUtc, s32 iTimeZoneMinutes)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcFormatRFC3339LocalTime(vm::psv::ptr<char> pszDateTime, vm::psv::ptr<const u64> pUtc)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcParseDateTime(vm::psv::ptr<u64> pUtc, vm::psv::ptr<const char> pszDateTime)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceRtcParseRFC3339(vm::psv::ptr<u64> pUtc, vm::psv::ptr<const char> pszDateTime)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceRtc, #name, name)
 
 psv_log_base sceRtc("SceRtc", []()
@@ -12,41 +198,41 @@ psv_log_base sceRtc("SceRtc", []()
 	sceRtc.on_unload = nullptr;
 	sceRtc.on_stop = nullptr;
 
-	//REG_FUNC(0x23F79274, sceRtcGetCurrentTick);
-	//REG_FUNC(0xCDDD25FE, sceRtcGetCurrentNetworkTick);
-	//REG_FUNC(0x70FDE8F1, sceRtcGetCurrentClock);
-	//REG_FUNC(0x0572EDDC, sceRtcGetCurrentClockLocalTime);
-	//REG_FUNC(0x1282C436, sceRtcConvertUtcToLocalTime);
-	//REG_FUNC(0x0A05E201, sceRtcConvertLocalTimeToUtc);
-	//REG_FUNC(0x42CA8EB5, sceRtcFormatRFC2822LocalTime);
-	//REG_FUNC(0x147F2138, sceRtcFormatRFC2822);
-	//REG_FUNC(0x742250A9, sceRtcFormatRFC3339LocalTime);
-	//REG_FUNC(0xCCEA2B54, sceRtcFormatRFC3339);
-	//REG_FUNC(0xF17FD8B5, sceRtcIsLeapYear);
-	//REG_FUNC(0x49EB4556, sceRtcGetDaysInMonth);
-	//REG_FUNC(0x2F3531EB, sceRtcGetDayOfWeek);
-	//REG_FUNC(0xD7622935, sceRtcCheckValid);
-	//REG_FUNC(0x3A332F81, sceRtcSetTime_t);
-	//REG_FUNC(0xA6C36B6A, sceRtcSetTime64_t);
-	//REG_FUNC(0x8DE6FEB7, sceRtcGetTime_t);
-	//REG_FUNC(0xC995DE02, sceRtcGetTime64_t);
-	//REG_FUNC(0xF8B22B07, sceRtcSetDosTime);
-	//REG_FUNC(0x92ABEBAF, sceRtcGetDosTime);
-	//REG_FUNC(0xA79A8846, sceRtcSetWin32FileTime);
-	//REG_FUNC(0x8A95E119, sceRtcGetWin32FileTime);
-	//REG_FUNC(0x811313B3, sceRtcGetTickResolution);
-	//REG_FUNC(0xCD89F464, sceRtcSetTick);
-	//REG_FUNC(0xF2B238E2, sceRtcGetTick);
-	//REG_FUNC(0xC7385158, sceRtcCompareTick);
-	//REG_FUNC(0x4559E2DB, sceRtcTickAddTicks);
-	//REG_FUNC(0xAE26D920, sceRtcTickAddMicroseconds);
-	//REG_FUNC(0x979AFD79, sceRtcTickAddSeconds);
-	//REG_FUNC(0x4C358871, sceRtcTickAddMinutes);
-	//REG_FUNC(0x6F193F55, sceRtcTickAddHours);
-	//REG_FUNC(0x58DE3C70, sceRtcTickAddDays);
-	//REG_FUNC(0xE713C640, sceRtcTickAddWeeks);
-	//REG_FUNC(0x6321B4AA, sceRtcTickAddMonths);
-	//REG_FUNC(0xDF6C3E1B, sceRtcTickAddYears);
-	//REG_FUNC(0x2347CE12, sceRtcParseDateTime);
-	//REG_FUNC(0x2D18AEEC, sceRtcParseRFC3339);
+	REG_FUNC(0x23F79274, sceRtcGetCurrentTick);
+	REG_FUNC(0xCDDD25FE, sceRtcGetCurrentNetworkTick);
+	REG_FUNC(0x70FDE8F1, sceRtcGetCurrentClock);
+	REG_FUNC(0x0572EDDC, sceRtcGetCurrentClockLocalTime);
+	REG_FUNC(0x1282C436, sceRtcConvertUtcToLocalTime);
+	REG_FUNC(0x0A05E201, sceRtcConvertLocalTimeToUtc);
+	REG_FUNC(0x42CA8EB5, sceRtcFormatRFC2822LocalTime);
+	REG_FUNC(0x147F2138, sceRtcFormatRFC2822);
+	REG_FUNC(0x742250A9, sceRtcFormatRFC3339LocalTime);
+	REG_FUNC(0xCCEA2B54, sceRtcFormatRFC3339);
+	REG_FUNC(0xF17FD8B5, sceRtcIsLeapYear);
+	REG_FUNC(0x49EB4556, sceRtcGetDaysInMonth);
+	REG_FUNC(0x2F3531EB, sceRtcGetDayOfWeek);
+	REG_FUNC(0xD7622935, sceRtcCheckValid);
+	REG_FUNC(0x3A332F81, sceRtcSetTime_t);
+	REG_FUNC(0xA6C36B6A, sceRtcSetTime64_t);
+	REG_FUNC(0x8DE6FEB7, sceRtcGetTime_t);
+	REG_FUNC(0xC995DE02, sceRtcGetTime64_t);
+	REG_FUNC(0xF8B22B07, sceRtcSetDosTime);
+	REG_FUNC(0x92ABEBAF, sceRtcGetDosTime);
+	REG_FUNC(0xA79A8846, sceRtcSetWin32FileTime);
+	REG_FUNC(0x8A95E119, sceRtcGetWin32FileTime);
+	REG_FUNC(0x811313B3, sceRtcGetTickResolution);
+	REG_FUNC(0xCD89F464, sceRtcSetTick);
+	REG_FUNC(0xF2B238E2, sceRtcGetTick);
+	REG_FUNC(0xC7385158, sceRtcCompareTick);
+	REG_FUNC(0x4559E2DB, sceRtcTickAddTicks);
+	REG_FUNC(0xAE26D920, sceRtcTickAddMicroseconds);
+	REG_FUNC(0x979AFD79, sceRtcTickAddSeconds);
+	REG_FUNC(0x4C358871, sceRtcTickAddMinutes);
+	REG_FUNC(0x6F193F55, sceRtcTickAddHours);
+	REG_FUNC(0x58DE3C70, sceRtcTickAddDays);
+	REG_FUNC(0xE713C640, sceRtcTickAddWeeks);
+	REG_FUNC(0x6321B4AA, sceRtcTickAddMonths);
+	REG_FUNC(0xDF6C3E1B, sceRtcTickAddYears);
+	REG_FUNC(0x2347CE12, sceRtcParseDateTime);
+	REG_FUNC(0x2D18AEEC, sceRtcParseRFC3339);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSas.cpp b/rpcs3/Emu/ARMv7/Modules/sceSas.cpp
index 0db6b65e16..3d11ff98f1 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSas.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceSas.cpp
@@ -4,6 +4,152 @@
 
 extern psv_log_base sceSas;
 
+s32 sceSasGetNeededMemorySize(vm::psv::ptr<const char> config, vm::psv::ptr<u32> outSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasInit(vm::psv::ptr<const char> config, vm::psv::ptr<void> buffer, u32 bufferSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasInitWithGrain(vm::psv::ptr<const char> config, u32 grain, vm::psv::ptr<void> buffer, u32 bufferSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasExit(vm::psv::ptr<vm::psv::ptr<void>> outBuffer, vm::psv::ptr<u32> outBufferSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetGrain(u32 grain)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasGetGrain()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetOutputmode(u32 outputmode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasGetOutputmode()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasCore(vm::psv::ptr<s16> out)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasCoreWithMix(vm::psv::ptr<s16> inOut, s32 lvol, s32 rvol)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetVoice(s32 iVoiceNum, vm::psv::ptr<const void> vagBuf, u32 size, u32 loopflag)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetVoicePCM(s32 iVoiceNum, vm::psv::ptr<const void> pcmBuf, u32 size, s32 loopsize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetNoise(s32 iVoiceNum, u32 uClk)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetVolume(s32 iVoiceNum, s32 l, s32 r, s32 wl, s32 wr)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetPitch(s32 iVoiceNum, s32 pitch)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetADSR(s32 iVoiceNum, u32 flag, u32 ar, u32 dr, u32 sr, u32 rr)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetADSRmode(s32 iVoiceNum, u32 flag, u32 am, u32 dm, u32 sm, u32 rm)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetSL(s32 iVoiceNum, u32 sl)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetSimpleADSR(s32 iVoiceNum, u16 adsr1, u16 adsr2)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetKeyOn(s32 iVoiceNum)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetKeyOff(s32 iVoiceNum)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetPause(s32 iVoiceNum, u32 pauseFlag)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasGetPauseState(s32 iVoiceNum)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasGetEndState(s32 iVoiceNum)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasGetEnvelope(s32 iVoiceNum)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetEffect(s32 drySwitch, s32 wetSwitch)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetEffectType(s32 type)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetEffectVolume(s32 valL, s32 valR)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSasSetEffectParam(u32 delayTime, u32 feedback)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceSas, #name, name)
 
 psv_log_base sceSas("SceSas", []()
@@ -28,36 +174,36 @@ psv_log_base sceSas("SceSas", []()
 	//REG_FUNC(0xC72F1EEF, sceAsRender);
 	//REG_FUNC(0xCE23F057, sceAsLockUpdate);
 	//REG_FUNC(0x8BEF3C92, sceAsUnlockUpdate);
-	//REG_FUNC(0x180C6824, sceSasGetNeededMemorySize);
-	//REG_FUNC(0x449B5974, sceSasInit);
-	//REG_FUNC(0x820D5F82, sceSasInitWithGrain);
-	//REG_FUNC(0xBB7D6790, sceSasExit);
-	//REG_FUNC(0x2B4A207C, sceSasSetGrain);
-	//REG_FUNC(0x2BEA45BC, sceSasGetGrain);
-	//REG_FUNC(0x44DDB3C4, sceSasSetOutputmode);
-	//REG_FUNC(0x2C36E150, sceSasGetOutputmode);
-	//REG_FUNC(0x7A4672B2, sceSasCore);
-	//REG_FUNC(0xBD496983, sceSasCoreWithMix);
-	//REG_FUNC(0x2B75F9BC, sceSasSetVoice);
-	//REG_FUNC(0xB1756EFC, sceSasSetVoicePCM);
-	//REG_FUNC(0xF1C63CB9, sceSasSetNoise);
-	//REG_FUNC(0x0BE8204D, sceSasSetVolume);
+	REG_FUNC(0x180C6824, sceSasGetNeededMemorySize);
+	REG_FUNC(0x449B5974, sceSasInit);
+	REG_FUNC(0x820D5F82, sceSasInitWithGrain);
+	REG_FUNC(0xBB7D6790, sceSasExit);
+	REG_FUNC(0x2B4A207C, sceSasSetGrain);
+	REG_FUNC(0x2BEA45BC, sceSasGetGrain);
+	REG_FUNC(0x44DDB3C4, sceSasSetOutputmode);
+	REG_FUNC(0x2C36E150, sceSasGetOutputmode);
+	REG_FUNC(0x7A4672B2, sceSasCore);
+	REG_FUNC(0xBD496983, sceSasCoreWithMix);
+	REG_FUNC(0x2B75F9BC, sceSasSetVoice);
+	REG_FUNC(0xB1756EFC, sceSasSetVoicePCM);
+	REG_FUNC(0xF1C63CB9, sceSasSetNoise);
+	REG_FUNC(0x0BE8204D, sceSasSetVolume);
 	//REG_FUNC(0x011788BE, sceSasSetDistortion);
-	//REG_FUNC(0x2C48A08C, sceSasSetPitch);
-	//REG_FUNC(0x18A5EFA2, sceSasSetADSR);
-	//REG_FUNC(0x5207F9D2, sceSasSetADSRmode);
-	//REG_FUNC(0xDE6227B8, sceSasSetSL);
-	//REG_FUNC(0xECCE0DB8, sceSasSetSimpleADSR);
-	//REG_FUNC(0xC838DB6F, sceSasSetKeyOn);
-	//REG_FUNC(0x5E42ADAB, sceSasSetKeyOff);
-	//REG_FUNC(0x59C7A9DF, sceSasSetPause);
-	//REG_FUNC(0x007E63E6, sceSasGetEndState);
-	//REG_FUNC(0xFD1A0CBF, sceSasGetPauseState);
-	//REG_FUNC(0x296A9910, sceSasGetEnvelope);
-	//REG_FUNC(0xB0444E69, sceSasSetEffect);
-	//REG_FUNC(0xCDF2DDD5, sceSasSetEffectType);
-	//REG_FUNC(0x55EDDBFA, sceSasSetEffectVolume);
-	//REG_FUNC(0xBAD546A0, sceSasSetEffectParam);
+	REG_FUNC(0x2C48A08C, sceSasSetPitch);
+	REG_FUNC(0x18A5EFA2, sceSasSetADSR);
+	REG_FUNC(0x5207F9D2, sceSasSetADSRmode);
+	REG_FUNC(0xDE6227B8, sceSasSetSL);
+	REG_FUNC(0xECCE0DB8, sceSasSetSimpleADSR);
+	REG_FUNC(0xC838DB6F, sceSasSetKeyOn);
+	REG_FUNC(0x5E42ADAB, sceSasSetKeyOff);
+	REG_FUNC(0x59C7A9DF, sceSasSetPause);
+	REG_FUNC(0x007E63E6, sceSasGetEndState);
+	REG_FUNC(0xFD1A0CBF, sceSasGetPauseState);
+	REG_FUNC(0x296A9910, sceSasGetEnvelope);
+	REG_FUNC(0xB0444E69, sceSasSetEffect);
+	REG_FUNC(0xCDF2DDD5, sceSasSetEffectType);
+	REG_FUNC(0x55EDDBFA, sceSasSetEffectVolume);
+	REG_FUNC(0xBAD546A0, sceSasSetEffectParam);
 	//REG_FUNC(0xB6642276, sceSasGetDryPeak);
 	//REG_FUNC(0x4314F0E9, sceSasGetWetPeak);
 	//REG_FUNC(0x1568017A, sceSasGetPreMasterPeak);
diff --git a/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp b/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp
index b70a5a27c4..0e894f79fb 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceSystemGesture.cpp
@@ -2,8 +2,250 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
+#include "sceTouch.h"
+
 extern psv_log_base sceSystemGesture;
 
+enum SceSystemGestureTouchState : s32
+{
+	SCE_SYSTEM_GESTURE_TOUCH_STATE_INACTIVE = 0,
+	SCE_SYSTEM_GESTURE_TOUCH_STATE_BEGIN = 1,
+	SCE_SYSTEM_GESTURE_TOUCH_STATE_ACTIVE = 2,
+	SCE_SYSTEM_GESTURE_TOUCH_STATE_END = 3
+};
+
+enum SceSystemGestureType : s32
+{
+	SCE_SYSTEM_GESTURE_TYPE_TAP = 1,
+	SCE_SYSTEM_GESTURE_TYPE_DRAG = 2,
+	SCE_SYSTEM_GESTURE_TYPE_TAP_AND_HOLD = 4,
+	SCE_SYSTEM_GESTURE_TYPE_PINCH_OUT_IN = 8
+};
+
+struct SceSystemGestureVector2
+{
+	s16 x;
+	s16 y;
+};
+
+struct SceSystemGestureRectangle
+{
+	s16 x;
+	s16 y;
+	s16 width;
+	s16 height;
+};
+
+struct SceSystemGesturePrimitiveTouchEvent
+{
+	SceSystemGestureTouchState eventState;
+	u16 primitiveID;
+	SceSystemGestureVector2 pressedPosition;
+	s16 pressedForce;
+	SceSystemGestureVector2 currentPosition;
+	s16 currentForce;
+	SceSystemGestureVector2 deltaVector;
+	s16 deltaForce;
+	u64 deltaTime;
+	u64 elapsedTime;
+	u8 reserved[56];
+};
+
+struct SceSystemGesturePrimitiveTouchRecognizerParameter
+{
+	u8 reserved[64];
+};
+
+struct SceSystemGestureTouchRecognizer
+{
+	u64 reserved[307];
+};
+
+struct SceSystemGestureTouchRecognizerInformation
+{
+	SceSystemGestureType gestureType;
+	u32 touchPanelPortID;
+	SceSystemGestureRectangle rectangle;
+	u64 updatedTime;
+	u8 reserved[256];
+};
+
+struct SceSystemGestureTapRecognizerParameter
+{
+	u8 maxTapCount;
+	u8 reserved[63];
+};
+
+struct SceSystemGestureDragRecognizerParameter
+{
+	u8 reserved[64];
+};
+
+struct SceSystemGestureTapAndHoldRecognizerParameter
+{
+	u64 timeToInvokeEvent;
+	u8 reserved[56];
+};
+
+struct SceSystemGesturePinchOutInRecognizerParameter
+{
+	u8 reserved[64];
+};
+
+union SceSystemGestureTouchRecognizerParameter
+{
+	u8 parameterBuf[64];
+	SceSystemGestureTapRecognizerParameter tap;
+	SceSystemGestureDragRecognizerParameter drag;
+	SceSystemGestureTapAndHoldRecognizerParameter tapAndHold;
+	SceSystemGesturePinchOutInRecognizerParameter pinchOutIn;
+};
+
+struct SceSystemGestureTapEventProperty
+{
+	u16 primitiveID;
+	SceSystemGestureVector2 position;
+	u8 tappedCount;
+	u8 reserved[57];
+};
+
+struct SceSystemGestureDragEventProperty
+{
+	u16 primitiveID;
+	SceSystemGestureVector2 deltaVector;
+	SceSystemGestureVector2 currentPosition;
+	SceSystemGestureVector2 pressedPosition;
+	u8 reserved[50];
+};
+
+struct SceSystemGestureTapAndHoldEventProperty
+{
+	u16 primitiveID;
+	SceSystemGestureVector2 pressedPosition;
+	u8 reserved[58];
+};
+
+struct SceSystemGesturePinchOutInEventProperty
+{
+	float scale;
+
+	struct
+	{
+		u16 primitiveID;
+		SceSystemGestureVector2 currentPosition;
+		SceSystemGestureVector2 deltaVector;
+		SceSystemGestureVector2 pairedPosition;
+	} primitive[2];
+
+	u8 reserved[32];
+};
+
+struct SceSystemGestureTouchEvent
+{
+	u32 eventID;
+	SceSystemGestureTouchState eventState;
+	SceSystemGestureType gestureType;
+	u8 padding[4];
+	u64 updatedTime;
+
+	union
+	{
+		u8 propertyBuf[64];
+		SceSystemGestureTapEventProperty tap;
+		SceSystemGestureDragEventProperty drag;
+		SceSystemGestureTapAndHoldEventProperty tapAndHold;
+		SceSystemGesturePinchOutInEventProperty pinchOutIn;
+	} property;
+
+	u8 reserved[56];
+};
+
+s32 sceSystemGestureInitializePrimitiveTouchRecognizer(vm::psv::ptr<SceSystemGesturePrimitiveTouchRecognizerParameter> parameter)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureFinalizePrimitiveTouchRecognizer()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureResetPrimitiveTouchRecognizer()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureUpdatePrimitiveTouchRecognizer(vm::psv::ptr<const SceTouchData> pFrontData, vm::psv::ptr<const SceTouchData> pBackData)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureGetPrimitiveTouchEvents(vm::psv::ptr<SceSystemGesturePrimitiveTouchEvent> primitiveEventBuffer, const u32 capacityOfBuffer, vm::psv::ptr<u32> numberOfEvent)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureGetPrimitiveTouchEventsCount()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureGetPrimitiveTouchEventByIndex(const u32 index, vm::psv::ptr<SceSystemGesturePrimitiveTouchEvent> primitiveTouchEvent)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureGetPrimitiveTouchEventByPrimitiveID(const u16 primitiveID, vm::psv::ptr<SceSystemGesturePrimitiveTouchEvent> primitiveTouchEvent)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureCreateTouchRecognizer(vm::psv::ptr<SceSystemGestureTouchRecognizer> touchRecognizer, const SceSystemGestureType gestureType, const u8 touchPanelPortID, vm::psv::ptr<const SceSystemGestureRectangle> rectangle, vm::psv::ptr<const SceSystemGestureTouchRecognizerParameter> touchRecognizerParameter)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureGetTouchRecognizerInformation(vm::psv::ptr<const SceSystemGestureTouchRecognizer> touchRecognizer, vm::psv::ptr<SceSystemGestureTouchRecognizerInformation> information)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureResetTouchRecognizer(vm::psv::ptr<SceSystemGestureTouchRecognizer> touchRecognizer)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureUpdateTouchRecognizer(vm::psv::ptr<SceSystemGestureTouchRecognizer> touchRecognizer)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureUpdateTouchRecognizerRectangle(vm::psv::ptr<SceSystemGestureTouchRecognizer> touchRecognizer, vm::psv::ptr<const SceSystemGestureRectangle> rectangle)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureGetTouchEvents(vm::psv::ptr<const SceSystemGestureTouchRecognizer> touchRecognizer, vm::psv::ptr<SceSystemGestureTouchEvent> eventBuffer, const u32 capacityOfBuffer, vm::psv::ptr<u32> numberOfEvent)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureGetTouchEventsCount(vm::psv::ptr<const SceSystemGestureTouchRecognizer> touchRecognizer)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureGetTouchEventByIndex(vm::psv::ptr<const SceSystemGestureTouchRecognizer> touchRecognizer, const u32 index, vm::psv::ptr<SceSystemGestureTouchEvent> touchEvent)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceSystemGestureGetTouchEventByEventID(vm::psv::ptr<const SceSystemGestureTouchRecognizer> touchRecognizer, const u32 eventID, vm::psv::ptr<SceSystemGestureTouchEvent> touchEvent)
+{
+	throw __FUNCTION__;
+}
+
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceSystemGesture, #name, name)
 
 psv_log_base sceSystemGesture("SceSystemGesture", []()
@@ -12,21 +254,21 @@ psv_log_base sceSystemGesture("SceSystemGesture", []()
 	sceSystemGesture.on_unload = nullptr;
 	sceSystemGesture.on_stop = nullptr;
 
-	//REG_FUNC(0x6078A08B, sceSystemGestureInitializePrimitiveTouchRecognizer);
-	//REG_FUNC(0xFD5A6504, sceSystemGestureResetPrimitiveTouchRecognizer);
-	//REG_FUNC(0xB3875104, sceSystemGestureFinalizePrimitiveTouchRecognizer);
-	//REG_FUNC(0xDF4C665A, sceSystemGestureUpdatePrimitiveTouchRecognizer);
-	//REG_FUNC(0xC750D3DA, sceSystemGestureGetPrimitiveTouchEvents);
-	//REG_FUNC(0xBAB8ECCB, sceSystemGestureGetPrimitiveTouchEventsCount);
-	//REG_FUNC(0xE0577765, sceSystemGestureGetPrimitiveTouchEventByIndex);
-	//REG_FUNC(0x480564C9, sceSystemGestureGetPrimitiveTouchEventByPrimitiveID);
-	//REG_FUNC(0xC3367370, sceSystemGestureCreateTouchRecognizer);
-	//REG_FUNC(0xF0DB1AE5, sceSystemGestureGetTouchRecognizerInformation);
-	//REG_FUNC(0x0D941B90, sceSystemGestureResetTouchRecognizer);
-	//REG_FUNC(0x851FB144, sceSystemGestureUpdateTouchRecognizer);
-	//REG_FUNC(0xA9DB29F6, sceSystemGestureUpdateTouchRecognizerRectangle);
-	//REG_FUNC(0x789D867C, sceSystemGestureGetTouchEvents);
-	//REG_FUNC(0x13AD2218, sceSystemGestureGetTouchEventsCount);
-	//REG_FUNC(0x74724147, sceSystemGestureGetTouchEventByIndex);
-	//REG_FUNC(0x5570B83E, sceSystemGestureGetTouchEventByEventID);
+	REG_FUNC(0x6078A08B, sceSystemGestureInitializePrimitiveTouchRecognizer);
+	REG_FUNC(0xFD5A6504, sceSystemGestureResetPrimitiveTouchRecognizer);
+	REG_FUNC(0xB3875104, sceSystemGestureFinalizePrimitiveTouchRecognizer);
+	REG_FUNC(0xDF4C665A, sceSystemGestureUpdatePrimitiveTouchRecognizer);
+	REG_FUNC(0xC750D3DA, sceSystemGestureGetPrimitiveTouchEvents);
+	REG_FUNC(0xBAB8ECCB, sceSystemGestureGetPrimitiveTouchEventsCount);
+	REG_FUNC(0xE0577765, sceSystemGestureGetPrimitiveTouchEventByIndex);
+	REG_FUNC(0x480564C9, sceSystemGestureGetPrimitiveTouchEventByPrimitiveID);
+	REG_FUNC(0xC3367370, sceSystemGestureCreateTouchRecognizer);
+	REG_FUNC(0xF0DB1AE5, sceSystemGestureGetTouchRecognizerInformation);
+	REG_FUNC(0x0D941B90, sceSystemGestureResetTouchRecognizer);
+	REG_FUNC(0x851FB144, sceSystemGestureUpdateTouchRecognizer);
+	REG_FUNC(0xA9DB29F6, sceSystemGestureUpdateTouchRecognizerRectangle);
+	REG_FUNC(0x789D867C, sceSystemGestureGetTouchEvents);
+	REG_FUNC(0x13AD2218, sceSystemGestureGetTouchEventsCount);
+	REG_FUNC(0x74724147, sceSystemGestureGetTouchEventByIndex);
+	REG_FUNC(0x5570B83E, sceSystemGestureGetTouchEventByEventID);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp b/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp
index ee13162e61..b6ce6ccc77 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceTouch.cpp
@@ -2,40 +2,7 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
-extern psv_log_base sceTouch;
-
-struct SceTouchPanelInfo
-{
-	s16 minAaX;
-	s16 minAaY;
-	s16 maxAaX;
-	s16 maxAaY;
-	s16 minDispX;
-	s16 minDispY;
-	s16 maxDispX;
-	s16 maxDispY;
-	u8 minForce;
-	u8 maxForce;
-	u8 rsv[30];
-};
-
-struct SceTouchReport
-{
-	u8 id;
-	u8 force;
-	s16 x;
-	s16 y;
-	s8 rsv[8];
-	u16 info;
-};
-
-struct SceTouchData
-{
-	u64 timeStamp;
-	u32 status;
-	u32 reportNum;
-	SceTouchReport report[8];
-};
+#include "sceTouch.h"
 
 s32 sceTouchGetPanelInfo(u32 port, vm::psv::ptr<SceTouchPanelInfo> pPanelInfo)
 {
diff --git a/rpcs3/Emu/ARMv7/Modules/sceTouch.h b/rpcs3/Emu/ARMv7/Modules/sceTouch.h
new file mode 100644
index 0000000000..a71f6003c2
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceTouch.h
@@ -0,0 +1,36 @@
+#pragma once
+
+struct SceTouchPanelInfo
+{
+	s16 minAaX;
+	s16 minAaY;
+	s16 maxAaX;
+	s16 maxAaY;
+	s16 minDispX;
+	s16 minDispY;
+	s16 maxDispX;
+	s16 maxDispY;
+	u8 minForce;
+	u8 maxForce;
+	u8 rsv[30];
+};
+
+struct SceTouchReport
+{
+	u8 id;
+	u8 force;
+	s16 x;
+	s16 y;
+	s8 rsv[8];
+	u16 info;
+};
+
+struct SceTouchData
+{
+	u64 timeStamp;
+	u32 status;
+	u32 reportNum;
+	SceTouchReport report[8];
+};
+
+extern psv_log_base sceTouch;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp b/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp
index cb0cfc8f53..cddc5f43d2 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceVoice.cpp
@@ -174,7 +174,7 @@ s32 sceVoiceDeletePort(u32 portId)
 	throw __FUNCTION__;
 }
 
-s32 sceVoiceWriteToIPort(u32 ips, vm::psv::ptr<const void> data, vm::psv::ptr<u32> size, int16_t frameGaps)
+s32 sceVoiceWriteToIPort(u32 ips, vm::psv::ptr<const void> data, vm::psv::ptr<u32> size, s16 frameGaps)
 {
 	throw __FUNCTION__;
 }
diff --git a/rpcs3/Emu/Memory/vm_ptr.h b/rpcs3/Emu/Memory/vm_ptr.h
index ead6e577a0..0c588cd7ee 100644
--- a/rpcs3/Emu/Memory/vm_ptr.h
+++ b/rpcs3/Emu/Memory/vm_ptr.h
@@ -108,6 +108,8 @@ namespace vm
 		AT m_addr;
 		
 	public:
+		static_assert(!std::is_pointer<T>::value, "vm::_ptr_base<> error: invalid type (pointer)");
+		static_assert(!std::is_reference<T>::value, "vm::_ptr_base<> error: invalid type (reference)");
 		typedef typename std::remove_cv<T>::type type;
 
 		__forceinline static const u32 data_size()
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.h b/rpcs3/Emu/SysCalls/Modules/sceNp.h
index ddce57f3dd..35be94177a 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNp.h
+++ b/rpcs3/Emu/SysCalls/Modules/sceNp.h
@@ -1957,7 +1957,7 @@ struct SceNpScoreClanRankData
 	CellRtcTick recordDate;
 	SceNpId npId;
 	SceNpOnlineName onlineName;
-	uint8_t reserved[32];
+	u8 reserved[32];
 };
 
 // Clan ranking information to be obtained for a specified clan ID
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpClans.h b/rpcs3/Emu/SysCalls/Modules/sceNpClans.h
index faf47e3062..d870d5bd07 100644
--- a/rpcs3/Emu/SysCalls/Modules/sceNpClans.h
+++ b/rpcs3/Emu/SysCalls/Modules/sceNpClans.h
@@ -109,7 +109,7 @@ enum
 
 // Request handle for clan API
 struct SceNpClansRequest;
-typedef SceNpClansRequest* SceNpClansRequestHandle;
+typedef vm::ptr<SceNpClansRequest> SceNpClansRequestHandle;
 
 // Paging request structure
 struct SceNpClansPagingRequest
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 69cbaaf944..1e6d47a50e 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -341,6 +341,7 @@
     <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceNet.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceSsl.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\sceTouch.h" />
     <ClInclude Include="Emu\ARMv7\PSVFuncList.h" />
     <ClInclude Include="Emu\ARMv7\PSVObjectList.h" />
     <ClInclude Include="Emu\Audio\AL\OpenALThread.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 7935e1ddc6..ac1531ee30 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -1498,5 +1498,8 @@
     <ClInclude Include="Emu\ARMv7\Modules\sceSsl.h">
       <Filter>Emu\CPU\ARMv7\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\ARMv7\Modules\sceTouch.h">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From bdd458d2ae1bbd029eca9a116eb3de5618f2ad99 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 30 Jan 2015 20:19:11 +0300
Subject: [PATCH 58/70] Some functions added

---
 rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp    |  242 +++-
 rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp   |   79 +-
 rpcs3/Emu/ARMv7/Modules/sceNpCommon.h     |  154 +++
 rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp  |   79 +-
 rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp | 1360 ++++++++++++++++++++-
 rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp    |  387 +++++-
 rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp  |  172 ++-
 rpcs3/Emu/ARMv7/Modules/sceUlt.cpp        |  643 +++++++++-
 rpcs3/emucore.vcxproj                     |    1 +
 rpcs3/emucore.vcxproj.filters             |    3 +
 10 files changed, 2946 insertions(+), 174 deletions(-)
 create mode 100644 rpcs3/Emu/ARMv7/Modules/sceNpCommon.h

diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp
index 1afa85a9cc..e798df5f48 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpBasic.cpp
@@ -1,9 +1,213 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
+#include "sceNpCommon.h"
+
 extern psv_log_base sceNpBasic;
 
+enum SceNpBasicFriendListEventType : s32
+{
+	SCE_NP_BASIC_FRIEND_LIST_EVENT_TYPE_SYNC = 1,
+	SCE_NP_BASIC_FRIEND_LIST_EVENT_TYPE_SYNC_DONE = 2,
+	SCE_NP_BASIC_FRIEND_LIST_EVENT_TYPE_ADDED = 3,
+	SCE_NP_BASIC_FRIEND_LIST_EVENT_TYPE_DELETED = 4
+};
+
+typedef vm::psv::ptr<void(SceNpBasicFriendListEventType eventType, vm::psv::ptr<const SceNpId> friendId, vm::psv::ptr<void> userdata)> SceNpBasicFriendListEventHandler;
+
+enum SceNpBasicFriendOnlineStatusEventType : s32
+{
+	SCE_NP_BASIC_FRIEND_ONLINE_STATUS_EVENT_TYPE_SYNC = 1,
+	SCE_NP_BASIC_FRIEND_ONLINE_STATUS_EVENT_TYPE_SYNC_DONE = 2,
+	SCE_NP_BASIC_FRIEND_ONLINE_STATUS_EVENT_TYPE_UPDATED = 3
+};
+
+enum SceNpBasicFriendOnlineStatus : s32
+{
+	SCE_NP_BASIC_FRIEND_ONLINE_STATUS_UNKNOWN = 0,
+	SCE_NP_BASIC_FRIEND_ONLINE_STATUS_OFFLINE = 1,
+	SCE_NP_BASIC_FRIEND_ONLINE_STATUS_STANDBY = 2,
+	SCE_NP_BASIC_FRIEND_ONLINE_STATUS_ONLINE_OUT_OF_CONTEXT = 3,
+	SCE_NP_BASIC_FRIEND_ONLINE_STATUS_ONLINE_IN_CONTEXT = 4
+};
+
+typedef vm::psv::ptr<void(SceNpBasicFriendOnlineStatusEventType eventType, vm::psv::ptr<const SceNpId> friendId, SceNpBasicFriendOnlineStatus status, vm::psv::ptr<void> userdata)> SceNpBasicFriendOnlineStatusEventHandler;
+
+enum SceNpBasicBlockListEventType : s32
+{
+	SCE_NP_BASIC_BLOCK_LIST_EVENT_TYPE_SYNC = 1,
+	SCE_NP_BASIC_BLOCK_LIST_EVENT_TYPE_SYNC_DONE = 2,
+	SCE_NP_BASIC_BLOCK_LIST_EVENT_TYPE_ADDED = 3,
+	SCE_NP_BASIC_BLOCK_LIST_EVENT_TYPE_DELETED = 4
+};
+
+typedef vm::psv::ptr<void(SceNpBasicBlockListEventType eventType, vm::psv::ptr<const SceNpId> playerId, vm::psv::ptr<void> userdata)> SceNpBasicBlockListEventHandler;
+
+enum SceNpBasicFriendGamePresenceEventType : s32
+{
+	SCE_NP_BASIC_FRIEND_GAME_PRESENCE_EVENT_TYPE_SYNC = 1,
+	SCE_NP_BASIC_FRIEND_GAME_PRESENCE_EVENT_TYPE_SYNC_DONE = 2,
+	SCE_NP_BASIC_FRIEND_GAME_PRESENCE_EVENT_TYPE_UPDATED = 3
+};
+
+enum SceNpBasicInGamePresenceType
+{
+	SCE_NP_BASIC_IN_GAME_PRESENCE_TYPE_UNKNOWN = -1,
+	SCE_NP_BASIC_IN_GAME_PRESENCE_TYPE_NONE = 0,
+	SCE_NP_BASIC_IN_GAME_PRESENCE_TYPE_DEFAULT = 1,
+	SCE_NP_BASIC_IN_GAME_PRESENCE_TYPE_JOINABLE = 2,
+	SCE_NP_BASIC_IN_GAME_PRESENCE_TYPE_MAX = 3
+};
+
+struct SceNpBasicInGamePresence
+{
+	u32 sdkVersion;
+	SceNpBasicInGamePresenceType type;
+	char status[192];
+	u8 data[128];
+	u32 dataSize;
+};
+
+struct SceNpBasicGamePresence
+{
+	u32 size;
+	char title[128];
+	SceNpBasicInGamePresence inGamePresence;
+};
+
+typedef vm::psv::ptr<void(SceNpBasicFriendGamePresenceEventType eventtype, vm::psv::ptr<const SceNpId> friendId, vm::psv::ptr<const SceNpBasicGamePresence> presence, vm::psv::ptr<void> userdata)> SceNpBasicFriendGamePresenceEventHandler;
+
+struct SceNpBasicInGameDataMessage
+{
+	u8 data[128];
+	u32 dataSize;
+};
+
+typedef vm::psv::ptr<void(vm::psv::ptr<const SceNpId> from, vm::psv::ptr<const SceNpBasicInGameDataMessage> message, vm::psv::ptr<void> userdata)> SceNpBasicInGameDataMessageEventHandler;
+
+struct SceNpBasicEventHandlers
+{
+	u32 sdkVersion;
+	SceNpBasicFriendListEventHandler friendListEventHandler;
+	SceNpBasicFriendOnlineStatusEventHandler friendOnlineStatusEventHandler;
+	SceNpBasicBlockListEventHandler blockListEventHandler;
+	SceNpBasicFriendGamePresenceEventHandler friendGamePresenceEventHandler;
+	SceNpBasicInGameDataMessageEventHandler inGameDataMessageEventHandler;
+};
+
+struct SceNpBasicPlaySessionLogDescription
+{
+	char text[512];
+};
+
+struct SceNpBasicPlaySessionLog
+{
+	u64 date;
+	SceNpId withWhom;
+	SceNpCommunicationId commId;
+	char title[128];
+	SceNpBasicPlaySessionLogDescription description;
+};
+
+enum SceNpBasicPlaySessionLogType : s32
+{
+	SCE_NP_BASIC_PLAY_SESSION_LOG_TYPE_INVALID = -1,
+	SCE_NP_BASIC_PLAY_SESSION_LOG_TYPE_ALL = 0,
+	SCE_NP_BASIC_PLAY_SESSION_LOG_TYPE_BY_NP_COMM_ID = 1,
+	SCE_NP_BASIC_PLAY_SESSION_LOG_TYPE_MAX = 2
+};
+
+s32 sceNpBasicInit(vm::psv::ptr<void> opt)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicTerm(ARMv7Context&)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicRegisterHandler(vm::psv::ptr<const SceNpBasicEventHandlers> handlers, vm::psv::ptr<const SceNpCommunicationId> context, vm::psv::ptr<void> userdata)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicUnregisterHandler(ARMv7Context&)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicCheckCallback()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicGetFriendOnlineStatus(vm::psv::ptr<const SceNpId> friendId, vm::psv::ptr<SceNpBasicFriendOnlineStatus> status)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicGetGamePresenceOfFriend(vm::psv::ptr<const SceNpId> friendId, vm::psv::ptr<SceNpBasicGamePresence> presence)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicGetFriendListEntryCount(vm::psv::ptr<u32> count)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicGetFriendListEntries(u32 startIndex, vm::psv::ptr<SceNpId> entries, u32 numEntries, vm::psv::ptr<u32> retrieved)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicGetBlockListEntryCount(vm::psv::ptr<u32> count)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicGetBlockListEntries(u32 startIndex, vm::psv::ptr<SceNpId> entries, u32 numEntries, vm::psv::ptr<u32> retrieved)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicCheckIfPlayerIsBlocked(vm::psv::ptr<const SceNpId> player, vm::psv::ptr<u8> playerIsBlocked)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicSetInGamePresence(vm::psv::ptr<const SceNpBasicInGamePresence> presence)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicUnsetInGamePresence()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicSendInGameDataMessage(vm::psv::ptr<const SceNpId> to, vm::psv::ptr<const SceNpBasicInGameDataMessage> message)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicRecordPlaySessionLog(vm::psv::ptr<const SceNpId> withWhom, vm::psv::ptr<const SceNpBasicPlaySessionLogDescription> description)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicGetPlaySessionLogSize(SceNpBasicPlaySessionLogType type, vm::psv::ptr<u32> size)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBasicGetPlaySessionLog(SceNpBasicPlaySessionLogType type, u32 index, vm::psv::ptr<SceNpBasicPlaySessionLog> log)
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpBasic, #name, name)
 
 psv_log_base sceNpBasic("SceNpBasic", []()
@@ -12,22 +216,22 @@ psv_log_base sceNpBasic("SceNpBasic", []()
 	sceNpBasic.on_unload = nullptr;
 	sceNpBasic.on_stop = nullptr;
 
-	//REG_FUNC(0xEFB91A99, sceNpBasicInit);
-	//REG_FUNC(0x389BCB3B, sceNpBasicTerm);
-	//REG_FUNC(0x26E6E048, sceNpBasicRegisterHandler);
-	//REG_FUNC(0x050AE072, sceNpBasicUnregisterHandler);
-	//REG_FUNC(0x20146AEC, sceNpBasicCheckCallback);
-	//REG_FUNC(0x5183A4B5, sceNpBasicGetFriendOnlineStatus);
-	//REG_FUNC(0xEF8A91BC, sceNpBasicGetGamePresenceOfFriend);
-	//REG_FUNC(0xDF41F308, sceNpBasicGetFriendListEntryCount);
-	//REG_FUNC(0xFF07E787, sceNpBasicGetFriendListEntries);
-	//REG_FUNC(0x407E1E6F, sceNpBasicGetBlockListEntryCount);
-	//REG_FUNC(0x1211AE8E, sceNpBasicGetBlockListEntries);
-	//REG_FUNC(0xF51545D8, sceNpBasicCheckIfPlayerIsBlocked);
-	//REG_FUNC(0x51D75562, sceNpBasicSetInGamePresence);
-	//REG_FUNC(0xD20C2370, sceNpBasicUnsetInGamePresence);
-	//REG_FUNC(0x7A5020A5, sceNpBasicSendInGameDataMessage);
-	//REG_FUNC(0x3B0A7F47, sceNpBasicRecordPlaySessionLog);
-	//REG_FUNC(0xFB0F7FDF, sceNpBasicGetPlaySessionLogSize);
-	//REG_FUNC(0x364531A8, sceNpBasicGetPlaySessionLog);
+	REG_FUNC(0xEFB91A99, sceNpBasicInit);
+	REG_FUNC(0x389BCB3B, sceNpBasicTerm);
+	REG_FUNC(0x26E6E048, sceNpBasicRegisterHandler);
+	REG_FUNC(0x050AE072, sceNpBasicUnregisterHandler);
+	REG_FUNC(0x20146AEC, sceNpBasicCheckCallback);
+	REG_FUNC(0x5183A4B5, sceNpBasicGetFriendOnlineStatus);
+	REG_FUNC(0xEF8A91BC, sceNpBasicGetGamePresenceOfFriend);
+	REG_FUNC(0xDF41F308, sceNpBasicGetFriendListEntryCount);
+	REG_FUNC(0xFF07E787, sceNpBasicGetFriendListEntries);
+	REG_FUNC(0x407E1E6F, sceNpBasicGetBlockListEntryCount);
+	REG_FUNC(0x1211AE8E, sceNpBasicGetBlockListEntries);
+	REG_FUNC(0xF51545D8, sceNpBasicCheckIfPlayerIsBlocked);
+	REG_FUNC(0x51D75562, sceNpBasicSetInGamePresence);
+	REG_FUNC(0xD20C2370, sceNpBasicUnsetInGamePresence);
+	REG_FUNC(0x7A5020A5, sceNpBasicSendInGameDataMessage);
+	REG_FUNC(0x3B0A7F47, sceNpBasicRecordPlaySessionLog);
+	REG_FUNC(0xFB0F7FDF, sceNpBasicGetPlaySessionLogSize);
+	REG_FUNC(0x364531A8, sceNpBasicGetPlaySessionLog);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp
index 4422bee950..095de28b17 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.cpp
@@ -2,7 +2,62 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
-extern psv_log_base sceNpCommon;
+#include "sceNpCommon.h"
+
+s32 sceNpAuthInit()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpAuthTerm()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpAuthCreateStartRequest(vm::psv::ptr<const SceNpAuthRequestParameter> param)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpAuthDestroyRequest(SceNpAuthRequestId id)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpAuthAbortRequest(SceNpAuthRequestId id)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpAuthGetTicket(SceNpAuthRequestId id, vm::psv::ptr<void> buf, u32 len)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpAuthGetTicketParam(vm::psv::ptr<const u8> ticket, u32 ticketSize, s32 paramId, vm::psv::ptr<SceNpTicketParam> param)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpAuthGetEntitlementIdList(vm::psv::ptr<const u8> ticket, u32 ticketSize, vm::psv::ptr<SceNpEntitlementId> entIdList, u32 entIdListNum)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpAuthGetEntitlementById(vm::psv::ptr<const u8> ticket, u32 ticketSize, vm::psv::ptr<const char> entId, vm::psv::ptr<SceNpEntitlement> ent)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpCmpNpId(vm::psv::ptr<const SceNpId> npid1, vm::psv::ptr<const SceNpId> npid2)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpCmpNpIdInOrder(vm::psv::ptr<const SceNpId> npid1, vm::psv::ptr<const SceNpId> npid2, vm::psv::ptr<s32> order)
+{
+	throw __FUNCTION__;
+}
 
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpCommon, #name, name)
 
@@ -12,15 +67,15 @@ psv_log_base sceNpCommon("SceNpCommon", []()
 	sceNpCommon.on_unload = nullptr;
 	sceNpCommon.on_stop = nullptr;
 
-	//REG_FUNC(0x441D8B4E, sceNpAuthInit);
-	//REG_FUNC(0x6093B689, sceNpAuthTerm);
-	//REG_FUNC(0xED42079F, sceNpAuthCreateStartRequest);
-	//REG_FUNC(0x14FC18AF, sceNpAuthDestroyRequest);
-	//REG_FUNC(0xE2582575, sceNpAuthAbortRequest);
-	//REG_FUNC(0x59608D1C, sceNpAuthGetTicket);
-	//REG_FUNC(0xC1E23E01, sceNpAuthGetTicketParam);
-	//REG_FUNC(0x3377CD37, sceNpAuthGetEntitlementIdList);
-	//REG_FUNC(0xF93842F0, sceNpAuthGetEntitlementById);
-	//REG_FUNC(0xFB8D82E5, sceNpCmpNpId);
-	//REG_FUNC(0x6BC8150A, sceNpCmpNpIdInOrder);
+	REG_FUNC(0x441D8B4E, sceNpAuthInit);
+	REG_FUNC(0x6093B689, sceNpAuthTerm);
+	REG_FUNC(0xED42079F, sceNpAuthCreateStartRequest);
+	REG_FUNC(0x14FC18AF, sceNpAuthDestroyRequest);
+	REG_FUNC(0xE2582575, sceNpAuthAbortRequest);
+	REG_FUNC(0x59608D1C, sceNpAuthGetTicket);
+	REG_FUNC(0xC1E23E01, sceNpAuthGetTicketParam);
+	REG_FUNC(0x3377CD37, sceNpAuthGetEntitlementIdList);
+	REG_FUNC(0xF93842F0, sceNpAuthGetEntitlementById);
+	REG_FUNC(0xFB8D82E5, sceNpCmpNpId);
+	REG_FUNC(0x6BC8150A, sceNpCmpNpIdInOrder);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h
new file mode 100644
index 0000000000..2a40b7aee3
--- /dev/null
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h
@@ -0,0 +1,154 @@
+#pragma once
+
+enum SceNpServiceState : s32
+{
+	SCE_NP_SERVICE_STATE_UNKNOWN = 0,
+	SCE_NP_SERVICE_STATE_SIGNED_OUT,
+	SCE_NP_SERVICE_STATE_SIGNED_IN,
+	SCE_NP_SERVICE_STATE_ONLINE
+};
+
+struct SceNpCommunicationId
+{
+	char data[9];
+	char term;
+	u8 num;
+	char dummy;
+};
+
+struct SceNpCommunicationPassphrase
+{
+	u8 data[128];
+};
+
+struct SceNpCommunicationSignature
+{
+	u8 data[160];
+};
+
+struct SceNpCommunicationConfig
+{
+	vm::psv::ptr<const SceNpCommunicationId> commId;
+	vm::psv::ptr<const SceNpCommunicationPassphrase> commPassphrase;
+	vm::psv::ptr<const SceNpCommunicationSignature> commSignature;
+};
+
+struct SceNpCountryCode
+{
+	char data[2];
+	char term;
+	char padding[1];
+};
+
+struct SceNpOnlineId
+{
+	char data[16];
+	char term;
+	char dummy[3];
+};
+
+struct SceNpId
+{
+	SceNpOnlineId handle;
+	u8 opt[8];
+	u8 reserved[8];
+};
+
+struct SceNpAvatarUrl
+{
+	char data[127];
+	char term;
+};
+
+struct SceNpUserInformation
+{
+	SceNpId userId;
+	SceNpAvatarUrl icon;
+	u8 reserved[52];
+};
+
+struct SceNpMyLanguages
+{
+	s32 language1;
+	s32 language2;
+	s32 language3;
+	u8 padding[4];
+};
+
+struct SceNpAvatarImage
+{
+	u8 data[200 * 1024];
+	u32 size;
+	u8 reserved[12];
+};
+
+enum SceNpAvatarSizeType : s32
+{
+	SCE_NP_AVATAR_SIZE_LARGE,
+	SCE_NP_AVATAR_SIZE_MIDDLE,
+	SCE_NP_AVATAR_SIZE_SMALL
+};
+
+struct SceNpAboutMe
+{
+	char data[64];
+};
+
+typedef s32 SceNpAuthRequestId;
+typedef u64 SceNpTime;
+
+struct SceNpDate
+{
+	u16 year;
+	u8 month;
+	u8 day;
+};
+
+union SceNpTicketParam
+{
+	s32 i32;
+	s64 i64;
+	u32 u32;
+	u64 u64;
+	SceNpDate date;
+	u8 data[256];
+};
+
+struct SceNpTicketVersion
+{
+	u16 major;
+	u16 minor;
+};
+
+typedef vm::psv::ptr<s32(SceNpAuthRequestId id, s32 result, vm::psv::ptr<void> arg)> SceNpAuthCallback;
+
+struct SceNpAuthRequestParameter
+{
+	u32 size;
+	SceNpTicketVersion version;
+	vm::psv::ptr<const char> serviceId;
+	vm::psv::ptr<const void> cookie;
+	u32 cookieSize;
+	vm::psv::ptr<const char> entitlementId;
+	u32 consumedCount;
+	SceNpAuthCallback ticketCb;
+	vm::psv::ptr<void> cbArg;
+};
+
+struct SceNpEntitlementId
+{
+	u8 data[32];
+};
+
+struct SceNpEntitlement
+{
+	SceNpEntitlementId id;
+	SceNpTime createdDate;
+	SceNpTime expireDate;
+	u32 type;
+	s32 remainingCount;
+	u32 consumedCount;
+	char padding[4];
+};
+
+extern psv_log_base sceNpCommon;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp
index 4771107b92..5fce1c946e 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpManager.cpp
@@ -2,8 +2,67 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
+#include "sceNpCommon.h"
+
 extern psv_log_base sceNpManager;
 
+struct SceNpOptParam
+{
+	u32 optParamSize;
+};
+
+typedef vm::psv::ptr<void(SceNpServiceState state, vm::psv::ptr<void> userdata)> SceNpServiceStateCallback;
+
+s32 sceNpInit(vm::psv::ptr<const SceNpCommunicationConfig> commConf, vm::psv::ptr<SceNpOptParam> opt)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpTerm(ARMv7Context&)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpCheckCallback()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpGetServiceState(vm::psv::ptr<SceNpServiceState> state)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpRegisterServiceStateCallback(SceNpServiceStateCallback callback, vm::psv::ptr<void> userdata)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpUnregisterServiceStateCallback()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpManagerGetNpId(vm::psv::ptr<SceNpId> npId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpManagerGetAccountRegion(vm::psv::ptr<SceNpCountryCode> countryCode, vm::psv::ptr<s32> languageCode)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpManagerGetContentRatingFlag(vm::psv::ptr<s32> isRestricted, vm::psv::ptr<s32> age)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpManagerGetChatRestrictionFlag(vm::psv::ptr<s32> isRestricted)
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpManager, #name, name)
 
 psv_log_base sceNpManager("SceNpManager", []()
@@ -12,14 +71,14 @@ psv_log_base sceNpManager("SceNpManager", []()
 	sceNpManager.on_unload = nullptr;
 	sceNpManager.on_stop = nullptr;
 
-	//REG_FUNC(0x04D9F484, sceNpInit);
-	//REG_FUNC(0x19E40AE1, sceNpTerm);
-	//REG_FUNC(0x3C94B4B4, sceNpManagerGetNpId);
-	//REG_FUNC(0x54060DF6, sceNpGetServiceState);
-	//REG_FUNC(0x44239C35, sceNpRegisterServiceStateCallback);
-	//REG_FUNC(0xD9E6E56C, sceNpUnregisterServiceStateCallback);
-	//REG_FUNC(0x3B0AE9A9, sceNpCheckCallback);
-	//REG_FUNC(0xFE835967, sceNpManagerGetAccountRegion);
-	//REG_FUNC(0xAF0073B2, sceNpManagerGetContentRatingFlag);
-	//REG_FUNC(0x60C575B1, sceNpManagerGetChatRestrictionFlag);
+	REG_FUNC(0x04D9F484, sceNpInit);
+	REG_FUNC(0x19E40AE1, sceNpTerm);
+	REG_FUNC(0x3C94B4B4, sceNpManagerGetNpId);
+	REG_FUNC(0x54060DF6, sceNpGetServiceState);
+	REG_FUNC(0x44239C35, sceNpRegisterServiceStateCallback);
+	REG_FUNC(0xD9E6E56C, sceNpUnregisterServiceStateCallback);
+	REG_FUNC(0x3B0AE9A9, sceNpCheckCallback);
+	REG_FUNC(0xFE835967, sceNpManagerGetAccountRegion);
+	REG_FUNC(0xAF0073B2, sceNpManagerGetContentRatingFlag);
+	REG_FUNC(0x60C575B1, sceNpManagerGetChatRestrictionFlag);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp
index ffc7d962a7..cdb9f5aa8e 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpMatching.cpp
@@ -2,8 +2,1306 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
+#include "sceNet.h"
+#include "sceNpCommon.h"
+
 extern psv_log_base sceNpMatching;
 
+struct SceNpMatching2MemoryInfo
+{
+	u32 totalMemSize;
+	u32 curMemUsage;
+	u32 maxMemUsage;
+	u8 reserved[12];
+};
+
+typedef u16 SceNpMatching2ServerId;
+typedef u32 SceNpMatching2WorldId;
+typedef u16 SceNpMatching2WorldNumber;
+typedef u64 SceNpMatching2LobbyId;
+typedef u16 SceNpMatching2LobbyNumber;
+typedef u64 SceNpMatching2RoomId;
+typedef u16 SceNpMatching2RoomNumber;
+typedef u16 SceNpMatching2ContextId;
+typedef u32 SceNpMatching2RequestId;
+typedef u32 SceNpMatching2SignalingRequestId;
+typedef u8 SceNpMatching2NatType;
+typedef u8 SceNpMatching2Operator;
+typedef u8 SceNpMatching2CastType;
+
+struct SceNpMatching2SessionPassword
+{
+	u8 data[8];
+};
+
+typedef u8 SceNpMatching2SessionType;
+typedef u8 SceNpMatching2EventCause;
+
+struct SceNpMatching2PresenceOptionData
+{
+	u8 data[16];
+	u32 len;
+};
+
+typedef u16 SceNpMatching2AttributeId;
+typedef u32 SceNpMatching2FlagAttr;
+
+struct SceNpMatching2IntAttr
+{
+	SceNpMatching2AttributeId id;
+	u8 padding[2];
+	u32 num;
+};
+
+
+struct SceNpMatching2BinAttr
+{
+	SceNpMatching2AttributeId id;
+	u8 padding[2];
+	vm::psv::ptr<void> ptr;
+	u32 size;
+};
+
+
+struct SceNpMatching2RangeFilter
+{
+	u32 startIndex;
+	u32 max;
+};
+
+
+struct SceNpMatching2IntSearchFilter
+{
+	SceNpMatching2Operator searchOperator;
+	u8 padding[3];
+	SceNpMatching2IntAttr attr;
+};
+
+
+struct SceNpMatching2BinSearchFilter
+{
+	SceNpMatching2Operator searchOperator;
+	u8 padding[3];
+	SceNpMatching2BinAttr attr;
+};
+
+
+struct SceNpMatching2Range
+{
+	u32 startIndex;
+	u32 total;
+	u32 resultCount;
+};
+
+
+struct SceNpMatching2JoinedSessionInfo
+{
+	SceNpMatching2SessionType sessionType;
+	u8 padding1[1];
+	SceNpMatching2ServerId serverId;
+	SceNpMatching2WorldId worldId;
+	SceNpMatching2LobbyId lobbyId;
+	SceNpMatching2RoomId roomId;
+	u64 joinDate;
+};
+
+
+struct SceNpMatching2UserInfo
+{
+	vm::psv::ptr<SceNpMatching2UserInfo> next;
+	SceNpId npId;
+	vm::psv::ptr<SceNpMatching2BinAttr> userBinAttr;
+	u32 userBinAttrNum;
+	vm::psv::ptr<SceNpMatching2JoinedSessionInfo> joinedSessionInfo;
+	u32 joinedSessionInfoNum;
+};
+
+typedef u8 SceNpMatching2ServerStatus;
+
+struct SceNpMatching2Server
+{
+	SceNpMatching2ServerId serverId;
+	SceNpMatching2ServerStatus status;
+	u8 padding[1];
+};
+
+
+struct SceNpMatching2World
+{
+	vm::psv::ptr<SceNpMatching2World> next;
+	SceNpMatching2WorldId worldId;
+	u32 numOfLobby;
+	u32 maxNumOfTotalLobbyMember;
+	u32 curNumOfTotalLobbyMember;
+	u32 curNumOfRoom;
+	u32 curNumOfTotalRoomMember;
+	bool withEntitlementId;
+	SceNpEntitlementId entitlementId;
+	u8 padding[3];
+};
+
+typedef u16 SceNpMatching2LobbyMemberId;
+
+struct SceNpMatching2LobbyMemberBinAttrInternal
+{
+	u64 updateDate;
+	SceNpMatching2BinAttr data;
+	u8 padding[4];
+};
+
+
+struct SceNpMatching2LobbyMemberDataInternal
+{
+	vm::psv::ptr<SceNpMatching2LobbyMemberDataInternal> next;
+	SceNpId npId;
+
+	u64 joinDate;
+	SceNpMatching2LobbyMemberId memberId;
+	u8 padding[2];
+
+	SceNpMatching2FlagAttr flagAttr;
+
+	vm::psv::ptr<SceNpMatching2JoinedSessionInfo> joinedSessionInfo;
+	u32 joinedSessionInfoNum;
+	vm::psv::ptr<SceNpMatching2LobbyMemberBinAttrInternal> lobbyMemberBinAttrInternal;
+	u32 lobbyMemberBinAttrInternalNum;
+};
+
+
+struct SceNpMatching2LobbyMemberIdList
+{
+	vm::psv::ptr<SceNpMatching2LobbyMemberId> memberId;
+	u32 memberIdNum;
+	SceNpMatching2LobbyMemberId me;
+	u8 padding[6];
+};
+
+
+struct SceNpMatching2LobbyBinAttrInternal
+{
+	u64 updateDate;
+	SceNpMatching2LobbyMemberId updateMemberId;
+	u8 padding[2];
+	SceNpMatching2BinAttr data;
+};
+
+
+struct SceNpMatching2LobbyDataExternal
+{
+	vm::psv::ptr<SceNpMatching2LobbyDataExternal> next;
+	SceNpMatching2ServerId serverId;
+	u8 padding1[2];
+	SceNpMatching2WorldId worldId;
+	u8 padding2[4];
+	SceNpMatching2LobbyId lobbyId;
+	u32 maxSlot;
+	u32 curMemberNum;
+	SceNpMatching2FlagAttr flagAttr;
+	vm::psv::ptr<SceNpMatching2IntAttr> lobbySearchableIntAttrExternal;
+	u32 lobbySearchableIntAttrExternalNum;
+	vm::psv::ptr<SceNpMatching2BinAttr> lobbySearchableBinAttrExternal;
+	u32 lobbySearchableBinAttrExternalNum;
+	vm::psv::ptr<SceNpMatching2BinAttr> lobbyBinAttrExternal;
+	u32 lobbyBinAttrExternalNum;
+	u8 padding3[4];
+};
+
+
+struct SceNpMatching2LobbyDataInternal
+{
+	SceNpMatching2ServerId serverId;
+	u8 padding1[2];
+	SceNpMatching2WorldId worldId;
+	SceNpMatching2LobbyId lobbyId;
+
+	u32 maxSlot;
+	SceNpMatching2LobbyMemberIdList memberIdList;
+	SceNpMatching2FlagAttr flagAttr;
+	vm::psv::ptr<SceNpMatching2LobbyBinAttrInternal> lobbyBinAttrInternal;
+	u32 lobbyBinAttrInternalNum;
+};
+
+
+union SceNpMatching2LobbyMessageDestination
+{
+	SceNpMatching2LobbyMemberId unicastTarget;
+	struct
+	{
+		vm::psv::ptr<SceNpMatching2LobbyMemberId> memberId;
+		u32 memberIdNum;
+
+	} multicastTarget;
+};
+
+typedef u8 SceNpMatching2RoomGroupId;
+typedef u16 SceNpMatching2RoomMemberId;
+typedef u8 SceNpMatching2TeamId;
+typedef u8 SceNpMatching2Role;
+typedef u8 SceNpMatching2BlockKickFlag;
+
+struct SceNpMatching2GroupLabel
+{
+	u8 data[8];
+};
+
+typedef u64 SceNpMatching2RoomPasswordSlotMask;
+typedef u64 SceNpMatching2RoomJoinedSlotMask;
+
+struct SceNpMatching2RoomGroupConfig
+{
+	u32 slotNum;
+	bool withLabel;
+	SceNpMatching2GroupLabel label;
+	bool withPassword;
+	u8 padding[2];
+};
+
+
+struct SceNpMatching2RoomGroupPasswordConfig
+{
+	SceNpMatching2RoomGroupId groupId;
+	bool withPassword;
+	u8 padding[1];
+};
+
+
+struct SceNpMatching2RoomMemberBinAttrInternal
+{
+	u64 updateDate;
+	SceNpMatching2BinAttr data;
+	u8 padding[4];
+};
+
+
+struct SceNpMatching2RoomGroup
+{
+	SceNpMatching2RoomGroupId groupId;
+	bool withPassword;
+	bool withLabel;
+	u8 padding[1];
+	SceNpMatching2GroupLabel label;
+	u32 slotNum;
+	u32 curGroupMemberNum;
+};
+
+
+struct SceNpMatching2RoomMemberDataExternal
+{
+	struct vm::psv::ptr<SceNpMatching2RoomMemberDataExternal> next;
+	SceNpId npId;
+	u64 joinDate;
+	SceNpMatching2Role role;
+	u8 padding[7];
+};
+
+
+struct SceNpMatching2RoomMemberDataInternal
+{
+	struct vm::psv::ptr<SceNpMatching2RoomMemberDataInternal> next;
+	SceNpId npId;
+
+	u64 joinDate;
+	SceNpMatching2RoomMemberId memberId;
+	SceNpMatching2TeamId teamId;
+	u8 padding1[1];
+
+	vm::psv::ptr<SceNpMatching2RoomGroup> roomGroup;
+
+	SceNpMatching2NatType natType;
+	u8 padding2[3];
+	SceNpMatching2FlagAttr flagAttr;
+	vm::psv::ptr<SceNpMatching2RoomMemberBinAttrInternal> roomMemberBinAttrInternal;
+	u32 roomMemberBinAttrInternalNum;
+};
+
+
+struct SceNpMatching2RoomMemberDataInternalList
+{
+	vm::psv::ptr<SceNpMatching2RoomMemberDataInternal> members;
+	u32 membersNum;
+	vm::psv::ptr<SceNpMatching2RoomMemberDataInternal> me;
+	vm::psv::ptr<SceNpMatching2RoomMemberDataInternal> owner;
+};
+
+
+struct SceNpMatching2RoomBinAttrInternal
+{
+	u64 updateDate;
+	SceNpMatching2RoomMemberId updateMemberId;
+	u8 padding[2];
+	SceNpMatching2BinAttr data;
+};
+
+
+struct SceNpMatching2RoomDataExternal
+{
+	vm::psv::ptr<SceNpMatching2RoomDataExternal> next;
+
+	u16 maxSlot;
+	u16 curMemberNum;
+
+	SceNpMatching2ServerId serverId;
+	u8 padding[2];
+	SceNpMatching2WorldId worldId;
+	SceNpMatching2LobbyId lobbyId;
+	SceNpMatching2RoomId roomId;
+
+	SceNpMatching2RoomPasswordSlotMask passwordSlotMask;
+	SceNpMatching2RoomJoinedSlotMask joinedSlotMask;
+	u16 publicSlotNum;
+	u16 privateSlotNum;
+	u16 openPublicSlotNum;
+	u16 openPrivateSlotNum;
+
+	vm::psv::ptr<SceNpId> owner;
+	SceNpMatching2FlagAttr flagAttr;
+
+	vm::psv::ptr<SceNpMatching2RoomGroup> roomGroup;
+	u32 roomGroupNum;
+	vm::psv::ptr<SceNpMatching2IntAttr> roomSearchableIntAttrExternal;
+	u32 roomSearchableIntAttrExternalNum;
+	vm::psv::ptr<SceNpMatching2BinAttr> roomSearchableBinAttrExternal;
+	u32 roomSearchableBinAttrExternalNum;
+	vm::psv::ptr<SceNpMatching2BinAttr> roomBinAttrExternal;
+	u32 roomBinAttrExternalNum;
+};
+
+
+struct SceNpMatching2RoomDataInternal
+{
+	u16 maxSlot;
+
+	SceNpMatching2ServerId serverId;
+	SceNpMatching2WorldId worldId;
+	SceNpMatching2LobbyId lobbyId;
+	SceNpMatching2RoomId roomId;
+
+	SceNpMatching2RoomPasswordSlotMask passwordSlotMask;
+	SceNpMatching2RoomJoinedSlotMask joinedSlotMask;
+	u16 publicSlotNum;
+	u16 privateSlotNum;
+	u16 openPublicSlotNum;
+	u16 openPrivateSlotNum;
+
+	SceNpMatching2RoomMemberDataInternalList memberList;
+
+	vm::psv::ptr<SceNpMatching2RoomGroup> roomGroup;
+	u32 roomGroupNum;
+
+	SceNpMatching2FlagAttr flagAttr;
+	u8 padding[4];
+	vm::psv::ptr<SceNpMatching2RoomBinAttrInternal> roomBinAttrInternal;
+	u32 roomBinAttrInternalNum;
+};
+
+
+union SceNpMatching2RoomMessageDestination
+{
+	SceNpMatching2RoomMemberId unicastTarget;
+	struct
+	{
+		vm::psv::ptr<SceNpMatching2RoomMemberId> memberId;
+		u32 memberIdNum;
+
+	} multicastTarget;
+	SceNpMatching2TeamId multicastTargetTeamId;
+};
+
+
+struct SceNpMatching2InvitationData
+{
+	vm::psv::ptr<SceNpMatching2JoinedSessionInfo> targetSession;
+	u32 targetSessionNum;
+	vm::psv::ptr<void> optData;
+	u32 optDataLen;
+};
+
+typedef u16 SceNpMatching2Event;
+
+typedef vm::psv::ptr<void(
+	SceNpMatching2ContextId ctxId,
+	SceNpMatching2RequestId reqId,
+	SceNpMatching2Event event,
+	s32 errorCode,
+	vm::psv::ptr<const void> data,
+	vm::psv::ptr<void> arg
+	)> SceNpMatching2RequestCallback;
+
+typedef vm::psv::ptr<void(
+	SceNpMatching2ContextId ctxId,
+	SceNpMatching2LobbyId lobbyId,
+	SceNpMatching2Event event,
+	s32 errorCode,
+	vm::psv::ptr<const void> data,
+	vm::psv::ptr<void> arg
+	)> SceNpMatching2LobbyEventCallback;
+
+typedef vm::psv::ptr<void(
+	SceNpMatching2ContextId ctxId,
+	SceNpMatching2RoomId roomId,
+	SceNpMatching2Event event,
+	s32 errorCode,
+	vm::psv::ptr<const void> data,
+	vm::psv::ptr<void> arg
+	)> SceNpMatching2RoomEventCallback;
+
+typedef vm::psv::ptr<void(
+	SceNpMatching2ContextId ctxId,
+	SceNpMatching2LobbyId lobbyId,
+	SceNpMatching2LobbyMemberId srcMemberId,
+	SceNpMatching2Event event,
+	s32 errorCode,
+	vm::psv::ptr<const void> data,
+	vm::psv::ptr<void> arg
+	)> SceNpMatching2LobbyMessageCallback;
+
+typedef vm::psv::ptr<void(
+	SceNpMatching2ContextId ctxId,
+	SceNpMatching2RoomId roomId,
+	SceNpMatching2RoomMemberId srcMemberId,
+	SceNpMatching2Event event,
+	s32 errorCode,
+	vm::psv::ptr<const void> data,
+	vm::psv::ptr<void> arg
+	)> SceNpMatching2RoomMessageCallback;
+
+typedef vm::psv::ptr<void(SceNpMatching2ContextId ctxId,
+	SceNpMatching2RoomId roomId,
+	SceNpMatching2RoomMemberId peerMemberId,
+	SceNpMatching2Event event,
+	s32 errorCode,
+	vm::psv::ptr<void> arg
+	)> SceNpMatching2SignalingCallback;
+
+typedef vm::psv::ptr<void(SceNpMatching2ContextId ctxId,
+	SceNpMatching2Event event,
+	SceNpMatching2EventCause eventCause,
+	s32 errorCode,
+	vm::psv::ptr<void> arg
+	)> SceNpMatching2ContextCallback;
+
+
+struct SceNpMatching2RequestOptParam
+{
+	SceNpMatching2RequestCallback cbFunc;
+	vm::psv::ptr<void> cbFuncArg;
+	u32 timeout;
+	u16 appReqId;
+	u8 padding[2];
+};
+
+
+struct SceNpMatching2GetWorldInfoListRequest
+{
+	SceNpMatching2ServerId serverId;
+};
+
+
+
+struct SceNpMatching2GetWorldInfoListResponse
+{
+	vm::psv::ptr<SceNpMatching2World> world;
+	u32 worldNum;
+};
+
+struct SceNpMatching2SetUserInfoRequest
+{
+	SceNpMatching2ServerId serverId;
+	u8 padding[2];
+	vm::psv::ptr<SceNpMatching2BinAttr> userBinAttr;
+	u32 userBinAttrNum;
+};
+
+
+struct SceNpMatching2GetUserInfoListRequest
+{
+	SceNpMatching2ServerId serverId;
+	u8 padding[2];
+	vm::psv::ptr<SceNpId> npId;
+	u32 npIdNum;
+	vm::psv::ptr<SceNpMatching2AttributeId> attrId;
+	u32 attrIdNum;
+	s32 option;
+};
+
+
+
+struct SceNpMatching2GetUserInfoListResponse
+{
+	vm::psv::ptr<SceNpMatching2UserInfo> userInfo;
+	u32 userInfoNum;
+};
+
+
+struct SceNpMatching2GetRoomMemberDataExternalListRequest
+{
+	SceNpMatching2RoomId roomId;
+};
+
+
+
+struct SceNpMatching2GetRoomMemberDataExternalListResponse
+{
+	vm::psv::ptr<SceNpMatching2RoomMemberDataExternal> roomMemberDataExternal;
+	u32 roomMemberDataExternalNum;
+};
+
+
+struct SceNpMatching2SetRoomDataExternalRequest
+{
+	SceNpMatching2RoomId roomId;
+	vm::psv::ptr<SceNpMatching2IntAttr> roomSearchableIntAttrExternal;
+	u32 roomSearchableIntAttrExternalNum;
+	vm::psv::ptr<SceNpMatching2BinAttr> roomSearchableBinAttrExternal;
+	u32 roomSearchableBinAttrExternalNum;
+	vm::psv::ptr<SceNpMatching2BinAttr> roomBinAttrExternal;
+	u32 roomBinAttrExternalNum;
+};
+
+
+struct SceNpMatching2GetRoomDataExternalListRequest
+{
+	vm::psv::ptr<SceNpMatching2RoomId> roomId;
+	u32 roomIdNum;
+	vm::psv::ptr<const SceNpMatching2AttributeId> attrId;
+	u32 attrIdNum;
+};
+
+
+
+struct SceNpMatching2GetRoomDataExternalListResponse
+{
+	vm::psv::ptr<SceNpMatching2RoomDataExternal> roomDataExternal;
+	u32 roomDataExternalNum;
+};
+
+typedef u8 SceNpMatching2SignalingType;
+typedef u8 SceNpMatching2SignalingFlag;
+
+struct SceNpMatching2SignalingOptParam
+{
+	SceNpMatching2SignalingType type;
+	SceNpMatching2SignalingFlag flag;
+	SceNpMatching2RoomMemberId hubMemberId;
+	u8 reserved2[4];
+};
+
+
+
+struct SceNpMatching2CreateJoinRoomRequest
+{
+	SceNpMatching2WorldId worldId;
+	u8 padding1[4];
+	SceNpMatching2LobbyId lobbyId;
+
+	u32 maxSlot;
+	SceNpMatching2FlagAttr flagAttr;
+	vm::psv::ptr<SceNpMatching2BinAttr> roomBinAttrInternal;
+	u32 roomBinAttrInternalNum;
+	vm::psv::ptr<SceNpMatching2IntAttr> roomSearchableIntAttrExternal;
+	u32 roomSearchableIntAttrExternalNum;
+	vm::psv::ptr<SceNpMatching2BinAttr> roomSearchableBinAttrExternal;
+	u32 roomSearchableBinAttrExternalNum;
+	vm::psv::ptr<SceNpMatching2BinAttr> roomBinAttrExternal;
+	u32 roomBinAttrExternalNum;
+	vm::psv::ptr<SceNpMatching2SessionPassword> roomPassword;
+	vm::psv::ptr<SceNpMatching2RoomGroupConfig> groupConfig;
+	u32 groupConfigNum;
+	vm::psv::ptr<SceNpMatching2RoomPasswordSlotMask> passwordSlotMask;
+	vm::psv::ptr<SceNpId> allowedUser;
+	u32 allowedUserNum;
+	vm::psv::ptr<SceNpId> blockedUser;
+	u32 blockedUserNum;
+
+	vm::psv::ptr<SceNpMatching2GroupLabel> joinRoomGroupLabel;
+	vm::psv::ptr<SceNpMatching2BinAttr> roomMemberBinAttrInternal;
+	u32 roomMemberBinAttrInternalNum;
+	SceNpMatching2TeamId teamId;
+	u8 padding2[3];
+
+	vm::psv::ptr<SceNpMatching2SignalingOptParam> sigOptParam;
+	u8 padding3[4];
+};
+
+
+
+struct SceNpMatching2CreateJoinRoomResponse
+{
+	vm::psv::ptr<SceNpMatching2RoomDataInternal> roomDataInternal;
+};
+
+
+struct SceNpMatching2JoinRoomRequest
+{
+	SceNpMatching2RoomId roomId;
+	vm::psv::ptr<SceNpMatching2SessionPassword> roomPassword;
+	vm::psv::ptr<SceNpMatching2GroupLabel> joinRoomGroupLabel;
+	vm::psv::ptr<SceNpMatching2BinAttr> roomMemberBinAttrInternal;
+	u32 roomMemberBinAttrInternalNum;
+	SceNpMatching2PresenceOptionData optData;
+	SceNpMatching2TeamId teamId;
+	u8 padding[3];
+	vm::psv::ptr<SceNpId> blockedUser;
+	u32 blockedUserNum;
+};
+
+
+
+struct SceNpMatching2JoinRoomResponse
+{
+	vm::psv::ptr<SceNpMatching2RoomDataInternal> roomDataInternal;
+};
+
+
+struct SceNpMatching2LeaveRoomRequest
+{
+	SceNpMatching2RoomId roomId;
+	SceNpMatching2PresenceOptionData optData;
+	u8 padding[4];
+};
+
+
+struct SceNpMatching2GrantRoomOwnerRequest
+{
+	SceNpMatching2RoomId roomId;
+	SceNpMatching2RoomMemberId newOwner;
+	u8 padding[2];
+	SceNpMatching2PresenceOptionData optData;
+};
+
+
+struct SceNpMatching2KickoutRoomMemberRequest
+{
+	SceNpMatching2RoomId roomId;
+	SceNpMatching2RoomMemberId target;
+	SceNpMatching2BlockKickFlag blockKickFlag;
+	u8 padding[1];
+	SceNpMatching2PresenceOptionData optData;
+};
+
+
+struct SceNpMatching2SearchRoomRequest
+{
+	s32 option;
+	SceNpMatching2WorldId worldId;
+	SceNpMatching2LobbyId lobbyId;
+	SceNpMatching2RangeFilter rangeFilter;
+	SceNpMatching2FlagAttr flagFilter;
+	SceNpMatching2FlagAttr flagAttr;
+	vm::psv::ptr<SceNpMatching2IntSearchFilter> intFilter;
+	u32 intFilterNum;
+	vm::psv::ptr<SceNpMatching2BinSearchFilter> binFilter;
+	u32 binFilterNum;
+	vm::psv::ptr<SceNpMatching2AttributeId> attrId;
+	u32 attrIdNum;
+};
+
+
+
+struct SceNpMatching2SearchRoomResponse
+{
+	SceNpMatching2Range range;
+	vm::psv::ptr<SceNpMatching2RoomDataExternal> roomDataExternal;
+};
+
+
+struct SceNpMatching2SendRoomMessageRequest
+{
+	SceNpMatching2RoomId roomId;
+	SceNpMatching2CastType castType;
+	u8 padding[3];
+	SceNpMatching2RoomMessageDestination dst;
+	vm::psv::ptr<const void> msg;
+	u32 msgLen;
+	s32 option;
+};
+
+
+struct SceNpMatching2SendRoomChatMessageRequest
+{
+	SceNpMatching2RoomId roomId;
+	SceNpMatching2CastType castType;
+	u8 padding[3];
+	SceNpMatching2RoomMessageDestination dst;
+	vm::psv::ptr<const void> msg;
+	u32 msgLen;
+	s32 option;
+};
+
+
+
+struct SceNpMatching2SendRoomChatMessageResponse
+{
+	bool filtered;
+};
+
+
+struct SceNpMatching2SetRoomDataInternalRequest
+{
+	SceNpMatching2RoomId roomId;
+	SceNpMatching2FlagAttr flagFilter;
+	SceNpMatching2FlagAttr flagAttr;
+	vm::psv::ptr<SceNpMatching2BinAttr> roomBinAttrInternal;
+	u32 roomBinAttrInternalNum;
+	vm::psv::ptr<SceNpMatching2RoomGroupPasswordConfig> passwordConfig;
+	u32 passwordConfigNum;
+	vm::psv::ptr<SceNpMatching2RoomPasswordSlotMask> passwordSlotMask;
+	vm::psv::ptr<SceNpMatching2RoomMemberId> ownerPrivilegeRank;
+	u32 ownerPrivilegeRankNum;
+	u8 padding[4];
+};
+
+
+struct SceNpMatching2GetRoomDataInternalRequest
+{
+	SceNpMatching2RoomId roomId;
+	vm::psv::ptr<const SceNpMatching2AttributeId> attrId;
+	u32 attrIdNum;
+};
+
+
+
+struct SceNpMatching2GetRoomDataInternalResponse
+{
+	vm::psv::ptr<SceNpMatching2RoomDataInternal> roomDataInternal;
+};
+
+
+struct SceNpMatching2SetRoomMemberDataInternalRequest
+{
+	SceNpMatching2RoomId roomId;
+	SceNpMatching2RoomMemberId memberId;
+	SceNpMatching2TeamId teamId;
+	u8 padding[5];
+	SceNpMatching2FlagAttr flagFilter;
+	SceNpMatching2FlagAttr flagAttr;
+	vm::psv::ptr<SceNpMatching2BinAttr> roomMemberBinAttrInternal;
+	u32 roomMemberBinAttrInternalNum;
+};
+
+
+struct SceNpMatching2GetRoomMemberDataInternalRequest
+{
+	SceNpMatching2RoomId roomId;
+	SceNpMatching2RoomMemberId memberId;
+	u8 padding[6];
+	vm::psv::ptr<const SceNpMatching2AttributeId> attrId;
+	u32 attrIdNum;
+};
+
+
+
+struct SceNpMatching2GetRoomMemberDataInternalResponse
+{
+	vm::psv::ptr<SceNpMatching2RoomMemberDataInternal> roomMemberDataInternal;
+};
+
+
+struct SceNpMatching2SetSignalingOptParamRequest
+{
+	SceNpMatching2RoomId roomId;
+	SceNpMatching2SignalingOptParam sigOptParam;
+};
+
+
+struct SceNpMatching2GetLobbyInfoListRequest
+{
+	SceNpMatching2WorldId worldId;
+	SceNpMatching2RangeFilter rangeFilter;
+	vm::psv::ptr<SceNpMatching2AttributeId> attrId;
+	u32 attrIdNum;
+};
+
+
+
+struct SceNpMatching2GetLobbyInfoListResponse
+{
+	SceNpMatching2Range range;
+	vm::psv::ptr<SceNpMatching2LobbyDataExternal> lobbyDataExternal;
+};
+
+
+struct SceNpMatching2JoinLobbyRequest
+{
+	SceNpMatching2LobbyId lobbyId;
+	vm::psv::ptr<SceNpMatching2JoinedSessionInfo> joinedSessionInfo;
+	u32 joinedSessionInfoNum;
+	vm::psv::ptr<SceNpMatching2BinAttr> lobbyMemberBinAttrInternal;
+	u32 lobbyMemberBinAttrInternalNum;
+	SceNpMatching2PresenceOptionData optData;
+	u8 padding[4];
+};
+
+
+
+struct SceNpMatching2JoinLobbyResponse
+{
+	vm::psv::ptr<SceNpMatching2LobbyDataInternal> lobbyDataInternal;
+};
+
+
+struct SceNpMatching2LeaveLobbyRequest
+{
+	SceNpMatching2LobbyId lobbyId;
+	SceNpMatching2PresenceOptionData optData;
+	u8 padding[4];
+};
+
+
+struct SceNpMatching2SetLobbyMemberDataInternalRequest
+{
+	SceNpMatching2LobbyId lobbyId;
+	SceNpMatching2LobbyMemberId memberId;
+	u8 padding1[2];
+	SceNpMatching2FlagAttr flagFilter;
+	SceNpMatching2FlagAttr flagAttr;
+	vm::psv::ptr<SceNpMatching2JoinedSessionInfo> joinedSessionInfo;
+	u32 joinedSessionInfoNum;
+	vm::psv::ptr<SceNpMatching2BinAttr> lobbyMemberBinAttrInternal;
+	u32 lobbyMemberBinAttrInternalNum;
+	u8 padding2[4];
+};
+
+
+struct SceNpMatching2GetLobbyMemberDataInternalRequest
+{
+	SceNpMatching2LobbyId lobbyId;
+	SceNpMatching2LobbyMemberId memberId;
+	u8 padding[6];
+	vm::psv::ptr<const SceNpMatching2AttributeId> attrId;
+	u32 attrIdNum;
+};
+
+
+
+struct SceNpMatching2GetLobbyMemberDataInternalResponse
+{
+	vm::psv::ptr<SceNpMatching2LobbyMemberDataInternal> lobbyMemberDataInternal;
+};
+
+
+
+struct SceNpMatching2GetLobbyMemberDataInternalListRequest
+{
+	SceNpMatching2LobbyId lobbyId;
+	vm::psv::ptr<SceNpMatching2LobbyMemberId> memberId;
+	u32 memberIdNum;
+	vm::psv::ptr<const SceNpMatching2AttributeId> attrId;
+	u32 attrIdNum;
+	bool extendedData;
+	u8 padding[7];
+};
+
+
+
+struct SceNpMatching2GetLobbyMemberDataInternalListResponse
+{
+	vm::psv::ptr<SceNpMatching2LobbyMemberDataInternal> lobbyMemberDataInternal;
+	u32 lobbyMemberDataInternalNum;
+};
+
+
+struct SceNpMatching2SendLobbyChatMessageRequest
+{
+	SceNpMatching2LobbyId lobbyId;
+	SceNpMatching2CastType castType;
+	u8 padding[3];
+	SceNpMatching2LobbyMessageDestination dst;
+	vm::psv::ptr<const void> msg;
+	u32 msgLen;
+	s32 option;
+};
+
+
+
+struct SceNpMatching2SendLobbyChatMessageResponse
+{
+	bool filtered;
+};
+
+
+struct SceNpMatching2SendLobbyInvitationRequest
+{
+	SceNpMatching2LobbyId lobbyId;
+	SceNpMatching2CastType castType;
+	u8 padding[3];
+	SceNpMatching2LobbyMessageDestination dst;
+	SceNpMatching2InvitationData invitationData;
+	s32 option;
+};
+
+
+struct SceNpMatching2RoomMemberUpdateInfo
+{
+	vm::psv::ptr<SceNpMatching2RoomMemberDataInternal> roomMemberDataInternal;
+	SceNpMatching2EventCause eventCause;
+	u8 padding[3];
+	SceNpMatching2PresenceOptionData optData;
+};
+
+
+struct SceNpMatching2RoomOwnerUpdateInfo
+{
+	SceNpMatching2RoomMemberId prevOwner;
+	SceNpMatching2RoomMemberId newOwner;
+	SceNpMatching2EventCause eventCause;
+	u8 padding[3];
+	vm::psv::ptr<SceNpMatching2SessionPassword> roomPassword;
+	SceNpMatching2PresenceOptionData optData;
+};
+
+
+struct SceNpMatching2RoomUpdateInfo
+{
+	SceNpMatching2EventCause eventCause;
+	u8 padding[3];
+	s32 errorCode;
+	SceNpMatching2PresenceOptionData optData;
+};
+
+
+struct SceNpMatching2RoomDataInternalUpdateInfo
+{
+	vm::psv::ptr<SceNpMatching2RoomDataInternal> newRoomDataInternal;
+	vm::psv::ptr<SceNpMatching2FlagAttr> newFlagAttr;
+	vm::psv::ptr<SceNpMatching2FlagAttr> prevFlagAttr;
+	vm::psv::ptr<SceNpMatching2RoomPasswordSlotMask> newRoomPasswordSlotMask;
+	vm::psv::ptr<SceNpMatching2RoomPasswordSlotMask> prevRoomPasswordSlotMask;
+	vm::psv::ptr<SceNpMatching2RoomGroup> *newRoomGroup;
+	u32 newRoomGroupNum;
+	vm::psv::ptr<SceNpMatching2RoomBinAttrInternal> *newRoomBinAttrInternal;
+	u32 newRoomBinAttrInternalNum;
+};
+
+
+struct SceNpMatching2RoomMemberDataInternalUpdateInfo
+{
+	vm::psv::ptr<SceNpMatching2RoomMemberDataInternal> newRoomMemberDataInternal;
+	vm::psv::ptr<SceNpMatching2FlagAttr> newFlagAttr;
+	vm::psv::ptr<SceNpMatching2FlagAttr> prevFlagAttr;
+	vm::psv::ptr<SceNpMatching2TeamId> newTeamId;
+	vm::psv::ptr<SceNpMatching2RoomMemberBinAttrInternal> *newRoomMemberBinAttrInternal;
+	u32 newRoomMemberBinAttrInternalNum;
+};
+
+
+struct SceNpMatching2SignalingOptParamUpdateInfo
+{
+	SceNpMatching2SignalingOptParam newSignalingOptParam;
+};
+
+
+struct SceNpMatching2RoomMessageInfo
+{
+	bool filtered;
+	SceNpMatching2CastType castType;
+	u8 padding[2];
+	vm::psv::ptr<SceNpMatching2RoomMessageDestination> dst;
+	vm::psv::ptr<SceNpId> srcMember;
+	vm::psv::ptr<const void> msg;
+	u32 msgLen;
+};
+
+
+struct SceNpMatching2LobbyMemberUpdateInfo
+{
+	vm::psv::ptr<SceNpMatching2LobbyMemberDataInternal> lobbyMemberDataInternal;
+	SceNpMatching2EventCause eventCause;
+	u8 padding[3];
+	SceNpMatching2PresenceOptionData optData;
+};
+
+
+struct SceNpMatching2LobbyUpdateInfo
+{
+	SceNpMatching2EventCause eventCause;
+	u8 padding[3];
+	s32 errorCode;
+};
+
+
+struct SceNpMatching2LobbyMemberDataInternalUpdateInfo
+{
+	SceNpMatching2LobbyMemberId memberId;
+	u8 padding[2];
+	SceNpId npId;
+	SceNpMatching2FlagAttr flagFilter;
+	SceNpMatching2FlagAttr newFlagAttr;
+	vm::psv::ptr<SceNpMatching2JoinedSessionInfo> newJoinedSessionInfo;
+	u32 newJoinedSessionInfoNum;
+	vm::psv::ptr<SceNpMatching2LobbyMemberBinAttrInternal> newLobbyMemberBinAttrInternal;
+	u32 newLobbyMemberBinAttrInternalNum;
+};
+
+
+struct SceNpMatching2LobbyMessageInfo
+{
+	bool filtered;
+	SceNpMatching2CastType castType;
+	u8 padding[2];
+	vm::psv::ptr<SceNpMatching2LobbyMessageDestination> dst;
+	vm::psv::ptr<SceNpId> srcMember;
+	vm::psv::ptr<const void> msg;
+	u32 msgLen;
+};
+
+
+struct SceNpMatching2LobbyInvitationInfo
+{
+	SceNpMatching2CastType castType;
+	u8 padding[3];
+	vm::psv::ptr<SceNpMatching2LobbyMessageDestination> dst;
+	vm::psv::ptr<SceNpId> srcMember;
+	SceNpMatching2InvitationData invitationData;
+};
+
+union SceNpMatching2SignalingConnectionInfo
+{
+	u32 rtt;
+	u32 bandwidth;
+	SceNpId npId;
+	struct
+	{
+		SceNetInAddr addr;
+		u16 port;
+		u8 padding[2];
+
+	} address;
+	u32 packetLoss;
+};
+
+struct SceNpMatching2SignalingNetInfo
+{
+	u32 size;
+	SceNetInAddr localAddr;
+	SceNetInAddr mappedAddr;
+	s32 natStatus;
+};
+
+// Functions
+
+s32 sceNpMatching2Init(
+	const u32 poolSize,
+	const s32 threadPriority,
+	const s32 cpuAffinityMask,
+	const u32 threadStackSize)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2Term()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2CreateContext(
+	vm::psv::ptr<const SceNpId> npId,
+	vm::psv::ptr<const SceNpCommunicationId> commId,
+	vm::psv::ptr<const SceNpCommunicationPassphrase> passPhrase,
+	vm::psv::ptr<SceNpMatching2ContextId> ctxId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2DestroyContext(const SceNpMatching2ContextId ctxId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2ContextStart(const SceNpMatching2ContextId ctxId, const u64 timeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2AbortContextStart(const SceNpMatching2ContextId ctxId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2ContextStop(const SceNpMatching2ContextId ctxId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2SetDefaultRequestOptParam(const SceNpMatching2ContextId ctxId, vm::psv::ptr<const SceNpMatching2RequestOptParam> optParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2RegisterRoomEventCallback(const SceNpMatching2ContextId ctxId, SceNpMatching2RoomEventCallback cbFunc, vm::psv::ptr<void> cbFuncArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2RegisterRoomMessageCallback(const SceNpMatching2ContextId ctxId, SceNpMatching2RoomMessageCallback cbFunc, vm::psv::ptr<void> cbFuncArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2RegisterSignalingCallback(const SceNpMatching2ContextId ctxId, SceNpMatching2SignalingCallback cbFunc, vm::psv::ptr<void> cbFuncArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2RegisterContextCallback(SceNpMatching2ContextCallback cbFunc, vm::psv::ptr<void> cbFuncArg)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2AbortRequest(const SceNpMatching2ContextId ctxId, const SceNpMatching2RequestId reqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2GetMemoryInfo(vm::psv::ptr<SceNpMatching2MemoryInfo> memInfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2GetServerLocal(const SceNpMatching2ContextId ctxId, vm::psv::ptr<SceNpMatching2Server> server)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2GetWorldInfoList(
+	const SceNpMatching2ContextId ctxId,
+	vm::psv::ptr<const SceNpMatching2GetWorldInfoListRequest> reqParam,
+	vm::psv::ptr<const SceNpMatching2RequestOptParam> optParam,
+	vm::psv::ptr<SceNpMatching2RequestId> assignedReqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2CreateJoinRoom(
+	const SceNpMatching2ContextId ctxId,
+	vm::psv::ptr<const SceNpMatching2CreateJoinRoomRequest> reqParam,
+	vm::psv::ptr<const SceNpMatching2RequestOptParam> optParam,
+	vm::psv::ptr<SceNpMatching2RequestId> assignedReqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2SearchRoom(
+	const SceNpMatching2ContextId ctxId,
+	vm::psv::ptr<const SceNpMatching2SearchRoomRequest> reqParam,
+	vm::psv::ptr<const SceNpMatching2RequestOptParam> optParam,
+	vm::psv::ptr<SceNpMatching2RequestId> assignedReqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2JoinRoom(
+	const SceNpMatching2ContextId ctxId,
+	vm::psv::ptr<const SceNpMatching2JoinRoomRequest> reqParam,
+	vm::psv::ptr<const SceNpMatching2RequestOptParam> optParam,
+	vm::psv::ptr<SceNpMatching2RequestId> assignedReqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2LeaveRoom(
+	const SceNpMatching2ContextId ctxId,
+	vm::psv::ptr<const SceNpMatching2LeaveRoomRequest> reqParam,
+	vm::psv::ptr<const SceNpMatching2RequestOptParam> optParam,
+	vm::psv::ptr<SceNpMatching2RequestId> assignedReqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2GetSignalingOptParamLocal(
+	const SceNpMatching2ContextId ctxId,
+	const SceNpMatching2RoomId roomId,
+	vm::psv::ptr<SceNpMatching2SignalingOptParam> signalingOptParam)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2SetRoomDataExternal(
+	const SceNpMatching2ContextId ctxId,
+	vm::psv::ptr<const SceNpMatching2SetRoomDataExternalRequest> reqParam,
+	vm::psv::ptr<const SceNpMatching2RequestOptParam> optParam,
+	vm::psv::ptr<SceNpMatching2RequestId> assignedReqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2KickoutRoomMember(
+	const SceNpMatching2ContextId ctxId,
+	vm::psv::ptr<const SceNpMatching2KickoutRoomMemberRequest> reqParam,
+	vm::psv::ptr<const SceNpMatching2RequestOptParam> optParam,
+	vm::psv::ptr<SceNpMatching2RequestId> assignedReqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2SendRoomChatMessage(
+	const SceNpMatching2ContextId ctxId,
+	vm::psv::ptr<const SceNpMatching2SendRoomChatMessageRequest> reqParam,
+	vm::psv::ptr<const SceNpMatching2RequestOptParam> optParam,
+	vm::psv::ptr<SceNpMatching2RequestId> assignedReqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2SendRoomMessage(
+	const SceNpMatching2ContextId ctxId,
+	vm::psv::ptr<const SceNpMatching2SendRoomMessageRequest> reqParam,
+	vm::psv::ptr<const SceNpMatching2RequestOptParam> optParam,
+	vm::psv::ptr<SceNpMatching2RequestId> assignedReqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2SignalingGetConnectionStatus(
+	SceNpMatching2ContextId ctxId,
+	SceNpMatching2RoomId roomId,
+	SceNpMatching2RoomMemberId memberId,
+	vm::psv::ptr<s32> connStatus,
+	vm::psv::ptr<SceNetInAddr> peerAddr,
+	vm::psv::ptr<u16> peerPort)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2SignalingGetConnectionInfo(
+	SceNpMatching2ContextId ctxId,
+	SceNpMatching2RoomId roomId,
+	SceNpMatching2RoomMemberId memberId,
+	s32 code,
+	vm::psv::ptr<SceNpMatching2SignalingConnectionInfo> info)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2SignalingGetLocalNetInfo(vm::psv::ptr<SceNpMatching2SignalingNetInfo> netinfo)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2SignalingGetPeerNetInfo(
+	SceNpMatching2ContextId ctxId,
+	SceNpMatching2RoomId roomId,
+	SceNpMatching2RoomMemberId memberId,
+	vm::psv::ptr<SceNpMatching2SignalingRequestId> reqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2SignalingCancelPeerNetInfo(
+	SceNpMatching2ContextId ctxId,
+	SceNpMatching2SignalingRequestId reqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpMatching2SignalingGetPeerNetInfoResult(
+	SceNpMatching2ContextId ctxId,
+	SceNpMatching2SignalingRequestId reqId,
+	vm::psv::ptr<SceNpMatching2SignalingNetInfo> netinfo)
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpMatching, #name, name)
 
 psv_log_base sceNpMatching("SceNpMatching2", []()
@@ -12,35 +1310,35 @@ psv_log_base sceNpMatching("SceNpMatching2", []()
 	sceNpMatching.on_unload = nullptr;
 	sceNpMatching.on_stop = nullptr;
 
-	//REG_FUNC(0xEBB1FE74, sceNpMatching2Init);
-	//REG_FUNC(0x0124641C, sceNpMatching2Term);
-	//REG_FUNC(0xADF578E1, sceNpMatching2CreateContext);
-	//REG_FUNC(0x368AA759, sceNpMatching2DestroyContext);
-	//REG_FUNC(0xBB2E7559, sceNpMatching2ContextStart);
-	//REG_FUNC(0xF2847E3B, sceNpMatching2AbortContextStart);
-	//REG_FUNC(0x506454DE, sceNpMatching2ContextStop);
-	//REG_FUNC(0xF3A43C50, sceNpMatching2SetDefaultRequestOptParam);
-	//REG_FUNC(0xF486991B, sceNpMatching2RegisterRoomEventCallback);
-	//REG_FUNC(0xFA51949B, sceNpMatching2RegisterRoomMessageCallback);
-	//REG_FUNC(0xF9E35566, sceNpMatching2RegisterContextCallback);
-	//REG_FUNC(0x74EB6CE9, sceNpMatching2AbortRequest);
-	//REG_FUNC(0x7BD39E50, sceNpMatching2GetMemoryInfo);
-	//REG_FUNC(0x65C0FEED, sceNpMatching2GetServerLocal);
-	//REG_FUNC(0xC086B560, sceNpMatching2GetWorldInfoList);
-	//REG_FUNC(0x818A9499, sceNpMatching2CreateJoinRoom);
-	//REG_FUNC(0xD48BAF13, sceNpMatching2SearchRoom);
-	//REG_FUNC(0x33F7D5AE, sceNpMatching2JoinRoom);
-	//REG_FUNC(0xC8B0C9EE, sceNpMatching2LeaveRoom);
-	//REG_FUNC(0x495D2B46, sceNpMatching2GetSignalingOptParamLocal);
-	//REG_FUNC(0xE0BE0510, sceNpMatching2SendRoomChatMessage);
-	//REG_FUNC(0x7B908D99, sceNpMatching2SendRoomMessage);
-	//REG_FUNC(0x4E4C55BD, sceNpMatching2SignalingGetConnectionStatus);
-	//REG_FUNC(0x20598618, sceNpMatching2SignalingGetConnectionInfo);
-	//REG_FUNC(0x79310806, sceNpMatching2SignalingGetLocalNetInfo);
-	//REG_FUNC(0xF0CB1DD3, sceNpMatching2SignalingGetPeerNetInfo);
-	//REG_FUNC(0xADCD102C, sceNpMatching2SignalingCancelPeerNetInfo);
-	//REG_FUNC(0xFDC7B2C9, sceNpMatching2SignalingGetPeerNetInfoResult);
-	//REG_FUNC(0x1C60BC5B, sceNpMatching2RegisterSignalingCallback);
-	//REG_FUNC(0x8F88AC7E, sceNpMatching2SetRoomDataExternal);
-	//REG_FUNC(0xA8021394, sceNpMatching2KickoutRoomMember);
+	REG_FUNC(0xEBB1FE74, sceNpMatching2Init);
+	REG_FUNC(0x0124641C, sceNpMatching2Term);
+	REG_FUNC(0xADF578E1, sceNpMatching2CreateContext);
+	REG_FUNC(0x368AA759, sceNpMatching2DestroyContext);
+	REG_FUNC(0xBB2E7559, sceNpMatching2ContextStart);
+	REG_FUNC(0xF2847E3B, sceNpMatching2AbortContextStart);
+	REG_FUNC(0x506454DE, sceNpMatching2ContextStop);
+	REG_FUNC(0xF3A43C50, sceNpMatching2SetDefaultRequestOptParam);
+	REG_FUNC(0xF486991B, sceNpMatching2RegisterRoomEventCallback);
+	REG_FUNC(0xFA51949B, sceNpMatching2RegisterRoomMessageCallback);
+	REG_FUNC(0xF9E35566, sceNpMatching2RegisterContextCallback);
+	REG_FUNC(0x74EB6CE9, sceNpMatching2AbortRequest);
+	REG_FUNC(0x7BD39E50, sceNpMatching2GetMemoryInfo);
+	REG_FUNC(0x65C0FEED, sceNpMatching2GetServerLocal);
+	REG_FUNC(0xC086B560, sceNpMatching2GetWorldInfoList);
+	REG_FUNC(0x818A9499, sceNpMatching2CreateJoinRoom);
+	REG_FUNC(0xD48BAF13, sceNpMatching2SearchRoom);
+	REG_FUNC(0x33F7D5AE, sceNpMatching2JoinRoom);
+	REG_FUNC(0xC8B0C9EE, sceNpMatching2LeaveRoom);
+	REG_FUNC(0x495D2B46, sceNpMatching2GetSignalingOptParamLocal);
+	REG_FUNC(0xE0BE0510, sceNpMatching2SendRoomChatMessage);
+	REG_FUNC(0x7B908D99, sceNpMatching2SendRoomMessage);
+	REG_FUNC(0x4E4C55BD, sceNpMatching2SignalingGetConnectionStatus);
+	REG_FUNC(0x20598618, sceNpMatching2SignalingGetConnectionInfo);
+	REG_FUNC(0x79310806, sceNpMatching2SignalingGetLocalNetInfo);
+	REG_FUNC(0xF0CB1DD3, sceNpMatching2SignalingGetPeerNetInfo);
+	REG_FUNC(0xADCD102C, sceNpMatching2SignalingCancelPeerNetInfo);
+	REG_FUNC(0xFDC7B2C9, sceNpMatching2SignalingGetPeerNetInfoResult);
+	REG_FUNC(0x1C60BC5B, sceNpMatching2RegisterSignalingCallback);
+	REG_FUNC(0x8F88AC7E, sceNpMatching2SetRoomDataExternal);
+	REG_FUNC(0xA8021394, sceNpMatching2KickoutRoomMember);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp
index 612114af70..f093ab8b31 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpScore.cpp
@@ -2,8 +2,337 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
+#include "sceNpCommon.h"
+
 extern psv_log_base sceNpScore;
 
+typedef u32 SceNpScoreBoardId;
+typedef s64 SceNpScoreValue;
+typedef u32 SceNpScoreRankNumber;
+typedef s32 SceNpScorePcId;
+
+struct SceNpScoreGameInfo
+{
+	u32 infoSize;
+	u8 pad[4];
+	u8 data[192];
+};
+
+struct SceNpScoreComment
+{
+	char utf8Comment[64];
+};
+
+struct SceNpScoreRankData
+{
+	SceNpId npId;
+	u8 reserved[49];
+	u8 pad0[3];
+	SceNpScorePcId pcId;
+	SceNpScoreRankNumber serialRank;
+	SceNpScoreRankNumber rank;
+	SceNpScoreRankNumber highestRank;
+	s32 hasGameData;
+	u8 pad1[4];
+	SceNpScoreValue scoreValue;
+	u64 recordDate;
+};
+
+struct SceNpScorePlayerRankData
+{
+	s32 hasData;
+	u8 pad0[4];
+	SceNpScoreRankData rankData;
+};
+
+struct SceNpScoreBoardInfo
+{
+	u32 rankLimit;
+	u32 updateMode;
+	u32 sortMode;
+	u32 uploadNumLimit;
+	u32 uploadSizeLimit;
+};
+
+struct SceNpScoreNpIdPcId
+{
+	SceNpId npId;
+	SceNpScorePcId pcId;
+	u8 pad[4];
+};
+
+s32 sceNpScoreInit(s32 threadPriority, s32 cpuAffinityMask, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreTerm(ARMv7Context&)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreCreateTitleCtx(vm::psv::ptr<const SceNpCommunicationId> titleId, vm::psv::ptr<const SceNpCommunicationPassphrase> passphrase, vm::psv::ptr<const SceNpId> selfNpId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreDeleteTitleCtx(s32 titleCtxId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreCreateRequest(s32 titleCtxId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreDeleteRequest(s32 reqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreAbortRequest(s32 reqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreSetTimeout(s32 id, s32 resolveRetry, s32 resolveTimeout, s32 connTimeout, s32 sendTimeout, s32 recvTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreSetPlayerCharacterId(s32 id, SceNpScorePcId pcId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreGetBoardInfo(s32 reqId, SceNpScoreBoardId boardId, vm::psv::ptr<SceNpScoreBoardInfo> boardInfo, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreRecordScore(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	SceNpScoreValue score,
+	vm::psv::ptr<const SceNpScoreComment> scoreComment,
+	vm::psv::ptr<const SceNpScoreGameInfo> gameInfo,
+	vm::psv::ptr<SceNpScoreRankNumber> tmpRank,
+	vm::psv::ptr<const u64> compareDate,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreRecordGameData(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	SceNpScoreValue score,
+	u32 totalSize,
+	u32 sendSize,
+	vm::psv::ptr<const void> data,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreGetGameData(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	vm::psv::ptr<const SceNpId> npId,
+	vm::psv::ptr<u32> totalSize,
+	u32 recvSize,
+	vm::psv::ptr<void> data,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreGetRankingByNpId(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	vm::psv::ptr<const SceNpId> npIdArray,
+	u32 npIdArraySize,
+	vm::psv::ptr<SceNpScorePlayerRankData> rankArray,
+	u32 rankArraySize,
+	vm::psv::ptr<SceNpScoreComment> commentArray,
+	u32 commentArraySize,
+	vm::psv::ptr<SceNpScoreGameInfo> infoArray,
+	u32 infoArraySize,
+	u32 arrayNum,
+	vm::psv::ptr<u64> lastSortDate,
+	vm::psv::ptr<SceNpScoreRankNumber> totalRecord,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreGetRankingByRange(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	SceNpScoreRankNumber startSerialRank,
+	vm::psv::ptr<SceNpScoreRankData> rankArray,
+	u32 rankArraySize,
+	vm::psv::ptr<SceNpScoreComment> commentArray,
+	u32 commentArraySize,
+	vm::psv::ptr<SceNpScoreGameInfo> infoArray,
+	u32 infoArraySize,
+	u32 arrayNum,
+	vm::psv::ptr<u64> lastSortDate,
+	vm::psv::ptr<SceNpScoreRankNumber> totalRecord,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+
+s32 sceNpScoreGetRankingByNpIdPcId(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	vm::psv::ptr<const SceNpScoreNpIdPcId> idArray,
+	u32 idArraySize,
+	vm::psv::ptr<SceNpScorePlayerRankData> rankArray,
+	u32 rankArraySize,
+	vm::psv::ptr<SceNpScoreComment> commentArray,
+	u32 commentArraySize,
+	vm::psv::ptr<SceNpScoreGameInfo> infoArray,
+	u32 infoArraySize,
+	u32 arrayNum,
+	vm::psv::ptr<u64> lastSortDate,
+	vm::psv::ptr<SceNpScoreRankNumber> totalRecord,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreCensorComment(s32 reqId, vm::psv::ptr<const char> comment, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreSanitizeComment(s32 reqId, vm::psv::ptr<const char> comment, vm::psv::ptr<char> sanitizedComment, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreWaitAsync(s32 id, vm::psv::ptr<s32> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScorePollAsync(s32 reqId, vm::psv::ptr<s32> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreGetBoardInfoAsync(s32 reqId, SceNpScoreBoardId boardId, vm::psv::ptr<SceNpScoreBoardInfo> boardInfo, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreRecordScoreAsync(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	SceNpScoreValue score,
+	vm::psv::ptr<const SceNpScoreComment> scoreComment,
+	vm::psv::ptr<const SceNpScoreGameInfo> gameInfo,
+	vm::psv::ptr<SceNpScoreRankNumber> tmpRank,
+	vm::psv::ptr<const u64> compareDate,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreRecordGameDataAsync(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	SceNpScoreValue score,
+	u32 totalSize,
+	u32 sendSize,
+	vm::psv::ptr<const void> data,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreGetGameDataAsync(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	vm::psv::ptr<const SceNpId> npId,
+	vm::psv::ptr<u32> totalSize,
+	u32 recvSize,
+	vm::psv::ptr<void> data,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreGetRankingByNpIdAsync(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	vm::psv::ptr<const SceNpId> npIdArray,
+	u32 npIdArraySize,
+	vm::psv::ptr<SceNpScorePlayerRankData> rankArray,
+	u32 rankArraySize,
+	vm::psv::ptr<SceNpScoreComment> commentArray,
+	u32 commentArraySize,
+	vm::psv::ptr<SceNpScoreGameInfo> infoArray,
+	u32 infoArraySize,
+	u32 arrayNum,
+	vm::psv::ptr<u64> lastSortDate,
+	vm::psv::ptr<SceNpScoreRankNumber> totalRecord,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreGetRankingByRangeAsync(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	SceNpScoreRankNumber startSerialRank,
+	vm::psv::ptr<SceNpScoreRankData> rankArray,
+	u32 rankArraySize,
+	vm::psv::ptr<SceNpScoreComment> commentArray,
+	u32 commentArraySize,
+	vm::psv::ptr<SceNpScoreGameInfo> infoArray,
+	u32 infoArraySize,
+	u32 arrayNum,
+	vm::psv::ptr<u64> lastSortDate,
+	vm::psv::ptr<SceNpScoreRankNumber> totalRecord,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreGetRankingByNpIdPcIdAsync(
+	s32 reqId,
+	SceNpScoreBoardId boardId,
+	vm::psv::ptr<const SceNpScoreNpIdPcId> idArray,
+	u32 idArraySize,
+	vm::psv::ptr<SceNpScorePlayerRankData> rankArray,
+	u32 rankArraySize,
+	vm::psv::ptr<SceNpScoreComment> commentArray,
+	u32 commentArraySize,
+	vm::psv::ptr<SceNpScoreGameInfo> infoArray,
+	u32 infoArraySize,
+	u32 arrayNum,
+	vm::psv::ptr<u64> lastSortDate,
+	vm::psv::ptr<SceNpScoreRankNumber> totalRecord,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreCensorCommentAsync(s32 reqId, vm::psv::ptr<const char> comment, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpScoreSanitizeCommentAsync(s32 reqId, vm::psv::ptr<const char> comment, vm::psv::ptr<char> sanitizedComment, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpScore, #name, name)
 
 psv_log_base sceNpScore("SceNpScore", []()
@@ -12,33 +341,33 @@ psv_log_base sceNpScore("SceNpScore", []()
 	sceNpScore.on_unload = nullptr;
 	sceNpScore.on_stop = nullptr;
 
-	//REG_FUNC(0x0433069F, sceNpScoreInit);
-	//REG_FUNC(0x2050F98F, sceNpScoreTerm);
-	//REG_FUNC(0x5685F225, sceNpScoreCreateTitleCtx);
-	//REG_FUNC(0xD30D1993, sceNpScoreCreateRequest);
-	//REG_FUNC(0xF52EA88A, sceNpScoreDeleteTitleCtx);
-	//REG_FUNC(0xFFF24BB1, sceNpScoreDeleteRequest);
-	//REG_FUNC(0x320C0277, sceNpScoreRecordScore);
-	//REG_FUNC(0x24B09634, sceNpScoreRecordScoreAsync);
-	//REG_FUNC(0xC2862B67, sceNpScoreRecordGameData);
-	//REG_FUNC(0x40573917, sceNpScoreRecordGameDataAsync);
-	//REG_FUNC(0xDFAD64D3, sceNpScoreGetGameData);
-	//REG_FUNC(0xCE416993, sceNpScoreGetGameDataAsync);
-	//REG_FUNC(0x427D3412, sceNpScoreGetRankingByRange);
-	//REG_FUNC(0xC45E3FCD, sceNpScoreGetRankingByRangeAsync);
-	//REG_FUNC(0xBAE55B34, sceNpScoreGetRankingByNpId);
-	//REG_FUNC(0x45CD1D00, sceNpScoreGetRankingByNpIdAsync);
-	//REG_FUNC(0x871F28AA, sceNpScoreGetRankingByNpIdPcId);
-	//REG_FUNC(0xCE3A9544, sceNpScoreGetRankingByNpIdPcIdAsync);
-	//REG_FUNC(0xA7E93CE1, sceNpScoreAbortRequest);
-	//REG_FUNC(0x31733BF3, sceNpScoreWaitAsync);
-	//REG_FUNC(0x9F2A7AC9, sceNpScorePollAsync);
-	//REG_FUNC(0x00F90E7B, sceNpScoreGetBoardInfo);
-	//REG_FUNC(0x3CD9974E, sceNpScoreGetBoardInfoAsync);
-	//REG_FUNC(0xA0C94D46, sceNpScoreCensorComment);
-	//REG_FUNC(0xAA0BBF8E, sceNpScoreCensorCommentAsync);
-	//REG_FUNC(0x6FD2041A, sceNpScoreSanitizeComment);
-	//REG_FUNC(0x15981858, sceNpScoreSanitizeCommentAsync);
-	//REG_FUNC(0x5EF44841, sceNpScoreSetTimeout);
-	//REG_FUNC(0x53D77883, sceNpScoreSetPlayerCharacterId);
+	REG_FUNC(0x0433069F, sceNpScoreInit);
+	REG_FUNC(0x2050F98F, sceNpScoreTerm);
+	REG_FUNC(0x5685F225, sceNpScoreCreateTitleCtx);
+	REG_FUNC(0xD30D1993, sceNpScoreCreateRequest);
+	REG_FUNC(0xF52EA88A, sceNpScoreDeleteTitleCtx);
+	REG_FUNC(0xFFF24BB1, sceNpScoreDeleteRequest);
+	REG_FUNC(0x320C0277, sceNpScoreRecordScore);
+	REG_FUNC(0x24B09634, sceNpScoreRecordScoreAsync);
+	REG_FUNC(0xC2862B67, sceNpScoreRecordGameData);
+	REG_FUNC(0x40573917, sceNpScoreRecordGameDataAsync);
+	REG_FUNC(0xDFAD64D3, sceNpScoreGetGameData);
+	REG_FUNC(0xCE416993, sceNpScoreGetGameDataAsync);
+	REG_FUNC(0x427D3412, sceNpScoreGetRankingByRange);
+	REG_FUNC(0xC45E3FCD, sceNpScoreGetRankingByRangeAsync);
+	REG_FUNC(0xBAE55B34, sceNpScoreGetRankingByNpId);
+	REG_FUNC(0x45CD1D00, sceNpScoreGetRankingByNpIdAsync);
+	REG_FUNC(0x871F28AA, sceNpScoreGetRankingByNpIdPcId);
+	REG_FUNC(0xCE3A9544, sceNpScoreGetRankingByNpIdPcIdAsync);
+	REG_FUNC(0xA7E93CE1, sceNpScoreAbortRequest);
+	REG_FUNC(0x31733BF3, sceNpScoreWaitAsync);
+	REG_FUNC(0x9F2A7AC9, sceNpScorePollAsync);
+	REG_FUNC(0x00F90E7B, sceNpScoreGetBoardInfo);
+	REG_FUNC(0x3CD9974E, sceNpScoreGetBoardInfoAsync);
+	REG_FUNC(0xA0C94D46, sceNpScoreCensorComment);
+	REG_FUNC(0xAA0BBF8E, sceNpScoreCensorCommentAsync);
+	REG_FUNC(0x6FD2041A, sceNpScoreSanitizeComment);
+	REG_FUNC(0x15981858, sceNpScoreSanitizeCommentAsync);
+	REG_FUNC(0x5EF44841, sceNpScoreSetTimeout);
+	REG_FUNC(0x53D77883, sceNpScoreSetPlayerCharacterId);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp b/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp
index 5ce2ca80ad..1aab007361 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpUtility.cpp
@@ -2,8 +2,140 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
+#include "sceNpCommon.h"
+
 extern psv_log_base sceNpUtility;
 
+struct SceNpBandwidthTestResult
+{
+	double uploadBps;
+	double downloadBps;
+	s32 result;
+	char padding[4];
+};
+
+s32 sceNpLookupInit(s32 usesAsync, s32 threadPriority, s32 cpuAffinityMask, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupTerm(ARMv7Context&)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupCreateTitleCtx(vm::psv::ptr<const SceNpCommunicationId> titleId, vm::psv::ptr<const SceNpId> selfNpId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupDeleteTitleCtx(s32 titleCtxId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupCreateRequest(s32 titleCtxId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupDeleteRequest(s32 reqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupAbortRequest(s32 reqId)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupSetTimeout(s32 id, s32 resolveRetry, u32 resolveTimeout, u32 connTimeout, u32 sendTimeout, u32 recvTimeout)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupWaitAsync(s32 reqId, vm::psv::ptr<s32> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupPollAsync(s32 reqId, vm::psv::ptr<s32> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupNpId(s32 reqId, vm::psv::ptr<const SceNpOnlineId> onlineId, vm::psv::ptr<SceNpId> npId, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupNpIdAsync(s32 reqId, vm::psv::ptr<const SceNpOnlineId> onlineId, vm::psv::ptr<SceNpId> npId, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupUserProfile(
+	s32 reqId,
+	s32 avatarSizeType,
+	vm::psv::ptr<const SceNpId> npId,
+	vm::psv::ptr<SceNpUserInformation> userInfo,
+	vm::psv::ptr<SceNpAboutMe> aboutMe,
+	vm::psv::ptr<SceNpMyLanguages> languages,
+	vm::psv::ptr<SceNpCountryCode> countryCode,
+	vm::psv::ptr<void> avatarImageData,
+	u32 avatarImageDataMaxSize,
+	vm::psv::ptr<u32> avatarImageDataSize,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupUserProfileAsync(
+	s32 reqId,
+	s32 avatarSizeType,
+	vm::psv::ptr<const SceNpId> npId,
+	vm::psv::ptr<SceNpUserInformation> userInfo,
+	vm::psv::ptr<SceNpAboutMe> aboutMe,
+	vm::psv::ptr<SceNpMyLanguages> languages,
+	vm::psv::ptr<SceNpCountryCode> countryCode,
+	vm::psv::ptr<void> avatarImageData,
+	u32 avatarImageDataMaxSize,
+	vm::psv::ptr<u32> avatarImageDataSize,
+	vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupAvatarImage(s32 reqId, vm::psv::ptr<const SceNpAvatarUrl> avatarUrl, vm::psv::ptr<SceNpAvatarImage> avatarImage, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpLookupAvatarImageAsync(s32 reqId, vm::psv::ptr<const SceNpAvatarUrl> avatarUrl, vm::psv::ptr<SceNpAvatarImage> avatarImage, vm::psv::ptr<void> option)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBandwidthTestInitStart(s32 initPriority, s32 cpuAffinityMask)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBandwidthTestGetStatus()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBandwidthTestShutdown(vm::psv::ptr<SceNpBandwidthTestResult> result)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceNpBandwidthTestAbort()
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceNpUtility, #name, name)
 
 psv_log_base sceNpUtility("SceNpUtility", []()
@@ -12,24 +144,24 @@ psv_log_base sceNpUtility("SceNpUtility", []()
 	sceNpUtility.on_unload = nullptr;
 	sceNpUtility.on_stop = nullptr;
 
-	//REG_FUNC(0x9246A673, sceNpLookupInit);
-	//REG_FUNC(0x0158B61B, sceNpLookupTerm);
-	//REG_FUNC(0x5110E17E, sceNpLookupCreateTitleCtx);
-	//REG_FUNC(0x33B64699, sceNpLookupDeleteTitleCtx);
-	//REG_FUNC(0x9E42E922, sceNpLookupCreateRequest);
-	//REG_FUNC(0x8B608BF6, sceNpLookupDeleteRequest);
-	//REG_FUNC(0x027587C4, sceNpLookupAbortRequest);
-	//REG_FUNC(0xB0C9DC45, sceNpLookupSetTimeout);
-	//REG_FUNC(0xCF956F23, sceNpLookupWaitAsync);
-	//REG_FUNC(0xFCDBA234, sceNpLookupPollAsync);
-	//REG_FUNC(0xB1A14879, sceNpLookupNpId);
-	//REG_FUNC(0x5387BABB, sceNpLookupNpIdAsync);
-	//REG_FUNC(0x6A1BF429, sceNpLookupUserProfile);
-	//REG_FUNC(0xE5285E0F, sceNpLookupUserProfileAsync);
-	//REG_FUNC(0xFDB0AE47, sceNpLookupAvatarImage);
-	//REG_FUNC(0x282BD43C, sceNpLookupAvatarImageAsync);
-	//REG_FUNC(0x081FA13C, sceNpBandwidthTestInitStart);
-	//REG_FUNC(0xE0EBFBF6, sceNpBandwidthTestGetStatus);
-	//REG_FUNC(0x58D92EFD, sceNpBandwidthTestShutdown);
-	//REG_FUNC(0x32B068C4, sceNpBandwidthTestAbort);
+	REG_FUNC(0x9246A673, sceNpLookupInit);
+	REG_FUNC(0x0158B61B, sceNpLookupTerm);
+	REG_FUNC(0x5110E17E, sceNpLookupCreateTitleCtx);
+	REG_FUNC(0x33B64699, sceNpLookupDeleteTitleCtx);
+	REG_FUNC(0x9E42E922, sceNpLookupCreateRequest);
+	REG_FUNC(0x8B608BF6, sceNpLookupDeleteRequest);
+	REG_FUNC(0x027587C4, sceNpLookupAbortRequest);
+	REG_FUNC(0xB0C9DC45, sceNpLookupSetTimeout);
+	REG_FUNC(0xCF956F23, sceNpLookupWaitAsync);
+	REG_FUNC(0xFCDBA234, sceNpLookupPollAsync);
+	REG_FUNC(0xB1A14879, sceNpLookupNpId);
+	REG_FUNC(0x5387BABB, sceNpLookupNpIdAsync);
+	REG_FUNC(0x6A1BF429, sceNpLookupUserProfile);
+	REG_FUNC(0xE5285E0F, sceNpLookupUserProfileAsync);
+	REG_FUNC(0xFDB0AE47, sceNpLookupAvatarImage);
+	REG_FUNC(0x282BD43C, sceNpLookupAvatarImageAsync);
+	REG_FUNC(0x081FA13C, sceNpBandwidthTestInitStart);
+	REG_FUNC(0xE0EBFBF6, sceNpBandwidthTestGetStatus);
+	REG_FUNC(0x58D92EFD, sceNpBandwidthTestShutdown);
+	REG_FUNC(0x32B068C4, sceNpBandwidthTestAbort);
 });
diff --git a/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp b/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp
index 6fb390fbd8..68216d7ddc 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp
@@ -2,8 +2,545 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
+#include "sceLibKernel.h"
+
 extern psv_log_base sceUlt;
 
+#define CHECK_SIZE(type, size) static_assert(sizeof(type) == size, "Invalid " #type " size")
+
+struct _SceUltOptParamHeader
+{
+	s64 reserved[2];
+};
+
+struct SceUltWaitingQueueResourcePoolOptParam
+{
+	_SceUltOptParamHeader header;
+	u64 reserved[14];
+};
+
+CHECK_SIZE(SceUltWaitingQueueResourcePoolOptParam, 128);
+
+struct SceUltWaitingQueueResourcePool
+{
+	u64 reserved[32];
+};
+
+CHECK_SIZE(SceUltWaitingQueueResourcePool, 256);
+
+struct SceUltQueueDataResourcePoolOptParam
+{
+	_SceUltOptParamHeader header;
+	u64 reserved[14];
+};
+
+CHECK_SIZE(SceUltQueueDataResourcePoolOptParam, 128);
+
+struct SceUltQueueDataResourcePool
+{
+	u64 reserved[32];
+};
+
+CHECK_SIZE(SceUltQueueDataResourcePool, 256);
+
+struct SceUltMutexOptParam
+{
+	_SceUltOptParamHeader header;
+	u32 attribute;
+	u32 reserved_0;
+	u64 reserved[13];
+};
+
+CHECK_SIZE(SceUltMutexOptParam, 128);
+
+struct SceUltMutex
+{
+	u64 reserved[32];
+};
+
+CHECK_SIZE(SceUltMutex, 256);
+
+struct SceUltConditionVariableOptParam
+{
+	_SceUltOptParamHeader header;
+	u64 reserved[14];
+};
+
+CHECK_SIZE(SceUltConditionVariableOptParam, 128);
+
+struct SceUltConditionVariable
+{
+	u64 reserved[32];
+};
+
+CHECK_SIZE(SceUltConditionVariable, 256);
+
+struct SceUltQueueOptParam
+{
+	_SceUltOptParamHeader header;
+	u64 reserved[14];
+};
+
+CHECK_SIZE(SceUltQueueOptParam, 128);
+
+struct SceUltQueue
+{
+	u64 reserved[32];
+};
+
+CHECK_SIZE(SceUltQueue, 256);
+
+struct SceUltReaderWriterLockOptParam
+{
+	_SceUltOptParamHeader header;
+	u64 reserved[14];
+};
+
+CHECK_SIZE(SceUltReaderWriterLockOptParam, 128);
+
+struct SceUltReaderWriterLock
+{
+	u64 reserved[32];
+};
+
+CHECK_SIZE(SceUltReaderWriterLock, 256);
+
+struct SceUltSemaphoreOptParam
+{
+	_SceUltOptParamHeader header;
+	u64 reserved[14];
+};
+
+CHECK_SIZE(SceUltSemaphoreOptParam, 128);
+
+struct SceUltSemaphore
+{
+	u64 reserved[32];
+};
+
+CHECK_SIZE(SceUltSemaphore, 256);
+
+struct SceUltUlthreadRuntimeOptParam
+{
+	_SceUltOptParamHeader header;
+
+	u32 oneShotThreadStackSize;
+	s32 workerThreadPriority;
+	u32 workerThreadCpuAffinityMask;
+	u32 workerThreadAttr;
+	vm::psv::ptr<const SceKernelThreadOptParam> workerThreadOptParam;
+
+	u64 reserved[11];
+};
+
+CHECK_SIZE(SceUltUlthreadRuntimeOptParam, 128);
+
+struct SceUltUlthreadRuntime
+{
+	u64 reserved[128];
+};
+
+CHECK_SIZE(SceUltUlthreadRuntime, 1024);
+
+struct SceUltUlthreadOptParam
+{
+	_SceUltOptParamHeader header;
+	u32 attribute;
+	u32 reserved_0;
+	u64 reserved[13];
+};
+
+CHECK_SIZE(SceUltUlthreadOptParam, 128);
+
+struct SceUltUlthread
+{
+	u64 reserved[32];
+};
+
+CHECK_SIZE(SceUltUlthread, 256);
+
+typedef vm::psv::ptr<s32(u32 arg)> SceUltUlthreadEntry;
+
+// Functions
+
+s32 _sceUltWaitingQueueResourcePoolOptParamInitialize(vm::psv::ptr<SceUltWaitingQueueResourcePoolOptParam> optParam, u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceUltWaitingQueueResourcePoolGetWorkAreaSize(u32 numThreads, u32 numSyncObjects)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltWaitingQueueResourcePoolCreate(
+	vm::psv::ptr<SceUltWaitingQueueResourcePool> pool,
+	vm::psv::ptr<const char> name,
+	u32 numThreads,
+	u32 numSyncObjects,
+	vm::psv::ptr<void> workArea,
+	vm::psv::ptr<const SceUltWaitingQueueResourcePoolOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltWaitingQueueResourcePoolDestroy(vm::psv::ptr<SceUltWaitingQueueResourcePool> pool)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltQueueDataResourcePoolOptParamInitialize(vm::psv::ptr<SceUltQueueDataResourcePoolOptParam> optParam, u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceUltQueueDataResourcePoolGetWorkAreaSize(u32 numData, u32 dataSize, u32 numQueueObject)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltQueueDataResourcePoolCreate(
+	vm::psv::ptr<SceUltQueueDataResourcePool> pool,
+	vm::psv::ptr<const char> name,
+	u32 numData,
+	u32 dataSize,
+	u32 numQueueObject,
+	vm::psv::ptr<SceUltWaitingQueueResourcePool> waitingQueueResourcePool,
+	vm::psv::ptr<void> workArea,
+	vm::psv::ptr<const SceUltQueueDataResourcePoolOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltQueueDataResourcePoolDestroy(vm::psv::ptr<SceUltQueueDataResourcePool> pool)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceUltMutexGetStandaloneWorkAreaSize(u32 waitingQueueDepth, u32 numConditionVariable)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltMutexOptParamInitialize(vm::psv::ptr<SceUltMutexOptParam> optParam, u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltMutexCreate(
+	vm::psv::ptr<SceUltMutex> mutex,
+	vm::psv::ptr<const char> name,
+	vm::psv::ptr<SceUltWaitingQueueResourcePool> waitingQueueResourcePool,
+	vm::psv::ptr<const SceUltMutexOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltMutexCreateStandalone(
+	vm::psv::ptr<SceUltMutex> mutex,
+	vm::psv::ptr<const char> name,
+	u32 numConditionVariable,
+	u32 maxNumThreads,
+	vm::psv::ptr<void> workArea,
+	vm::psv::ptr<const SceUltMutexOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltMutexLock(vm::psv::ptr<SceUltMutex> mutex)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltMutexTryLock(vm::psv::ptr<SceUltMutex> mutex)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltMutexUnlock(vm::psv::ptr<SceUltMutex> mutex)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltMutexDestroy(vm::psv::ptr<SceUltMutex> mutex)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltConditionVariableOptParamInitialize(vm::psv::ptr<SceUltConditionVariableOptParam> optParam, u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltConditionVariableCreate(
+	vm::psv::ptr<SceUltConditionVariable> conditionVariable,
+	vm::psv::ptr<const char> name,
+	vm::psv::ptr<SceUltMutex> mutex,
+	vm::psv::ptr<const SceUltConditionVariableOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltConditionVariableSignal(vm::psv::ptr<SceUltConditionVariable> conditionVariable)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltConditionVariableSignalAll(vm::psv::ptr<SceUltConditionVariable> conditionVariable)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltConditionVariableWait(vm::psv::ptr<SceUltConditionVariable> conditionVariable)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltConditionVariableDestroy(vm::psv::ptr<SceUltConditionVariable> conditionVariable)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltQueueOptParamInitialize(vm::psv::ptr<SceUltQueueOptParam> optParam, u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceUltQueueGetStandaloneWorkAreaSize(u32 queueDepth,
+	u32 dataSize,
+	u32 waitingQueueLength)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltQueueCreate(
+	vm::psv::ptr<SceUltQueue> queue,
+	vm::psv::ptr<const char> _name,
+	u32 dataSize,
+	vm::psv::ptr<SceUltWaitingQueueResourcePool> resourcePool,
+	vm::psv::ptr<SceUltQueueDataResourcePool> queueResourcePool,
+	vm::psv::ptr<const SceUltQueueOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltQueueCreateStandalone(
+	vm::psv::ptr<SceUltQueue> queue,
+	vm::psv::ptr<const char> name,
+	u32 queueDepth,
+	u32 dataSize,
+	u32 waitingQueueLength,
+	vm::psv::ptr<void> workArea,
+	vm::psv::ptr<const SceUltQueueOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltQueuePush(vm::psv::ptr<SceUltQueue> queue, vm::psv::ptr<const void> data)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltQueueTryPush(vm::psv::ptr<SceUltQueue> queue, vm::psv::ptr<const void> data)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltQueuePop(vm::psv::ptr<SceUltQueue> queue, vm::psv::ptr<void> data)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltQueueTryPop(vm::psv::ptr<SceUltQueue> queue, vm::psv::ptr<void> data)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltQueueDestroy(vm::psv::ptr<SceUltQueue> queue)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltReaderWriterLockOptParamInitialize(vm::psv::ptr<SceUltReaderWriterLockOptParam> optParam, u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltReaderWriterLockCreate(
+	vm::psv::ptr<SceUltReaderWriterLock> rwlock,
+	vm::psv::ptr<const char> name,
+	vm::psv::ptr<SceUltWaitingQueueResourcePool> waitingQueueResourcePool,
+	vm::psv::ptr<const SceUltReaderWriterLockOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltReaderWriterLockCreateStandalone(
+	vm::psv::ptr<SceUltReaderWriterLock> rwlock,
+	vm::psv::ptr<const char> name,
+	u32 waitingQueueDepth,
+	vm::psv::ptr<void> workArea,
+	vm::psv::ptr<const SceUltReaderWriterLockOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceUltReaderWriterLockGetStandaloneWorkAreaSize(u32 waitingQueueDepth)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltReaderWriterLockLockRead(vm::psv::ptr<SceUltReaderWriterLock> rwlock)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltReaderWriterLockTryLockRead(vm::psv::ptr<SceUltReaderWriterLock> rwlock)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltReaderWriterLockUnlockRead(vm::psv::ptr<SceUltReaderWriterLock> rwlock)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltReaderWriterLockLockWrite(vm::psv::ptr<SceUltReaderWriterLock> rwlock)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltReaderWriterLockTryLockWrite(vm::psv::ptr<SceUltReaderWriterLock> rwlock)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltReaderWriterLockUnlockWrite(vm::psv::ptr<SceUltReaderWriterLock> rwlock)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltReaderWriterLockDestroy(vm::psv::ptr<SceUltReaderWriterLock> rwlock)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltSemaphoreOptParamInitialize(vm::psv::ptr<SceUltSemaphoreOptParam> optParam, u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltSemaphoreCreate(
+	vm::psv::ptr<SceUltSemaphore> semaphore,
+	vm::psv::ptr<const char> name,
+	s32 numInitialResource,
+	vm::psv::ptr<SceUltWaitingQueueResourcePool> waitingQueueResourcePool,
+	vm::psv::ptr<const SceUltSemaphoreOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltSemaphoreAcquire(vm::psv::ptr<SceUltSemaphore> semaphore, s32 numResource)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltSemaphoreTryAcquire(vm::psv::ptr<SceUltSemaphore> semaphore, s32 numResource)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltSemaphoreRelease(vm::psv::ptr<SceUltSemaphore> semaphore, s32 numResource)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltSemaphoreDestroy(vm::psv::ptr<SceUltSemaphore> semaphore)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltUlthreadRuntimeOptParamInitialize(vm::psv::ptr<SceUltUlthreadRuntimeOptParam> optParam, u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+u32 sceUltUlthreadRuntimeGetWorkAreaSize(u32 numMaxUlthread, u32 numWorkerThread)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltUlthreadRuntimeCreate(
+	vm::psv::ptr<SceUltUlthreadRuntime> runtime,
+	vm::psv::ptr<const char> name,
+	u32 numMaxUlthread,
+	u32 numWorkerThread,
+	vm::psv::ptr<void> workArea,
+	vm::psv::ptr<const SceUltUlthreadRuntimeOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltUlthreadRuntimeDestroy(vm::psv::ptr<SceUltUlthreadRuntime> runtime)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltUlthreadOptParamInitialize(vm::psv::ptr<SceUltUlthreadOptParam> optParam, u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 _sceUltUlthreadCreate(
+	vm::psv::ptr<SceUltUlthread> ulthread,
+	vm::psv::ptr<const char> name,
+	SceUltUlthreadEntry entry,
+	u32 arg,
+	vm::psv::ptr<void> context,
+	u32 sizeContext,
+	vm::psv::ptr<SceUltUlthreadRuntime> runtime,
+	vm::psv::ptr<const SceUltUlthreadOptParam> optParam,
+	u32 buildVersion)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltUlthreadYield()
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltUlthreadExit(s32 status)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltUlthreadJoin(vm::psv::ptr<SceUltUlthread> ulthread, vm::psv::ptr<s32> status)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltUlthreadTryJoin(vm::psv::ptr<SceUltUlthread> ulthread, vm::psv::ptr<s32> status)
+{
+	throw __FUNCTION__;
+}
+
+s32 sceUltUlthreadGetSelf(vm::psv::ptr<vm::psv::ptr<SceUltUlthread>> ulthread)
+{
+	throw __FUNCTION__;
+}
+
 #define REG_FUNC(nid, name) reg_psv_func(nid, &sceUlt, #name, name)
 
 psv_log_base sceUlt("SceUlt", []()
@@ -12,57 +549,57 @@ psv_log_base sceUlt("SceUlt", []()
 	sceUlt.on_unload = nullptr;
 	sceUlt.on_stop = nullptr;
 
-	//REG_FUNC(0xEF094E35, _sceUltWaitingQueueResourcePoolOptParamInitialize);
-	//REG_FUNC(0x644DA029, sceUltWaitingQueueResourcePoolGetWorkAreaSize);
-	//REG_FUNC(0x62F9493E, _sceUltWaitingQueueResourcePoolCreate);
-	//REG_FUNC(0xC9E96714, sceUltWaitingQueueResourcePoolDestroy);
-	//REG_FUNC(0x8A4F88A2, _sceUltQueueDataResourcePoolOptParamInitialize);
-	//REG_FUNC(0xECDA7FEE, sceUltQueueDataResourcePoolGetWorkAreaSize);
-	//REG_FUNC(0x40856827, _sceUltQueueDataResourcePoolCreate);
-	//REG_FUNC(0x2B8D33F1, sceUltQueueDataResourcePoolDestroy);
-	//REG_FUNC(0x24D87E05, _sceUltMutexOptParamInitialize);
-	//REG_FUNC(0x5AFEC7A1, _sceUltMutexCreate);
-	//REG_FUNC(0x001EAC8A, sceUltMutexLock);
-	//REG_FUNC(0xE5936A69, sceUltMutexTryLock);
-	//REG_FUNC(0x897C9097, sceUltMutexUnlock);
-	//REG_FUNC(0xEEBD9052, sceUltMutexDestroy);
-	//REG_FUNC(0x0603FCC1, _sceUltConditionVariableOptParamInitialize);
-	//REG_FUNC(0xD76A156C, _sceUltConditionVariableCreate);
-	//REG_FUNC(0x9FE7CB9F, sceUltConditionVariableSignal);
-	//REG_FUNC(0xEBB6FC1E, sceUltConditionVariableSignalAll);
-	//REG_FUNC(0x2CD0F57C, sceUltConditionVariableWait);
-	//REG_FUNC(0x53420ED2, sceUltConditionVariableDestroy);
-	//REG_FUNC(0xF7A83023, _sceUltQueueOptParamInitialize);
-	//REG_FUNC(0x14DA1BB4, _sceUltQueueCreate);
-	//REG_FUNC(0xA7E78FF9, sceUltQueuePush);
-	//REG_FUNC(0x6D356B29, sceUltQueueTryPush);
-	//REG_FUNC(0x1AD58A53, sceUltQueuePop);
-	//REG_FUNC(0x2A1A8EA6, sceUltQueueTryPop);
-	//REG_FUNC(0xF37862DE, sceUltQueueDestroy);
-	//REG_FUNC(0xD8334A1F, _sceUltReaderWriterLockOptParamInitialize);
-	//REG_FUNC(0x2FB0EB32, _sceUltReaderWriterLockCreate);
-	//REG_FUNC(0x9AD07630, sceUltReaderWriterLockLockRead);
-	//REG_FUNC(0x2629C055, sceUltReaderWriterLockTryLockRead);
-	//REG_FUNC(0x218D4743, sceUltReaderWriterLockUnlockRead);
-	//REG_FUNC(0xF5F63E2C, sceUltReaderWriterLockLockWrite);
-	//REG_FUNC(0x944FB222, sceUltReaderWriterLockTryLockWrite);
-	//REG_FUNC(0x2A5741F5, sceUltReaderWriterLockUnlockWrite);
-	//REG_FUNC(0xB1FEB79B, sceUltReaderWriterLockDestroy);
-	//REG_FUNC(0x8E31B9FE, _sceUltSemaphoreOptParamInitialize);
-	//REG_FUNC(0xDD59562C, _sceUltSemaphoreCreate);
-	//REG_FUNC(0xF220D3AE, sceUltSemaphoreAcquire);
-	//REG_FUNC(0xAF15606D, sceUltSemaphoreTryAcquire);
-	//REG_FUNC(0x65376E2D, sceUltSemaphoreRelease);
-	//REG_FUNC(0x8EC57420, sceUltSemaphoreDestroy);
-	//REG_FUNC(0x8486DDE6, _sceUltUlthreadRuntimeOptParamInitialize);
-	//REG_FUNC(0x5435C586, sceUltUlthreadRuntimeGetWorkAreaSize);
-	//REG_FUNC(0x86DDA3AE, _sceUltUlthreadRuntimeCreate);
-	//REG_FUNC(0x4E9A745C, sceUltUlthreadRuntimeDestroy);
-	//REG_FUNC(0x7F373376, _sceUltUlthreadOptParamInitialize);
-	//REG_FUNC(0xB1290375, _sceUltUlthreadCreate);
-	//REG_FUNC(0xCAD57BAD, sceUltUlthreadYield);
-	//REG_FUNC(0x1E401DF8, sceUltUlthreadExit);
-	//REG_FUNC(0x63483381, sceUltUlthreadJoin);
-	//REG_FUNC(0xB4CF88AC, sceUltUlthreadTryJoin);
-	//REG_FUNC(0xA798C5D7, sceUltUlthreadGetSelf);
+	REG_FUNC(0xEF094E35, _sceUltWaitingQueueResourcePoolOptParamInitialize);
+	REG_FUNC(0x644DA029, sceUltWaitingQueueResourcePoolGetWorkAreaSize);
+	REG_FUNC(0x62F9493E, _sceUltWaitingQueueResourcePoolCreate);
+	REG_FUNC(0xC9E96714, sceUltWaitingQueueResourcePoolDestroy);
+	REG_FUNC(0x8A4F88A2, _sceUltQueueDataResourcePoolOptParamInitialize);
+	REG_FUNC(0xECDA7FEE, sceUltQueueDataResourcePoolGetWorkAreaSize);
+	REG_FUNC(0x40856827, _sceUltQueueDataResourcePoolCreate);
+	REG_FUNC(0x2B8D33F1, sceUltQueueDataResourcePoolDestroy);
+	REG_FUNC(0x24D87E05, _sceUltMutexOptParamInitialize);
+	REG_FUNC(0x5AFEC7A1, _sceUltMutexCreate);
+	REG_FUNC(0x001EAC8A, sceUltMutexLock);
+	REG_FUNC(0xE5936A69, sceUltMutexTryLock);
+	REG_FUNC(0x897C9097, sceUltMutexUnlock);
+	REG_FUNC(0xEEBD9052, sceUltMutexDestroy);
+	REG_FUNC(0x0603FCC1, _sceUltConditionVariableOptParamInitialize);
+	REG_FUNC(0xD76A156C, _sceUltConditionVariableCreate);
+	REG_FUNC(0x9FE7CB9F, sceUltConditionVariableSignal);
+	REG_FUNC(0xEBB6FC1E, sceUltConditionVariableSignalAll);
+	REG_FUNC(0x2CD0F57C, sceUltConditionVariableWait);
+	REG_FUNC(0x53420ED2, sceUltConditionVariableDestroy);
+	REG_FUNC(0xF7A83023, _sceUltQueueOptParamInitialize);
+	REG_FUNC(0x14DA1BB4, _sceUltQueueCreate);
+	REG_FUNC(0xA7E78FF9, sceUltQueuePush);
+	REG_FUNC(0x6D356B29, sceUltQueueTryPush);
+	REG_FUNC(0x1AD58A53, sceUltQueuePop);
+	REG_FUNC(0x2A1A8EA6, sceUltQueueTryPop);
+	REG_FUNC(0xF37862DE, sceUltQueueDestroy);
+	REG_FUNC(0xD8334A1F, _sceUltReaderWriterLockOptParamInitialize);
+	REG_FUNC(0x2FB0EB32, _sceUltReaderWriterLockCreate);
+	REG_FUNC(0x9AD07630, sceUltReaderWriterLockLockRead);
+	REG_FUNC(0x2629C055, sceUltReaderWriterLockTryLockRead);
+	REG_FUNC(0x218D4743, sceUltReaderWriterLockUnlockRead);
+	REG_FUNC(0xF5F63E2C, sceUltReaderWriterLockLockWrite);
+	REG_FUNC(0x944FB222, sceUltReaderWriterLockTryLockWrite);
+	REG_FUNC(0x2A5741F5, sceUltReaderWriterLockUnlockWrite);
+	REG_FUNC(0xB1FEB79B, sceUltReaderWriterLockDestroy);
+	REG_FUNC(0x8E31B9FE, _sceUltSemaphoreOptParamInitialize);
+	REG_FUNC(0xDD59562C, _sceUltSemaphoreCreate);
+	REG_FUNC(0xF220D3AE, sceUltSemaphoreAcquire);
+	REG_FUNC(0xAF15606D, sceUltSemaphoreTryAcquire);
+	REG_FUNC(0x65376E2D, sceUltSemaphoreRelease);
+	REG_FUNC(0x8EC57420, sceUltSemaphoreDestroy);
+	REG_FUNC(0x8486DDE6, _sceUltUlthreadRuntimeOptParamInitialize);
+	REG_FUNC(0x5435C586, sceUltUlthreadRuntimeGetWorkAreaSize);
+	REG_FUNC(0x86DDA3AE, _sceUltUlthreadRuntimeCreate);
+	REG_FUNC(0x4E9A745C, sceUltUlthreadRuntimeDestroy);
+	REG_FUNC(0x7F373376, _sceUltUlthreadOptParamInitialize);
+	REG_FUNC(0xB1290375, _sceUltUlthreadCreate);
+	REG_FUNC(0xCAD57BAD, sceUltUlthreadYield);
+	REG_FUNC(0x1E401DF8, sceUltUlthreadExit);
+	REG_FUNC(0x63483381, sceUltUlthreadJoin);
+	REG_FUNC(0xB4CF88AC, sceUltUlthreadTryJoin);
+	REG_FUNC(0xA798C5D7, sceUltUlthreadGetSelf);
 });
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 1e6d47a50e..8864e59975 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -340,6 +340,7 @@
     <ClInclude Include="Emu\ARMv7\Modules\sceIme.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceLibKernel.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceNet.h" />
+    <ClInclude Include="Emu\ARMv7\Modules\sceNpCommon.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceSsl.h" />
     <ClInclude Include="Emu\ARMv7\Modules\sceTouch.h" />
     <ClInclude Include="Emu\ARMv7\PSVFuncList.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index ac1531ee30..b45c4de188 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -1501,5 +1501,8 @@
     <ClInclude Include="Emu\ARMv7\Modules\sceTouch.h">
       <Filter>Emu\CPU\ARMv7\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\ARMv7\Modules\sceNpCommon.h">
+      <Filter>Emu\CPU\ARMv7\Modules</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 2be045593a62f99d029f400033d04f7e88c18c36 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 30 Jan 2015 20:41:17 +0300
Subject: [PATCH 59/70] Compilation fix

---
 rpcs3/Emu/ARMv7/Modules/sceNpCommon.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h
index 2a40b7aee3..bd2b282301 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h
+++ b/rpcs3/Emu/ARMv7/Modules/sceNpCommon.h
@@ -106,10 +106,10 @@ struct SceNpDate
 
 union SceNpTicketParam
 {
-	s32 i32;
-	s64 i64;
-	u32 u32;
-	u64 u64;
+	s32 _s32;
+	s64 _s64;
+	u32 _u32;
+	u64 _u64;
 	SceNpDate date;
 	u8 data[256];
 };

From 4ea1b8cffc8a0f9e4c54cb0dcb18f90986d461ff Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Fri, 30 Jan 2015 23:01:13 +0300
Subject: [PATCH 60/70] Fixed TLS for PPU threads

---
 rpcs3/Emu/ARMv7/Modules/sceLibc.cpp          |  6 ++
 rpcs3/Emu/Cell/PPUThread.cpp                 |  6 +-
 rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp | 60 ++++++++++++++++++++
 rpcs3/Loader/ELF64.cpp                       |  3 +-
 4 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
index abb831ae32..b833a38c5f 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
@@ -18,6 +18,8 @@ namespace sce_libc_func
 	{
 		sceLibc.Error("__cxa_atexit(func=0x%x, arg=0x%x, dso=0x%x)", func, arg, dso);
 		
+		LV2_LOCK(0);
+
 		g_atexit.insert(g_atexit.begin(), [func, arg, dso](ARMv7Context& context)
 		{
 			func(context, arg);
@@ -28,6 +30,8 @@ namespace sce_libc_func
 	{
 		sceLibc.Error("__aeabi_atexit(arg=0x%x, func=0x%x, dso=0x%x)", arg, func, dso);
 
+		LV2_LOCK(0);
+
 		g_atexit.insert(g_atexit.begin(), [func, arg, dso](ARMv7Context& context)
 		{
 			func(context, arg);
@@ -38,6 +42,8 @@ namespace sce_libc_func
 	{
 		sceLibc.Error("exit()");
 		
+		LV2_LOCK(0);
+
 		for (auto func : g_atexit)
 		{
 			func(context);
diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp
index 9e5588276a..9a221b00c6 100644
--- a/rpcs3/Emu/Cell/PPUThread.cpp
+++ b/rpcs3/Emu/Cell/PPUThread.cpp
@@ -15,6 +15,9 @@
 
 u64 rotate_mask[64][64];
 
+extern u32 ppu_get_tls(u32 thread);
+extern void ppu_free_tls(u32 thread);
+
 PPUThread& GetCurrentPPUThread()
 {
 	PPCThread* thread = GetCurrentPPCThread();
@@ -32,6 +35,7 @@ PPUThread::PPUThread() : PPCThread(CPU_THREAD_PPU)
 
 PPUThread::~PPUThread()
 {
+	ppu_free_tls(GetId());
 }
 
 void PPUThread::DoReset()
@@ -92,7 +96,7 @@ void PPUThread::InitRegs()
 	GPR[2] = rtoc;
 	//GPR[11] = entry;
 	//GPR[12] = Emu.GetMallocPageSize();
-	GPR[13] = Memory.PRXMem.GetStartAddr() + 0x7060;
+	GPR[13] = ppu_get_tls(GetId()) + 0x7000; // 0x7000 is usually subtracted from r13 to access first TLS element (details are not clear)
 
 	LR = Emu.GetCPUThreadExit();
 	CTR = PC;
diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
index 1629d3fb05..c523ca64f1 100644
--- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
@@ -23,11 +23,62 @@
 
 Module *sysPrxForUser = nullptr;
 
+u32 g_tls_size; // size of every thread's storage
+u32 g_tls_start; // start of TLS memory area
+u32 g_tls_image_addr; // address of TLS initialization area
+u32 g_tls_image_size; // size of TLS initialization area
+
+const u32 TLS_MAX = 256;
+std::array<std::atomic<u32>, TLS_MAX> g_tls_owners;
+
 void sys_initialize_tls()
 {
 	sysPrxForUser->Log("sys_initialize_tls()");
 }
 
+u32 ppu_get_tls(u32 thread)
+{
+	if (!g_tls_start)
+	{
+		g_tls_size = vm::cast(Emu.GetTLSMemsz(), "Emu.GetTLSMemsz"); // (not an address for vm::cast, but fine)
+		g_tls_start = vm::cast(Memory.Alloc(g_tls_size * TLS_MAX, 4096)); // memory for up to TLS_MAX threads
+		g_tls_image_addr = vm::cast(Emu.GetTLSAddr(), "Emu.GetTLSAddr");
+		g_tls_image_size = vm::cast(Emu.GetTLSFilesz(), "Emu.GetTLSFilesz");
+
+		sysPrxForUser->Warning("TLS initialized (g_tls_size=0x%x, g_tls_start=0x%x, g_tls_image_addr=0x%x, g_tls_image_size=0x%x)", g_tls_size, g_tls_start, g_tls_image_addr, g_tls_image_size);
+	}
+	
+	for (auto& v : g_tls_owners)
+	{
+		u32 old = 0;
+		if (v.compare_exchange_strong(old, thread))
+		{
+			const u32 addr = g_tls_start + (&v - g_tls_owners.data()) * g_tls_size;     // get TLS address
+			memset(vm::get_ptr(addr), 0, g_tls_size);                                   // fill TLS area with zeros
+			memcpy(vm::get_ptr(addr), vm::get_ptr(g_tls_image_addr), g_tls_image_size); // initialize from TLS image
+			return addr;
+		}
+		else if (old == thread)
+		{
+			return g_tls_start + (&v - g_tls_owners.data()) * g_tls_size; // if already initialized, return TLS address again
+		}
+	}
+
+	throw "Out of TLS memory";
+}
+
+void ppu_free_tls(u32 thread)
+{
+	for (auto& v : g_tls_owners)
+	{
+		u32 old = thread;
+		if (v.compare_exchange_strong(old, 0))
+		{
+			return;
+		}
+	}
+}
+
 int _sys_heap_create_heap(const u32 heap_addr, const u32 align, const u32 size)
 {
 	sysPrxForUser->Warning("_sys_heap_create_heap(heap_addr=0x%x, align=0x%x, size=0x%x)", heap_addr, align, size);
@@ -365,6 +416,15 @@ void sysPrxForUser_init(Module *pxThis)
 {
 	sysPrxForUser = pxThis;
 
+	g_tls_size = 0;
+	g_tls_start = 0;
+	g_tls_image_addr = 0;
+	g_tls_image_size = 0;
+	for (auto& v : g_tls_owners)
+	{
+		v.store(0, std::memory_order_relaxed);
+	}
+
 	// Setup random number generator
 	srand(time(NULL));
 
diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp
index c71e8cb5f7..de2a78c0a6 100644
--- a/rpcs3/Loader/ELF64.cpp
+++ b/rpcs3/Loader/ELF64.cpp
@@ -356,7 +356,7 @@ namespace loader
 			ppu_thr_stop_data[1] = BLR();
 			Emu.SetCPUThreadStop(ppu_thr_stop_data.addr());
 
-			vm::write64(Memory.PRXMem.AllocAlign(0x10000), 0xDEADBEEFABADCAFE);
+			//vm::write64(Memory.PRXMem.AllocAlign(0x10000), 0xDEADBEEFABADCAFE);
 			/*
 			//TODO
 			static const int branch_size = 6 * 4;
@@ -423,7 +423,6 @@ namespace loader
 
 				case 0x00000007: //TLS
 					Emu.SetTLSData(phdr.p_vaddr.addr(), phdr.p_filesz.value(), phdr.p_memsz.value());
-					LOG_ERROR(LOADER, "TLS: addr=0x%x, filesz=0x%x, memsz=0x%x", Emu.GetTLSAddr(), Emu.GetTLSFilesz(), Emu.GetTLSMemsz());
 					break;
 
 				case 0x60000001: //LOOS+1

From 140a42fbcb16f13a3f27fd7ff1ba4ecb1edd5255 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Sat, 31 Jan 2015 00:30:46 +0300
Subject: [PATCH 61/70] Bugfix

---
 rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
index c523ca64f1..063655cc72 100644
--- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
@@ -48,20 +48,24 @@ u32 ppu_get_tls(u32 thread)
 		sysPrxForUser->Warning("TLS initialized (g_tls_size=0x%x, g_tls_start=0x%x, g_tls_image_addr=0x%x, g_tls_image_size=0x%x)", g_tls_size, g_tls_start, g_tls_image_addr, g_tls_image_size);
 	}
 	
-	for (auto& v : g_tls_owners)
+	for (u32 i = 0; i < TLS_MAX; i++)
+	{
+		if (g_tls_owners[i] == thread)
+		{
+			return g_tls_start + i * g_tls_size; // if already initialized, return TLS address
+		}
+	}
+
+	for (u32 i = 0; i < TLS_MAX; i++)
 	{
 		u32 old = 0;
-		if (v.compare_exchange_strong(old, thread))
+		if (g_tls_owners[i].compare_exchange_strong(old, thread))
 		{
-			const u32 addr = g_tls_start + (&v - g_tls_owners.data()) * g_tls_size;     // get TLS address
-			memset(vm::get_ptr(addr), 0, g_tls_size);                                   // fill TLS area with zeros
+			const u32 addr = g_tls_start + i * g_tls_size; // get TLS address
+			memset(vm::get_ptr(addr), 0, g_tls_size);      // fill TLS area with zeros
 			memcpy(vm::get_ptr(addr), vm::get_ptr(g_tls_image_addr), g_tls_image_size); // initialize from TLS image
 			return addr;
 		}
-		else if (old == thread)
-		{
-			return g_tls_start + (&v - g_tls_owners.data()) * g_tls_size; // if already initialized, return TLS address again
-		}
 	}
 
 	throw "Out of TLS memory";

From 384cb5e4153d79896fac17d1ec4a6082227c042e Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Sat, 31 Jan 2015 16:01:34 +0300
Subject: [PATCH 62/70] RSX "refactoring" reverted

---
 rpcs3/Emu/RSX/GL/GLGSRender.cpp   | 1077 ++++++++++++++++-------------
 rpcs3/Emu/RSX/GL/GLGSRender.h     |   41 +-
 rpcs3/Emu/RSX/Null/NullGSRender.h |   84 ++-
 rpcs3/Emu/RSX/RSXThread.cpp       |  969 +++++++++++++-------------
 rpcs3/Emu/RSX/RSXThread.h         |   46 +-
 5 files changed, 1104 insertions(+), 1113 deletions(-)

diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp
index 35ec0a7dc5..1b3df4a0bd 100644
--- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp
+++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp
@@ -18,9 +18,9 @@ void SetGetGSFrameCallback(GetGSFrameCb value)
 #define DUMP_VERTEX_DATA 0
 
 #if CMD_DEBUG
-	#define CMD_LOG(...) LOG_NOTICE(RSX, __VA_ARGS__)
+#define CMD_LOG(...) LOG_NOTICE(RSX, __VA_ARGS__)
 #else
-	#define CMD_LOG(...)
+#define CMD_LOG(...)
 #endif
 
 GLuint g_flip_tex, g_depth_tex, g_pbo[6];
@@ -41,7 +41,7 @@ void printGlError(GLenum err, const std::string& situation)
 }
 
 #if 0
-	#define checkForGlError(x) /*x*/
+#define checkForGlError(x) /*x*/
 #endif
 
 void GLTexture::Create()
@@ -110,9 +110,9 @@ void GLTexture::Init(RSXTexture& tex)
 		LOG_ERROR(RSX, "Bad texture address=0x%x", texaddr);
 		return;
 	}
-	//lOG_WARNING(RSX, "texture addr = 0x%x, width = %d, height = %d, max_aniso=%d, mipmap=%d, remap=0x%x, zfunc=0x%x, wraps=0x%x, wrapt=0x%x, wrapr=0x%x, minlod=0x%x, maxlod=0x%x", 
+	//LOG_WARNING(RSX, "texture addr = 0x%x, width = %d, height = %d, max_aniso=%d, mipmap=%d, remap=0x%x, zfunc=0x%x, wraps=0x%x, wrapt=0x%x, wrapr=0x%x, minlod=0x%x, maxlod=0x%x", 
 	//	m_offset, m_width, m_height, m_maxaniso, m_mipmap, m_remap, m_zfunc, m_wraps, m_wrapt, m_wrapr, m_minlod, m_maxlod);
-
+	
 	//TODO: safe init
 	checkForGlError("GLTexture::Init() -> glBindTexture");
 
@@ -134,10 +134,11 @@ void GLTexture::Init(RSXTexture& tex)
 
 		static const GLint swizzleMaskB8[] = { GL_BLUE, GL_BLUE, GL_BLUE, GL_BLUE };
 		glRemap = swizzleMaskB8;
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_A1R5G5B5:
+	{
 		glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_TRUE);
 		checkForGlError("GLTexture::Init() -> glPixelStorei");
 
@@ -147,7 +148,8 @@ void GLTexture::Init(RSXTexture& tex)
 
 		glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
 		checkForGlError("GLTexture::Init() -> glPixelStorei(CELL_GCM_TEXTURE_A1R5G5B5)");
-	break;
+		break;
+	}
 
 	case CELL_GCM_TEXTURE_A4R4G4B4:
 	{
@@ -157,8 +159,8 @@ void GLTexture::Init(RSXTexture& tex)
 		// We read it in as R4G4B4A4, so we need to remap each component.
 		static const GLint swizzleMaskA4R4G4B4[] = { GL_BLUE, GL_ALPHA, GL_RED, GL_GREEN };
 		glRemap = swizzleMaskA4R4G4B4;
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_R5G6B5:
 	{
@@ -170,8 +172,8 @@ void GLTexture::Init(RSXTexture& tex)
 
 		glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
 		checkForGlError("GLTexture::Init() -> glPixelStorei(CELL_GCM_TEXTURE_R5G6B5)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_A8R8G8B8:
 	{
@@ -195,11 +197,11 @@ void GLTexture::Init(RSXTexture& tex)
 				}
 			}
 		}
-	
+
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex.GetWidth(), tex.GetHeight(), 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, is_swizzled ? unswizzledPixels : pixels);
 		checkForGlError("GLTexture::Init() -> glTexImage2D(CELL_GCM_TEXTURE_A8R8G8B8)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_COMPRESSED_DXT1: // Compressed 4x4 pixels into 8 bytes
 	{
@@ -207,8 +209,8 @@ void GLTexture::Init(RSXTexture& tex)
 
 		glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, tex.GetWidth(), tex.GetHeight(), 0, size, pixels);
 		checkForGlError("GLTexture::Init() -> glCompressedTexImage2D(CELL_GCM_TEXTURE_COMPRESSED_DXT1)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_COMPRESSED_DXT23: // Compressed 4x4 pixels into 16 bytes
 	{
@@ -217,7 +219,7 @@ void GLTexture::Init(RSXTexture& tex)
 		glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, tex.GetWidth(), tex.GetHeight(), 0, size, pixels);
 		checkForGlError("GLTexture::Init() -> glCompressedTexImage2D(CELL_GCM_TEXTURE_COMPRESSED_DXT23)");
 	}
-	break;
+		break;
 
 	case CELL_GCM_TEXTURE_COMPRESSED_DXT45: // Compressed 4x4 pixels into 16 bytes
 	{
@@ -225,8 +227,8 @@ void GLTexture::Init(RSXTexture& tex)
 
 		glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, tex.GetWidth(), tex.GetHeight(), 0, size, pixels);
 		checkForGlError("GLTexture::Init() -> glCompressedTexImage2D(CELL_GCM_TEXTURE_COMPRESSED_DXT45)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_G8B8:
 	{
@@ -235,8 +237,8 @@ void GLTexture::Init(RSXTexture& tex)
 
 		static const GLint swizzleMaskG8B8[] = { GL_RED, GL_GREEN, GL_RED, GL_GREEN };
 		glRemap = swizzleMaskG8B8;
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_R6G5B5:
 	{
@@ -256,36 +258,36 @@ void GLTexture::Init(RSXTexture& tex)
 		checkForGlError("GLTexture::Init() -> glTexImage2D(CELL_GCM_TEXTURE_R6G5B5)");
 
 		free(unswizzledPixels);
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_DEPTH24_D8: //  24-bit unsigned fixed-point number and 8 bits of garbage
 	{
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, tex.GetWidth(), tex.GetHeight(), 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, pixels);
 		checkForGlError("GLTexture::Init() -> glTexImage2D(CELL_GCM_TEXTURE_DEPTH24_D8)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT: // 24-bit unsigned float and 8 bits of garbage
 	{
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, tex.GetWidth(), tex.GetHeight(), 0, GL_DEPTH_COMPONENT, GL_FLOAT, pixels);
 		checkForGlError("GLTexture::Init() -> glTexImage2D(CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_DEPTH16: // 16-bit unsigned fixed-point number
 	{
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT16, tex.GetWidth(), tex.GetHeight(), 0, GL_DEPTH_COMPONENT, GL_SHORT, pixels);
 		checkForGlError("GLTexture::Init() -> glTexImage2D(CELL_GCM_TEXTURE_DEPTH16)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_DEPTH16_FLOAT: // 16-bit unsigned float
 	{
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT16, tex.GetWidth(), tex.GetHeight(), 0, GL_DEPTH_COMPONENT, GL_FLOAT, pixels);
 		checkForGlError("GLTexture::Init() -> glTexImage2D(CELL_GCM_TEXTURE_DEPTH16_FLOAT)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_X16: // A 16-bit fixed-point number
 	{
@@ -300,8 +302,8 @@ void GLTexture::Init(RSXTexture& tex)
 
 		static const GLint swizzleMaskX16[] = { GL_RED, GL_ONE, GL_RED, GL_ONE };
 		glRemap = swizzleMaskX16;
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_Y16_X16: // Two 16-bit fixed-point numbers
 	{
@@ -316,8 +318,8 @@ void GLTexture::Init(RSXTexture& tex)
 
 		static const GLint swizzleMaskX32_Y16_X16[] = { GL_GREEN, GL_RED, GL_GREEN, GL_RED };
 		glRemap = swizzleMaskX32_Y16_X16;
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_R5G5B5A1:
 	{
@@ -329,8 +331,8 @@ void GLTexture::Init(RSXTexture& tex)
 
 		glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
 		checkForGlError("GLTexture::Init() -> glPixelStorei(CELL_GCM_TEXTURE_R5G5B5A1)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT: // Four fp16 values
 	{
@@ -342,15 +344,15 @@ void GLTexture::Init(RSXTexture& tex)
 
 		glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
 		checkForGlError("GLTexture::Init() -> glPixelStorei(CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT: // Four fp32 values
 	{
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex.GetWidth(), tex.GetHeight(), 0, GL_BGRA, GL_FLOAT, pixels);
 		checkForGlError("GLTexture::Init() -> glTexImage2D(CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_X32_FLOAT: // One 32-bit floating-point number
 	{
@@ -359,8 +361,8 @@ void GLTexture::Init(RSXTexture& tex)
 
 		static const GLint swizzleMaskX32_FLOAT[] = { GL_RED, GL_ONE, GL_ONE, GL_ONE };
 		glRemap = swizzleMaskX32_FLOAT;
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_D1R5G5B5:
 	{
@@ -376,8 +378,8 @@ void GLTexture::Init(RSXTexture& tex)
 
 		glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
 		checkForGlError("GLTexture::Init() -> glPixelStorei(CELL_GCM_TEXTURE_D1R5G5B5)");
+		break;
 	}
-	break;
 
 	case CELL_GCM_TEXTURE_D8R8G8B8: // 8 bits of garbage and three unsigned 8-bit fixed-point numbers
 	{
@@ -386,8 +388,9 @@ void GLTexture::Init(RSXTexture& tex)
 
 		static const GLint swizzleMaskX32_D8R8G8B8[] = { GL_ONE, GL_RED, GL_GREEN, GL_BLUE };
 		glRemap = swizzleMaskX32_D8R8G8B8;
+		break;
 	}
-	break;
+
 
 	case CELL_GCM_TEXTURE_Y16_X16_FLOAT: // Two fp16 values
 	{
@@ -402,15 +405,16 @@ void GLTexture::Init(RSXTexture& tex)
 
 		static const GLint swizzleMaskX32_Y16_X16_FLOAT[] = { GL_RED, GL_GREEN, GL_RED, GL_GREEN };
 		glRemap = swizzleMaskX32_Y16_X16_FLOAT;
+		break;
 	}
-	break;
 
-	case CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8 & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN):
+	case ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN) & CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8:
 	{
 		const u32 numPixels = tex.GetWidth() * tex.GetHeight();
 		unswizzledPixels = (u8 *)malloc(numPixels * 4);
 		// TODO: Speed.
-		for (u32 i = 0; i < numPixels; i += 2) {
+		for (u32 i = 0; i < numPixels; i += 2)
+		{
 			unswizzledPixels[i * 4 + 0 + 0] = pixels[i * 2 + 3];
 			unswizzledPixels[i * 4 + 0 + 1] = pixels[i * 2 + 2];
 			unswizzledPixels[i * 4 + 0 + 2] = pixels[i * 2 + 0];
@@ -427,15 +431,16 @@ void GLTexture::Init(RSXTexture& tex)
 		checkForGlError("GLTexture::Init() -> glTexImage2D(CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8 & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN)");
 
 		free(unswizzledPixels);
+		break;
 	}
-	break;
 
-	case CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8 & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN):
+	case ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN) & CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8:
 	{
 		const u32 numPixels = tex.GetWidth() * tex.GetHeight();
 		unswizzledPixels = (u8 *)malloc(numPixels * 4);
 		// TODO: Speed.
-		for (u32 i = 0; i < numPixels; i += 2) {
+		for (u32 i = 0; i < numPixels; i += 2)
+		{
 			unswizzledPixels[i * 4 + 0 + 0] = pixels[i * 2 + 2];
 			unswizzledPixels[i * 4 + 0 + 1] = pixels[i * 2 + 3];
 			unswizzledPixels[i * 4 + 0 + 2] = pixels[i * 2 + 1];
@@ -452,13 +457,16 @@ void GLTexture::Init(RSXTexture& tex)
 		checkForGlError("GLTexture::Init() -> glTexImage2D(CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8 & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN)");
 
 		free(unswizzledPixels);
-	}
-	break;
-
-	default: LOG_ERROR(RSX, "Init tex error: Bad tex format (0x%x | %s | 0x%x)", format, (is_swizzled ? "swizzled" : "linear"), tex.GetFormat() & 0x40); 
 		break;
 	}
 
+	default:
+	{
+		LOG_ERROR(RSX, "Init tex error: Bad tex format (0x%x | %s | 0x%x)", format, (is_swizzled ? "swizzled" : "linear"), tex.GetFormat() & 0x40);
+		break;
+	}
+	}
+
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, tex.GetMipmap() - 1);
 	glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, tex.GetMipmap() > 1);
 
@@ -746,7 +754,7 @@ void DrawCursorObj::InitializeShaders()
 		"	gl_Position = in_pos;\n"
 		"}\n";
 
-	m_fp.shader =
+	m_fp.shader = 
 		"#version 420\n"
 		"\n"
 		"in vec2 tc;\n"
@@ -797,6 +805,18 @@ GLGSRender::~GLGSRender()
 	m_frame->DeleteContext(m_context);
 }
 
+void GLGSRender::Enable(bool enable, const u32 cap)
+{
+	if (enable)
+	{
+		glEnable(cap);
+	}
+	else
+	{
+		glDisable(cap);
+	}
+}
+
 extern CellGcmContextData current_context;
 
 void GLGSRender::Close()
@@ -887,58 +907,58 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
 		switch (m_vertex_data[i].type)
 		{
 		case CELL_GCM_VERTEX_S1:
-			for (u32 j = 0; j < m_vertex_data[i].data.size(); j+=2)
+			for (u32 j = 0; j < m_vertex_data[i].data.size(); j += 2)
 			{
 				dump.Write(wxString::Format("%d\n", *(u16*)&m_vertex_data[i].data[j]));
-				if (!(((j+2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
+				if (!(((j + 2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
 			}
-		break;
+			break;
 
 		case CELL_GCM_VERTEX_F:
-			for (u32 j = 0; j < m_vertex_data[i].data.size(); j+=4)
+			for (u32 j = 0; j < m_vertex_data[i].data.size(); j += 4)
 			{
 				dump.Write(wxString::Format("%.01f\n", *(float*)&m_vertex_data[i].data[j]));
-				if (!(((j+4) / 4) % m_vertex_data[i].size)) dump.Write("\n");
+				if (!(((j + 4) / 4) % m_vertex_data[i].size)) dump.Write("\n");
 			}
-		break;
+			break;
 
 		case CELL_GCM_VERTEX_SF:
-			for (u32 j = 0; j < m_vertex_data[i].data.size(); j+=2)
+			for (u32 j = 0; j < m_vertex_data[i].data.size(); j += 2)
 			{
 				dump.Write(wxString::Format("%.01f\n", *(float*)&m_vertex_data[i].data[j]));
-				if (!(((j+2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
+				if (!(((j + 2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
 			}
-		break;
+			break;
 
 		case CELL_GCM_VERTEX_UB:
 			for (u32 j = 0; j < m_vertex_data[i].data.size(); ++j)
 			{
 				dump.Write(wxString::Format("%d\n", m_vertex_data[i].data[j]));
-				if (!((j+1) % m_vertex_data[i].size)) dump.Write("\n");
+				if (!((j + 1) % m_vertex_data[i].size)) dump.Write("\n");
 			}
-		break;
+			break;
 
 		case CELL_GCM_VERTEX_S32K:
-			for (u32 j = 0; j < m_vertex_data[i].data.size(); j+=2)
+			for (u32 j = 0; j < m_vertex_data[i].data.size(); j += 2)
 			{
 				dump.Write(wxString::Format("%d\n", *(u16*)&m_vertex_data[i].data[j]));
-				if (!(((j+2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
+				if (!(((j + 2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
 			}
-		break;
-		
-		// case CELL_GCM_VERTEX_CMP:
-		
+			break;
+
+			// case CELL_GCM_VERTEX_CMP:
+
 		case CELL_GCM_VERTEX_UB256:
 			for (u32 j = 0; j < m_vertex_data[i].data.size(); ++j)
 			{
 				dump.Write(wxString::Format("%d\n", m_vertex_data[i].data[j]));
-				if (!((j+1) % m_vertex_data[i].size)) dump.Write("\n");
+				if (!((j + 1) % m_vertex_data[i].size)) dump.Write("\n");
 			}
-		break;
+			break;
 
 		default:
 			LOG_ERROR(HLE, "Bad cv type! %d", m_vertex_data[i].type);
-		return;
+			return;
 		}
 
 		dump.Write("\n");
@@ -966,7 +986,7 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
 			GL_FALSE,
 		};
 
-		if (m_vertex_data[i].type < 1 || m_vertex_data[i].type > 7) 
+		if (m_vertex_data[i].type < 1 || m_vertex_data[i].type > 7)
 		{
 			LOG_ERROR(RSX, "GLGSRender::EnableVertexData: Bad vertex data type (%d)!", m_vertex_data[i].type);
 		}
@@ -984,7 +1004,7 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
 				case 3: glVertexAttrib3sv(i, (GLshort*)&m_vertex_data[i].data[0]); break;
 				case 4: glVertexAttrib4sv(i, (GLshort*)&m_vertex_data[i].data[0]); break;
 				}
-			break;
+				break;
 
 			case CELL_GCM_VERTEX_F:
 				switch (m_vertex_data[i].size)
@@ -994,12 +1014,12 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
 				case 3: glVertexAttrib3fv(i, (GLfloat*)&m_vertex_data[i].data[0]); break;
 				case 4: glVertexAttrib4fv(i, (GLfloat*)&m_vertex_data[i].data[0]); break;
 				}
-			break;
+				break;
 
 			case CELL_GCM_VERTEX_CMP:
 			case CELL_GCM_VERTEX_UB:
 				glVertexAttrib4ubv(i, (GLubyte*)&m_vertex_data[i].data[0]);
-			break;
+				break;
 			}
 
 			checkForGlError("glVertexAttrib");
@@ -1034,9 +1054,9 @@ void GLGSRender::InitVertexData()
 	int l;
 	GLfloat scaleOffsetMat[16] =
 	{
-		1.0f, 0.0f, 0.0f, 0.0f, 
-		0.0f, 1.0f, 0.0f, 0.0f, 
-		0.0f, 0.0f, 1.0f, 0.0f, 
+		1.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 1.0f, 0.0f, 0.0f,
+		0.0f, 0.0f, 1.0f, 0.0f,
 		0.0f, 0.0f, 0.0f, 1.0f
 	};
 
@@ -1076,7 +1096,7 @@ void GLGSRender::InitFragmentData()
 		return;
 	}
 
-	for (const RSXTransformConstant& c : m_fragment_constants) 
+	for (const RSXTransformConstant& c : m_fragment_constants)
 	{
 		u32 id = c.id - m_cur_fragment_prog->offset;
 
@@ -1101,15 +1121,15 @@ bool GLGSRender::LoadProgram()
 		LOG_WARNING(RSX, "LoadProgram: m_cur_shader_prog == NULL");
 		return false;
 	}
-	
+
 	m_cur_fragment_prog->ctrl = m_shader_ctrl;
-	
+
 	if (!m_cur_vertex_prog)
 	{
 		LOG_WARNING(RSX, "LoadProgram: m_cur_vertex_prog == NULL");
 		return false;
 	}
-	
+
 	m_fp_buf_num = m_prog_buffer.SearchFp(*m_cur_fragment_prog, m_fragment_prog);
 	m_vp_buf_num = m_prog_buffer.SearchVp(*m_cur_vertex_prog, m_vertex_prog);
 
@@ -1391,14 +1411,14 @@ void GLGSRender::WriteColorBuffers()
 		glBufferData(GL_PIXEL_PACK_BUFFER, RSXThread::m_width * RSXThread::m_height * 4, 0, GL_STREAM_READ);
 		glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
 		WriteColorBufferA();
-	break;
+		break;
 
 	case CELL_GCM_SURFACE_TARGET_1:
 		glBindBuffer(GL_PIXEL_PACK_BUFFER, g_pbo[1]);
 		glBufferData(GL_PIXEL_PACK_BUFFER, RSXThread::m_width * RSXThread::m_height * 4, 0, GL_STREAM_READ);
 		glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
 		WriteColorBufferB();
-	break;
+		break;
 
 	case CELL_GCM_SURFACE_TARGET_MRT1:
 		for (int i = 0; i < 2; i++)
@@ -1409,7 +1429,7 @@ void GLGSRender::WriteColorBuffers()
 		glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
 		WriteColorBufferA();
 		WriteColorBufferB();
-	break;
+		break;
 
 	case CELL_GCM_SURFACE_TARGET_MRT2:
 		for (int i = 0; i < 3; i++)
@@ -1421,7 +1441,7 @@ void GLGSRender::WriteColorBuffers()
 		WriteColorBufferA();
 		WriteColorBufferB();
 		WriteColorBufferC();
-	break;
+		break;
 
 	case CELL_GCM_SURFACE_TARGET_MRT3:
 		for (int i = 0; i < 4; i++)
@@ -1434,7 +1454,7 @@ void GLGSRender::WriteColorBuffers()
 		WriteColorBufferB();
 		WriteColorBufferC();
 		WriteColorBufferD();
-	break;
+		break;
 	}
 }
 
@@ -1480,7 +1500,7 @@ void GLGSRender::OnExitThread()
 	glDeleteTextures(1, &g_flip_tex);
 	glDeleteTextures(1, &g_depth_tex);
 	glDeleteBuffers(6, g_pbo);
-	
+
 	glDisable(GL_TEXTURE_2D);
 	glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
 
@@ -1530,15 +1550,31 @@ void GLGSRender::InitDrawBuffers()
 
 		m_rbo.Bind(4);
 
-		if (m_surface_depth_format == CELL_GCM_SURFACE_Z16)
+		switch (m_surface_depth_format)
+		{
+		case 0:
+		{
+			// case 0 found in BLJM60410-[Suzukaze no Melt - Days in the Sanctuary]
+			// [E : RSXThread]: Bad depth format! (0)
+			// [E : RSXThread]: glEnable: opengl error 0x0506
+			// [E : RSXThread]: glDrawArrays: opengl error 0x0506
+			m_rbo.Storage(GL_DEPTH_COMPONENT, RSXThread::m_width, RSXThread::m_height);
+			checkForGlError("m_rbo.Storage(GL_DEPTH_COMPONENT)");
+			break;
+		}
+
+		case CELL_GCM_SURFACE_Z16:
 		{
 			m_rbo.Storage(GL_DEPTH_COMPONENT16, RSXThread::m_width, RSXThread::m_height);
 			checkForGlError("m_rbo.Storage(GL_DEPTH_COMPONENT16)");
 
 			m_fbo.Renderbuffer(GL_DEPTH_ATTACHMENT, m_rbo.GetId(4));
 			checkForGlError("m_fbo.Renderbuffer(GL_DEPTH_ATTACHMENT)");
+			break;
 		}
-		else if (m_surface_depth_format == CELL_GCM_SURFACE_Z24S8)
+			
+
+		case CELL_GCM_SURFACE_Z24S8:
 		{
 			m_rbo.Storage(GL_DEPTH24_STENCIL8, RSXThread::m_width, RSXThread::m_height);
 			checkForGlError("m_rbo.Storage(GL_DEPTH24_STENCIL8)");
@@ -1548,6 +1584,18 @@ void GLGSRender::InitDrawBuffers()
 
 			m_fbo.Renderbuffer(GL_STENCIL_ATTACHMENT, m_rbo.GetId(4));
 			checkForGlError("m_fbo.Renderbuffer(GL_STENCIL_ATTACHMENT)");
+
+			break;
+
+		}
+			
+
+		default:
+		{
+			LOG_ERROR(RSX, "Bad depth format! (%d)", m_surface_depth_format);
+			assert(0);
+			break;
+		}
 		}
 
 		for (int i = 0; i < 4; ++i)
@@ -1555,6 +1603,15 @@ void GLGSRender::InitDrawBuffers()
 			m_fbo.Renderbuffer(GL_COLOR_ATTACHMENT0 + i, m_rbo.GetId(i));
 			checkForGlError(fmt::Format("m_fbo.Renderbuffer(GL_COLOR_ATTACHMENT%d)", i));
 		}
+
+		//m_fbo.Renderbuffer(GL_DEPTH_ATTACHMENT, m_rbo.GetId(4));
+		//checkForGlError("m_fbo.Renderbuffer(GL_DEPTH_ATTACHMENT)");
+
+		//if (m_surface_depth_format == 2)
+		//{
+		//	m_fbo.Renderbuffer(GL_STENCIL_ATTACHMENT, m_rbo.GetId(4));
+		//	checkForGlError("m_fbo.Renderbuffer(GL_STENCIL_ATTACHMENT)");
+		//}
 	}
 
 	if (!m_set_surface_clip_horizontal)
@@ -1568,41 +1625,56 @@ void GLGSRender::InitDrawBuffers()
 		m_surface_clip_y = 0;
 		m_surface_clip_h = RSXThread::m_height;
 	}
-		
+
 	m_fbo.Bind();
 
 	static const GLenum draw_buffers[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2, GL_COLOR_ATTACHMENT3 };
 
 	switch (m_surface_color_target)
 	{
-	case CELL_GCM_SURFACE_TARGET_NONE:
-	break;
+	case CELL_GCM_SURFACE_TARGET_NONE: break;
 
 	case CELL_GCM_SURFACE_TARGET_0:
+	{
 		glDrawBuffer(draw_buffers[0]);
-	break;
-
+		checkForGlError("glDrawBuffer(0)");
+		break;
+	}
+		
 	case CELL_GCM_SURFACE_TARGET_1:
+	{
 		glDrawBuffer(draw_buffers[1]);
-	break;
-
+		checkForGlError("glDrawBuffer(1)");
+		break;
+	}
+		
 	case CELL_GCM_SURFACE_TARGET_MRT1:
+	{
 		glDrawBuffers(2, draw_buffers);
-	break;
-
+		checkForGlError("glDrawBuffers(2)");
+		break;
+	}
+		
 	case CELL_GCM_SURFACE_TARGET_MRT2:
+	{
 		glDrawBuffers(3, draw_buffers);
-	break;
+		checkForGlError("glDrawBuffers(3)");
+		break;
+	}
 
 	case CELL_GCM_SURFACE_TARGET_MRT3:
+	{
 		glDrawBuffers(4, draw_buffers);
-	break;
-
-	checkForGlError("glDrawBuffers");
+		checkForGlError("glDrawBuffers(4)");
+		break;
+	}
 
 	default:
+	{
 		LOG_ERROR(RSX, "Bad surface color target: %d", m_surface_color_target);
-	break;
+		break;
+	}
+		
 	}
 
 	if (m_read_buffer)
@@ -1621,326 +1693,63 @@ void GLGSRender::InitDrawBuffers()
 	}
 }
 
-void GLGSRender::Enable(u32 cmd, u32 enable)
+void GLGSRender::ExecCMD(u32 cmd)
 {
-	switch (cmd)
-	{
-	case NV4097_SET_DITHER_ENABLE:
-		enable ? glEnable(GL_DITHER) : glDisable(GL_DITHER);
-		break;
+	assert(cmd == NV4097_CLEAR_SURFACE);
 
-	case NV4097_SET_ALPHA_TEST_ENABLE:
-		enable ? glEnable(GL_ALPHA_TEST) : glDisable(GL_ALPHA_TEST);
-		break;
-
-	case NV4097_SET_STENCIL_TEST_ENABLE:
-		enable ? glEnable(GL_STENCIL_TEST) : glDisable(GL_STENCIL_TEST);
-		break;
-
-	case NV4097_SET_DEPTH_TEST_ENABLE:
-		enable ? glEnable(GL_DEPTH_TEST) : glDisable(GL_DEPTH_TEST);
-		break;
-
-	case NV4097_SET_CULL_FACE_ENABLE:
-		enable ? glEnable(GL_CULL_FACE) : glDisable(GL_CULL_FACE);
-		break;
-
-	case NV4097_SET_BLEND_ENABLE:
-		enable ? glEnable(GL_BLEND) : glDisable(GL_BLEND);
-		break;
-
-	case NV4097_SET_POLY_OFFSET_FILL_ENABLE:
-		enable ? glEnable(GL_POLYGON_OFFSET_FILL) : glDisable(GL_POLYGON_OFFSET_FILL);
-		break;
-
-	case NV4097_SET_POLY_OFFSET_LINE_ENABLE:
-		enable ? glEnable(GL_POLYGON_OFFSET_LINE) : glDisable(GL_POLYGON_OFFSET_LINE);
-		break;
-
-	case NV4097_SET_POLY_OFFSET_POINT_ENABLE:
-		enable ? glEnable(GL_POLYGON_OFFSET_POINT) : glDisable(GL_POLYGON_OFFSET_POINT);
-		break;
-
-	case NV4097_SET_LOGIC_OP_ENABLE:
-		enable ? glEnable(GL_LOGIC_OP) : glDisable(GL_LOGIC_OP);
-		break;
-
-	case NV4097_SET_SPECULAR_ENABLE:
-		enable ? glEnable(GL_LIGHTING) : glDisable(GL_LIGHTING);
-		break;
-
-	case NV4097_SET_LINE_SMOOTH_ENABLE:
-		enable ? glEnable(GL_LINE_SMOOTH) : glDisable(GL_LINE_SMOOTH);
-		break;
-
-	case NV4097_SET_POLY_SMOOTH_ENABLE:
-		enable ? glEnable(GL_POLYGON_SMOOTH) : glDisable(GL_POLYGON_SMOOTH);
-		break;
-
-	case NV4097_SET_RESTART_INDEX_ENABLE:
-		enable ? glEnable(GL_PRIMITIVE_RESTART) : glDisable(GL_PRIMITIVE_RESTART);
-		break;
-
-	case NV4097_SET_POINT_SPRITE_CONTROL:
-		enable ? glEnable(GL_POINT_SPRITE) : glDisable(GL_POINT_SPRITE);
-		break;
-
-	case NV4097_SET_LINE_STIPPLE:
-		enable ? glEnable(GL_LINE_STIPPLE) : glDisable(GL_LINE_STIPPLE);
-		break;
-
-	case NV4097_SET_POLYGON_STIPPLE:
-		enable ? glEnable(GL_POLYGON_STIPPLE) : glDisable(GL_POLYGON_STIPPLE);
-		break;
-
-	case NV4097_SET_DEPTH_BOUNDS_TEST_ENABLE:
-		enable ? glEnable(GL_DEPTH_BOUNDS_TEST_EXT) : glDisable(GL_DEPTH_BOUNDS_TEST_EXT);
-		break;
-
-	case NV4097_SET_TWO_SIDED_STENCIL_TEST_ENABLE:
-		enable ? glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT) : glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT);
-		break;
-
-	case NV4097_SET_USER_CLIP_PLANE_CONTROL:
-		const u32 clip_plane_0 = enable & 0xf;
-		const u32 clip_plane_1 = (enable >> 4) & 0xf;
-		const u32 clip_plane_2 = (enable >> 8) & 0xf;
-		const u32 clip_plane_3 = (enable >> 12) & 0xf;
-		const u32 clip_plane_4 = (enable >> 16) & 0xf;
-		const u32 clip_plane_5 = enable >> 20;
-
-		clip_plane_0 ? glEnable(GL_CLIP_PLANE0) : glDisable(GL_CLIP_PLANE0);
-		clip_plane_1 ? glEnable(GL_CLIP_PLANE1) : glDisable(GL_CLIP_PLANE1);
-		clip_plane_2 ? glEnable(GL_CLIP_PLANE2) : glDisable(GL_CLIP_PLANE2);
-		clip_plane_3 ? glEnable(GL_CLIP_PLANE3) : glDisable(GL_CLIP_PLANE3);
-		clip_plane_4 ? glEnable(GL_CLIP_PLANE4) : glDisable(GL_CLIP_PLANE4);
-		clip_plane_5 ? glEnable(GL_CLIP_PLANE5) : glDisable(GL_CLIP_PLANE5);
-		break;
-	}
-}
-
-void GLGSRender::ClearColor(u32 a, u32 r, u32 g, u32 b)
-{
-	glClearColor(r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f);
-	checkForGlError("glClearColor");
-}
-
-void GLGSRender::ClearStencil(u32 stencil)
-{
-	glClearStencil(stencil);
-	checkForGlError("glClearStencil");
-}
-
-void GLGSRender::ClearDepth(u32 depth)
-{
-	glClearDepth(depth / (float)0xffffff);
-	checkForGlError("glClearDepth");
-}
-
-void GLGSRender::ClearSurface(u32 mask)
-{
 	InitDrawBuffers();
 
-	GLbitfield clearMask = 0;
-	if (mask & 0x01) clearMask |= GL_DEPTH_BUFFER_BIT;
-	if (mask & 0x02) clearMask |= GL_STENCIL_BUFFER_BIT;
-	if (mask & 0xF0) clearMask |= GL_COLOR_BUFFER_BIT;
-	
-	glClear(clearMask);
+	if (m_set_color_mask)
+	{
+		glColorMask(m_color_mask_r, m_color_mask_g, m_color_mask_b, m_color_mask_a);
+		checkForGlError("glColorMask");
+	}
+
+	if (m_set_scissor_horizontal && m_set_scissor_vertical)
+	{
+		glScissor(m_scissor_x, m_scissor_y, m_scissor_w, m_scissor_h);
+		checkForGlError("glScissor");
+	}
+
+	GLbitfield f = 0;
+
+	if (m_clear_surface_mask & 0x1)
+	{
+		glClearDepth(m_clear_surface_z / (float)0xffffff);
+		checkForGlError("glClearDepth");
+
+		f |= GL_DEPTH_BUFFER_BIT;
+	}
+
+	if (m_clear_surface_mask & 0x2)
+	{
+		glClearStencil(m_clear_surface_s);
+		checkForGlError("glClearStencil");
+
+		f |= GL_STENCIL_BUFFER_BIT;
+	}
+
+	if (m_clear_surface_mask & 0xF0)
+	{
+		glClearColor(
+			m_clear_surface_color_r / 255.0f,
+			m_clear_surface_color_g / 255.0f,
+			m_clear_surface_color_b / 255.0f,
+			m_clear_surface_color_a / 255.0f);
+		checkForGlError("glClearColor");
+
+		f |= GL_COLOR_BUFFER_BIT;
+	}
+
+	glClear(f);
 	checkForGlError("glClear");
 
 	WriteBuffers();
 }
 
-void GLGSRender::ColorMask(bool a, bool r, bool g, bool b)
-{
-	glColorMask(r, g, b, a);
-	checkForGlError("glColorMask");
-}
-
-void GLGSRender::AlphaFunc(u32 func, float ref)
-{
-	glAlphaFunc(func, ref);
-	checkForGlError("glAlphaFunc");
-}
-
-void GLGSRender::DepthFunc(u32 func)
-{
-	glDepthFunc(func);
-	checkForGlError("glDepthFunc");
-}
-
-void GLGSRender::DepthMask(u32 flag)
-{
-	glDepthMask(flag);
-	checkForGlError("glDepthMask");
-}
-
-void GLGSRender::PolygonMode(u32 face, u32 mode)
-{
-	switch (face)
-	{
-	case NV4097_SET_FRONT_POLYGON_MODE:
-		glPolygonMode(GL_FRONT, mode);
-		break;
-	case NV4097_SET_BACK_POLYGON_MODE:
-		glPolygonMode(GL_BACK, mode);
-		break;
-	}
-	checkForGlError("glPolygonMode");
-}
-
-void GLGSRender::PointSize(float size)
-{
-	glPointSize(m_point_size);
-	checkForGlError("glPointSize");
-}
-
-void GLGSRender::LogicOp(u32 opcode)
-{
-	glLogicOp(opcode);
-	checkForGlError("glLogicOp");
-}
-
-void GLGSRender::LineWidth(float width)
-{
-	glLineWidth(width);
-	checkForGlError("glLineWidth");
-}
-
-void GLGSRender::LineStipple(u16 factor, u16 pattern)
-{
-	glLineStipple(factor, pattern);
-	checkForGlError("glLineStipple");
-}
-
-void GLGSRender::PolygonStipple(u32 pattern)
-{
-	glPolygonStipple((const GLubyte*)pattern);
-	checkForGlError("glPolygonStipple");
-}
-
-void GLGSRender::PrimitiveRestartIndex(u32 index)
-{
-	glPrimitiveRestartIndex(index);
-	checkForGlError("glPrimitiveRestartIndex");
-}
-
-void GLGSRender::CullFace(u32 mode)
-{
-	glCullFace(mode);
-	checkForGlError("glCullFace");
-}
-
-void GLGSRender::FrontFace(u32 mode)
-{
-	glFrontFace(mode);
-	checkForGlError("glFrontFace");
-}
-
-void GLGSRender::Fogi(u32 mode)
-{
-	glFogi(GL_FOG_MODE, mode);
-	checkForGlError("glFogi(GL_FOG_MODE)");
-}
-
-void GLGSRender::Fogf(float start, float end)
-{
-	glFogf(GL_FOG_START, start);
-	checkForGlError("glFogf(GL_FOG_START)");
-	glFogf(GL_FOG_END, end);
-	checkForGlError("glFogf(GL_FOG_END)");
-}
-
-void GLGSRender::PolygonOffset(float factor , float bias)
-{
-	glPolygonOffset(factor, bias);
-	checkForGlError("glPolygonOffset");
-}
-
-void GLGSRender::DepthRangef(float min, float max)
-{
-	glDepthRangef(min, max);
-	checkForGlError("glDepthRangef");
-}
-
-void GLGSRender::BlendEquationSeparate(u16 rgb, u16 a)
-{
-	glBlendEquationSeparate(rgb, a);
-	checkForGlError("glBlendEquationSeparate");
-}
-
-void GLGSRender::BlendFuncSeparate(u16 srcRGB, u16 dstRGB, u16 srcAlpha, u16 dstAlpha)
-{
-	glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
-	checkForGlError("glBlendFuncSeparate");
-}
-
-void GLGSRender::BlendColor(u8 r, u8 g, u8 b, u8 a)
-{
-	glBlendColor(r, g, b, a);
-	checkForGlError("glBlendColor");
-}
-
-void GLGSRender::LightModeli(u32 enable)
-{
-	enable ? glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE) : glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_FALSE);
-	checkForGlError("glLightModeli");
-}
-
-void GLGSRender::ShadeModel(u32 mode)
-{
-	glShadeModel(m_shade_mode);
-	checkForGlError("glShadeModel");
-}
-
-void GLGSRender::DepthBoundsEXT(float min, float max)
-{
-	glDepthBoundsEXT(min, max);
-	checkForGlError("glDepthBoundsEXT");
-}
-
-void GLGSRender::Scissor(u16 x, u16 y, u16 width, u16 height)
-{
-	glScissor(x, y, width, height);
-	checkForGlError("glScissor");
-}
-
-void GLGSRender::StencilOp(u32 fail, u32 zfail, u32 zpass)
-{
-	glStencilOp(fail, zfail, zpass);
-	checkForGlError("glStencilOp");
-}
-
-void GLGSRender::StencilMask(u32 mask)
-{
-	glStencilMask(mask);
-	checkForGlError("glStencilMask");
-}
-
-void GLGSRender::StencilFunc(u32 func, u32 ref, u32 mask)
-{
-	glStencilFunc(func, ref, mask);
-	checkForGlError("glStencilFunc");
-}
-
-void GLGSRender::StencilOpSeparate(u32 mode, u32 fail, u32 zfail, u32 zpass)
-{
-	mode ? glStencilOpSeparate(GL_FRONT, fail, zfail, zpass) : glStencilOpSeparate(GL_BACK, fail, zfail, zpass);
-}
-
-void GLGSRender::StencilMaskSeparate(u32 mode, u32 mask)
-{
-	mode ? glStencilMaskSeparate(GL_FRONT, mask) : glStencilMaskSeparate(GL_BACK, mask);
-}
-
-void GLGSRender::StencilFuncSeparate(u32 mode, u32 func, u32 ref, u32 mask)
-{
-	mode ? glStencilFuncSeparate(GL_FRONT, func, ref, mask) : glStencilFuncSeparate(GL_BACK, func, ref, mask);
-}
-
 void GLGSRender::ExecCMD()
 {
+	//return;
 	if (!LoadProgram())
 	{
 		LOG_ERROR(RSX, "LoadProgram failed.");
@@ -1949,7 +1758,268 @@ void GLGSRender::ExecCMD()
 	}
 
 	InitDrawBuffers();
-	
+
+	if (m_set_color_mask)
+	{
+		glColorMask(m_color_mask_r, m_color_mask_g, m_color_mask_b, m_color_mask_a);
+		checkForGlError("glColorMask");
+	}
+
+	if (!m_indexed_array.m_count && !m_draw_array_count)
+	{
+		u32 min_vertex_size = ~0;
+		for (auto &i : m_vertex_data)
+		{
+			if (!i.size)
+				continue;
+
+			u32 vertex_size = i.data.size() / (i.size * i.GetTypeSize());
+
+			if (min_vertex_size > vertex_size)
+				min_vertex_size = vertex_size;
+		}
+
+		m_draw_array_count = min_vertex_size;
+		m_draw_array_first = 0;
+	}
+
+	Enable(m_set_depth_test, GL_DEPTH_TEST);
+	Enable(m_set_alpha_test, GL_ALPHA_TEST);
+	Enable(m_set_depth_bounds_test, GL_DEPTH_BOUNDS_TEST_EXT);
+	Enable(m_set_blend || m_set_blend_mrt1 || m_set_blend_mrt2 || m_set_blend_mrt3, GL_BLEND);
+	Enable(m_set_scissor_horizontal && m_set_scissor_vertical, GL_SCISSOR_TEST);
+	Enable(m_set_logic_op, GL_LOGIC_OP);
+	Enable(m_set_cull_face, GL_CULL_FACE);
+	Enable(m_set_dither, GL_DITHER);
+	Enable(m_set_stencil_test, GL_STENCIL_TEST);
+	Enable(m_set_line_smooth, GL_LINE_SMOOTH);
+	Enable(m_set_poly_smooth, GL_POLYGON_SMOOTH);
+	Enable(m_set_point_sprite_control, GL_POINT_SPRITE);
+	Enable(m_set_specular, GL_LIGHTING);
+	Enable(m_set_poly_offset_fill, GL_POLYGON_OFFSET_FILL);
+	Enable(m_set_poly_offset_line, GL_POLYGON_OFFSET_LINE);
+	Enable(m_set_poly_offset_point, GL_POLYGON_OFFSET_POINT);
+	Enable(m_set_restart_index, GL_PRIMITIVE_RESTART);
+	Enable(m_set_line_stipple, GL_LINE_STIPPLE);
+	Enable(m_set_polygon_stipple, GL_POLYGON_STIPPLE);
+
+	if (m_set_clip_plane)
+	{
+		Enable(m_clip_plane_0, GL_CLIP_PLANE0);
+		Enable(m_clip_plane_1, GL_CLIP_PLANE1);
+		Enable(m_clip_plane_2, GL_CLIP_PLANE2);
+		Enable(m_clip_plane_3, GL_CLIP_PLANE3);
+		Enable(m_clip_plane_4, GL_CLIP_PLANE4);
+		Enable(m_clip_plane_5, GL_CLIP_PLANE5);
+
+		checkForGlError("m_set_clip_plane");
+	}
+
+	checkForGlError("glEnable");
+
+	if (m_set_front_polygon_mode)
+	{
+		glPolygonMode(GL_FRONT, m_front_polygon_mode);
+		checkForGlError("glPolygonMode(Front)");
+	}
+
+	if (m_set_back_polygon_mode)
+	{
+		glPolygonMode(GL_BACK, m_back_polygon_mode);
+		checkForGlError("glPolygonMode(Back)");
+	}
+
+	if (m_set_point_size)
+	{
+		glPointSize(m_point_size);
+		checkForGlError("glPointSize");
+	}
+
+	if (m_set_poly_offset_mode)
+	{
+		glPolygonOffset(m_poly_offset_scale_factor, m_poly_offset_bias);
+		checkForGlError("glPolygonOffset");
+	}
+
+	if (m_set_logic_op)
+	{
+		glLogicOp(m_logic_op);
+		checkForGlError("glLogicOp");
+	}
+
+	if (m_set_scissor_horizontal && m_set_scissor_vertical)
+	{
+		glScissor(m_scissor_x, m_scissor_y, m_scissor_w, m_scissor_h);
+		checkForGlError("glScissor");
+	}
+
+	if (m_set_two_sided_stencil_test_enable)
+	{
+		if (m_set_stencil_fail && m_set_stencil_zfail && m_set_stencil_zpass)
+		{
+			glStencilOpSeparate(GL_FRONT, m_stencil_fail, m_stencil_zfail, m_stencil_zpass);
+			checkForGlError("glStencilOpSeparate");
+		}
+
+		if (m_set_stencil_mask)
+		{
+			glStencilMaskSeparate(GL_FRONT, m_stencil_mask);
+			checkForGlError("glStencilMaskSeparate");
+		}
+
+		if (m_set_stencil_func && m_set_stencil_func_ref && m_set_stencil_func_mask)
+		{
+			glStencilFuncSeparate(GL_FRONT, m_stencil_func, m_stencil_func_ref, m_stencil_func_mask);
+			checkForGlError("glStencilFuncSeparate");
+		}
+
+		if (m_set_back_stencil_fail && m_set_back_stencil_zfail && m_set_back_stencil_zpass)
+		{
+			glStencilOpSeparate(GL_BACK, m_back_stencil_fail, m_back_stencil_zfail, m_back_stencil_zpass);
+			checkForGlError("glStencilOpSeparate(GL_BACK)");
+		}
+
+		if (m_set_back_stencil_mask)
+		{
+			glStencilMaskSeparate(GL_BACK, m_back_stencil_mask);
+			checkForGlError("glStencilMaskSeparate(GL_BACK)");
+		}
+
+		if (m_set_back_stencil_func && m_set_back_stencil_func_ref && m_set_back_stencil_func_mask)
+		{
+			glStencilFuncSeparate(GL_BACK, m_back_stencil_func, m_back_stencil_func_ref, m_back_stencil_func_mask);
+			checkForGlError("glStencilFuncSeparate(GL_BACK)");
+		}
+	}
+	else
+	{
+		if (m_set_stencil_fail && m_set_stencil_zfail && m_set_stencil_zpass)
+		{
+			glStencilOp(m_stencil_fail, m_stencil_zfail, m_stencil_zpass);
+			checkForGlError("glStencilOp");
+		}
+
+		if (m_set_stencil_mask)
+		{
+			glStencilMask(m_stencil_mask);
+			checkForGlError("glStencilMask");
+		}
+
+		if (m_set_stencil_func && m_set_stencil_func_ref && m_set_stencil_func_mask)
+		{
+			glStencilFunc(m_stencil_func, m_stencil_func_ref, m_stencil_func_mask);
+			checkForGlError("glStencilFunc");
+		}
+	}
+
+	// TODO: Use other glLightModel functions?
+	glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, m_set_two_side_light_enable ? GL_TRUE : GL_FALSE);
+	checkForGlError("glLightModeli");
+
+	if (m_set_shade_mode)
+	{
+		glShadeModel(m_shade_mode);
+		checkForGlError("glShadeModel");
+	}
+
+	if (m_set_depth_mask)
+	{
+		glDepthMask(m_depth_mask);
+		checkForGlError("glDepthMask");
+	}
+
+	if (m_set_depth_func)
+	{
+		glDepthFunc(m_depth_func);
+		checkForGlError("glDepthFunc");
+	}
+
+	if (m_set_depth_bounds)
+	{
+		glDepthBoundsEXT(m_depth_bounds_min, m_depth_bounds_max);
+		checkForGlError("glDepthBounds");
+	}
+
+	if (m_set_clip)
+	{
+		glDepthRangef(m_clip_min, m_clip_max);
+		checkForGlError("glDepthRangef");
+	}
+
+	if (m_set_line_width)
+	{
+		glLineWidth(m_line_width);
+		checkForGlError("glLineWidth");
+	}
+
+	if (m_set_line_stipple)
+	{
+		glLineStipple(m_line_stipple_factor, m_line_stipple_pattern);
+		checkForGlError("glLineStipple");
+	}
+
+	if (m_set_polygon_stipple)
+	{
+		glPolygonStipple((const GLubyte*)m_polygon_stipple_pattern);
+		checkForGlError("glPolygonStipple");
+	}
+
+	if (m_set_blend_equation)
+	{
+		glBlendEquationSeparate(m_blend_equation_rgb, m_blend_equation_alpha);
+		checkForGlError("glBlendEquationSeparate");
+	}
+
+	if (m_set_blend_sfactor && m_set_blend_dfactor)
+	{
+		glBlendFuncSeparate(m_blend_sfactor_rgb, m_blend_dfactor_rgb, m_blend_sfactor_alpha, m_blend_dfactor_alpha);
+		checkForGlError("glBlendFuncSeparate");
+	}
+
+	if (m_set_blend_color)
+	{
+		glBlendColor(m_blend_color_r, m_blend_color_g, m_blend_color_b, m_blend_color_a);
+		checkForGlError("glBlendColor");
+	}
+
+	if (m_set_cull_face)
+	{
+		glCullFace(m_cull_face);
+		checkForGlError("glCullFace");
+	}
+
+	if (m_set_front_face)
+	{
+		glFrontFace(m_front_face);
+		checkForGlError("glFrontFace");
+	}
+
+	if (m_set_alpha_func && m_set_alpha_ref)
+	{
+		glAlphaFunc(m_alpha_func, m_alpha_ref);
+		checkForGlError("glAlphaFunc");
+	}
+
+	if (m_set_fog_mode)
+	{
+		glFogi(GL_FOG_MODE, m_fog_mode);
+		checkForGlError("glFogi(GL_FOG_MODE)");
+	}
+
+	if (m_set_fog_params)
+	{
+		glFogf(GL_FOG_START, m_fog_param0);
+		checkForGlError("glFogf(GL_FOG_START)");
+		glFogf(GL_FOG_END, m_fog_param1);
+		checkForGlError("glFogf(GL_FOG_END)");
+	}
+
+	if (m_set_restart_index)
+	{
+		glPrimitiveRestartIndex(m_restart_index);
+		checkForGlError("glPrimitiveRestartIndex");
+	}
+
 	if (m_indexed_array.m_count && m_draw_array_count)
 	{
 		LOG_WARNING(RSX, "m_indexed_array.m_count && draw_array_count");
@@ -2005,16 +2075,16 @@ void GLGSRender::ExecCMD()
 		case CELL_GCM_DRAW_INDEX_ARRAY_TYPE_32:
 			glDrawElements(m_draw_mode - 1, m_indexed_array.m_count, GL_UNSIGNED_INT, nullptr);
 			checkForGlError("glDrawElements #4");
-		break;
+			break;
 
 		case CELL_GCM_DRAW_INDEX_ARRAY_TYPE_16:
 			glDrawElements(m_draw_mode - 1, m_indexed_array.m_count, GL_UNSIGNED_SHORT, nullptr);
 			checkForGlError("glDrawElements #2");
-		break;
+			break;
 
 		default:
 			LOG_ERROR(RSX, "Bad indexed array type (%d)", m_indexed_array.m_type);
-		break;
+			break;
 		}
 
 		DisableVertexData();
@@ -2028,102 +2098,130 @@ void GLGSRender::ExecCMD()
 		checkForGlError("glDrawArrays");
 		DisableVertexData();
 	}
-	
+
 	WriteBuffers();
 }
 
 void GLGSRender::Flip()
 {
-	static u8* src_buffer = nullptr;
-	static u32 width = 0;
-	static u32 height = 0;
-	GLenum format = GL_RGBA;
-
-	if (m_read_buffer)
+	// Set scissor to FBO size 
+	if (m_set_scissor_horizontal && m_set_scissor_vertical)
 	{
-		format = GL_BGRA;
-		CellGcmDisplayInfo* buffers = vm::get_ptr<CellGcmDisplayInfo>(m_gcm_buffers_addr);
-		u32 addr = GetAddress(buffers[m_gcm_current_buffer].offset, CELL_GCM_LOCATION_LOCAL);
+		glScissor(0, 0, RSXThread::m_width, RSXThread::m_height);
+		checkForGlError("glScissor");
+	}
 
-		if (Memory.IsGoodAddr(addr))
+	switch (m_surface_color_target)
+	{
+	case CELL_GCM_SURFACE_TARGET_0:
+	case CELL_GCM_SURFACE_TARGET_1:
+	case CELL_GCM_SURFACE_TARGET_MRT1:
+	case CELL_GCM_SURFACE_TARGET_MRT2:
+	case CELL_GCM_SURFACE_TARGET_MRT3:
+	{
+		// Fast path for non-MRT using glBlitFramebuffer.
+		GLfbo::Bind(GL_DRAW_FRAMEBUFFER, 0);
+		// Renderbuffer is upside turn , swapped srcY0 and srcY1
+		GLfbo::Blit(0, RSXThread::m_height, RSXThread::m_width, 0, 0, 0, RSXThread::m_width, RSXThread::m_height, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+	}
+		break;
+
+	case CELL_GCM_SURFACE_TARGET_NONE:
+	{
+		// Slow path for MRT/None target using glReadPixels.
+		static u8* src_buffer = nullptr;
+		static u32 width = 0;
+		static u32 height = 0;
+		GLenum format = GL_RGBA;
+
+		if (m_read_buffer)
 		{
-			width = buffers[m_gcm_current_buffer].width;
-			height = buffers[m_gcm_current_buffer].height;
-			src_buffer = vm::get_ptr<u8>(addr);
+			format = GL_BGRA;
+			CellGcmDisplayInfo* buffers = vm::get_ptr<CellGcmDisplayInfo>(m_gcm_buffers_addr);
+			u32 addr = GetAddress(buffers[m_gcm_current_buffer].offset, CELL_GCM_LOCATION_LOCAL);
+
+			if (Memory.IsGoodAddr(addr))
+			{
+				width = buffers[m_gcm_current_buffer].width;
+				height = buffers[m_gcm_current_buffer].height;
+				src_buffer = vm::get_ptr<u8>(addr);
+			}
+			else
+			{
+				src_buffer = nullptr;
+			}
+		}
+		else if (m_fbo.IsCreated())
+		{
+			format = GL_RGBA;
+			static std::vector<u8> pixels;
+			pixels.resize(RSXThread::m_width * RSXThread::m_height * 4);
+			m_fbo.Bind(GL_READ_FRAMEBUFFER);
+			glBindBuffer(GL_PIXEL_PACK_BUFFER, g_pbo[5]);
+			glBufferData(GL_PIXEL_PACK_BUFFER, RSXThread::m_width * RSXThread::m_height * 4, 0, GL_STREAM_READ);
+			glReadPixels(0, 0, RSXThread::m_width, RSXThread::m_height, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 0);
+			checkForGlError("Flip(): glReadPixels(GL_BGRA, GL_UNSIGNED_INT_8_8_8_8)");
+			GLubyte *packed = (GLubyte *)glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY);
+			if (packed)
+			{
+				memcpy(pixels.data(), packed, RSXThread::m_width * RSXThread::m_height * 4);
+				glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
+				checkForGlError("Flip(): glUnmapBuffer");
+			}
+			glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
+
+			src_buffer = pixels.data();
+			width = RSXThread::m_width;
+			height = RSXThread::m_height;
 		}
 		else
 		{
 			src_buffer = nullptr;
 		}
-	}
-	else if (m_fbo.IsCreated())
-	{
-		format = GL_RGBA;
-		static std::vector<u8> pixels;
-		pixels.resize(RSXThread::m_width * RSXThread::m_height * 4);
-		m_fbo.Bind(GL_READ_FRAMEBUFFER);
-		glBindBuffer(GL_PIXEL_PACK_BUFFER, g_pbo[5]);
-		glBufferData(GL_PIXEL_PACK_BUFFER, RSXThread::m_width * RSXThread::m_height * 4, 0, GL_STREAM_READ);
-		glReadPixels(0, 0, RSXThread::m_width, RSXThread::m_height, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 0);
-		checkForGlError("Flip(): glReadPixels(GL_BGRA, GL_UNSIGNED_INT_8_8_8_8)");
-		GLubyte *packed = (GLubyte *)glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY);
-		if (packed) 
+			
+		if (src_buffer)
 		{
-			memcpy(pixels.data(), packed, RSXThread::m_width * RSXThread::m_height * 4);
-			glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
-			checkForGlError("Flip(): glUnmapBuffer");
+			glDisable(GL_STENCIL_TEST);
+			glDisable(GL_DEPTH_TEST);
+			glDisable(GL_CLIP_PLANE0);
+			glDisable(GL_CLIP_PLANE1);
+			glDisable(GL_CLIP_PLANE2);
+			glDisable(GL_CLIP_PLANE3);
+			glDisable(GL_CLIP_PLANE4);
+			glDisable(GL_CLIP_PLANE5);
+			glActiveTexture(GL_TEXTURE0);
+			glBindTexture(GL_TEXTURE_2D, g_flip_tex);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, format, GL_UNSIGNED_INT_8_8_8_8, src_buffer);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_ONE);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+			glMatrixMode(GL_PROJECTION);
+			glLoadIdentity();
+			glOrtho(0, 1, 0, 1, 0, 1);
+			glMatrixMode(GL_MODELVIEW);
+			glLoadIdentity();
+
+			GLfbo::Bind(GL_DRAW_FRAMEBUFFER, 0);
+
+			m_program.UnUse();
+			m_program.Use();
+			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_ACCUM_BUFFER_BIT);
+
+			glColor3f(1, 1, 1);
+			glBegin(GL_QUADS);
+			glTexCoord2i(0, 1);
+			glVertex2i(0, 0);
+			glTexCoord2i(1, 1);
+			glVertex2i(1, 0);
+			glTexCoord2i(1, 0);
+			glVertex2i(1, 1);
+			glTexCoord2i(0, 0);
+			glVertex2i(0, 1);
+			glEnd();
 		}
-		glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
-
-		src_buffer = pixels.data();
-		width = RSXThread::m_width;
-		height = RSXThread::m_height;
 	}
-	else
-	{
-		src_buffer = nullptr;
-	}
-
-	if (src_buffer)
-	{
-		glDisable(GL_STENCIL_TEST);
-		glDisable(GL_DEPTH_TEST);
-		glDisable(GL_CLIP_PLANE0);
-		glDisable(GL_CLIP_PLANE1);
-		glDisable(GL_CLIP_PLANE2);
-		glDisable(GL_CLIP_PLANE3);
-		glDisable(GL_CLIP_PLANE4);
-		glDisable(GL_CLIP_PLANE5);
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(GL_TEXTURE_2D, g_flip_tex);
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, format, GL_UNSIGNED_INT_8_8_8_8, src_buffer);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_ONE);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-		glMatrixMode(GL_PROJECTION);
-		glLoadIdentity();
-		glOrtho(0, 1, 0, 1, 0, 1);
-		glMatrixMode(GL_MODELVIEW);
-		glLoadIdentity();
-
-		GLfbo::Bind(GL_DRAW_FRAMEBUFFER, 0);
-
-		m_program.UnUse();
-		m_program.Use();
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_ACCUM_BUFFER_BIT);
-
-		glColor3f(1, 1, 1);
-		glBegin(GL_QUADS);
-		glTexCoord2i(0, 1);
-		glVertex2i(0, 0);
-		glTexCoord2i(1, 1);
-		glVertex2i(1, 0);
-		glTexCoord2i(1, 0);
-		glVertex2i(1, 1);
-		glTexCoord2i(0, 0);
-		glVertex2i(0, 1);
-		glEnd();
+		break;
 	}
 
 	// Draw Objects
@@ -2133,7 +2231,14 @@ void GLGSRender::Flip()
 	}
 
 	m_frame->Flip(m_context);
-	
+
+	// Restore scissor
+	if (m_set_scissor_horizontal && m_set_scissor_vertical)
+	{
+		glScissor(m_scissor_x, m_scissor_y, m_scissor_w, m_scissor_h);
+		checkForGlError("glScissor");
+	}
+
 }
 
 u32 LinearToSwizzleAddress(u32 x, u32 y, u32 z, u32 log2_width, u32 log2_height, u32 log2_depth)
diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.h b/rpcs3/Emu/RSX/GL/GLGSRender.h
index 7ab9f406d1..a509664ded 100644
--- a/rpcs3/Emu/RSX/GL/GLGSRender.h
+++ b/rpcs3/Emu/RSX/GL/GLGSRender.h
@@ -21,7 +21,7 @@ u32 LinearToSwizzleAddress(u32 x, u32 y, u32 z, u32 log2_width, u32 log2_height,
 class GLTexture
 {
 	u32 m_id;
-	
+
 public:
 	GLTexture() : m_id(0)
 	{
@@ -166,11 +166,12 @@ public:
 	virtual ~GLGSRender();
 
 private:
-	void EnableVertexData(bool indexed_draw=false);
+	void EnableVertexData(bool indexed_draw = false);
 	void DisableVertexData();
 	void InitVertexData();
 	void InitFragmentData();
 
+	void Enable(bool enable, const u32 cap);
 	virtual void Close();
 	bool LoadProgram();
 	void WriteBuffers();
@@ -189,41 +190,7 @@ protected:
 	virtual void OnInitThread();
 	virtual void OnExitThread();
 	virtual void OnReset();
+	virtual void ExecCMD(u32 cmd);
 	virtual void ExecCMD();
-	virtual void Enable(u32 cmd, u32 enable);
-	virtual void ClearColor(u32 a, u32 r, u32 g, u32 b);
-	virtual void ClearStencil(u32 stencil);
-	virtual void ClearDepth(u32 depth);
-	virtual void ClearSurface(u32 mask);
-	virtual void ColorMask(bool a, bool r, bool g, bool b);
-	virtual void AlphaFunc(u32 func, float ref);
-	virtual void DepthFunc(u32 func);
-	virtual void DepthMask(u32 flag);
-	virtual void PolygonMode(u32 face, u32 mode);
-	virtual void PointSize(float size);
-	virtual void LogicOp(u32 opcode);
-	virtual void LineWidth(float width);
-	virtual void LineStipple(u16 factor, u16 pattern);
-	virtual void PolygonStipple(u32 pattern);
-	virtual void PrimitiveRestartIndex(u32 index);
-	virtual void CullFace(u32 mode);
-	virtual void FrontFace(u32 mode);
-	virtual void Fogi(u32 mode);
-	virtual void Fogf(float start, float end);
-	virtual void PolygonOffset(float factor, float bias);
-	virtual void DepthRangef(float min, float max);
-	virtual void BlendEquationSeparate(u16 rgb, u16 a);
-	virtual void BlendFuncSeparate(u16 srcRGB, u16 dstRGB, u16 srcAlpha, u16 dstAlpha);
-	virtual void BlendColor(u8 r, u8 g, u8 b, u8 a);
-	virtual void LightModeli(u32 enable);
-	virtual void ShadeModel(u32 mode);
-	virtual void DepthBoundsEXT(float min, float max);
-	virtual void Scissor(u16 x, u16 y, u16 width, u16 height);
-	virtual void StencilOp(u32 fail, u32 zfail, u32 zpass);
-	virtual void StencilMask(u32 mask);
-	virtual void StencilFunc(u32 func, u32 ref, u32 mask);
-	virtual void StencilOpSeparate(u32 mode, u32 fail, u32 zfail, u32 zpass);
-	virtual void StencilMaskSeparate(u32 mode, u32 mask);
-	virtual void StencilFuncSeparate(u32 mode, u32 func, u32 ref, u32 mask);
 	virtual void Flip();
 };
diff --git a/rpcs3/Emu/RSX/Null/NullGSRender.h b/rpcs3/Emu/RSX/Null/NullGSRender.h
index 53786c3b8e..33875cbabe 100644
--- a/rpcs3/Emu/RSX/Null/NullGSRender.h
+++ b/rpcs3/Emu/RSX/Null/NullGSRender.h
@@ -6,50 +6,44 @@ class NullGSRender
 {
 public:
 
-	NullGSRender() {}
-	virtual ~NullGSRender() {}
+	NullGSRender()
+	{
+	}
+
+	virtual ~NullGSRender()
+	{
+	}
 
 private:
-	virtual void OnInit() {}
-	virtual void OnInitThread() {}
-	virtual void OnExitThread() {}
-	virtual void OnReset() {}
-	virtual void Enable(u32 cmd, u32 enable) {}
-	virtual void ClearColor(u32 a, u32 r, u32 g, u32 b) {}
-	virtual void ClearStencil(u32 stencil) {}
-	virtual void ClearDepth(u32 depth) {}
-	virtual void ClearSurface(u32 mask) {}
-	virtual void ColorMask(bool a, bool r, bool g, bool b) {}
-	virtual void ExecCMD() {}
-	virtual void AlphaFunc(u32 func, float ref) {}
-	virtual void DepthFunc(u32 func) {}
-	virtual void DepthMask(u32 flag) {}
-	virtual void PolygonMode(u32 face, u32 mode) {}
-	virtual void PointSize(float size) {}
-	virtual void LogicOp(u32 opcode) {}
-	virtual void LineWidth(float width) {}
-	virtual void LineStipple(u16 factor, u16 pattern) {}
-	virtual void PolygonStipple(u32 pattern) {}
-	virtual void PrimitiveRestartIndex(u32 index) {}
-	virtual void CullFace(u32 mode) {}
-	virtual void FrontFace(u32 mode) {}
-	virtual void Fogi(u32 mode) {}
-	virtual void Fogf(float start, float end) {}
-	virtual void PolygonOffset(float factor, float bias) {}
-	virtual void DepthRangef(float min, float max) {}
-	virtual void BlendEquationSeparate(u16 rgb, u16 a) {}
-	virtual void BlendFuncSeparate(u16 srcRGB, u16 dstRGB, u16 srcAlpha, u16 dstAlpha) {}
-	virtual void BlendColor(u8 r, u8 g, u8 b, u8 a) {}
-	virtual void LightModeli(u32 enable) {}
-	virtual void ShadeModel(u32 mode) {}
-	virtual void DepthBoundsEXT(float min, float max) {}
-	virtual void Scissor(u16 x, u16 y, u16 width, u16 height) {}
-	virtual void StencilOp(u32 fail, u32 zfail, u32 zpass) {}
-	virtual void StencilMask(u32 mask) {}
-	virtual void StencilFunc(u32 func, u32 ref, u32 mask) {}
-	virtual void StencilOpSeparate(u32 mode, u32 fail, u32 zfail, u32 zpass) {}
-	virtual void StencilMaskSeparate(u32 mode, u32 mask) {}
-	virtual void StencilFuncSeparate(u32 mode, u32 func, u32 ref, u32 mask) {}
-	virtual void Flip() {}
-	virtual void Close() {}
-};
+	virtual void OnInit()
+	{
+	}
+
+	virtual void OnInitThread()
+	{
+	}
+
+	virtual void OnExitThread()
+	{
+	}
+
+	virtual void OnReset()
+	{
+	}
+
+	virtual void ExecCMD(u32 cmd)
+	{
+	}
+
+	virtual void ExecCMD()
+	{
+	}
+
+	virtual void Flip()
+	{
+	}
+
+	virtual void Close()
+	{
+	}
+};
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp
index 906b0281c3..2c7f2086ba 100644
--- a/rpcs3/Emu/RSX/RSXThread.cpp
+++ b/rpcs3/Emu/RSX/RSXThread.cpp
@@ -25,32 +25,32 @@ void RSXThread::NativeRescale(float width, float height)
 		m_height_scale = 1080 / height * 2.0f;
 		m_width = 1920;
 		m_height = 1080;
+		break;
 	}
-	break;
 	case 2: // 1280x720 window size
 	{
 		m_width_scale = 1280 / width * 2.0f;
 		m_height_scale = 720 / height * 2.0f;
 		m_width = 1280;
 		m_height = 720;
+		break;
 	}
-	break;
 	case 4: // 720x480 window size
 	{
 		m_width_scale = 720 / width * 2.0f;
 		m_height_scale = 480 / height * 2.0f;
 		m_width = 720;
 		m_height = 480;
+		break;
 	}
-	break;
 	case 5: // 720x576 window size
 	{
 		m_width_scale = 720 / width * 2.0f;
 		m_height_scale = 576 / height * 2.0f;
 		m_width = 720;
 		m_height = 576;
+		break;
 	}
-	break;
 	}
 }
 
@@ -58,7 +58,7 @@ u32 GetAddress(u32 offset, u32 location)
 {
 	u32 res = 0;
 
-	switch(location)
+	switch (location)
 	{
 	case CELL_GCM_LOCATION_LOCAL:
 	{
@@ -70,22 +70,19 @@ u32 GetAddress(u32 offset, u32 location)
 		res = (u32)Memory.RSXIOMem.RealAddr(offset); // TODO: Error Check?
 		if (res == 0)
 		{
-			LOG_ERROR(RSX, "GetAddress(offset=0x%x): RSXIO memory not mapped", offset);
-			Emu.Pause();
-			break;
+			throw fmt::format("GetAddress(offset=0x%x, location=0x%x): RSXIO memory not mapped", offset, location);
 		}
 
 		if (Emu.GetGSManager().GetRender().m_strict_ordering[offset >> 20])
 		{
 			_mm_mfence(); // probably doesn't have any effect on current implementation
 		}
+
 		break;
 	}
 	default:
 	{
-		LOG_ERROR(RSX, "GetAddress(offset=0x%x, location=0x%x): invalid location", offset, location);
-		Emu.Pause();
-		break;
+		throw fmt::format("GetAddress(offset=0x%x, location=0x%x): invalid location", offset, location);
 	}
 	}
 
@@ -112,7 +109,7 @@ void RSXVertexData::Reset()
 	data.clear();
 }
 
-void RSXVertexData::Load(u32 start, u32 count, u32 baseOffset, u32 baseIndex=0)
+void RSXVertexData::Load(u32 start, u32 count, u32 baseOffset, u32 baseIndex = 0)
 {
 	if (!addr) return;
 
@@ -125,29 +122,29 @@ void RSXVertexData::Load(u32 start, u32 count, u32 baseOffset, u32 baseIndex=0)
 		auto src = vm::get_ptr<const u8>(addr + baseOffset + stride * (i + baseIndex));
 		u8* dst = &data[i * tsize * size];
 
-		switch(tsize)
+		switch (tsize)
 		{
 		case 1:
 		{
-			memcpy(dst, src, size); // may be dangerous
+			memcpy(dst, src, size);
+			break;
 		}
-		break;
 
 		case 2:
 		{
 			const u16* c_src = (const u16*)src;
 			u16* c_dst = (u16*)dst;
 			for (u32 j = 0; j < size; ++j) *c_dst++ = re16(*c_src++);
+			break;
 		}
-		break;
 
 		case 4:
 		{
 			const u32* c_src = (const u32*)src;
 			u32* c_dst = (u32*)dst;
 			for (u32 j = 0; j < size; ++j) *c_dst++ = re32(*c_src++);
+			break;
 		}
-		break;
 		}
 	}
 }
@@ -199,7 +196,7 @@ u32 RSXThread::OutOfArgsCount(const uint x, const u32 cmd, const u32 count, cons
     case_16(offset + 16*step, step)
 #define case_range(n, offset, step) \
     case_##n(offset, step) \
-    index = (cmd - offset) / step;
+    index = (cmd - offset) / step
 
 void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const u32 count)
 {
@@ -217,14 +214,14 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 
 	m_used_gcm_commands.insert(cmd);
 
-	switch(cmd)
+	switch (cmd)
 	{
 	// NV406E
 	case NV406E_SET_REFERENCE:
 	{
 		m_ctrl->ref.exchange(be_t<u32>::make(ARGS(0)));
+		break;
 	}
-	break;
 
 	case NV406E_SET_CONTEXT_DMA_SEMAPHORE:
 	{
@@ -232,16 +229,16 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV406E_SET_CONTEXT_DMA_SEMAPHORE: 0x%x", ARGS(0));
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_SEMAPHORE_OFFSET:
 	case NV406E_SEMAPHORE_OFFSET:
 	{
 		m_set_semaphore_offset = true;
 		m_semaphore_offset = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV406E_SEMAPHORE_ACQUIRE:
 	{
@@ -249,8 +246,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV406E_SEMAPHORE_ACQUIRE: 0x%x", ARGS(0));
 		}
+		break;
 	}
-	break;
 
 	case NV406E_SEMAPHORE_RELEASE:
 	case NV4097_TEXTURE_READ_SEMAPHORE_RELEASE:
@@ -260,8 +257,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 			m_set_semaphore_offset = false;
 			vm::write32(Memory.RSXCMDMem.GetStartAddr() + m_semaphore_offset, ARGS(0));
 		}
+		break;
 	}
-	break;
 
 	case NV4097_BACK_END_WRITE_SEMAPHORE_RELEASE:
 	{
@@ -273,8 +270,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 
 			vm::write32(Memory.RSXCMDMem.GetStartAddr() + m_semaphore_offset, value);
 		}
+		break;
 	}
-	break;
 
 	// NV4097
 	case 0x0003fead:
@@ -311,30 +308,30 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 				return;
 			}
 
-			std::this_thread::sleep_for (std::chrono::milliseconds((s64)(1000.0 / limit - m_timer_sync.GetElapsedTimeInMilliSec())));
+			std::this_thread::sleep_for(std::chrono::milliseconds((s64)(1000.0 / limit - m_timer_sync.GetElapsedTimeInMilliSec())));
 			m_timer_sync.Start();
 		};
 
 		sync();
 
 		//Emu.Pause();
+		break;
 	}
-	break;
 
 	case NV4097_NO_OPERATION:
 	{
 		// Nothing to do here 
+		break;
 	}
-	break;	
-	
+
 	case NV4097_SET_CONTEXT_DMA_REPORT:
 	{
 		if (ARGS(0))
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_CONTEXT_DMA_REPORT: 0x%x", ARGS(0));
 		}
+		break;
 	}
-	break;
 
 	case NV4097_NOTIFY:
 	{
@@ -342,8 +339,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_NOTIFY: 0x%x", ARGS(0));
 		}
+		break;
 	}
-	break;
 
 	case NV4097_WAIT_FOR_IDLE:
 	{
@@ -351,8 +348,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_WAIT_FOR_IDLE: 0x%x", ARGS(0));
 		}
+		break;
 	}
-	break;
 
 	case NV4097_PM_TRIGGER:
 	{
@@ -360,64 +357,64 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_PM_TRIGGER: 0x%x", ARGS(0));
 		}
+		break;
 	}
-	break;
 
 	// Texture
-	case_range(16, NV4097_SET_TEXTURE_FORMAT, 0x20)
-	case_range(16, NV4097_SET_TEXTURE_OFFSET, 0x20)
-	case_range(16, NV4097_SET_TEXTURE_FILTER, 0x20)
-	case_range(16, NV4097_SET_TEXTURE_ADDRESS, 0x20)
-	case_range(16, NV4097_SET_TEXTURE_IMAGE_RECT, 32)
-	case_range(16, NV4097_SET_TEXTURE_BORDER_COLOR, 0x20)
-	case_range(16, NV4097_SET_TEXTURE_CONTROL0, 0x20)
-	case_range(16, NV4097_SET_TEXTURE_CONTROL1, 0x20)
+	case_range(16, NV4097_SET_TEXTURE_FORMAT, 0x20);
+	case_range(16, NV4097_SET_TEXTURE_OFFSET, 0x20);
+	case_range(16, NV4097_SET_TEXTURE_FILTER, 0x20);
+	case_range(16, NV4097_SET_TEXTURE_ADDRESS, 0x20);
+	case_range(16, NV4097_SET_TEXTURE_IMAGE_RECT, 32);
+	case_range(16, NV4097_SET_TEXTURE_BORDER_COLOR, 0x20);
+	case_range(16, NV4097_SET_TEXTURE_CONTROL0, 0x20);
+	case_range(16, NV4097_SET_TEXTURE_CONTROL1, 0x20);
 	{
 		// Done using methodRegisters in RSXTexture.cpp
+		break;
 	}
-	break;
 
-	case_range(16, NV4097_SET_TEX_COORD_CONTROL, 4)
+	case_range(16, NV4097_SET_TEX_COORD_CONTROL, 4);
 	{
 		LOG_WARNING(RSX, "TODO: NV4097_SET_TEX_COORD_CONTROL");
+		break;
 	}
-	break;
 
-	case_range(16, NV4097_SET_TEXTURE_CONTROL3, 4)
+	case_range(16, NV4097_SET_TEXTURE_CONTROL3, 4);
 	{
 		RSXTexture& tex = m_textures[index];
 		const u32 a0 = ARGS(0);
 		u32 pitch = a0 & 0xFFFFF;
 		u16 depth = a0 >> 20;
 		tex.SetControl3(depth, pitch);
+		break;
 	}
-	break;
-	
-	// Vertex Texture
-	case_range(4, NV4097_SET_VERTEX_TEXTURE_FORMAT, 0x20)
-	case_range(4, NV4097_SET_VERTEX_TEXTURE_OFFSET, 0x20)
-	case_range(4, NV4097_SET_VERTEX_TEXTURE_FILTER, 0x20)
-	case_range(4, NV4097_SET_VERTEX_TEXTURE_ADDRESS, 0x20)
-	case_range(4, NV4097_SET_VERTEX_TEXTURE_IMAGE_RECT, 0x20)
-	case_range(4, NV4097_SET_VERTEX_TEXTURE_BORDER_COLOR, 0x20)
-	case_range(4, NV4097_SET_VERTEX_TEXTURE_CONTROL0, 0x20)
+
+		// Vertex Texture
+	case_range(4, NV4097_SET_VERTEX_TEXTURE_FORMAT, 0x20);
+	case_range(4, NV4097_SET_VERTEX_TEXTURE_OFFSET, 0x20);
+	case_range(4, NV4097_SET_VERTEX_TEXTURE_FILTER, 0x20);
+	case_range(4, NV4097_SET_VERTEX_TEXTURE_ADDRESS, 0x20);
+	case_range(4, NV4097_SET_VERTEX_TEXTURE_IMAGE_RECT, 0x20);
+	case_range(4, NV4097_SET_VERTEX_TEXTURE_BORDER_COLOR, 0x20);
+	case_range(4, NV4097_SET_VERTEX_TEXTURE_CONTROL0, 0x20);
 	{
 		// Done using methodRegisters in RSXTexture.cpp
+		break;
 	}
-	break;
 
-	case_range(4, NV4097_SET_VERTEX_TEXTURE_CONTROL3, 0x20)
+	case_range(4, NV4097_SET_VERTEX_TEXTURE_CONTROL3, 0x20);
 	{
 		RSXVertexTexture& tex = m_vertex_textures[index];
 		const u32 a0 = ARGS(0);
 		u32 pitch = a0 & 0xFFFFF;
 		u16 depth = a0 >> 20;
 		tex.SetControl3(depth, pitch);
+		break;
 	}
-	break;
 
-	// Vertex data
-	case_range(16, NV4097_SET_VERTEX_DATA4UB_M, 4)
+		// Vertex data
+	case_range(16, NV4097_SET_VERTEX_DATA4UB_M, 4);
 	{
 		const u32 a0 = ARGS(0);
 		u8 v0 = a0;
@@ -434,17 +431,17 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		m_vertex_data[index].data.push_back(v3);
 
 		//LOG_WARNING(RSX, "NV4097_SET_VERTEX_DATA4UB_M: index = %d, v0 = 0x%x, v1 = 0x%x, v2 = 0x%x, v3 = 0x%x", index, v0, v1, v2, v3);
+		break;
 	}
-	break;
 
-	case_range(16, NV4097_SET_VERTEX_DATA2F_M, 8)
+	case_range(16, NV4097_SET_VERTEX_DATA2F_M, 8);
 	{
 		const u32 a0 = ARGS(0);
 		const u32 a1 = ARGS(1);
 
 		float v0 = (float&)a0;
 		float v1 = (float&)a1;
-		
+
 		m_vertex_data[index].Reset();
 		m_vertex_data[index].type = CELL_GCM_VERTEX_F;
 		m_vertex_data[index].size = 2;
@@ -454,10 +451,10 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		(float&)m_vertex_data[index].data[pos + sizeof(float) * 1] = v1;
 
 		//LOG_WARNING(RSX, "NV4097_SET_VERTEX_DATA2F_M: index = %d, v0 = %f, v1 = %f", index, v0, v1);
+		break;
 	}
-	break;
 
-	case_range(16, NV4097_SET_VERTEX_DATA4F_M, 16)
+	case_range(16, NV4097_SET_VERTEX_DATA4F_M, 16);
 	{
 		const u32 a0 = ARGS(0);
 		const u32 a1 = ARGS(1);
@@ -480,10 +477,10 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		(float&)m_vertex_data[index].data[pos + sizeof(float) * 3] = v3;
 
 		//LOG_WARNING(RSX, "NV4097_SET_VERTEX_DATA4F_M: index = %d, v0 = %f, v1 = %f, v2 = %f, v3 = %f", index, v0, v1, v2, v3);
+		break;
 	}
-	break;
 
-	case_range(16, NV4097_SET_VERTEX_DATA_ARRAY_OFFSET, 4)
+	case_range(16, NV4097_SET_VERTEX_DATA_ARRAY_OFFSET, 4);
 	{
 		const u32 addr = GetAddress(ARGS(0) & 0x7fffffff, ARGS(0) >> 31);
 
@@ -491,10 +488,10 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		m_vertex_data[index].data.clear();
 
 		//LOG_WARNING(RSX, "NV4097_SET_VERTEX_DATA_ARRAY_OFFSET: num=%d, addr=0x%x", index, addr);
+		break;
 	}
-	break;
 
-	case_range(16, NV4097_SET_VERTEX_DATA_ARRAY_FORMAT, 4)
+	case_range(16, NV4097_SET_VERTEX_DATA_ARRAY_FORMAT, 4);
 	{
 		const u32 a0 = ARGS(0);
 		u16 frequency = a0 >> 16;
@@ -510,8 +507,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 
 		//LOG_WARNING(RSX, "NV4097_SET_VERTEX_DATA_ARRAY_FORMAT: index=%d, frequency=%d, stride=%d, size=%d, type=%d", index, frequency, stride, size, type);
 
+		break;
 	}
-	break;
 
 	// Vertex Attribute
 	case NV4097_SET_VERTEX_ATTRIB_INPUT_MASK:
@@ -522,8 +519,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		}
 
 		//VertexData[0].prog.attributeInputMask = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK:
 	{
@@ -534,16 +531,21 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 
 		//VertexData[0].prog.attributeOutputMask = ARGS(0);
 		//FragmentData.prog.attributeInputMask = ARGS(0)/* & ~0x20*/;
+		break;
 	}
-	break;
 
 	// Color Mask
 	case NV4097_SET_COLOR_MASK:
 	{
-		const u32 mask = ARGS(0);
-		ColorMask(mask & 0x1000000, mask & 0x1000000, mask & 0x1000000, mask & 0x0000001);
+		const u32 a0 = ARGS(0);
+
+		m_set_color_mask = true;
+		m_color_mask_a = a0 & 0x1000000 ? true : false;
+		m_color_mask_r = a0 & 0x0010000 ? true : false;
+		m_color_mask_g = a0 & 0x0000100 ? true : false;
+		m_color_mask_b = a0 & 0x0000001 ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_COLOR_MASK_MRT:
 	{
@@ -551,118 +553,105 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_COLOR_MASK_MRT: 0x%x", mask);
 		}
+		break;
 	}
-	break;
 
 	// Alpha testing
 	case NV4097_SET_ALPHA_TEST_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_alpha_test = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_ALPHA_FUNC:
 	{
-		const u32 value = ARGS(0);
-		m_alpha_func = value;
+		m_set_alpha_func = true;
+		m_alpha_func = ARGS(0);
 
-		// Sanity check here for invalid alpha func
-		if (m_alpha_func)
+		if (count == 2)
 		{
-			AlphaFunc(m_alpha_func, m_alpha_ref);
+			m_set_alpha_ref = true;
+			const u32 a1 = ARGS(1);
+			m_alpha_ref = (float&)a1;
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_ALPHA_REF:
 	{
-		const u32 value = ARGS(0);
-		m_alpha_ref = (float&)value;
-
-		// Sanity check here for invalid alpha func
-		if (m_alpha_func)
-		{
-			AlphaFunc(m_alpha_func, m_alpha_ref);
-		}
+		m_set_alpha_ref = true;
+		const u32 a0 = ARGS(0);
+		m_alpha_ref = (float&)a0;
+		break;
 	}
-	break;
 
 	// Cull face
 	case NV4097_SET_CULL_FACE_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_cull_face = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_CULL_FACE:
 	{
-		const u32 value = ARGS(0);
-		CullFace(value);
+		m_cull_face = ARGS(0);
+		break;
 	}
-	break;
 
 	// Front face 
 	case NV4097_SET_FRONT_FACE:
 	{
-		const u32 value = ARGS(0);
-		//FrontFace(value);
+		m_front_face = ARGS(0);
+		break;
 	}
-	break;
 
 	// Blending
 	case NV4097_SET_BLEND_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_blend = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_BLEND_ENABLE_MRT:
 	{
 		m_set_blend_mrt1 = ARGS(0) & 0x02 ? true : false;
 		m_set_blend_mrt2 = ARGS(0) & 0x04 ? true : false;
 		m_set_blend_mrt3 = ARGS(0) & 0x08 ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_BLEND_FUNC_SFACTOR:
 	{
-		const u32 value = ARGS(0);
 		m_set_blend_sfactor = true;
-		m_blend_sfactor_rgb = value & 0xffff;
-		m_blend_sfactor_alpha = value >> 16;
+		m_blend_sfactor_rgb = ARGS(0) & 0xffff;
+		m_blend_sfactor_alpha = ARGS(0) >> 16;
 
 		if (count == 2)
 		{
-			const u32 value1 = ARGS(1);
-			m_blend_dfactor_rgb = value1 & 0xffff;
-			m_blend_dfactor_alpha = value1 >> 16;
-			BlendFuncSeparate(m_blend_sfactor_rgb, m_blend_dfactor_rgb, m_blend_sfactor_alpha, m_blend_dfactor_alpha);
+			m_set_blend_dfactor = true;
+			m_blend_dfactor_rgb = ARGS(1) & 0xffff;
+			m_blend_dfactor_alpha = ARGS(1) >> 16;
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_BLEND_FUNC_DFACTOR:
 	{
-		const u32 value = ARGS(0);
-		m_blend_dfactor_rgb = value & 0xffff;
-		m_blend_dfactor_alpha = value >> 16;
-
-		if (m_set_blend_sfactor)
-		{
-			BlendFuncSeparate(m_blend_sfactor_rgb, m_blend_dfactor_rgb, m_blend_sfactor_alpha, m_blend_dfactor_alpha);
-		}
+		m_set_blend_dfactor = true;
+		m_blend_dfactor_rgb = ARGS(0) & 0xffff;
+		m_blend_dfactor_alpha = ARGS(0) >> 16;
+		break;
 	}
-	break;
 
 	case NV4097_SET_BLEND_COLOR:
 	{
-		const u32 value = ARGS(0);
-		BlendColor(value & 0xff, (value >> 8) & 0xff, (value >> 16) & 0xff, (value >> 24) & 0xff);
+		m_set_blend_color = true;
+		m_blend_color_r = ARGS(0) & 0xff;
+		m_blend_color_g = (ARGS(0) >> 8) & 0xff;
+		m_blend_color_b = (ARGS(0) >> 16) & 0xff;
+		m_blend_color_a = (ARGS(0) >> 24) & 0xff;
+		break;
 	}
-	break;
 
 	case NV4097_SET_BLEND_COLOR2:
 	{
@@ -670,15 +659,16 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO : NV4097_SET_BLEND_COLOR2: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_BLEND_EQUATION:
 	{
-		const u32 value = ARGS(0);
-		BlendEquationSeparate(value & 0xffff, value >> 16);
+		m_set_blend_equation = true;
+		m_blend_equation_rgb = ARGS(0) & 0xffff;
+		m_blend_equation_alpha = ARGS(0) >> 16;
+		break;
 	}
-	break;
 
 	case NV4097_SET_REDUCE_DST_COLOR:
 	{
@@ -686,43 +676,37 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_REDUCE_DST_COLOR: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	// Depth bound testing
 	case NV4097_SET_DEPTH_BOUNDS_TEST_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_depth_bounds_test = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_DEPTH_BOUNDS_MIN:
 	{
-		const u32 value = ARGS(0);
 		m_set_depth_bounds = true;
-		m_depth_bounds_min = (float&)value;
+		const u32 a0 = ARGS(0);
+		m_depth_bounds_min = (float&)a0;
 
 		if (count == 2)
 		{
-			const u32 value1 = ARGS(1);
-			m_depth_bounds_max = (float&)value1;
-			DepthBoundsEXT(m_depth_bounds_min, m_depth_bounds_max);
+			const u32 a1 = ARGS(1);
+			m_depth_bounds_max = (float&)a1;
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_DEPTH_BOUNDS_MAX:
 	{
-		const u32 value = ARGS(0);
-		m_depth_bounds_max = (float&)value;
-
-		if (m_set_depth_bounds)
-		{
-			DepthBoundsEXT(m_depth_bounds_min, m_depth_bounds_max);
-		}
+		m_set_depth_bounds = true;
+		const u32 a0 = ARGS(0);
+		m_depth_bounds_max = (float&)a0;
+		break;
 	}
-	break;
 
 	// Viewport
 	case NV4097_SET_VIEWPORT_HORIZONTAL:
@@ -739,8 +723,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		}
 
 		//LOG_NOTICE(RSX, "NV4097_SET_VIEWPORT_HORIZONTAL: x=%d, y=%d, w=%d, h=%d", m_viewport_x, m_viewport_y, m_viewport_w, m_viewport_h);
+		break;
 	}
-	break;
 
 	case NV4097_SET_VIEWPORT_VERTICAL:
 	{
@@ -749,124 +733,120 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		m_viewport_h = ARGS(0) >> 16;
 
 		//LOG_NOTICE(RSX, "NV4097_SET_VIEWPORT_VERTICAL: y=%d, h=%d", m_viewport_y, m_viewport_h);
+		break;
 	}
-	break;
 
 	case NV4097_SET_VIEWPORT_SCALE:
 	case NV4097_SET_VIEWPORT_OFFSET:
 	{
 		// Done in Vertex Shader
+		break;
 	}
-	break;
 
 	// Clipping
 	case NV4097_SET_CLIP_MIN:
 	{
-		const u32 value = ARGS(0);
-		m_clip_min = (float&)value;
-		DepthRangef(m_clip_min, m_clip_max);
+		const u32 a0 = ARGS(0);
+		const u32 a1 = ARGS(1);
+
+		m_set_clip = true;
+		m_clip_min = (float&)a0;
+		m_clip_max = (float&)a1;
+
+		//LOG_NOTICE(RSX, "NV4097_SET_CLIP_MIN: clip_min=%.01f, clip_max=%.01f", m_clip_min, m_clip_max);
+		break;
 	}
-	break;
 
 	case NV4097_SET_CLIP_MAX:
 	{
-		const u32 value = ARGS(0);
-		m_clip_max = (float&)value;
-		DepthRangef(m_clip_min, m_clip_max);
+		const u32 a0 = ARGS(0);
+
+		m_set_clip = true;
+		m_clip_max = (float&)a0;
+
+		//LOG_NOTICE(RSX, "NV4097_SET_CLIP_MAX: clip_max=%.01f", m_clip_max);
+		break;
 	}
-	break;
 
 	// Depth testing
 	case NV4097_SET_DEPTH_TEST_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_depth_test = ARGS(0) ? true : false;
+		break;
 	}
-	break;
-	
+
 	case NV4097_SET_DEPTH_FUNC:
 	{
-		const u32 value = ARGS(0);
-		// Sanity check here for invalid depth func 
-		if (value)
-		{
-			DepthFunc(value);
-		}
+		m_set_depth_func = true;
+		m_depth_func = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_DEPTH_MASK:
 	{
-		const u32 value = ARGS(0);
-		DepthMask(value);
+		m_set_depth_mask = true;
+		m_depth_mask = ARGS(0);
+		break;
 	}
-	break;
 
 	// Polygon mode/offset
 	case NV4097_SET_FRONT_POLYGON_MODE:
 	{
-		const u32 value = ARGS(0);
-		PolygonMode(cmd, value);
+		m_set_front_polygon_mode = true;
+		m_front_polygon_mode = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_BACK_POLYGON_MODE:
 	{
-		const u32 value = ARGS(0);
-		PolygonMode(cmd, value);
+		m_set_back_polygon_mode = true;
+		m_back_polygon_mode = ARGS(0);
+		break;
 	}
-	break;
-	
+
 	case NV4097_SET_POLY_OFFSET_FILL_ENABLE:
 	{
-		Enable(cmd, ARGS(0));
+		m_set_poly_offset_fill = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_POLY_OFFSET_LINE_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_poly_offset_line = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_POLY_OFFSET_POINT_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_poly_offset_point = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_POLYGON_OFFSET_SCALE_FACTOR:
 	{
-		Enable(NV4097_SET_DEPTH_TEST_ENABLE, 1);
-		
-		const u32 value = ARGS(0);
+		m_set_depth_test = true;
 		m_set_poly_offset_mode = true;
-		m_poly_offset_scale_factor = (float&)value;
+
+		const u32 a0 = ARGS(0);
+		m_poly_offset_scale_factor = (float&)a0;
 
 		if (count == 2)
 		{
-			const u32 value1 = ARGS(1);
-			m_poly_offset_bias = (float&)value1;
-			PolygonOffset(m_poly_offset_scale_factor, m_poly_offset_bias);
+			const u32 a1 = ARGS(1);
+			m_poly_offset_bias = (float&)a1;
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_POLYGON_OFFSET_BIAS:
 	{
-		Enable(NV4097_SET_DEPTH_TEST_ENABLE, 1);
+		m_set_depth_test = true;
+		m_set_poly_offset_mode = true;
 
-		const u32 value = ARGS(0);
-		m_poly_offset_bias = (float&)value;
-
-		if (m_set_poly_offset_mode)
-		{
-			PolygonOffset(m_poly_offset_scale_factor, m_poly_offset_bias);
-		}
+		const u32 a0 = ARGS(0);
+		m_poly_offset_bias = (float&)a0;
+		break;
 	}
-	break;
 
 	case NV4097_SET_CYLINDRICAL_WRAP:
 	{
@@ -874,8 +854,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_CYLINDRICAL_WRAP: 0x%x", ARGS(0));
 		}
+		break;
 	}
-	break;
 
 	// Clearing
 	case NV4097_CLEAR_ZCULL_SURFACE:
@@ -886,33 +866,42 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		if (a0 & 0x02) m_clear_surface_s = m_clear_s;
 
 		m_clear_surface_mask |= a0 & 0x3;
+		break;
 	}
-	break;
 
 	case NV4097_CLEAR_SURFACE:
 	{
-		const u32 mask = ARGS(0);
+		const u32 a0 = ARGS(0);
 
-		ClearSurface(mask);
+		if (a0 & 0x01) m_clear_surface_z = m_clear_z;
+		if (a0 & 0x02) m_clear_surface_s = m_clear_s;
+		if (a0 & 0x10) m_clear_surface_color_r = m_clear_color_r;
+		if (a0 & 0x20) m_clear_surface_color_g = m_clear_color_g;
+		if (a0 & 0x40) m_clear_surface_color_b = m_clear_color_b;
+		if (a0 & 0x80) m_clear_surface_color_a = m_clear_color_a;
+
+		m_clear_surface_mask = a0;
+		ExecCMD(NV4097_CLEAR_SURFACE);
+		break;
 	}
-	break;
 
 	case NV4097_SET_ZSTENCIL_CLEAR_VALUE:
 	{
-		const u32 value = ARGS(0);
-
-		ClearStencil(value & 0xff);
-		ClearDepth(value >> 8);
+		const u32 a0 = ARGS(0);
+		m_clear_s = a0 & 0xff;
+		m_clear_z = a0 >> 8;
+		break;
 	}
-	break;
 
 	case NV4097_SET_COLOR_CLEAR_VALUE:
 	{
 		const u32 color = ARGS(0);
-
-		ClearColor((color >> 24) & 0xff, (color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff);
+		m_clear_color_a = (color >> 24) & 0xff;
+		m_clear_color_r = (color >> 16) & 0xff;
+		m_clear_color_g = (color >> 8) & 0xff;
+		m_clear_color_b = color & 0xff;
+		break;
 	}
-	break;
 
 	case NV4097_SET_CLEAR_RECT_HORIZONTAL:
 	{
@@ -920,8 +909,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_CLEAR_RECT_HORIZONTAL: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_CLEAR_RECT_VERTICAL:
 	{
@@ -929,8 +918,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_CLEAR_RECT_VERTICAL: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	// Arrays
 	case NV4097_INLINE_ARRAY:
@@ -939,12 +928,12 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NNV4097_INLINE_ARRAY: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV4097_DRAW_ARRAYS:
 	{
-		for (u32 c=0; c<count; ++c)
+		for (u32 c = 0; c<count; ++c)
 		{
 			u32 ac = ARGS(c);
 			const u32 first = ac & 0xffffff;
@@ -961,15 +950,15 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 
 			m_draw_array_count += _count;
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_INDEX_ARRAY_ADDRESS:
 	{
 		m_indexed_array.m_addr = GetAddress(ARGS(0), ARGS(1) & 0xf);
 		m_indexed_array.m_type = ARGS(1) >> 4;
+		break;
 	}
-	break;
 
 	case NV4097_DRAW_INDEX_ARRAY:
 	{
@@ -985,24 +974,24 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 				u32 index;
 				switch(m_indexed_array.m_type)
 				{
-					case 0:
-					{
-						int pos = (int)m_indexed_array.m_data.size();
-						m_indexed_array.m_data.resize(m_indexed_array.m_data.size() + 4);
-						index = vm::read32(m_indexed_array.m_addr + i * 4);
-						*(u32*)&m_indexed_array.m_data[pos] = index;
-						//LOG_WARNING(RSX, "index 4: %d", *(u32*)&m_indexed_array.m_data[pos]);
-					}
+				case 0:
+				{
+					int pos = (int)m_indexed_array.m_data.size();
+					m_indexed_array.m_data.resize(m_indexed_array.m_data.size() + 4);
+					index = vm::read32(m_indexed_array.m_addr + i * 4);
+					*(u32*)&m_indexed_array.m_data[pos] = index;
+					//LOG_WARNING(RSX, "index 4: %d", *(u32*)&m_indexed_array.m_data[pos]);
+				}
 					break;
 
-					case 1:
-					{
-						int pos = (int)m_indexed_array.m_data.size();
-						m_indexed_array.m_data.resize(m_indexed_array.m_data.size() + 2);
-						index = vm::read16(m_indexed_array.m_addr + i * 2);
-						//LOG_WARNING(RSX, "index 2: %d", index);
-						*(u16*)&m_indexed_array.m_data[pos] = index;
-					}
+				case 1:
+				{
+					int pos = (int)m_indexed_array.m_data.size();
+					m_indexed_array.m_data.resize(m_indexed_array.m_data.size() + 2);
+					index = vm::read16(m_indexed_array.m_addr + i * 2);
+					//LOG_WARNING(RSX, "index 2: %d", index);
+					*(u16*)&m_indexed_array.m_data[pos] = index;
+				}
 					break;
 				}
 
@@ -1012,27 +1001,27 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 
 			m_indexed_array.m_count += _count;
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_VERTEX_DATA_BASE_OFFSET:
 	{
 		m_vertex_data_base_offset = ARGS(0);
 
-		if (count >= 2) 
+		if (count >= 2)
 		{
 			m_vertex_data_base_index = ARGS(1);
 		}
 
 		//LOG_WARNING(RSX, "NV4097_SET_VERTEX_DATA_BASE_OFFSET: 0x%x", m_vertex_data_base_offset);
+		break;
 	}
-	break;
 
 	case NV4097_SET_VERTEX_DATA_BASE_INDEX:
 	{
 		m_vertex_data_base_index = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_BEGIN_END:
 	{
@@ -1068,8 +1057,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			End();
 		}
+		break;
 	}
-	break;
 
 	// Shader
 	case NV4097_SET_SHADER_PROGRAM:
@@ -1080,21 +1069,21 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		m_cur_fragment_prog->offset = a0 & ~0x3;
 		m_cur_fragment_prog->addr = GetAddress(m_cur_fragment_prog->offset, (a0 & 0x3) - 1);
 		m_cur_fragment_prog->ctrl = 0x40;
+		break;
 	}
-	break;
 
 	case NV4097_SET_SHADER_CONTROL:
 	{
 		m_shader_ctrl = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SHADE_MODE:
 	{
-		const u32 value = ARGS(0);
-		ShadeModel(value);
+		m_set_shade_mode = true;
+		m_shade_mode = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SHADER_PACKER:
 	{
@@ -1110,8 +1099,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		m_shader_window_height = a0 & 0xfff;
 		m_shader_window_origin = (a0 >> 12) & 0xf;
 		m_shader_window_pixel_centers = a0 >> 16;
+		break;
 	}
-	break;
 
 	// Transform 
 	case NV4097_SET_TRANSFORM_PROGRAM_LOAD:
@@ -1129,20 +1118,20 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 				LOG_WARNING(RSX, "NV4097_SET_TRANSFORM_PROGRAM_LOAD: start = %d", start);
 			}
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_TRANSFORM_PROGRAM_START:
 	{
 		const u32 start = ARGS(0);
-		if (start) 
+		if (start)
 		{
 			LOG_WARNING(RSX, "NV4097_SET_TRANSFORM_PROGRAM_START: start = %d", start);
 		}
+		break;
 	}
-	break;
 
-	case_range(32, NV4097_SET_TRANSFORM_PROGRAM, 4)
+	case_range(32, NV4097_SET_TRANSFORM_PROGRAM, 4);
 	{
 		//LOG_WARNING(RSX, "NV4097_SET_TRANSFORM_PROGRAM[%d](%d)", index, count);
 
@@ -1156,11 +1145,11 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			m_cur_vertex_prog->data.push_back(ARGS(i));
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_TRANSFORM_TIMEOUT:
-
+	{
 		// TODO:
 		// (cmd)[1] = CELL_GCM_ENDIAN_SWAP((count) | ((registerCount) << 16)); \
 
@@ -1171,7 +1160,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		}
 
 		//m_cur_vertex_prog->Decompile();
-	break;
+		break;
+	}
 
 	case NV4097_SET_TRANSFORM_BRANCH_BITS:
 	{
@@ -1179,8 +1169,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_TRANSFORM_BRANCH_BITS: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_TRANSFORM_CONSTANT_LOAD:
 	{
@@ -1203,8 +1193,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 
 			//LOG_NOTICE(RSX, "NV4097_SET_TRANSFORM_CONSTANT_LOAD: [%d : %d] = (%f, %f, %f, %f)", i, id, c.x, c.y, c.z, c.w);
 		}
+		break;
 	}
-	break;
 
 	// Invalidation
 	case NV4097_INVALIDATE_L2:
@@ -1213,20 +1203,20 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_INVALIDATE_L2: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV4097_INVALIDATE_VERTEX_CACHE_FILE:
 	{
 		// Nothing to do here
+		break;
 	}
-	break;
 
 	case NV4097_INVALIDATE_VERTEX_FILE:
 	{
 		// Nothing to do here
+		break;
 	}
-	break;
 
 	case NV4097_INVALIDATE_ZCULL:
 	{
@@ -1234,190 +1224,165 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_INVALIDATE_ZCULL: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	// Logic Ops
 	case NV4097_SET_LOGIC_OP_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_logic_op = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_LOGIC_OP:
 	{
-		const u32 value = ARGS(0);
-		LogicOp(value);
+		m_logic_op = ARGS(0);
+		break;
 	}
-	break;
-	
+
 	// Dithering
 	case NV4097_SET_DITHER_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_dither = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	// Stencil testing
 	case NV4097_SET_STENCIL_TEST_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, ARGS(0));
+		m_set_stencil_test = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_TWO_SIDED_STENCIL_TEST_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, ARGS(0));
+		m_set_two_sided_stencil_test_enable = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_TWO_SIDE_LIGHT_EN:
 	{
-		const u32 value = ARGS(0);
-		LightModeli(value);
+		m_set_two_side_light_enable = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_STENCIL_MASK:
 	{
-		const u32 value = ARGS(0);
 		m_set_stencil_mask = true;
-		StencilMask(value);
+		m_stencil_mask = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_STENCIL_FUNC:
 	{
-		if (count == 3)
+		m_set_stencil_func = true;
+		m_stencil_func = ARGS(0);
+
+		if (count >= 2)
 		{
-			m_set_stencil_func = true;
-			m_stencil_func = ARGS(0);
+			m_set_stencil_func_ref = true;
 			m_stencil_func_ref = ARGS(1);
-			m_stencil_func_mask = ARGS(2);
-			StencilFunc(m_stencil_func, m_stencil_func_ref, m_stencil_func_mask);
+
+			if (count >= 3)
+			{
+				m_set_stencil_func_mask = true;
+				m_stencil_func_mask = ARGS(2);
+			}
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_STENCIL_FUNC_REF:
 	{
+		m_set_stencil_func_ref = true;
 		m_stencil_func_ref = ARGS(0);
-
-		if (m_set_stencil_func)
-		{
-			StencilFunc(m_stencil_func, m_stencil_func_ref, m_stencil_func_mask);
-		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_STENCIL_FUNC_MASK:
 	{
+		m_set_stencil_func_mask = true;
 		m_stencil_func_mask = ARGS(0);
-
-		if (m_set_stencil_func)
-		{
-			StencilFunc(m_stencil_func, m_stencil_func_ref, m_stencil_func_mask);
-		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_STENCIL_OP_FAIL:
 	{
-		if (count == 3)
+		m_set_stencil_fail = true;
+		m_stencil_fail = ARGS(0);
+
+		if (count >= 2)
 		{
-			m_set_stencil_op_fail = true;
-			m_stencil_fail = ARGS(0);
+			m_set_stencil_zfail = true;
 			m_stencil_zfail = ARGS(1);
-			m_stencil_zpass = ARGS(2);
-			StencilOp(m_stencil_fail, m_stencil_zfail, m_stencil_zpass);
+
+			if (count >= 3)
+			{
+				m_set_stencil_zpass = true;
+				m_stencil_zpass = ARGS(2);
+			}
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_BACK_STENCIL_MASK:
 	{
+		m_set_back_stencil_mask = true;
 		m_back_stencil_mask = ARGS(0);
-
-		StencilMaskSeparate(0, m_back_stencil_mask); // GL_BACK
-
-		if (m_set_stencil_mask)
-		{
-			StencilMaskSeparate(1, m_stencil_mask); // GL_FRONT
-		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_BACK_STENCIL_FUNC:
 	{
-		if (count == 3)
+		m_set_back_stencil_func = true;
+		m_back_stencil_func = ARGS(0);
+
+		if (count >= 2)
 		{
-			m_set_back_stencil_func = true;
-			m_back_stencil_func = ARGS(0);
+			m_set_back_stencil_func_ref = true;
 			m_back_stencil_func_ref = ARGS(1);
-			m_back_stencil_func_mask = ARGS(2);
-			StencilFuncSeparate(0, m_back_stencil_func, m_back_stencil_func_ref, m_back_stencil_func_mask); // GL_BACK
-			if (m_set_stencil_func)
+
+			if (count >= 3)
 			{
-				StencilFuncSeparate(1, m_stencil_func, m_stencil_func_ref, m_stencil_func_mask); // GL_FRONT
+				m_set_back_stencil_func_mask = true;
+				m_back_stencil_func_mask = ARGS(2);
 			}
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_BACK_STENCIL_FUNC_REF:
 	{
+		m_set_back_stencil_func_ref = true;
 		m_back_stencil_func_ref = ARGS(0);
-
-		if (m_set_back_stencil_func)
-		{
-			StencilFuncSeparate(0, m_back_stencil_func, m_back_stencil_func_ref, m_back_stencil_func_mask); // GL_BACK
-
-			if (m_set_stencil_func)
-			{
-				StencilFuncSeparate(1, m_stencil_func, m_stencil_func_ref, m_stencil_func_mask); // GL_FRONT
-			}
-		}
-
+		break;
 	}
-	break;
 
 	case NV4097_SET_BACK_STENCIL_FUNC_MASK:
 	{
+		m_set_back_stencil_func_mask = true;
 		m_back_stencil_func_mask = ARGS(0);
-
-		if (m_set_back_stencil_func)
-		{
-			StencilFuncSeparate(0, m_back_stencil_func, m_back_stencil_func_ref, m_back_stencil_func_mask); // GL_BACK
-
-			if (m_set_stencil_func)
-			{
-				StencilFuncSeparate(1, m_stencil_func, m_stencil_func_ref, m_stencil_func_mask); // GL_FRONT
-			}
-		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_BACK_STENCIL_OP_FAIL:
 	{
-		if (count == 3)
-		{
-			m_back_stencil_fail = ARGS(0);
-			m_back_stencil_zfail = ARGS(1);
-			m_back_stencil_zpass = ARGS(2);
-			StencilOpSeparate(0, m_back_stencil_fail, m_back_stencil_zfail, m_back_stencil_zpass); // GL_BACK
+		m_set_stencil_fail = true;
+		m_stencil_fail = ARGS(0);
 
-			if (m_set_stencil_op_fail)
+		if (count >= 2)
+		{
+			m_set_back_stencil_zfail = true;
+			m_back_stencil_zfail = ARGS(1);
+
+			if (count >= 3)
 			{
-				StencilOpSeparate(1, m_stencil_fail, m_stencil_zfail, m_stencil_zpass); // GL_FRONT
+				m_set_back_stencil_zpass = true;
+				m_back_stencil_zpass = ARGS(2);
 			}
 		}
-
+		break;
 	}
-	break;
 
 	case NV4097_SET_SCULL_CONTROL:
 	{
@@ -1425,31 +1390,30 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_SCULL_CONTROL: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	// Primitive restart index
 	case NV4097_SET_RESTART_INDEX_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_restart_index = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_RESTART_INDEX:
 	{
-		const u32 value = ARGS(0);
-		PrimitiveRestartIndex(value);
+		m_restart_index = ARGS(0);
+		break;
 	}
-	break;
 
 	// Point size
 	case NV4097_SET_POINT_SIZE:
 	{
-		const u32 value = ARGS(0);
-		PointSize((float&)value);
+		m_set_point_size = true;
+		const u32 a0 = ARGS(0);
+		m_point_size = (float&)a0;
+		break;
 	}
-	break;
 
 	// Point sprite
 	case NV4097_SET_POINT_PARAMS_ENABLE:
@@ -1458,57 +1422,48 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_POINT_PARAMS_ENABLE: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_POINT_SPRITE_CONTROL:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_point_sprite_control = ARGS(0) ? true : false;
 
 		// TODO:
 		//(cmd)[1] = CELL_GCM_ENDIAN_SWAP((enable) | ((rmode) << 1) | (texcoordMask));
+		break;
 	}
-	break;
 
 	// Lighting
 	case NV4097_SET_SPECULAR_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_specular = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	// Scissor
 	case NV4097_SET_SCISSOR_HORIZONTAL:
 	{
-		const u32 value = ARGS(0);
 		m_set_scissor_horizontal = true;
-		m_scissor_x = value & 0xffff;
-		m_scissor_w = value >> 16;
+		m_scissor_x = ARGS(0) & 0xffff;
+		m_scissor_w = ARGS(0) >> 16;
 
 		if (count == 2)
 		{
-			const u32 value1 = ARGS(1);
-			m_scissor_y = value1 & 0xffff;
-			m_scissor_h = value1 >> 16;
-			Scissor(m_scissor_x, m_scissor_y, m_scissor_w, m_scissor_h);
+			m_set_scissor_vertical = true;
+			m_scissor_y = ARGS(1) & 0xffff;
+			m_scissor_h = ARGS(1) >> 16;
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_SCISSOR_VERTICAL:
 	{
-		const u32 value = ARGS(0);
-		m_scissor_y = value & 0xffff;
-		m_scissor_h = value >> 16;
-
-		if (m_set_scissor_horizontal)
-		{
-			Scissor(m_scissor_x, m_scissor_y, m_scissor_w, m_scissor_h);
-		}
+		m_set_scissor_vertical = true;
+		m_scissor_y = ARGS(0) & 0xffff;
+		m_scissor_h = ARGS(0) >> 16;
+		break;
 	}
-	break;
 
 	// Depth/Color buffer usage 
 	case NV4097_SET_SURFACE_FORMAT:
@@ -1536,56 +1491,56 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		m_height = buffers[m_gcm_current_buffer].height;
 
 		NativeRescale((float)m_width, (float)m_height);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_COLOR_TARGET:
 	{
 		m_surface_color_target = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_COLOR_AOFFSET:
 	{
 		m_surface_offset_a = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_COLOR_BOFFSET:
 	{
 		m_surface_offset_b = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_COLOR_COFFSET:
 	{
 		m_surface_offset_c = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_COLOR_DOFFSET:
 	{
 		m_surface_offset_d = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_ZETA_OFFSET:
 	{
 		m_surface_offset_z = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_PITCH_A:
 	{
 		m_surface_pitch_a = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_PITCH_B:
 	{
 		m_surface_pitch_b = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_PITCH_C:
 	{
@@ -1599,8 +1554,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		m_surface_pitch_d = ARGS(1);
 		m_surface_offset_c = ARGS(2);
 		m_surface_offset_d = ARGS(3);
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_PITCH_D:
 	{
@@ -1611,8 +1566,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 			LOG_ERROR(RSX, "NV4097_SET_SURFACE_PITCH_D: Bad count (%d)", count);
 			break;
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_PITCH_Z:
 	{
@@ -1623,8 +1578,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 			LOG_ERROR(RSX, "NV4097_SET_SURFACE_PITCH_Z: Bad count (%d)", count);
 			break;
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_CONTEXT_DMA_COLOR_A:
 	{
@@ -1636,15 +1591,15 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 			LOG_ERROR(RSX, "NV4097_SET_CONTEXT_DMA_COLOR_A: Bad count (%d)", count);
 			break;
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_CONTEXT_DMA_COLOR_B:
 	{
 		m_set_context_dma_color_b = true;
 		m_context_dma_color_b = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_CONTEXT_DMA_COLOR_C:
 	{
@@ -1656,8 +1611,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 			m_set_context_dma_color_d = true;
 			m_context_dma_color_d = ARGS(1);
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_CONTEXT_DMA_COLOR_D:
 	{
@@ -1665,15 +1620,15 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_CONTEXT_DMA_COLOR_D: 0x%x", ARGS(0));
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_CONTEXT_DMA_ZETA:
 	{
 		m_set_context_dma_z = true;
 		m_context_dma_z = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_CONTEXT_DMA_SEMAPHORE:
 	{
@@ -1681,8 +1636,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_CONTEXT_DMA_SEMAPHORE: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_CONTEXT_DMA_NOTIFIES:
 	{
@@ -1690,8 +1645,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_CONTEXT_DMA_NOTIFIES: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_CLIP_HORIZONTAL:
 	{
@@ -1708,8 +1663,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 			m_surface_clip_y = a1;
 			m_surface_clip_h = a1 >> 16;
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_SURFACE_CLIP_VERTICAL:
 	{
@@ -1717,8 +1672,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		m_set_surface_clip_vertical = true;
 		m_surface_clip_y = a0;
 		m_surface_clip_h = a0 >> 16;
+		break;
 	}
-	break;
 
 	// Anti-aliasing
 	case NV4097_SET_ANTI_ALIASING_CONTROL:
@@ -1729,78 +1684,76 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		const u8 alphaToCoverage = (a0 >> 4) & 0xf;
 		const u8 alphaToOne = (a0 >> 8) & 0xf;
 		const u16 sampleMask = a0 >> 16;
-		
+
 		if (a0)
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_ANTI_ALIASING_CONTROL: 0x%x", a0);
 		}
+		break;
 	}
-	break;
 
 	// Line/Polygon smoothing
 	case NV4097_SET_LINE_SMOOTH_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_line_smooth = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_POLY_SMOOTH_ENABLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_poly_smooth = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	// Line width
 	case NV4097_SET_LINE_WIDTH:
 	{
-		const u32 value = ARGS(0);
-		LineWidth((float)value / 8.0f);
+		m_set_line_width = true;
+		const u32 a0 = ARGS(0);
+		m_line_width = (float)a0 / 8.0f;
+		break;
 	}
-	break;
 
 	// Line/Polygon stipple
 	case NV4097_SET_LINE_STIPPLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_line_stipple = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_LINE_STIPPLE_PATTERN:
 	{
-		const u32 value = ARGS(0);
-		LineStipple(value & 0xffff, value >> 16);
+		m_set_line_stipple = true;
+		const u32 a0 = ARGS(0);
+		m_line_stipple_factor = a0 & 0xffff;
+		m_line_stipple_pattern = a0 >> 16;
+		break;
 	}
-	break;
 
 	case NV4097_SET_POLYGON_STIPPLE:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		m_set_polygon_stipple = ARGS(0) ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_POLYGON_STIPPLE_PATTERN:
 	{
-		u32 pattern[32];
 		for (u32 i = 0; i < 32; i++)
 		{
-			pattern[i] = ARGS(i);
-			PolygonStipple(pattern[i]);
+			m_polygon_stipple_pattern[i] = ARGS(i);
 		}
+		break;
 	}
-	break;
 
 	// Zcull
 	case NV4097_SET_ZCULL_EN:
 	{
-		const u32 value = ARGS(0);
-		Enable(NV4097_SET_DEPTH_TEST_ENABLE, value & 0x1);
-		Enable(NV4097_SET_STENCIL_TEST_ENABLE, value & 0x2);
+		const u32 a0 = ARGS(0);
+
+		m_set_depth_test = a0 & 0x1 ? true : false;
+		m_set_stencil_test = a0 & 0x2 ? true : false;
+		break;
 	}
-	break;
 
 	case NV4097_SET_ZCULL_CONTROL0:
 	{
@@ -1808,17 +1761,17 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_ZCULL_CONTROL0: 0x%x", value);
 		}
+		break;
 	}
-	break;
-	
+
 	case NV4097_SET_ZCULL_CONTROL1:
 	{
 		if (u32 value = ARGS(0))
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_ZCULL_CONTROL1: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV4097_SET_ZCULL_STATS_ENABLE:
 	{
@@ -1826,8 +1779,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_SET_ZCULL_STATS_ENABLE: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV4097_ZCULL_SYNC:
 	{
@@ -1835,8 +1788,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV4097_ZCULL_SYNC: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	// Reports
 	case NV4097_GET_REPORT:
@@ -1855,12 +1808,12 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		case CELL_GCM_ZCULL_STATS3:
 			value = 0;
 			LOG_WARNING(RSX, "NV4097_GET_REPORT: Unimplemented type %d", type);
-		break;
+			break;
 
 		default:
 			value = 0;
 			LOG_ERROR(RSX, "NV4097_GET_REPORT: Bad type %d", type);
-		break;
+			break;
 		}
 
 		// Get timestamp, and convert it from microseconds to nanoseconds
@@ -1870,14 +1823,14 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		vm::write64(m_local_mem_addr + offset + 0x0, timestamp);
 		vm::write32(m_local_mem_addr + offset + 0x8, value);
 		vm::write32(m_local_mem_addr + offset + 0xc, 0);
+		break;
 	}
-	break;
 
 	case NV4097_CLEAR_REPORT_VALUE:
 	{
 		const u32 type = ARGS(0);
 
-		switch(type)
+		switch (type)
 		{
 		case CELL_GCM_ZPASS_PIXEL_CNT:
 			LOG_WARNING(RSX, "TODO: NV4097_CLEAR_REPORT_VALUE: ZPASS_PIXEL_CNT");
@@ -1888,33 +1841,41 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		default:
 			LOG_ERROR(RSX, "NV4097_CLEAR_REPORT_VALUE: Bad type: %d", type);
 			break;
-		}	
+		}
+		break;
 	}
-	break;
 
 	// Clip Plane
 	case NV4097_SET_USER_CLIP_PLANE_CONTROL:
 	{
-		const u32 value = ARGS(0);
-		Enable(cmd, value);
+		const u32 a0 = ARGS(0);
+		m_set_clip_plane = true;
+		m_clip_plane_0 = (a0 & 0xf) ? true : false;
+		m_clip_plane_1 = ((a0 >> 4)) & 0xf ? true : false;
+		m_clip_plane_2 = ((a0 >> 8)) & 0xf ? true : false;
+		m_clip_plane_3 = ((a0 >> 12)) & 0xf ? true : false;
+		m_clip_plane_4 = ((a0 >> 16)) & 0xf ? true : false;
+		m_clip_plane_5 = (a0 >> 20) ? true : false;
+		break;
 	}
-	break;
 
 	// Fog
 	case NV4097_SET_FOG_MODE:
 	{
-		const u32 value = ARGS(0);
-		Fogi(value);
+		m_set_fog_mode = true;
+		m_fog_mode = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV4097_SET_FOG_PARAMS:
 	{
-		const u32 start = ARGS(0);
-		const u32 end = ARGS(1);
-		Fogf((float&)start, (float&)end);
+		m_set_fog_params = true;
+		const u32 a0 = ARGS(0);
+		const u32 a1 = ARGS(1);
+		m_fog_param0 = (float&)a0;
+		m_fog_param1 = (float&)a1;
+		break;
 	}
-	break;
 
 	// Zmin_max
 	case NV4097_SET_ZMIN_MAX_CONTROL:
@@ -1924,8 +1885,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		const u8 cullIgnoreW = (ARGS(0) >> 8) & 0xf;
 
 		LOG_WARNING(RSX, "TODO: NV4097_SET_ZMIN_MAX_CONTROL: cullNearFarEnable=%d, zclampEnable=%d, cullIgnoreW=%d", cullNearFarEnable, zclampEnable, cullIgnoreW);
+		break;
 	}
-	break;
 
 	case NV4097_SET_WINDOW_OFFSET:
 	{
@@ -1933,16 +1894,16 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		const u16 y = ARGS(0) >> 16;
 
 		LOG_WARNING(RSX, "TODO: NV4097_SET_WINDOW_OFFSET: x=%d, y=%d", x, y);
+		break;
 	}
-	break;
 
 	case NV4097_SET_FREQUENCY_DIVIDER_OPERATION:
 	{
 		m_set_frequency_divider_operation = ARGS(0);
-		
+
 		LOG_WARNING(RSX, "TODO: NV4097_SET_FREQUENCY_DIVIDER_OPERATION: %d", m_set_frequency_divider_operation);
+		break;
 	}
-	break;
 
 	case NV4097_SET_RENDER_ENABLE:
 	{
@@ -1950,16 +1911,16 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		const u8 mode = ARGS(0) >> 24;
 
 		LOG_WARNING(RSX, "TODO: NV4097_SET_RENDER_ENABLE: Offset=0x%06x, Mode=0x%x", offset, mode);
+		break;
 	}
-	break;
 
 	case NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE:
 	{
 		const u32 enable = ARGS(0);
 
 		LOG_WARNING(RSX, "TODO: NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE: %d", enable);
+		break;
 	}
-	break;
 
 	// NV0039
 	case NV0039_SET_CONTEXT_DMA_BUFFER_IN:
@@ -1968,8 +1929,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		const u32 dstContext = ARGS(1);
 		m_context_dma_buffer_in_src = srcContext;
 		m_context_dma_buffer_in_dst = dstContext;
+		break;
 	}
-	break;
 
 	case NV0039_OFFSET_IN:
 	{
@@ -1984,7 +1945,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		const u32 notify = ARGS(7);
 
 		// The existing GCM commands use only the value 0x1 for inFormat and outFormat
-		if (inFormat != 0x01 || outFormat != 0x01) 
+		if (inFormat != 0x01 || outFormat != 0x01)
 		{
 			LOG_ERROR(RSX, "NV0039_OFFSET_IN: Unsupported format: inFormat=%d, outFormat=%d", inFormat, outFormat);
 		}
@@ -1998,8 +1959,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 			LOG_ERROR(RSX, "NV0039_OFFSET_IN: bad offset(in=0x%x, out=0x%x), pitch(in=0x%x, out=0x%x), line(len=0x%x, cnt=0x%x), fmt(in=0x%x, out=0x%x), notify=0x%x",
 				inOffset, outOffset, inPitch, outPitch, lineLength, lineCount, inFormat, outFormat, notify);
 		}
+		break;
 	}
-	break;
 
 	case NV0039_OFFSET_OUT: // [E : RSXThread]: TODO: unknown/illegal method [0x00002310](0x0)
 	{
@@ -2012,8 +1973,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_ERROR(RSX, "TODO: NV0039_OFFSET_OUT: offset=0x%x", offset);
 		}
+		break;
 	}
-	break;
 
 	case NV0039_PITCH_IN:
 	{
@@ -2021,8 +1982,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV0039_PITCH_IN: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV0039_BUFFER_NOTIFY:
 	{
@@ -2030,29 +1991,29 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV0039_BUFFER_NOTIFY: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	// NV3062
 	case NV3062_SET_CONTEXT_DMA_IMAGE_DESTIN:
 	{
 		m_context_dma_img_dst = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV3062_SET_OFFSET_DESTIN:
 	{
 		m_dst_offset = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV3062_SET_COLOR_FORMAT:
 	{
 		m_color_format = ARGS(0);
 		m_color_format_src_pitch = ARGS(1);
 		m_color_format_dst_pitch = ARGS(1) >> 16;
+		break;
 	}
-	break;
 
 	// NV309E
 	case NV309E_SET_CONTEXT_DMA_IMAGE:
@@ -2061,8 +2022,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_WARNING(RSX, "TODO: NV309E_SET_CONTEXT_DMA_IMAGE: 0x%x", value);
 		}
+		break;
 	}
-	break;
 
 	case NV309E_SET_FORMAT:
 	{
@@ -2072,8 +2033,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		const u32 offset = ARGS(1);
 
 		LOG_WARNING(RSX, "TODO: NV309E_SET_FORMAT: Format:0x%x, Width:%d, Height:%d, Offset:0x%x", format, width, height, offset);
+		break;
 	}
-	break;
 
 	// NV308A
 	case NV308A_POINT:
@@ -2081,8 +2042,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		const u32 a0 = ARGS(0);
 		m_point_x = a0 & 0xffff;
 		m_point_y = a0 >> 16;
+		break;
 	}
-	break;
 
 	case NV308A_COLOR:
 	{
@@ -2125,15 +2086,15 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		m_fragment_constants.push_back(c);
 
 		//LOG_WARNING(RSX, "NV308A_COLOR: [%d]: %f, %f, %f, %f", c.id, c.x, c.y, c.z, c.w);
+		break;
 	}
-	break;
 
 	// NV3089
 	case NV3089_SET_CONTEXT_DMA_IMAGE:
 	{
 		m_context_dma_img_src = ARGS(0);
+		break;
 	}
-	break;
 
 	case NV3089_SET_CONTEXT_SURFACE:
 	{
@@ -2141,8 +2102,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			LOG_ERROR(RSX, "NV3089_SET_CONTEXT_SURFACE: Unsupported surface (0x%x)", ARGS(0));
 		}
+		break;
 	}
-	break;
 
 	case NV3089_IMAGE_IN_SIZE:
 	{
@@ -2174,8 +2135,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 				//(u32&)pixels_dst[dst_offset] = (u32&)pixels_src[src_offset];
 			}
 		}
+		break;
 	}
-	break;
 
 	case NV3089_SET_COLOR_CONVERSION:
 	{
@@ -2194,8 +2155,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		m_color_conv_dtdy = ARGS(8);
 
 		LOG_WARNING(RSX, "TODO: NV3089_SET_COLOR_CONVERSION");
+		break;
 	}
-	break;
 
 	case GCM_SET_USER_COMMAND:
 	{
@@ -2205,8 +2166,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 		{
 			cb(CPU, cause);
 		});
+		break;
 	}
-	break;
 
 	// Note: What is this? NV4097 offsets?
 	case 0x000002c8:
@@ -2216,7 +2177,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 	case 0x000002e8:
 	case 0x000002f0:
 	case 0x000002f8:
-	break;
+		break;
 
 	// The existing GCM commands don't use any of the following NV4097 / NV0039 / NV3062 / NV309E / NV308A / NV3089 methods
 	case NV4097_SET_WINDOW_CLIP_TYPE:
@@ -2224,8 +2185,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 	case NV4097_SET_WINDOW_CLIP_VERTICAL:
 	{
 		LOG_WARNING(RSX, "Unused NV4097 method 0x%x detected!", cmd);
+		break;
 	}
-	break;
 
 	case NV0039_SET_CONTEXT_DMA_BUFFER_OUT:
 	case NV0039_PITCH_OUT:
@@ -2236,8 +2197,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 	case NV0039_SET_CONTEXT_DMA_NOTIFIES:
 	{
 		LOG_WARNING(RSX, "Unused NV0039 method 0x%x detected!", cmd);
+		break;
 	}
-	break;
 
 	case NV3062_SET_OBJECT:
 	case NV3062_SET_CONTEXT_DMA_NOTIFIES:
@@ -2246,8 +2207,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 	case NV3062_SET_OFFSET_SOURCE:
 	{
 		LOG_WARNING(RSX, "Unused NV3062 method 0x%x detected!", cmd);
+		break;
 	}
-	break;
 
 	case NV308A_SET_OBJECT:
 	case NV308A_SET_CONTEXT_DMA_NOTIFIES:
@@ -2265,16 +2226,16 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 	case NV308A_SIZE_IN:
 	{
 		LOG_WARNING(RSX, "Unused NV308A method 0x%x detected!", cmd);
+		break;
 	}
-	break;
 
 	case NV309E_SET_OBJECT:
 	case NV309E_SET_CONTEXT_DMA_NOTIFIES:
 	case NV309E_SET_OFFSET:
 	{
 		LOG_WARNING(RSX, "Unused NV309E method 0x%x detected!", cmd);
+		break;
 	}
-	break;
 
 	case NV3089_SET_OBJECT:
 	case NV3089_SET_CONTEXT_DMA_NOTIFIES:
@@ -2295,20 +2256,21 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 	case NV3089_IMAGE_IN:
 	{
 		LOG_WARNING(RSX, "Unused NV3089 methods 0x%x detected!", cmd);
+		break;
 	}
-	break;
 
 	default:
 	{
 		std::string log = GetMethodName(cmd);
 		log += "(";
-		for (u32 i=0; i<count; ++i) {
+		for (u32 i = 0; i < count; ++i)
+		{
 			log += (i ? ", " : "") + fmt::Format("0x%x", ARGS(i));
 		}
 		log += ")";
 		LOG_ERROR(RSX, "TODO: %s", log.c_str());
+		break;
 	}
-	break;
 	}
 }
 
@@ -2328,7 +2290,7 @@ void RSXThread::End()
 	{
 		vdata.data.clear();
 	}
-	
+
 	m_indexed_array.Reset();
 	m_fragment_constants.clear();
 	m_transform_constants.clear();
@@ -2371,7 +2333,7 @@ void RSXThread::Task()
 				continue;
 			}
 
-			std::this_thread::sleep_for (std::chrono::milliseconds(1)); // hack
+			std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack
 		}
 	});
 
@@ -2384,7 +2346,7 @@ void RSXThread::Task()
 		}
 		std::lock_guard<std::mutex> lock(m_cs_main);
 
-		inc=1;
+		inc = 1;
 
 		u32 get = m_ctrl->get.read_sync();
 		u32 put = m_ctrl->put.read_sync();
@@ -2405,12 +2367,12 @@ void RSXThread::Task()
 
 		const u32 cmd = ReadIO32(get);
 		const u32 count = (cmd >> 18) & 0x7ff;
-		
+
 		if (Ini.RSXLogging.GetValue())
 		{
 			LOG_NOTICE(Log::RSX, "%s (cmd=0x%x)", GetMethodName(cmd & 0xffff).c_str(), cmd);
 		}
-
+	
 		if (cmd & CELL_GCM_METHOD_FLAG_JUMP)
 		{
 			u32 offs = cmd & 0x1fffffff;
@@ -2418,7 +2380,6 @@ void RSXThread::Task()
 			m_ctrl->get.exchange(be_t<u32>::make(offs));
 			continue;
 		}
-
 		if (cmd & CELL_GCM_METHOD_FLAG_CALL)
 		{
 			m_call_stack.push(get + 4);
@@ -2427,7 +2388,6 @@ void RSXThread::Task()
 			m_ctrl->get.exchange(be_t<u32>::make(offs));
 			continue;
 		}
-
 		if (cmd == CELL_GCM_METHOD_FLAG_RETURN)
 		{
 			u32 get = m_call_stack.top();
@@ -2436,7 +2396,6 @@ void RSXThread::Task()
 			m_ctrl->get.exchange(be_t<u32>::make(get));
 			continue;
 		}
-
 		if (cmd & CELL_GCM_METHOD_FLAG_NON_INCREMENT)
 		{
 			//LOG_WARNING(RSX, "rsx non increment cmd! 0x%x", cmd);
diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h
index c0f412f648..9732c8a418 100644
--- a/rpcs3/Emu/RSX/RSXThread.h
+++ b/rpcs3/Emu/RSX/RSXThread.h
@@ -90,7 +90,7 @@ struct RSXTransformConstant
 	}
 };
 
-class RSXThread  : public ThreadBase
+class RSXThread : public ThreadBase
 {
 public:
 	static const uint m_textures_count = 16;
@@ -498,7 +498,7 @@ protected:
 		m_front_face = 0x0901; // GL_CCW
 		m_cull_face = 0x0405; // GL_BACK
 		m_alpha_func = 0x0207; // GL_ALWAYS
-		m_alpha_ref = 0.0; 
+		m_alpha_ref = 0.0f;
 		m_logic_op = 0x1503; // GL_COPY
 		m_shade_mode = 0x1D01; // GL_SMOOTH
 		m_depth_mask = 1;
@@ -523,7 +523,7 @@ protected:
 		m_vertex_data_base_index = 0;
 
 		// Construct Stipple Pattern
-		for (size_t i = 0; i < 32; i++) 
+		for (size_t i = 0; i < 32; i++)
 		{
 			m_polygon_stipple_pattern[i] = 0xFFFFFFFF;
 		}
@@ -629,54 +629,20 @@ protected:
 	u32 OutOfArgsCount(const uint x, const u32 cmd, const u32 count, const u32 args_addr);
 	void DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const u32 count);
 	void NativeRescale(float width, float height);
-	
+
 	virtual void OnInit() = 0;
 	virtual void OnInitThread() = 0;
 	virtual void OnExitThread() = 0;
 	virtual void OnReset() = 0;
 	virtual void ExecCMD() = 0;
-	virtual void Enable(u32 cmd, u32 enable) = 0;
-	virtual void ClearColor(u32 a, u32 r, u32 g, u32 b) = 0;
-	virtual void ClearStencil(u32 stencil) = 0;
-	virtual void ClearDepth(u32 depth) = 0;
-	virtual void ClearSurface(u32 mask) = 0;
-	virtual void ColorMask(bool a, bool r, bool g, bool b) = 0;
-	virtual void AlphaFunc(u32 func, float ref) = 0;
-	virtual void DepthFunc(u32 func) = 0;
-	virtual void DepthMask(u32 flag) = 0;
-	virtual void PolygonMode(u32 face, u32 mode) = 0;
-	virtual void PointSize(float size) = 0;
-	virtual void LogicOp(u32 opcode) = 0;
-	virtual void LineWidth(float width) = 0;
-	virtual void LineStipple(u16 factor, u16 pattern) = 0;
-	virtual void PolygonStipple(u32 pattern) = 0;
-	virtual void PrimitiveRestartIndex(u32 index) = 0;
-	virtual void CullFace(u32 mode) = 0;
-	virtual void FrontFace(u32 mode) = 0;
-	virtual void Fogi(u32 mode) = 0;
-	virtual void Fogf(float start, float end) = 0;
-	virtual void PolygonOffset(float factor, float bias) = 0;
-	virtual void DepthRangef(float min, float max) = 0;
-	virtual void BlendEquationSeparate(u16 rgb, u16 a) = 0;
-	virtual void BlendFuncSeparate(u16 srcRGB, u16 dstRGB, u16 srcAlpha, u16 dstAlpha) = 0;
-	virtual void BlendColor(u8 r, u8 g, u8 b, u8 a) = 0;
-	virtual void LightModeli(u32 enable) = 0;
-	virtual void ShadeModel(u32 mode) = 0;
-	virtual void DepthBoundsEXT(float min, float max) = 0;
-	virtual void Scissor(u16 x, u16 y, u16 width, u16 height) = 0;
-	virtual void StencilOp(u32 fail, u32 zfail, u32 zpass) = 0;
-	virtual void StencilMask(u32 mask) = 0;
-	virtual void StencilFunc(u32 func, u32 ref, u32 mask) = 0;
-	virtual void StencilOpSeparate(u32 mode, u32 fail, u32 zfail, u32 zpass) = 0;
-	virtual void StencilMaskSeparate(u32 mode, u32 mask) = 0;
-	virtual void StencilFuncSeparate(u32 mode, u32 func, u32 ref, u32 mask) = 0;
+	virtual void ExecCMD(u32 cmd) = 0;
 	virtual void Flip() = 0;
 
 	void LoadVertexData(u32 first, u32 count)
 	{
 		for (u32 i = 0; i < m_vertex_count; ++i)
 		{
-			if(!m_vertex_data[i].IsEnabled()) continue;
+			if (!m_vertex_data[i].IsEnabled()) continue;
 
 			m_vertex_data[i].Load(first, count, m_vertex_data_base_offset, m_vertex_data_base_index);
 		}

From 61a5459ccb48a25e499e1a6a82df64c3ac47e60e Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Sat, 31 Jan 2015 19:44:26 +0300
Subject: [PATCH 63/70] TLS for ARMv7 threads

---
 rpcs3/Emu/ARMv7/ARMv7Context.h               |  2 +
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp         | 14 ++--
 rpcs3/Emu/ARMv7/ARMv7Thread.cpp              | 69 ++++++++++++++++++++
 rpcs3/Emu/ARMv7/ARMv7Thread.h                |  1 +
 rpcs3/Emu/Cell/PPUThread.cpp                 | 27 +-------
 rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp | 28 +++-----
 rpcs3/Emu/System.h                           | 22 +++----
 rpcs3/Loader/ELF32.cpp                       | 11 +++-
 rpcs3/Loader/ELF64.cpp                       |  5 +-
 9 files changed, 115 insertions(+), 64 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index 962f5dcc19..1316a26786 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -111,6 +111,8 @@ struct ARMv7Context
 
 	} ITSTATE;
 
+	u32 TLS;
+
 	u32 R_ADDR;
 	u64 R_DATA;
 
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index ea01bcecc9..78c17f4fda 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -336,15 +336,17 @@ void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7
 
 	if (ConditionPassed(context, cond))
 	{
-		if (cp == 15 && opc1 == 0 && cn == 13 && cm == 0 && opc2 == 3)
-		{
-			LOG_ERROR(ARMv7, "TODO: TLS requested");
+		// APSR flags are written if t = 15
 
-			if (t < 15)
+		if (t < 15 && cp == 15 && opc1 == 0 && cn == 13 && cm == 0 && opc2 == 3)
+		{
+			if (!context.TLS)
 			{
-				context.GPR[t] = 0;
-				return;
+				throw "TLS not initialized";
 			}
+
+			context.GPR[t] = context.TLS;
+			return;
 		}
 
 		throw fmt::format("Bad instruction: mrc p%d,%d,r%d,c%d,c%d,%d", cp, opc1, t, cn, cm, opc2);
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
index 0b9710ffe2..3495376c79 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
@@ -30,6 +30,69 @@ void ARMv7Context::fast_call(u32 addr)
 	return thread.FastCall(addr);
 }
 
+#define TLS_MAX 128
+
+u32 g_armv7_tls_start;
+
+std::array<std::atomic<u32>, TLS_MAX> g_armv7_tls_owners;
+
+void armv7_init_tls()
+{
+	g_armv7_tls_start = Emu.GetTLSMemsz() ? vm::cast(Memory.PSV.RAM.AllocAlign(Emu.GetTLSMemsz() * TLS_MAX, 4096)) : 0;
+
+	for (auto& v : g_armv7_tls_owners)
+	{
+		v.store(0, std::memory_order_relaxed);
+	}
+}
+
+u32 armv7_get_tls(u32 thread)
+{
+	if (!Emu.GetTLSMemsz())
+	{
+		return 0;
+	}
+
+	for (u32 i = 0; i < TLS_MAX; i++)
+	{
+		if (g_armv7_tls_owners[i] == thread)
+		{
+			return g_armv7_tls_start + i * Emu.GetTLSMemsz(); // if already initialized, return TLS address
+		}
+	}
+
+	for (u32 i = 0; i < TLS_MAX; i++)
+	{
+		u32 old = 0;
+		if (g_armv7_tls_owners[i].compare_exchange_strong(old, thread))
+		{
+			const u32 addr = g_armv7_tls_start + i * Emu.GetTLSMemsz(); // get TLS address
+			memset(vm::get_ptr(addr), 0, Emu.GetTLSMemsz()); // fill TLS area with zeros
+			memcpy(vm::get_ptr(addr), vm::get_ptr(Emu.GetTLSAddr()), Emu.GetTLSFilesz()); // initialize from TLS image
+			return addr;
+		}
+	}
+
+	throw "Out of TLS memory";
+}
+
+void armv7_free_tls(u32 thread)
+{
+	if (!Emu.GetTLSMemsz())
+	{
+		return;
+	}
+
+	for (auto& v : g_armv7_tls_owners)
+	{
+		u32 old = thread;
+		if (v.compare_exchange_strong(old, 0))
+		{
+			return;
+		}
+	}
+}
+
 ARMv7Thread::ARMv7Thread()
 	: CPUThread(CPU_THREAD_ARMv7)
 	, context(*this)
@@ -39,6 +102,11 @@ ARMv7Thread::ARMv7Thread()
 {
 }
 
+ARMv7Thread::~ARMv7Thread()
+{
+	armv7_free_tls(GetId());
+}
+
 void ARMv7Thread::InitRegs()
 {
 	memset(context.GPR, 0, sizeof(context.GPR[0]) * 15);
@@ -47,6 +115,7 @@ void ARMv7Thread::InitRegs()
 	context.ISET = Thumb;
 	context.ITSTATE.IT = 0;
 	context.SP = m_stack_addr + m_stack_size;
+	context.TLS = armv7_get_tls(GetId());
 }
 
 void ARMv7Thread::InitStack()
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.h b/rpcs3/Emu/ARMv7/ARMv7Thread.h
index 2dd26772e7..c806f4b6c4 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.h
@@ -12,6 +12,7 @@ public:
 	//const char* m_last_instr_name;
 
 	ARMv7Thread();
+	~ARMv7Thread();
 
 	//void update_code(const u32 address)
 	//{
diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp
index 9a221b00c6..e064a54feb 100644
--- a/rpcs3/Emu/Cell/PPUThread.cpp
+++ b/rpcs3/Emu/Cell/PPUThread.cpp
@@ -55,7 +55,7 @@ void PPUThread::DoReset()
 	XER.XER     = 0;
 	FPSCR.FPSCR = 0;
 	VSCR.VSCR   = 0;
-        VRSAVE      = 0;
+	VRSAVE      = 0;
 
 	cycle = 0;
 }
@@ -65,33 +65,8 @@ void PPUThread::InitRegs()
 	const u32 pc = entry ? vm::read32(entry) : 0;
 	const u32 rtoc = entry ? vm::read32(entry + 4) : 0;
 
-	//ConLog.Write("entry = 0x%x", entry);
-	//ConLog.Write("rtoc = 0x%x", rtoc);
-
 	SetPc(pc);
 
-	/*
-	const s32 thread_num = Emu.GetCPU().GetThreadNumById(GetType(), GetId());
-
-	if(thread_num < 0)
-	{
-		LOG_ERROR(PPU, "GetThreadNumById failed.");
-		Emu.Pause();
-		return;
-	}
-	*/
-
-	/*
-	const s32 tls_size = Emu.GetTLSFilesz() * thread_num;
-
-	if(tls_size >= Emu.GetTLSMemsz())
-	{
-		LOG_ERROR(PPU, "Out of TLS memory.");
-		Emu.Pause();
-		return;
-	}
-	*/
-
 	GPR[1] = align(m_stack_addr + m_stack_size, 0x200) - 0x200;
 	GPR[2] = rtoc;
 	//GPR[11] = entry;
diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
index 063655cc72..2a8d3cc699 100644
--- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
@@ -23,12 +23,10 @@
 
 Module *sysPrxForUser = nullptr;
 
-u32 g_tls_size; // size of every thread's storage
-u32 g_tls_start; // start of TLS memory area
-u32 g_tls_image_addr; // address of TLS initialization area
-u32 g_tls_image_size; // size of TLS initialization area
+#define TLS_MAX 128
+
+u32 g_tls_start; // start of TLS memory area
 
-const u32 TLS_MAX = 256;
 std::array<std::atomic<u32>, TLS_MAX> g_tls_owners;
 
 void sys_initialize_tls()
@@ -40,19 +38,16 @@ u32 ppu_get_tls(u32 thread)
 {
 	if (!g_tls_start)
 	{
-		g_tls_size = vm::cast(Emu.GetTLSMemsz(), "Emu.GetTLSMemsz"); // (not an address for vm::cast, but fine)
-		g_tls_start = vm::cast(Memory.Alloc(g_tls_size * TLS_MAX, 4096)); // memory for up to TLS_MAX threads
-		g_tls_image_addr = vm::cast(Emu.GetTLSAddr(), "Emu.GetTLSAddr");
-		g_tls_image_size = vm::cast(Emu.GetTLSFilesz(), "Emu.GetTLSFilesz");
-
-		sysPrxForUser->Warning("TLS initialized (g_tls_size=0x%x, g_tls_start=0x%x, g_tls_image_addr=0x%x, g_tls_image_size=0x%x)", g_tls_size, g_tls_start, g_tls_image_addr, g_tls_image_size);
+		g_tls_start = vm::cast(Memory.MainMem.AllocAlign(Emu.GetTLSMemsz() * TLS_MAX, 4096)); // memory for up to TLS_MAX threads
+		sysPrxForUser->Notice("Thread Local Storage initialized (g_tls_start=0x%x, size = 0x%x)\n*** TLS segment addr: 0x%08x\n*** TLS segment size: 0x%08x",
+			g_tls_start, Emu.GetTLSMemsz(), Emu.GetTLSAddr(), Emu.GetTLSFilesz());
 	}
 	
 	for (u32 i = 0; i < TLS_MAX; i++)
 	{
 		if (g_tls_owners[i] == thread)
 		{
-			return g_tls_start + i * g_tls_size; // if already initialized, return TLS address
+			return g_tls_start + i * Emu.GetTLSMemsz(); // if already initialized, return TLS address
 		}
 	}
 
@@ -61,9 +56,9 @@ u32 ppu_get_tls(u32 thread)
 		u32 old = 0;
 		if (g_tls_owners[i].compare_exchange_strong(old, thread))
 		{
-			const u32 addr = g_tls_start + i * g_tls_size; // get TLS address
-			memset(vm::get_ptr(addr), 0, g_tls_size);      // fill TLS area with zeros
-			memcpy(vm::get_ptr(addr), vm::get_ptr(g_tls_image_addr), g_tls_image_size); // initialize from TLS image
+			const u32 addr = g_tls_start + i * Emu.GetTLSMemsz(); // get TLS address
+			memset(vm::get_ptr(addr), 0, Emu.GetTLSMemsz()); // fill TLS area with zeros
+			memcpy(vm::get_ptr(addr), vm::get_ptr(Emu.GetTLSAddr()), Emu.GetTLSFilesz()); // initialize from TLS image
 			return addr;
 		}
 	}
@@ -420,10 +415,7 @@ void sysPrxForUser_init(Module *pxThis)
 {
 	sysPrxForUser = pxThis;
 
-	g_tls_size = 0;
 	g_tls_start = 0;
-	g_tls_image_addr = 0;
-	g_tls_image_size = 0;
 	for (auto& v : g_tls_owners)
 	{
 		v.store(0, std::memory_order_relaxed);
diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h
index a4901089b3..d9615e2613 100644
--- a/rpcs3/Emu/System.h
+++ b/rpcs3/Emu/System.h
@@ -28,9 +28,9 @@ struct VFS;
 struct EmuInfo
 {
 private:
-	u64 tls_addr;
-	u64 tls_filesz;
-	u64 tls_memsz;
+	u32 tls_addr;
+	u32 tls_filesz;
+	u32 tls_memsz;
 
 	sys_process_param_info proc_param;
 
@@ -50,16 +50,16 @@ public:
 		proc_param.primary_prio = be_t<s32>::make(0x50);
 	}
 
-	void SetTLSData(const u64 addr, const u64 filesz, const u64 memsz)
+	void SetTLSData(u32 addr, u32 filesz, u32 memsz)
 	{
 		tls_addr = addr;
 		tls_filesz = filesz;
 		tls_memsz = memsz;
 	}
 
-	u64 GetTLSAddr() const { return tls_addr; }
-	u64 GetTLSFilesz() const { return tls_filesz; }
-	u64 GetTLSMemsz() const { return tls_memsz; }
+	u32 GetTLSAddr() const { return tls_addr; }
+	u32 GetTLSFilesz() const { return tls_filesz; }
+	u32 GetTLSMemsz() const { return tls_memsz; }
 };
 
 class ModuleInitializer
@@ -173,7 +173,7 @@ public:
 		m_modules_init.push_back(std::move(m));
 	}
 
-	void SetTLSData(const u64 addr, const u64 filesz, const u64 memsz)
+	void SetTLSData(u32 addr, u32 filesz, u32 memsz)
 	{
 		m_info.SetTLSData(addr, filesz, memsz);
 	}
@@ -195,9 +195,9 @@ public:
 
 	EmuInfo& GetInfo() { return m_info; }
 
-	u64 GetTLSAddr() const { return m_info.GetTLSAddr(); }
-	u64 GetTLSFilesz() const { return m_info.GetTLSFilesz(); }
-	u64 GetTLSMemsz() const { return m_info.GetTLSMemsz(); }
+	u32 GetTLSAddr() const { return m_info.GetTLSAddr(); }
+	u32 GetTLSFilesz() const { return m_info.GetTLSFilesz(); }
+	u32 GetTLSMemsz() const { return m_info.GetTLSMemsz(); }
 
 	u32 GetMallocPageSize() { return m_info.GetProcParam().malloc_pagesize; }
 
diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp
index 01232eb579..9c7f19d0c2 100644
--- a/rpcs3/Loader/ELF32.cpp
+++ b/rpcs3/Loader/ELF32.cpp
@@ -11,6 +11,8 @@
 #include "Emu/ARMv7/PSVFuncList.h"
 #include "Emu/System.h"
 
+extern void armv7_init_tls();
+
 namespace loader
 {
 	namespace handlers
@@ -235,9 +237,13 @@ namespace loader
 					}
 					else if (!strcmp(name.c_str(), ".tbss"))
 					{
-						LOG_NOTICE(LOADER, ".tbss analysis");
+						LOG_NOTICE(LOADER, ".tbss analysis...");
+						const u32 img_addr = shdr.data_le.sh_addr;                  // start address of TLS initialization image
+						const u32 img_size = (&shdr)[1].data_le.sh_addr - img_addr; // calculate its size as the difference between sections
+						const u32 tls_size = shdr.data_le.sh_size;                  // full size of TLS
 
-						LOG_ERROR(LOADER, "TLS: size=0x%08x", shdr.data_le.sh_size);
+						LOG_WARNING(LOADER, "TLS: img_addr=0x%08x, img_size=0x%x, tls_size=0x%x", img_addr, img_size, tls_size);
+						Emu.SetTLSData(img_addr, img_size, tls_size);
 					}
 					else if (!strcmp(name.c_str(), ".sceRefs.rodata"))
 					{
@@ -314,6 +320,7 @@ namespace loader
 					}
 				}
 
+				armv7_init_tls();
 				armv7_decoder_initialize(code_start, code_end);
 
 				arm7_thread(entry & ~1 /* TODO: Thumb/ARM encoding selection */, "main_thread").args({ Emu.GetPath()/*, "-emu"*/ }).run();
diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp
index de2a78c0a6..ac64afc207 100644
--- a/rpcs3/Loader/ELF64.cpp
+++ b/rpcs3/Loader/ELF64.cpp
@@ -422,7 +422,10 @@ namespace loader
 					break;
 
 				case 0x00000007: //TLS
-					Emu.SetTLSData(phdr.p_vaddr.addr(), phdr.p_filesz.value(), phdr.p_memsz.value());
+					Emu.SetTLSData(
+						vm::cast(phdr.p_vaddr.addr(), "TLS: phdr.p_vaddr"),
+						vm::cast(phdr.p_filesz.value(), "TLS: phdr.p_filesz"),
+						vm::cast(phdr.p_memsz.value(), "TLS: phdr.p_memsz"));
 					break;
 
 				case 0x60000001: //LOOS+1

From 8a945a1a52b47b686871978de245b092d7d1a578 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Sun, 1 Feb 2015 10:09:24 +0300
Subject: [PATCH 64/70] Fixes

---
 rpcs3/Emu/ARMv7/ARMv7Context.h               | 35 +++++++++++---------
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp         | 12 ++++---
 rpcs3/Emu/ARMv7/ARMv7Thread.cpp              |  6 ++--
 rpcs3/Emu/Cell/SPUThread.cpp                 |  2 ++
 rpcs3/Emu/Memory/Memory.cpp                  |  2 +-
 rpcs3/Emu/Memory/vm_ref.h                    |  2 ++
 rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp |  7 +++-
 rpcs3/Emu/SysCalls/lv2/sys_spu.cpp           |  6 ++--
 8 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index 1316a26786..692592e5ec 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -37,6 +37,25 @@ struct ARMv7Context
 			};
 
 			u32 LR;
+
+			union
+			{
+				struct
+				{
+					u32 reserved0 : 16;
+					u32 GE : 4;
+					u32 reserved1 : 4;
+					u32 dummy : 3;
+					u32 Q : 1; // Set to 1 if an SSAT or USAT instruction changes (saturates) the input value for the signed or unsigned range of the result
+					u32 V : 1; // Overflow condition code flag
+					u32 C : 1; // Carry condition code flag
+					u32 Z : 1; // Zero condition code flag
+					u32 N : 1; // Negative condition code flag
+				};
+
+				u32 APSR;
+
+			} APSR;
 		};
 
 		struct
@@ -45,22 +64,6 @@ struct ARMv7Context
 		};
 	};
 
-	union
-	{
-		struct
-		{
-			u32 N : 1; //Negative condition code flag
-			u32 Z : 1; //Zero condition code flag
-			u32 C : 1; //Carry condition code flag
-			u32 V : 1; //Overflow condition code flag
-			u32 Q : 1; //Set to 1 if an SSAT or USAT instruction changes (saturates) the input value for the signed or unsigned range of the result
-			u32 dummy : 27;
-		};
-
-		u32 APSR;
-
-	} APSR;
-
 	union
 	{
 		struct
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index 78c17f4fda..6ea768832b 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -316,10 +316,10 @@ void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7
 
 	switch (type)
 	{
-	case T1:
-	case A1:
+	case T1: case A1:
+	case T2: case A2:
 	{
-		cond = context.ITSTATE.advance();
+		cond = type == A1 ? code.data >> 28 : context.ITSTATE.advance();
 		t = (code.data & 0xf000) >> 12;
 		cp = (code.data & 0xf00) >> 8;
 		opc1 = (code.data & 0xe00000) >> 21;
@@ -327,8 +327,8 @@ void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7
 		cn = (code.data & 0xf0000) >> 16;
 		cm = (code.data & 0xf);
 
-		reject(cp - 10 < 2, "Advanced SIMD and VFP");
-		reject(t == 13 && type == T1, "UNPREDICTABLE");
+		reject(cp - 10 < 2 && (type == T1 || type == A1), "Advanced SIMD and VFP");
+		reject(t == 13 && (type == T1 || type == T2), "UNPREDICTABLE");
 		break;
 	}
 	default: throw __FUNCTION__;
@@ -340,6 +340,8 @@ void ARMv7_instrs::MRC_(ARMv7Context& context, const ARMv7Code code, const ARMv7
 
 		if (t < 15 && cp == 15 && opc1 == 0 && cn == 13 && cm == 0 && opc2 == 3)
 		{
+			// Read CP15 User Read-only Thread ID Register (seems used as TLS address)
+
 			if (!context.TLS)
 			{
 				throw "TLS not initialized";
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
index 3495376c79..1a968dd858 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
@@ -48,7 +48,7 @@ void armv7_init_tls()
 
 u32 armv7_get_tls(u32 thread)
 {
-	if (!Emu.GetTLSMemsz())
+	if (!Emu.GetTLSMemsz() || !thread)
 	{
 		return 0;
 	}
@@ -67,8 +67,8 @@ u32 armv7_get_tls(u32 thread)
 		if (g_armv7_tls_owners[i].compare_exchange_strong(old, thread))
 		{
 			const u32 addr = g_armv7_tls_start + i * Emu.GetTLSMemsz(); // get TLS address
-			memset(vm::get_ptr(addr), 0, Emu.GetTLSMemsz()); // fill TLS area with zeros
 			memcpy(vm::get_ptr(addr), vm::get_ptr(Emu.GetTLSAddr()), Emu.GetTLSFilesz()); // initialize from TLS image
+			memset(vm::get_ptr(addr + Emu.GetTLSFilesz()), 0, Emu.GetTLSMemsz() - Emu.GetTLSFilesz()); // fill the rest with zeros
 			return addr;
 		}
 	}
@@ -112,7 +112,7 @@ void ARMv7Thread::InitRegs()
 	memset(context.GPR, 0, sizeof(context.GPR[0]) * 15);
 	context.APSR.APSR = 0;
 	context.IPSR.IPSR = 0;
-	context.ISET = Thumb;
+	//context.ISET = Thumb;
 	context.ITSTATE.IT = 0;
 	context.SP = m_stack_addr + m_stack_size;
 	context.TLS = armv7_get_tls(GetId());
diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp
index c4cf028f8f..1c861da43c 100644
--- a/rpcs3/Emu/Cell/SPUThread.cpp
+++ b/rpcs3/Emu/Cell/SPUThread.cpp
@@ -99,6 +99,8 @@ void SPUThread::InitRegs()
 
 	m_event_mask = 0;
 	m_events = 0;
+
+	R_ADDR = 0;
 }
 
 void SPUThread::DoRun()
diff --git a/rpcs3/Emu/Memory/Memory.cpp b/rpcs3/Emu/Memory/Memory.cpp
index 84f75c6fff..502694ff93 100644
--- a/rpcs3/Emu/Memory/Memory.cpp
+++ b/rpcs3/Emu/Memory/Memory.cpp
@@ -131,7 +131,7 @@ void MemoryBase::Init(MemoryType type)
 
 	case Memory_PSV:
 		MemoryBlocks.push_back(PSV.RAM.SetRange(0x81000000, 0x10000000));
-		MemoryBlocks.push_back(UserMemory = PSV.Userspace.SetRange(0x91000000, 0x10000000));
+		MemoryBlocks.push_back(UserMemory = PSV.Userspace.SetRange(0x91000000, 0x2F000000));
 		break;
 
 	case Memory_PSP:
diff --git a/rpcs3/Emu/Memory/vm_ref.h b/rpcs3/Emu/Memory/vm_ref.h
index 5788457c3b..f7256cedff 100644
--- a/rpcs3/Emu/Memory/vm_ref.h
+++ b/rpcs3/Emu/Memory/vm_ref.h
@@ -10,6 +10,8 @@ namespace vm
 
 	public:
 		typedef T type;
+		static_assert(!std::is_pointer<T>::value, "vm::_ref_base<> error: invalid type (pointer)");
+		static_assert(!std::is_reference<T>::value, "vm::_ref_base<> error: invalid type (reference)");
 		typedef typename remove_be_t<T>::type le_type;
 		typedef typename to_be_t<T>::type be_type;
 
diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
index 2a8d3cc699..3fc79e4256 100644
--- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp
@@ -42,6 +42,11 @@ u32 ppu_get_tls(u32 thread)
 		sysPrxForUser->Notice("Thread Local Storage initialized (g_tls_start=0x%x, size = 0x%x)\n*** TLS segment addr: 0x%08x\n*** TLS segment size: 0x%08x",
 			g_tls_start, Emu.GetTLSMemsz(), Emu.GetTLSAddr(), Emu.GetTLSFilesz());
 	}
+
+	if (!thread)
+	{
+		return 0;
+	}
 	
 	for (u32 i = 0; i < TLS_MAX; i++)
 	{
@@ -57,8 +62,8 @@ u32 ppu_get_tls(u32 thread)
 		if (g_tls_owners[i].compare_exchange_strong(old, thread))
 		{
 			const u32 addr = g_tls_start + i * Emu.GetTLSMemsz(); // get TLS address
-			memset(vm::get_ptr(addr), 0, Emu.GetTLSMemsz()); // fill TLS area with zeros
 			memcpy(vm::get_ptr(addr), vm::get_ptr(Emu.GetTLSAddr()), Emu.GetTLSFilesz()); // initialize from TLS image
+			memset(vm::get_ptr(addr + Emu.GetTLSFilesz()), 0, Emu.GetTLSMemsz() - Emu.GetTLSFilesz()); // fill the rest with zeros
 			return addr;
 		}
 	}
diff --git a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp b/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp
index 29cdb9bd39..f3fb23b383 100644
--- a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp
@@ -85,10 +85,10 @@ SPUThread* spu_thread_initialize(std::shared_ptr<SpuGroupInfo>& group, u32 spu_n
 		sys_spu.Todo("Unsupported SPU Thread options (0x%x)", option);
 	}
 
-	u32 spu_ep = (u32)img.entry_point;
+	const u32 spu_ep = img.entry_point;
 	// Copy SPU image:
 	// TODO: use segment info
-	u32 spu_offset = (u32)Memory.Alloc(256 * 1024, 4096);
+	const u32 spu_offset = vm::cast(Memory.MainMem.AllocAlign(256 * 1024, 4096));
 	memcpy(vm::get_ptr<void>(spu_offset), vm::get_ptr<void>(img.addr), 256 * 1024);
 
 	SPUThread& new_thread = static_cast<SPUThread&>(Emu.GetCPU().AddThread(CPU_THREAD_SPU));
@@ -218,7 +218,7 @@ s32 sys_spu_thread_group_destroy(u32 id)
 		std::shared_ptr<CPUThread> t = Emu.GetCPU().GetThread(group_info->list[i]);
 		if (t)
 		{
-			Memory.Free(((SPUThread*)t.get())->GetOffset());
+			Memory.MainMem.Free(((SPUThread*)t.get())->GetOffset());
 			Emu.GetCPU().RemoveThread(group_info->list[i]);
 		}
 	}

From e5dd03dbcb042c93f00a112f4b5e0f661245cd81 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Sun, 1 Feb 2015 16:52:34 +0300
Subject: [PATCH 65/70] ARMv7: argc, argv setting, LDRSB_IMM, bugfixes

---
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp     |  3 +-
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 61 ++++++++++++++++++++++++++--
 rpcs3/Emu/ARMv7/ARMv7Thread.cpp      | 61 ++++++++++++++++++++++++++--
 rpcs3/Emu/ARMv7/ARMv7Thread.h        | 56 ++++---------------------
 rpcs3/Emu/CPU/CPUThread.cpp          | 11 -----
 rpcs3/Emu/CPU/CPUThread.h            | 11 +++--
 rpcs3/Emu/Cell/PPCThread.cpp         | 15 -------
 rpcs3/Emu/Cell/PPCThread.h           |  3 --
 rpcs3/Emu/Cell/PPUThread.cpp         | 18 ++++++++
 rpcs3/Emu/Cell/PPUThread.h           |  6 ++-
 rpcs3/Emu/Cell/SPUThread.cpp         | 11 +++++
 rpcs3/Emu/Cell/SPUThread.h           |  2 +
 rpcs3/Emu/Memory/vm.cpp              | 22 ++++++++--
 rpcs3/Loader/ELF32.cpp               |  2 +-
 14 files changed, 184 insertions(+), 98 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index fac6873a33..ce2dbb6914 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include <unordered_map>
 #include "Utilities/Log.h"
+#include "Emu/Memory/Memory.h"
 #include "ARMv7Thread.h"
 #include "ARMv7Interpreter.h"
 #include "ARMv7Opcodes.h"
@@ -1262,7 +1263,7 @@ void armv7_decoder_initialize(u32 addr, u32 end_addr, bool dump)
 		addr += 16;
 	}
 
-	LOG_NOTICE(ARMv7, "armv7_decoder_initialize() finished, g_opct.size() = %lld", g_opct.size());
+	LOG_NOTICE(ARMv7, "armv7_decoder_initialize() finished, g_opct.size() = %lld", (u64)g_opct.size());
 }
 
 u32 ARMv7Decoder::DecodeMemory(const u32 address)
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index 6ea768832b..c204351616 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -191,7 +191,7 @@ namespace ARMv7_instrs
 
 	template<typename T> T AddWithCarry(T x, T y, bool carry_in, bool& carry_out, bool& overflow)
 	{
-		const T sign_mask = (T)1 << (sizeof(T) - 1);
+		const T sign_mask = (T)1 << (sizeof(T) * 8 - 1);
 
 		T result = x + y;
 		carry_out = ((x & y) | ((x ^ y) & ~result)) & sign_mask;
@@ -823,6 +823,7 @@ void ARMv7_instrs::B(ARMv7Context& context, const ARMv7Code code, const ARMv7_en
 
 	if (ConditionPassed(context, cond))
 	{
+		//LOG_NOTICE(ARMv7, "Branch to 0x%x (cond=0x%x)", context.thread.PC + jump, cond);
 		context.thread.SetBranch(context.thread.PC + jump);
 	}
 }
@@ -1174,6 +1175,7 @@ void ARMv7_instrs::CMP_REG(ARMv7Context& context, const ARMv7Code code, const AR
 	}
 	case T3:
 	{
+		cond = context.ITSTATE.advance();
 		n = (code.data & 0xf0000) >> 16;
 		m = (code.data & 0xf);
 		shift_t = DecodeImmShift((code.data & 0x30) >> 4, (code.data & 0x7000) >> 10 | (code.data & 0xc0) >> 6, &shift_n);
@@ -1187,13 +1189,17 @@ void ARMv7_instrs::CMP_REG(ARMv7Context& context, const ARMv7Code code, const AR
 
 	if (ConditionPassed(context, cond))
 	{
+		const u32 m_value = context.read_gpr(m);
+		const u32 n_value = context.read_gpr(n);
 		bool carry, overflow;
-		const u32 shifted = Shift(context.read_gpr(m), shift_t, shift_n, true);
-		const u32 res = AddWithCarry(context.read_gpr(n), ~shifted, true, carry, overflow);
+		const u32 shifted = Shift(m_value, shift_t, shift_n, true);
+		const u32 res = AddWithCarry(n_value, ~shifted, true, carry, overflow);
 		context.APSR.N = res >> 31;
 		context.APSR.Z = res == 0;
 		context.APSR.C = carry;
 		context.APSR.V = overflow;
+
+		//LOG_NOTICE(ARMv7, "CMP: r%d=0x%08x <> r%d=0x%08x, shifted=0x%08x, res=0x%08x", n, n_value, m, m_value, shifted, res);
 	}
 }
 
@@ -1619,11 +1625,60 @@ void ARMv7_instrs::LDRH_REG(ARMv7Context& context, const ARMv7Code code, const A
 
 void ARMv7_instrs::LDRSB_IMM(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
 {
+	u32 cond, t, n, imm32;
+	bool index, add, wback;
+
 	switch (type)
 	{
+	case T1:
+	{
+		cond = context.ITSTATE.advance();
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xfff);
+		index = true;
+		add = true;
+		wback = false;
+
+		reject(t == 15, "PLI");
+		reject(n == 15, "LDRSB (literal)");
+		reject(t == 13, "UNPREDICTABLE");
+		break;
+	}
+	case T2:
+	{
+		cond = context.ITSTATE.advance();
+		t = (code.data & 0xf000) >> 12;
+		n = (code.data & 0xf0000) >> 16;
+		imm32 = (code.data & 0xff);
+		index = (code.data & 0x400);
+		add = (code.data & 0x200);
+		wback = (code.data & 0x100);
+
+		reject(t == 15 && index && !add && !wback, "PLI");
+		reject(n == 15, "LDRSB (literal)");
+		reject(index && add && !wback, "LDRSBT");
+		reject(!index && !wback, "UNDEFINED");
+		reject(t == 13 || t == 15 || (wback && n == t), "UNPREDICTABLE");
+		break;
+	}
 	case A1: throw __FUNCTION__;
 	default: throw __FUNCTION__;
 	}
+
+	if (ConditionPassed(context, cond))
+	{
+		const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32;
+		const u32 addr = index ? offset_addr : context.read_gpr(n);
+		const s8 value = vm::psv::read8(addr);
+
+		context.write_gpr(t, value); // sign-extend
+
+		if (wback)
+		{
+			context.write_gpr(n, offset_addr);
+		}
+	}
 }
 
 void ARMv7_instrs::LDRSB_LIT(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
index 1a968dd858..f58acfd0d3 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
@@ -120,10 +120,19 @@ void ARMv7Thread::InitRegs()
 
 void ARMv7Thread::InitStack()
 {
-	if(!m_stack_addr)
+	if (!m_stack_addr)
 	{
-		m_stack_size = 0x10000;
-		m_stack_addr = (u32)Memory.Alloc(0x10000, 1);
+		assert(m_stack_size);
+		m_stack_addr = vm::cast(Memory.Alloc(m_stack_size, 4096));
+	}
+}
+
+void ARMv7Thread::CloseStack()
+{
+	if (m_stack_addr)
+	{
+		Memory.Free(m_stack_addr);
+		m_stack_addr = 0;
 	}
 }
 
@@ -218,7 +227,7 @@ void ARMv7Thread::FastStop()
 	m_status = Stopped;
 }
 
-arm7_thread::arm7_thread(u32 entry, const std::string& name, u32 stack_size, u32 prio)
+armv7_thread::armv7_thread(u32 entry, const std::string& name, u32 stack_size, u32 prio)
 {
 	thread = &Emu.GetCPU().AddThread(CPU_THREAD_ARMv7);
 
@@ -229,3 +238,47 @@ arm7_thread::arm7_thread(u32 entry, const std::string& name, u32 stack_size, u32
 
 	argc = 0;
 }
+
+cpu_thread& armv7_thread::args(std::initializer_list<std::string> values)
+{
+	assert(argc == 0);
+
+	if (!values.size())
+	{
+		return *this;
+	}
+
+	std::vector<char> argv_data;
+	u32 argv_size = 0;
+
+	for (auto& arg : values)
+	{
+		const u32 arg_size = vm::cast(arg.size(), "arg.size()"); // get arg size
+
+		for (char c : arg)
+		{
+			argv_data.push_back(c); // append characters
+		}
+
+		argv_data.push_back('\0'); // append null terminator
+
+		argv_size += arg_size + 1;
+		argc++;
+	}
+
+	argv = vm::cast(Memory.PSV.RAM.AllocAlign(argv_size, 4096)); // allocate arg list
+	memcpy(vm::get_ptr(argv), argv_data.data(), argv_size); // copy arg list
+	
+	return *this;
+}
+
+cpu_thread& armv7_thread::run()
+{
+	thread->Run();
+
+	// set arguments
+	static_cast<ARMv7Thread*>(thread)->context.GPR[0] = argc;
+	static_cast<ARMv7Thread*>(thread)->context.GPR[1] = argv;
+
+	return *this;
+}
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.h b/rpcs3/Emu/ARMv7/ARMv7Thread.h
index c806f4b6c4..a8a0f75311 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.h
@@ -1,29 +1,19 @@
 #pragma once
 #include "Emu/CPU/CPUThread.h"
-#include "Emu/Memory/Memory.h"
 #include "ARMv7Context.h"
 
 class ARMv7Thread : public CPUThread
 {
 public:
 	ARMv7Context context;
-	//u32 m_arg;
-	//u8 m_last_instr_size;
-	//const char* m_last_instr_name;
 
 	ARMv7Thread();
 	~ARMv7Thread();
 
-	//void update_code(const u32 address)
-	//{
-	//	code.code0 = vm::psv::read16(address & ~1);
-	//	code.code1 = vm::psv::read16(address + 2 & ~1);
-	//	m_arg = address & 0x1 ? code.code1 << 16 | code.code0 : code.data;
-	//}
-
 public:
 	virtual void InitRegs(); 
 	virtual void InitStack();
+	virtual void CloseStack();
 	u32 GetStackArg(u32 pos);
 	void FastCall(u32 addr);
 	void FastStop();
@@ -42,48 +32,16 @@ protected:
 
 	virtual void DoCode();
 };
-class arm7_thread : cpu_thread
+
+class armv7_thread : cpu_thread
 {
-	static const u32 stack_align = 0x10;
-	vm::ptr<u64> argv;
+	u32 argv;
 	u32 argc;
-	vm::ptr<u64> envp;
 
 public:
-	arm7_thread(u32 entry, const std::string& name = "", u32 stack_size = 0, u32 prio = 0);
+	armv7_thread(u32 entry, const std::string& name = "", u32 stack_size = 0, u32 prio = 0);
 
-	cpu_thread& args(std::initializer_list<std::string> values) override
-	{
-		if (!values.size())
-			return *this;
+	cpu_thread& args(std::initializer_list<std::string> values) override;
 
-		//assert(argc == 0);
-
-		//envp.set(vm::alloc((u32)sizeof(envp), stack_align, vm::main));
-		//*envp = 0;
-		//argv.set(vm::alloc(u32(sizeof(argv)* values.size()), stack_align, vm::main));
-
-		for (auto &arg : values)
-		{
-			//u32 arg_size = align(u32(arg.size() + 1), stack_align);
-			//u32 arg_addr = vm::alloc(arg_size, stack_align, vm::main);
-
-			//std::strcpy(vm::get_ptr<char>(arg_addr), arg.c_str());
-
-			//argv[argc++] = arg_addr;
-		}
-
-		return *this;
-	}
-
-	cpu_thread& run() override
-	{
-		thread->Run();
-
-		//static_cast<ARMv7Thread*>(thread)->GPR[0] = argc;
-		//static_cast<ARMv7Thread*>(thread)->GPR[1] = argv.addr();
-		//static_cast<ARMv7Thread*>(thread)->GPR[2] = envp.addr();
-
-		return *this;
-	}
+	cpu_thread& run() override;
 };
diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp
index a69ec8338a..b2224af9c0 100644
--- a/rpcs3/Emu/CPU/CPUThread.cpp
+++ b/rpcs3/Emu/CPU/CPUThread.cpp
@@ -64,17 +64,6 @@ void CPUThread::Reset()
 	DoReset();
 }
 
-void CPUThread::CloseStack()
-{
-	if(m_stack_addr)
-	{
-		Memory.StackMem.Free(m_stack_addr);
-		m_stack_addr = 0;
-	}
-
-	m_stack_size = 0;
-}
-
 void CPUThread::SetId(const u32 id)
 {
 	m_id = id;
diff --git a/rpcs3/Emu/CPU/CPUThread.h b/rpcs3/Emu/CPU/CPUThread.h
index dd79700c65..35010483cc 100644
--- a/rpcs3/Emu/CPU/CPUThread.h
+++ b/rpcs3/Emu/CPU/CPUThread.h
@@ -1,8 +1,7 @@
 #pragma once
-
 #include "Utilities/Thread.h"
 
-enum CPUThreadType :unsigned char
+enum CPUThreadType : unsigned char
 {
 	CPU_THREAD_PPU,
 	CPU_THREAD_SPU,
@@ -46,10 +45,10 @@ protected:
 	bool m_trace_call_stack;
 
 public:
-	virtual void InitRegs()=0;
+	virtual void InitRegs() = 0;
 
-	virtual void InitStack()=0;
-	virtual void CloseStack();
+	virtual void InitStack() = 0;
+	virtual void CloseStack() = 0;
 
 	u32 GetStackAddr() const { return m_stack_addr; }
 	u32 GetStackSize() const { return m_stack_size; }
@@ -271,4 +270,4 @@ public:
 	{
 		return thread->GetId();
 	}
-};
\ No newline at end of file
+};
diff --git a/rpcs3/Emu/Cell/PPCThread.cpp b/rpcs3/Emu/Cell/PPCThread.cpp
index 4248fd58a8..4d77900d90 100644
--- a/rpcs3/Emu/Cell/PPCThread.cpp
+++ b/rpcs3/Emu/Cell/PPCThread.cpp
@@ -25,18 +25,3 @@ PPCThread::~PPCThread()
 void PPCThread::DoReset()
 {
 }
-
-void PPCThread::InitStack()
-{
-	if(m_stack_addr) return;
-	if(m_stack_size == 0) m_stack_size = 0x10000;
-	m_stack_addr = (u32)Memory.StackMem.AllocAlign(m_stack_size, 0x100);
-	/*
-	m_stack_point += m_stack_size - 0x10;
-	m_stack_point &= -0x10;
-	vm::write64(m_stack_point, 0);
-	m_stack_point -= 0x60;
-	vm::write64(m_stack_point, m_stack_point + 0x60);
-	*/
-}
-
diff --git a/rpcs3/Emu/Cell/PPCThread.h b/rpcs3/Emu/Cell/PPCThread.h
index 99471f7a80..2c3fa5c05b 100644
--- a/rpcs3/Emu/Cell/PPCThread.h
+++ b/rpcs3/Emu/Cell/PPCThread.h
@@ -4,9 +4,6 @@
 class PPCThread : public CPUThread
 {
 public:
-	virtual void InitRegs()=0;
-	virtual void InitStack();
-
 	virtual std::string GetThreadName() const
 	{
 		return fmt::format("%s[0x%08x]", GetFName(), PC);
diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp
index e064a54feb..e6d229583a 100644
--- a/rpcs3/Emu/Cell/PPUThread.cpp
+++ b/rpcs3/Emu/Cell/PPUThread.cpp
@@ -80,6 +80,24 @@ void PPUThread::InitRegs()
 	TB = 0;
 }
 
+void PPUThread::InitStack()
+{
+	if (!m_stack_addr)
+	{
+		assert(m_stack_size);
+		m_stack_addr = vm::cast(Memory.StackMem.AllocAlign(m_stack_size, 4096));
+	}
+}
+
+void PPUThread::CloseStack()
+{
+	if (m_stack_addr)
+	{
+		Memory.StackMem.Free(m_stack_addr);
+		m_stack_addr = 0;
+	}
+}
+
 void PPUThread::DoRun()
 {
 	switch(Ini.CPUDecoderMode.GetValue())
diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h
index 51722f1645..820b244c2b 100644
--- a/rpcs3/Emu/Cell/PPUThread.h
+++ b/rpcs3/Emu/Cell/PPUThread.h
@@ -799,8 +799,10 @@ public:
 	}
 
 public:
-	virtual void InitRegs();
-	virtual void Task();
+	virtual void InitRegs() override;
+	virtual void InitStack() override;
+	virtual void CloseStack() override;
+	virtual void Task() override;
 	u64 GetStackArg(s32 i);
 	u64 FastCall2(u32 addr, u32 rtoc);
 	void FastStop();
diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp
index 1c861da43c..f5faf9fff1 100644
--- a/rpcs3/Emu/Cell/SPUThread.cpp
+++ b/rpcs3/Emu/Cell/SPUThread.cpp
@@ -103,6 +103,17 @@ void SPUThread::InitRegs()
 	R_ADDR = 0;
 }
 
+void SPUThread::InitStack()
+{
+	m_stack_size = 0x1000; // this value is wrong
+	m_stack_addr = m_offset + 0x40000 - m_stack_size; // stack is the part of SPU Local Storage
+}
+
+void SPUThread::CloseStack()
+{
+	// nothing to do here
+}
+
 void SPUThread::DoRun()
 {
 	switch(Ini.SPUDecoderMode.GetValue())
diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h
index 50d70b1c7f..c2e2cc2f03 100644
--- a/rpcs3/Emu/Cell/SPUThread.h
+++ b/rpcs3/Emu/Cell/SPUThread.h
@@ -568,6 +568,8 @@ public:
 
 public:
 	virtual void InitRegs();
+	virtual void InitStack();
+	virtual void CloseStack();
 	virtual void Task();
 	void FastCall(u32 ls_addr);
 	void FastStop();
diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp
index 2c23ecdb66..69e42e62cb 100644
--- a/rpcs3/Emu/Memory/vm.cpp
+++ b/rpcs3/Emu/Memory/vm.cpp
@@ -2,6 +2,7 @@
 #include "Memory.h"
 #include "Emu/CPU/CPUThread.h"
 #include "Emu/Cell/PPUThread.h"
+#include "Emu/ARMv7/ARMv7Thread.h"
 
 namespace vm
 {
@@ -167,13 +168,14 @@ namespace vm
 
 	u32 stack_push(CPUThread& CPU, u32 size, u32 align_v, u32& old_pos)
 	{
+		assert(align_v);
+
 		switch (CPU.GetType())
 		{
 		case CPU_THREAD_PPU:
 		{
 			PPUThread& PPU = static_cast<PPUThread&>(CPU);
 
-			assert(align_v);
 			old_pos = (u32)PPU.GPR[1];
 			PPU.GPR[1] -= align(size, 8); // room minimal possible size
 			PPU.GPR[1] &= ~(align_v - 1); // fix stack alignment
@@ -199,8 +201,22 @@ namespace vm
 
 		case CPU_THREAD_ARMv7:
 		{
-			assert(!"stack_push(): ARMv7 not supported");
-			return 0;
+			ARMv7Context& context = static_cast<ARMv7Thread&>(CPU).context;
+
+			old_pos = context.SP;
+			context.SP -= align(size, 4); // room minimal possible size
+			context.SP &= ~(align_v - 1); // fix stack alignment
+
+			if (context.SP < CPU.GetStackAddr())
+			{
+				// stack overflow
+				context.SP = old_pos;
+				return 0;
+			}
+			else
+			{
+				return context.SP;
+			}
 		}
 
 		default:
diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp
index 9c7f19d0c2..c622308f3d 100644
--- a/rpcs3/Loader/ELF32.cpp
+++ b/rpcs3/Loader/ELF32.cpp
@@ -323,7 +323,7 @@ namespace loader
 				armv7_init_tls();
 				armv7_decoder_initialize(code_start, code_end);
 
-				arm7_thread(entry & ~1 /* TODO: Thumb/ARM encoding selection */, "main_thread").args({ Emu.GetPath()/*, "-emu"*/ }).run();
+				armv7_thread(entry & ~1 /* TODO: Thumb/ARM encoding selection */, "main_thread").args({ Emu.GetPath(), "-emu" }).run();
 				break;
 			}
 			case MACHINE_SPU: spu_thread(m_ehdr.is_le() ? m_ehdr.data_le.e_entry : m_ehdr.data_be.e_entry, "main_thread").args({ Emu.GetPath()/*, "-emu"*/ }).run(); break;

From dab80497bbbd39141914a4b918732129f52c7ae2 Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Mon, 2 Feb 2015 00:12:40 +0300
Subject: [PATCH 66/70] ARMv7: bugfix, loader improved, scePerf

---
 rpcs3/Emu/ARMv7/ARMv7Context.h           |   8 +
 rpcs3/Emu/ARMv7/ARMv7Thread.cpp          |   1 +
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp |  12 +-
 rpcs3/Emu/ARMv7/Modules/sceLibc.cpp      |  18 +-
 rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp |   9 +-
 rpcs3/Emu/ARMv7/Modules/scePerf.cpp      | 222 +++++++++++++++++++++--
 rpcs3/Loader/ELF32.cpp                   | 108 +++++++++--
 7 files changed, 330 insertions(+), 48 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index 692592e5ec..fa9e04c64d 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -119,6 +119,14 @@ struct ARMv7Context
 	u32 R_ADDR;
 	u64 R_DATA;
 
+	struct perf_counter
+	{
+		u32 event;
+		u32 value;
+	};
+
+	std::array<perf_counter, 6> counters;
+
 	void write_gpr(u32 n, u32 value)
 	{
 		assert(n < 16);
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
index f58acfd0d3..6e1cec6fa8 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
@@ -116,6 +116,7 @@ void ARMv7Thread::InitRegs()
 	context.ITSTATE.IT = 0;
 	context.SP = m_stack_addr + m_stack_size;
 	context.TLS = armv7_get_tls(GetId());
+	context.R_ADDR = 0;
 }
 
 void ARMv7Thread::InitStack()
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index f4705ab1d8..dbbce2e151 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -42,7 +42,7 @@ s32 sceKernelCreateThread(
 	s32 cpuAffinityMask,
 	vm::psv::ptr<const SceKernelThreadOptParam> pOptParam)
 {
-	sceLibKernel.Error("sceKernelCreateThread(pName=0x%x, entry=0x%x, initPriority=%d, stackSize=0x%x, attr=0x%x, cpuAffinityMask=0x%x, pOptParam=0x%x)",
+	sceLibKernel.Warning("sceKernelCreateThread(pName=0x%x, entry=0x%x, initPriority=%d, stackSize=0x%x, attr=0x%x, cpuAffinityMask=0x%x, pOptParam=0x%x)",
 		pName, entry, initPriority, stackSize, attr, cpuAffinityMask, pOptParam);
 
 	ARMv7Thread& new_thread = static_cast<ARMv7Thread&>(Emu.GetCPU().AddThread(CPU_THREAD_ARMv7));
@@ -61,7 +61,7 @@ s32 sceKernelCreateThread(
 
 s32 sceKernelStartThread(s32 threadId, u32 argSize, vm::psv::ptr<const void> pArgBlock)
 {
-	sceLibKernel.Error("sceKernelStartThread(threadId=0x%x, argSize=0x%x, pArgBlock=0x%x)", threadId, argSize, pArgBlock);
+	sceLibKernel.Warning("sceKernelStartThread(threadId=0x%x, argSize=0x%x, pArgBlock=0x%x)", threadId, argSize, pArgBlock);
 
 	std::shared_ptr<CPUThread> t = Emu.GetCPU().GetThread(threadId, CPU_THREAD_ARMv7);
 
@@ -93,7 +93,7 @@ s32 sceKernelStartThread(s32 threadId, u32 argSize, vm::psv::ptr<const void> pAr
 
 s32 sceKernelExitThread(ARMv7Context& context, s32 exitStatus)
 {
-	sceLibKernel.Error("sceKernelExitThread(exitStatus=0x%x)", exitStatus);
+	sceLibKernel.Warning("sceKernelExitThread(exitStatus=0x%x)", exitStatus);
 
 	// exit status is stored in r0
 	context.thread.Stop();
@@ -103,7 +103,7 @@ s32 sceKernelExitThread(ARMv7Context& context, s32 exitStatus)
 
 s32 sceKernelDeleteThread(s32 threadId)
 {
-	sceLibKernel.Error("sceKernelDeleteThread(threadId=0x%x)", threadId);
+	sceLibKernel.Warning("sceKernelDeleteThread(threadId=0x%x)", threadId);
 
 	std::shared_ptr<CPUThread> t = Emu.GetCPU().GetThread(threadId, CPU_THREAD_ARMv7);
 
@@ -125,7 +125,7 @@ s32 sceKernelDeleteThread(s32 threadId)
 
 s32 sceKernelExitDeleteThread(ARMv7Context& context, s32 exitStatus)
 {
-	sceLibKernel.Error("sceKernelExitDeleteThread(exitStatus=0x%x)", exitStatus);
+	sceLibKernel.Warning("sceKernelExitDeleteThread(exitStatus=0x%x)", exitStatus);
 
 	// exit status is stored in r0
 	context.thread.Stop();
@@ -261,7 +261,7 @@ s32 sceKernelDelayThreadCB(u32 usec)
 
 s32 sceKernelWaitThreadEnd(s32 threadId, vm::psv::ptr<s32> pExitStatus, vm::psv::ptr<u32> pTimeout)
 {
-	sceLibKernel.Error("sceKernelWaitThreadEnd(threadId=0x%x, pExitStatus=0x%x, pTimeout=0x%x)", threadId, pExitStatus, pTimeout);
+	sceLibKernel.Warning("sceKernelWaitThreadEnd(threadId=0x%x, pExitStatus=0x%x, pTimeout=0x%x)", threadId, pExitStatus, pTimeout);
 
 	std::shared_ptr<CPUThread> t = Emu.GetCPU().GetThread(threadId, CPU_THREAD_ARMv7);
 
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
index b833a38c5f..d280e3dc24 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibc.cpp
@@ -16,7 +16,7 @@ namespace sce_libc_func
 {
 	void __cxa_atexit(vm::psv::ptr<atexit_func_t> func, vm::psv::ptr<void> arg, vm::psv::ptr<void> dso)
 	{
-		sceLibc.Error("__cxa_atexit(func=0x%x, arg=0x%x, dso=0x%x)", func, arg, dso);
+		sceLibc.Warning("__cxa_atexit(func=0x%x, arg=0x%x, dso=0x%x)", func, arg, dso);
 		
 		LV2_LOCK(0);
 
@@ -28,7 +28,7 @@ namespace sce_libc_func
 
 	void __aeabi_atexit(vm::psv::ptr<void> arg, vm::psv::ptr<atexit_func_t> func, vm::psv::ptr<void> dso)
 	{
-		sceLibc.Error("__aeabi_atexit(arg=0x%x, func=0x%x, dso=0x%x)", arg, func, dso);
+		sceLibc.Warning("__aeabi_atexit(arg=0x%x, func=0x%x, dso=0x%x)", arg, func, dso);
 
 		LV2_LOCK(0);
 
@@ -40,7 +40,7 @@ namespace sce_libc_func
 
 	void exit(ARMv7Context& context)
 	{
-		sceLibc.Error("exit()");
+		sceLibc.Warning("exit()");
 		
 		LV2_LOCK(0);
 
@@ -117,7 +117,7 @@ namespace sce_libc_func
 
 	void printf(ARMv7Context& context, vm::psv::ptr<const char> fmt) // va_args...
 	{
-		sceLibc.Error("printf(fmt=0x%x)", fmt);
+		sceLibc.Warning("printf(fmt=0x%x)", fmt);
 
 		sceLibc.Notice("*** *fmt = '%s'", fmt.get_ptr());
 
@@ -126,7 +126,7 @@ namespace sce_libc_func
 
 	void sprintf(ARMv7Context& context, vm::psv::ptr<char> str, vm::psv::ptr<const char> fmt) // va_args...
 	{
-		sceLibc.Error("sprintf(str=0x%x, fmt=0x%x)", str, fmt);
+		sceLibc.Warning("sprintf(str=0x%x, fmt=0x%x)", str, fmt);
 
 		sceLibc.Notice("*** *fmt = '%s'", fmt.get_ptr());
 
@@ -139,28 +139,28 @@ namespace sce_libc_func
 
 	void __cxa_set_dso_handle_main(vm::psv::ptr<void> dso)
 	{
-		sceLibc.Error("__cxa_set_dso_handle_main(dso=0x%x)", dso);
+		sceLibc.Warning("__cxa_set_dso_handle_main(dso=0x%x)", dso);
 
 		g_dso = dso;
 	}
 
 	void memcpy(vm::psv::ptr<void> dst, vm::psv::ptr<const void> src, u32 size)
 	{
-		sceLibc.Error("memcpy(dst=0x%x, src=0x%x, size=0x%x)", dst, src, size);
+		sceLibc.Warning("memcpy(dst=0x%x, src=0x%x, size=0x%x)", dst, src, size);
 
 		::memcpy(dst.get_ptr(), src.get_ptr(), size);
 	}
 
 	void memset(vm::psv::ptr<void> dst, s32 value, u32 size)
 	{
-		sceLibc.Error("memset(dst=0x%x, value=%d, size=0x%x)", dst, value, size);
+		sceLibc.Warning("memset(dst=0x%x, value=%d, size=0x%x)", dst, value, size);
 
 		::memset(dst.get_ptr(), value, size);
 	}
 
 	void _Assert(vm::psv::ptr<const char> text, vm::psv::ptr<const char> func)
 	{
-		sceLibc.Error("_Assert(text=0x%x, func=0x%x)", text, func);
+		sceLibc.Warning("_Assert(text=0x%x, func=0x%x)", text, func);
 
 		LOG_ERROR(TTY, "%s : %s\n", func.get_ptr(), text.get_ptr());
 		Emu.Pause();
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
index f0f2674441..73260d9420 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibstdcxx.cpp
@@ -8,20 +8,17 @@ namespace sce_libstdcxx_func
 {
 	void __aeabi_unwind_cpp_pr0()
 	{
-		sceLibstdcxx.Todo(__FUNCTION__);
-		Emu.Pause();
+		throw __FUNCTION__;
 	}
 
 	void __aeabi_unwind_cpp_pr1()
 	{
-		sceLibstdcxx.Todo(__FUNCTION__);
-		Emu.Pause();
+		throw __FUNCTION__;
 	}
 
 	void __aeabi_unwind_cpp_pr2()
 	{
-		sceLibstdcxx.Todo(__FUNCTION__);
-		Emu.Pause();
+		throw __FUNCTION__;
 	}
 }
 
diff --git a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp
index d83e6d5f22..e7939506bc 100644
--- a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp
@@ -2,48 +2,242 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
+#include "Emu/SysCalls/lv2/sys_time.h"
+
+#define RETURN_ERROR(code) { Emu.Pause(); scePerf.Error("%s() failed: %s", __FUNCTION__, #code); return code; }
+
 extern psv_log_base scePerf;
 
-s32 scePerfArmPmonReset(s32 threadId)
+enum
 {
-	scePerf.Todo("scePerfArmPmonReset(threadId=0x%x)", threadId);
+	// Error Codes
+	SCE_PERF_ERROR_INVALID_ARGUMENT = 0x80580000,
+};
+
+enum : s32
+{
+	// Thread IDs
+	SCE_PERF_ARM_PMON_THREAD_ID_ALL = -1,
+	SCE_PERF_ARM_PMON_THREAD_ID_SELF = 0,
+};
+
+enum : u32
+{
+	// Counter Numbers
+	SCE_PERF_ARM_PMON_CYCLE_COUNTER = 31,
+	SCE_PERF_ARM_PMON_COUNTER_5 = 5,
+	SCE_PERF_ARM_PMON_COUNTER_4 = 4,
+	SCE_PERF_ARM_PMON_COUNTER_3 = 3,
+	SCE_PERF_ARM_PMON_COUNTER_2 = 2,
+	SCE_PERF_ARM_PMON_COUNTER_1 = 1,
+	SCE_PERF_ARM_PMON_COUNTER_0 = 0,
+
+	// Counter Masks
+	SCE_PERF_ARM_PMON_COUNTER_MASK_5 = 0x20,
+	SCE_PERF_ARM_PMON_COUNTER_MASK_4 = 0x10,
+	SCE_PERF_ARM_PMON_COUNTER_MASK_3 = 0x08,
+	SCE_PERF_ARM_PMON_COUNTER_MASK_2 = 0x04,
+	SCE_PERF_ARM_PMON_COUNTER_MASK_1 = 0x02,
+	SCE_PERF_ARM_PMON_COUNTER_MASK_0 = 0x01,
+	SCE_PERF_ARM_PMON_COUNTER_MASK_ALL = 0x3f,
+};
+
+enum : u8
+{
+	// Performance Counter Events
+	SCE_PERF_ARM_PMON_SOFT_INCREMENT = 0x00,
+	SCE_PERF_ARM_PMON_ICACHE_MISS = 0x01,
+	SCE_PERF_ARM_PMON_ITLB_MISS = 0x02,
+	SCE_PERF_ARM_PMON_DCACHE_MISS = 0x03,
+	SCE_PERF_ARM_PMON_DCACHE_ACCESS = 0x04,
+	SCE_PERF_ARM_PMON_DTLB_MISS = 0x05,
+	SCE_PERF_ARM_PMON_DATA_READ = 0x06,
+	SCE_PERF_ARM_PMON_DATA_WRITE = 0x07,
+	SCE_PERF_ARM_PMON_EXCEPTION_TAKEN = 0x09,
+	SCE_PERF_ARM_PMON_EXCEPTION_RETURN = 0x0A,
+	SCE_PERF_ARM_PMON_WRITE_CONTEXTID = 0x0B,
+	SCE_PERF_ARM_PMON_SOFT_CHANGEPC = 0x0C,
+	SCE_PERF_ARM_PMON_IMMEDIATE_BRANCH = 0x0D,
+	SCE_PERF_ARM_PMON_UNALIGNED = 0x0F,
+	SCE_PERF_ARM_PMON_BRANCH_MISPREDICT = 0x10,
+	SCE_PERF_ARM_PMON_PREDICT_BRANCH = 0x12,
+	SCE_PERF_ARM_PMON_COHERENT_LF_MISS = 0x50,
+	SCE_PERF_ARM_PMON_COHERENT_LF_HIT = 0x51,
+	SCE_PERF_ARM_PMON_ICACHE_STALL = 0x60,
+	SCE_PERF_ARM_PMON_DCACHE_STALL = 0x61,
+	SCE_PERF_ARM_PMON_MAINTLB_STALL = 0x62,
+	SCE_PERF_ARM_PMON_STREX_PASSED = 0x63,
+	SCE_PERF_ARM_PMON_STREX_FAILED = 0x64,
+	SCE_PERF_ARM_PMON_DATA_EVICTION = 0x65,
+	SCE_PERF_ARM_PMON_ISSUE_NO_DISPATCH = 0x66,
+	SCE_PERF_ARM_PMON_ISSUE_EMPTY = 0x67,
+	SCE_PERF_ARM_PMON_INST_RENAME = 0x68,
+	SCE_PERF_ARM_PMON_PREDICT_FUNC_RET = 0x6E,
+	SCE_PERF_ARM_PMON_MAIN_PIPE = 0x70,
+	SCE_PERF_ARM_PMON_SECOND_PIPE = 0x71,
+	SCE_PERF_ARM_PMON_LS_PIPE = 0x72,
+	SCE_PERF_ARM_PMON_FPU_RENAME = 0x73,
+	SCE_PERF_ARM_PMON_PLD_STALL = 0x80,
+	SCE_PERF_ARM_PMON_WRITE_STALL = 0x81,
+	SCE_PERF_ARM_PMON_INST_MAINTLB_STALL = 0x82,
+	SCE_PERF_ARM_PMON_DATA_MAINTLB_STALL = 0x83,
+	SCE_PERF_ARM_PMON_INST_UTLB_STALL = 0x84,
+	SCE_PERF_ARM_PMON_DATA_UTLB_STALL = 0x85,
+	SCE_PERF_ARM_PMON_DMB_STALL = 0x86,
+	SCE_PERF_ARM_PMON_INTEGER_CLOCK = 0x8A,
+	SCE_PERF_ARM_PMON_DATAENGINE_CLOCK = 0x8B,
+	SCE_PERF_ARM_PMON_ISB = 0x90,
+	SCE_PERF_ARM_PMON_DSB = 0x91,
+	SCE_PERF_ARM_PMON_DMB = 0x92,
+	SCE_PERF_ARM_PMON_EXT_INTERRUPT = 0x93,
+	SCE_PERF_ARM_PMON_PLE_LINE_REQ_COMPLETED = 0xA0,
+	SCE_PERF_ARM_PMON_PLE_CHANNEL_SKIPPED = 0xA1,
+	SCE_PERF_ARM_PMON_PLE_FIFO_FLUSH = 0xA2,
+	SCE_PERF_ARM_PMON_PLE_REQ_COMPLETED = 0xA3,
+	SCE_PERF_ARM_PMON_PLE_FIFO_OVERFLOW = 0xA4,
+	SCE_PERF_ARM_PMON_PLE_REQ_PROGRAMMED = 0xA5,
+};
+
+s32 scePerfArmPmonReset(ARMv7Context& context, s32 threadId)
+{
+	scePerf.Warning("scePerfArmPmonReset(threadId=0x%x)", threadId);
+
+	if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF)
+	{
+		throw __FUNCTION__;
+	}
+
+	context.counters = {};
 
 	return SCE_OK;
 }
 
-s32 scePerfArmPmonSelectEvent(s32 threadId, u32 counter, u8 eventCode)
+s32 scePerfArmPmonSelectEvent(ARMv7Context& context, s32 threadId, u32 counter, u8 eventCode)
 {
-	throw __FUNCTION__;
+	scePerf.Warning("scePerfArmPmonSelectEvent(threadId=0x%x, counter=0x%x, eventCode=0x%x)", threadId, counter, eventCode);
+
+	if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF)
+	{
+		throw __FUNCTION__;
+	}
+
+	if (counter >= 6)
+	{
+		RETURN_ERROR(SCE_PERF_ERROR_INVALID_ARGUMENT);
+	}
+
+	u32 value = 0; // initial value
+
+	switch (eventCode)
+	{
+	case SCE_PERF_ARM_PMON_SOFT_INCREMENT: break;
+
+	case SCE_PERF_ARM_PMON_BRANCH_MISPREDICT: 
+	case SCE_PERF_ARM_PMON_DCACHE_MISS:
+	case SCE_PERF_ARM_PMON_UNALIGNED:
+	{
+		value = 1; // these events will probably never be implemented
+		break;
+	}
+		
+	case SCE_PERF_ARM_PMON_PREDICT_BRANCH:
+	case SCE_PERF_ARM_PMON_DCACHE_ACCESS:
+	{
+		value = 1000; // these events will probably never be implemented
+		break;
+	}
+
+	default: throw "scePerfArmPmonSelectEvent(): unknown event requested";
+	}
+
+	context.counters[counter].event = eventCode;
+	context.counters[counter].value = value;
+
+	return SCE_OK;
 }
 
-s32 scePerfArmPmonStart(s32 threadId)
+s32 scePerfArmPmonStart(ARMv7Context& context, s32 threadId)
 {
-	throw __FUNCTION__;
+	scePerf.Warning("scePerfArmPmonStart(threadId=0x%x)", threadId);
+
+	if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF)
+	{
+		throw __FUNCTION__;
+	}
+
+	return SCE_OK;
 }
 
-s32 scePerfArmPmonStop(s32 threadId)
+s32 scePerfArmPmonStop(ARMv7Context& context, s32 threadId)
 {
-	throw __FUNCTION__;
+	scePerf.Warning("scePerfArmPmonStop(threadId=0x%x)");
+
+	if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF)
+	{
+		throw __FUNCTION__;
+	}
+
+	return SCE_OK;
 }
 
-s32 scePerfArmPmonGetCounterValue(s32 threadId, u32 counter, vm::psv::ptr<u32> pValue)
+s32 scePerfArmPmonGetCounterValue(ARMv7Context& context, s32 threadId, u32 counter, vm::psv::ptr<u32> pValue)
 {
-	throw __FUNCTION__;
+	scePerf.Warning("scePerfArmPmonGetCounterValue(threadId=0x%x, counter=%d, pValue=0x%x)", threadId, counter, pValue);
+
+	if (threadId != SCE_PERF_ARM_PMON_THREAD_ID_SELF)
+	{
+		throw __FUNCTION__;
+	}
+
+	if (counter >= 6 && counter != SCE_PERF_ARM_PMON_CYCLE_COUNTER)
+	{
+		RETURN_ERROR(SCE_PERF_ERROR_INVALID_ARGUMENT);
+	}
+
+	if (counter < 6)
+	{
+		*pValue = context.counters[counter].value;
+	}
+	else
+	{
+		throw "scePerfArmPmonGetCounterValue(): cycle counter requested";
+	}
+
+	return SCE_OK;
 }
 
-s32 scePerfArmPmonSoftwareIncrement(u32 mask)
+s32 scePerfArmPmonSoftwareIncrement(ARMv7Context& context, u32 mask)
 {
-	throw __FUNCTION__;
+	scePerf.Warning("scePerfArmPmonSoftwareIncrement(mask=0x%x)", mask);
+
+	if (mask > SCE_PERF_ARM_PMON_COUNTER_MASK_ALL)
+	{
+		RETURN_ERROR(SCE_PERF_ERROR_INVALID_ARGUMENT);
+	}
+
+	for (u32 i = 0; i < 6; i++, mask >>= 1)
+	{
+		if (mask & 1)
+		{
+			context.counters[i].value++;
+		}
+	}
+
+	return SCE_OK;
 }
 
 u64 scePerfGetTimebaseValue()
 {
-	throw __FUNCTION__;
+	scePerf.Warning("scePerfGetTimebaseValue()");
+
+	return get_system_time();
 }
 
 u32 scePerfGetTimebaseFrequency()
 {
-	throw __FUNCTION__;
+	scePerf.Warning("scePerfGetTimebaseFrequency()");
+
+	return 1;
 }
 
 s32 _sceRazorCpuInit(vm::psv::ptr<const void> pBufferBase, u32 bufferSize, u32 numPerfCounters, vm::psv::ptr<vm::psv::ptr<u32>> psceRazorVars)
diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp
index c622308f3d..bf36001a51 100644
--- a/rpcs3/Loader/ELF32.cpp
+++ b/rpcs3/Loader/ELF32.cpp
@@ -93,6 +93,37 @@ namespace loader
 			case MACHINE_MIPS: break;
 			case MACHINE_ARM:
 			{
+				struct psv_libc_param_t
+				{
+					u32 size; // 0x0000001c
+					u32 unk1; // 0x00000000
+
+					vm::psv::ptr<u32> sceLibcHeapSize;
+					vm::psv::ptr<u32> sceLibcHeapSizeDefault;
+					vm::psv::ptr<u32> sceLibcHeapExtendedAlloc;
+					vm::psv::ptr<u32> sceLibcHeapDelayedAlloc;
+
+					u32 unk2;
+				};
+
+				struct psv_process_param_t
+				{
+					u32 size; // 0x00000030
+					u32 unk1; // 'PSP2'
+					u32 unk2; // 0x00000005
+					u32 unk3;
+
+					vm::psv::ptr<const char> sceUserMainThreadName;
+					vm::psv::ptr<s32>        sceUserMainThreadPriority;
+					vm::psv::ptr<u32>        sceUserMainThreadStackSize;
+					vm::psv::ptr<u32>        sceUserMainThreadAttribute;
+					vm::psv::ptr<const char> sceProcessName;
+					vm::psv::ptr<u32>        sce_process_preload_disabled;
+					vm::psv::ptr<u32>        sceUserMainThreadCpuAffinityMask;
+
+					vm::psv::ptr<psv_libc_param_t> __sce_libcparam;
+				};
+
 				initialize_psv_modules();
 
 				auto armv7_thr_stop_data = vm::psv::ptr<u32>::make(Memory.PSV.RAM.AllocAlign(3 * 4));
@@ -104,10 +135,11 @@ namespace loader
 				u32 fnid_addr = 0;
 				u32 code_start = 0;
 				u32 code_end = 0;
-
 				u32 vnid_addr = 0;
 				std::unordered_map<u32, u32> vnid_list;
 
+				auto proc_param = vm::psv::ptr<psv_process_param_t>::make(0);
+
 				for (auto& shdr : m_shdrs)
 				{
 					// get secton name
@@ -130,24 +162,40 @@ namespace loader
 						code_start = shdr.data_le.sh_addr;
 						code_end = shdr.data_le.sh_size + code_start;
 					}
-					else if (!strcmp(name.c_str(), ".sceModuleInfo.rodata"))
+					else if (!strcmp(name.c_str(), ".sceExport.rodata"))
 					{
-						LOG_NOTICE(LOADER, ".sceModuleInfo.rodata analysis...");
+						LOG_NOTICE(LOADER, ".sceExport.rodata analysis...");
 
-						auto code = vm::psv::ptr<const u32>::make(shdr.data_le.sh_addr);
+						auto enid = vm::psv::ptr<const u32>::make(shdr.data_le.sh_addr);
+						auto edata = vm::psv::ptr<const u32>::make(enid.addr() + shdr.data_le.sh_size / 2);
 
-						// very rough way to find the entry point
-						while (code[0] != 0xffffffffu)
+						for (u32 j = 0; j < shdr.data_le.sh_size / 8; j++)
 						{
-							entry = code[0] + 0x81000000;
-							code++;
-
-							if (code.addr() >= shdr.data_le.sh_addr + shdr.data_le.sh_size)
+							switch (const u32 nid = enid[j])
 							{
-								LOG_ERROR(LOADER, "Unable to find entry point in .sceModuleInfo.rodata");
-								entry = 0;
+							case 0x935cd196: // set entry point
+							{
+								entry = edata[j];
 								break;
 							}
+
+							case 0x6c2224ba: // __sce_moduleinfo
+							{
+								// currently nothing, but it should theoretically be the root of analysis instead of section name comparison
+								break;
+							}
+
+							case 0x70fba1e7: // __sce_process_param
+							{
+								proc_param.set(edata[j]);
+								break;
+							}
+
+							default:
+							{
+								LOG_ERROR(LOADER, "Unknown export 0x%08x (addr=0x%08x)", nid, edata[j]);
+							}
+							}
 						}
 					}
 					else if (!strcmp(name.c_str(), ".sceFNID.rodata"))
@@ -320,10 +368,44 @@ namespace loader
 					}
 				}
 
+				LOG_NOTICE(LOADER, "__sce_process_param(addr=0x%x) analysis...", proc_param);
+
+				if (proc_param->size != 0x30 || proc_param->unk1 != *(u32*)"PSP2" || proc_param->unk2 != 5)
+				{
+					LOG_ERROR(LOADER, "__sce_process_param: unexpected data found (size=0x%x, 0x%x, 0x%x, 0x%x)", proc_param->size, proc_param->unk1, proc_param->unk2, proc_param->unk3);
+				}
+
+				LOG_NOTICE(LOADER, "*** &sceUserMainThreadName            = 0x%x", proc_param->sceUserMainThreadName);
+				LOG_NOTICE(LOADER, "*** &sceUserMainThreadPriority        = 0x%x", proc_param->sceUserMainThreadPriority);
+				LOG_NOTICE(LOADER, "*** &sceUserMainThreadStackSize       = 0x%x", proc_param->sceUserMainThreadStackSize);
+				LOG_NOTICE(LOADER, "*** &sceUserMainThreadAttribute       = 0x%x", proc_param->sceUserMainThreadAttribute);
+				LOG_NOTICE(LOADER, "*** &sceProcessName                   = 0x%x", proc_param->sceProcessName);
+				LOG_NOTICE(LOADER, "*** &sce_process_preload_disabled     = 0x%x", proc_param->sce_process_preload_disabled);
+				LOG_NOTICE(LOADER, "*** &sceUserMainThreadCpuAffinityMask = 0x%x", proc_param->sceUserMainThreadCpuAffinityMask);
+
+				auto libc_param = proc_param->__sce_libcparam;
+
+				LOG_NOTICE(LOADER, "__sce_libcparam(addr=0x%x) analysis...", libc_param);
+
+				if (libc_param->size != 0x1c || libc_param->unk1)
+				{
+					LOG_ERROR(LOADER, "__sce_libcparam: unexpected data found (size=0x%x, 0x%x, 0x%x)", libc_param->size, libc_param->unk1, libc_param->unk2);
+				}
+
+				LOG_NOTICE(LOADER, "*** &sceLibcHeapSize          = 0x%x", libc_param->sceLibcHeapSize);
+				LOG_NOTICE(LOADER, "*** &sceLibcHeapSizeDefault   = 0x%x", libc_param->sceLibcHeapSizeDefault);
+				LOG_NOTICE(LOADER, "*** &sceLibcHeapExtendedAlloc = 0x%x", libc_param->sceLibcHeapExtendedAlloc);
+				LOG_NOTICE(LOADER, "*** &sceLibcHeapDelayedAlloc  = 0x%x", libc_param->sceLibcHeapDelayedAlloc);
+
 				armv7_init_tls();
 				armv7_decoder_initialize(code_start, code_end);
 
-				armv7_thread(entry & ~1 /* TODO: Thumb/ARM encoding selection */, "main_thread").args({ Emu.GetPath(), "-emu" }).run();
+				const std::string& thread_name = proc_param->sceUserMainThreadName ? proc_param->sceUserMainThreadName.get_ptr() : "main_thread";
+				const u32 stack_size = proc_param->sceUserMainThreadStackSize ? *proc_param->sceUserMainThreadStackSize : 0;
+				const u32 priority = proc_param->sceUserMainThreadPriority ? *proc_param->sceUserMainThreadPriority : 0;
+
+				/* TODO: Thumb/ARM encoding selection */
+				armv7_thread(entry & ~1, thread_name, stack_size, priority).args({ Emu.GetPath(), "-emu" }).run();
 				break;
 			}
 			case MACHINE_SPU: spu_thread(m_ehdr.is_le() ? m_ehdr.data_le.e_entry : m_ehdr.data_be.e_entry, "main_thread").args({ Emu.GetPath()/*, "-emu"*/ }).run(); break;

From 23c7028b2acf2bc18e657d6613e7ebfd42b6a6eb Mon Sep 17 00:00:00 2001
From: Nekotekina <fbx@3mf.ru>
Date: Mon, 2 Feb 2015 12:14:49 +0300
Subject: [PATCH 67/70] ARMv7: ARM encoding introduced; bugfixes

---
 Utilities/GNU.h                             |   6 +
 Utilities/Log.h                             |   2 +-
 Utilities/StrFmt.cpp                        |   3 +-
 Utilities/StrFmt.h                          |  11 +-
 rpcs3/Emu/ARMv7/ARMv7Context.h              |   2 +-
 rpcs3/Emu/ARMv7/ARMv7Decoder.cpp            | 132 ++++++++++++++------
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp        |  31 ++---
 rpcs3/Emu/ARMv7/ARMv7Thread.cpp             |   8 +-
 rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp    |   4 +-
 rpcs3/Emu/ARMv7/Modules/sceRtc.cpp          |   4 +-
 rpcs3/Emu/Memory/vm.cpp                     |   7 +-
 rpcs3/Emu/SysCalls/LogBase.h                |  14 +--
 rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp |  12 +-
 rpcs3/Emu/SysCalls/Modules/cellSync.cpp     |   4 +-
 rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp  |  13 +-
 rpcs3/Loader/ELF32.cpp                      |  17 ++-
 16 files changed, 161 insertions(+), 109 deletions(-)

diff --git a/Utilities/GNU.h b/Utilities/GNU.h
index b1988b4dfa..a8db7f8703 100644
--- a/Utilities/GNU.h
+++ b/Utilities/GNU.h
@@ -14,6 +14,12 @@
 #define __noinline __attribute__((noinline))
 #endif
 
+#ifdef _WIN32
+#define __safebuffers __declspec(safebuffers)
+#else
+#define __safebuffers
+#endif
+
 template<size_t size>
 void strcpy_trunc(char(&dst)[size], const std::string& src)
 {
diff --git a/Utilities/Log.h b/Utilities/Log.h
index d1710f05cf..5ff8504ce7 100644
--- a/Utilities/Log.h
+++ b/Utilities/Log.h
@@ -132,5 +132,5 @@ void log_message(Log::LogType type, Log::LogSeverity sev, std::string text);
 template<typename... Targs> 
 __noinline void log_message(Log::LogType type, Log::LogSeverity sev, const char* fmt, Targs... args)
 {
-	log_message(type, sev, fmt::detail::format(fmt, strlen(fmt), fmt::do_unveil(args)...));
+	log_message(type, sev, fmt::detail::format(fmt, fmt::do_unveil(args)...));
 }
diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp
index 0b8410e2f4..2de4fc889f 100644
--- a/Utilities/StrFmt.cpp
+++ b/Utilities/StrFmt.cpp
@@ -144,8 +144,9 @@ size_t fmt::detail::get_fmt_precision(const char* fmt, size_t len)
 	return 1;
 }
 
-std::string fmt::detail::format(const char* fmt, size_t len)
+std::string fmt::detail::format(const char* fmt)
 {
+	const size_t len = strlen(fmt);
 	const size_t fmt_start = get_fmt_start(fmt, len);
 	if (fmt_start != len)
 	{
diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h
index 3bc464fcb8..f7474efa25 100644
--- a/Utilities/StrFmt.h
+++ b/Utilities/StrFmt.h
@@ -429,16 +429,17 @@ namespace fmt
 			}
 		};
 
-		std::string format(const char* fmt, size_t len); // terminator
+		std::string format(const char* fmt); // terminator
 
 		template<typename T, typename... Args>
-		std::string format(const char* fmt, size_t len, const T& arg, Args... args)
+		std::string format(const char* fmt, const T& arg, Args... args)
 		{
+			const size_t len = strlen(fmt);
 			const size_t fmt_start = get_fmt_start(fmt, len);
 			const size_t fmt_len = get_fmt_len(fmt + fmt_start, len - fmt_start);
 			const size_t fmt_end = fmt_start + fmt_len;
 
-			return std::string(fmt, fmt_start) + get_fmt<T>::text(fmt + fmt_start, fmt_len, arg) + format(fmt + fmt_end, len - fmt_end, args...);
+			return std::string(fmt, fmt_start) + get_fmt<T>::text(fmt + fmt_start, fmt_len, arg) + format(fmt + fmt_end, args...);
 		}
 	};
 
@@ -551,9 +552,9 @@ namespace fmt
 	Other features are not supported.
 	*/
 	template<typename... Args>
-	__forceinline std::string format(const char* fmt, Args... args)
+	__forceinline __safebuffers std::string format(const char* fmt, Args... args)
 	{
-		return detail::format(fmt, strlen(fmt), do_unveil(args)...);
+		return detail::format(fmt, do_unveil(args)...);
 	}
 
 	//convert a wxString to a std::string encoded in utf8
diff --git a/rpcs3/Emu/ARMv7/ARMv7Context.h b/rpcs3/Emu/ARMv7/ARMv7Context.h
index fa9e04c64d..5ca662939f 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Context.h
+++ b/rpcs3/Emu/ARMv7/ARMv7Context.h
@@ -137,7 +137,7 @@ struct ARMv7Context
 		}
 		else
 		{
-			write_pc(value & ~1);
+			write_pc(value);
 		}
 	}
 
diff --git a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
index ce2dbb6914..2c0c976697 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Decoder.cpp
@@ -1159,9 +1159,44 @@ struct ARMv7_op4t_table_t
 			}
 		}
 	}
+
+	const ARMv7_opcode_t* HACK()
+	{
+		for (auto& opcode : table)
+		{
+			if (opcode->func == ARMv7_instrs::HACK)
+			{
+				return opcode;
+			}
+		}
+
+		throw "HACK instruction not found";
+	}
 	
 } g_op4t;
 
+struct ARMv7_op4arm_table_t
+{
+	std::vector<const ARMv7_opcode_t*> table;
+
+	ARMv7_op4arm_table_t()
+	{
+		for (auto& opcode : ARMv7_opcode_table)
+		{
+			if (opcode.type >= A1)
+			{
+				if (opcode.code & ~opcode.mask)
+				{
+					LOG_ERROR(GENERAL, "%s: wrong opcode mask (mask=0x%08x, code=0x%08x)", opcode.name, opcode.mask, opcode.code);
+				}
+
+				table.push_back(&opcode);
+			}
+		}
+	}
+
+} g_op4arm;
+
 std::unordered_map<u32, const ARMv7_opcode_t*> g_opct;
 
 void armv7_decoder_initialize(u32 addr, u32 end_addr, bool dump)
@@ -1231,16 +1266,21 @@ void armv7_decoder_initialize(u32 addr, u32 end_addr, bool dump)
 			const u32 i2 = (code.data >> 11) & 0x1 ^ s ^ 1;
 			const u32 target = (addr + 4 & ~3) + sign<25, u32>(s << 24 | i2 << 23 | i1 << 22 | (code.data & 0x3ff0000) >> 4 | (code.data & 0x7ff) << 1);
 
-			// possibly a call to imported function:
-			if (target >= end_addr && ((target - end_addr) % 16) == 0 && vm::psv::read16(target) == 0xf870)
-			{
-				const u32 instr = vm::psv::read32(target);
+			const u32 instr = vm::psv::read32(target);
 
-				// check if not "unimplemented"
-				if (instr >> 16)
+			// possibly a call to imported function:
+			if (target >= end_addr && ((target - end_addr) % 16) == 0 && (instr & 0xfff000f0) == 0xe0700090)
+			{
+				// check if implemented
+				if (const u32 func = (instr & 0xfff00) >> 4 | (instr & 0xf))
 				{
-					// replace BLX with "hack" instruction directly, it can help to see where it was called from
-					vm::psv::write32(addr, instr);
+					// replace BLX with "HACK" instruction directly (in Thumb form), it can help to see where it was called from
+					vm::psv::write32(addr, 0xf870 | func << 16);
+					g_opct[0xf8700000 | func] = g_op4t.HACK();
+				}
+				else
+				{
+					// leave as is if unimplemented
 				}
 			}
 			else
@@ -1257,50 +1297,60 @@ void armv7_decoder_initialize(u32 addr, u32 end_addr, bool dump)
 		addr += found->length;
 	}
 
-	while (vm::psv::read16(addr) == 0xf870)
-	{
-		g_opct[0xf8700000 | vm::psv::read16(addr + 2)] = g_op4t.table[0];
-		addr += 16;
-	}
-
 	LOG_NOTICE(ARMv7, "armv7_decoder_initialize() finished, g_opct.size() = %lld", (u64)g_opct.size());
 }
 
 u32 ARMv7Decoder::DecodeMemory(const u32 address)
 {
-	if (address & 0x1)
-	{
-		throw "ARMv7Decoder::DecodeMemory() failed (something is wrong with instruction set)";
-	}
-
 	ARMv7Code code = {};
-	code.code0 = vm::psv::read16(address);
 
-	if (auto opcode = g_op2t.data[code.code0])
+	if (m_ctx.ISET == Thumb)
 	{
-		(*opcode->func)(m_ctx, code, opcode->type);
-		return 2;
+		code.code0 = vm::psv::read16(address);
+
+		if (auto opcode = g_op2t.data[code.code0])
+		{
+			(*opcode->func)(m_ctx, code, opcode->type);
+			return 2;
+		}
+
+		code.code1 = code.code0;
+		code.code0 = vm::psv::read16(address + 2);
+
+		auto op = g_opct.find(code.data);
+		if (op != g_opct.end())
+		{
+			(*op->second->func)(m_ctx, code, op->second->type);
+			return 4;
+		}
+
+		//for (auto opcode : g_op4t.table)
+		//{
+		//	if ((code.data & opcode->mask) == opcode->code && (!opcode->skip || !opcode->skip(code.data)))
+		//	{
+		//		(*opcode->func)(m_ctx, code, opcode->type);
+		//		return 4;
+		//	}
+		//}
 	}
-
-	code.code1 = code.code0;
-	code.code0 = vm::psv::read16(address + 2);
-
-	auto op = g_opct.find(code.data);
-	if (op != g_opct.end())
+	else if (m_ctx.ISET == ARM)
 	{
-		(*op->second->func)(m_ctx, code, op->second->type);
-		return 4;
+		code.data = vm::psv::read32(address);
+
+		for (auto opcode : g_op4arm.table)
+		{
+			if ((code.data & opcode->mask) == opcode->code && (!opcode->skip || !opcode->skip(code.data)))
+			{
+				(*opcode->func)(m_ctx, code, opcode->type);
+				return 4;
+			}
+		}
 	}
-
-	//for (auto opcode : g_op4t.table)
-	//{
-	//	if ((code.data & opcode->mask) == opcode->code && (!opcode->skip || !opcode->skip(code.data)))
-	//	{
-	//		(*opcode->func)(m_ctx, code, opcode->type);
-	//		return 4;
-	//	}
-	//}
-
+	else
+	{
+		throw "ARMv7Decoder::DecodeMemory() failed (invalid instruction set set)";
+	}
+	
 	ARMv7_instrs::UNK(m_ctx, code);
 	return 4;
 
diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index c204351616..d7b1c9adf8 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -280,7 +280,14 @@ namespace ARMv7_instrs
 
 void ARMv7_instrs::UNK(ARMv7Context& context, const ARMv7Code code)
 {
-	throw fmt::format("Unknown/illegal opcode: 0x%04x 0x%04x", code.code1, code.code0);
+	if (context.ISET == Thumb)
+	{
+		throw fmt::format("Unknown/illegal opcode: 0x%04x 0x%04x", code.code1, code.code0);
+	}
+	else
+	{
+		throw fmt::format("Unknown/illegal opcode: 0x%08x", code.data);
+	}
 }
 
 void ARMv7_instrs::HACK(ARMv7Context& context, const ARMv7Code code, const ARMv7_encoding type)
@@ -976,16 +983,7 @@ void ARMv7_instrs::BLX(ARMv7Context& context, const ARMv7Code code, const ARMv7_
 	if (ConditionPassed(context, cond))
 	{
 		context.LR = newLR;
-		if (target & 1)
-		{
-			context.ISET = Thumb;
-			context.thread.SetBranch(target & ~1);
-		}
-		else
-		{
-			context.ISET = ARM;
-			context.thread.SetBranch(target);
-		}
+		context.write_pc(target);
 	}
 }
 
@@ -1014,16 +1012,7 @@ void ARMv7_instrs::BX(ARMv7Context& context, const ARMv7Code code, const ARMv7_e
 
 	if (ConditionPassed(context, cond))
 	{
-		if (target & 1)
-		{
-			context.ISET = Thumb;
-			context.thread.SetBranch(target & ~1);
-		}
-		else
-		{
-			context.ISET = ARM;
-			context.thread.SetBranch(target);
-		}
+		context.write_pc(target);
 	}
 }
 
diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
index 6e1cec6fa8..9fe72a3d49 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp
@@ -12,7 +12,8 @@
 
 void ARMv7Context::write_pc(u32 value)
 {
-	thread.SetBranch(value);
+	ISET = value & 1 ? Thumb : ARM;
+	thread.SetBranch(value & ~1);
 }
 
 u32 ARMv7Context::read_pc()
@@ -109,10 +110,11 @@ ARMv7Thread::~ARMv7Thread()
 
 void ARMv7Thread::InitRegs()
 {
-	memset(context.GPR, 0, sizeof(context.GPR[0]) * 15);
+	memset(context.GPR, 0, sizeof(context.GPR));
 	context.APSR.APSR = 0;
 	context.IPSR.IPSR = 0;
-	//context.ISET = Thumb;
+	context.ISET = PC & 1 ? Thumb : ARM; // select instruction set
+	context.thread.SetPc(PC & ~1); // and fix PC
 	context.ITSTATE.IT = 0;
 	context.SP = m_stack_addr + m_stack_size;
 	context.TLS = armv7_get_tls(GetId());
diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
index dbbce2e151..d7bd58c79a 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp
@@ -48,12 +48,12 @@ s32 sceKernelCreateThread(
 	ARMv7Thread& new_thread = static_cast<ARMv7Thread&>(Emu.GetCPU().AddThread(CPU_THREAD_ARMv7));
 
 	const auto id = new_thread.GetId();
-	new_thread.SetEntry(entry.addr() ^ 1);
+	new_thread.SetEntry(entry.addr());
 	new_thread.SetPrio(initPriority);
 	new_thread.SetStackSize(stackSize);
 	new_thread.SetName(pName.get_ptr());
 
-	sceLibKernel.Error("*** New ARMv7 Thread [%s] (entry=0x%x)^1: id -> 0x%x", pName.get_ptr(), entry, id);
+	sceLibKernel.Warning("*** New ARMv7 Thread [%s] (entry=0x%x): id -> 0x%x", pName.get_ptr(), entry, id);
 
 	new_thread.Run();
 	return id;
diff --git a/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp b/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp
index 96d44a3686..9b81d86072 100644
--- a/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/sceRtc.cpp
@@ -59,7 +59,7 @@ s32 sceRtcCheckValid(vm::psv::ptr<const SceDateTime> pTime)
 	throw __FUNCTION__;
 }
 
-s32 sceRtcSetTime_t(vm::psv::ptr<SceDateTime> pTime, time_t iTime)
+s32 sceRtcSetTime_t(vm::psv::ptr<SceDateTime> pTime, u32 iTime)
 {
 	throw __FUNCTION__;
 }
@@ -69,7 +69,7 @@ s32 sceRtcSetTime64_t(vm::psv::ptr<SceDateTime> pTime, u64 ullTime)
 	throw __FUNCTION__;
 }
 
-s32 sceRtcGetTime_t(vm::psv::ptr<const SceDateTime> pTime, vm::psv::ptr<time_t> piTime)
+s32 sceRtcGetTime_t(vm::psv::ptr<const SceDateTime> pTime, vm::psv::ptr<u32> piTime)
 {
 	throw __FUNCTION__;
 }
diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp
index 69e42e62cb..04d3a0f90a 100644
--- a/rpcs3/Emu/Memory/vm.cpp
+++ b/rpcs3/Emu/Memory/vm.cpp
@@ -69,7 +69,7 @@ namespace vm
 
 	void error(const u64 addr, const char* func)
 	{
-		throw fmt::format("%s(): invalid address 0x%llx", func, addr);
+		throw fmt::format("%s(): failed to cast 0x%llx (too big value)", func, addr);
 	}
 
 	namespace ps3
@@ -249,7 +249,10 @@ namespace vm
 
 		case CPU_THREAD_ARMv7:
 		{
-			assert(!"stack_pop(): ARMv7 not supported");
+			ARMv7Context& context = static_cast<ARMv7Thread&>(CPU).context;
+
+			assert(context.SP == addr);
+			context.SP = old_pos;
 			return;
 		}
 
diff --git a/rpcs3/Emu/SysCalls/LogBase.h b/rpcs3/Emu/SysCalls/LogBase.h
index 7f496d6c6e..82e569e808 100644
--- a/rpcs3/Emu/SysCalls/LogBase.h
+++ b/rpcs3/Emu/SysCalls/LogBase.h
@@ -17,9 +17,9 @@ class LogBase
 	void LogOutput(LogType type, const std::string& text) const;
 
 	template<typename... Targs>
-	__noinline void LogPrepare(LogType type, const char* fmt, size_t len, Targs... args) const
+	__noinline void LogPrepare(LogType type, const char* fmt, Targs... args) const
 	{
-		LogOutput(type, fmt::detail::format(fmt, len, args...));
+		LogOutput(type, fmt::detail::format(fmt, args...));
 	}
 
 public:
@@ -38,7 +38,7 @@ public:
 	template<typename... Targs>
 	__forceinline void Notice(const char* fmt, Targs... args) const
 	{
-		LogPrepare(LogNotice, fmt, strlen(fmt), fmt::do_unveil(args)...);
+		LogPrepare(LogNotice, fmt, fmt::do_unveil(args)...);
 	}
 
 	template<typename... Targs>
@@ -53,25 +53,25 @@ public:
 	template<typename... Targs>
 	__forceinline void Success(const char* fmt, Targs... args) const
 	{
-		LogPrepare(LogSuccess, fmt, strlen(fmt), fmt::do_unveil(args)...);
+		LogPrepare(LogSuccess, fmt, fmt::do_unveil(args)...);
 	}
 
 	template<typename... Targs>
 	__forceinline void Warning(const char* fmt, Targs... args) const
 	{
-		LogPrepare(LogWarning, fmt, strlen(fmt), fmt::do_unveil(args)...);
+		LogPrepare(LogWarning, fmt, fmt::do_unveil(args)...);
 	}
 
 	template<typename... Targs>
 	__forceinline void Error(const char* fmt, Targs... args) const
 	{
-		LogPrepare(LogError, fmt, strlen(fmt), fmt::do_unveil(args)...);
+		LogPrepare(LogError, fmt, fmt::do_unveil(args)...);
 	}
 
 	template<typename... Targs>
 	__forceinline void Todo(const char* fmt, Targs... args) const
 	{
-		LogPrepare(LogTodo, fmt, strlen(fmt), fmt::do_unveil(args)...);
+		LogPrepare(LogTodo, fmt, fmt::do_unveil(args)...);
 	}
 };
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
index 18724020af..79ad2d72bc 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
@@ -372,7 +372,7 @@ s32 cellSaveDataListSave2(
 	for (u32 i=0; i<saveEntries.size(); i++) {
 		strcpy_trunc(dirList[i].dirName, saveEntries[i].dirName);
 		strcpy_trunc(dirList[i].listParam, saveEntries[i].listParam);
-		*dirList[i].reserved = {};
+		memset(dirList[i].reserved, 0, sizeof(dirList[i].reserved));
 	}
 
 	funcList(result, listGet, listSet);
@@ -464,7 +464,7 @@ s32 cellSaveDataListLoad2(
 	for (u32 i=0; i<saveEntries.size(); i++) {
 		strcpy_trunc(dirList[i].dirName, saveEntries[i].dirName);
 		strcpy_trunc(dirList[i].listParam, saveEntries[i].listParam);
-		*dirList[i].reserved = {};
+		memset(dirList[i].reserved, 0, sizeof(dirList[i].reserved));
 	}
 
 	funcList(result, listGet, listSet);
@@ -553,7 +553,7 @@ s32 cellSaveDataFixedSave2(
 	for (u32 i = 0; i<saveEntries.size(); i++) {
 		strcpy_trunc(dirList[i].dirName, saveEntries[i].dirName);
 		strcpy_trunc(dirList[i].listParam, saveEntries[i].listParam);
-		*dirList[i].reserved = {};
+		memset(dirList[i].reserved, 0, sizeof(dirList[i].reserved));
 	}
 	funcFixed(result, listGet, fixedSet);
 	if (result->result < 0)	{
@@ -629,7 +629,7 @@ s32 cellSaveDataFixedLoad2(
 	for (u32 i = 0; i<saveEntries.size(); i++) {
 		strcpy_trunc(dirList[i].dirName, saveEntries[i].dirName);
 		strcpy_trunc(dirList[i].listParam, saveEntries[i].listParam);
-		*dirList[i].reserved = {};
+		memset(dirList[i].reserved, 0, sizeof(dirList[i].reserved));
 	}
 	funcFixed(result, listGet, fixedSet);
 	if (result->result < 0)	{
@@ -826,7 +826,7 @@ s32 cellSaveDataListAutoSave(
 	//for (u32 i = 0; i<saveEntries.size(); i++) {
 	//	strcpy_trunc(dirList[i].dirName, saveEntries[i].dirName.c_str());
 	//	strcpy_trunc(dirList[i].listParam, saveEntries[i].listParam.c_str());
-	//	*dirList[i].reserved = {};
+	//	memset(dirList[i].reserved, 0, sizeof(dirList[i].reserved));
 	//}
 
 	//funcFixed(result, listGet, fixedSet);
@@ -909,7 +909,7 @@ s32 cellSaveDataListAutoLoad(
 	//for (u32 i = 0; i<saveEntries.size(); i++) {
 	//	strcpy_trunc(dirList[i].dirName, saveEntries[i].dirName);
 	//	strcpy_trunc(dirList[i].listParam, saveEntries[i].listParam);
-	//	*dirList[i].reserved = {};
+	//	memset(dirList[i].reserved, 0, sizeof(dirList[i].reserved));
 	//}
 
 	//funcFixed(result, listGet, fixedSet);
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
index 7bce4b7769..121147d385 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp
@@ -850,8 +850,8 @@ void syncLFQueueInit(vm::ptr<CellSyncLFQueue> queue, vm::ptr<u8> buffer, u32 siz
 	queue->m_depth = depth;
 	queue->m_buffer = buffer;
 	queue->m_direction = direction;
-	*queue->m_hs1 = {};
-	*queue->m_hs2 = {};
+	memset(queue->m_hs1, 0, sizeof(queue->m_hs1));
+	memset(queue->m_hs2, 0, sizeof(queue->m_hs2));
 	queue->m_eaSignal = eaSignal;
 
 	if (direction == CELL_SYNC_QUEUE_ANY2ANY)
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
index 99555c70cf..f38865db09 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
@@ -217,6 +217,7 @@ int cellVideoOutGetConfiguration(u32 videoOut, vm::ptr<CellVideoOutConfiguration
 		videoOut, config.addr(), option.addr());
 
 	if (option) *option = {};
+	*config = {};
 
 	switch(videoOut)
 	{
@@ -224,13 +225,11 @@ int cellVideoOutGetConfiguration(u32 videoOut, vm::ptr<CellVideoOutConfiguration
 		config->resolutionId = Emu.GetGSManager().GetInfo().mode.resolutionId;
 		config->format = Emu.GetGSManager().GetInfo().mode.format;
 		config->aspect = Emu.GetGSManager().GetInfo().mode.aspect;
-		*config->reserved = {};
 		config->pitch = Emu.GetGSManager().GetInfo().mode.pitch;
 
 		return CELL_VIDEO_OUT_SUCCEEDED;
 
 	case CELL_VIDEO_OUT_SECONDARY:
-		*config = {}; // ???
 
 		return CELL_VIDEO_OUT_SUCCEEDED;
 	}
@@ -478,22 +477,25 @@ int cellAudioOutGetState(u32 audioOut, u32 deviceIndex, vm::ptr<CellAudioOutStat
 {
 	cellSysutil->Warning("cellAudioOutGetState(audioOut=0x%x, deviceIndex=0x%x, state_addr=0x%x)", audioOut, deviceIndex, state.addr());
 
+	*state = {};
+
 	switch(audioOut)
 	{
 	case CELL_AUDIO_OUT_PRIMARY:
 		state->state = Emu.GetAudioManager().GetState();
 		state->encoder = Emu.GetAudioManager().GetInfo().mode.encoder;
-		*state->reserved = {};
 		state->downMixer = Emu.GetAudioManager().GetInfo().mode.downMixer;
 		state->soundMode.type = Emu.GetAudioManager().GetInfo().mode.type;
 		state->soundMode.channel = Emu.GetAudioManager().GetInfo().mode.channel;
 		state->soundMode.fs = Emu.GetAudioManager().GetInfo().mode.fs;
 		state->soundMode.reserved = 0;
 		state->soundMode.layout = Emu.GetAudioManager().GetInfo().mode.layout;
+
 		return CELL_AUDIO_OUT_SUCCEEDED;
 
 	case CELL_AUDIO_OUT_SECONDARY:
-		*state = { CELL_AUDIO_OUT_OUTPUT_STATE_DISABLED };
+		state->state = CELL_AUDIO_OUT_OUTPUT_STATE_DISABLED;
+
 		return CELL_AUDIO_OUT_SUCCEEDED;
 	}
 
@@ -534,19 +536,18 @@ int cellAudioOutGetConfiguration(u32 audioOut, vm::ptr<CellAudioOutConfiguration
 	cellSysutil->Warning("cellAudioOutGetConfiguration(audioOut=%d, config_addr=0x%x, option_addr=0x%x)", audioOut, config.addr(), option.addr());
 
 	if (option) *option = {};
+	*config = {};
 
 	switch(audioOut)
 	{
 	case CELL_AUDIO_OUT_PRIMARY:
 		config->channel = Emu.GetAudioManager().GetInfo().mode.channel;
 		config->encoder = Emu.GetAudioManager().GetInfo().mode.encoder;
-		*config->reserved = {};
 		config->downMixer = Emu.GetAudioManager().GetInfo().mode.downMixer;
 
 		return CELL_AUDIO_OUT_SUCCEEDED;
 
 	case CELL_AUDIO_OUT_SECONDARY:
-		*config = {};
 
 		return CELL_AUDIO_OUT_SUCCEEDED;
 	}
diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp
index bf36001a51..89112c8692 100644
--- a/rpcs3/Loader/ELF32.cpp
+++ b/rpcs3/Loader/ELF32.cpp
@@ -104,6 +104,10 @@ namespace loader
 					vm::psv::ptr<u32> sceLibcHeapDelayedAlloc;
 
 					u32 unk2;
+					u32 unk3;
+					
+					vm::psv::ptr<u32> __sce_libcmallocreplace;
+					vm::psv::ptr<u32> __sce_libcnewreplace;
 				};
 
 				struct psv_process_param_t
@@ -233,18 +237,14 @@ namespace loader
 									LOG_NOTICE(LOADER, "Imported function %s (nid=0x%08x, addr=0x%x)", func->name, nid, addr);
 								}
 
-								// writing Thumb code (temporarily, because it should be ARM)
-								vm::psv::write16(addr + 0, 0xf870); // HACK instruction (Thumb)
-								vm::psv::write16(addr + 2, (u16)get_psv_func_index(func)); // function index
-								vm::psv::write16(addr + 4, 0x4770); // BX LR
-								vm::psv::write16(addr + 6, 0); // null
+								const u32 code = get_psv_func_index(func);
+								vm::psv::write32(addr + 0, 0xe0700090 | (code & 0xfff0) << 4 | (code & 0xf)); // HACK instruction (ARM)
 							}
 							else
 							{
 								LOG_ERROR(LOADER, "Unknown function 0x%08x (addr=0x%x)", nid, addr);
 
-								vm::psv::write16(addr + 0, 0xf870); // HACK instruction (Thumb)
-								vm::psv::write16(addr + 2, 0); // index 0 (unimplemented stub)
+								vm::psv::write32(addr + 0, 0xe0700090); // HACK instruction (ARM), unimplemented stub (code 0)
 								vm::psv::write32(addr + 4, nid); // nid
 							}
 
@@ -404,8 +404,7 @@ namespace loader
 				const u32 stack_size = proc_param->sceUserMainThreadStackSize ? *proc_param->sceUserMainThreadStackSize : 0;
 				const u32 priority = proc_param->sceUserMainThreadPriority ? *proc_param->sceUserMainThreadPriority : 0;
 
-				/* TODO: Thumb/ARM encoding selection */
-				armv7_thread(entry & ~1, thread_name, stack_size, priority).args({ Emu.GetPath(), "-emu" }).run();
+				armv7_thread(entry, thread_name, stack_size, priority).args({ Emu.GetPath(), "-emu" }).run();
 				break;
 			}
 			case MACHINE_SPU: spu_thread(m_ehdr.is_le() ? m_ehdr.data_le.e_entry : m_ehdr.data_be.e_entry, "main_thread").args({ Emu.GetPath()/*, "-emu"*/ }).run(); break;

From bd65f8107495186d6f0f0a2b0ae585dda666c1c3 Mon Sep 17 00:00:00 2001
From: Peter Tissen <dravorek@gmail.com>
Date: Mon, 2 Feb 2015 11:21:35 +0100
Subject: [PATCH 68/70] Fix some small mistakes

* replace_first and replace_all were in the wrong namespace, so they could not be linked
* replace_all did not work correctly (would loop indefinately)
* cellGcmUnmapIoAddress did not shif the size, so it would run past the end of the mmap array
* fsstat did use a 32-bit size on Windows, so files >4 gigs would return "stat failed"
---
 Utilities/StrFmt.cpp                      |  9 +++++----
 Utilities/StrFmt.h                        |  2 +-
 rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp |  1 +
 rpcs3/Emu/SysCalls/lv2/cellFs.cpp         | 12 +++++++++---
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp
index 0b8410e2f4..8760fddd69 100644
--- a/Utilities/StrFmt.cpp
+++ b/Utilities/StrFmt.cpp
@@ -157,7 +157,7 @@ std::string fmt::detail::format(const char* fmt, size_t len)
 
 extern const std::string fmt::placeholder = "???";
 
-std::string replace_first(const std::string& src, const std::string& from, const std::string& to)
+std::string fmt::replace_first(const std::string& src, const std::string& from, const std::string& to)
 {
 	auto pos = src.find(from);
 
@@ -169,11 +169,12 @@ std::string replace_first(const std::string& src, const std::string& from, const
 	return (pos ? src.substr(0, pos) + to : to) + std::string(src.c_str() + pos + from.length());
 }
 
-std::string replace_all(std::string src, const std::string& from, const std::string& to)
+std::string fmt::replace_all(const std::string &src, const std::string& from, const std::string& to)
 {
-	for (auto pos = src.find(from); pos != std::string::npos; src.find(from, pos + 1))
+	std::string target = src;
+	for (auto pos = target.find(from); pos != std::string::npos; pos = target.find(from, pos + 1))
 	{
-		src = (pos ? src.substr(0, pos) + to : to) + std::string(src.c_str() + pos + from.length());
+		target = (pos ? target.substr(0, pos) + to : to) + std::string(target.c_str() + pos + from.length());
 		pos += to.length();
 	}
 
diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h
index 3bc464fcb8..001dbaa742 100644
--- a/Utilities/StrFmt.h
+++ b/Utilities/StrFmt.h
@@ -123,7 +123,7 @@ namespace fmt
 	}
 
 	std::string replace_first(const std::string& src, const std::string& from, const std::string& to);
-	std::string replace_all(std::string src, const std::string& from, const std::string& to);
+	std::string replace_all(const std::string &src, const std::string& from, const std::string& to);
 
 	template<size_t list_size>
 	std::string replace_all(std::string src, const std::pair<std::string, std::string>(&list)[list_size])
diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
index de40d05383..292ca71c30 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
@@ -1004,6 +1004,7 @@ s32 cellGcmUnmapIoAddress(u64 io)
 	{
 		u64 ea;
 		io = io >> 20;
+		size = size >> 20;
 		ea = offsetTable.eaAddress[io];
 
 		for (u32 i = 0; i<size; i++)
diff --git a/rpcs3/Emu/SysCalls/lv2/cellFs.cpp b/rpcs3/Emu/SysCalls/lv2/cellFs.cpp
index 218221deab..f140555ddc 100644
--- a/rpcs3/Emu/SysCalls/lv2/cellFs.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/cellFs.cpp
@@ -235,11 +235,17 @@ s32 cellFsStat(vm::ptr<const char> path, vm::ptr<CellFsStat> sb)
 
 	Emu.GetVFS().GetDevice(_path, real_path);
 
+	int stat_result;
+#ifdef _WIN32
+	struct _stat64 buf;
+	stat_result = _stat64(real_path.c_str(), &buf);
+#elif
 	struct stat buf;
-
-	if (int result = stat(real_path.c_str(), &buf))
+	stat_result = stat(real_path.c_str(), &buf);
+#endif
+	if (stat_result)
 	{
-		sys_fs->Error("cellFsStat(): stat('%s') failed -> 0x%x", real_path.c_str(), result);
+		sys_fs->Error("cellFsStat(): stat('%s') failed -> 0x%x", real_path.c_str(), stat_result);
 	}
 	else
 	{

From 13d2f8fa59b477bcfe32dae1e4dba2b014d24ec3 Mon Sep 17 00:00:00 2001
From: Peter Tissen <dravorek@gmail.com>
Date: Mon, 2 Feb 2015 11:33:49 +0100
Subject: [PATCH 69/70] re-enable threadlist in GUI

This used to crash so it was removed. However I think this is a cruicial feature.
This is the only way to observe the stack-frames, registers and disasm around the PC
in a user friendly way.

The reason this caused crashes was that we got a reference to a std::vector and iterated
over it in one thread while another thread could modify it (and thereby invalidating the
iterators). The way I "fixed" it is to just copy the `std::vector<std::shared_ptr<...>>`
and iterate over the copy. This obviously has some overhead (locking the shared_ptr
counters and incrementing them). It also allows entities other than the Thread manager
to keep the Thread objects frome being deleted but that should not be a problem.
---
 rpcs3/Emu/CPU/CPUThreadManager.h |  2 +-
 rpcs3/Gui/InterpreterDisAsm.cpp  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rpcs3/Emu/CPU/CPUThreadManager.h b/rpcs3/Emu/CPU/CPUThreadManager.h
index 66fef8b377..9724b4ab34 100644
--- a/rpcs3/Emu/CPU/CPUThreadManager.h
+++ b/rpcs3/Emu/CPU/CPUThreadManager.h
@@ -18,7 +18,7 @@ public:
 	CPUThread& AddThread(CPUThreadType type);
 	void RemoveThread(const u32 id);
 
-	//std::vector<std::shared_ptr<CPUThread>>& GetThreads() { return m_threads; }
+	std::vector<std::shared_ptr<CPUThread>> GetThreads() { return m_threads; }
 	s32 GetThreadNumById(CPUThreadType type, u32 id);
 	std::shared_ptr<CPUThread> GetThread(u32 id);
 	std::shared_ptr<CPUThread> GetThread(u32 id, CPUThreadType type);
diff --git a/rpcs3/Gui/InterpreterDisAsm.cpp b/rpcs3/Gui/InterpreterDisAsm.cpp
index 1a62a4224c..b16742f078 100644
--- a/rpcs3/Gui/InterpreterDisAsm.cpp
+++ b/rpcs3/Gui/InterpreterDisAsm.cpp
@@ -108,12 +108,12 @@ void InterpreterDisAsmFrame::UpdateUnitList()
 {
 	m_choice_units->Freeze();
 	m_choice_units->Clear();
-	//auto& thrs = Emu.GetCPU().GetThreads();
+	auto thrs = Emu.GetCPU().GetThreads();
 
-	//for (auto& t : thrs)
-	//{
-	//	m_choice_units->Append(t->GetFName(), t.get());
-	//}
+	for (auto& t : thrs)
+	{
+		m_choice_units->Append(t->GetFName(), t.get());
+	}
 
 	m_choice_units->Thaw();
 }

From 8ce1de036adeefe5874731be57b2a7ce48e74179 Mon Sep 17 00:00:00 2001
From: Peter Tissen <dravorek@gmail.com>
Date: Mon, 2 Feb 2015 22:38:05 +0100
Subject: [PATCH 70/70] fix #elif with no condition

---
 rpcs3/Emu/SysCalls/lv2/cellFs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpcs3/Emu/SysCalls/lv2/cellFs.cpp b/rpcs3/Emu/SysCalls/lv2/cellFs.cpp
index f140555ddc..38ea4fc729 100644
--- a/rpcs3/Emu/SysCalls/lv2/cellFs.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/cellFs.cpp
@@ -239,7 +239,7 @@ s32 cellFsStat(vm::ptr<const char> path, vm::ptr<CellFsStat> sb)
 #ifdef _WIN32
 	struct _stat64 buf;
 	stat_result = _stat64(real_path.c_str(), &buf);
-#elif
+#else
 	struct stat buf;
 	stat_result = stat(real_path.c_str(), &buf);
 #endif