diff options
| author | Chuan Zhu <chuan.zhu@arm.com> | 2018-01-05 10:26:37 +0000 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-02-08 10:24:56 +0000 |
| commit | 73b1160bd808cc523f49db37df597e4b2f3b9877 (patch) | |
| tree | 8a5494ac4611e67ff2efda4b008a3cbba5415916 /src/arch/arm/faults.hh | |
| parent | ad36e61ce400deaddfb07e71b13aea8a74b52550 (diff) | |
| download | gem5-73b1160bd808cc523f49db37df597e4b2f3b9877.tar.xz | |
arch-arm: Fixed error in choosing vector offset
The old code chose vector offset associated with exceptions taken
to EL3 by incorrectly using "from64", which is associated with the
exception level where the exception was taken from. However, the
offset should depends on the ISA of the lower EL and not of the
starting EL itself, as specified in ARM ARM. This patch corrects
this by implementing the method in AArch64.TakeException in ARM ARM.
Change-Id: I8f7c9aa777c5f2eef9e2d89c36e9daee23f3a822
Reviewed-by: Jack Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/8001
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/arch/arm/faults.hh')
| -rw-r--r-- | src/arch/arm/faults.hh | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/arch/arm/faults.hh b/src/arch/arm/faults.hh index bec2c0e8f..6ae4c067e 100644 --- a/src/arch/arm/faults.hh +++ b/src/arch/arm/faults.hh @@ -191,7 +191,7 @@ class ArmFault : public FaultBase virtual void annotate(AnnotationIDs id, uint64_t val) {} virtual FaultStat& countStat() = 0; virtual FaultOffset offset(ThreadContext *tc) = 0; - virtual FaultOffset offset64() = 0; + virtual FaultOffset offset64(ThreadContext *tc) = 0; virtual OperatingMode nextMode() = 0; virtual bool routeToMonitor(ThreadContext *tc) const = 0; virtual bool routeToHyp(ThreadContext *tc) const { return false; } @@ -221,17 +221,7 @@ class ArmFaultVals : public ArmFault FaultStat & countStat() override { return vals.count; } FaultOffset offset(ThreadContext *tc) override; - FaultOffset offset64() override { - if (toEL == fromEL) { - if (opModeIsT(fromMode)) - return vals.currELTOffset; - return vals.currELHOffset; - } else { - if (from64) - return vals.lowerEL64Offset; - return vals.lowerEL32Offset; - } - } + FaultOffset offset64(ThreadContext *tc) override; OperatingMode nextMode() override { return vals.nextMode; } virtual bool routeToMonitor(ThreadContext *tc) const override { |