stage2_mmu.cc (10912:b99a6662d7c2) stage2_mmu.cc (12406:86bde4a026b5)
1/*
2 * Copyright (c) 2012-2013, 2015 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

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

92 if (fault != NoFault) {
93 ArmFault *armFault = reinterpret_cast<ArmFault *>(fault.get());
94 armFault->annotate(ArmFault::S1PTW, true);
95 armFault->annotate(ArmFault::OVA, oVAddr);
96 }
97 return fault;
98}
99
1/*
2 * Copyright (c) 2012-2013, 2015 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

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

92 if (fault != NoFault) {
93 ArmFault *armFault = reinterpret_cast<ArmFault *>(fault.get());
94 armFault->annotate(ArmFault::S1PTW, true);
95 armFault->annotate(ArmFault::OVA, oVAddr);
96 }
97 return fault;
98}
99
100Fault
100void
101Stage2MMU::readDataTimed(ThreadContext *tc, Addr descAddr,
102 Stage2Translation *translation, int numBytes,
103 Request::Flags flags)
104{
101Stage2MMU::readDataTimed(ThreadContext *tc, Addr descAddr,
102 Stage2Translation *translation, int numBytes,
103 Request::Flags flags)
104{
105 Fault fault;
106 // translate to physical address using the second stage MMU
105 // translate to physical address using the second stage MMU
107 translation->setVirt(descAddr, numBytes, flags | Request::PT_WALK, masterId);
108 fault = translation->translateTiming(tc);
109 return fault;
106 translation->setVirt(
107 descAddr, numBytes, flags | Request::PT_WALK, masterId);
108 translation->translateTiming(tc);
110}
111
112Stage2MMU::Stage2Translation::Stage2Translation(Stage2MMU &_parent,
113 uint8_t *_data, Event *_event, Addr _oVAddr)
114 : data(_data), numBytes(0), event(_event), parent(_parent), oVAddr(_oVAddr),
115 fault(NoFault)
116{
117}

--- 31 unchanged lines hidden --- 		109}
110
111Stage2MMU::Stage2Translation::Stage2Translation(Stage2MMU &_parent,
112 uint8_t *_data, Event *_event, Addr _oVAddr)
113 : data(_data), numBytes(0), event(_event), parent(_parent), oVAddr(_oVAddr),
114 fault(NoFault)
115{
116}

--- 31 unchanged lines hidden ---