faults.cc (14171:58d343fa3194) faults.cc (14279:0f25d914f4a8)
1/*
2 * Copyright (c) 2010, 2012-2014, 2016-2019 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 1357 unchanged lines hidden (view full) ---

1366DataAbort::iss() const
1367{
1368 uint32_t val;
1369
1370 // Add on the data abort specific fields to the generic abort ISS value
1371 val = AbortFault<DataAbort>::iss();
1372 // ISS is valid if not caused by a stage 1 page table walk, and when taken
1373 // to AArch64 only when directed to EL2
1/*
2 * Copyright (c) 2010, 2012-2014, 2016-2019 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 1357 unchanged lines hidden (view full) ---

1366DataAbort::iss() const
1367{
1368 uint32_t val;
1369
1370 // Add on the data abort specific fields to the generic abort ISS value
1371 val = AbortFault<DataAbort>::iss();
1372 // ISS is valid if not caused by a stage 1 page table walk, and when taken
1373 // to AArch64 only when directed to EL2
1374 if (!s1ptw && (!to64 || toEL == EL2)) {
1374 if (!s1ptw && stage2 && (!to64 || toEL == EL2)) {
1375 val |= isv << 24;
1376 if (isv) {
1377 val |= sas << 22;
1378 val |= sse << 21;
1379 val |= srt << 16;
1380 // AArch64 only. These assignments are safe on AArch32 as well
1381 // because these vars are initialized to false
1382 val |= sf << 15;

--- 287 unchanged lines hidden --- 		1375 val |= isv << 24;
1376 if (isv) {
1377 val |= sas << 22;
1378 val |= sse << 21;
1379 val |= srt << 16;
1380 // AArch64 only. These assignments are safe on AArch32 as well
1381 // because these vars are initialized to false
1382 val |= sf << 15;

--- 287 unchanged lines hidden ---