diff options
Diffstat (limited to 'src/coff/base/coff_object.cpp')
| -rw-r--r-- | src/coff/base/coff_object.cpp | 148 |
1 files changed, 74 insertions, 74 deletions
diff --git a/src/coff/base/coff_object.cpp b/src/coff/base/coff_object.cpp index f4109f9..f6263fd 100644 --- a/src/coff/base/coff_object.cpp +++ b/src/coff/base/coff_object.cpp @@ -16,10 +16,10 @@ #include "common/global/pfile.h" //---------------------------------------------------------------------------- -bool Coff::getName(const QByteArray &data, uint &offset, uint nbChars, uint stringTableOffset, - Log::Base &log, QString &name) +bool Coff::getName(const TQByteArray &data, uint &offset, uint nbChars, uint stringTableOffset, + Log::Base &log, TQString &name) { - Q_UINT32 v; + TQ_UINT32 v; if ( !getULong(data, offset, 4, log, v) ) return false; if ( v!=0 ) { // name is not in string table offset -= 4; @@ -27,7 +27,7 @@ bool Coff::getName(const QByteArray &data, uint &offset, uint nbChars, uint stri } if ( !getULong(data, offset, 4, log, v) ) return false; // ### do a sanity check here - name = QString(data.data()+stringTableOffset+v); + name = TQString(data.data()+stringTableOffset+v); return true; } @@ -55,7 +55,7 @@ const Coff::AuxSymbolType::Data Coff::AuxSymbolType::DATA[Nb_Types] = { { 0, I18N_NOOP("Section") } }; -Coff::AuxSymbol *Coff::AuxSymbol::factory(const Object &object, AuxSymbolType type, const QByteArray &data, uint offset, uint stringTableOffset, Log::Base &log) +Coff::AuxSymbol *Coff::AuxSymbol::factory(const Object &object, AuxSymbolType type, const TQByteArray &data, uint offset, uint stringTableOffset, Log::Base &log) { switch (type.type()) { case AuxSymbolType::Direct: return new AuxSymbolDirect(object, data, offset, stringTableOffset, log); @@ -68,47 +68,47 @@ Coff::AuxSymbol *Coff::AuxSymbol::factory(const Object &object, AuxSymbolType ty return 0; } -Coff::AuxSymbolDirect::AuxSymbolDirect(const Object &object, const QByteArray &data, uint start, uint stringTableOffset, Log::Base &log) +Coff::AuxSymbolDirect::AuxSymbolDirect(const Object &object, const TQByteArray &data, uint start, uint stringTableOffset, Log::Base &log) : AuxSymbol(object) { uint offset = start; - Q_UINT32 v; + TQ_UINT32 v; if ( !getULong(data, offset, 1, log, v) ) return; _command = v; if ( !getULong(data, offset, 4, log, v) ) return; - _string = QString(data.data()+stringTableOffset+v); + _string = TQString(data.data()+stringTableOffset+v); } -Coff::AuxSymbolFile::AuxSymbolFile(const Object &object, const QByteArray &data, uint start, uint stringTableOffset, Log::Base &log) +Coff::AuxSymbolFile::AuxSymbolFile(const Object &object, const TQByteArray &data, uint start, uint stringTableOffset, Log::Base &log) : AuxSymbol(object) { uint offset = start; - Q_UINT32 v; + TQ_UINT32 v; if ( object.format()==Format::PIC30 ) { if ( !getName(data, offset, 14, stringTableOffset, log, _filename) ) return; _line = 0; } else { if ( !getULong(data, offset, 4, log, v) ) return; - _filename = QString(data.data()+stringTableOffset+v); + _filename = TQString(data.data()+stringTableOffset+v); if ( !getULong(data, offset, 4, log, v) ) return; _line = v; } } -Coff::AuxSymbolIdentifier::AuxSymbolIdentifier(const Object &object, const QByteArray &data, uint start, uint stringTableOffset, Log::Base &log) +Coff::AuxSymbolIdentifier::AuxSymbolIdentifier(const Object &object, const TQByteArray &data, uint start, uint stringTableOffset, Log::Base &log) : AuxSymbol(object) { uint offset = start; - Q_UINT32 v; + TQ_UINT32 v; if ( !getULong(data, offset, 4, log, v) ) return; - _string = QString(data.data()+stringTableOffset+v); + _string = TQString(data.data()+stringTableOffset+v); } -Coff::AuxSymbolSection::AuxSymbolSection(const Object &object, const QByteArray &data, uint start, uint, Log::Base &log) +Coff::AuxSymbolSection::AuxSymbolSection(const Object &object, const TQByteArray &data, uint start, uint, Log::Base &log) : AuxSymbol(object) { uint offset = start; - Q_UINT32 v; + TQ_UINT32 v; if ( !getULong(data, offset, 4, log, v) ) return; _length = v; if ( !getULong(data, offset, 2, log, v) ) return; @@ -180,12 +180,12 @@ const Coff::SymbolDerivedType::Data Coff::SymbolDerivedType::DATA[Nb_Types] = { { 0, I18N_NOOP("Array"), 0x110000 } }; -Coff::Symbol::Symbol(const Object &object, const QByteArray &data, uint start, - uint stringTableOffset, const QString &lastFilename, Log::Base &log) +Coff::Symbol::Symbol(const Object &object, const TQByteArray &data, uint start, + uint stringTableOffset, const TQString &lastFilename, Log::Base &log) : BaseSymbol(object) { uint offset = start; - Q_UINT32 v; + TQ_UINT32 v; if ( !getName(data, offset, 8, stringTableOffset, log, _name) ) return; if ( !getULong(data, offset, 4, log, v) ) return; _value = v; @@ -212,7 +212,7 @@ Coff::Symbol::Symbol(const Object &object, const QByteArray &data, uint start, else if ( _name==".ident" ) auxType = AuxSymbolType::Identifier; else if ( _sclass==SymbolClass::Filename ) auxType = AuxSymbolType::File; else if ( _sclass==SymbolClass::Section ) auxType = AuxSymbolType::Section; - if ( auxType!=AuxSymbolType::Nb_Types && nbAux==0 ) log.log(Log::LineType::Warning, i18n("Symbol without needed auxilliary symbol (type=%1)").arg(auxType.type())); + if ( auxType!=AuxSymbolType::Nb_Types && nbAux==0 ) log.log(Log::LineType::Warning, i18n("Symbol without needed auxilliary symbol (type=%1)").tqarg(auxType.type())); Q_ASSERT( (offset-start)==object.size(SymbolSize) ); _aux.resize(nbAux); for (uint i=0; i<nbAux; i++) { @@ -238,21 +238,21 @@ Coff::SymbolSectionType Coff::Symbol::sectionType() const //---------------------------------------------------------------------------- Coff::Relocation::Relocation(const Object &object, const Section §ion, - const QByteArray &data, uint start, Log::Base &log) + const TQByteArray &data, uint start, Log::Base &log) : Element(object), _symbol(0) { uint offset = start; - Q_UINT32 v; + TQ_UINT32 v; if ( !getULong(data, offset, 4, log, v) ) return; _address = v; - if ( _address>section.size() ) log.log(Log::LineType::Warning, i18n("Relocation address beyong section size: %1/%2").arg(v).arg(section.size())); + if ( _address>section.size() ) log.log(Log::LineType::Warning, i18n("Relocation address beyong section size: %1/%2").tqarg(v).tqarg(section.size())); if ( !getULong(data, offset, 4, log, v) ) return; if ( v>=object.nbSymbols() ) { - log.log(Log::LineType::Error, i18n("Relocation has unknown symbol: %1").arg(v)); + log.log(Log::LineType::Error, i18n("Relocation has unknown symbol: %1").tqarg(v)); return; } if ( object.symbol(v)->isAuxSymbol() ) { - log.log(Log::LineType::Error, i18n("Relocation is an auxiliary symbol: %1").arg(v)); + log.log(Log::LineType::Error, i18n("Relocation is an auxiliary symbol: %1").tqarg(v)); return; } _symbol = static_cast<const Symbol *>(object.symbol(v)); @@ -267,11 +267,11 @@ Coff::Relocation::Relocation(const Object &object, const Section §ion, //---------------------------------------------------------------------------- Coff::CodeLine::CodeLine(const Object &object, const Section §ion, - const QByteArray &data, uint start, const QString &lastFilename, Log::Base &log) + const TQByteArray &data, uint start, const TQString &lastFilename, Log::Base &log) : Element(object), _section(section), _symbol(0) { uint offset = start; - Q_UINT32 v; + TQ_UINT32 v; if ( !getULong(data, offset, 4, log, v) ) return; uint tmp = v; if ( object.format()==Format::PIC30 ) { @@ -283,11 +283,11 @@ Coff::CodeLine::CodeLine(const Object &object, const Section §ion, //qDebug("code line %i: %s", _line, toHexLabel(_address, nbChars(_address)).latin1()); } else { if ( tmp>=object.nbSymbols() ) { - log.log(Log::LineType::Error, i18n("Codeline has unknown symbol: %1").arg(tmp)); + log.log(Log::LineType::Error, i18n("Codeline has unknown symbol: %1").tqarg(tmp)); return; } if ( object.symbol(tmp)->isAuxSymbol() ) { - log.log(Log::LineType::Error, i18n("Codeline is an auxiliary symbol: %1").arg(tmp)); + log.log(Log::LineType::Error, i18n("Codeline is an auxiliary symbol: %1").tqarg(tmp)); return; } _symbol = static_cast<const Symbol *>(object.symbol(tmp)); @@ -296,11 +296,11 @@ Coff::CodeLine::CodeLine(const Object &object, const Section §ion, } } else { if ( tmp>=object.nbSymbols() ) { - log.log(Log::LineType::Error, i18n("Codeline has unknown symbol: %1").arg(tmp)); + log.log(Log::LineType::Error, i18n("Codeline has unknown symbol: %1").tqarg(tmp)); return; } if ( object.symbol(tmp)->isAuxSymbol() ) { - log.log(Log::LineType::Error, i18n("Codeline is an auxiliary symbol: %1").arg(tmp)); + log.log(Log::LineType::Error, i18n("Codeline is an auxiliary symbol: %1").tqarg(tmp)); return; } _symbol = static_cast<const Symbol *>(object.symbol(tmp)); @@ -318,7 +318,7 @@ Coff::CodeLine::CodeLine(const Object &object, const Section §ion, } // if ( _symbol && _symbol->_class!=Symbol::CFile ) // log.log(Log::LineType::Warning, i18n("Line without file symbol associated (%1:%2 %3).") -// .arg(_section._name).arg(toHexLabel(_address, nbChars(_address))).arg(_symbol->_class)); +// .tqarg(_section._name).tqarg(toHexLabel(_address, nbChars(_address))).tqarg(_symbol->_class)); } //---------------------------------------------------------------------------- @@ -333,17 +333,17 @@ const Coff::SectionType::Data Coff::SectionType::DATA[Nb_Types] = { }; Coff::Section::Section(const Device::Data &device, const Object &object, - const QByteArray &data, uint start, uint stringTableOffset, Log::Base &log) + const TQByteArray &data, uint start, uint stringTableOffset, Log::Base &log) : Element(object) { uint offset = start; - Q_UINT32 v; + TQ_UINT32 v; if ( !getName(data, offset, 8, stringTableOffset, log, _name) ) return; if ( !getULong(data, offset, 4, log, v) ) return; _address = v; if ( !getULong(data, offset, 4, log, v) ) return; //if ( _address!=v ) log.log(Log::LineType::Warning, i18n("Virtual address (%1) does not match physical address (%2) in %3.") - // .arg(toHexLabel(v, 4)).arg(toHexLabel(_address, 4)).arg(_name)); + // .tqarg(toHexLabel(v, 4)).tqarg(toHexLabel(_address, 4)).tqarg(_name)); if ( !getULong(data, offset, 4, log, v) ) return; _size = v; if ( !getULong(data, offset, 4, log, v) ) return; @@ -386,7 +386,7 @@ Coff::Section::Section(const Device::Data &device, const Object &object, buffer[0] = 0; BitValue op2 = ((i+1)<nbWords ? _instructions[address+inc].value : 0); uint nbop = disassemble(op.toUInt(), op2.toUInt(), address.toUInt()/inc, pdata.architecture(), buffer, 512); - _instructions[address].disasm = QString(buffer); + _instructions[address].disasm = TQString(buffer); _instructions[address].opcode = toHex(op, pdata.nbCharsWord(Pic::MemoryRangeType::Code)); if ( nbop==2 ) { _instructions[address+inc].opcode = toHex(op2, pdata.nbCharsWord(Pic::MemoryRangeType::Code)); @@ -394,7 +394,7 @@ Coff::Section::Section(const Device::Data &device, const Object &object, } //qDebug(" %s: %s (%s %s)", toHex(address, 4).data(), _data[address].disasm.data(), _data[address].opcode.data(), (nbop==2 ? _data[address+inc].opcode.data() : "")); } else if ( _flags & FDataRom ) _instructions[address].opcode = toHex(op, 4); - else if ( _flags & FData ) _instructions[address].opcode = toHex(op.maskWith(0xFF), 2); + else if ( _flags & FData ) _instructions[address].opcode = toHex(op.tqmaskWith(0xFF), 2); } } @@ -410,7 +410,7 @@ Coff::Section::Section(const Device::Data &device, const Object &object, // read line numbers if ( lineNumberOffset!=0 ) { - QString lastFilename; + TQString lastFilename; _lines.resize(nbLineNumbers); for (uint i=0; i<nbLineNumbers; i++) { _lines[i] = new CodeLine(object, *this, data, lineNumberOffset, lastFilename, log); @@ -447,35 +447,35 @@ Coff::Object::Object(const Device::Data *device, const PURL::Url &url) bool Coff::Object::parse(Log::Base &log) { // header - QByteArray data; + TQByteArray data; uint offset = 0; if ( !initParse(CoffType::Object, data, offset, log) ) return false; if ( _format==Format::Nb_Types ) { - log.log(Log::LineType::Error, i18n("COFF format not supported: magic number is %1.").arg(toHexLabel(_magic, 4))); + log.log(Log::LineType::Error, i18n("COFF format not supported: magic number is %1.").tqarg(toHexLabel(_magic, 4))); return false; } - log.log(Log::DebugLevel::Extra, QString("COFF format: %1").arg(toHexLabel(_magic, 4))); + log.log(Log::DebugLevel::Extra, TQString("COFF format: %1").tqarg(toHexLabel(_magic, 4))); if ( !parseHeader(data, offset, log) ) return false; // optionnal header Q_ASSERT( offset==size(HeaderSize) ); if ( !getULong(data, offset, 2, log, _optHeaderMagic) ) return false; - log.log(Log::DebugLevel::Extra, QString("COFF optionnal header format: %1").arg(toHexLabel(_optHeaderMagic, 4))); + log.log(Log::DebugLevel::Extra, TQString("COFF optionnal header format: %1").tqarg(toHexLabel(_optHeaderMagic, 4))); _optHeaderFormat = OptHeaderFormat::Nb_Types; uint i = 0; for (; OPT_HEADER_DATA[i].optHeaderFormat!=OptHeaderFormat::Nb_Types; i++) if ( _optHeaderMagic==OPT_HEADER_DATA[i].magic ) break; _optHeaderFormat = OPT_HEADER_DATA[i].optHeaderFormat; if ( _optHeaderFormat==OptHeaderFormat::Nb_Types ) { - log.log(Log::LineType::Warning, i18n("Optional header format not supported: magic number is %1.").arg(toHexLabel(_optHeaderMagic, 4))); + log.log(Log::LineType::Warning, i18n("Optional header format not supported: magic number is %1.").tqarg(toHexLabel(_optHeaderMagic, 4))); offset += size(OptHeaderSize)-2; } else if ( !OPT_HEADER_DATA[i].parsed ) { - log.log(Log::DebugLevel::Normal, QString("Optional header not parsed: magic number is %1.").arg(toHexLabel(_optHeaderMagic, 4))); + log.log(Log::DebugLevel::Normal, TQString("Optional header not parsed: magic number is %1.").tqarg(toHexLabel(_optHeaderMagic, 4))); offset += size(OptHeaderSize)-2; } else if ( !parseOptionnalHeader(data, offset, log) ) return false; // parse symbol table uint stringTableOffset = _symbolOffset + _nbSymbols*size(SymbolSize); - QString lastFilename; + TQString lastFilename; _symbols.resize(_nbSymbols); for (uint i=0; i<_nbSymbols; i++) { Symbol *s = new Symbol(*this, data, _symbolOffset, stringTableOffset, lastFilename, log); @@ -503,8 +503,8 @@ bool Coff::Object::parse(Log::Base &log) // extract filenames for (uint i=0; i<_nbSymbols; i++) { if ( _symbols[i]==0 || _symbols[i]->isAuxSymbol() ) continue; - QString s = static_cast<const Symbol *>(_symbols[i])->filename(); - if ( s.isEmpty() || s=="fake" || _filenames.contains(s) ) continue; + TQString s = static_cast<const Symbol *>(_symbols[i])->filename(); + if ( s.isEmpty() || s=="fake" || _filenames.tqcontains(s) ) continue; _filenames.append(s); } @@ -514,7 +514,7 @@ bool Coff::Object::parse(Log::Base &log) const Symbol *sym = static_cast<const Symbol *>(_symbols[i]); if ( sym->symbolClass()!=SymbolClass::Static ) continue; if ( sym->sectionType()!=SymbolSectionType::InsideSection ) continue; - QString name = sym->name(); + TQString name = sym->name(); if ( name.startsWith("_$_") || name.startsWith("__") || name.startsWith(".") ) continue; // special variables (?) _variables[name] = sym->value() & 0xFFF; // #### ?? } @@ -522,9 +522,9 @@ bool Coff::Object::parse(Log::Base &log) return true; } -bool Coff::Object::parseHeader(const QByteArray &data, uint &offset, Log::Base &log) +bool Coff::Object::parseHeader(const TQByteArray &data, uint &offset, Log::Base &log) { - Q_UINT32 v; + TQ_UINT32 v; if ( !getULong(data, offset, 2, log, v) ) return false; _nbSections = v; if ( !getULong(data, offset, 4, log, v) ) return false; @@ -535,7 +535,7 @@ bool Coff::Object::parseHeader(const QByteArray &data, uint &offset, Log::Base & _nbSymbols = v; if ( !getULong(data, offset, 2, log, v) ) return false; if ( v!=size(OptHeaderSize) ) { - log.log(Log::LineType::Error, i18n("Optionnal header size is not %1: %2").arg(size(OptHeaderSize)).arg(v)); + log.log(Log::LineType::Error, i18n("Optionnal header size is not %1: %2").tqarg(size(OptHeaderSize)).tqarg(v)); return false; } if ( !getULong(data, offset, 2, log, v) ) return false; @@ -543,9 +543,9 @@ bool Coff::Object::parseHeader(const QByteArray &data, uint &offset, Log::Base & return true; } -bool Coff::Object::parseOptionnalHeader(const QByteArray &data, uint &offset, Log::Base &log) +bool Coff::Object::parseOptionnalHeader(const TQByteArray &data, uint &offset, Log::Base &log) { - Q_UINT32 v; + TQ_UINT32 v; int nb = (_format==Format::NewMicrochip ? 4 : 2); if ( !getULong(data, offset, nb, log, v) ) return false; // version stamp if ( _format==Format::PIC30 ) { @@ -560,24 +560,24 @@ bool Coff::Object::parseOptionnalHeader(const QByteArray &data, uint &offset, Lo if ( !getULong(data, offset, 4, log, v) ) return false; // #### at least for C18 compiler, it can be compiled for generic processor: in such case // the pic type will be 18C452 in non-extended mode and 18F4620 for extended mode... - QString name = Coff::findId(v); - log.log(Log::DebugLevel::Normal, QString("Device name: \"%1\"").arg(name)); + TQString name = Coff::findId(v); + log.log(Log::DebugLevel::Normal, TQString("Device name: \"%1\"").tqarg(name)); if ( name.isEmpty() ) { - log.log(Log::DebugLevel::Normal, QString("Unknown processor type: %1").arg(toHexLabel(v, 4))); - log.log(Log::LineType::Error, i18n("Could not determine processor (%1).").arg(toHexLabel(v, 4))); + log.log(Log::DebugLevel::Normal, TQString("Unknown processor type: %1").tqarg(toHexLabel(v, 4))); + log.log(Log::LineType::Error, i18n("Could not determine processor (%1).").tqarg(toHexLabel(v, 4))); return false; } else if ( _device==0 ) _device = Device::lister().data(name); - else if ( name!=_device->name() ) log.log(Log::DebugLevel::Normal, QString("Different processor name: %1").arg(name)); + else if ( name!=_device->name() ) log.log(Log::DebugLevel::Normal, TQString("Different processor name: %1").tqarg(name)); if ( !getULong(data, offset, 4, log, v) ) return false; const Pic::Data *pdata = static_cast<const Pic::Data *>(_device); if (pdata) { uint nbBits = pdata->nbBitsWord(Pic::MemoryRangeType::Code) / pdata->addressIncrement(Pic::MemoryRangeType::Code); - if ( v!=nbBits ) log.log(Log::DebugLevel::Normal, QString("Rom width is not %1: %2").arg(nbBits).arg(v)); + if ( v!=nbBits ) log.log(Log::DebugLevel::Normal, TQString("Rom width is not %1: %2").tqarg(nbBits).tqarg(v)); } if ( !getULong(data, offset, 4, log, v) ) return false; if (pdata) { uint nbBits = pdata->registersData().nbBits(); - if ( v!=nbBits ) log.log(Log::DebugLevel::Normal, QString("Ram width is not %1: %2").arg(nbBits).arg(v)); + if ( v!=nbBits ) log.log(Log::DebugLevel::Normal, TQString("Ram width is not %1: %2").tqarg(nbBits).tqarg(v)); } } return true; @@ -589,18 +589,18 @@ Coff::Object::~Object() for (uint i=0; i<nbSections(); i++) delete _sections[i]; } -QString Coff::Object::variableName(Address address) const +TQString Coff::Object::variableName(Address address) const { - QMap<QString, Address>::const_iterator it; + TQMap<TQString, Address>::const_iterator it; for (it=_variables.begin(); it!=_variables.end(); ++it) if ( it.data()==address ) return it.key(); - return QString::null; + return TQString(); } //---------------------------------------------------------------------------- -QValueVector<Pic::RegisterNameData> Pic::sfrList(const Pic::Data &data) +TQValueVector<Pic::RegisterNameData> Pic::sfrList(const Pic::Data &data) { - QValueVector<Pic::RegisterNameData> list; + TQValueVector<Pic::RegisterNameData> list; const Pic::RegistersData &rdata = data.registersData(); for (uint i=0; i<rdata.nbRegisters(); i++) { uint address = rdata.nbBytes() * i; @@ -610,7 +610,7 @@ QValueVector<Pic::RegisterNameData> Pic::sfrList(const Pic::Data &data) Register::TypeData rtd(address, rdata.nbChars()); if ( type==Pic::Sfr ) list.append(Pic::RegisterNameData(rdata.label(address), rtd)); } - QMap<QString, Pic::CombinedData>::const_iterator it; + TQMap<TQString, Pic::CombinedData>::const_iterator it; for (it=rdata.combined.begin(); it!=rdata.combined.end(); ++it) { Register::TypeData td(it.key(), it.data().address, it.data().nbChars); list.append(Pic::RegisterNameData(it.key(), td)); @@ -621,9 +621,9 @@ QValueVector<Pic::RegisterNameData> Pic::sfrList(const Pic::Data &data) return list; } -QValueVector<Pic::RegisterNameData> Pic::gprList(const Pic::Data &data, const Coff::Object *coff) +TQValueVector<Pic::RegisterNameData> Pic::gprList(const Pic::Data &data, const Coff::Object *coff) { - QValueVector<Pic::RegisterNameData> list; + TQValueVector<Pic::RegisterNameData> list; const Pic::RegistersData &rdata = data.registersData(); for (uint i=0; i<rdata.nbRegisters(); i++) { uint address = rdata.nbBytes() * i; @@ -631,9 +631,9 @@ QValueVector<Pic::RegisterNameData> Pic::gprList(const Pic::Data &data, const Co Device::RegisterProperties rp = rdata.properties(address); if ( !(rp & Device::Readable) ) continue; if (type==Pic::Gpr ) { - QString s = toHexLabel(address, rdata.nbCharsAddress()); + TQString s = toHexLabel(address, rdata.nbCharsAddress()); if (coff) { - QString name = coff->variableName(address); + TQString name = coff->variableName(address); if ( !name.isEmpty() ) s += " (" + name + ")"; } Register::TypeData rtd(address, rdata.nbChars()); @@ -643,12 +643,12 @@ QValueVector<Pic::RegisterNameData> Pic::gprList(const Pic::Data &data, const Co return list; } -QValueVector<Pic::RegisterNameData> Pic::variableList(const Pic::Data &data, const Coff::Object &coff) +TQValueVector<Pic::RegisterNameData> Pic::variableList(const Pic::Data &data, const Coff::Object &coff) { - QValueVector<Pic::RegisterNameData> list; + TQValueVector<Pic::RegisterNameData> list; const Pic::RegistersData &rdata = data.registersData(); - QMap<QString, Address> variables = coff.variables(); - QMap<QString, Address>::const_iterator vit; + TQMap<TQString, Address> variables = coff.variables(); + TQMap<TQString, Address>::const_iterator vit; for (vit=variables.begin(); vit!=variables.end(); ++vit) { Register::TypeData rtd(vit.data(), rdata.nbChars()); list.append(Pic::RegisterNameData(vit.key() + " (" + toHexLabel(vit.data(), rdata.nbCharsAddress()) + ")", rtd)); |