From 2a28f2b414bbcfdba61947473e3da82542151f36 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Mon, 12 Jan 2015 07:32:14 +0000
Subject: [PATCH] psx - apply fresh GTE division bugfix

---
 psx/octoshock/psx/gte.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/psx/octoshock/psx/gte.cpp b/psx/octoshock/psx/gte.cpp
index 9463b0bc6c..2f87f94078 100644
--- a/psx/octoshock/psx/gte.cpp
+++ b/psx/octoshock/psx/gte.cpp
@@ -153,7 +153,7 @@ static INLINE uint8 Sat5(int16 cc)
 // Newton-Raphson division table.  (Initialized at startup; do NOT save in save states!)
 //
 static uint8 DivTable[0x100 + 1];
-static INLINE int32 CalcRecip(uint16 divisor)
+static INLINE uint32 CalcRecip(uint16 divisor)
 {
  int32 x = (0x101 + DivTable[(((divisor & 0x7FFF) + 0x40) >> 7)]);
  int32 tmp = (((int32)divisor * -x) + 0x80) >> 8;
@@ -997,7 +997,7 @@ static INLINE uint32 Divide(uint32 dividend, uint32 divisor)
   dividend <<= shift_bias;
   divisor <<= shift_bias;
 
-  return ((int64)dividend * CalcRecip(divisor | 0x8000) + 32768) >> 16;
+  return std::min<uint32>(0x1FFFF, ((uint64)dividend * CalcRecip(divisor | 0x8000) + 32768) >> 16);
  }
  else
  {