diff options
| author | Dylan Johnson <Dylan.Johnson@ARM.com> | 2016-08-02 10:38:01 +0100 |
|---|---|---|
| committer | Dylan Johnson <Dylan.Johnson@ARM.com> | 2016-08-02 10:38:01 +0100 |
| commit | e727a0eeaa5f2d46921c8496d77623a9704d40b6 (patch) | |
| tree | 3222bfcdd7e86d6c29fbb0fdcf69db276879b732 /src/arch/arm/insts/pseudo.cc | |
| parent | c20b6c56f68fe829965826dd0040bd1a1ddd76c7 (diff) | |
| download | gem5-e727a0eeaa5f2d46921c8496d77623a9704d40b6.tar.xz | |
arm: change instruction classes to catch hyp traps
Change-Id: I122918d0e3dfd01ae1a4ca4f19240a069115c8b7
Diffstat (limited to 'src/arch/arm/insts/pseudo.cc')
| -rw-r--r-- | src/arch/arm/insts/pseudo.cc | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/src/arch/arm/insts/pseudo.cc b/src/arch/arm/insts/pseudo.cc index de4a5afdc..526369b33 100644 --- a/src/arch/arm/insts/pseudo.cc +++ b/src/arch/arm/insts/pseudo.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 ARM Limited + * Copyright (c) 2014,2016 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -182,21 +182,40 @@ WarnUnimplemented::generateDisassembly(Addr pc, const SymbolTable *symtab) const -FlushPipeInst::FlushPipeInst(const char *_mnemonic, ExtMachInst _machInst) +McrMrcMiscInst::McrMrcMiscInst(const char *_mnemonic, ExtMachInst _machInst, + uint64_t _iss, MiscRegIndex _miscReg) : ArmStaticInst(_mnemonic, _machInst, No_OpClass) { flags[IsNonSpeculative] = true; + iss = _iss; + miscReg = _miscReg; } Fault -FlushPipeInst::execute(ExecContext *xc, Trace::InstRecord *traceData) const +McrMrcMiscInst::execute(ExecContext *xc, Trace::InstRecord *traceData) const { - Fault fault = std::make_shared<FlushPipe>(); - return fault; + uint32_t cpsr = xc->readMiscReg(MISCREG_CPSR); + uint32_t hcr = xc->readMiscReg(MISCREG_HCR); + uint32_t scr = xc->readMiscReg(MISCREG_SCR); + uint32_t hdcr = xc->readMiscReg(MISCREG_HDCR); + uint32_t hstr = xc->readMiscReg(MISCREG_HSTR); + uint32_t hcptr = xc->readMiscReg(MISCREG_HCPTR); + + bool hypTrap = mcrMrc15TrapToHyp(miscReg, hcr, cpsr, scr, hdcr, hstr, + hcptr, iss); + if (hypTrap) { + return std::make_shared<HypervisorTrap>(machInst, iss, + EC_TRAPPED_CP15_MCR_MRC); + } + + if (miscReg == MISCREG_DCCMVAC) + return std::make_shared<FlushPipe>(); + else + return NoFault; } std::string -FlushPipeInst::generateDisassembly(Addr pc, const SymbolTable *symtab) const +McrMrcMiscInst::generateDisassembly(Addr pc, const SymbolTable *symtab) const { return csprintf("%-10s (pipe flush)", mnemonic); } |