diff options
Diffstat (limited to 'src/arch/arm/isa')
| -rw-r--r-- | src/arch/arm/isa/formats/aarch64.isa | 4 | ||||
| -rw-r--r-- | src/arch/arm/isa/insts/misc64.isa | 20 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/arch/arm/isa/formats/aarch64.isa b/src/arch/arm/isa/formats/aarch64.isa index 2d94aff51..c3fa74274 100644 --- a/src/arch/arm/isa/formats/aarch64.isa +++ b/src/arch/arm/isa/formats/aarch64.isa @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2015 ARM Limited +// Copyright (c) 2011-2016 ARM Limited // All rights reserved // // The license below extends only to copyright in the software and shall @@ -250,7 +250,7 @@ namespace Aarch64 case 0x01: return new Svc64(machInst); case 0x02: - return new FailUnimplemented("hvc", machInst); + return new Hvc64(machInst); case 0x03: return new Smc64(machInst); case 0x04: diff --git a/src/arch/arm/isa/insts/misc64.isa b/src/arch/arm/isa/insts/misc64.isa index 7e88bebbb..08902abe8 100644 --- a/src/arch/arm/isa/insts/misc64.isa +++ b/src/arch/arm/isa/insts/misc64.isa @@ -1,6 +1,6 @@ // -*- mode:c++ -*- -// Copyright (c) 2011-2013 ARM Limited +// Copyright (c) 2011-2013, 2016 ARM Limited // All rights reserved // // The license below extends only to copyright in the software and shall @@ -49,6 +49,24 @@ let {{ decoder_output = BasicConstructor64.subst(svcIop) exec_output = BasicExecute.subst(svcIop) + hvcCode = ''' + SCR scr = Scr64; + + if (!ArmSystem::haveVirtualization(xc->tcBase()) || + (ArmSystem::haveSecurity(xc->tcBase()) && !scr.hce)) { + fault = disabledFault(); + } else { + fault = std::make_shared<HypervisorCall>(machInst, bits(machInst, 20, 5)); + } + ''' + + hvcIop = InstObjParams("hvc", "Hvc64", "ArmStaticInst", + hvcCode, ["IsSyscall", "IsNonSpeculative", + "IsSerializeAfter"]) + header_output += BasicDeclare.subst(hvcIop) + decoder_output += BasicConstructor64.subst(hvcIop) + exec_output += BasicExecute.subst(hvcIop) + # @todo: extend to take into account Virtualization. smcCode = ''' SCR scr = Scr64; |