tlb.cc (12356:e56e838c47cb) tlb.cc (12406:86bde4a026b5)
1/*
2 * Copyright (c) 2010-2013, 2016-2017 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

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

1178 if (FullSystem)
1179 fault = translateFs(req, tc, mode, NULL, delay, false, tranType, true);
1180 else
1181 fault = translateSe(req, tc, mode, NULL, delay, false);
1182 assert(!delay);
1183 return fault;
1184}
1185
1/*
2 * Copyright (c) 2010-2013, 2016-2017 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

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

1178 if (FullSystem)
1179 fault = translateFs(req, tc, mode, NULL, delay, false, tranType, true);
1180 else
1181 fault = translateSe(req, tc, mode, NULL, delay, false);
1182 assert(!delay);
1183 return fault;
1184}
1185
1186Fault
1186void
1187TLB::translateTiming(RequestPtr req, ThreadContext *tc,
1188 Translation *translation, Mode mode, TLB::ArmTranslationType tranType)
1189{
1190 updateMiscReg(tc, tranType);
1191
1192 if (directToStage2) {
1193 assert(stage2Tlb);
1187TLB::translateTiming(RequestPtr req, ThreadContext *tc,
1188 Translation *translation, Mode mode, TLB::ArmTranslationType tranType)
1189{
1190 updateMiscReg(tc, tranType);
1191
1192 if (directToStage2) {
1193 assert(stage2Tlb);
1194 return stage2Tlb->translateTiming(req, tc, translation, mode, tranType);
1194 stage2Tlb->translateTiming(req, tc, translation, mode, tranType);
1195 return;
1195 }
1196
1197 assert(translation);
1198
1196 }
1197
1198 assert(translation);
1199
1199 return translateComplete(req, tc, translation, mode, tranType, isStage2);
1200 translateComplete(req, tc, translation, mode, tranType, isStage2);
1200}
1201
1202Fault
1203TLB::translateComplete(RequestPtr req, ThreadContext *tc,
1204 Translation *translation, Mode mode, TLB::ArmTranslationType tranType,
1205 bool callFromS2)
1206{
1207 bool delay = false;

--- 347 unchanged lines hidden --- 		1201}
1202
1203Fault
1204TLB::translateComplete(RequestPtr req, ThreadContext *tc,
1205 Translation *translation, Mode mode, TLB::ArmTranslationType tranType,
1206 bool callFromS2)
1207{
1208 bool delay = false;

--- 347 unchanged lines hidden ---