Merge branch 'master' into v2.1

2016-07-17 14:38:26 +02:00
parent 01e4754962 1914de71c7
commit 37b377dedf
7 changed files with 13 additions and 13 deletions
--- a/src/jit/dis_x86.lua
+++ b/src/jit/dis_x86.lua
@@ -818,7 +818,7 @@ map_act = {
      m = b%32; b = (b-m)/32
      local nb = b%2; b = (b-nb)/2
      if nb == 0 then ctx.rexb = true end
-      local nx = b%2; b = (b-nx)/2
+      local nx = b%2
      if nx == 0 then ctx.rexx = true end
      b = byte(ctx.code, pos, pos)
      if not b then return incomplete(ctx) end