Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5

--HG--
extra : convert_revision : 315f207185b418f41509210a35188be996c0eb0a

base/cprintf.cc

@@ -238,22 +238,6 @@ ArgList::dump(const string &format)
           }
             break;
         }
-
-        ios::iostate state = stream->rdstate();
-        if (state) {
-#if 0
-            cout << "stream->rdstate() == " << state << endl;
-            if (state & ios::badbit)
-                cout << "stream is bad!\n";
-            if (state & ios::eofbit)
-                cout << "stream at eof!\n";
-            if (state & ios::failbit)
-                cout << "stream failed!\n";
-            if (state & ios::goodbit)
-                cout << "stream is good!!\n";
-#endif
-            stream->clear();
-        }
     }
 
     while (!objects.empty()) {

cpu/exetrace.cc

@@ -120,7 +120,6 @@ Trace::InstRecord::dump(ostream &outs)
     //  End of line...
     //
     outs << endl;
-    outs.flush();
 }