From a9b965498fd61aaffeffbbefa7c7d4f7b3cd3262 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 22 Feb 2015 19:31:14 +0000
Subject: [PATCH] Lunatic: update files from LuaJIT. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@5027 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/lunatic/dis_x64.lua | 2 +-
 polymer/eduke32/source/lunatic/dis_x86.lua | 2 +-
 polymer/eduke32/source/lunatic/dump.lua    | 7 +++----
 polymer/eduke32/source/lunatic/v.lua       | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/polymer/eduke32/source/lunatic/dis_x64.lua b/polymer/eduke32/source/lunatic/dis_x64.lua
index 4a1894ace..a80981bd5 100644
--- a/polymer/eduke32/source/lunatic/dis_x64.lua
+++ b/polymer/eduke32/source/lunatic/dis_x64.lua
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
 -- LuaJIT x64 disassembler wrapper module.
 --
--- Copyright (C) 2005-2013 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
 -- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 -- This module just exports the 64 bit functions from the combined
diff --git a/polymer/eduke32/source/lunatic/dis_x86.lua b/polymer/eduke32/source/lunatic/dis_x86.lua
index c442a176b..078d6094d 100644
--- a/polymer/eduke32/source/lunatic/dis_x86.lua
+++ b/polymer/eduke32/source/lunatic/dis_x86.lua
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
 -- LuaJIT x86/x64 disassembler module.
 --
--- Copyright (C) 2005-2013 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
 -- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 -- This is a helper module used by the LuaJIT machine code dumper module.
diff --git a/polymer/eduke32/source/lunatic/dump.lua b/polymer/eduke32/source/lunatic/dump.lua
index 7441b74db..589543f1f 100644
--- a/polymer/eduke32/source/lunatic/dump.lua
+++ b/polymer/eduke32/source/lunatic/dump.lua
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
 -- LuaJIT compiler dump module.
 --
--- Copyright (C) 2005-2013 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
 -- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 --
@@ -36,6 +36,7 @@
 --  * m  Dump the generated machine code.
 --    x  Print each taken trace exit.
 --    X  Print each taken trace exit and the contents of all registers.
+--    a  Print the IR of aborted traces, too.
 --
 -- The output format can be set with the following characters:
 --
@@ -54,7 +55,7 @@
 
 -- Cache some library functions and objects.
 local jit = require("jit")
-assert(jit.version_num == 20002, "LuaJIT core/library version mismatch")
+assert(jit.version_num == 20003, "LuaJIT core/library version mismatch")
 local jutil = require("jit.util")
 local vmdef = require("jit.vmdef")
 local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc
@@ -546,10 +547,8 @@ local function dump_trace(what, tr, func, pc, otr, oex)
     out:write("---- TRACE ", tr, " ", what)
     if otr then out:write(" ", otr, "/", oex) end
     out:write(" ", fmtfunc(func, pc), "\n")
-    recprefix = ""
   elseif what == "stop" or what == "abort" then
     out:write("---- TRACE ", tr, " ", what)
-    recprefix = nil
     if what == "abort" then
       out:write(" ", fmtfunc(func, pc), " -- ", fmterr(otr, oex), "\n")
     else
diff --git a/polymer/eduke32/source/lunatic/v.lua b/polymer/eduke32/source/lunatic/v.lua
index d7df71262..c622443d9 100644
--- a/polymer/eduke32/source/lunatic/v.lua
+++ b/polymer/eduke32/source/lunatic/v.lua
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
 -- Verbose mode of the LuaJIT compiler.
 --
--- Copyright (C) 2005-2013 Mike Pall. All rights reserved.
+-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
 -- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 --
@@ -59,7 +59,7 @@
 
 -- Cache some library functions and objects.
 local jit = require("jit")
-assert(jit.version_num == 20002, "LuaJIT core/library version mismatch")
+assert(jit.version_num == 20003, "LuaJIT core/library version mismatch")
 local jutil = require("jit.util")
 local vmdef = require("jit.vmdef")
 local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo