diff --git a/Source/BasicBlock.cpp b/Source/BasicBlock.cpp
index 8e8fa62ea..d35fcab32 100644
--- a/Source/BasicBlock.cpp
+++ b/Source/BasicBlock.cpp
@@ -206,7 +206,7 @@ void CBasicBlock::CompileRange(CMipsJitter* jitter)
 		m_context.m_pArch->CompileInstruction(
 		    address,
 		    jitter,
-		    &m_context);
+		    &m_context, address - m_begin);
 		//Sanity check
 		assert(jitter->IsStackEmpty());
 	}
@@ -275,7 +275,9 @@ void CBasicBlock::CompileEpilog(CMipsJitter* jitter)
 	}
 	jitter->Else();
 	{
-		jitter->PushCst(m_end + 4);
+		jitter->PushRel(offsetof(CMIPS, m_State.nPC));
+		jitter->PushCst(m_end - m_begin + 4);
+		jitter->Add();
 		jitter->PullRel(offsetof(CMIPS, m_State.nPC));
 
 #if !defined(AOT_BUILD_CACHE) && !defined(__EMSCRIPTEN__)
diff --git a/Source/COP_FPU.cpp b/Source/COP_FPU.cpp
index e924dc64c..6bea4c741 100644
--- a/Source/COP_FPU.cpp
+++ b/Source/COP_FPU.cpp
@@ -24,9 +24,9 @@ CCOP_FPU::CCOP_FPU(MIPS_REGSIZE regSize)
 	SetupReflectionTables();
 }
 
-void CCOP_FPU::CompileInstruction(uint32 address, CMipsJitter* codeGen, CMIPS* ctx)
+void CCOP_FPU::CompileInstruction(uint32 address, CMipsJitter* codeGen, CMIPS* ctx, uint32 instrPosition)
 {
-	SetupQuickVariables(address, codeGen, ctx);
+	SetupQuickVariables(address, codeGen, ctx, instrPosition);
 
 	m_ft = static_cast<uint8>((m_nOpcode >> 16) & 0x1F);
 	m_fs = static_cast<uint8>((m_nOpcode >> 11) & 0x1F);
diff --git a/Source/COP_FPU.h b/Source/COP_FPU.h
index 3276ef5b1..8bbb6d1ac 100644
--- a/Source/COP_FPU.h
+++ b/Source/COP_FPU.h
@@ -7,7 +7,7 @@ class CCOP_FPU : public CMIPSCoprocessor
 {
 public:
 	CCOP_FPU(MIPS_REGSIZE);
-	void CompileInstruction(uint32, CMipsJitter*, CMIPS*) override;
+	void CompileInstruction(uint32, CMipsJitter*, CMIPS*, uint32) override;
 	void GetInstruction(uint32, char*) override;
 	void GetArguments(uint32, uint32, char*) override;
 	uint32 GetEffectiveAddress(uint32, uint32) override;
diff --git a/Source/COP_SCU.cpp b/Source/COP_SCU.cpp
index 8c40d0fef..5cd8b6e68 100644
--- a/Source/COP_SCU.cpp
+++ b/Source/COP_SCU.cpp
@@ -52,9 +52,9 @@ CCOP_SCU::CCOP_SCU(MIPS_REGSIZE nRegSize)
 	SetupReflectionTables();
 }
 
-void CCOP_SCU::CompileInstruction(uint32 nAddress, CMipsJitter* codeGen, CMIPS* pCtx)
+void CCOP_SCU::CompileInstruction(uint32 nAddress, CMipsJitter* codeGen, CMIPS* pCtx, uint32 instrPosition)
 {
-	SetupQuickVariables(nAddress, codeGen, pCtx);
+	SetupQuickVariables(nAddress, codeGen, pCtx, instrPosition);
 
 	m_nRT = (uint8)((m_nOpcode >> 16) & 0x1F);
 	m_nRD = (uint8)((m_nOpcode >> 11) & 0x1F);
diff --git a/Source/COP_SCU.h b/Source/COP_SCU.h
index 9e8e52392..38b4a2247 100644
--- a/Source/COP_SCU.h
+++ b/Source/COP_SCU.h
@@ -62,7 +62,7 @@ public:
 	static_assert(sizeof(PCCR) == 4, "PCCR must be 4 bytes long.");
 
 	CCOP_SCU(MIPS_REGSIZE);
-	virtual void CompileInstruction(uint32, CMipsJitter*, CMIPS*) override;
+	virtual void CompileInstruction(uint32, CMipsJitter*, CMIPS*, uint32) override;
 	virtual void GetInstruction(uint32, char*) override;
 	virtual void GetArguments(uint32, uint32, char*) override;
 	virtual uint32 GetEffectiveAddress(uint32, uint32) override;
diff --git a/Source/MA_MIPSIV.cpp b/Source/MA_MIPSIV.cpp
index 102fd39a1..e9fee730c 100644
--- a/Source/MA_MIPSIV.cpp
+++ b/Source/MA_MIPSIV.cpp
@@ -225,9 +225,9 @@ void CMA_MIPSIV::SetupInstructionTables()
 	}
 }
 
