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 | 21 |
2 files changed, 22 insertions, 3 deletions
diff --git a/src/arch/arm/isa/formats/aarch64.isa b/src/arch/arm/isa/formats/aarch64.isa index 0cb8e9c66..f39a1a5b9 100644 --- a/src/arch/arm/isa/formats/aarch64.isa +++ b/src/arch/arm/isa/formats/aarch64.isa @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2016 ARM Limited +// Copyright (c) 2011-2018 ARM Limited // All rights reserved // // The license below extends only to copyright in the software and shall @@ -256,7 +256,7 @@ namespace Aarch64 case 0x04: return new Brk64(machInst); case 0x08: - return new FailUnimplemented("hlt", machInst); + return new Hlt64(machInst); case 0x15: return new FailUnimplemented("dcps1", machInst); case 0x16: diff --git a/src/arch/arm/isa/insts/misc64.isa b/src/arch/arm/isa/insts/misc64.isa index 2483b75b0..faac5cfcf 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, 2016-2017 ARM Limited +// Copyright (c) 2011-2013, 2016-2018 ARM Limited // All rights reserved // // The license below extends only to copyright in the software and shall @@ -174,4 +174,23 @@ let {{ header_output += BasicDeclare.subst(brkIop) decoder_output += BasicConstructor64.subst(brkIop) exec_output += BasicExecute.subst(brkIop) + + hltCode = ''' + ThreadContext *tc = xc->tcBase(); + if (ArmSystem::haveSemihosting(tc) && bits(machInst, 20, 5) == 0xF000) { + X0 = ArmSystem::callSemihosting64(tc, X0 & mask(32), X1); + } else { + // HLT instructions aren't implemented, so treat them as undefined + // instructions. + fault = std::make_shared<UndefinedInstruction>( + machInst, false, mnemonic); + } + + ''' + + hltIop = InstObjParams("hlt", "Hlt64", "ArmStaticInst", + hltCode, ["IsNonSpeculative"]) + header_output += BasicDeclare.subst(hltIop) + decoder_output += BasicConstructor64.subst(hltIop) + exec_output += BasicExecute.subst(hltIop) }}; |