diff options
Diffstat (limited to 'src/progs/sdcdb/base')
| -rw-r--r-- | src/progs/sdcdb/base/sdcdb_debug.cpp | 64 | ||||
| -rw-r--r-- | src/progs/sdcdb/base/sdcdb_debug.h | 19 |
2 files changed, 42 insertions, 41 deletions
diff --git a/src/progs/sdcdb/base/sdcdb_debug.cpp b/src/progs/sdcdb/base/sdcdb_debug.cpp index fcccf22..d8d4ad4 100644 --- a/src/progs/sdcdb/base/sdcdb_debug.cpp +++ b/src/progs/sdcdb/base/sdcdb_debug.cpp @@ -9,7 +9,7 @@ #include "gpsim_debug.h" #include <signal.h> -#include <qregexp.h> +#include <tqregexp.h> #include "devices/list/device_list.h" #include "devices/pic/pic/pic_debug.h" @@ -52,10 +52,10 @@ bool GPSim::Debugger::internalStep() return hardware()->execute("step", true); } -bool GPSim::Debugger::setBreakpoints(const QValueList<Address> &list) +bool GPSim::Debugger::setBreakpoints(const TQValueList<Address> &list) { for (uint i=0; i<_nbBreakpoints; i++) - if ( !hardware()->execute("clear " + QString::number(i), true) ) return false; + if ( !hardware()->execute("clear " + TQString::number(i), true) ) return false; for (uint i=0; i<uint(list.count()); i++) if ( !hardware()->execute("break e 0x" + toHex(list[i], nbChars(list[i].toUInt())), true) ) return false; _nbBreakpoints = list.count(); @@ -75,15 +75,15 @@ bool GPSim::Debugger::updateState() return true; } -bool GPSim::Debugger::findRegExp(const QStringList &lines, const QString &pattern, - const QString &label, QString &value) const +bool GPSim::Debugger::findRegExp(const TQStringList &lines, const TQString &pattern, + const TQString &label, TQString &value) const { - QRegExp rexp(pattern); + TQRegExp rexp(pattern); uint i = 0; for (; i<uint(lines.count()); i++) { int offset = 0; for (;;) { - offset = rexp.search(lines[i], offset, QRegExp::CaretAtOffset); + offset = rexp.search(lines[i], offset, TQRegExp::CaretAtOffset); if ( offset==-1 || rexp.cap(1)==label ) break; offset += rexp.cap(0).length(); } @@ -99,9 +99,9 @@ bool GPSim::Debugger::readWreg(BitValue &value) // #### only known for version 4 and 11 if ( hardware()->version()<=VersionData(0, 21, 7) || hardware()->version()>=VersionData(0, 22, 0) ) return getRegister("W", value); - QStringList lines; + TQStringList lines; if ( !hardware()->execute("dump s", true, &lines) ) return false; - QString s; + TQString s; if ( !findRegExp(lines, "^\\s*[0-9A-Fa-f]+\\s+(\\w+)\\s*=\\s*([0-9A-Fa-f]+)", "W", s) ) { log(Log::Error, i18n("Error reading register \"W\"")); return false; @@ -110,10 +110,10 @@ bool GPSim::Debugger::readWreg(BitValue &value) return true; } -bool GPSim::Debugger::getRegister(const QString &name, BitValue &value) +bool GPSim::Debugger::getRegister(const TQString &name, BitValue &value) { - QStringList lines; - QRegExp r; + TQStringList lines; + TQRegExp r; if ( hardware()->version()<VersionData(0, 22, 0) ) { if ( !hardware()->execute("x " + name, true, &lines) ) return false; r.setPattern("\\w+\\s*[][\\w]+\\s*=\\s*(?:0x|)([0-9A-Fa-f]+)(?:\\W.*|)"); @@ -125,7 +125,7 @@ bool GPSim::Debugger::getRegister(const QString &name, BitValue &value) for (; i<uint(lines.count()); i++) if ( r.exactMatch(lines[i]) ) break; if ( i==uint(lines.count()) ) { - log(Log::Error, i18n("Error reading register \"%1\"").arg(name)); + log(Log::Error, i18n("Error reading register \"%1\"").tqarg(name)); return false; } value = fromHex(r.cap(1), 0); @@ -135,9 +135,9 @@ bool GPSim::Debugger::getRegister(const QString &name, BitValue &value) bool GPSim::Debugger::getRegister(Address address, BitValue &value) { const Pic::RegistersData &rdata = device()->registersData(); - QString name = toHex(address, rdata.nbCharsAddress()); + TQString name = toHex(address, rdata.nbCharsAddress()); if ( hardware()->version()<VersionData(0, 22, 0) ) return getRegister("0x" + name, value); - return getRegister(QString("ramData[$%1]").arg(name), value); + return getRegister(TQString("ramData[$%1]").tqarg(name), value); } bool GPSim::Debugger::readRegister(const Register::TypeData &data, BitValue &value) @@ -148,27 +148,27 @@ bool GPSim::Debugger::readRegister(const Register::TypeData &data, BitValue &val Q_ASSERT(false); return true; } - QString name = device()->registersData().sfrNames[data.address()]; + TQString name = device()->registersData().sfrNames[data.address()]; if ( name=="WREG" ) return readWreg(value); if ( !name.isEmpty() ) return getRegister(name.lower(), value); return getRegister(data.address(), value); } -bool GPSim::Debugger::setRegister(const QString &name, BitValue value) +bool GPSim::Debugger::setRegister(const TQString &name, BitValue value) { if ( hardware()->version()<VersionData(0, 22, 0) ) { log(Log::Warning, i18n("Writing registers is not supported by this version of gpsim")); return true; } const Pic::RegistersData &rdata = device()->registersData(); - QString s = QString("%1 = %2").arg(name).arg(toHexLabel(value, rdata.nbChars())); + TQString s = TQString("%1 = %2").tqarg(name).tqarg(toHexLabel(value, rdata.nbChars())); return hardware()->execute(s, true); } bool GPSim::Debugger::setRegister(Address address, BitValue value) { const Pic::RegistersData &rdata = device()->registersData(); - QString s = QString("ramData[$%1]").arg(toHex(address, rdata.nbCharsAddress())); + TQString s = TQString("ramData[$%1]").tqarg(toHex(address, rdata.nbCharsAddress())); return setRegister(s, value); } @@ -184,7 +184,7 @@ bool GPSim::Debugger::writeRegister(const Register::TypeData &data, BitValue val return false; } const Pic::RegistersData &rdata = device()->registersData(); - QString name = rdata.sfrNames[data.address()]; + TQString name = rdata.sfrNames[data.address()]; if ( !name.isEmpty() ) return setRegister(name.lower(), value); return setRegister(data.address(), value); } @@ -194,16 +194,16 @@ bool GPSim::Debugger::writeWreg(BitValue value) return setRegister("W", value); } -bool GPSim::Debugger::updatePortStatus(uint index, QMap<uint, Device::PortBitData> &bits) +bool GPSim::Debugger::updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits) { for (uint i=0; i<Device::MAX_NB_PORT_BITS; i++) { if ( !device()->registersData().hasPortBit(index, i) ) continue; - QString name = device()->registersData().portName(index).lower() + QString::number(i); - QStringList lines; + TQString name = device()->registersData().portName(index).lower() + TQString::number(i); + TQStringList lines; if ( !hardware()->execute("symbol " + name, true, &lines) ) return false; - QString pattern = "^(\\w+)=([^\\s])+\\s*", value; + TQString pattern = "^(\\w+)=([^\\s])+\\s*", value; if ( !findRegExp(lines, pattern, "bitState", value) || value.length()!=1 ) { - log(Log::Error, i18n("Error reading state of IO bit: %1").arg(name)); + log(Log::Error, i18n("Error reading state of IO bit: %1").tqarg(name)); return false; } switch (value[0].latin1()) { @@ -217,24 +217,24 @@ bool GPSim::Debugger::updatePortStatus(uint index, QMap<uint, Device::PortBitDat case 'X': bits[i].state = Device::Unknown; break; default: bits[i].state = Device::Unknown; - log(Log::Warning, i18n("Unknown state for IO bit: %1 (%2)").arg(name).arg(value)); + log(Log::Warning, i18n("Unknown state for IO bit: %1 (%2)").tqarg(name).tqarg(value)); break; } if ( !findRegExp(lines, pattern, "Driving", value) || value.length()!=1 ) { - log(Log::Error, i18n("Error reading driving state of IO bit: %1").arg(name)); + log(Log::Error, i18n("Error reading driving state of IO bit: %1").tqarg(name)); return false; } bits[i].driving = ( value[0]=='1' ); if (bits[i].driving) { if ( !findRegExp(lines, pattern, "drivingState", value) || value.length()!=1 ) { - log(Log::Error, i18n("Error reading driving state of IO bit: %1").arg(name)); + log(Log::Error, i18n("Error reading driving state of IO bit: %1").tqarg(name)); return false; } bits[i].drivingState = (value[0]=='0' ? Device::IoLow : Device::IoHigh); bits[i].drivenState = Device::IoUnknown; } else { if ( !findRegExp(lines, pattern, "drivenState", value) || value.length()!=1 ) { - log(Log::Error, i18n("Error reading driven state of IO bit: %1").arg(name)); + log(Log::Error, i18n("Error reading driven state of IO bit: %1").tqarg(name)); return false; } bits[i].drivenState = (value[0]=='0' ? Device::IoLow : Device::IoHigh); @@ -245,7 +245,7 @@ bool GPSim::Debugger::updatePortStatus(uint index, QMap<uint, Device::PortBitDat } //---------------------------------------------------------------------------- -QString GPSim::Group::statusLabel() const +TQString GPSim::Group::statusLabel() const { return i18n("GPSim (4MHz)"); // #### FIXME: add config } @@ -258,9 +258,9 @@ void GPSim::Group::initSupported() if ( !manager.getVersion(version) ) return; bool oldGpsim = ( version<VersionData(0, 21, 11) ); if ( !manager.sendCommand("processor list", true) ) return; - QStringList devices = QStringList::split(" ", manager.process().sout().join(" ")); + TQStringList devices = TQStringList::split(" ", manager.process().sout().join(" ")); for (uint i=0; i<uint(devices.count()); i++) { - QString s = devices[i].upper(); + TQString s = devices[i].upper(); if ( s.startsWith("PIC") ) s = s.mid(3); const Pic::Data *data = static_cast<const Pic::Data *>(Device::lister().data(s)); if (data) { diff --git a/src/progs/sdcdb/base/sdcdb_debug.h b/src/progs/sdcdb/base/sdcdb_debug.h index 55cda75..e1f109b 100644 --- a/src/progs/sdcdb/base/sdcdb_debug.h +++ b/src/progs/sdcdb/base/sdcdb_debug.h @@ -19,6 +19,7 @@ namespace SDCDB class Programmer : public ::Programmer::PicBase { Q_OBJECT + TQ_OBJECT public: Programmer(const ::Programmer::Group &group, const Pic::Data *data) : Programmer::PicBase(group, data, "sdcdb_programmer") {} @@ -41,18 +42,18 @@ class Debugger : public ::Debugger::PicBase { public: Debugger(Programmer &programmer); - virtual bool setBreakpoints(const QValueList<Address> &list); + virtual bool setBreakpoints(const TQValueList<Address> &list); virtual bool readRegister(const Register::TypeData &data, BitValue &value); virtual bool writeRegister(const Register::TypeData &data, BitValue value); - virtual bool updatePortStatus(uint index, QMap<uint, Device::PortBitData> &bits); + virtual bool updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits); private: uint _nbBreakpoints; - bool findRegExp(const QStringList &lines, const QString &pattern, - const QString &label, QString &value) const; - bool getRegister(const QString &name, BitValue &value); - bool setRegister(const QString &name, BitValue value); + bool findRegExp(const TQStringList &lines, const TQString &pattern, + const TQString &label, TQString &value) const; + bool getRegister(const TQString &name, BitValue &value); + bool setRegister(const TQString &name, BitValue value); bool getRegister(Address address, BitValue &value); bool setRegister(Address address, BitValue value); Hardware *hardware() { return static_cast<Hardware *>(_programmer.hardware()); } @@ -72,9 +73,9 @@ private: class Group : public ::Programmer::PicGroup { public: - virtual QString name() const { return "sdcdb"; } - virtual QString label() const { return i18n("SDCDB"); } - virtual QString statusLabel() const; + virtual TQString name() const { return "sdcdb"; } + virtual TQString label() const { return i18n("SDCDB"); } + virtual TQString statusLabel() const; virtual ::Programmer::Properties properties() const { return ::Programmer::Debugger | ::Programmer::HasConnectedState; } virtual ::Programmer::TargetPowerMode targetPowerMode() const { return ::Programmer::TargetSelfPowered; } virtual bool isPortSupported(Port::Type) const { return false; } |