Removed numMapEntries since typeMap is not really part of the SideExit struct yet anyway.
authorAndreas Gal <gal@mozilla.com>
Wed, 09 Jul 2008 00:13:35 -0700
changeset 17533 84e4a44abb65fb7bcc533356df79bce62df2886d
parent 17532 dc043e4e6c34c5538ed0bdd0e235d2b94e4f5db5
child 17534 596ac5ad13aab66f4b2d7a8f48474e3c78d9ce52
push id1452
push usershaver@mozilla.com
push dateFri, 22 Aug 2008 00:08:22 +0000
treeherdermozilla-central@d13bb0868596 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1a1pre
Removed numMapEntries since typeMap is not really part of the SideExit struct yet anyway.
js/src/jstracer.cpp
js/src/nanojit/avmplus.h
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -786,17 +786,16 @@ TraceRecorder::snapshot()
     LIns* data = lir_buf_writer->skip(slots * sizeof(uint8));
     /* setup side exit structure */
     memset(&exit, 0, sizeof(exit));
     exit.from = fragment;
     exit.calldepth = getCallDepth();
     exit.sp_adj = (cx->fp->regs->sp - entryRegs.sp) * sizeof(double);
     exit.ip_adj = cx->fp->regs->pc - entryRegs.pc;
     exit.typeMap = (uint8 *)data->payload();
-    exit.numMapEntries = slots;
     return &exit;
 }
 
 void
 TraceRecorder::guard(bool expected, LIns* cond)
 {
     lir->insGuard(expected ? LIR_xf : LIR_xt,
                   cond,
--- a/js/src/nanojit/avmplus.h
+++ b/js/src/nanojit/avmplus.h
@@ -116,17 +116,16 @@ namespace nanojit
 	struct SideExit
 	{
 		intptr_t sp_adj;
 		intptr_t ip_adj;
 		Fragment *target;
         Fragment *from;
 		int32_t calldepth;
         uint8 *typeMap;
-        uint32 numMapEntries;
 #if defined NJ_VERBOSE
 		uint32_t sid;
 #endif
 	};
 
 	class LIns;
 
 	struct GuardRecord
@@ -142,21 +141,17 @@ namespace nanojit
 		int32_t calldepth;
 #if defined NJ_VERBOSE
 		uint32_t compileNbr;
 		uint32_t sid;
 #endif
 	};
 
 	#define GuardRecordSize(g) sizeof(GuardRecord)
-
-    inline size_t SideExitSize(const SideExit *e)
-    {
-        return sizeof(SideExit)  + (sizeof(uint8) * e->numMapEntries);
-    }
+    #define SideExitSize(e) sizeof(SideExit)
 }
 
 class GCObject 
 {
 };
 
 class GCFinalizedObject
 {