DynASM/x86: Fix x64 .aword refs. Add .qword, .quad, .addr and .long.

(Switch to .aword implementation by Make Pall)

Author: dstogov

ext/opcache/jit/dynasm/dasm_x86.h

@@ -17,11 +17,11 @@
 
 /* Action definitions. DASM_STOP must be 255. */
 enum {
-  DASM_DISP = 231,
+  DASM_DISP = 233,
   DASM_IMM_S, DASM_IMM_B, DASM_IMM_W, DASM_IMM_D, DASM_IMM_WB, DASM_IMM_DB,
   DASM_VREG, DASM_SPACE, DASM_SETLABEL, DASM_REL_A, DASM_REL_LG, DASM_REL_PC,
-  DASM_IMM_LG, DASM_IMM_LG64, DASM_IMM_PC, DASM_IMM_PC64, DASM_LABEL_LG, DASM_LABEL_PC,
-  DASM_ALIGN, DASM_EXTERN, DASM_ESC, DASM_MARK, DASM_SECTION, DASM_STOP
+  DASM_IMM_LG, DASM_IMM_PC, DASM_LABEL_LG, DASM_LABEL_PC, DASM_ALIGN,
+  DASM_EXTERN, DASM_ESC, DASM_MARK, DASM_SECTION, DASM_STOP
 };
 
 /* Maximum number of section buffer positions for a single dasm_put() call. */
@@ -221,7 +221,6 @@ void dasm_put(Dst_DECL, int start, ...)
     } else {
       int *pl, n;
       switch (action) {
-      case DASM_IMM_LG64: ofs += 4;
       case DASM_REL_LG:
       case DASM_IMM_LG:
 	n = *p++; pl = D->lglabels + n;
@@ -230,7 +229,6 @@ void dasm_put(Dst_DECL, int start, ...)
 	pl -= 246; n = *pl;
 	if (n < 0) n = 0;  /* Start new chain for fwd rel if label exists. */
 	goto linkrel;
-	  case DASM_IMM_PC64: ofs += 4;
       case DASM_REL_PC:
       case DASM_IMM_PC: pl = D->pclabels + va_arg(ap, int); CKPL(pc, PC);
       putrel:
@@ -244,8 +242,11 @@ void dasm_put(Dst_DECL, int start, ...)
 	}
 	pos++;
 	ofs += 4;  /* Maximum offset needed. */
-	if (action == DASM_REL_LG || action == DASM_REL_PC)
+	if (action == DASM_REL_LG || action == DASM_REL_PC) {
 	  b[pos++] = ofs;  /* Store pass1 offset estimate. */
+	} else if (sizeof(ptrdiff_t) == 8) {
+	  ofs += 4;
+	}
 	break;
       case DASM_LABEL_LG: pl = D->lglabels + *p++; CKPL(lg, LG); goto putlabel;
       case DASM_LABEL_PC: pl = D->pclabels + va_arg(ap, int); CKPL(pc, PC);
@@ -338,12 +339,10 @@ int dasm_link(Dst_DECL, size_t *szp)
 	  break;
 	}
 	  /* fallthrough */
-	case DASM_SPACE: case DASM_IMM_LG: case DASM_IMM_LG64: case DASM_VREG: p++;
-	  /* fallthrough */
+	case DASM_SPACE: case DASM_IMM_LG: case DASM_VREG: p++;
 	case DASM_DISP: case DASM_IMM_S: case DASM_IMM_B: case DASM_IMM_W:
 	case DASM_IMM_D: case DASM_IMM_WB: case DASM_IMM_DB:
-	case DASM_SETLABEL: case DASM_REL_A: case DASM_IMM_PC: case DASM_IMM_PC64:
-	  pos++; break;
+	case DASM_SETLABEL: case DASM_REL_A: case DASM_IMM_PC: pos++; break;
 	case DASM_LABEL_LG: p++;
 	  /* fallthrough */
 	case DASM_LABEL_PC: b[pos++] += ofs; break; /* Fix label offset. */
@@ -369,17 +368,27 @@ int dasm_link(Dst_DECL, size_t *szp)
 #ifndef DASM_ALIGNED_WRITES
 typedef ZEND_SET_ALIGNED(1, unsigned short unaligned_short);
 typedef ZEND_SET_ALIGNED(1, unsigned int unaligned_int);
-typedef ZEND_SET_ALIGNED(1, uint64_t unaligned_uint64_t);
+typedef ZEND_SET_ALIGNED(1, unsigned long long unaligned_long_long);
 #define dasmw(x) \
   do { *((unaligned_short *)cp) = (unsigned short)(x); cp+=2; } while (0)
 #define dasmd(x) \
   do { *((unaligned_int *)cp) = (unsigned int)(x); cp+=4; } while (0)
 #define dasmq(x) \
