56d55
< #include "config/use_checker.hh"
57a57
> #include "cpu/checker/cpu.hh"
69,72d68
< #if USE_CHECKER
< #include "cpu/checker/cpu.hh"
< #endif
<
434,436c430,436
< #if USE_CHECKER
< Port *old_checker_itb_port, *old_checker_dtb_port;
< Port *new_checker_itb_port, *new_checker_dtb_port;
---
> // Checker whether or not we have to transfer CheckerCPU
> // objects over in the switch
> CheckerCPU *oldChecker = oldTC->getCheckerCpuPtr();
> CheckerCPU *newChecker = newTC->getCheckerCpuPtr();
> if (oldChecker && newChecker) {
> Port *old_checker_itb_port, *old_checker_dtb_port;
> Port *new_checker_itb_port, *new_checker_dtb_port;
438,445c438,441
< CheckerCPU *oldChecker =
< dynamic_cast<CheckerCPU*>(oldTC->getCheckerCpuPtr());
< CheckerCPU *newChecker =
< dynamic_cast<CheckerCPU*>(newTC->getCheckerCpuPtr());
< old_checker_itb_port = oldChecker->getITBPtr()->getPort();
< old_checker_dtb_port = oldChecker->getDTBPtr()->getPort();
< new_checker_itb_port = newChecker->getITBPtr()->getPort();
< new_checker_dtb_port = newChecker->getDTBPtr()->getPort();
---
> old_checker_itb_port = oldChecker->getITBPtr()->getPort();
> old_checker_dtb_port = oldChecker->getDTBPtr()->getPort();
> new_checker_itb_port = newChecker->getITBPtr()->getPort();
> new_checker_dtb_port = newChecker->getDTBPtr()->getPort();
447,452c443,455
< // Move over any table walker ports if they exist for checker
< if (new_checker_itb_port && !new_checker_itb_port->isConnected()) {
< assert(old_checker_itb_port);
< Port *peer = old_checker_itb_port->getPeer();;
< new_checker_itb_port->setPeer(peer);
< peer->setPeer(new_checker_itb_port);
---
> // Move over any table walker ports if they exist for checker
> if (new_checker_itb_port && !new_checker_itb_port->isConnected()) {
> assert(old_checker_itb_port);
> Port *peer = old_checker_itb_port->getPeer();;
> new_checker_itb_port->setPeer(peer);
> peer->setPeer(new_checker_itb_port);
> }
> if (new_checker_dtb_port && !new_checker_dtb_port->isConnected()) {
> assert(old_checker_dtb_port);
> Port *peer = old_checker_dtb_port->getPeer();;
> new_checker_dtb_port->setPeer(peer);
> peer->setPeer(new_checker_dtb_port);
> }
454,461d456
< if (new_checker_dtb_port && !new_checker_dtb_port->isConnected()) {
< assert(old_checker_dtb_port);
< Port *peer = old_checker_dtb_port->getPeer();;
< new_checker_dtb_port->setPeer(peer);
< peer->setPeer(new_checker_dtb_port);
< }
< #endif
<