diff options
Diffstat (limited to 'src/devices/pic/prog/pic_debug.cpp')
| -rw-r--r-- | src/devices/pic/prog/pic_debug.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/devices/pic/prog/pic_debug.cpp b/src/devices/pic/prog/pic_debug.cpp index 443bb10..ebdcd75 100644 --- a/src/devices/pic/prog/pic_debug.cpp +++ b/src/devices/pic/prog/pic_debug.cpp @@ -13,14 +13,14 @@ #include "progs/manager/debug_manager.h" //---------------------------------------------------------------------------- -Register::TypeData Debugger::PicBase::registerTypeData(const QString &name) const +Register::TypeData Debugger::PicBase::registerTypeData(const TQString &name) const { const Pic::RegistersData &rdata = device()->registersData(); - Q_ASSERT(rdata.sfrs.contains(name)); + Q_ASSERT(rdata.sfrs.tqcontains(name)); return Register::TypeData(rdata.sfrs[name].address, rdata.nbChars()); } -bool Debugger::PicBase::updatePortStatus(uint index, QMap<uint, Device::PortBitData> &bits) +bool Debugger::PicBase::updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits) { const Pic::RegistersData &rdata = device()->registersData(); BitValue tris; @@ -65,7 +65,7 @@ const Debugger::PicBase &Debugger::PicSpecific::base() const return static_cast<PicBase &>(_base); } -bool Debugger::PicSpecific::updateStatus() +bool Debugger::PicSpecific::updatetqStatus() { if ( !Debugger::manager->readRegister(base().pcTypeData()) ) return false; if ( !Debugger::manager->readRegister(base().registerTypeData("STATUS")) ) return false; @@ -79,22 +79,22 @@ Register::TypeData Debugger::P16FSpecific::wregTypeData() const return Register::TypeData("WREG", device().registersData().nbChars()); } -QString Debugger::P16FSpecific::statusString() const +TQString Debugger::P16FSpecific::statusString() const { const Pic::RegistersData &rdata = device().registersData(); BitValue status = Register::list().value(base().registerTypeData("STATUS")); uint bank = (status.bit(5) ? 1 : 0) + (status.bit(6) ? 2 : 0); BitValue wreg = Register::list().value(wregTypeData()); - return QString("W:%1 %2 %3 %4 PC:%5 Bank:%6") - .arg(toHexLabel(wreg, rdata.nbChars())).arg(status.bit(2) ? "Z" : "z") - .arg(status.bit(1) ? "DC" : "dc").arg(status.bit(0) ? "C" : "c") - .arg(toHexLabel(_base.pc(), device().nbCharsAddress())).arg(bank); + return TQString("W:%1 %2 %3 %4 PC:%5 Bank:%6") + .tqarg(toHexLabel(wreg, rdata.nbChars())).tqarg(status.bit(2) ? "Z" : "z") + .tqarg(status.bit(1) ? "DC" : "dc").tqarg(status.bit(0) ? "C" : "c") + .tqarg(toHexLabel(_base.pc(), device().nbCharsAddress())).tqarg(bank); } //---------------------------------------------------------------------------- -bool Debugger::P18FSpecific::updateStatus() +bool Debugger::P18FSpecific::updatetqStatus() { - if ( !PicSpecific::updateStatus() ) return false; + if ( !PicSpecific::updatetqStatus() ) return false; if ( !Debugger::manager->readRegister(base().registerTypeData("BSR")) ) return false; return true; } @@ -104,15 +104,15 @@ Register::TypeData Debugger::P18FSpecific::wregTypeData() const return base().registerTypeData("WREG"); } -QString Debugger::P18FSpecific::statusString() const +TQString Debugger::P18FSpecific::statusString() const { const Pic::RegistersData &rdata = device().registersData(); BitValue status = Register::list().value(base().registerTypeData("STATUS")); BitValue bsr = Register::list().value(base().registerTypeData("BSR")); BitValue wreg = Register::list().value(wregTypeData()); - return QString("W:%1 %2 %3 %4 %5 %6 PC:%7 Bank:%8") - .arg(toHexLabel(wreg, rdata.nbChars())).arg(status.bit(4) ? "N" : "n") - .arg(status.bit(3) ? "OV" : "ov").arg(status.bit(2) ? "Z" : "z") - .arg(status.bit(1) ? "DC" : "dc").arg(status.bit(0) ? "C" : "c") - .arg(toHexLabel(base().pc(), device().nbCharsAddress())).arg(toLabel(bsr)); + return TQString("W:%1 %2 %3 %4 %5 %6 PC:%7 Bank:%8") + .tqarg(toHexLabel(wreg, rdata.nbChars())).tqarg(status.bit(4) ? "N" : "n") + .tqarg(status.bit(3) ? "OV" : "ov").tqarg(status.bit(2) ? "Z" : "z") + .tqarg(status.bit(1) ? "DC" : "dc").tqarg(status.bit(0) ? "C" : "c") + .tqarg(toHexLabel(base().pc(), device().nbCharsAddress())).tqarg(toLabel(bsr)); } |