diff options
author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-06-05 16:17:48 +0100 |
---|---|---|
committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-06-22 10:53:40 +0000 |
commit | b4a10d55e55752c3423a9d0f4b529f7f80432590 (patch) | |
tree | 34f6f36084709e9e2ea1568e3a5ff9051d9c5d57 /src/arch/arm/isa/formats | |
parent | fc278fffb78512ff3d62a906804d6b285edd00c7 (diff) | |
download | gem5-b4a10d55e55752c3423a9d0f4b529f7f80432590.tar.xz |
arch-arm: AArch32 execution triggering AArch64 SW Break
AArch32 Software Breakpoint (BKPT) can trigger an AArch64 fault when
interprocessing if the trapping conditions are met.
Change-Id: I485852ed19429f9cd928a6447a95eb6f471f189c
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/11197
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/arch/arm/isa/formats')
-rw-r--r-- | src/arch/arm/isa/formats/breakpoint.isa | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/src/arch/arm/isa/formats/breakpoint.isa b/src/arch/arm/isa/formats/breakpoint.isa index 4f281e045..67360f1b5 100644 --- a/src/arch/arm/isa/formats/breakpoint.isa +++ b/src/arch/arm/isa/formats/breakpoint.isa @@ -45,53 +45,11 @@ // Breakpoint instructions // -output header {{ - /** - * Static instruction class for Breakpoint (illegal) instructions. - * These cause simulator termination if they are executed in a - * non-speculative mode. This is a leaf class. - */ - class Breakpoint : public ArmStaticInst - { - public: - /// Constructor - Breakpoint(ExtMachInst _machInst) - : ArmStaticInst("Breakpoint", _machInst, No_OpClass) - { - // don't call execute() (which panics) if we're on a - // speculative path - flags[IsNonSpeculative] = true; - } - - Fault execute(ExecContext *, Trace::InstRecord *) const override; - - std::string - generateDisassembly(Addr pc, const SymbolTable *symtab) const override; - }; -}}; - -output decoder {{ - std::string - Breakpoint::generateDisassembly(Addr pc, const SymbolTable *symtab) const - { - return csprintf("%-10s (inst 0x%x)", "Breakpoint", machInst); - } -}}; - -output exec {{ - Fault - Breakpoint::execute(ExecContext *xc, Trace::InstRecord *traceData) const - { - return std::make_shared<PrefetchAbort>(xc->pcState().pc(), - ArmFault::DebugEvent); - } -}}; - def format ArmBkptHlt() {{ decode_block = ''' { if (bits(machInst, 21)) { - return new Breakpoint(machInst); + return new BkptInst(machInst); } else { uint32_t imm16 = (bits(machInst, 19, 8) << 4) | (bits(machInst, 3, 0) << 0); |