cpu.hh (10935:acd48ddd725f) cpu.hh (11148:1bc3d93c7eaa)
1/*
2 * Copyright (c) 2011 ARM Limited
3 * Copyright (c) 2013 Advanced Micro Devices, Inc.
4 * All rights reserved
5 *
6 * The license below extends only to copyright in the software and shall
7 * not be construed as granting a license to any other intellectual
8 * property including but not limited to intellectual property relating

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

345
346 void demapPage(Addr vaddr, uint64_t asn)
347 {
348 this->itb->demapPage(vaddr, asn);
349 this->dtb->demapPage(vaddr, asn);
350 }
351
352 // monitor/mwait funtions
1/*
2 * Copyright (c) 2011 ARM Limited
3 * Copyright (c) 2013 Advanced Micro Devices, Inc.
4 * All rights reserved
5 *
6 * The license below extends only to copyright in the software and shall
7 * not be construed as granting a license to any other intellectual
8 * property including but not limited to intellectual property relating

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

345
346 void demapPage(Addr vaddr, uint64_t asn)
347 {
348 this->itb->demapPage(vaddr, asn);
349 this->dtb->demapPage(vaddr, asn);
350 }
351
352 // monitor/mwait funtions
353 virtual void armMonitor(Addr address) { BaseCPU::armMonitor(address); }
354 bool mwait(PacketPtr pkt) { return BaseCPU::mwait(pkt); }
353 virtual void armMonitor(Addr address) { BaseCPU::armMonitor(0, address); }
354 bool mwait(PacketPtr pkt) { return BaseCPU::mwait(0, pkt); }
355 void mwaitAtomic(ThreadContext *tc)
355 void mwaitAtomic(ThreadContext *tc)
356 { return BaseCPU::mwaitAtomic(tc, thread->dtb); }
357 AddressMonitor *getAddrMonitor() { return BaseCPU::getCpuAddrMonitor(); }
356 { return BaseCPU::mwaitAtomic(0, tc, thread->dtb); }
357 AddressMonitor *getAddrMonitor() { return BaseCPU::getCpuAddrMonitor(0); }
358
359 void demapInstPage(Addr vaddr, uint64_t asn)
360 {
361 this->itb->demapPage(vaddr, asn);
362 }
363
364 void demapDataPage(Addr vaddr, uint64_t asn)
365 {

--- 103 unchanged lines hidden --- 		358
359 void demapInstPage(Addr vaddr, uint64_t asn)
360 {
361 this->itb->demapPage(vaddr, asn);
362 }
363
364 void demapDataPage(Addr vaddr, uint64_t asn)
365 {

--- 103 unchanged lines hidden ---