From: Ali Saidi <saidi@eecs.umich.edu>
Date: Tue, 13 Feb 2007 15:07:50 +0000 (-0500)
Subject: fix compiling problems
X-Git-Tag: m5_2.0_beta3~198
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca5cd68df4967b306625723c13eab9282c0f2372;p=gem5.git

fix compiling problems

--HG--
extra : convert_revision : 9ecfd5a0a151c03503e42faf98240da12fd719b1
---

diff --git a/src/arch/mips/isa/formats/mem.isa b/src/arch/mips/isa/formats/mem.isa
index fccda2775..c365edd0a 100644
--- a/src/arch/mips/isa/formats/mem.isa
+++ b/src/arch/mips/isa/formats/mem.isa
@@ -449,7 +449,7 @@ def template StoreCondCompleteAcc {{
         %(fp_enable_check)s;
         %(op_dest_decl)s;
 
-        uint64_t write_result = pkt->req->getScResult();
+        uint64_t write_result = pkt->req->getExtraData();
 
         if (fault == NoFault) {
             %(postacc_code)s;
diff --git a/src/base/traceflags.py b/src/base/traceflags.py
index 335629467..897bf0023 100644
--- a/src/base/traceflags.py
+++ b/src/base/traceflags.py
@@ -278,7 +278,7 @@ def gen_hh(filename):
     /* namespace Trace */ }
 
     #endif // __BASE_TRACE_FLAGS_HH__
-    ''',
+    \n''',
 
     hhfile.close()