2 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 77484a8d..2a8b62c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-29  Wenji Huang <wenji.huang@oracle.com>
+
+	* main.cxx (printscript): Print variable name and type for listing mode.
+
 2008-08-28  Frank Ch. Eigler  <fche@elastic.org>
 
 	* elaborate.cxx (add_global_var_display): Render array indexes
diff --git a/main.cxx b/main.cxx
index 27926447..51252e61 100644
--- a/main.cxx
+++ b/main.cxx
@@ -179,6 +179,18 @@ printscript(systemtap_session& s, ostream& o)
           if (seen.find (pp) == seen.end())
             {
               o << pp << endl;
+              if (s.verbose) {
+	              for (unsigned j=0; j<p->locals.size(); j++)
+		            {
+        		      vardecl* v = p->locals[j];
+	        	      if (j>0)
+			      	o << ", ";
+        		      else
+		      		o << "  ";
+		              v->printsig (o);
+		            }
+	              o << endl;
+              }
               seen.insert (pp);
             }
         }
@@ -581,6 +593,7 @@ main (int argc, char * const argv [])
         case 'l':
 	  s.suppress_warnings = true;
           s.listing_mode = true;
+          s.unoptimized = true;
           s.last_pass = 2;
           if (have_script)
             {