-  do { *((unaligned_uint64_t *)cp) = (uint64_t)(x); cp+=8; } while (0)
+  do { *((unaligned_long_long *)cp) = (unsigned long long)(x); cp+=8; } while (0)
 #else
 #define dasmw(x)	do { dasmb(x); dasmb((x)>>8); } while (0)
 #define dasmd(x)	do { dasmw(x); dasmw((x)>>16); } while (0)
+#define dasmq(x)	do { dasmd(x); dasmd((x)>>32); } while (0)
 #endif
+static unsigned char *dasma_(unsigned char *cp, ptrdiff_t x)
+{
+  if (sizeof(ptrdiff_t) == 8)
+    dasmq((unsigned long long)x);
+  else
+    dasmd((unsigned int)x);
+  return cp;
+}
+#define dasma(x)	(cp = dasma_(cp, (x)))
 
 /* Pass 3: Encode sections. */
 int dasm_encode(Dst_DECL, void *buffer)
@@ -454,21 +463,12 @@ int dasm_encode(Dst_DECL, void *buffer)
 	  goto wb;
 	}
 	case DASM_IMM_LG:
-	  p++; if (n < 0) { n = (int)(ptrdiff_t)D->globals[-n]; goto wd; }
+	  p++;
+	  if (n < 0) { dasma((ptrdiff_t)D->globals[-n]); break; }
 	  /* fallthrough */
 	case DASM_IMM_PC: {
 	  int *pb = DASM_POS2PTR(D, n);
-	  n = *pb < 0 ? pb[1] : (*pb + (int)(ptrdiff_t)base);
-	  goto wd;
-	}
-	case DASM_IMM_LG64: {
-	  p++;
-	  if (n < 0)
-	    dasmq((ptrdiff_t)D->globals[-n]);
-	}
-	case DASM_IMM_PC64: {
-	  int *pb = DASM_POS2PTR(D, n);
-	  dasmq(*pb < 0 ? pb[1] : (*pb + (ptrdiff_t)base));
+	  dasma(*pb < 0 ? (ptrdiff_t)pb[1] : (*pb + (ptrdiff_t)base));
 	  break;
 	}
 	case DASM_LABEL_LG: {

ext/opcache/jit/dynasm/dasm_x86.lua

@@ -46,8 +46,8 @@ local action_names = {
   "SETLABEL", "REL_A",
   -- action arg (1 byte) or int arg, 2 buffer pos (link, offset):
   "REL_LG", "REL_PC",
-  -- action arg (1 byte) or ptrdiff_t arg, 1 buffer pos (link):
-  "IMM_LG", "IMM_LG64", "IMM_PC", "IMM_PC64",
+  -- action arg (1 byte) or int arg, 1 buffer pos (link):
+  "IMM_LG", "IMM_PC",
   -- action arg (1 byte) or int arg, 1 buffer pos (offset):
   "LABEL_LG", "LABEL_PC",
   -- action arg (1 byte), 1 buffer pos (offset):
@@ -438,16 +438,6 @@ local function wputlabel(aprefix, imm, num)
   end
 end
 
--- Put action for label arg (IMM_LG64, IMM_PC64, REL_LG, REL_PC).
-local function wputlabel64(aprefix, imm, num)
-  if type(imm) == "number" then
-    waction("IMM_LG64", nil, num);
-    wputxb(imm)
-  else
-    waction("IMM_PC64", imm, num)
-  end
-end
-
 -- Put signed byte or arg.
 local function wputsbarg(n)
   if type(n) == "number" then
@@ -479,38 +469,34 @@ local function wputwarg(n)
   else waction("IMM_W", n) end
 end
 
--- Put signed or unsigned qword or arg.
-local function wputqarg(n)
+-- Put signed or unsigned dword or arg.
+local function wputdarg(n)
   local tn = type(n)
   if tn == "number" then
     wputb(band(n, 255))
     wputb(band(shr(n, 8), 255))
     wputb(band(shr(n, 16), 255))
-    wputb(band(shr(n, 24), 255))
-    wputb(band(shr(n, 32), 255))
-    wputb(band(shr(n, 40), 255))
-    wputb(band(shr(n, 48), 255))
-    wputb(shr(n, 56))
+    wputb(shr(n, 24))
   elseif tn == "table" then
-    wputlabel64("IMM_", n[1], 1)
+    wputlabel("IMM_", n[1], 1)
   else
-    waction("IMM_D", format("(unsigned int)(%s)", n))
-    waction("IMM_D", format("(unsigned int)((%s)>>32)", n))
+    waction("IMM_D", n)
   end
 end
 
--- Put signed or unsigned dword or arg.
-local function wputdarg(n)
+-- Put signed or unsigned qword or arg.
+local function wputqarg(n)
   local tn = type(n)
-  if tn == "number" then
+  if tn == "number" then -- This is only used for numbers from -2^31..2^32-1.
     wputb(band(n, 255))
     wputb(band(shr(n, 8), 255))
     wputb(band(shr(n, 16), 255))
     wputb(shr(n, 24))
-  elseif tn == "table" then
-    wputlabel("IMM_", n[1], 1)
+    local sign = n < 0 and 255 or 0
+    wputb(sign); wputb(sign); wputb(sign); wputb(sign)
   else
-    waction("IMM_D", n)
+    waction("IMM_D", format("(unsigned int)(%s)", n))
+    waction("IMM_D", format("(unsigned int)((unsigned long long)(%s)>>32)", n))
   end
 end
 
@@ -693,10 +679,16 @@ local function opmodestr(op, args)
 end
 
 -- Convert number to valid integer or nil.
-local function toint(expr)
+local function toint(expr, isqword)
   local n = tonumber(expr)
   if n then
-    if n % 1 ~= 0 or n < -2147483648 or n > 4294967295 then
+    if n % 1 ~= 0 then
+      werror("not an integer number `"..expr.."'")
+    elseif isqword then
+      if n < -2147483648 or n > 2147483647 then
+	n = nil -- Handle it as an expression to avoid precision loss.
+      end
+    elseif n < -2147483648 or n > 4294967295 then
       werror("bad integer number `"..expr.."'")
     end
     return n
@@ -779,7 +771,7 @@ local function rtexpr(expr)
 end
 
 -- Parse operand and return { mode, opsize, reg, xreg, xsc, disp, imm }.
-local function parseoperand(param)
+local function parseoperand(param, isqword)
   local t = {}
 
   local expr = param
@@ -867,7 +859,7 @@ local function parseoperand(param)
       t.disp = dispexpr(tailx)
     else
       -- imm or opsize*imm
-      local imm = toint(expr)
+      local imm = toint(expr, isqword)
       if not imm and sub(expr, 1, 1) == "*" and t.opsize then
 	imm = toint(sub(expr, 2))
 	if imm then
@@ -1982,7 +1974,7 @@ local function dopattern(pat, args, sz, op, needrex)
 	local a = args[narg]
 	narg = narg + 1
 	local mode, imm = a.mode, a.imm
-	if mode == "iJ" and not match("iIJ", c) then
+	if mode == "iJ" and not match(x64 and "J" or "iIJ", c) then
 	  werror("bad operand size for label")
 	end
 	if c == "S" then
@@ -2174,24 +2166,18 @@ end
 local function op_data(params)
   if not params then return "imm..." end
   local sz = sub(params.op, 2, 2)
-  if sz == "a" then sz = addrsize end
+  if sz == "l" then sz = "d" elseif sz == "a" then sz = addrsize end
   for _,p in ipairs(params) do
-    local a = parseoperand(p)
+    local a = parseoperand(p, sz == "q")
     if sub(a.mode, 1, 1) ~= "i" or (a.opsize and a.opsize ~= sz) then
       werror("bad mode or size in `"..p.."'")
     end
     if a.mode == "iJ" then
-      if sz == 'q' then
-        wputlabel64("IMM_", a.imm, 1)
-      else
-        wputlabel("IMM_", a.imm, 1)
-      end
+      wputlabel("IMM_", a.imm, 1)
+    elseif sz == "q" then
+      wputqarg(a.imm)
     else
-      if sz == 'q' then
-        wputqarg(a.imm)
-      else
-        wputszarg(sz, a.imm)
-      end
+      wputszarg(sz, a.imm)
     end
     if secpos+2 > maxsecpos then wflush() end
   end
@@ -2201,7 +2187,11 @@ map_op[".byte_*"] = op_data
 map_op[".sbyte_*"] = op_data
 map_op[".word_*"] = op_data
 map_op[".dword_*"] = op_data
+map_op[".qword_*"] = op_data
 map_op[".aword_*"] = op_data
+map_op[".long_*"] = op_data
+map_op[".quad_*"] = op_data
+map_op[".addr_*"] = op_data
 
 ------------------------------------------------------------------------------