diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2016-06-02 13:41:26 +0100 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2016-06-02 13:41:26 +0100 |
| commit | 660fbd543f7c84dec81cd17bdb4ff08f954aec77 (patch) | |
| tree | a03fb18c83b32031b5331767e3067a026d641775 /src/arch/arm/miscregs.hh | |
| parent | f48ad5b29d6f291b4f3679ff5fb7b5beae10d6fa (diff) | |
| download | gem5-660fbd543f7c84dec81cd17bdb4ff08f954aec77.tar.xz | |
arm: Rewrite ERET to behave according to the ARMv8 ARM
The ERET instruction doesn't set PSTATE correctly in some cases
(particularly when returning to aarch32 code). Among other things,
this breaks EL0 thumb code when using a 64-bit kernel. This changeset
updates the ERET implementation to match the ARM ARM.
Change-Id: I408e7c69a23cce437859313dfe84e68744b07c98
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Nathanael Premillieu <nathanael.premillieu@arm.com>
Diffstat (limited to 'src/arch/arm/miscregs.hh')
| -rw-r--r-- | src/arch/arm/miscregs.hh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/arch/arm/miscregs.hh b/src/arch/arm/miscregs.hh index 025507673..84f0fe8d1 100644 --- a/src/arch/arm/miscregs.hh +++ b/src/arch/arm/miscregs.hh @@ -1376,6 +1376,7 @@ namespace ArmISA Bitfield<8> a; Bitfield<7> i; Bitfield<6> f; + Bitfield<8, 6> aif; Bitfield<9, 6> daif; // AArch64 Bitfield<5> t; Bitfield<4> width; // AArch64 |