1 files changed, 12 insertions, 3 deletions

diff --git a/dynasm/dasm_arm64.h b/dynasm/dasm_arm64.h
index 577b54bc..b2251532 100644
--- a/dynasm/dasm_arm64.h
+++ b/dynasm/dasm_arm64.h
@@ -23,6 +23,7 @@ enum {
   /* The following actions also have an argument. */
   DASM_REL_PC, DASM_LABEL_PC,
   DASM_IMM, DASM_IMM6, DASM_IMM12, DASM_IMM13W, DASM_IMM13X, DASM_IMML,
+  DASM_VREG,
   DASM__MAX
 };
 
@@ -39,6 +40,7 @@ enum {
 #define DASM_S_RANGE_LG         0x13000000
 #define DASM_S_RANGE_PC         0x14000000
 #define DASM_S_RANGE_REL        0x15000000
+#define DASM_S_RANGE_VREG       0x16000000
 #define DASM_S_UNDEF_LG         0x21000000
 #define DASM_S_UNDEF_PC         0x22000000
 
@@ -312,13 +314,17 @@ void dasm_put(Dst_DECL, int start, ...)
         }
       case DASM_IMML: {
 #ifdef DASM_CHECKS
-        int scale = (p[-2] >> 30);
+        int scale = (ins & 3);
         CK((!(n & ((1<<scale)-1)) && (unsigned int)(n>>scale) < 4096) ||
            (unsigned int)(n+256) < 512, RANGE_I);
 #endif
         b[pos++] = n;
         break;
         }
+      case DASM_VREG:
+        CK(n < 32, RANGE_VREG);
+        b[pos++] = n;
+        break;
       }
     }
   }
@@ -375,7 +381,7 @@ int dasm_link(Dst_DECL, size_t *szp)
         case DASM_REL_LG: case DASM_REL_PC: pos++; break;
         case DASM_LABEL_LG: case DASM_LABEL_PC: b[pos++] += ofs; break;
         case DASM_IMM: case DASM_IMM6: case DASM_IMM12: case DASM_IMM13W:
-        case DASM_IMML: pos++; break;
+        case DASM_IMML: case DASM_VREG: pos++; break;
         case DASM_IMM13X: pos += 2; break;
         }
       }
@@ -468,11 +474,14 @@ int dasm_encode(Dst_DECL, void *buffer)
           cp[-1] |= (dasm_imm13(n, *b++) << 10);
           break;
         case DASM_IMML: {
-          int scale = (p[-2] >> 30);
+          int scale = (ins & 3);
           cp[-1] |= (!(n & ((1<<scale)-1)) && (unsigned int)(n>>scale) < 4096) ?
             ((n << (10-scale)) | 0x01000000) : ((n & 511) << 12);
           break;
           }
+        case DASM_VREG:
+          cp[-1] |= (n & 0x1f) << (ins & 0x1f);
+          break;
         default: *cp++ = ins; break;
         }
       }