diff options
Diffstat (limited to 'src/piklab-test/base')
| -rw-r--r-- | src/piklab-test/base/generator_check.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/piklab-test/base/generator_check.cpp b/src/piklab-test/base/generator_check.cpp index f7ce96f..1df1a9c 100644 --- a/src/piklab-test/base/generator_check.cpp +++ b/src/piklab-test/base/generator_check.cpp @@ -130,10 +130,10 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data) for (uint i=0; i<config._words.count(); i++) { const Pic::Config::Word &cword = config._words[i]; for (uint k=0; k<cword.masks.count(); k++) { - const Pic::Config::Mask &ctqmask = cword.masks[k]; - if ( l<ctqmask.values.count() ) { + const Pic::Config::Mask &cmask = cword.masks[k]; + if ( l<cmask.values.count() ) { ok = true; - if ( !ctqmask.values[l].name.isEmpty() ) _memory2->setConfigValue(ctqmask.name, ctqmask.values[l].name); + if ( !cmask.values[l].name.isEmpty() ) _memory2->setConfigValue(cmask.name, cmask.values[l].name); } } } @@ -158,22 +158,22 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data) BitValue word2 = _memory2->word(Pic::MemoryRangeType::Config, i); if ( word1==word2 ) continue; 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.maskWith(ctqmask.value); - BitValue value2 = word2.maskWith(ctqmask.value); + const Pic::Config::Mask &cmask = cword.masks[k]; + if ( cmask.value.isInside(cword.pmask) ) continue; + BitValue value1 = word1.maskWith(cmask.value); + BitValue value2 = word2.maskWith(cmask.value); if ( value1==value2 ) continue; TQString name1, name2; uint l1, l2; - for (uint l=0; l<ctqmask.values.count(); l++) { - const Pic::Config::Value &value = ctqmask.values[l]; + for (uint l=0; l<cmask.values.count(); l++) { + const Pic::Config::Value &value = cmask.values[l]; if ( value.value==value1 ) { name1 = value.name; l1 = l; } if ( value.value==value2 ) { name2 = value.name; l2 = l; } } 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.maskWith(ctqmask.value), nbChars)).tqarg(toHexLabel(word1.maskWith(ctqmask.value), nbChars))) + .tqarg(cmask.name).tqarg(cmask.values[l2].name) + .tqarg(toHexLabel(word2.maskWith(cmask.value), nbChars)).tqarg(toHexLabel(word1.maskWith(cmask.value), nbChars))) } } } |