diff --git a/js/src/nanojit/Assembler.cpp b/js/src/nanojit/Assembler.cpp
index daf549afc55..a023b7b0c60 100755
--- a/js/src/nanojit/Assembler.cpp
+++ b/js/src/nanojit/Assembler.cpp
@@ -100,11 +100,7 @@ namespace nanojit
             if (!block.isEmpty()) {
 			    for (int j=0,n=block.size(); j < n; j++) {
 					LIns *i = block[j];
-				    assm->outputf("    %s", names->formatIns(block[j]));
-					if (i->isop(LIR_label)) {
-						assm->outputf("        %p:", assm->_nIns);
-						assm->output("");
-					}
+					assm->outputf("    %s", names->formatIns(i));
 				}
 			    block.clear();
             }
@@ -132,7 +128,7 @@ namespace nanojit
 			else {
                 if (flushnext)
                     flush();
-				flush_add(i);//block.add(i);
+				block.add(i);//flush_add(i);
                 if (i->isop(LIR_label))
                     flushnext = true;
 			}
@@ -158,6 +154,7 @@ namespace nanojit
 		nInit(core);
 		verbose_only( _verbose = !core->quiet_opt() && core->verbose() );
 		verbose_only( _outputCache = 0);
+		verbose_only( outlineEOL[0] = '\0');
 		
 		internalReset();
 		pageReset();
@@ -636,13 +633,8 @@ namespace nanojit
 		int d = disp(resv);
 		Register rr = resv->reg;
 		bool quad = i->opcode() == LIR_param || i->isQuad();
+		verbose_only( if (d && _verbose) { outputForEOL("  <= spill %s", _thisfrag->lirbuf->names->formatRef(i)); } )
 		asm_spill(rr, d, pop, quad);
-		if (d) 
-		{
-			verbose_only(if (_verbose) {
-				outputf("        spill %s",_thisfrag->lirbuf->names->formatRef(i));
-			})
-		}
 	}
 
 	void Assembler::freeRsrcOf(LIns *i, bool pop)
@@ -821,8 +813,8 @@ namespace nanojit
         _labels.clear();
         _patches.clear();
 
-		verbose_only( verbose_outputf("        %p:",_nIns) );
-		verbose_only( verbose_output("        epilogue:") );
+		verbose_only( outputAddr=true; )
+		verbose_only( asm_output("[epilogue]"); )
 	}
 	
 	void Assembler::assemble(Fragment* frag,  NInsList& loopJumps)
@@ -894,8 +886,8 @@ namespace nanojit
 		if (!error())
 		{
 			fragEntry = genPrologue();
-			verbose_only( verbose_outputf("        %p:",_nIns); )
-			verbose_only( verbose_output("        prologue"); )
+			verbose_only( outputAddr=true; )
+			verbose_only( asm_output("[prologue]"); )
 		}
 		
 		// something bad happened?
@@ -1292,11 +1284,6 @@ namespace nanojit
                         }
                         JMP(0);
     					_patches.put(_nIns, to);
-                        verbose_only(
-                            verbose_outputf("        Loop %s -> %s", 
-                                lirNames[ins->opcode()], 
-                                _thisfrag->lirbuf->names->formatRef(to));
-                        )
                     }
 					break;
 				}
@@ -1328,11 +1315,6 @@ namespace nanojit
                         }
                         NIns *branch = asm_branch(op == LIR_jf, cond, 0, false);
 			            _patches.put(branch,to);
-                        verbose_only(
-                            verbose_outputf("Loop %s -> %s", 
-                                lirNames[ins->opcode()], 
-                                _thisfrag->lirbuf->names->formatRef(to));
-                        )
                     }
 					break;
 				}					
@@ -1352,10 +1334,8 @@ namespace nanojit
                         intersectRegisterState(label->regs);
                         //asm_align_code();
                         label->addr = _nIns;
-                        verbose_only(
-                            verbose_outputf("Loop %s", _thisfrag->lirbuf->names->formatRef(ins));
-                        )
                     }
+					verbose_only( if (_verbose) { outputAddr=true; asm_output1("[%s]", _thisfrag->lirbuf->names->formatRef(ins)); } )
 					break;
 				}
 
