From bcd459aa0e5ab8e6df4a89c75c4f9f00ec7d0176 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Fri, 30 Mar 2012 01:36:55 +0200
Subject: MIPS: Integrate and enable JIT compiler.

---
 lib/dis_mips.lua |  2 +-
 lib/dump.lua     | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/dis_mips.lua b/lib/dis_mips.lua
index 165405d2..2edfdf40 100644
--- a/lib/dis_mips.lua
+++ b/lib/dis_mips.lua
@@ -231,7 +231,7 @@ local map_gpr = {
   [0] = "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
   "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15",
   "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23",
-  "r24", "r25", "r26", "r27", "gp", "sp", "r30", "ra",
+  "r24", "r25", "r26", "r27", "r28", "sp", "r30", "ra",
 }
 
 ------------------------------------------------------------------------------
diff --git a/lib/dump.lua b/lib/dump.lua
index 37c06502..3d62c4ea 100644
--- a/lib/dump.lua
+++ b/lib/dump.lua
@@ -84,6 +84,10 @@ local nexitsym = 0
 local function fillsymtab_tr(tr, nexit)
   local t = {}
   symtabmt.__index = t
+  if jit.arch == "mips" or jit.arch == "mipsel" then
+    t[traceexitstub(tr, 0)] = "exit"
+    return
+  end
   for i=0,nexit-1 do
     local addr = traceexitstub(tr, i)
     t[addr] = tostring(i)
@@ -604,9 +608,16 @@ local function dump_texit(tr, ex, ngpr, nfpr, ...)
 	if i % 8 == 0 then out:write("\n") end
       end
     end
-    for i=1,nfpr do
-      out:write(format(" %+17.14g", regs[ngpr+i]))
-      if i % 4 == 0 then out:write("\n") end
+    if jit.arch == "mips" or jit.arch == "mipsel" then
+      for i=1,nfpr,2 do
+	out:write(format(" %+17.14g", regs[ngpr+i]))
+	if i % 8 == 7 then out:write("\n") end
+      end
+    else
+      for i=1,nfpr do
+	out:write(format(" %+17.14g", regs[ngpr+i]))
+	if i % 4 == 0 then out:write("\n") end
+      end
     end
   end
 end
-- 
cgit v1.2.3-55-g6feb