-void CMA_MIPSIV::CompileInstruction(uint32 address, CMipsJitter* codeGen, CMIPS* ctx)
+void CMA_MIPSIV::CompileInstruction(uint32 address, CMipsJitter* codeGen, CMIPS* ctx, uint32 instrPosition)
 {
-	SetupQuickVariables(address, codeGen, ctx);
+	SetupQuickVariables(address, codeGen, ctx, instrPosition);
 
 	m_nRS = (uint8)((m_nOpcode >> 21) & 0x1F);
 	m_nRT = (uint8)((m_nOpcode >> 16) & 0x1F);
@@ -435,7 +435,7 @@ void CMA_MIPSIV::COP0()
 {
 	if(m_pCtx->m_pCOP[0] != NULL)
 	{
-		m_pCtx->m_pCOP[0]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx);
+		m_pCtx->m_pCOP[0]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx, m_instrPosition);
 	}
 	else
 	{
@@ -448,7 +448,7 @@ void CMA_MIPSIV::COP1()
 {
 	if(m_pCtx->m_pCOP[1] != NULL)
 	{
-		m_pCtx->m_pCOP[1]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx);
+		m_pCtx->m_pCOP[1]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx, m_instrPosition);
 	}
 	else
 	{
@@ -461,7 +461,7 @@ void CMA_MIPSIV::COP2()
 {
 	if(m_pCtx->m_pCOP[2] != NULL)
 	{
-		m_pCtx->m_pCOP[2]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx);
+		m_pCtx->m_pCOP[2]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx, m_instrPosition);
 	}
 	else
 	{
@@ -706,7 +706,7 @@ void CMA_MIPSIV::LWC1()
 {
 	if(m_pCtx->m_pCOP[1] != NULL)
 	{
-		m_pCtx->m_pCOP[1]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx);
+		m_pCtx->m_pCOP[1]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx, m_instrPosition);
 	}
 	else
 	{
@@ -725,7 +725,7 @@ void CMA_MIPSIV::LDC2()
 {
 	if(m_pCtx->m_pCOP[2] != NULL)
 	{
-		m_pCtx->m_pCOP[2]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx);
+		m_pCtx->m_pCOP[2]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx, m_instrPosition);
 	}
 	else
 	{
@@ -769,7 +769,7 @@ void CMA_MIPSIV::SWC1()
 {
 	if(m_pCtx->m_pCOP[1] != NULL)
 	{
-		m_pCtx->m_pCOP[1]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx);
+		m_pCtx->m_pCOP[1]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx, m_instrPosition);
 	}
 	else
 	{
@@ -782,7 +782,7 @@ void CMA_MIPSIV::SDC2()
 {
 	if(m_pCtx->m_pCOP[2] != NULL)
 	{
-		m_pCtx->m_pCOP[2]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx);
+		m_pCtx->m_pCOP[2]->CompileInstruction(m_nAddress, m_codeGen, m_pCtx, m_instrPosition);
 	}
 	else
 	{
diff --git a/Source/MA_MIPSIV.h b/Source/MA_MIPSIV.h
index 58b9dc299..676898e1a 100644
--- a/Source/MA_MIPSIV.h
+++ b/Source/MA_MIPSIV.h
@@ -9,7 +9,7 @@ class CMA_MIPSIV : public CMIPSArchitecture
 public:
 	CMA_MIPSIV(MIPS_REGSIZE);
 	virtual ~CMA_MIPSIV() = default;
-	void CompileInstruction(uint32, CMipsJitter*, CMIPS*) override;
+	void CompileInstruction(uint32, CMipsJitter*, CMIPS*, uint32) override;
 	void GetInstructionMnemonic(CMIPS*, uint32, uint32, char*, unsigned int) override;
 	void GetInstructionOperands(CMIPS*, uint32, uint32, char*, unsigned int) override;
 	MIPS_BRANCH_TYPE IsInstructionBranch(CMIPS*, uint32, uint32) override;
diff --git a/Source/MIPSInstructionFactory.cpp b/Source/MIPSInstructionFactory.cpp
index 0d4fb91dd..ccbb85890 100644
--- a/Source/MIPSInstructionFactory.cpp
+++ b/Source/MIPSInstructionFactory.cpp
@@ -11,11 +11,12 @@ CMIPSInstructionFactory::CMIPSInstructionFactory(MIPS_REGSIZE nRegSize)
 {
 }
 
-void CMIPSInstructionFactory::SetupQuickVariables(uint32 nAddress, CMipsJitter* codeGen, CMIPS* pCtx)
+void CMIPSInstructionFactory::SetupQuickVariables(uint32 nAddress, CMipsJitter* codeGen, CMIPS* pCtx, uint32 instrPosition)
 {
 	m_pCtx = pCtx;
 	m_codeGen = codeGen;
 	m_nAddress = nAddress;
+	m_instrPosition = instrPosition;
 
 	m_nOpcode = m_pCtx->m_pMemoryMap->GetInstruction(m_nAddress);
 }
diff --git a/Source/MIPSInstructionFactory.h b/Source/MIPSInstructionFactory.h
index 6fcdd45bf..ac031c009 100644
--- a/Source/MIPSInstructionFactory.h
+++ b/Source/MIPSInstructionFactory.h
@@ -23,7 +23,7 @@ class CMIPSInstructionFactory
 public:
 	CMIPSInstructionFactory(MIPS_REGSIZE);
 	virtual ~CMIPSInstructionFactory() = default;
-	virtual void CompileInstruction(uint32, CMipsJitter*, CMIPS*) = 0;
+	virtual void CompileInstruction(uint32, CMipsJitter*, CMIPS*, uint32) = 0;
 	void Illegal();
 
 protected:
@@ -36,11 +36,12 @@ protected:
 	void Branch(Jitter::CONDITION);
 	void BranchLikely(Jitter::CONDITION);
 
-	void SetupQuickVariables(uint32, CMipsJitter*, CMIPS*);
+	void SetupQuickVariables(uint32, CMipsJitter*, CMIPS*, uint32);
 
 	CMipsJitter* m_codeGen = nullptr;
 	CMIPS* m_pCtx = nullptr;
 	uint32 m_nOpcode = 0;
 	uint32 m_nAddress = 0;
+	uint32 m_instrPosition = 0;
 	MIPS_REGSIZE m_regSize;
 };
diff --git a/Source/ee/COP_VU.cpp b/Source/ee/COP_VU.cpp
index 5173000cd..f281ebbf3 100644
--- a/Source/ee/COP_VU.cpp
+++ b/Source/ee/COP_VU.cpp
@@ -30,9 +30,9 @@ CCOP_VU::CCOP_VU(MIPS_REGSIZE nRegSize)
 	SetupReflectionTables();
 }
 
