2c2
< * Copyright (c) 2014 ARM Limited
---
> * Copyright (c) 2014,2016 ARM Limited
118c118,124
< class FlushPipeInst : public ArmStaticInst
---
> /**
> * Certain mrc/mcr instructions act as nops or flush the pipe based on what
> * register the instruction is trying to access. This inst/class exists so that
> * we can still check for hyp traps, as the normal nop instruction
> * does not.
> */
> class McrMrcMiscInst : public ArmStaticInst
119a126,129
> private:
> uint64_t iss;
> MiscRegIndex miscReg;
>
121c131,132
< FlushPipeInst(const char *_mnemonic, ExtMachInst _machInst);
---
> McrMrcMiscInst(const char *_mnemonic, ExtMachInst _machInst,
> uint64_t _iss, MiscRegIndex _miscReg);
130d140
<