From 34032f97d6861243a2338d02d6c7d071051c44c5 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 2 Jun 2010 12:58:05 -0500 Subject: ARM: Trigger system calls from the SupervisorCall invoke method. This simplifies the decoder slightly, and makes the system call mechanism very slightly more realistic. --- src/arch/arm/isa/decoder/arm.isa | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/arch/arm/isa/decoder') diff --git a/src/arch/arm/isa/decoder/arm.isa b/src/arch/arm/isa/decoder/arm.isa index 050571240..fe7e67b11 100644 --- a/src/arch/arm/isa/decoder/arm.isa +++ b/src/arch/arm/isa/decoder/arm.isa @@ -286,18 +286,13 @@ format DataOp { } // CPNUM (OP4 == 1) } //OPCODE_4 + 1: PredOp::swi({{ #if FULL_SYSTEM - 1: PredOp::swi({{ fault = new SupervisorCall; }}, IsSerializeAfter, IsNonSpeculative, IsSyscall); + fault = new SupervisorCall(); #else - 1: PredOp::swi({{ if (testPredicate(CondCodes, condCode)) - { - if (IMMED_23_0) - xc->syscall(IMMED_23_0); - else - xc->syscall(R7); - } - }}); -#endif // FULL_SYSTEM + fault = new SupervisorCall(machInst); +#endif + }}, IsSyscall); } // OPCODE_24 } -- cgit v1.2.3