diff options
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-10-31 17:12:30 +0000 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-11-07 15:22:43 +0000 |
| commit | 6fa49382ef22e1b01fb24503e3bbe5ab3556750a (patch) | |
| tree | 503b9ab214e8a52116debf268c7add2f6f41a962 /src/arch/arm/system.cc | |
| parent | f97164aa29ad50c1b324416c14f93e0b463bcfa7 (diff) | |
| download | gem5-6fa49382ef22e1b01fb24503e3bbe5ab3556750a.tar.xz | |
arch-arm: ArmSystem::resetAddr64 renamed to be used in AArch32
ARMv8 differs from ARMv7 with the presence of RVBAR register, which
contains the implementation defined reset address when EL3 is not
implemented.
The entry 0x0 in the AArch32 vector table, once used for the Reset
Vector, is now marked as "Not used", stating that it is now IMPLEMENTATION
DEFINED. An implementation might still use this vector table entry to
hold the Reset vector, but having a Reset address != than the general
vector table (for any other exception) is allowed.
At the moment any Reset exception is still using 0 as a vector table
base address. This patch is extending the ArmSystem::resetAddr64 to
ArmSystem::resetAddr so that it can be used for initializing
MVBAR/RVBAR. In order to do so, we are providing a specialized behavior
for the Reset exception when evaluating the vector base address.
Change-Id: I051a730dc089e194db3b107bbed19251c661f87e
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/14000
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/arch/arm/system.cc')
| -rw-r--r-- | src/arch/arm/system.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc index 21b02e968..063066151 100644 --- a/src/arch/arm/system.cc +++ b/src/arch/arm/system.cc @@ -63,10 +63,10 @@ ArmSystem::ArmSystem(Params *p) _haveVirtualization(p->have_virtualization), _haveCrypto(p->have_crypto), _genericTimer(nullptr), + _resetAddr(p->auto_reset_addr ? + (kernelEntry & loadAddrMask) + loadAddrOffset : + p->reset_addr), _highestELIs64(p->highest_el_is_64), - _resetAddr64(p->auto_reset_addr_64 ? - (kernelEntry & loadAddrMask) + loadAddrOffset : - p->reset_addr_64), _physAddrRange64(p->phys_addr_range_64), _haveLargeAsid64(p->have_large_asid_64), _m5opRange(p->m5ops_base ? @@ -248,9 +248,9 @@ ArmSystem::haveEL(ThreadContext *tc, ExceptionLevel el) } Addr -ArmSystem::resetAddr64(ThreadContext *tc) +ArmSystem::resetAddr(ThreadContext *tc) { - return getArmSystem(tc)->resetAddr64(); + return getArmSystem(tc)->resetAddr(); } uint8_t |