summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-02-13 10:07:50 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-02-13 10:07:50 -0500
commitca5cd68df4967b306625723c13eab9282c0f2372 (patch)
treef4653abde00346241a297278ae8b32ac61241f95 /src
parentd8c7ebf904e49d0ebf62099c35af0705de3c3f81 (diff)
downloadgem5-ca5cd68df4967b306625723c13eab9282c0f2372.tar.xz
fix compiling problems
--HG-- extra : convert_revision : 9ecfd5a0a151c03503e42faf98240da12fd719b1
Diffstat (limited to 'src')
-rw-r--r--src/arch/mips/isa/formats/mem.isa2
-rw-r--r--src/base/traceflags.py2
2 files changed, 2 insertions, 2 deletions
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()