diff options
Diffstat (limited to 'src/coff')
-rw-r--r-- | src/coff/base/coff_object.cpp | 14 | ||||
-rw-r--r-- | src/coff/base/text_coff.cpp | 2 | ||||
-rw-r--r-- | src/coff/xml/xml_coff_parser.cpp | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/coff/base/coff_object.cpp b/src/coff/base/coff_object.cpp index ee49a95..98f8f3b 100644 --- a/src/coff/base/coff_object.cpp +++ b/src/coff/base/coff_object.cpp @@ -205,7 +205,7 @@ Coff::Symbol::Symbol(const Object &object, const TQByteArray &data, uint start, if ( v==sclass.data().id ) { _sclass = sclass; break; } if ( !getULong(data, offset, 1, log, v) ) return; uint nbAux = v; - //qDebug("symbol: %s value=%s type=%i dtype=%i class=%i nbAux=%i section=%i", _name.latin1(), toHexLabel(_value, 4).latin1(), _type, _dtype, _class, nbAux, _section); + //tqDebug("symbol: %s value=%s type=%i dtype=%i class=%i nbAux=%i section=%i", _name.latin1(), toHexLabel(_value, 4).latin1(), _type, _dtype, _class, nbAux, _section); AuxSymbolType auxType = AuxSymbolType::Nb_Types; if ( _name==".direct" ) auxType = AuxSymbolType::Direct; @@ -262,7 +262,7 @@ Coff::Relocation::Relocation(const Object &object, const Section §ion, } if ( !getULong(data, offset, 2, log, v) ) return; _type = v; - //qDebug("reloc %s: address=%s offset=%i type=%i", _symbol->_name.latin1(), toHexLabel(_address, 4).latin1(), _offset, _type); + //tqDebug("reloc %s: address=%s offset=%i type=%i", _symbol->_name.latin1(), toHexLabel(_address, 4).latin1(), _offset, _type); } //---------------------------------------------------------------------------- @@ -280,7 +280,7 @@ Coff::CodeLine::CodeLine(const Object &object, const Section §ion, if ( _line!=0 ) { _address = tmp; _filename = lastFilename; - //qDebug("code line %i: %s", _line, toHexLabel(_address, nbChars(_address)).latin1()); + //tqDebug("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)); @@ -292,7 +292,7 @@ Coff::CodeLine::CodeLine(const Object &object, const Section §ion, } _symbol = static_cast<const Symbol *>(object.symbol(tmp)); _filename = _symbol->filename(); - //qDebug("code line %i: %s", _line, _symbol->_name.latin1()); + //tqDebug("code line %i: %s", _line, _symbol->_name.latin1()); } } else { if ( tmp>=object.nbSymbols() ) { @@ -314,7 +314,7 @@ Coff::CodeLine::CodeLine(const Object &object, const Section §ion, // flags if ( !getULong(data, offset, 4, log, v) ) return; // function index - //qDebug("code line %i: %s", _line, toHexLabel(_address, nbChars(_address)).latin1()); + //tqDebug("code line %i: %s", _line, toHexLabel(_address, nbChars(_address)).latin1()); } // if ( _symbol && _symbol->_class!=Symbol::CFile ) // log.log(Log::LineType::Warning, i18n("Line without file symbol associated (%1:%2 %3).") @@ -362,7 +362,7 @@ Coff::Section::Section(const Device::Data &device, const Object &object, // read data Q_ASSERT ( device.group().name()=="pic" ); const Pic::Data &pdata = static_cast<const Pic::Data &>(device); - //qDebug("section %s: address=%s size=%i flags=%i", _name.data(), toHexLabel(_address, 4).latin1(), _size, int(_flags)); + //tqDebug("section %s: address=%s size=%i flags=%i", _name.data(), toHexLabel(_address, 4).latin1(), _size, int(_flags)); if ( _size!=0 && dataOffset!=0 ) { uint inc = 1; uint nbWords = _size; @@ -392,7 +392,7 @@ Coff::Section::Section(const Device::Data &device, const Object &object, _instructions[address+inc].opcode = toHex(op2, pdata.nbCharsWord(Pic::MemoryRangeType::Code)); i++; } - //qDebug(" %s: %s (%s %s)", toHex(address, 4).data(), _data[address].disasm.data(), _data[address].opcode.data(), (nbop==2 ? _data[address+inc].opcode.data() : "")); + //tqDebug(" %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); } diff --git a/src/coff/base/text_coff.cpp b/src/coff/base/text_coff.cpp index 1ddeb30..d8eba7b 100644 --- a/src/coff/base/text_coff.cpp +++ b/src/coff/base/text_coff.cpp @@ -100,7 +100,7 @@ void Coff::TextObject::init() const const Section *sec = section(*lines[k]); if (sec) { ldata.codes[k].opcode = "0x" + sec->instructions()[address].opcode.upper(); - //qDebug("%s: %s", ldata.codes[k].address.latin1(), ldata.codes[k].opcode.latin1()); + //tqDebug("%s: %s", ldata.codes[k].address.latin1(), ldata.codes[k].opcode.latin1()); opcodeWidth = qMax(opcodeWidth, uint(ldata.codes[k].opcode.length())); TQString s = sec->instructions()[address].disasm; int j = s.find('\t'); diff --git a/src/coff/xml/xml_coff_parser.cpp b/src/coff/xml/xml_coff_parser.cpp index 556cdb0..9b915bf 100644 --- a/src/coff/xml/xml_coff_parser.cpp +++ b/src/coff/xml/xml_coff_parser.cpp @@ -35,14 +35,14 @@ private: void Coff::XmlToData::parseData(TQDomElement element, Data &data) { TQStringList list = TQStringList::split(' ', element.attribute("id")); - if ( list.isEmpty() ) qFatal("Missing id"); - if ( list.count()>MAX_NB_IDS ) qFatal("Please raise MAX_NB_IDS"); + if ( list.isEmpty() ) tqFatal("Missing id"); + if ( list.count()>MAX_NB_IDS ) tqFatal("Please raise MAX_NB_IDS"); for (uint i=0; i<MAX_NB_IDS; i++) { if ( i<uint(list.count()) ) { bool ok; data.ids[i] = fromHexLabel(list[i], 4, &ok); - if ( !ok ) qFatal("Invalid id"); - //if ( _ids.contains(data.ids[i]) ) qFatal("Duplicated id"); + if ( !ok ) tqFatal("Invalid id"); + //if ( _ids.contains(data.ids[i]) ) tqFatal("Duplicated id"); //_ids[data.ids[i]] = true; } else data.ids[i] = 0; } @@ -93,19 +93,19 @@ void Coff::XmlToData::parse() case Pic::Architecture::P33F: continue; case Pic::Architecture::Nb_Types: Q_ASSERT(false); continue; } - if ( !hasDevice(data->name()) ) qWarning("No id for device %s", data->name().latin1()); + if ( !hasDevice(data->name()) ) tqWarning("No id for device %s", data->name().latin1()); } // extract COFF id from gputils for (uint i=0; pics[i].tag!=no_processor; i++) { _current = TQString(pics[i].names[2]).upper(); if ( !Device::lister().isSupported(_current) ) continue; - if ( !hasDevice(_current) ) qDebug(">> add new id %s: %s", _current.latin1(), toHexLabel(pics[i].coff_type, 4).latin1()); + if ( !hasDevice(_current) ) tqDebug(">> add new id %s: %s", _current.latin1(), toHexLabel(pics[i].coff_type, 4).latin1()); else { bool ok = false; for (uint k=0; k<MAX_NB_IDS; k++) if ( _map[_current].data.ids[k]==pics[i].coff_type ) ok = true; - if ( !ok ) qFatal(TQString("Different ids")); + if ( !ok ) tqFatal(TQString("Different ids")); } } } |