@@ -1718,29 +1698,34 @@ namespace nanojit
 	{
 		// evictions and pops first
 		RegisterMask skip = 0;
+		verbose_only(bool shouldMention=false; )
 		for (Register r=FirstReg; r <= LastReg; r = nextreg(r))
 		{
 			LIns * curins = _allocator.getActive(r);
 			LIns * savedins = saved.getActive(r);
 			if (curins == savedins)
 			{
-				verbose_only( if (curins) verbose_outputf("        skip %s", regNames[r]); )
+				//verbose_only( if (curins) verbose_outputf("                                              skip %s", regNames[r]); )
 				skip |= rmask(r);
 			}
 			else 
 			{
                 if (curins) {
                     //_nvprof("intersect-evict",1);
+					verbose_only( shouldMention=true; )
 					evict(r);
                 }
 				
     			#ifdef NANOJIT_IA32
-				if (savedins && (rmask(r) & x87Regs))
+				if (savedins && (rmask(r) & x87Regs)) {
+					verbose_only( shouldMention=true; )
 					FSTP(r);
+				}
 				#endif
 			}
 		}
         assignSaved(saved, skip);
+		verbose_only( if (shouldMention) verbose_outputf("                                              merging registers (intersect) with existing edge");  )
 	}
 
 	/**
@@ -1754,6 +1739,7 @@ namespace nanojit
 	void Assembler::unionRegisterState(RegAlloc& saved)
 	{
 		// evictions and pops first
+		verbose_only(bool shouldMention=false; )
 		RegisterMask skip = 0;
 		for (Register r=FirstReg; r <= LastReg; r = nextreg(r))
 		{
@@ -1761,13 +1747,14 @@ namespace nanojit
 			LIns * savedins = saved.getActive(r);
 			if (curins == savedins)
 			{
-				verbose_only( if (curins) verbose_outputf("        skip %s", regNames[r]); )
+				//verbose_only( if (curins) verbose_outputf("                                              skip %s", regNames[r]); )
 				skip |= rmask(r);
 			}
 			else 
 			{
                 if (curins && savedins) {
                     //_nvprof("union-evict",1);
+					verbose_only( shouldMention=true; )
 					evict(r);
                 }
 				
@@ -1781,11 +1768,13 @@ namespace nanojit
 						// so we must evict here to keep x87 stack balanced.
 						evict(r);
 					}
+					verbose_only( shouldMention=true; )
 				}
 				#endif
 			}
 		}
         assignSaved(saved, skip);
+		verbose_only( if (shouldMention) verbose_outputf("                                              merging registers (union) with existing edge");  )
     }
 
     void Assembler::assignSaved(RegAlloc &saved, RegisterMask skip)
@@ -1807,6 +1796,15 @@ namespace nanojit
 
 	#ifdef NJ_VERBOSE
 		char Assembler::outline[8192];
+		char Assembler::outlineEOL[512];
+
+		void Assembler::outputForEOL(const char* format, ...)
+		{
+			va_list args;
+			va_start(args, format);
+			outlineEOL[0] = '\0';
+			vsprintf(outlineEOL, format, args);
+		}
 
 		void Assembler::outputf(const char* format, ...)
 		{
@@ -1835,7 +1833,6 @@ namespace nanojit
 		{
 			if (!verbose_enabled())
 				return;
-			if (*s != '^')
 				output(s);
 		}
 
diff --git a/js/src/nanojit/Assembler.h b/js/src/nanojit/Assembler.h
index 8b9612380a0..716034d11be 100644
--- a/js/src/nanojit/Assembler.h
+++ b/js/src/nanojit/Assembler.h
@@ -167,13 +167,15 @@ namespace nanojit
 		public:
 			#ifdef NJ_VERBOSE
 			static char  outline[8192]; 
+			static char  outlineEOL[512];  // string to be added to the end of the line
 			static char* outputAlign(char* s, int col); 
 
+			void FASTCALL outputForEOL(const char* format, ...);
 			void FASTCALL output(const char* s); 
 			void FASTCALL outputf(const char* format, ...); 
 			void FASTCALL output_asm(const char* s); 
 			
-			bool _verbose, vpad[3];
+			bool _verbose, outputAddr, vpad[2];  // if outputAddr=true then next asm instr. will include address in output
 			void printActivationState();
 
 			StringList* _outputCache;
diff --git a/js/src/nanojit/Native.h b/js/src/nanojit/Native.h
index 9ab51453cd1..4858a2e1c2c 100644
--- a/js/src/nanojit/Native.h
+++ b/js/src/nanojit/Native.h
@@ -98,10 +98,14 @@ namespace nanojit {
 		#define PRFX					counter_increment(native);\
 			if (verbose_enabled()) {\
 				outline[0]='\0';\
-				sprintf(outline, "                   ");\
+				if (outputAddr) { sprintf(outline, "         %8p  ",_nIns); } \
+				else { sprintf(outline, "                   "); } \
 				sprintf(&outline[19]
 		#define PSFX					Assembler::outputAlign(outline, 45);\
 			RegAlloc::formatRegisters(_allocator, outline, _thisfrag);\
+			strcat(outline,outlineEOL); \
+			outlineEOL[0]='\0'; \
+			outputAddr = false; \
 			Assembler::output_asm(outline); }
 		//#define PRFX					fprintf(stdout
 		//#define PSFX					fprintf(stdout,"\n")
diff --git a/js/src/nanojit/Nativei386.cpp b/js/src/nanojit/Nativei386.cpp
index 767b4f3e39d..778ecc5ed25 100644
--- a/js/src/nanojit/Nativei386.cpp
+++ b/js/src/nanojit/Nativei386.cpp
@@ -127,8 +127,7 @@ namespace nanojit
 #endif
 		}
 
-		verbose_only( verbose_outputf("        %p:",_nIns); )
-		verbose_only( verbose_output("        frag entry:"); )
+		verbose_only( outputAddr=true; asm_output("[frag entry]"); )
         NIns *fragEntry = _nIns;
 		MR(FP, SP); // Establish our own FP.
         PUSHr(FP); // Save caller's FP.
@@ -261,9 +260,6 @@ namespace nanojit
 
         bool indirect = false;
         if (ins->isop(LIR_call) || ins->isop(LIR_fcall)) {
-            verbose_only(if (_verbose)
-                outputf("        %p:", _nIns);
-            )
     		CALL(call);
         }
         else {
@@ -522,10 +518,8 @@ namespace nanojit
 	void Assembler::asm_restore(LInsp i, Reservation *resv, Register r)
 	{
         if (i->isop(LIR_alloc)) {
+			verbose_only( if (_verbose) { outputForEOL("  <= remat %s size %d", _thisfrag->lirbuf->names->formatRef(i), i->size()); } )
             LEA(r, disp(resv), FP);
-            verbose_only(if (_verbose) {
-                outputf("        remat %s size %d", _thisfrag->lirbuf->names->formatRef(i), i->size());
-            })
         }
         else if (i->isconst()) {
             if (!resv->arIndex) {
@@ -535,10 +529,8 @@ namespace nanojit
         }
         else {
             int d = findMemFor(i);
+			verbose_only( if (_verbose) { outputForEOL("  <= restore %s", _thisfrag->lirbuf->names->formatRef(i)); } )
 			asm_load(d,r);
-			verbose_only(if (_verbose) {
-				outputf("        restore %s", _thisfrag->lirbuf->names->formatRef(i));
-			})
         }
 	}
 
diff --git a/js/src/nanojit/Nativei386.h b/js/src/nanojit/Nativei386.h
index eb4280fb28c..2d11fd21167 100644
--- a/js/src/nanojit/Nativei386.h
+++ b/js/src/nanojit/Nativei386.h
@@ -745,7 +745,7 @@ namespace nanojit
   int offset = (c->_address) - ((int)_nIns); \
   IMM32( (uint32_t)offset );	\
   *(--_nIns) = 0xE8;		\
-  verbose_only(asm_output1("call %s",(c->_name));) \
+  verbose_only(outputAddr=true; asm_output1("call %s",(c->_name));) \
   debug_only(if ((c->_argtypes&3)==ARGSIZE_F) fpu_push();)\
 } while (0)
 
@@ -753,7 +753,7 @@ namespace nanojit
 #define CALLr(c,r)	do { \
   underrunProtect(2);\
   ALU(0xff, 2, (r));\
-  verbose_only(asm_output1("call %s",gpn(r));) \
+  verbose_only(outputAddr=true; asm_output1("call %s",gpn(r));) \
   debug_only(if ((c->_argtypes&3)==ARGSIZE_F) fpu_push();)\
 } while (0)