summaryrefslogtreecommitdiff
path: root/src/arch/x86/isa/formats/monitor_mwait.isa
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/x86/isa/formats/monitor_mwait.isa')
-rw-r--r--src/arch/x86/isa/formats/monitor_mwait.isa11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/arch/x86/isa/formats/monitor_mwait.isa b/src/arch/x86/isa/formats/monitor_mwait.isa
index c901ceded..5e68b8738 100644
--- a/src/arch/x86/isa/formats/monitor_mwait.isa
+++ b/src/arch/x86/isa/formats/monitor_mwait.isa
@@ -47,10 +47,9 @@ def format MonitorInst(code, *opt_flags) {{
// Declarations for execute() methods.
def template MwaitExecDeclare {{
- Fault execute(%(CPU_exec_context)s *, Trace::InstRecord *) const;
- Fault initiateAcc(%(CPU_exec_context)s *, Trace::InstRecord *) const;
- Fault completeAcc(PacketPtr, %(CPU_exec_context)s *,
- Trace::InstRecord *) const;
+ Fault execute(ExecContext *, Trace::InstRecord *) const;
+ Fault initiateAcc(ExecContext *, Trace::InstRecord *) const;
+ Fault completeAcc(PacketPtr, ExecContext *, Trace::InstRecord *) const;
}};
def template MwaitDeclare {{
@@ -64,7 +63,7 @@ def template MwaitDeclare {{
}};
def template MwaitInitiateAcc {{
- Fault %(class_name)s::initiateAcc(CPU_EXEC_CONTEXT * xc,
+ Fault %(class_name)s::initiateAcc(ExecContext * xc,
Trace::InstRecord * traceData) const
{
unsigned s = 0x8; //size
@@ -75,7 +74,7 @@ def template MwaitInitiateAcc {{
}};
def template MwaitCompleteAcc {{
- Fault %(class_name)s::completeAcc(PacketPtr pkt, CPU_EXEC_CONTEXT *xc,
+ Fault %(class_name)s::completeAcc(PacketPtr pkt, ExecContext *xc,
Trace::InstRecord *traceData) const
{
MicroHalt hltObj(machInst, mnemonic, 0x0);