From 4f8acd27095240899bfd6f5abecc7549417062e9 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Fri, 19 Dec 2003 08:04:40 -0800
Subject: [PATCH 1/2] Minor cleanup of trace/output stuff (leftover from EINTR
 bug fix).

base/cprintf.cc:
    Get rid of unnecessary stream state check.
    Bug is fixed now, and I'm not sure this did much anyway.
cpu/exetrace.cc:
    Get rid of unnecessary flush() call.

--HG--
extra : convert_revision : 107dcdc578b2b0ad1652ee52ea0a33b0f3cd4e39
---
 base/cprintf.cc | 16 ----------------
 cpu/exetrace.cc |  1 -
 2 files changed, 17 deletions(-)

diff --git a/base/cprintf.cc b/base/cprintf.cc
index 945ad5b38a..af3b26a577 100644
--- a/base/cprintf.cc
+++ b/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()) {
diff --git a/cpu/exetrace.cc b/cpu/exetrace.cc
index ce6b0c5442..3e8877e933 100644
--- a/cpu/exetrace.cc
+++ b/cpu/exetrace.cc
@@ -120,7 +120,6 @@ Trace::InstRecord::dump(ostream &outs)
     //  End of line...
     //
     outs << endl;
-    outs.flush();
 }
 
 

From 7d8366ac490fd720a09e1d9313f78241cef1dc9f Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Fri, 19 Dec 2003 08:10:53 -0800
Subject: [PATCH 2/2] Fix non-determinism on misspeculated uncached store
 conditionals.

--HG--
extra : convert_revision : d0e986d540a1425a91d070ee9d29652a30c60b01