74,80d73
< DefaultCommit<Impl>::TrapEvent::TrapEvent(DefaultCommit<Impl> *_commit,
< ThreadID _tid)
< : Event(CPU_Tick_Pri, AutoDelete), commit(_commit), tid(_tid)
< {
< }
<
< template <class Impl>
82c75
< DefaultCommit<Impl>::TrapEvent::process()
---
> DefaultCommit<Impl>::processTrapEvent(ThreadID tid)
86c79
< commit->trapSquash[tid] = true;
---
> trapSquash[tid] = true;
90,96d82
< const char *
< DefaultCommit<Impl>::TrapEvent::description() const
< {
< return "Trap";
< }
<
< template <class Impl>
540c526,528
< TrapEvent *trap = new TrapEvent(this, tid);
---
> EventFunctionWrapper *trap = new EventFunctionWrapper(
> [this, tid]{ processTrapEvent(tid); },
> "Trap", true, Event::CPU_Tick_Pri);