base.cc (5217:bb810bb8ca2d) base.cc (5311:9ed42a2315ae)
1/*
2 * Copyright (c) 2002-2005 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 338 unchanged lines hidden (view full) ---

347 if (profileEvent)
348 profileEvent->schedule(curTick);
349#endif
350
351 // Connect new CPU to old CPU's memory only if new CPU isn't
352 // connected to anything. Also connect old CPU's memory to new
353 // CPU.
354 Port *peer;
1/*
2 * Copyright (c) 2002-2005 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 338 unchanged lines hidden (view full) ---

347 if (profileEvent)
348 profileEvent->schedule(curTick);
349#endif
350
351 // Connect new CPU to old CPU's memory only if new CPU isn't
352 // connected to anything. Also connect old CPU's memory to new
353 // CPU.
354 Port *peer;
355 if (ic->getPeer() == NULL) {
355 if (ic->getPeer() == NULL || ic->getPeer()->isDefaultPort()) {
356 peer = oldCPU->getPort("icache_port")->getPeer();
357 ic->setPeer(peer);
358 } else {
359 peer = ic->getPeer();
360 }
361 peer->setPeer(ic);
362
356 peer = oldCPU->getPort("icache_port")->getPeer();
357 ic->setPeer(peer);
358 } else {
359 peer = ic->getPeer();
360 }
361 peer->setPeer(ic);
362
363 if (dc->getPeer() == NULL) {
363 if (dc->getPeer() == NULL || dc->getPeer()->isDefaultPort()) {
364 peer = oldCPU->getPort("dcache_port")->getPeer();
365 dc->setPeer(peer);
366 } else {
367 peer = dc->getPeer();
368 }
369 peer->setPeer(dc);
370}
371

--- 83 unchanged lines hidden --- 		364 peer = oldCPU->getPort("dcache_port")->getPeer();
365 dc->setPeer(peer);
366 } else {
367 peer = dc->getPeer();
368 }
369 peer->setPeer(dc);
370}
371

--- 83 unchanged lines hidden ---