From: Giacomo Travaglini Date: Tue, 10 Dec 2019 14:59:38 +0000 (+0000) Subject: cpu: Replace empty byteEnable check with Request::isMasked X-Git-Tag: v19.0.0.0~196 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a71fb9ae62564b08889861496abae420a1530a6e;p=gem5.git cpu: Replace empty byteEnable check with Request::isMasked This should be the interface to be used to check if the request has some masked bytes. JIRA: https://gem5.atlassian.net/browse/GEM5-196 Change-Id: I1ab5fd266c7b63a928aada32ae6d4f7fa915f2b6 Signed-off-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23523 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc index 3e3ba41b3..25a799521 100644 --- a/src/cpu/simple/atomic.cc +++ b/src/cpu/simple/atomic.cc @@ -541,7 +541,7 @@ AtomicSimpleCPU::writeMem(uint8_t *data, unsigned size, Addr addr, if (fault != NoFault || size_left == 0) { if (req->isLockedRMW() && fault == NoFault) { - assert(byte_enable.empty()); + assert(!req->isMasked()); locked = false; }