diff options
| author | Nikos Nikoleris <nikos.nikoleris@arm.com> | 2016-08-15 12:00:35 +0100 |
|---|---|---|
| committer | Nikos Nikoleris <nikos.nikoleris@arm.com> | 2016-08-15 12:00:35 +0100 |
| commit | 698767e5384a664b3bad52c9b40d62daf0eabbfc (patch) | |
| tree | 2cb02cf387574c233367bfd6602b9ac271815384 /src/arch/x86 | |
| parent | 608a37c844829715c2a15ef079f7dd8db428779b (diff) | |
| download | gem5-698767e5384a664b3bad52c9b40d62daf0eabbfc.tar.xz | |
cpu, arch: fix the type used for the request flags
Change-Id: I183b9942929c873c3272ce6d1abd4ebc472c7132
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/memhelpers.hh | 10 | ||||
| -rw-r--r-- | src/arch/x86/tlb.cc | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/arch/x86/memhelpers.hh b/src/arch/x86/memhelpers.hh index b13207ec4..416dfe3c1 100644 --- a/src/arch/x86/memhelpers.hh +++ b/src/arch/x86/memhelpers.hh @@ -45,7 +45,7 @@ namespace X86ISA template <class XC> Fault initiateMemRead(XC *xc, Trace::InstRecord *traceData, Addr addr, - unsigned dataSize, unsigned flags) + unsigned dataSize, Request::Flags flags) { return xc->initiateMemRead(addr, dataSize, flags); } @@ -100,7 +100,7 @@ getMem(PacketPtr pkt, std::array<uint64_t, N> &mem, unsigned dataSize, template <class XC> Fault readMemAtomic(XC *xc, Trace::InstRecord *traceData, Addr addr, uint64_t &mem, - unsigned dataSize, unsigned flags) + unsigned dataSize, Request::Flags flags) { memset(&mem, 0, sizeof(mem)); Fault fault = xc->readMem(addr, (uint8_t *)&mem, dataSize, flags); @@ -142,7 +142,8 @@ readMemAtomic(XC *xc, Trace::InstRecord *traceData, Addr addr, template <class XC> Fault writeMemTiming(XC *xc, Trace::InstRecord *traceData, uint64_t mem, - unsigned dataSize, Addr addr, unsigned flags, uint64_t *res) + unsigned dataSize, Addr addr, Request::Flags flags, + uint64_t *res) { if (traceData) { traceData->setData(mem); @@ -176,7 +177,8 @@ writeMemTiming(XC *xc, Trace::InstRecord *traceData, template <class XC> Fault writeMemAtomic(XC *xc, Trace::InstRecord *traceData, uint64_t mem, - unsigned dataSize, Addr addr, unsigned flags, uint64_t *res) + unsigned dataSize, Addr addr, Request::Flags flags, + uint64_t *res) { if (traceData) { traceData->setData(mem); diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc index d0e77bc9b..be43cb06e 100644 --- a/src/arch/x86/tlb.cc +++ b/src/arch/x86/tlb.cc @@ -273,7 +273,7 @@ Fault TLB::translate(RequestPtr req, ThreadContext *tc, Translation *translation, Mode mode, bool &delayedResponse, bool timing) { - uint32_t flags = req->getFlags(); + Request::Flags flags = req->getFlags(); int seg = flags & SegmentFlagMask; bool storeCheck = flags & (StoreCheck << FlagShift); |