cpu.cc (3226:de4981baa276) | cpu.cc (3227:fe19356d6f88) |
---|---|
1/* 2 * Copyright (c) 2004-2006 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; --- 946 unchanged lines hidden (view full) --- 955 } 956 } 957 if (!tickEvent.scheduled()) 958 tickEvent.schedule(curTick); 959 960 Port *peer; 961 Port *icachePort = fetch.getIcachePort(); 962 if (icachePort->getPeer() == NULL) { | 1/* 2 * Copyright (c) 2004-2006 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; --- 946 unchanged lines hidden (view full) --- 955 } 956 } 957 if (!tickEvent.scheduled()) 958 tickEvent.schedule(curTick); 959 960 Port *peer; 961 Port *icachePort = fetch.getIcachePort(); 962 if (icachePort->getPeer() == NULL) { |
963 peer = oldCPU->getPort("icachePort")->getPeer(); | 963 peer = oldCPU->getPort("icache_port")->getPeer(); |
964 icachePort->setPeer(peer); 965 } else { 966 peer = icachePort->getPeer(); 967 } 968 peer->setPeer(icachePort); 969 970 Port *dcachePort = iew.getDcachePort(); 971 if (dcachePort->getPeer() == NULL) { | 964 icachePort->setPeer(peer); 965 } else { 966 peer = icachePort->getPeer(); 967 } 968 peer->setPeer(icachePort); 969 970 Port *dcachePort = iew.getDcachePort(); 971 if (dcachePort->getPeer() == NULL) { |
972 Port *peer = oldCPU->getPort("dcachePort")->getPeer(); | 972 peer = oldCPU->getPort("dcache_port")->getPeer(); |
973 dcachePort->setPeer(peer); 974 } else { 975 peer = dcachePort->getPeer(); 976 } 977 peer->setPeer(dcachePort); 978} 979 980template <class Impl> --- 461 unchanged lines hidden --- | 973 dcachePort->setPeer(peer); 974 } else { 975 peer = dcachePort->getPeer(); 976 } 977 peer->setPeer(dcachePort); 978} 979 980template <class Impl> --- 461 unchanged lines hidden --- |