stage2_lookup.cc (12749:223c83ed9979) | stage2_lookup.cc (13375:5fd5f8441e2e) |
---|---|
1/* | 1/* |
2 * Copyright (c) 2010-2013, 2016 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 --- 175 unchanged lines hidden (view full) --- 186 timing, functional, false, tranType); 187 } 188 189 // Now we have the stage 2 table entry we need to merge it with the stage 190 // 1 entry we were given at the start 191 mergeTe(req, mode); 192 193 if (fault != NoFault) { | 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 --- 175 unchanged lines hidden (view full) --- 186 timing, functional, false, tranType); 187 } 188 189 // Now we have the stage 2 table entry we need to merge it with the stage 190 // 1 entry we were given at the start 191 mergeTe(req, mode); 192 193 if (fault != NoFault) { |
194 transState->finish(fault, req, tc, mode); | 194 // Returning with a fault requires the original request 195 transState->finish(fault, s1Req, tc, mode); |
195 } else if (timing) { 196 // Now notify the original stage 1 translation that we finally have 197 // a result 198 stage1Tlb->translateComplete(s1Req, tc, transState, mode, tranType, true); 199 } 200 // if we have been asked to delete ourselfs do it now 201 if (selfDelete) { 202 delete this; 203 } 204} 205 | 196 } else if (timing) { 197 // Now notify the original stage 1 translation that we finally have 198 // a result 199 stage1Tlb->translateComplete(s1Req, tc, transState, mode, tranType, true); 200 } 201 // if we have been asked to delete ourselfs do it now 202 if (selfDelete) { 203 delete this; 204 } 205} 206 |