Commits

Anonymous committed 20f8b5c

deleting debug printfs

Comments (0)

Files changed (1)

patches/metric-lwact.diff

 diff -r fb21a3a12180 js/src/jsapi.cpp
 --- a/js/src/jsapi.cpp	Thu Jun 04 10:58:06 2009 -0700
-+++ b/js/src/jsapi.cpp	Thu Jun 04 11:18:57 2009 -0700
++++ b/js/src/jsapi.cpp	Thu Jun 04 11:38:29 2009 -0700
 @@ -727,6 +727,9 @@
  JS_PUBLIC_API(JSRuntime *)
  JS_NewRuntime(uint32 maxbytes)
  
 diff -r fb21a3a12180 js/src/jsinterp.cpp
 --- a/js/src/jsinterp.cpp	Thu Jun 04 10:58:06 2009 -0700
-+++ b/js/src/jsinterp.cpp	Thu Jun 04 11:18:57 2009 -0700
++++ b/js/src/jsinterp.cpp	Thu Jun 04 11:38:29 2009 -0700
 @@ -235,7 +235,7 @@
                                                   JSVAL_TO_OBJECT(v))),
                              OBJ_SHAPE(obj));
    atom_not_defined:
 diff -r fb21a3a12180 js/src/jstracer.cpp
 --- a/js/src/jstracer.cpp	Thu Jun 04 10:58:06 2009 -0700
-+++ b/js/src/jstracer.cpp	Thu Jun 04 11:18:57 2009 -0700
++++ b/js/src/jstracer.cpp	Thu Jun 04 11:38:29 2009 -0700
 @@ -78,6 +78,8 @@
  #include "jsautooplen.h"        // generated headers last
  #include "imacros.c.out"
      if (tm->needFlush) {
          FlushJITCache(cx);
          return;
-@@ -2880,6 +2884,7 @@
-     fragmento->labels->add(fragment, sizeof(Fragment), 0, label);
-     free(label);
- #endif
-+    printf("completed\n");
-     AUDIT(traceCompleted);
- }
- 
-@@ -3925,11 +3930,12 @@
+@@ -3925,11 +3929,12 @@
  }
  
  static JS_REQUIRES_STACK bool
          return false;
      }
  
-@@ -3938,8 +3944,12 @@
+@@ -3938,8 +3943,12 @@
      TreeInfo* ti = (TreeInfo*)f->vmprivate;
  
      /* Don't grow trees above a certain size to avoid code explosion due to tail duplication. */
  
      Fragment* c;
      if (!(c = anchor->target)) {
-@@ -3987,9 +3997,13 @@
+@@ -3987,9 +3996,13 @@
              ngslots = e2->numGlobalSlots;
              typeMap = fullMap.data();
          }
      return false;
  }
  
-@@ -4318,6 +4332,8 @@
+@@ -4318,6 +4331,8 @@
  js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount,
                 VMSideExit** innermostNestedGuardp)
  {
      JS_ASSERT(f->root == f && f->code() && f->vmprivate);
  
      JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
-@@ -4407,11 +4423,14 @@
+@@ -4407,11 +4422,14 @@
  
      debug_only(fflush(NULL);)
      GuardRecord* rec;
      VMSideExit* lr = (VMSideExit*)rec->exit;
  
      AUDIT(traceTriggered);
-@@ -4671,6 +4690,8 @@
+@@ -4671,6 +4689,8 @@
  JS_REQUIRES_STACK bool
  js_MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount)
  {
      JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
  
      /* Is the recorder currently active? */
-@@ -4690,14 +4711,17 @@
+@@ -4690,14 +4710,17 @@
           * the interpreter and do not attempt to trigger or record a new tree at this
           * location.
           */
          return false; /* Out of memory, don't try to record now. */
      }
  
-@@ -4712,8 +4736,10 @@
+@@ -4712,8 +4735,10 @@
      }
  
      /* Do not enter the JIT code with a pending operation callback. */
      
      jsbytecode* pc = cx->fp->regs->pc;
      uint32 argc = cx->fp->argc;
-@@ -4724,6 +4750,7 @@
+@@ -4724,6 +4749,7 @@
  
      if (!f) {
          FlushJITCache(cx);
          return false;
      }
  
-@@ -4731,12 +4758,17 @@
+@@ -4731,12 +4757,17 @@
         activate any trees so, start compiling. */
      if (!f->code() && !f->peer) {
      record:
      }
  
      debug_only_v(nj_dprintf("Looking for compat peer %d@%d, from %p (ip: %p)\n",
-@@ -4752,6 +4784,7 @@
+@@ -4752,6 +4783,7 @@
             expensive. This must be a rather type-unstable loop. */
          debug_only_v(nj_dprintf("Blacklisted: too many peer trees.\n");)
          js_Blacklist((jsbytecode*) f->root->ip);
          return false;
      }
  
-@@ -4759,24 +4792,41 @@
+@@ -4759,24 +4791,39 @@
      VMSideExit* innermostNestedGuard = NULL;
  
      lr = js_ExecuteTree(cx, match, inlineCallCount, &innermostNestedGuard);
 -        return false;
 +            return js_AttemptToExtendTree(cx, innermostNestedGuard, lr, NULL,
 +                                          &_mso);
-+        printf("extendOuter %s:%u %d\n", cx->fp->script->filename,
-+               js_FramePCToLineNumber(cx, cx->fp), *cx->fp->regs->pc);
 +        _mso.r = R_NO_EXTEND_OUTER;
 +        return false;
 +      case MISMATCH_EXIT: _mso.r = R_MISMATCH_EXIT; return false;
  }
 diff -r fb21a3a12180 js/src/jstracer.h
 --- a/js/src/jstracer.h	Thu Jun 04 10:58:06 2009 -0700
-+++ b/js/src/jstracer.h	Thu Jun 04 11:18:57 2009 -0700
++++ b/js/src/jstracer.h	Thu Jun 04 11:38:29 2009 -0700
 @@ -343,11 +343,11 @@
      unsigned                branchCount;
      Queue<VMSideExit*>      sideExits;