-void CCOP_VU::CompileInstruction(uint32 nAddress, CMipsJitter* codeGen, CMIPS* pCtx)
+void CCOP_VU::CompileInstruction(uint32 nAddress, CMipsJitter* codeGen, CMIPS* pCtx, uint32 instrPosition)
 {
-	SetupQuickVariables(nAddress, codeGen, pCtx);
+	SetupQuickVariables(nAddress, codeGen, pCtx, instrPosition);
 
 	m_nDest = (uint8)((m_nOpcode >> 21) & 0x0F);
 
diff --git a/Source/ee/COP_VU.h b/Source/ee/COP_VU.h
index ed2f4ac70..59a7a00f7 100644
--- a/Source/ee/COP_VU.h
+++ b/Source/ee/COP_VU.h
@@ -9,7 +9,7 @@ class CCOP_VU : public CMIPSCoprocessor
 public:
 	CCOP_VU(MIPS_REGSIZE);
 
-	void CompileInstruction(uint32, CMipsJitter*, CMIPS*) override;
+	void CompileInstruction(uint32, CMipsJitter*, CMIPS*, uint32) override;
 	void GetInstruction(uint32, char*) override;
 	void GetArguments(uint32, uint32, char*) override;
 	uint32 GetEffectiveAddress(uint32, uint32) override;
diff --git a/Source/ee/MA_VU.cpp b/Source/ee/MA_VU.cpp
index f18606034..7572c4a1e 100644
--- a/Source/ee/MA_VU.cpp
+++ b/Source/ee/MA_VU.cpp
@@ -8,17 +8,17 @@ CMA_VU::CMA_VU(uint32 vuMemAddressMask)
 	SetupReflectionTables();
 }
 
