summaryrefslogtreecommitdiffstats
path: root/src/devices
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/base/hex_buffer.cpp4
-rw-r--r--src/devices/gui/hex_word_editor.h2
-rw-r--r--src/devices/mem24/gui/mem24_hex_view.cpp2
-rw-r--r--src/devices/mem24/mem24/mem24_memory.cpp6
-rw-r--r--src/devices/mem24/prog/mem24_prog.cpp4
-rw-r--r--src/devices/pic/base/pic.cpp32
-rw-r--r--src/devices/pic/base/pic_config.cpp36
-rw-r--r--src/devices/pic/base/pic_config.h10
-rw-r--r--src/devices/pic/base/pic_protection.cpp8
-rw-r--r--src/devices/pic/base/pic_protection.h2
-rw-r--r--src/devices/pic/gui/pic_config_editor.cpp4
-rw-r--r--src/devices/pic/gui/pic_config_word_editor.cpp12
-rw-r--r--src/devices/pic/pic/pic_memory.cpp90
-rw-r--r--src/devices/pic/pic/pic_memory.h10
-rw-r--r--src/devices/pic/prog/pic_prog.cpp2
-rw-r--r--src/devices/pic/xml/pic_xml_to_data.cpp28
16 files changed, 126 insertions, 126 deletions
diff --git a/src/devices/base/hex_buffer.cpp b/src/devices/base/hex_buffer.cpp
index 09bf847..f389c92 100644
--- a/src/devices/base/hex_buffer.cpp
+++ b/src/devices/base/hex_buffer.cpp
@@ -250,8 +250,8 @@ void HexBuffer::load(TQTextStream &stream, Format &format, TQValueList<ErrorData
// however, I don't know if such a situation can occurs
uint a = addrbase+x >> 1;
BitValue value = (*this)[a];
- if ( addrbase+x & 1 ) insert(a, value.tqmaskWith(0x00FF) | data << 8); // Odd addr => Hi byte
- else insert(a, value.tqmaskWith(0xFF00) | data); // Low byte
+ if ( addrbase+x & 1 ) insert(a, value.maskWith(0x00FF) | data << 8); // Odd addr => Hi byte
+ else insert(a, value.maskWith(0xFF00) | data); // Low byte
//if ( x==0 ) qDebug("fb@%s: %s", toHex(addrbase+x >> 1, 8).data(), toHex(fb[addrbase+x >> 1], 8).data());
cksum += data;
}
diff --git a/src/devices/gui/hex_word_editor.h b/src/devices/gui/hex_word_editor.h
index db9374c..8744d03 100644
--- a/src/devices/gui/hex_word_editor.h
+++ b/src/devices/gui/hex_word_editor.h
@@ -55,7 +55,7 @@ private:
virtual bool isValid() const { return true; }
virtual BitValue tqmask() const { return _tqmask; }
- virtual BitValue normalizeWord(BitValue value) const { return value.tqmaskWith(_tqmask); }
+ virtual BitValue normalizeWord(BitValue value) const { return value.maskWith(_tqmask); }
virtual BitValue word() const { return _word; }
virtual void setWord(BitValue value) { _word = value; }
virtual BitValue blankValue() const { return BitValue(); }
diff --git a/src/devices/mem24/gui/mem24_hex_view.cpp b/src/devices/mem24/gui/mem24_hex_view.cpp
index 7ded854..7c30e9f 100644
--- a/src/devices/mem24/gui/mem24_hex_view.cpp
+++ b/src/devices/mem24/gui/mem24_hex_view.cpp
@@ -34,5 +34,5 @@ BitValue Mem24::HexView::checksum() const
BitValue cs = 0x0000;
for (uint i=0; i<static_cast<const Data &>(_memory->device()).nbBytes(); i++)
cs += static_cast<const Memory *>(_memory)->byte(i);
- return cs.tqmaskWith(0xFFFF);
+ return cs.maskWith(0xFFFF);
}
diff --git a/src/devices/mem24/mem24/mem24_memory.cpp b/src/devices/mem24/mem24/mem24_memory.cpp
index b09aa79..a29cee7 100644
--- a/src/devices/mem24/mem24/mem24_memory.cpp
+++ b/src/devices/mem24/mem24/mem24_memory.cpp
@@ -34,7 +34,7 @@ void Mem24::Memory::copyFrom(const Device::Memory &memory)
Device::Array Mem24::Memory::arrayForWriting() const
{
Device::Array data(_data.count());
- for (uint i=0; i<data.count(); i++) data[i] = _data[i].tqmaskWith(0xFF);
+ for (uint i=0; i<data.count(); i++) data[i] = _data[i].maskWith(0xFF);
return data;
}
@@ -55,7 +55,7 @@ BitValue Mem24::Memory::checksum() const
{
BitValue cs = 0x0000;
for (uint i=0; i<_data.count(); i++) cs += _data[i];
- return cs.tqmaskWith(0xFFFF);
+ return cs.maskWith(0xFFFF);
}
//-----------------------------------------------------------------------------
@@ -86,7 +86,7 @@ void Mem24::Memory::fromHexBuffer(const HexBuffer &hb, WarningTypes &result,
warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding tqmask (%3).")
.tqarg(toHexLabel(k, 8)).tqarg(toHexLabel(_data[k], 8)).tqarg(toHexLabel(tqmask, 8));
}
- _data[k] = _data[k].tqmaskWith(tqmask);
+ _data[k] = _data[k].maskWith(tqmask);
}
}
}
diff --git a/src/devices/mem24/prog/mem24_prog.cpp b/src/devices/mem24/prog/mem24_prog.cpp
index 338c217..82c596c 100644
--- a/src/devices/mem24/prog/mem24_prog.cpp
+++ b/src/devices/mem24/prog/mem24_prog.cpp
@@ -32,8 +32,8 @@ bool Programmer::Mem24DeviceSpecific::write(const Device::Array &data)
bool Programmer::Mem24DeviceSpecific::verifyByte(uint index, BitValue d, const VerifyData &vdata)
{
BitValue v = static_cast<const Mem24::Memory &>(vdata.memory).byte(index);
- v = v.tqmaskWith(0xFF);
- d = d.tqmaskWith(0xFF);
+ v = v.maskWith(0xFF);
+ d = d.maskWith(0xFF);
if ( v==d ) return true;
Address address = index;
if ( vdata.actions & BlankCheckVerify )
diff --git a/src/devices/pic/base/pic.cpp b/src/devices/pic/base/pic.cpp
index b58f480..fd8622b 100644
--- a/src/devices/pic/base/pic.cpp
+++ b/src/devices/pic/base/pic.cpp
@@ -175,23 +175,23 @@ bool Pic::Data::matchId(BitValue rawId, Device::IdData &idata) const
case Architecture::P18F:
case Architecture::P18J:
nid = rawId.clearMaskBits(0x1F);
- idata.revision = rawId.tqmaskWith(0x1F);
+ idata.revision = rawId.maskWith(0x1F);
break;
case Architecture::P24F:
- nid = (rawId >> 16).tqmaskWith(0x3FFF);
- idata.revision = (rawId >> 6).tqmaskWith(0x7);
- idata.minorRevision = rawId.tqmaskWith(0x7);
+ nid = (rawId >> 16).maskWith(0x3FFF);
+ idata.revision = (rawId >> 6).maskWith(0x7);
+ idata.minorRevision = rawId.maskWith(0x7);
break;
case Architecture::P30F:
- nid = (rawId >> 16).tqmaskWith(0xFFFF);
- idata.revision = (rawId >> 6).tqmaskWith(0x3F);
- idata.minorRevision = rawId.tqmaskWith(0x3F);
- idata.process = (rawId >> 12).tqmaskWith(0xF);
+ nid = (rawId >> 16).maskWith(0xFFFF);
+ idata.revision = (rawId >> 6).maskWith(0x3F);
+ idata.minorRevision = rawId.maskWith(0x3F);
+ idata.process = (rawId >> 12).maskWith(0xF);
break;
case Architecture::P24H:
case Architecture::P33F:
- nid = (rawId >> 16).tqmaskWith(0xFFFF);
- idata.revision = rawId.tqmaskWith(0xFFFF); // ??
+ nid = (rawId >> 16).maskWith(0xFFFF);
+ idata.revision = rawId.maskWith(0xFFFF); // ??
break;
case Architecture::Nb_Types: Q_ASSERT(false); break;
}
@@ -241,7 +241,7 @@ bool Pic::Data::checkCalibration(const Device::Array &data, TQString *message) c
}
}
if ( data.count()==1 ) {
- if ( data[0].tqmaskWith(_calibration.opcodeMask)!=_calibration.opcode ) {
+ if ( data[0].maskWith(_calibration.opcodeMask)!=_calibration.opcode ) {
if (message) *message = i18n("Calibration word is not a compatible opcode (%2).")
.tqarg(toHexLabel(_calibration.opcode, nbCharsWord(MemoryRangeType::Code)));
return false;
@@ -326,16 +326,16 @@ Device::Array Pic::Data::gotoInstruction(Address address, bool withPageSelection
bool Pic::Data::isGotoInstruction(BitValue instruction) const
{
switch (_architecture.type()) {
- case Architecture::P10X: return ( instruction.tqmaskWith(0xE00)==0xA00 );
- case Architecture::P16X: return ( instruction.tqmaskWith(0xF800)==0x2800 );
- case Architecture::P17C: return ( instruction.tqmaskWith(0xE000)==0xC000 );
+ case Architecture::P10X: return ( instruction.maskWith(0xE00)==0xA00 );
+ case Architecture::P16X: return ( instruction.maskWith(0xF800)==0x2800 );
+ case Architecture::P17C: return ( instruction.maskWith(0xE000)==0xC000 );
case Architecture::P18C:
case Architecture::P18F:
- case Architecture::P18J: return ( instruction.tqmaskWith(0xFF00)==0xEF00 );
+ case Architecture::P18J: return ( instruction.maskWith(0xFF00)==0xEF00 );
case Architecture::P24F:
case Architecture::P24H:
case Architecture::P30F:
- case Architecture::P33F: return ( instruction.tqmaskWith(0xFF0000)==0x040000 );
+ case Architecture::P33F: return ( instruction.maskWith(0xFF0000)==0x040000 );
case Architecture::Nb_Types: Q_ASSERT(false); break;
}
return false;
diff --git a/src/devices/pic/base/pic_config.cpp b/src/devices/pic/base/pic_config.cpp
index 811a38e..6e59d90 100644
--- a/src/devices/pic/base/pic_config.cpp
+++ b/src/devices/pic/base/pic_config.cpp
@@ -280,30 +280,30 @@ const Pic::Config::Data Pic::Config::DATA[] = {
{ { 0, 0 }, Fixed, { { 0, 0 } } }
};
-TQMap<TQString, Pic::Config::MapData> *Pic::Config::_tqmasks = 0;
-TQMap<TQString, Pic::Config::MapData> &Pic::Config::tqmasks()
+TQMap<TQString, Pic::Config::MapData> *Pic::Config::_masks = 0;
+TQMap<TQString, Pic::Config::MapData> &Pic::Config::masks()
{
- if ( _tqmasks==0 ) {
- _tqmasks = new TQMap<TQString, MapData>;
+ if ( _masks==0 ) {
+ _masks = new TQMap<TQString, MapData>;
for (uint i=0; DATA[i].tqmask.name; i++) {
- (*_tqmasks)[DATA[i].tqmask.name] = MapData(i, -1);
+ (*_masks)[DATA[i].tqmask.name] = MapData(i, -1);
if ( DATA[i].type==MemoryRange ) {
for (uint k=0; k<Protection::MAX_NB_BLOCKS; k++)
- (*_tqmasks)[TQString("%1_%2").tqarg(DATA[i].tqmask.name).tqarg(k)] = MapData(i, k);
+ (*_masks)[TQString("%1_%2").tqarg(DATA[i].tqmask.name).tqarg(k)] = MapData(i, k);
}
}
}
- return *_tqmasks;
+ return *_masks;
}
bool Pic::Config::hasMaskName(const TQString &tqmask)
{
- return tqmasks().tqcontains(tqmask);
+ return masks().tqcontains(tqmask);
}
-TQString Pic::Config::tqmaskLabel(const TQString &tqmask)
+TQString Pic::Config::maskLabel(const TQString &tqmask)
{
- const MapData &mp = tqmasks()[tqmask];
+ const MapData &mp = masks()[tqmask];
TQString s = i18n(DATA[mp.index].tqmask.label);
if ( mp.block>=0 ) return i18n("%1 for block %2").tqarg(s).tqarg(mp.block);
return s;
@@ -312,10 +312,10 @@ TQString Pic::Config::tqmaskLabel(const TQString &tqmask)
const Pic::Config::Mask *Pic::Config::findMask(const TQString &tqmask, uint *wordIndex) const
{
for (uint i=0; i<uint(_words.count()); i++)
- for (uint k=0; k<uint(_words[i].tqmasks.count()); k++) {
- if ( _words[i].tqmasks[k].name==tqmask ) {
+ for (uint k=0; k<uint(_words[i].masks.count()); k++) {
+ if ( _words[i].masks[k].name==tqmask ) {
if (wordIndex) *wordIndex = i;
- return &_words[i].tqmasks[k];
+ return &_words[i].masks[k];
}
}
return 0;
@@ -332,7 +332,7 @@ const Pic::Config::Value *Pic::Config::findValue(const TQString &tqmask, const T
bool Pic::Config::checkValueName(const TQString &tqmask, const TQString &name) const
{
- const Data &data = DATA[tqmasks()[tqmask].index];
+ const Data &data = DATA[masks()[tqmask].index];
TQString pinRegexp = "[A-Z]+\\d*(/[A-Z]+\\d*)?";
switch (data.type) {
case Fixed: break;
@@ -381,7 +381,7 @@ bool Pic::Config::checkValueName(const TQString &tqmask, const TQString &name) c
TQString Pic::Config::valueLabel(const TQString &tqmask, const TQString &name)
{
- const Data &data = DATA[tqmasks()[tqmask].index];
+ const Data &data = DATA[masks()[tqmask].index];
switch (data.type) {
case Fixed:
case ValueDouble:
@@ -406,7 +406,7 @@ TQString Pic::Config::valueLabel(const TQString &tqmask, const TQString &name)
BitValue Pic::Config::Word::usedMask() const
{
BitValue tqmask = 0x0;
- for (uint i=0; i<uint(tqmasks.count()); i++) tqmask |= tqmasks[i].value;
+ for (uint i=0; i<uint(masks.count()); i++) tqmask |= masks[i].value;
return tqmask;
}
@@ -435,12 +435,12 @@ TQDataStream &Pic::operator >>(TQDataStream &s, Config::Mask &tqmask)
TQDataStream &Pic::operator <<(TQDataStream &s, const Config::Word &word)
{
- s << word.name << word.ignoredCNames << word.wtqmask << word.ptqmask << word.ctqmask << word.bvalue << word.tqmasks;
+ s << word.name << word.ignoredCNames << word.wtqmask << word.ptqmask << word.ctqmask << word.bvalue << word.masks;
return s;
}
TQDataStream &Pic::operator >>(TQDataStream &s, Config::Word &word)
{
- s >> word.name >> word.ignoredCNames >> word.wtqmask >> word.ptqmask >> word.ctqmask >> word.bvalue >> word.tqmasks;
+ s >> word.name >> word.ignoredCNames >> word.wtqmask >> word.ptqmask >> word.ctqmask >> word.bvalue >> word.masks;
return s;
}
diff --git a/src/devices/pic/base/pic_config.h b/src/devices/pic/base/pic_config.h
index 67c0b1c..6e13210 100644
--- a/src/devices/pic/base/pic_config.h
+++ b/src/devices/pic/base/pic_config.h
@@ -48,9 +48,9 @@ public:
public:
TQString name;
TQStringList ignoredCNames;
- BitValue wtqmask, ptqmask, ctqmask; // write, protected, and checksum bits tqmasks
+ BitValue wtqmask, ptqmask, ctqmask; // write, protected, and checksum bits masks
BitValue bvalue; // blank value
- TQValueVector<Mask> tqmasks; // ordered from lower to higher
+ TQValueVector<Mask> masks; // ordered from lower to higher
BitValue usedMask() const;
};
@@ -62,7 +62,7 @@ public:
const Value *findValue(const TQString &tqmask, const TQString &value) const;
const Mask *findMask(const TQString &tqmask, uint *wordIndex = 0) const;
static bool hasMaskName(const TQString &tqmask);
- static TQString tqmaskLabel(const TQString &tqmask);
+ static TQString maskLabel(const TQString &tqmask);
bool checkValueName(const TQString &tqmask, const TQString &name) const;
static TQString valueLabel(const TQString &tqmask, const TQString &name);
@@ -73,8 +73,8 @@ private:
MapData(int i, int b) : index(i), block(b) {}
int index, block;
};
- static TQMap<TQString, MapData> &tqmasks();
- static TQMap<TQString, MapData> *_tqmasks; // tqmask name -> index in DATA
+ static TQMap<TQString, MapData> &masks();
+ static TQMap<TQString, MapData> *_masks; // tqmask name -> index in DATA
struct NameData {
const char *name, *label;
diff --git a/src/devices/pic/base/pic_protection.cpp b/src/devices/pic/base/pic_protection.cpp
index 7af925c..4c08c45 100644
--- a/src/devices/pic/base/pic_protection.cpp
+++ b/src/devices/pic/base/pic_protection.cpp
@@ -29,7 +29,7 @@ bool Pic::Protection::isAllProtectedValueName(const TQString &name) const
Pic::Protection::Family Pic::Protection::family() const
{
if ( _config.findMask("WRTBS") ) return CodeGuard;
- TQString tqmask = tqmaskName(ProgramProtected, MemoryRangeType::Code);
+ TQString tqmask = maskName(ProgramProtected, MemoryRangeType::Code);
if ( _config.findMask(TQString("%1_%2").tqarg(tqmask).tqarg(0)) ) return BlockProtection;
if ( _config.findMask(tqmask) ) return BasicProtection;
return NoProtection;
@@ -79,10 +79,10 @@ TQString Pic::Protection::blockMaskName(Type type, uint block) const
if ( type==StandardSecurity || type==HighSecurity ) return (block==0 ? "SSSEC" : "GSSEC");
return TQString();
}
- return TQString("%1_%2").tqarg(tqmaskName(type, MemoryRangeType::Code)).tqarg(block);
+ return TQString("%1_%2").tqarg(maskName(type, MemoryRangeType::Code)).tqarg(block);
}
-TQString Pic::Protection::tqmaskName(Type type, MemoryRangeType mtype) const
+TQString Pic::Protection::maskName(Type type, MemoryRangeType mtype) const
{
Q_ASSERT( type!=Nb_Types );
switch (mtype.type()) {
@@ -215,7 +215,7 @@ Pic::Protection::ProtectedRange Pic::Protection::extractRange(const TQString &tq
for (MemoryRangeType type; type<=MemoryRangeType::Nb_Types; ++type) { // #### danger: <=
isBootBlock = ( type==MemoryRangeType::Nb_Types );
for (uint k=0; k<Nb_Types; k++) {
- TQString mname = (isBootBlock ? bootMaskName(Type(k)) : tqmaskName(Type(k), type));
+ TQString mname = (isBootBlock ? bootMaskName(Type(k)) : maskName(Type(k), type));
if ( rexp.cap(1)!=mname ) continue;
rtype = (isBootBlock ? MemoryRangeType(MemoryRangeType::Code) : type);
ptype = Type(k);
diff --git a/src/devices/pic/base/pic_protection.h b/src/devices/pic/base/pic_protection.h
index a10a8a6..86712f9 100644
--- a/src/devices/pic/base/pic_protection.h
+++ b/src/devices/pic/base/pic_protection.h
@@ -38,7 +38,7 @@ public:
TQString blockLabel(uint i) const;
AddressRangeVector extractRanges(const TQString &name, MemoryRangeType type) const;
bool checkRange(const TQString &tqmask, const TQString &name) const;
- TQString tqmaskName(Type type, MemoryRangeType mtype) const;
+ TQString maskName(Type type, MemoryRangeType mtype) const;
bool isAllProtectedValueName(const TQString &valueName) const;
bool isNoneProtectedValueName(const TQString &valueName) const;
diff --git a/src/devices/pic/gui/pic_config_editor.cpp b/src/devices/pic/gui/pic_config_editor.cpp
index 5cbb5b1..37917c7 100644
--- a/src/devices/pic/gui/pic_config_editor.cpp
+++ b/src/devices/pic/gui/pic_config_editor.cpp
@@ -34,8 +34,8 @@ Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool wit
for(uint i=0; i<nbWords; ++i) {
//qDebug("BinWordsEditor for config word #%i", i);
//uint address = device().range(Device::MemoryConfig).start + device().addressIncrement(Device::MemoryConfig) * i;
- //qDebug("address: %s %s nb: %i", toHex(address, 8).data(), device().configWord(i).name.latin1(), device().configWord(i).tqmasks.count());
- if ( device().config()._words[i].tqmasks.count()==0 ) continue;
+ //qDebug("address: %s %s nb: %i", toHex(address, 8).data(), device().configWord(i).name.latin1(), device().configWord(i).masks.count());
+ if ( device().config()._words[i].masks.count()==0 ) continue;
TQWidget *page = 0;
if ( nbWords>1 ) {
page = new TQWidget(tabw);
diff --git a/src/devices/pic/gui/pic_config_word_editor.cpp b/src/devices/pic/gui/pic_config_word_editor.cpp
index bfa55e4..82b24b7 100644
--- a/src/devices/pic/gui/pic_config_word_editor.cpp
+++ b/src/devices/pic/gui/pic_config_word_editor.cpp
@@ -123,11 +123,11 @@ Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEd
TQGridLayout *grid = new TQGridLayout(_top);
grid->setColStretch(2, 1);
const Config::Word &cword = device().config()._words[ci];
- _combos.resize(cword.tqmasks.count());
+ _combos.resize(cword.masks.count());
uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
for (uint k=0; k<_combos.count(); k++) {
- const Config::Mask &ctqmask = cword.tqmasks[k];
- TQLabel *label = new TQLabel(Config::tqmaskLabel(ctqmask.name) + ":", this);
+ const Config::Mask &ctqmask = cword.masks[k];
+ TQLabel *label = new TQLabel(Config::maskLabel(ctqmask.name) + ":", this);
grid->addWidget(label, k, 0);
label = new TQLabel(ctqmask.name, this);
grid->addWidget(label, k, 1);
@@ -148,7 +148,7 @@ void Pic::ConfigWordEditor::setReadOnly(bool readOnly)
if (_mdb) _mdb->setReadOnly(readOnly);
const Config::Word &cword = device().config()._words[_configIndex];
for (uint k=0; k<_combos.count(); k++) {
- const Config::Mask &ctqmask = cword.tqmasks[k];
+ const Config::Mask &ctqmask = cword.masks[k];
_combos[k]->setEnabled(!readOnly && !ctqmask.value.isOverlapping(cword.ptqmask) && ctqmask.values.count()!=1);
}
}
@@ -158,7 +158,7 @@ void Pic::ConfigWordEditor::slotModified()
BitValue v = memory().word(MemoryRangeType::Config, _configIndex);
//qDebug("BinWordEditor::slotModified %i: %s", _configIndex, toHex(v, 4).data());
for (uint k=0; k<_combos.count(); k++) {
- const Config::Mask &ctqmask = device().config()._words[_configIndex].tqmasks[k];
+ const Config::Mask &ctqmask = device().config()._words[_configIndex].masks[k];
v = v.clearMaskBits(ctqmask.value);
v |= ctqmask.values[_combos[k]->index()].value; // set value
}
@@ -174,7 +174,7 @@ void Pic::ConfigWordEditor::updateDisplay()
uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
//qDebug("BinWordEditor::updateDisplay %i: %s", _configIndex, toHex(v, 4).data());
for (uint k=0; k<_combos.count(); k++) {
- const Config::Mask &ctqmask = device().config()._words[_configIndex].tqmasks[k];
+ const Config::Mask &ctqmask = device().config()._words[_configIndex].masks[k];
for (int i=ctqmask.values.count()-1; i>=0; i--) {
if ( ctqmask.values[i].value.isInside(v) ) {
if ( ctqmask.values[i].isValid() ) _combos[k]->setItem(i);
diff --git a/src/devices/pic/pic/pic_memory.cpp b/src/devices/pic/pic/pic_memory.cpp
index 8567790..cff538d 100644
--- a/src/devices/pic/pic/pic_memory.cpp
+++ b/src/devices/pic/pic/pic_memory.cpp
@@ -58,7 +58,7 @@ Device::Array Pic::Memory::arrayForWriting(MemoryRangeType type) const
{
Device::Array data = _ranges[type];
for (uint i=0; i<data.count(); i++)
- data[i] = data[i].tqmaskWith(type==MemoryRangeType::Config ? device().config()._words[i].wtqmask : device().tqmask(type));
+ data[i] = data[i].maskWith(type==MemoryRangeType::Config ? device().config()._words[i].wtqmask : device().tqmask(type));
return data;
}
@@ -72,10 +72,10 @@ BitValue Pic::Memory::normalizeWord(MemoryRangeType type, uint offset, BitValue
{
if ( type==MemoryRangeType::Config) {
const Config::Word &cword = device().config()._words[offset];
- return value.tqmaskWith(cword.usedMask());
+ return value.maskWith(cword.usedMask());
}
- if ( type==MemoryRangeType::UserId ) return value.tqmaskWith(device().userIdRecommendedMask());
- return value.tqmaskWith(device().tqmask(type));
+ if ( type==MemoryRangeType::UserId ) return value.maskWith(device().userIdRecommendedMask());
+ return value.maskWith(device().tqmask(type));
}
BitValue Pic::Memory::normalizedWord(MemoryRangeType type, uint offset) const
@@ -96,13 +96,13 @@ void Pic::Memory::setArray(MemoryRangeType type, const Device::Array &data)
_ranges[type] = data;
}
-TQString Pic::Memory::findValue(const TQString &tqmaskName) const
+TQString Pic::Memory::findValue(const TQString &maskName) const
{
- if ( tqmaskName.isEmpty() ) return TQString();
+ if ( maskName.isEmpty() ) return TQString();
uint i;
- const Config::Mask *tqmask = device().config().findMask(tqmaskName, &i);
+ const Config::Mask *tqmask = device().config().findMask(maskName, &i);
if ( tqmask==0 ) return TQString();
- BitValue v = word(MemoryRangeType::Config, i).tqmaskWith(tqmask->value);
+ BitValue v = word(MemoryRangeType::Config, i).maskWith(tqmask->value);
for (uint k=0; k<uint(tqmask->values.count()); k++)
if ( v.isInside(tqmask->values[k].value) ) return tqmask->values[k].name;
Q_ASSERT(false);
@@ -122,8 +122,8 @@ AddressRange Pic::Memory::bootRange() const
return AddressRange(start, 2 * size - 1); // instruction words
}
// only CPB
- TQString tqmaskName = protection.bootMaskName(Protection::ProgramProtected);
- const Config::Mask *tqmask = device().config().findMask(tqmaskName);
+ TQString maskName = protection.bootMaskName(Protection::ProgramProtected);
+ const Config::Mask *tqmask = device().config().findMask(maskName);
for (uint k=0; k<uint(tqmask->values.count()); k++) {
AddressRangeVector rv = protection.extractRanges(tqmask->values[k].name, MemoryRangeType::Code);
if ( !rv.isEmpty() ) return rv[0];
@@ -142,9 +142,9 @@ AddressRange Pic::Memory::blockRange(uint i) const
Address start = (previous.isEmpty() ? device().range(MemoryRangeType::Code).start : previous.end + 1);
return AddressRange(start, device().range(MemoryRangeType::Code).end);
}
- TQString tqmaskName = protection.blockSizeMaskName(i);
+ TQString maskName = protection.blockSizeMaskName(i);
if ( protection.family()==Protection::CodeGuard ) { // secure segment
- TQString value = findValue(tqmaskName);
+ TQString value = findValue(maskName);
Q_ASSERT( !value.isEmpty() );
uint size = value.toUInt();
if ( size==0 ) return AddressRange();
@@ -153,7 +153,7 @@ AddressRange Pic::Memory::blockRange(uint i) const
return AddressRange(start, 2 * size - 1);
}
AddressRange previous = (i==0 ? bootRange() : blockRange(i-1));
- const Config::Mask *tqmask = device().config().findMask(tqmaskName);
+ const Config::Mask *tqmask = device().config().findMask(maskName);
for (uint k=0; k<uint(tqmask->values.count()); k++) {
AddressRangeVector rv = protection.extractRanges(tqmask->values[k].name, MemoryRangeType::Code);
if ( !rv.isEmpty() ) return AddressRange(previous.end + 1, rv[0].end);
@@ -165,8 +165,8 @@ AddressRange Pic::Memory::blockRange(uint i) const
AddressRange Pic::Memory::bootProtectedRange(Protection::Type ptype) const
{
const Protection &protection = device().config().protection();
- TQString tqmaskName = protection.bootMaskName(ptype);
- TQString value = findValue(tqmaskName);
+ TQString maskName = protection.bootMaskName(ptype);
+ TQString value = findValue(maskName);
if ( value.isEmpty() ) return AddressRange();
if ( protection.family()!=Protection::CodeGuard ) {
if ( protection.extractRanges(value, MemoryRangeType::Code).isEmpty() ) return AddressRange();
@@ -179,8 +179,8 @@ AddressRange Pic::Memory::bootProtectedRange(Protection::Type ptype) const
AddressRange Pic::Memory::blockProtectedRange(Protection::Type ptype, uint i) const
{
const Protection &protection = device().config().protection();
- TQString tqmaskName = protection.blockMaskName(ptype, i);
- TQString value = findValue(tqmaskName);
+ TQString maskName = protection.blockMaskName(ptype, i);
+ TQString value = findValue(maskName);
if ( value.isEmpty() ) return AddressRange();
if ( protection.family()!=Protection::CodeGuard ) {
if ( protection.extractRanges(value, MemoryRangeType::Code).isEmpty() ) return AddressRange();
@@ -202,9 +202,9 @@ AddressRangeVector Pic::Memory::protectedRanges(Protection::Type ptype, MemoryRa
}
}
if ( protection.family()!=Protection::CodeGuard ) {
- TQString tqmaskName = protection.tqmaskName(ptype, type);
- TQString value = findValue(tqmaskName);
- //qDebug("%s %s", tqmaskName.latin1(), value.latin1());
+ TQString maskName = protection.maskName(ptype, type);
+ TQString value = findValue(maskName);
+ //qDebug("%s %s", maskName.latin1(), value.latin1());
if ( !value.isEmpty() ) {
AddressRangeVector tmp = protection.extractRanges(value, type);
Q_ASSERT( tmp.count()==1 );
@@ -216,14 +216,14 @@ AddressRangeVector Pic::Memory::protectedRanges(Protection::Type ptype, MemoryRa
void Pic::Memory::setBootProtection(bool on, Protection::Type ptype)
{
- TQString tqmaskName = device().config().protection().bootMaskName(ptype);
- setProtection(on, tqmaskName, ptype);
+ TQString maskName = device().config().protection().bootMaskName(ptype);
+ setProtection(on, maskName, ptype);
}
void Pic::Memory::setBlockProtection(bool on, Protection::Type ptype, uint block)
{
- TQString tqmaskName = device().config().protection().blockMaskName(ptype, block);
- setProtection(on, tqmaskName, ptype);
+ TQString maskName = device().config().protection().blockMaskName(ptype, block);
+ setProtection(on, maskName, ptype);
}
void Pic::Memory::setProtection(bool on, Protection::Type ptype, MemoryRangeType type)
@@ -236,13 +236,13 @@ void Pic::Memory::setProtection(bool on, Protection::Type ptype, MemoryRangeType
return;
}
}
- setProtection(on, protection.tqmaskName(ptype, type), ptype);
+ setProtection(on, protection.maskName(ptype, type), ptype);
}
-void Pic::Memory::setConfigValue(const TQString &tqmaskName, const TQString &valueName)
+void Pic::Memory::setConfigValue(const TQString &maskName, const TQString &valueName)
{
uint i;
- const Config::Mask *tqmask = device().config().findMask(tqmaskName, &i);
+ const Config::Mask *tqmask = device().config().findMask(maskName, &i);
Q_ASSERT(tqmask);
BitValue v = word(MemoryRangeType::Config, i);
v = v.clearMaskBits(tqmask->value);
@@ -254,9 +254,9 @@ void Pic::Memory::setConfigValue(const TQString &tqmaskName, const TQString &val
Q_ASSERT(false);
}
-void Pic::Memory::setProtection(bool on, const TQString &tqmaskName, Protection::Type ptype)
+void Pic::Memory::setProtection(bool on, const TQString &maskName, Protection::Type ptype)
{
- const Config::Mask *tqmask = device().config().findMask(tqmaskName, 0);
+ const Config::Mask *tqmask = device().config().findMask(maskName, 0);
if( tqmask==0 ) return;
const Protection &protection = device().config().protection();
TQString valueName;
@@ -268,25 +268,25 @@ void Pic::Memory::setProtection(bool on, const TQString &tqmaskName, Protection:
|| (!on && protection.isNoneProtectedValueName(tqmask->values[k].name)) ) valueName = tqmask->values[k].name;
}
}
- setConfigValue(tqmaskName, valueName);
+ setConfigValue(maskName, valueName);
}
-bool Pic::Memory::hasFlagOn(const TQString &tqmaskName, bool valueIfNotPresent) const
+bool Pic::Memory::hasFlagOn(const TQString &maskName, bool valueIfNotPresent) const
{
- const Config::Mask *tqmask = device().config().findMask(tqmaskName, 0);
+ const Config::Mask *tqmask = device().config().findMask(maskName, 0);
if ( tqmask==0 ) return valueIfNotPresent;
Q_ASSERT(tqmask);
Q_ASSERT( tqmask->values.count()==2 );
- return ( findValue(tqmaskName)=="On" );
+ return ( findValue(maskName)=="On" );
}
-void Pic::Memory::setFlagOn(const TQString &tqmaskName, bool on)
+void Pic::Memory::setFlagOn(const TQString &maskName, bool on)
{
- const Config::Mask *tqmask = device().config().findMask(tqmaskName, 0);
+ const Config::Mask *tqmask = device().config().findMask(maskName, 0);
Q_UNUSED(tqmask);
Q_ASSERT(tqmask);
Q_ASSERT( tqmask->values.count()==2 );
- setConfigValue(tqmaskName, on ? "On" : "Off");
+ setConfigValue(maskName, on ? "On" : "Off");
}
void Pic::Memory::checksumCheckFill()
@@ -345,8 +345,8 @@ BitValue Pic::Memory::checksum() const
BitValue cs = 0x0000;
const Protection &protection = device().config().protection();
if ( protection.family()==Protection::BasicProtection ) {
- TQString tqmaskName = protection.tqmaskName(Protection::ProgramProtected, MemoryRangeType::Code);
- TQString valueName = findValue(tqmaskName);
+ TQString maskName = protection.maskName(Protection::ProgramProtected, MemoryRangeType::Code);
+ TQString valueName = findValue(maskName);
const TQMap<TQString, Checksum::Data> &checksums = device().checksums();
if ( checksums.tqcontains(valueName) ) { // #### REMOVE ME !!
algorithm = checksums[valueName].algorithm;
@@ -357,7 +357,7 @@ BitValue Pic::Memory::checksum() const
//qDebug("algo: %s", Checksum::ALGORITHM_DATA[algorithm].name);
for (uint i=0; i<device().nbWords(MemoryRangeType::Code); i++) {
if ( algorithm==Checksum::Algorithm::Normal && rv.tqcontains(inc*i) ) continue;
- BitValue v = word(MemoryRangeType::Code, i).tqmaskWith(tqmask);
+ BitValue v = word(MemoryRangeType::Code, i).maskWith(tqmask);
//if ( i==0 || i==device().nbWords(MemoryRangeType::Code)-1 ) qDebug("%s %s", toHexLabel(i, 4).latin1(), toHexLabel(v, 4).latin1());
switch (device().architecture().type()) {
case Architecture::P10X:
@@ -392,7 +392,7 @@ BitValue Pic::Memory::checksum() const
const Config &config = device().config();
for (uint i=0; i<uint(config._words.count()); i++) {
const Config::Word &cword = config._words[i];
- BitValue v = word(MemoryRangeType::Config, i).tqmaskWith(cword.ctqmask);
+ BitValue v = word(MemoryRangeType::Config, i).maskWith(cword.ctqmask);
//uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
// qDebug("%i: %s %s", i, toHex(word(MemoryRangeType::Config, i), nbChars).latin1(), toHex(cword.ctqmask, nbChars).latin1());
if ( ( device().name()=="16C61" || device().name()=="16C71" ) && isProtected ) cs += v | 0x0060;
@@ -405,7 +405,7 @@ BitValue Pic::Memory::checksum() const
BitValue id = 0x0;
uint nb = device().nbWords(MemoryRangeType::UserId);
for (uint i=0; i<nb; i++) {
- BitValue v = word(MemoryRangeType::UserId, nb-i-1).tqmaskWith(0xF);
+ BitValue v = word(MemoryRangeType::UserId, nb-i-1).maskWith(0xF);
if ( device().is18Family() ) id += v;
else {
// qDebug("id %i (%i): %s %s", i, nbb, toHex(v, 4).latin1(), toHex(v << (nbb*i), 9).latin1());
@@ -416,7 +416,7 @@ BitValue Pic::Memory::checksum() const
cs += id;
}
//qDebug("checksum: %s %s", toHexLabelAbs(cs).latin1(), toHex(cs & 0xFFFF, 4).latin1());
- return cs.tqmaskWith(0xFFFF);
+ return cs.maskWith(0xFFFF);
}
BitValue Pic::Memory::unprotectedChecksum() const
@@ -474,7 +474,7 @@ void Pic::Memory::toHexBuffer(MemoryRangeType type, HexBuffer &hb) const
//qDebug("%s wnb=%i snb=%i div=%i", MEMORY_RANGE_TYPE_DATA[type].label, wNbBytes, sNbBytes, div);
for (uint k=0; k<wNbBytes*device().nbWords(type); k++) {
// set byte
- BitValue s = _ranges[type][wOffset].tqmaskWith(tqmask);
+ BitValue s = _ranges[type][wOffset].maskWith(tqmask);
//if ( k<4 ) qDebug("s=%s so=%s sb=%i wo=%i wb=%i", toHex(s, 8).data(), toHex(sOffset, 8).data(), sByte, wOffset, wByte);
s = s.byte(wByte);
if ( (byte%2)==0 ) hb.insert(offset, s);
@@ -540,12 +540,12 @@ void Pic::Memory::fromHexBuffer(MemoryRangeType type, const HexBuffer &hb, Warni
wByte++;
if ( (wByte%wNbBytes)==0 ) {
if ( _ranges[type][wOffset].isInitialized() ) {
- if ( !(result & ValueTooLarge) && _ranges[type][wOffset].tqmaskWith(tqmask)!=_ranges[type][wOffset] ) {
+ if ( !(result & ValueTooLarge) && _ranges[type][wOffset].maskWith(tqmask)!=_ranges[type][wOffset] ) {
result |= ValueTooLarge;
warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding tqmask (%3).")
.tqarg(toHexLabel(offset, 8)).tqarg(toHexLabel(_ranges[type][wOffset], 8)).tqarg(toHexLabel(tqmask, 8));
}
- _ranges[type][wOffset] = _ranges[type][wOffset].tqmaskWith(tqmask);
+ _ranges[type][wOffset] = _ranges[type][wOffset].maskWith(tqmask);
}
wByte = 0;
wOffset++;
diff --git a/src/devices/pic/pic/pic_memory.h b/src/devices/pic/pic/pic_memory.h
index 7d00c01..dbfd9ea 100644
--- a/src/devices/pic/pic/pic_memory.h
+++ b/src/devices/pic/pic/pic_memory.h
@@ -41,7 +41,7 @@ public:
bool isBlockProtected(Protection::Type ptype, uint i) const { return !blockProtectedRange(ptype, i).isEmpty(); }
bool isProtected(Protection::Type ptype, MemoryRangeType type) const { return !protectedRanges(ptype, type).isEmpty(); }
AddressRangeVector protectedRanges(Protection::Type ptype, MemoryRangeType type) const;
- void setConfigValue(const TQString &tqmaskName, const TQString &valueName);
+ void setConfigValue(const TQString &maskName, const TQString &valueName);
bool hasDebugOn() const { return hasFlagOn("DEBUG", false); }
void setDebugOn(bool on) { setFlagOn("DEBUG", on); }
bool hasWatchdogTimerOn() const { return hasFlagOn("WDT", false); }
@@ -67,10 +67,10 @@ private:
virtual void savePartial(TQTextStream &stream, HexBuffer::Format format) const;
virtual void fromHexBuffer(const HexBuffer &hb, WarningTypes &warningTypes,
TQStringList &warnings, TQMap<uint, bool> &inRange);
- TQString findValue(const TQString &tqmaskName) const;
- bool hasFlagOn(const TQString &tqmaskName, bool valueIfNotPresent) const;
- void setFlagOn(const TQString &tqmaskName, bool on);
- void setProtection(bool on, const TQString &tqmaskName, Protection::Type ptype);
+ TQString findValue(const TQString &maskName) const;
+ bool hasFlagOn(const TQString &maskName, bool valueIfNotPresent) const;
+ void setFlagOn(const TQString &maskName, bool on);
+ void setProtection(bool on, const TQString &maskName, Protection::Type ptype);
AddressRange bootProtectedRange(Protection::Type ptype) const;
AddressRange blockProtectedRange(Protection::Type ptype, uint block) const;
};
diff --git a/src/devices/pic/prog/pic_prog.cpp b/src/devices/pic/prog/pic_prog.cpp
index e882529..da0b1ca 100644
--- a/src/devices/pic/prog/pic_prog.cpp
+++ b/src/devices/pic/prog/pic_prog.cpp
@@ -375,7 +375,7 @@ bool Programmer::PicBase::restoreBandGapBits()
BitValue ptqmask = device()->config()._words[i].ptqmask;
if ( ptqmask==0 ) continue;
cdata[i] = cdata[i].clearMaskBits(ptqmask);
- cdata[i] |= data[i].tqmaskWith(ptqmask);
+ cdata[i] |= data[i].maskWith(ptqmask);
}
if ( !specific()->canWriteRange(Pic::MemoryRangeType::Config) ) {
log(Log::LineType::Warning, i18n("Could not restore band gap bits because programmer does not support writing config bits."));
diff --git a/src/devices/pic/xml/pic_xml_to_data.cpp b/src/devices/pic/xml/pic_xml_to_data.cpp
index 7f727ff..eeb293a 100644
--- a/src/devices/pic/xml/pic_xml_to_data.cpp
+++ b/src/devices/pic/xml/pic_xml_to_data.cpp
@@ -219,13 +219,13 @@ Pic::Config::Word toConfigWord(TQDomElement config)
if ( tqmask.attribute("name").isEmpty() ) qFatal(TQString("Empty tqmask name in config %1").tqarg(cword.name));
Config::Mask ctqmask = toConfigMask(tqmask, cword.ptqmask);
if ( !ctqmask.value.isInside(gtqmask) ) qFatal(TQString("Mask value not inside tqmask in config %1").tqarg(cword.name));
- for (uint i=0; i<uint(cword.tqmasks.count()); i++) {
- if ( cword.tqmasks[i].name==ctqmask.name ) qFatal(TQString("Duplicated tqmask name %1 in config %2").tqarg(ctqmask.name).tqarg(cword.name));
- if ( ctqmask.value.isOverlapping(cword.tqmasks[i].value) ) qFatal(TQString("Overlapping tqmasks in config %1").tqarg(cword.name));
+ for (uint i=0; i<uint(cword.masks.count()); i++) {
+ if ( cword.masks[i].name==ctqmask.name ) qFatal(TQString("Duplicated tqmask name %1 in config %2").tqarg(ctqmask.name).tqarg(cword.name));
+ if ( ctqmask.value.isOverlapping(cword.masks[i].value) ) qFatal(TQString("Overlapping masks in config %1").tqarg(cword.name));
}
- cword.tqmasks.append(ctqmask);
+ cword.masks.append(ctqmask);
}
- qHeapSort(cword.tqmasks);
+ qHeapSort(cword.masks);
BitValue tqmask = (cword.usedMask() | cword.bvalue).clearMaskBits(cword.ptqmask);
if ( config.attribute("ctqmask").isEmpty() ) {
if ( data()->_architecture==Pic::Architecture::P30F ) cword.ctqmask = cword.wtqmask;
@@ -443,15 +443,15 @@ virtual void processDevice(TQDomElement device)
if ( cwords[i].name.isNull() ) qFatal(TQString("Config word #%1 not defined").tqarg(i));
data()->_config->_words[i] = cwords[i];
const Config::Word &word = data()->_config->_words[i];
- for (uint j=0; j<uint(word.tqmasks.count()); j++) {
- const Config::Mask &tqmask = word.tqmasks[j];
+ for (uint j=0; j<uint(word.masks.count()); j++) {
+ const Config::Mask &tqmask = word.masks[j];
for (uint k=0; k<uint(tqmask.values.count()); k++) {
const TQStringList &vcnames = tqmask.values[k].configNames[type];
for (uint l=0; l<uint(vcnames.count()); l++) {
if ( vcnames[l].startsWith("0x") ) continue;
if ( cnames.tqcontains(vcnames[l]) && cnames[vcnames[l]]!=tqmask.name )
qFatal(TQString("Duplicated config name for %1/%2").tqarg(tqmask.name).tqarg(tqmask.values[k].name));
- cnames[vcnames[l]] = word.tqmasks[j].name;
+ cnames[vcnames[l]] = word.masks[j].name;
}
}
}
@@ -460,8 +460,8 @@ virtual void processDevice(TQDomElement device)
// check validity of value names
for (uint i=0; i<nbWords; i++) {
const Config::Word &word = data()->_config->_words[i];
- for (uint j=0; j<uint(word.tqmasks.count()); j++) {
- const Config::Mask &tqmask = word.tqmasks[j];
+ for (uint j=0; j<uint(word.masks.count()); j++) {
+ const Config::Mask &tqmask = word.masks[j];
for (uint k=0; k<uint(tqmask.values.count()); k++) {
const Config::Value &value = tqmask.values[k];
if ( !value.isValid() ) continue;
@@ -473,8 +473,8 @@ virtual void processDevice(TQDomElement device)
// check if all values are explicit
for (uint i=0; i<nbWords; i++) {
const Config::Word &word = data()->_config->_words[i];
- for (uint j=0; j<uint(word.tqmasks.count()); j++) {
- const Config::Mask &tqmask = word.tqmasks[j];
+ for (uint j=0; j<uint(word.masks.count()); j++) {
+ const Config::Mask &tqmask = word.masks[j];
BitValue::const_iterator it;
for (it=tqmask.value.begin(); it!=tqmask.value.end(); ++it)
if ( !hasValue(tqmask, *it) ) qFatal(TQString("Value %1 not defined in tqmask %2").tqarg(toHexLabel(*it, data()->nbCharsWord(MemoryRangeType::Config))).tqarg(tqmask.name));
@@ -489,8 +489,8 @@ virtual void processDevice(TQDomElement device)
TQMap<TQString, bool> valueNames;
const Pic::Protection &protection = data()->_config->protection();
if ( protection.family()==Protection::BasicProtection ) {
- TQString tqmaskName = protection.tqmaskName(Protection::ProgramProtected, MemoryRangeType::Code);
- const Pic::Config::Mask *tqmask = data()->_config->findMask(tqmaskName);
+ TQString maskName = protection.maskName(Protection::ProgramProtected, MemoryRangeType::Code);
+ const Pic::Config::Mask *tqmask = data()->_config->findMask(maskName);
Q_ASSERT(tqmask);
for (uint i=0; i<uint(tqmask->values.count()); i++) valueNames[tqmask->values[i].name] = false;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 05:39:35 +0000