43,44c43,44
< IntrControl::IntrControl(const string &name, BaseCPU *c)
< : SimObject(name), cpu(c)
---
> IntrControl::IntrControl(const string &name, System *s)
> : SimObject(name), sys(s)
47,50d46
< /* @todo
< *Fix the cpu sim object parameter to be a system pointer
< *instead, to avoid some extra dereferencing
< */
54c50
< std::vector<ThreadContext *> &tcvec = cpu->system->threadContexts;
---
> std::vector<ThreadContext *> &tcvec = sys->threadContexts;
62c58
< std::vector<ThreadContext *> &tcvec = cpu->system->threadContexts;
---
> std::vector<ThreadContext *> &tcvec = sys->threadContexts;
70c66
< std::vector<ThreadContext *> &tcvec = cpu->system->threadContexts;
---
> std::vector<ThreadContext *> &tcvec = sys->threadContexts;
78c74
< std::vector<ThreadContext *> &tcvec = cpu->system->threadContexts;
---
> std::vector<ThreadContext *> &tcvec = sys->threadContexts;
85c81
< SimObjectParam<BaseCPU *> cpu;
---
> SimObjectParam<System *> sys;
91c87
< INIT_PARAM(cpu, "the cpu")
---
> INIT_PARAM(sys, "the system we are part of")
97c93
< return new IntrControl(getInstanceName(), cpu);
---
> return new IntrControl(getInstanceName(), sys);