From 698767e5384a664b3bad52c9b40d62daf0eabbfc Mon Sep 17 00:00:00 2001 From: Nikos Nikoleris Date: Mon, 15 Aug 2016 12:00:35 +0100 Subject: cpu, arch: fix the type used for the request flags Change-Id: I183b9942929c873c3272ce6d1abd4ebc472c7132 Reviewed-by: Andreas Sandberg --- src/cpu/checker/cpu.cc | 5 +++-- src/cpu/checker/cpu.hh | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/cpu/checker') diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc index 4d5919cdf..9aae8b812 100644 --- a/src/cpu/checker/cpu.cc +++ b/src/cpu/checker/cpu.cc @@ -139,7 +139,8 @@ CheckerCPU::unserialize(CheckpointIn &cp) } Fault -CheckerCPU::readMem(Addr addr, uint8_t *data, unsigned size, unsigned flags) +CheckerCPU::readMem(Addr addr, uint8_t *data, unsigned size, + Request::Flags flags) { Fault fault = NoFault; int fullSize = size; @@ -225,7 +226,7 @@ CheckerCPU::readMem(Addr addr, uint8_t *data, unsigned size, unsigned flags) Fault CheckerCPU::writeMem(uint8_t *data, unsigned size, - Addr addr, unsigned flags, uint64_t *res) + Addr addr, Request::Flags flags, uint64_t *res) { Fault fault = NoFault; bool checked_flags = false; diff --git a/src/cpu/checker/cpu.hh b/src/cpu/checker/cpu.hh index 93ab9defd..21ff9c7f7 100644 --- a/src/cpu/checker/cpu.hh +++ b/src/cpu/checker/cpu.hh @@ -57,6 +57,7 @@ #include "cpu/simple_thread.hh" #include "cpu/static_inst.hh" #include "debug/Checker.hh" +#include "mem/request.hh" #include "params/CheckerCPU.hh" #include "sim/eventq.hh" @@ -374,9 +375,9 @@ class CheckerCPU : public BaseCPU, public ExecContext } Fault readMem(Addr addr, uint8_t *data, unsigned size, - unsigned flags) override; - Fault writeMem(uint8_t *data, unsigned size, - Addr addr, unsigned flags, uint64_t *res) override; + Request::Flags flags) override; + Fault writeMem(uint8_t *data, unsigned size, Addr addr, + Request::Flags flags, uint64_t *res) override; unsigned int readStCondFailures() const override { return thread->readStCondFailures(); -- cgit v1.2.3