summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-12-18 01:52:57 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-12-18 01:52:57 -0500
commit45ea1549c9cec71b5119702056fad20a0db1ebdf (patch)
treeb420d99a930c9209664884edd299c219e0136d05 /src
parent71909a50de2dd5154622c936179d97ec5220f872 (diff)
downloadgem5-45ea1549c9cec71b5119702056fad20a0db1ebdf.tar.xz
Checkpointing: Fix a bug in the simulation script when restoring without standard switch and change some ifs to work with the default port since every port is now connected to something.
--HG-- extra : convert_revision : 72507cf13e58465291b0dce6322e853bee5a2b89
Diffstat (limited to 'src')
-rw-r--r--src/cpu/base.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/base.cc b/src/cpu/base.cc
index 7b04f5a90..677152ce8 100644
--- a/src/cpu/base.cc
+++ b/src/cpu/base.cc
@@ -352,7 +352,7 @@ BaseCPU::takeOverFrom(BaseCPU *oldCPU, Port *ic, Port *dc)
// connected to anything. Also connect old CPU's memory to new
// CPU.
Port *peer;
- if (ic->getPeer() == NULL) {
+ if (ic->getPeer() == NULL || ic->getPeer()->isDefaultPort()) {
peer = oldCPU->getPort("icache_port")->getPeer();
ic->setPeer(peer);
} else {
@@ -360,7 +360,7 @@ BaseCPU::takeOverFrom(BaseCPU *oldCPU, Port *ic, Port *dc)
}
peer->setPeer(ic);
- if (dc->getPeer() == NULL) {
+ if (dc->getPeer() == NULL || dc->getPeer()->isDefaultPort()) {
peer = oldCPU->getPort("dcache_port")->getPeer();
dc->setPeer(peer);
} else {