summaryrefslogtreecommitdiffstats
path: root/src/progs/direct/base/direct_16.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/direct/base/direct_16.cpp')
-rw-r--r--src/progs/direct/base/direct_16.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/progs/direct/base/direct_16.cpp b/src/progs/direct/base/direct_16.cpp
index 330c037..ef17479 100644
--- a/src/progs/direct/base/direct_16.cpp
+++ b/src/progs/direct/base/direct_16.cpp
@@ -87,10 +87,10 @@ bool Direct::pic16::doRead(Pic::MemoryRangeType type, Device::Array &data, const
const Device::Array wdata = static_cast<const Pic::Memory &>(vdata->memory).arrayForWriting(type);
if (only) nbWords = findNonMaskEnd(type, wdata)+1;
}
- BitValue tqmask = device().tqmask(type);
+ BitValue mask = device().mask(type);
for (uint i = 0; i<nbWords; i++) {
- if ( !only || data[i]!=tqmask || type!=Pic::MemoryRangeType::Code ) {
- data[i] = readWord(type).maskWith(tqmask);
+ if ( !only || data[i]!=mask || type!=Pic::MemoryRangeType::Code ) {
+ data[i] = readWord(type).maskWith(mask);
if ( vdata && !hardware().verifyWord(i, data[i], type, *vdata) ) return false;
}
incrementPC(1);
@@ -117,7 +117,7 @@ bool Direct::pic16::skipMaskWords(Pic::MemoryRangeType type, const Device::Array
if (force) return false;
uint nb = (type==Pic::MemoryRangeType::Code ? nbWordsCodeProg() : 1);
for (uint k=0; k<nb; k++)
- if ( data[i+k]!=device().tqmask(type) ) return false;
+ if ( data[i+k]!=device().mask(type) ) return false;
incrementPC(nb);
i += nb;
return true;