31a32
> #include "mem/mem_object.hh"
37c38
< : Port(pname, _owner), sendEvent(0), drainEvent(NULL),
---
> : Port(pname, _owner), sendEvent(NULL), drainEvent(NULL),
106a108,114
> void
> SimpleTimingPort::schedSendEvent(Tick when)
> {
> if (waitingOnRetry) {
> assert(!sendEvent->scheduled());
> return;
> }
107a116,122
> if (!sendEvent->scheduled()) {
> owner->schedule(sendEvent, when);
> } else if (sendEvent->when() > when) {
> owner->reschedule(sendEvent, when);
> }
> }
>
156c171
< schedule(sendEvent, time <= curTick() ? curTick()+1 : time);
---
> owner->schedule(sendEvent, time <= curTick() ? curTick()+1 : time);