MIPS: Add MIPS64 R6 port.

Contributed by Hua Zhang, YunQiang Su from Wave Computing,
and Radovan Birdic from RT-RK.
Sponsored by Wave Computing.

1 files changed, 7 insertions, 6 deletions

diff --git a/dynasm/dasm_mips.h b/dynasm/dasm_mips.h
index 71a835b2..7d06aa72 100644
--- a/dynasm/dasm_mips.h
+++ b/dynasm/dasm_mips.h
@@ -355,14 +355,15 @@ int dasm_encode(Dst_DECL, void *buffer)
           CK(n >= 0, UNDEF_PC);
           n = *DASM_POS2PTR(D, n);
           if (ins & 2048)
-            n = n - (int)((char *)cp - base);
-          else
             n = (n + (int)(size_t)base) & 0x0fffffff;
-        patchrel:
+          else
+            n = n - (int)((char *)cp - base);
+        patchrel: {
+          unsigned int e = 16 + ((ins >> 12) & 15);
           CK((n & 3) == 0 &&
-             ((n + ((ins & 2048) ? 0x00020000 : 0)) >>
-               ((ins & 2048) ? 18 : 28)) == 0, RANGE_REL);
-          cp[-1] |= ((n>>2) & ((ins & 2048) ? 0x0000ffff: 0x03ffffff));
+             ((n + ((ins & 2048) ? 0 : (1<<(e+1)))) >> (e+2)) == 0, RANGE_REL);
+          cp[-1] |= ((n>>2) & ((1<<e)-1));
+          }
           break;
         case DASM_LABEL_LG:
           ins &= 2047; if (ins >= 20) D->globals[ins-10] = (void *)(base + n);