1 files changed, 12 insertions, 12 deletions
diff --git a/src/coff/base/disassembler.cpp b/src/coff/base/disassembler.cpp
index 9790843..7515b71 100644
--- a/src/coff/base/disassembler.cpp
+++ b/src/coff/base/disassembler.cpp
@@ -126,10 +126,10 @@ TQStringList SourceLine::configNames(Pic::ConfigNameType type, const Pic::Memory
   const Pic::Config::Word &cword = config._words[word];
   TQStringList cnames;
   for (uint k=0; k<uint(cword.masks.count()); k++) {
-    const Pic::Config::Mask &ctqmask = cword.masks[k];
-    if ( ctqmask.value.isInside(cword.ptqmask) ) continue; // protected bits
-    for (int l=ctqmask.values.count()-1; l>=0; l--) {
-      const Pic::Config::Value &cvalue = ctqmask.values[l];
+    const Pic::Config::Mask &cmask = cword.masks[k];
+    if ( cmask.value.isInside(cword.pmask) ) continue; // protected bits
+    for (int l=cmask.values.count()-1; l>=0; l--) {
+      const Pic::Config::Value &cvalue = cmask.values[l];
       if ( !cvalue.value.isInside(v) ) continue;
       TQStringList vcnames = cvalue.configNames[type];
       if ( vcnames.isEmpty() && type!=Pic::ConfigNameType::Default ) vcnames = cvalue.configNames[Pic::ConfigNameType::Default];
@@ -192,8 +192,8 @@ SourceLine::List GPUtils::disassemble(const Pic::Memory &memory)
   bool isDefault = true;
   for (uint k=0; k<data.nbWords(Pic::MemoryRangeType::Config); k++) {
     BitValue op = memory.normalizedWord(Pic::MemoryRangeType::Config, k);
-    BitValue tqmask = data.config()._words[k].usedMask();
-    if ( !tqmask.isInside(op) ) isDefault = false; // this is not completely correct but otherwise empty config is written...
+    BitValue mask = data.config()._words[k].usedMask();
+    if ( !mask.isInside(op) ) isDefault = false; // this is not completely correct but otherwise empty config is written...
   }
   if ( !isDefault ) {
     lines.appendEmpty();
@@ -206,8 +206,8 @@ SourceLine::List GPUtils::disassemble(const Pic::Memory &memory)
   TQString tmp;
   for (uint k=0; k<data.nbWords(Pic::MemoryRangeType::UserId); k++) {
     BitValue op = memory.normalizedWord(Pic::MemoryRangeType::UserId, k);
-    BitValue tqmask = data.userIdRecommendedMask();
-    if ( tqmask.isInside(op) ) continue;
+    BitValue mask = data.userIdRecommendedMask();
+    if ( mask.isInside(op) ) continue;
     if ( data.is18Family() ) {
       Address ad = data.range(Pic::MemoryRangeType::UserId).start + data.range(Pic::MemoryRangeType::UserId).hexFileOffset + k*data.addressIncrement(Pic::MemoryRangeType::UserId);
       lines.appendIndentedCode("__IDLOCS " + toHexLabel(ad, data.nbCharsAddress()) + ", " + toHexLabel(op, data.nbCharsWord(Pic::MemoryRangeType::UserId)));
@@ -227,8 +227,8 @@ SourceLine::List GPUtils::disassemble(const Pic::Memory &memory)
   uint nb = data.nbWords(Pic::MemoryRangeType::Code);
   for (uint k=0; k<nb; k++) {
     BitValue op = memory.normalizedWord(Pic::MemoryRangeType::Code, k);
-    BitValue tqmask = data.tqmask(Pic::MemoryRangeType::Code);
-    if ( tqmask.isInside(op) ) newOrg = true;
+    BitValue mask = data.mask(Pic::MemoryRangeType::Code);
+    if ( mask.isInside(op) ) newOrg = true;
     else {
       if (newOrg) {
         if ( !first ) tmp += '\n';
@@ -254,8 +254,8 @@ SourceLine::List GPUtils::disassemble(const Pic::Memory &memory)
   nb = data.nbWords(Pic::MemoryRangeType::Eeprom);
   for (uint k=0; k<nb; k++) {
     BitValue op = memory.normalizedWord(Pic::MemoryRangeType::Eeprom, k);
-    BitValue tqmask = data.tqmask(Pic::MemoryRangeType::Eeprom);
-    if ( tqmask.isInside(op) ) newOrg = true;
+    BitValue mask = data.mask(Pic::MemoryRangeType::Eeprom);
+    if ( mask.isInside(op) ) newOrg = true;
     else {
       if (newOrg) {
         Address org = data.range(Pic::MemoryRangeType::Eeprom).start + data.range(Pic::MemoryRangeType::Eeprom).hexFileOffset + k*data.addressIncrement(Pic::MemoryRangeType::Eeprom);