-void CMA_VU::CompileInstruction(uint32 nAddress, CMipsJitter* codeGen, CMIPS* pCtx)
+void CMA_VU::CompileInstruction(uint32 nAddress, CMipsJitter* codeGen, CMIPS* pCtx, uint32 instrPosition)
 {
-	SetupQuickVariables(nAddress, codeGen, pCtx);
+	SetupQuickVariables(nAddress, codeGen, pCtx, instrPosition);
 
 	if(nAddress & 0x04)
 	{
-		m_Upper.CompileInstruction(nAddress, codeGen, pCtx);
+		m_Upper.CompileInstruction(nAddress, codeGen, pCtx, instrPosition);
 	}
 	else
 	{
-		m_Lower.CompileInstruction(nAddress, codeGen, pCtx);
+		m_Lower.CompileInstruction(nAddress, codeGen, pCtx, instrPosition);
 	}
 }
 
diff --git a/Source/ee/MA_VU.h b/Source/ee/MA_VU.h
index a6e37cf0f..ab9820136 100644
--- a/Source/ee/MA_VU.h
+++ b/Source/ee/MA_VU.h
@@ -12,7 +12,7 @@ class CMA_VU : public CMIPSArchitecture
 public:
 	CMA_VU(uint32);
 
-	void CompileInstruction(uint32, CMipsJitter*, CMIPS*) override;
+	void CompileInstruction(uint32, CMipsJitter*, CMIPS*, uint32) override;
 	void GetInstructionMnemonic(CMIPS*, uint32, uint32, char*, unsigned int) override;
 	void GetInstructionOperands(CMIPS*, uint32, uint32, char*, unsigned int) override;
 	MIPS_BRANCH_TYPE IsInstructionBranch(CMIPS*, uint32, uint32) override;
@@ -30,7 +30,7 @@ private:
 		CUpper();
 
 		void SetupReflectionTables();
-		void CompileInstruction(uint32, CMipsJitter*, CMIPS*) override;
+		void CompileInstruction(uint32, CMipsJitter*, CMIPS*, uint32) override;
 		void GetInstructionMnemonic(CMIPS*, uint32, uint32, char*, unsigned int);
 		void GetInstructionOperands(CMIPS*, uint32, uint32, char*, unsigned int);
 		VUShared::OPERANDSET GetAffectedOperands(CMIPS*, uint32, uint32);
@@ -177,7 +177,7 @@ private:
 		CLower(uint32);
 
 		void SetupReflectionTables();
-		void CompileInstruction(uint32, CMipsJitter*, CMIPS*) override;
+		void CompileInstruction(uint32, CMipsJitter*, CMIPS*, uint32) override;
 		void GetInstructionMnemonic(CMIPS*, uint32, uint32, char*, unsigned int);
 		void GetInstructionOperands(CMIPS*, uint32, uint32, char*, unsigned int);
 		MIPS_BRANCH_TYPE IsInstructionBranch(CMIPS*, uint32, uint32);
diff --git a/Source/ee/MA_VU_Lower.cpp b/Source/ee/MA_VU_Lower.cpp
index 759b1fe36..a1de1d9ad 100644
--- a/Source/ee/MA_VU_Lower.cpp
+++ b/Source/ee/MA_VU_Lower.cpp
@@ -24,9 +24,9 @@ CMA_VU::CLower::CLower(uint32 vuMemAddressMask)
 {
 }
 
