Merge branch 'master' into v2.1

2020-10-12 16:18:02 +02:00
parent 675e08cf06 050466552b
commit 1d8b747c16
19 changed files with 49 additions and 49 deletions
--- a/src/jit/dump.lua
+++ b/src/jit/dump.lua
@@ -614,7 +614,7 @@ local function dump_texit(tr, ex, ngpr, nfpr, ...)
  out:write("---- TRACE ", tr, " exit ", ex, "\n")
  if dumpmode.X then
    local regs = {...}
-    if jit.arch == "x64" then
+    if jit.arch:sub(-2) == "64" then
      for i=1,ngpr do
 	out:write(format(" %016x", regs[i]))
 	if i % 4 == 0 then out:write("\n") end