From 8229c0ed3d99a43785d2010e1a773c57df025dea Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Fri, 19 Jun 2015 19:53:52 +0300
Subject: [PATCH] Compilation fix

---
 rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp | 10 +++++-----
 rpcs3/Emu/ARMv7/Modules/scePerf.cpp  |  2 +-
 rpcs3/Emu/SysCalls/CB_FUNC.h         |  2 +-
 rpcs3/stdafx.h                       |  1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
index cf0b482c35..95ffb5a7e4 100644
--- a/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
+++ b/rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
@@ -2268,7 +2268,7 @@ void ARMv7_instrs::LDRB_IMM(ARMv7Context& context, const ARMv7Code code, const A
 	{
 		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));
+		context.write_gpr(t, vm::read8(addr));
 
 		if (wback)
 		{
@@ -2338,7 +2338,7 @@ void ARMv7_instrs::LDRB_REG(ARMv7Context& context, const ARMv7Code code, const A
 		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);
-		context.write_gpr(t, vm::psv::read8(addr));
+		context.write_gpr(t, vm::read8(addr));
 
 		if (wback)
 		{
@@ -2592,7 +2592,7 @@ void ARMv7_instrs::LDRSB_IMM(ARMv7Context& context, const ARMv7Code code, const
 	{
 		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);
+		const s8 value = vm::read8(addr);
 		context.write_gpr(t, value); // sign-extend
 
 		if (wback)
@@ -4545,7 +4545,7 @@ void ARMv7_instrs::STRB_IMM(ARMv7Context& context, const ARMv7Code code, const A
 	{
 		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));
+		vm::write8(addr, (u8)context.read_gpr(t));
 
 		if (wback)
 		{
@@ -4605,7 +4605,7 @@ void ARMv7_instrs::STRB_REG(ARMv7Context& context, const ARMv7Code code, const A
 		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::write8(addr, (u8)context.read_gpr(t));
+		vm::write8(addr, (u8)context.read_gpr(t));
 
 		if (wback)
 		{
diff --git a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp
index 38516caafe..396fc5eac9 100644
--- a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp
+++ b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp
@@ -2,7 +2,7 @@
 #include "Emu/System.h"
 #include "Emu/ARMv7/PSVFuncList.h"
 
-#include "Emu/SysCalls/lv2/sys_time.h"
+extern u64 get_system_time();
 
 #define RETURN_ERROR(code) { Emu.Pause(); scePerf.Error("%s() failed: %s", __FUNCTION__, #code); return code; }
 
diff --git a/rpcs3/Emu/SysCalls/CB_FUNC.h b/rpcs3/Emu/SysCalls/CB_FUNC.h
index 148feb5426..648d14750b 100644
--- a/rpcs3/Emu/SysCalls/CB_FUNC.h
+++ b/rpcs3/Emu/SysCalls/CB_FUNC.h
@@ -63,7 +63,7 @@ namespace cb_detail
 		{
 			const int stack_pos = (g_count - 9) * 8 - FIXED_STACK_FRAME_SIZE;
 			static_assert(stack_pos < 0, "TODO: Increase fixed stack frame size (arg count limit broken)");
-			vm::write64(CPU.GPR[1] + stack_pos, cast_to_ppu_gpr<T>(arg));
+			vm::ps3::write64(CPU.GPR[1] + stack_pos, cast_to_ppu_gpr<T>(arg));
 		}
 	};
 
diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h
index 1b730b9109..c7ac7dac43 100644
--- a/rpcs3/stdafx.h
+++ b/rpcs3/stdafx.h
@@ -20,6 +20,7 @@
 #include <cstring>
 #include <cassert>
 #include <cstdint>
+#include <climits>
 #include <cmath>
 #include <atomic>
 #include <mutex>