-void CMA_VU::CLower::CompileInstruction(uint32 address, CMipsJitter* codeGen, CMIPS* context)
+void CMA_VU::CLower::CompileInstruction(uint32 address, CMipsJitter* codeGen, CMIPS* context, uint32 instrPosition)
 {
-	SetupQuickVariables(address, codeGen, context);
+	SetupQuickVariables(address, codeGen, context, instrPosition);
 
 	if(IsLOI(context, address))
 	{
@@ -65,8 +65,9 @@ void CMA_VU::CLower::SetBranchAddress(bool nCondition, int32 nOffset)
 	m_codeGen->PushCst(0);
 	m_codeGen->BeginIf(nCondition ? Jitter::CONDITION_NE : Jitter::CONDITION_EQ);
 	{
-		const uint32 maxIAddr = 0x3FFF;
-		m_codeGen->PushCst((m_nAddress + nOffset + 4) & maxIAddr);
+		m_codeGen->PushRel(offsetof(CMIPS, m_State.nPC));
+		m_codeGen->PushCst(m_instrPosition + nOffset + 4);
+		m_codeGen->Add();
 		m_codeGen->PullRel(offsetof(CMIPS, m_State.nDelayedJumpAddr));
 	}
 	m_codeGen->EndIf();
@@ -382,7 +383,10 @@ void CMA_VU::CLower::B()
 void CMA_VU::CLower::BAL()
 {
 	//Save PC
-	m_codeGen->PushCst((m_nAddress + 0x10) / 0x8);
+	m_codeGen->PushRel(offsetof(CMIPS, m_State.nPC));
+	m_codeGen->PushCst(m_instrPosition + 0x10);
+	m_codeGen->Add();
+	m_codeGen->Sra(3);
 	m_codeGen->PullRel(offsetof(CMIPS, m_State.nCOP2VI[m_nIT]));
 
 	m_codeGen->PushCst(1);
@@ -411,7 +415,10 @@ void CMA_VU::CLower::JALR()
 	m_codeGen->PullRel(offsetof(CMIPS, m_State.nDelayedJumpAddr));
 
 	//Save PC
-	m_codeGen->PushCst((m_nAddress + 0x10) / 0x8);
+	m_codeGen->PushRel(offsetof(CMIPS, m_State.nPC));
+	m_codeGen->PushCst(m_instrPosition + 0x10);
+	m_codeGen->Add();
+	m_codeGen->Sra(3);
 	m_codeGen->PullRel(offsetof(CMIPS, m_State.nCOP2VI[m_nIT]));
 }
 
diff --git a/Source/ee/MA_VU_Upper.cpp b/Source/ee/MA_VU_Upper.cpp
index 57863047d..97b4eb335 100644
--- a/Source/ee/MA_VU_Upper.cpp
+++ b/Source/ee/MA_VU_Upper.cpp
@@ -17,9 +17,9 @@ CMA_VU::CUpper::CUpper()
 {
 }
 
-void CMA_VU::CUpper::CompileInstruction(uint32 nAddress, CMipsJitter* codeGen, CMIPS* pCtx)
+void CMA_VU::CUpper::CompileInstruction(uint32 nAddress, CMipsJitter* codeGen, CMIPS* pCtx, uint32 instrPositon)
 {
-	SetupQuickVariables(nAddress, codeGen, pCtx);
+	SetupQuickVariables(nAddress, codeGen, pCtx, instrPositon);
 
 	m_nDest = (uint8)((m_nOpcode >> 21) & 0x000F);
 	m_nFT = (uint8)((m_nOpcode >> 16) & 0x001F);
diff --git a/Source/ee/VuBasicBlock.cpp b/Source/ee/VuBasicBlock.cpp
index 86f21a7c8..db36e585e 100644
--- a/Source/ee/VuBasicBlock.cpp
+++ b/Source/ee/VuBasicBlock.cpp
@@ -121,7 +121,7 @@ void CVuBasicBlock::CompileRange(CMipsJitter* jitter)
 
 		uint32 compileHints = hints[instructionIndex];
 		arch->SetRelativePipeTime(relativePipeTime, compileHints);
-		arch->CompileInstruction(addressHi, jitter, &m_context);
+		arch->CompileInstruction(addressHi, jitter, &m_context, addressHi - m_begin);
 
 		if(savedReg != 0)
 		{
@@ -149,7 +149,7 @@ void CVuBasicBlock::CompileRange(CMipsJitter* jitter)
 			clearPendingXgKick();
 		}
 
-		arch->CompileInstruction(addressLo, jitter, &m_context);
+		arch->CompileInstruction(addressLo, jitter, &m_context, addressLo - m_begin);
 
 		if(address == integerBranchDelayInfo.useRegAddress)
 		{
@@ -194,7 +194,7 @@ void CVuBasicBlock::CompileRange(CMipsJitter* jitter)
 				//We need to compile the instruction at the branch target because it will be executed
 				//before the branch is taken
 				uint32 branchTgtAddress = branchOpcodeAddr + VUShared::GetBranch(branchOpcodeLo & 0x7FF) + 8;
-				arch->CompileInstruction(branchTgtAddress, jitter, &m_context);
+				arch->CompileInstruction(branchTgtAddress, jitter, &m_context, address - m_begin);
 			}
 		}