#include <string>
#include <vector>
+#include "base/trace.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
#include "cpu/intr_control.hh"
-#include "sim/builder.hh"
#include "sim/sim_object.hh"
using namespace std;
-IntrControl::IntrControl(const string &name, System *s)
- : SimObject(name), sys(s)
+IntrControl::IntrControl(const Params *p)
+ : SimObject(p), sys(p->sys)
{}
-void
-IntrControl::post(int int_num, int index)
-{
- std::vector<ThreadContext *> &tcvec = sys->threadContexts;
- BaseCPU *temp = tcvec[0]->getCpuPtr();
- temp->post_interrupt(int_num, index);
-}
-
void
IntrControl::post(int cpu_id, int int_num, int index)
{
+ DPRINTF(IntrControl, "post %d:%d (cpu %d)\n", int_num, index, cpu_id);
std::vector<ThreadContext *> &tcvec = sys->threadContexts;
- BaseCPU *temp = tcvec[cpu_id]->getCpuPtr();
- temp->post_interrupt(int_num, index);
-}
-
-void
-IntrControl::clear(int int_num, int index)
-{
- std::vector<ThreadContext *> &tcvec = sys->threadContexts;
- BaseCPU *temp = tcvec[0]->getCpuPtr();
- temp->clear_interrupt(int_num, index);
+ BaseCPU *cpu = tcvec[cpu_id]->getCpuPtr();
+ cpu->postInterrupt(int_num, index);
}
void
IntrControl::clear(int cpu_id, int int_num, int index)
{
+ DPRINTF(IntrControl, "clear %d:%d (cpu %d)\n", int_num, index, cpu_id);
std::vector<ThreadContext *> &tcvec = sys->threadContexts;
- BaseCPU *temp = tcvec[cpu_id]->getCpuPtr();
- temp->clear_interrupt(int_num, index);
+ BaseCPU *cpu = tcvec[cpu_id]->getCpuPtr();
+ cpu->clearInterrupt(int_num, index);
}
-BEGIN_DECLARE_SIM_OBJECT_PARAMS(IntrControl)
-
- SimObjectParam<System *> sys;
-
-END_DECLARE_SIM_OBJECT_PARAMS(IntrControl)
-
-BEGIN_INIT_SIM_OBJECT_PARAMS(IntrControl)
-
- INIT_PARAM(sys, "the system we are part of")
-
-END_INIT_SIM_OBJECT_PARAMS(IntrControl)
-
-CREATE_SIM_OBJECT(IntrControl)
+IntrControl *
+IntrControlParams::create()
{
- return new IntrControl(getInstanceName(), sys);
+ return new IntrControl(this);
}
-
-REGISTER_SIM_OBJECT("IntrControl", IntrControl)