From ed58f77c473cf6f35a17ba1448a12dbca089987d Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Tue, 15 Aug 2006 17:41:22 -0400
Subject: fixes for gcc 4.1 Nate needs to fix sinic builder stuff Gabe needs to
 verify my fixes to decoder.isa

OPT/DEBUG compiles for ALPHA_FS, ALPHA_SE, MIPS_SE, SPARC_SE with this changeset

README:
    Fix the swig version in the readme
src/SConscript:
    remove sinic until nate fixes the builder crap for it
src/arch/alpha/system.hh:
src/arch/mips/isa/includes.isa:
src/arch/sparc/isa/decoder.isa:
src/base/stats/visit.cc:
src/base/timebuf.hh:
src/dev/ide_disk.cc:
src/dev/sinic.cc:
src/mem/cache/miss/mshr.cc:
src/mem/cache/miss/mshr_queue.cc:
src/mem/packet.hh:
src/mem/request.hh:
src/sim/builder.hh:
src/sim/system.hh:
    fixes for gcc 4.1

--HG--
extra : convert_revision : 3775427c0047b282574d4831dd602c96cac3ba17
---
 src/mem/cache/miss/mshr.cc       | 4 ++--
 src/mem/cache/miss/mshr_queue.cc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mem/cache/miss')

diff --git a/src/mem/cache/miss/mshr.cc b/src/mem/cache/miss/mshr.cc
index db2f40c56..d073c0fea 100644
--- a/src/mem/cache/miss/mshr.cc
+++ b/src/mem/cache/miss/mshr.cc
@@ -103,8 +103,8 @@ MSHR::deallocate()
     assert(ntargets == 0);
     pkt = NULL;
     inService = false;
-    allocIter = NULL;
-    readyIter = NULL;
+    //allocIter = NULL;
+    //readyIter = NULL;
 }
 
 /*
diff --git a/src/mem/cache/miss/mshr_queue.cc b/src/mem/cache/miss/mshr_queue.cc
index 6516a99f8..ffb486c64 100644
--- a/src/mem/cache/miss/mshr_queue.cc
+++ b/src/mem/cache/miss/mshr_queue.cc
@@ -219,7 +219,7 @@ MSHRQueue::markInService(MSHR* mshr)
     }
     mshr->inService = true;
     pendingList.erase(mshr->readyIter);
-    mshr->readyIter = NULL;
+    //mshr->readyIter = NULL;
     inServiceMSHRs += 1;
     //pendingList.pop_front();
 }
@@ -227,7 +227,7 @@ MSHRQueue::markInService(MSHR* mshr)
 void
 MSHRQueue::markPending(MSHR* mshr, Packet::Command cmd)
 {
-    assert(mshr->readyIter == NULL);
+    //assert(mshr->readyIter == NULL);
     mshr->pkt->cmd = cmd;
     mshr->pkt->flags &= ~SATISFIED;
     mshr->inService = false;
-- 
cgit v1.2.3