From 1a948ad7196795d423af1225a7359cdc01bf3048 Mon Sep 17 00:00:00 2001
From: n-a-c-h <>
Date: Fri, 10 Dec 2004 12:46:35 +0000
Subject: [PATCH] The last of the jump fixes.

---
 zsnes/src/video/hq3x16.asm |  8 ++++----
 zsnes/src/video/hq3x32.asm |  8 ++++----
 zsnes/src/video/hq4x16.asm | 14 +++++++-------
 zsnes/src/video/hq4x32.asm | 14 +++++++-------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/zsnes/src/video/hq3x16.asm b/zsnes/src/video/hq3x16.asm
index 02b13275..df7c895c 100644
--- a/zsnes/src/video/hq3x16.asm
+++ b/zsnes/src/video/hq3x16.asm
@@ -489,7 +489,7 @@ hq3x:
     pand    mm2,mm4
     movd    eax,mm2
     inc     eax
-    jz      .loopx_end
+    jz      near .loopx_end
     movd    eax,mm5
     movzx   edx,ax
     mov     [w1],edx
@@ -530,7 +530,7 @@ hq3x:
     cwde
     and     eax,ebx
     inc     eax
-    jz      .loopx_end
+    jz      near .loopx_end
     movd    eax,mm5
     mov     [edx+ecx-2],ax
     movzx   edx,ax
@@ -2469,7 +2469,7 @@ hq3x:
     jmp     .loopx
 .xres_2
     ; x=Xres-2 - special case
-    jl      .xres_1
+    jl      near .xres_1
     mov     edx,[deltaptr]
     mov     ecx,[prevline]
     mov     eax,[nextline]
@@ -2523,7 +2523,7 @@ hq3x:
     jmp     .flags
 .xres_1
     cmp     dword[xcounter],-1
-    jl      .endofline
+    jl      near .endofline
     ; x=Xres-1 - special case
     mov     edx,[deltaptr]
     mov     ecx,[prevline]
diff --git a/zsnes/src/video/hq3x32.asm b/zsnes/src/video/hq3x32.asm
index d0b8abd3..bb41e2bf 100644
--- a/zsnes/src/video/hq3x32.asm
+++ b/zsnes/src/video/hq3x32.asm
@@ -452,7 +452,7 @@ hq3x:
     pand    mm2,mm4
     movd    eax,mm2
     inc     eax
-    jz      .loopx_end
+    jz      near .loopx_end
     movd    eax,mm5
     movzx   edx,ax
     mov     [w1],edx
@@ -493,7 +493,7 @@ hq3x:
     cwde
     and     eax,ebx
     inc     eax
-    jz      .loopx_end
+    jz      near .loopx_end
     movd    eax,mm5
     mov     [edx+ecx-2],ax
     movzx   edx,ax
@@ -2509,7 +2509,7 @@ hq3x:
     jmp     .loopx
 .xres_2
     ; x=Xres-2 - special case
-    jl      .xres_1
+    jl      near .xres_1
     mov     edx,[deltaptr]
     mov     ecx,[prevline]
     mov     eax,[nextline]
@@ -2563,7 +2563,7 @@ hq3x:
     jmp     .flags
 .xres_1
     cmp     dword[xcounter],-1
-    jl      .endofline
+    jl      near .endofline
     ; x=Xres-1 - special case
     mov     edx,[deltaptr]
     mov     ecx,[prevline]
diff --git a/zsnes/src/video/hq4x16.asm b/zsnes/src/video/hq4x16.asm
index 1fd5c967..e5619ac4 100644
--- a/zsnes/src/video/hq4x16.asm
+++ b/zsnes/src/video/hq4x16.asm
@@ -98,7 +98,7 @@ SECTION .text
 %macro DiffOrNot 10
    TestDiff %1,%2
    test edx,edx
-   jz %%same
+   jz near %%same
    %3
    %4
    %5
@@ -115,7 +115,7 @@ SECTION .text
 %macro DiffOrNot 14
    TestDiff %1,%2
    test edx,edx
-   jz %%same
+   jz near %%same
    %3
    %4
    %5
@@ -957,7 +957,7 @@ hq4x:
     pand    mm2,mm4
     movd    eax,mm2
     inc     eax
-    jz      .loopx_end
+    jz      near .loopx_end
     movd    eax,mm5
     movzx   edx,ax
     mov     [w1],edx
@@ -998,7 +998,7 @@ hq4x:
     cwde
     and     eax,ebx
     inc     eax
-    jz      .loopx_end
+    jz      near .loopx_end
     movd    eax,mm5
     mov     [edx+ecx-2],ax
     movzx   edx,ax
@@ -3910,7 +3910,7 @@ hq4x:
     jmp     .loopx
 .xres_2
     ; x=Xres-2 - special case
-    jl      .xres_1
+    jl      near .xres_1
     mov     edx,[deltaptr]
     mov     ecx,[prevline]
     mov     eax,[nextline]
@@ -3964,7 +3964,7 @@ hq4x:
     jmp     .flags
 .xres_1
     cmp     dword[xcounter],-1
-    jl      .endofline
+    jl      near .endofline
     ; x=Xres-1 - special case
     mov     edx,[deltaptr]
     mov     ecx,[prevline]
@@ -4148,7 +4148,7 @@ HighResProc:
     ret
 .hires
     test byte[ebx],4
-    jnz .m56
+    jnz near .m56
     mov ebx,[NumBytesPerLine]
     mov eax,edi
     add eax,ebx
diff --git a/zsnes/src/video/hq4x32.asm b/zsnes/src/video/hq4x32.asm
index 8538ee88..796ee167 100644
--- a/zsnes/src/video/hq4x32.asm
+++ b/zsnes/src/video/hq4x32.asm
@@ -99,7 +99,7 @@ SECTION .text
 %macro DiffOrNot 10
    TestDiff %1,%2
    test edx,edx
-   jz %%same
+   jz near %%same
    %3
    %4
    %5
@@ -116,7 +116,7 @@ SECTION .text
 %macro DiffOrNot 14
    TestDiff %1,%2
    test edx,edx
-   jz %%same
+   jz near %%same
    %3
    %4
    %5
@@ -796,7 +796,7 @@ NEWSYM hq4x_32b
     cmp byte[MMXSupport],0
     je  nointerp
     cmp byte[hqFilter],0
-    jne hq4x
+    jne near hq4x
 
 ;----------------------------;
 nointerp:
@@ -888,7 +888,7 @@ hq4x:
     pand    mm2,mm4
     movd    eax,mm2
     inc     eax
-    jz      .loopx_end
+    jz      near .loopx_end
     movd    eax,mm5
     movzx   edx,ax
     mov     [w1],edx
@@ -929,7 +929,7 @@ hq4x:
     cwde
     and     eax,ebx
     inc     eax
-    jz      .loopx_end
+    jz      near .loopx_end
     movd    eax,mm5
     mov     [edx+ecx-2],ax
     movzx   edx,ax
@@ -3877,7 +3877,7 @@ hq4x:
     jmp     .loopx
 .xres_2
     ; x=Xres-2 - special case
-    jl      .xres_1
+    jl      near .xres_1
     mov     edx,[deltaptr]
     mov     ecx,[prevline]
     mov     eax,[nextline]
@@ -3931,7 +3931,7 @@ hq4x:
     jmp     .flags
 .xres_1
     cmp     dword[xcounter],-1
-    jl      .endofline
+    jl      near .endofline
     ; x=Xres-1 - special case
     mov     edx,[deltaptr]
     mov     ecx,[prevline]