tlb.cc (12506:aed554105426) tlb.cc (12528:a9960d039c29)
1/*
1/*
2 * Copyright (c) 2010-2013, 2016-2017 ARM Limited
2 * Copyright (c) 2010-2013, 2016-2018 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
9 * licensed hereunder. You may use the software subject to the license
10 * terms below provided that you ensure that this notice is replicated

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

1468 if (isStage2) {
1469 // We are already in the stage 2 TLB. Grab the table entry for stage
1470 // 2 only. We are here because stage 1 translation is disabled.
1471 TlbEntry *s2Te = NULL;
1472 // Get the stage 2 table entry
1473 fault = getTE(&s2Te, req, tc, mode, translation, timing, functional,
1474 isSecure, curTranType);
1475 // Check permissions of stage 2
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
9 * licensed hereunder. You may use the software subject to the license
10 * terms below provided that you ensure that this notice is replicated

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

1468 if (isStage2) {
1469 // We are already in the stage 2 TLB. Grab the table entry for stage
1470 // 2 only. We are here because stage 1 translation is disabled.
1471 TlbEntry *s2Te = NULL;
1472 // Get the stage 2 table entry
1473 fault = getTE(&s2Te, req, tc, mode, translation, timing, functional,
1474 isSecure, curTranType);
1475 // Check permissions of stage 2
1476 if ((s2Te != NULL) && (fault = NoFault)) {
1477 if(aarch64)
1476 if ((s2Te != NULL) && (fault == NoFault)) {
1477 if (aarch64)
1478 fault = checkPermissions64(s2Te, req, mode, tc);
1479 else
1480 fault = checkPermissions(s2Te, req, mode);
1481 }
1482 *te = s2Te;
1483 return fault;
1484 }
1485

--- 87 unchanged lines hidden --- 		1478 fault = checkPermissions64(s2Te, req, mode, tc);
1479 else
1480 fault = checkPermissions(s2Te, req, mode);
1481 }
1482 *te = s2Te;
1483 return fault;
1484 }
1485

--- 87 unchanged lines hidden ---