diff options
Diffstat (limited to 'src/piklab-test/base/generator_check.cpp')
| -rw-r--r-- | src/piklab-test/base/generator_check.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/piklab-test/base/generator_check.cpp b/src/piklab-test/base/generator_check.cpp index 5819188..f7ce96f 100644 --- a/src/piklab-test/base/generator_check.cpp +++ b/src/piklab-test/base/generator_check.cpp @@ -129,8 +129,8 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data) bool ok = false; for (uint i=0; i<config._words.count(); i++) { const Pic::Config::Word &cword = config._words[i]; - for (uint k=0; k<cword.tqmasks.count(); k++) { - const Pic::Config::Mask &ctqmask = cword.tqmasks[k]; + for (uint k=0; k<cword.masks.count(); k++) { + const Pic::Config::Mask &ctqmask = cword.masks[k]; if ( l<ctqmask.values.count() ) { ok = true; if ( !ctqmask.values[l].name.isEmpty() ) _memory2->setConfigValue(ctqmask.name, ctqmask.values[l].name); @@ -157,11 +157,11 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data) BitValue word1 = _memory1->word(Pic::MemoryRangeType::Config, i); BitValue word2 = _memory2->word(Pic::MemoryRangeType::Config, i); if ( word1==word2 ) continue; - for (uint k=0; k<cword.tqmasks.count(); k++) { - const Pic::Config::Mask &ctqmask = cword.tqmasks[k]; + for (uint k=0; k<cword.masks.count(); k++) { + const Pic::Config::Mask &ctqmask = cword.masks[k]; if ( ctqmask.value.isInside(cword.ptqmask) ) continue; - BitValue value1 = word1.tqmaskWith(ctqmask.value); - BitValue value2 = word2.tqmaskWith(ctqmask.value); + BitValue value1 = word1.maskWith(ctqmask.value); + BitValue value2 = word2.maskWith(ctqmask.value); if ( value1==value2 ) continue; TQString name1, name2; uint l1, l2; @@ -173,7 +173,7 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data) if ( name1==name2 ) continue; TEST_FAILED_RETURN(TQString("Config bits are different in %1: set\"%2\"=(%3) != compiled=%4)") .tqarg(ctqmask.name).tqarg(ctqmask.values[l2].name) - .tqarg(toHexLabel(word2.tqmaskWith(ctqmask.value), nbChars)).tqarg(toHexLabel(word1.tqmaskWith(ctqmask.value), nbChars))) + .tqarg(toHexLabel(word2.maskWith(ctqmask.value), nbChars)).tqarg(toHexLabel(word1.maskWith(ctqmask.value), nbChars))) } } } |