From 1eca60dac5171d79ed132c837ba7a560dfc0e8d5 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Sat, 6 May 2017 16:52:40 -0230 Subject: [PATCH] Great colon purge Part3: all debugger ROM bankswitch tabs. --- src/debugger/gui/Cart0840Widget.cxx | 4 +- src/debugger/gui/Cart3EPlusWidget.cxx | 6 +- src/debugger/gui/Cart3EWidget.cxx | 8 +- src/debugger/gui/Cart3FWidget.cxx | 2 +- src/debugger/gui/Cart4A50Widget.cxx | 14 +-- src/debugger/gui/CartARWidget.cxx | 4 +- src/debugger/gui/CartBFSCWidget.cxx | 152 ++++++++++++------------- src/debugger/gui/CartBFWidget.cxx | 152 ++++++++++++------------- src/debugger/gui/CartBUSWidget.cxx | 40 +++---- src/debugger/gui/CartCDFWidget.cxx | 4 +- src/debugger/gui/CartCMWidget.cxx | 18 +-- src/debugger/gui/CartCTYWidget.cxx | 22 ++-- src/debugger/gui/CartCVPlusWidget.cxx | 2 +- src/debugger/gui/CartDASHWidget.cxx | 4 +- src/debugger/gui/CartDFSCWidget.cxx | 80 ++++++------- src/debugger/gui/CartDFWidget.cxx | 80 ++++++------- src/debugger/gui/CartDPCPlusWidget.cxx | 46 ++++---- src/debugger/gui/CartDPCWidget.cxx | 34 +++--- src/debugger/gui/CartE0Widget.cxx | 26 ++--- src/debugger/gui/CartE7Widget.cxx | 14 +-- src/debugger/gui/CartEFSCWidget.cxx | 44 +++---- src/debugger/gui/CartEFWidget.cxx | 44 +++---- src/debugger/gui/CartF0Widget.cxx | 6 +- src/debugger/gui/CartF4SCWidget.cxx | 26 ++--- src/debugger/gui/CartF4Widget.cxx | 26 ++--- src/debugger/gui/CartF6SCWidget.cxx | 18 +-- src/debugger/gui/CartF6Widget.cxx | 18 +-- src/debugger/gui/CartF8SCWidget.cxx | 16 +-- src/debugger/gui/CartF8Widget.cxx | 14 +-- src/debugger/gui/CartFA2Widget.cxx | 30 ++--- src/debugger/gui/CartFAWidget.cxx | 16 +-- src/debugger/gui/CartMCWidget.cxx | 10 +- src/debugger/gui/CartMDMWidget.cxx | 4 +- src/debugger/gui/CartSBWidget.cxx | 4 +- src/debugger/gui/CartUAWidget.cxx | 4 +- src/debugger/gui/CartWDWidget.cxx | 4 +- src/debugger/gui/CartX07Widget.cxx | 4 +- src/debugger/gui/RomWidget.cxx | 2 +- 38 files changed, 501 insertions(+), 501 deletions(-) diff --git a/src/debugger/gui/Cart0840Widget.cxx b/src/debugger/gui/Cart0840Widget.cxx index 1f1fa6762..bb1da1406 100644 --- a/src/debugger/gui/Cart0840Widget.cxx +++ b/src/debugger/gui/Cart0840Widget.cxx @@ -50,8 +50,8 @@ Cartridge0840Widget::Cartridge0840Widget( VarList::push_back(items, "1 ($840)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($800) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } diff --git a/src/debugger/gui/Cart3EPlusWidget.cxx b/src/debugger/gui/Cart3EPlusWidget.cxx index 6098cbbd3..4aafabf2b 100644 --- a/src/debugger/gui/Cart3EPlusWidget.cxx +++ b/src/debugger/gui/Cart3EPlusWidget.cxx @@ -59,7 +59,7 @@ Cartridge3EPlusWidget::Cartridge3EPlusWidget( int xpos_s, ypos_s = ypos; ostringstream label; - label << "Set segment " << i << " as: "; + label << "Set segment " << i << " as "; new StaticTextWidget(boss, _font, xpos, ypos, _font.getStringWidth(label.str()), myFontHeight, label.str(), kTextAlignLeft); @@ -99,7 +99,7 @@ Cartridge3EPlusWidget::Cartridge3EPlusWidget( int xoffset = xpos_s+t->getWidth() + 10; myBankState[2*i] = new EditTextWidget(boss, _font, xoffset, ypos_s, w - xoffset - 10, myLineHeight, ""); - myBankState[2*i]->setEditable(false); + myBankState[2*i]->setEditable(false, true); ypos_s += myLineHeight + 4; label.str(""); @@ -109,7 +109,7 @@ Cartridge3EPlusWidget::Cartridge3EPlusWidget( myBankState[2*i+1] = new EditTextWidget(boss, _font, xoffset, ypos_s, w - xoffset - 10, myLineHeight, ""); - myBankState[2*i+1]->setEditable(false); + myBankState[2*i+1]->setEditable(false, true); xpos = 10; ypos+= 2 * myLineHeight; diff --git a/src/debugger/gui/Cart3EWidget.cxx b/src/debugger/gui/Cart3EWidget.cxx index 849c4d80a..02fa1147b 100644 --- a/src/debugger/gui/Cart3EWidget.cxx +++ b/src/debugger/gui/Cart3EWidget.cxx @@ -71,16 +71,16 @@ Cartridge3EWidget::Cartridge3EWidget( xpos += 40; myROMBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($3E) "), - myLineHeight, romitems, "ROM ($3F): ", - _font.getStringWidth("ROM ($3F): "), kROMBankChanged); + myLineHeight, romitems, "ROM ($3F) ", + _font.getStringWidth("ROM ($3F) "), kROMBankChanged); myROMBank->setTarget(this); addFocusWidget(myROMBank); xpos += myROMBank->getWidth() + 20; myRAMBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($3E) "), - myLineHeight, ramitems, "RAM ($3E): ", - _font.getStringWidth("RAM ($3E): "), kRAMBankChanged); + myLineHeight, ramitems, "RAM ($3E) ", + _font.getStringWidth("RAM ($3E) "), kRAMBankChanged); myRAMBank->setTarget(this); addFocusWidget(myRAMBank); } diff --git a/src/debugger/gui/Cart3FWidget.cxx b/src/debugger/gui/Cart3FWidget.cxx index 9059ca0df..9f7592d1b 100644 --- a/src/debugger/gui/Cart3FWidget.cxx +++ b/src/debugger/gui/Cart3FWidget.cxx @@ -48,7 +48,7 @@ Cartridge3FWidget::Cartridge3FWidget( ostringstream label; label << "Set bank ($" << Common::Base::HEX4 << start << " - $" << - (start+0x7FF) << "): "; + (start+0x7FF) << ") "; myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($3F) "), myLineHeight, items, label.str(), diff --git a/src/debugger/gui/Cart4A50Widget.cxx b/src/debugger/gui/Cart4A50Widget.cxx index 6e94a438c..37aff950f 100644 --- a/src/debugger/gui/Cart4A50Widget.cxx +++ b/src/debugger/gui/Cart4A50Widget.cxx @@ -60,7 +60,7 @@ Cartridge4A50Widget::Cartridge4A50Widget( string highlabel = "Set high 256B region ($FE00 - $FEFF): "; const int lwidth = _font.getStringWidth(middlelabel), fwidth = _font.getStringWidth("Inactive"), - flwidth = _font.getStringWidth("ROM: "); + flwidth = _font.getStringWidth("ROM "); // Lower bank/region configuration xpos = 10; @@ -71,14 +71,14 @@ Cartridge4A50Widget::Cartridge4A50Widget( xpos += 40; myROMLower = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, myLineHeight, - items32, "ROM: ", flwidth, kROMLowerChanged); + items32, "ROM ", flwidth, kROMLowerChanged); myROMLower->setTarget(this); addFocusWidget(myROMLower); xpos += myROMLower->getWidth() + 20; myRAMLower = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, myLineHeight, - items16, "RAM: ", flwidth, kRAMLowerChanged); + items16, "RAM ", flwidth, kRAMLowerChanged); myRAMLower->setTarget(this); addFocusWidget(myRAMLower); @@ -91,14 +91,14 @@ Cartridge4A50Widget::Cartridge4A50Widget( xpos += 40; myROMMiddle = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, myLineHeight, - items32, "ROM: ", flwidth, kROMMiddleChanged); + items32, "ROM ", flwidth, kROMMiddleChanged); myROMMiddle->setTarget(this); addFocusWidget(myROMMiddle); xpos += myROMMiddle->getWidth() + 20; myRAMMiddle = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, myLineHeight, - items16, "RAM: ", flwidth, kRAMMiddleChanged); + items16, "RAM ", flwidth, kRAMMiddleChanged); myRAMMiddle->setTarget(this); addFocusWidget(myRAMMiddle); @@ -111,14 +111,14 @@ Cartridge4A50Widget::Cartridge4A50Widget( xpos += 40; myROMHigh = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, myLineHeight, - items256, "ROM: ", flwidth, kROMHighChanged); + items256, "ROM ", flwidth, kROMHighChanged); myROMHigh->setTarget(this); addFocusWidget(myROMHigh); xpos += myROMHigh->getWidth() + 20; myRAMHigh = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, myLineHeight, - items128, "RAM: ", flwidth, kRAMHighChanged); + items128, "RAM ", flwidth, kRAMHighChanged); myRAMHigh->setTarget(this); addFocusWidget(myRAMHigh); } diff --git a/src/debugger/gui/CartARWidget.cxx b/src/debugger/gui/CartARWidget.cxx index 23ed7f58b..5838dbbae 100644 --- a/src/debugger/gui/CartARWidget.cxx +++ b/src/debugger/gui/CartARWidget.cxx @@ -70,8 +70,8 @@ CartridgeARWidget::CartridgeARWidget( VarList::push_back(items, " 31"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" XX "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } diff --git a/src/debugger/gui/CartBFSCWidget.cxx b/src/debugger/gui/CartBFSCWidget.cxx index ce0dbeb81..8fd17eff2 100644 --- a/src/debugger/gui/CartBFSCWidget.cxx +++ b/src/debugger/gui/CartBFSCWidget.cxx @@ -40,82 +40,82 @@ CartridgeBFSCWidget::CartridgeBFSCWidget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << std::dec << i << " @ $" << Common::Base::HEX4 << (start + 0x100) - << " - " << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << " - " << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; VariantList items; - VarList::push_back(items, " 0 ($F80)"); - VarList::push_back(items, " 1 ($F81)"); - VarList::push_back(items, " 2 ($F82)"); - VarList::push_back(items, " 3 ($F83)"); - VarList::push_back(items, " 4 ($F84)"); - VarList::push_back(items, " 5 ($F85)"); - VarList::push_back(items, " 6 ($F86)"); - VarList::push_back(items, " 7 ($F87)"); - VarList::push_back(items, " 8 ($F88)"); - VarList::push_back(items, " 9 ($F89)"); - VarList::push_back(items, "10 ($F8A)"); - VarList::push_back(items, "11 ($F8B)"); - VarList::push_back(items, "12 ($F8C)"); - VarList::push_back(items, "13 ($F8D)"); - VarList::push_back(items, "14 ($F8E)"); - VarList::push_back(items, "15 ($F8F)"); - VarList::push_back(items, "16 ($F90)"); - VarList::push_back(items, "17 ($F91)"); - VarList::push_back(items, "18 ($F92)"); - VarList::push_back(items, "19 ($F93)"); - VarList::push_back(items, "20 ($F94)"); - VarList::push_back(items, "21 ($F95)"); - VarList::push_back(items, "22 ($F96)"); - VarList::push_back(items, "23 ($F97)"); - VarList::push_back(items, "24 ($F98)"); - VarList::push_back(items, "25 ($F99)"); - VarList::push_back(items, "26 ($F9A)"); - VarList::push_back(items, "27 ($F9B)"); - VarList::push_back(items, "28 ($F9C)"); - VarList::push_back(items, "29 ($F9D)"); - VarList::push_back(items, "30 ($F9E)"); - VarList::push_back(items, "31 ($F9F)"); - VarList::push_back(items, "32 ($FA0)"); - VarList::push_back(items, "33 ($FA1)"); - VarList::push_back(items, "34 ($FA2)"); - VarList::push_back(items, "35 ($FA3)"); - VarList::push_back(items, "36 ($FA4)"); - VarList::push_back(items, "37 ($FA5)"); - VarList::push_back(items, "38 ($FA6)"); - VarList::push_back(items, "39 ($FA7)"); - VarList::push_back(items, "40 ($FA8)"); - VarList::push_back(items, "41 ($FA9)"); - VarList::push_back(items, "42 ($FAA)"); - VarList::push_back(items, "43 ($FAB)"); - VarList::push_back(items, "44 ($FAC)"); - VarList::push_back(items, "45 ($FAD)"); - VarList::push_back(items, "46 ($FAE)"); - VarList::push_back(items, "47 ($FAF)"); - VarList::push_back(items, "48 ($FB0)"); - VarList::push_back(items, "49 ($FB1)"); - VarList::push_back(items, "50 ($FB2)"); - VarList::push_back(items, "51 ($FB3)"); - VarList::push_back(items, "52 ($FB4)"); - VarList::push_back(items, "53 ($FB5)"); - VarList::push_back(items, "54 ($FB6)"); - VarList::push_back(items, "55 ($FB7)"); - VarList::push_back(items, "56 ($FB8)"); - VarList::push_back(items, "57 ($FB9)"); - VarList::push_back(items, "58 ($FBA)"); - VarList::push_back(items, "59 ($FBB)"); - VarList::push_back(items, "60 ($FBC)"); - VarList::push_back(items, "61 ($FBD)"); - VarList::push_back(items, "62 ($FBE)"); - VarList::push_back(items, "63 ($FBF)"); + VarList::push_back(items, " 0 ($FF80)"); + VarList::push_back(items, " 1 ($FF81)"); + VarList::push_back(items, " 2 ($FF82)"); + VarList::push_back(items, " 3 ($FF83)"); + VarList::push_back(items, " 4 ($FF84)"); + VarList::push_back(items, " 5 ($FF85)"); + VarList::push_back(items, " 6 ($FF86)"); + VarList::push_back(items, " 7 ($FF87)"); + VarList::push_back(items, " 8 ($FF88)"); + VarList::push_back(items, " 9 ($FF89)"); + VarList::push_back(items, "10 ($FF8A)"); + VarList::push_back(items, "11 ($FF8B)"); + VarList::push_back(items, "12 ($FF8C)"); + VarList::push_back(items, "13 ($FF8D)"); + VarList::push_back(items, "14 ($FF8E)"); + VarList::push_back(items, "15 ($FF8F)"); + VarList::push_back(items, "16 ($FF90)"); + VarList::push_back(items, "17 ($FF91)"); + VarList::push_back(items, "18 ($FF92)"); + VarList::push_back(items, "19 ($FF93)"); + VarList::push_back(items, "20 ($FF94)"); + VarList::push_back(items, "21 ($FF95)"); + VarList::push_back(items, "22 ($FF96)"); + VarList::push_back(items, "23 ($FF97)"); + VarList::push_back(items, "24 ($FF98)"); + VarList::push_back(items, "25 ($FF99)"); + VarList::push_back(items, "26 ($FF9A)"); + VarList::push_back(items, "27 ($FF9B)"); + VarList::push_back(items, "28 ($FF9C)"); + VarList::push_back(items, "29 ($FF9D)"); + VarList::push_back(items, "30 ($FF9E)"); + VarList::push_back(items, "31 ($FF9F)"); + VarList::push_back(items, "32 ($FFA0)"); + VarList::push_back(items, "33 ($FFA1)"); + VarList::push_back(items, "34 ($FFA2)"); + VarList::push_back(items, "35 ($FFA3)"); + VarList::push_back(items, "36 ($FFA4)"); + VarList::push_back(items, "37 ($FFA5)"); + VarList::push_back(items, "38 ($FFA6)"); + VarList::push_back(items, "39 ($FFA7)"); + VarList::push_back(items, "40 ($FFA8)"); + VarList::push_back(items, "41 ($FFA9)"); + VarList::push_back(items, "42 ($FFAA)"); + VarList::push_back(items, "43 ($FFAB)"); + VarList::push_back(items, "44 ($FFAC)"); + VarList::push_back(items, "45 ($FFAD)"); + VarList::push_back(items, "46 ($FFAE)"); + VarList::push_back(items, "47 ($FFAF)"); + VarList::push_back(items, "48 ($FFB0)"); + VarList::push_back(items, "49 ($FFB1)"); + VarList::push_back(items, "50 ($FFB2)"); + VarList::push_back(items, "51 ($FFB3)"); + VarList::push_back(items, "52 ($FFB4)"); + VarList::push_back(items, "53 ($FFB5)"); + VarList::push_back(items, "54 ($FFB6)"); + VarList::push_back(items, "55 ($FFB7)"); + VarList::push_back(items, "56 ($FFB8)"); + VarList::push_back(items, "57 ($FFB9)"); + VarList::push_back(items, "58 ($FFBA)"); + VarList::push_back(items, "59 ($FFBB)"); + VarList::push_back(items, "60 ($FFBC)"); + VarList::push_back(items, "61 ($FFBD)"); + VarList::push_back(items, "62 ($FFBE)"); + VarList::push_back(items, "63 ($FFBF)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("63 ($FBF) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("63 ($FFBF) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -158,14 +158,14 @@ string CartridgeBFSCWidget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$F80", "$F81", "$F82", "$F83", "$F84", "$F85", "$F86", "$F87", - "$F88", "$F89", "$F8A", "$F8B", "$F8C", "$F8D", "$F8E", "$F8F", - "$F90", "$F91", "$F92", "$F93", "$F94", "$F95", "$F96", "$F97", - "$F98", "$F99", "$F9A", "$F9B", "$F9C", "$F9D", "$F9E", "$F9F", - "$FA0", "$FA1", "$FA2", "$FA3", "$FA4", "$FA5", "$FA6", "$FA7", - "$FA8", "$FA9", "$FAA", "$FAB", "$FAC", "$FAD", "$FAE", "$FAF", - "$FB0", "$FB1", "$FB2", "$FB3", "$FB4", "$FB5", "$FB6", "$FB7", - "$FB8", "$FB9", "$FBA", "$FBB", "$FBC", "$FBD", "$FBE", "$FBF" + "$FF80", "$FF81", "$FF82", "$FF83", "$FF84", "$FF85", "$FF86", "$FF87", + "$FF88", "$FF89", "$FF8A", "$FF8B", "$FF8C", "$FF8D", "$FF8E", "$FF8F", + "$FF90", "$FF91", "$FF92", "$FF93", "$FF94", "$FF95", "$FF96", "$FF97", + "$FF98", "$FF99", "$FF9A", "$FF9B", "$FF9C", "$FF9D", "$FF9E", "$FF9F", + "$FFA0", "$FFA1", "$FFA2", "$FFA3", "$FFA4", "$FFA5", "$FFA6", "$FFA7", + "$FFA8", "$FFA9", "$FFAA", "$FFAB", "$FFAC", "$FFAD", "$FFAE", "$FFAF", + "$FFB0", "$FFB1", "$FFB2", "$FFB3", "$FFB4", "$FFB5", "$FFB6", "$FFB7", + "$FFB8", "$FFB9", "$FFBA", "$FFBB", "$FFBC", "$FFBD", "$FFBE", "$FFBF" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartBFWidget.cxx b/src/debugger/gui/CartBFWidget.cxx index 72892bcdf..f204cbf32 100644 --- a/src/debugger/gui/CartBFWidget.cxx +++ b/src/debugger/gui/CartBFWidget.cxx @@ -38,82 +38,82 @@ CartridgeBFWidget::CartridgeBFWidget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << std::dec << i << " @ $" << Common::Base::HEX4 << start << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; VariantList items; - VarList::push_back(items, " 0 ($F80)"); - VarList::push_back(items, " 1 ($F81)"); - VarList::push_back(items, " 2 ($F82)"); - VarList::push_back(items, " 3 ($F83)"); - VarList::push_back(items, " 4 ($F84)"); - VarList::push_back(items, " 5 ($F85)"); - VarList::push_back(items, " 6 ($F86)"); - VarList::push_back(items, " 7 ($F87)"); - VarList::push_back(items, " 8 ($F88)"); - VarList::push_back(items, " 9 ($F89)"); - VarList::push_back(items, "10 ($F8A)"); - VarList::push_back(items, "11 ($F8B)"); - VarList::push_back(items, "12 ($F8C)"); - VarList::push_back(items, "13 ($F8D)"); - VarList::push_back(items, "14 ($F8E)"); - VarList::push_back(items, "15 ($F8F)"); - VarList::push_back(items, "16 ($F90)"); - VarList::push_back(items, "17 ($F91)"); - VarList::push_back(items, "18 ($F92)"); - VarList::push_back(items, "19 ($F93)"); - VarList::push_back(items, "20 ($F94)"); - VarList::push_back(items, "21 ($F95)"); - VarList::push_back(items, "22 ($F96)"); - VarList::push_back(items, "23 ($F97)"); - VarList::push_back(items, "24 ($F98)"); - VarList::push_back(items, "25 ($F99)"); - VarList::push_back(items, "26 ($F9A)"); - VarList::push_back(items, "27 ($F9B)"); - VarList::push_back(items, "28 ($F9C)"); - VarList::push_back(items, "29 ($F9D)"); - VarList::push_back(items, "30 ($F9E)"); - VarList::push_back(items, "31 ($F9F)"); - VarList::push_back(items, "32 ($FA0)"); - VarList::push_back(items, "33 ($FA1)"); - VarList::push_back(items, "34 ($FA2)"); - VarList::push_back(items, "35 ($FA3)"); - VarList::push_back(items, "36 ($FA4)"); - VarList::push_back(items, "37 ($FA5)"); - VarList::push_back(items, "38 ($FA6)"); - VarList::push_back(items, "39 ($FA7)"); - VarList::push_back(items, "40 ($FA8)"); - VarList::push_back(items, "41 ($FA9)"); - VarList::push_back(items, "42 ($FAA)"); - VarList::push_back(items, "43 ($FAB)"); - VarList::push_back(items, "44 ($FAC)"); - VarList::push_back(items, "45 ($FAD)"); - VarList::push_back(items, "46 ($FAE)"); - VarList::push_back(items, "47 ($FAF)"); - VarList::push_back(items, "48 ($FB0)"); - VarList::push_back(items, "49 ($FB1)"); - VarList::push_back(items, "50 ($FB2)"); - VarList::push_back(items, "51 ($FB3)"); - VarList::push_back(items, "52 ($FB4)"); - VarList::push_back(items, "53 ($FB5)"); - VarList::push_back(items, "54 ($FB6)"); - VarList::push_back(items, "55 ($FB7)"); - VarList::push_back(items, "56 ($FB8)"); - VarList::push_back(items, "57 ($FB9)"); - VarList::push_back(items, "58 ($FBA)"); - VarList::push_back(items, "59 ($FBB)"); - VarList::push_back(items, "60 ($FBC)"); - VarList::push_back(items, "61 ($FBD)"); - VarList::push_back(items, "62 ($FBE)"); - VarList::push_back(items, "63 ($FBF)"); + VarList::push_back(items, " 0 ($FF80)"); + VarList::push_back(items, " 1 ($FF81)"); + VarList::push_back(items, " 2 ($FF82)"); + VarList::push_back(items, " 3 ($FF83)"); + VarList::push_back(items, " 4 ($FF84)"); + VarList::push_back(items, " 5 ($FF85)"); + VarList::push_back(items, " 6 ($FF86)"); + VarList::push_back(items, " 7 ($FF87)"); + VarList::push_back(items, " 8 ($FF88)"); + VarList::push_back(items, " 9 ($FF89)"); + VarList::push_back(items, "10 ($FF8A)"); + VarList::push_back(items, "11 ($FF8B)"); + VarList::push_back(items, "12 ($FF8C)"); + VarList::push_back(items, "13 ($FF8D)"); + VarList::push_back(items, "14 ($FF8E)"); + VarList::push_back(items, "15 ($FF8F)"); + VarList::push_back(items, "16 ($FF90)"); + VarList::push_back(items, "17 ($FF91)"); + VarList::push_back(items, "18 ($FF92)"); + VarList::push_back(items, "19 ($FF93)"); + VarList::push_back(items, "20 ($FF94)"); + VarList::push_back(items, "21 ($FF95)"); + VarList::push_back(items, "22 ($FF96)"); + VarList::push_back(items, "23 ($FF97)"); + VarList::push_back(items, "24 ($FF98)"); + VarList::push_back(items, "25 ($FF99)"); + VarList::push_back(items, "26 ($FF9A)"); + VarList::push_back(items, "27 ($FF9B)"); + VarList::push_back(items, "28 ($FF9C)"); + VarList::push_back(items, "29 ($FF9D)"); + VarList::push_back(items, "30 ($FF9E)"); + VarList::push_back(items, "31 ($FF9F)"); + VarList::push_back(items, "32 ($FFA0)"); + VarList::push_back(items, "33 ($FFA1)"); + VarList::push_back(items, "34 ($FFA2)"); + VarList::push_back(items, "35 ($FFA3)"); + VarList::push_back(items, "36 ($FFA4)"); + VarList::push_back(items, "37 ($FFA5)"); + VarList::push_back(items, "38 ($FFA6)"); + VarList::push_back(items, "39 ($FFA7)"); + VarList::push_back(items, "40 ($FFA8)"); + VarList::push_back(items, "41 ($FFA9)"); + VarList::push_back(items, "42 ($FFAA)"); + VarList::push_back(items, "43 ($FFAB)"); + VarList::push_back(items, "44 ($FFAC)"); + VarList::push_back(items, "45 ($FFAD)"); + VarList::push_back(items, "46 ($FFAE)"); + VarList::push_back(items, "47 ($FFAF)"); + VarList::push_back(items, "48 ($FFB0)"); + VarList::push_back(items, "49 ($FFB1)"); + VarList::push_back(items, "50 ($FFB2)"); + VarList::push_back(items, "51 ($FFB3)"); + VarList::push_back(items, "52 ($FFB4)"); + VarList::push_back(items, "53 ($FFB5)"); + VarList::push_back(items, "54 ($FFB6)"); + VarList::push_back(items, "55 ($FFB7)"); + VarList::push_back(items, "56 ($FFB8)"); + VarList::push_back(items, "57 ($FFB9)"); + VarList::push_back(items, "58 ($FFBA)"); + VarList::push_back(items, "59 ($FFBB)"); + VarList::push_back(items, "60 ($FFBC)"); + VarList::push_back(items, "61 ($FFBD)"); + VarList::push_back(items, "62 ($FFBE)"); + VarList::push_back(items, "63 ($FFBF)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("64 ($FBF) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("64 ($FFBF) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -145,14 +145,14 @@ string CartridgeBFWidget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$F80", "$F81", "$F82", "$F83", "$F84", "$F85", "$F86", "$F87", - "$F88", "$F89", "$F8A", "$F8B", "$F8C", "$F8D", "$F8E", "$F8F", - "$F90", "$F91", "$F92", "$F93", "$F94", "$F95", "$F96", "$F97", - "$F98", "$F99", "$F9A", "$F9B", "$F9C", "$F9D", "$F9E", "$F9F", - "$FA0", "$FA1", "$FA2", "$FA3", "$FA4", "$FA5", "$FA6", "$FA7", - "$FA8", "$FA9", "$FAA", "$FAB", "$FAC", "$FAD", "$FAE", "$FAF", - "$FB0", "$FB1", "$FB2", "$FB3", "$FB4", "$FB5", "$FB6", "$FB7", - "$FB8", "$FB9", "$FBA", "$FBB", "$FBC", "$FBD", "$FBE", "$FBF" + "$FF80", "$FF81", "$FF82", "$FF83", "$FF84", "$FF85", "$FF86", "$FF87", + "$FF88", "$FF89", "$FF8A", "$FF8B", "$FF8C", "$FF8D", "$FF8E", "$FF8F", + "$FF90", "$FF91", "$FF92", "$FF93", "$FF94", "$FF95", "$FF96", "$FF97", + "$FF98", "$FF99", "$FF9A", "$FF9B", "$FF9C", "$FF9D", "$FF9E", "$FF9F", + "$FFA0", "$FFA1", "$FFA2", "$FFA3", "$FFA4", "$FFA5", "$FFA6", "$FFA7", + "$FFA8", "$FFA9", "$FFAA", "$FFAB", "$FFAC", "$FFAD", "$FFAE", "$FFAF", + "$FFB0", "$FFB1", "$FFB2", "$FFB3", "$FFB4", "$FFB5", "$FFB6", "$FFB7", + "$FFB8", "$FFB9", "$FFBA", "$FFBB", "$FFBC", "$FFBD", "$FFBE", "$FFBF" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartBUSWidget.cxx b/src/debugger/gui/CartBUSWidget.cxx index cd4be7e53..6ce333815 100644 --- a/src/debugger/gui/CartBUSWidget.cxx +++ b/src/debugger/gui/CartBUSWidget.cxx @@ -34,7 +34,7 @@ CartridgeBUSWidget::CartridgeBUSWidget( << "32K ROM, seven 4K banks are accessible to 2600\n" << "8K BUS RAM\n" << "BUS registers accessible @ $F000 - $F03F\n" - << "Banks accessible at hotspots $FF5 to $FFB\n" + << "Banks accessible at hotspots $FFF5 to $FFFB\n" << "Startup bank = " << cart.myStartBank << "\n"; #if 0 @@ -53,26 +53,26 @@ CartridgeBUSWidget::CartridgeBUSWidget( myLineHeight; VariantList items; - VarList::push_back(items, "0 ($FF5)"); - VarList::push_back(items, "1 ($FF6)"); - VarList::push_back(items, "2 ($FF7)"); - VarList::push_back(items, "3 ($FF8)"); - VarList::push_back(items, "4 ($FF9)"); - VarList::push_back(items, "5 ($FFA)"); - VarList::push_back(items, "6 ($FFB)"); + VarList::push_back(items, "0 ($FFF5)"); + VarList::push_back(items, "1 ($FFF6)"); + VarList::push_back(items, "2 ($FFF7)"); + VarList::push_back(items, "3 ($FFF8)"); + VarList::push_back(items, "4 ($FFF9)"); + VarList::push_back(items, "5 ($FFFA)"); + VarList::push_back(items, "6 ($FFFB)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); - int lwidth = _font.getStringWidth("Datastream Increments: "); // get width of the widest label + int lwidth = _font.getStringWidth("Datastream Increments "); // get width of the widest label // Datastream Pointers xpos = 0; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Datastream Pointers: ", kTextAlignLeft); + myFontHeight, "Datastream Pointers ", kTextAlignLeft); xpos += lwidth; myDatastreamPointers = new DataGridWidget(boss, _nfont, 0, ypos+myLineHeight-2, 4, 4, 6, 32, Common::Base::F_16_3_2); @@ -82,7 +82,7 @@ CartridgeBUSWidget::CartridgeBUSWidget( // Datastream Increments xpos = 0 + myDatastreamPointers->getWidth(); new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Datastream Increments: ", kTextAlignLeft); + myFontHeight, "Datastream Increments ", kTextAlignLeft); myDatastreamIncrements = new DataGridWidget(boss, _nfont, xpos, ypos+myLineHeight-2, 4, 4, 5, 32, Common::Base::F_16_2_2); myDatastreamIncrements->setTarget(this); @@ -91,7 +91,7 @@ CartridgeBUSWidget::CartridgeBUSWidget( // Datastream Maps xpos = 0; ypos += myLineHeight*5 + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Address Maps: ", kTextAlignLeft); + myFontHeight, "Address Maps ", kTextAlignLeft); myAddressMaps = new DataGridWidget(boss, _nfont, 0, ypos+myLineHeight-2, 8, 5, 8, 32, Common::Base::F_16_8); myAddressMaps->setTarget(this); @@ -100,7 +100,7 @@ CartridgeBUSWidget::CartridgeBUSWidget( // Music counters xpos = 10; ypos += myLineHeight*6 + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Music Counters: ", kTextAlignLeft); + myFontHeight, "Music Counters ", kTextAlignLeft); xpos += lwidth; myMusicCounters = new DataGridWidget(boss, _nfont, xpos, ypos-2, 3, 1, 8, 32, Common::Base::F_16_8); @@ -110,7 +110,7 @@ CartridgeBUSWidget::CartridgeBUSWidget( // Music frequencies xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Music Frequencies: ", kTextAlignLeft); + myFontHeight, "Music Frequencies ", kTextAlignLeft); xpos += lwidth; myMusicFrequencies = new DataGridWidget(boss, _nfont, xpos, ypos-2, 3, 1, 8, 32, Common::Base::F_16_8); @@ -120,7 +120,7 @@ CartridgeBUSWidget::CartridgeBUSWidget( // Music waveforms xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Music Waveforms: ", kTextAlignLeft); + myFontHeight, "Music Waveforms ", kTextAlignLeft); xpos += lwidth; myMusicWaveforms = new DataGridWidget(boss, _nfont, xpos, ypos-2, 3, 1, 4, 16, Common::Base::F_16_2); @@ -130,7 +130,7 @@ CartridgeBUSWidget::CartridgeBUSWidget( // Music waveform sizes xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Music Waveform Sizes: ", kTextAlignLeft); + myFontHeight, "Music Waveform Sizes ", kTextAlignLeft); xpos += lwidth; myMusicWaveformSizes = new DataGridWidget(boss, _nfont, xpos, ypos-2, 3, 1, 4, 16, Common::Base::F_16_2); @@ -304,7 +304,7 @@ string CartridgeBUSWidget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" + "$FFF5", "$FFF6", "$FFF7", "$FFF8", "$FFF9", "$FFFA", "$FFFB" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartCDFWidget.cxx b/src/debugger/gui/CartCDFWidget.cxx index 959895ed8..67adb6d5b 100644 --- a/src/debugger/gui/CartCDFWidget.cxx +++ b/src/debugger/gui/CartCDFWidget.cxx @@ -61,7 +61,7 @@ CartridgeCDFWidget::CartridgeCDFWidget( VarList::push_back(items, "5 ($FFFA)"); VarList::push_back(items, "6 ($FFFB)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), myLineHeight, items, "Set bank ", _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); @@ -360,7 +360,7 @@ string CartridgeCDFWidget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" + "$FFF5", "$FFF6", "$FFF7", "$FFF8", "$FFF9", "$FFFA", "$FFFB" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartCMWidget.cxx b/src/debugger/gui/CartCMWidget.cxx index 72580c894..e101fa79b 100644 --- a/src/debugger/gui/CartCMWidget.cxx +++ b/src/debugger/gui/CartCMWidget.cxx @@ -50,16 +50,16 @@ CartridgeCMWidget::CartridgeCMWidget( VarList::push_back(items, " 3 "); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 0 "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); // Raw SWCHA value (this will be broken down further in other UI elements) - int lwidth = _font.getStringWidth("Current column: "); + int lwidth = _font.getStringWidth("Current column "); ypos += myLineHeight + 8; new StaticTextWidget(boss, _font, xpos, ypos+2, lwidth, myFontHeight, - "Current SWCHA: ", kTextAlignLeft); + "Current SWCHA ", kTextAlignLeft); xpos += lwidth; mySWCHA = new ToggleBitWidget(boss, _nfont, xpos, ypos, 8, 1); mySWCHA->setTarget(this); @@ -68,7 +68,7 @@ CartridgeCMWidget::CartridgeCMWidget( // Current column number xpos = 10; ypos += myLineHeight + 5; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Current column: ", kTextAlignLeft); + myFontHeight, "Current column ", kTextAlignLeft); xpos += lwidth; myColumn = new DataGridWidget(boss, _nfont, xpos, ypos-2, 1, 1, 2, 8, Common::Base::F_16); @@ -136,12 +136,12 @@ CartridgeCMWidget::CartridgeCMWidget( // Ram state (combination of several bits in SWCHA) ypos += myLineHeight + 8; - lwidth = _font.getStringWidth("Ram State: "); + lwidth = _font.getStringWidth("Ram State "); new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Ram State: ", kTextAlignLeft); - myRAM = new EditTextWidget(boss, _nfont, xpos+lwidth, ypos-1, + myFontHeight, "Ram State ", kTextAlignLeft); + myRAM = new EditTextWidget(boss, _nfont, xpos+lwidth, ypos-2, _nfont.getStringWidth(" Write-only "), myLineHeight, ""); - myRAM->setEditable(false); + myRAM->setEditable(false, true); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/debugger/gui/CartCTYWidget.cxx b/src/debugger/gui/CartCTYWidget.cxx index 2b7ce8001..4d6f12ec4 100644 --- a/src/debugger/gui/CartCTYWidget.cxx +++ b/src/debugger/gui/CartCTYWidget.cxx @@ -38,17 +38,17 @@ CartridgeCTYWidget::CartridgeCTYWidget( ypos = addBaseInformation(size, "Chris D. Walton", info) + myLineHeight; VariantList items; - VarList::push_back(items, "1 ($FF5)"); - VarList::push_back(items, "2 ($FF6)"); - VarList::push_back(items, "3 ($FF7)"); - VarList::push_back(items, "4 ($FF8)"); - VarList::push_back(items, "5 ($FF9)"); - VarList::push_back(items, "6 ($FFA)"); - VarList::push_back(items, "7 ($FFB)"); + VarList::push_back(items, "1 ($FFF5)"); + VarList::push_back(items, "2 ($FFF6)"); + VarList::push_back(items, "3 ($FFF7)"); + VarList::push_back(items, "4 ($FFF8)"); + VarList::push_back(items, "5 ($FFF9)"); + VarList::push_back(items, "6 ($FFFA)"); + VarList::push_back(items, "7 ($FFFB)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -91,7 +91,7 @@ string CartridgeCTYWidget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "", "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" + "", "$FFF5", "$FFF6", "$FFF7", "$FFF8", "$FFF9", "$FFFA", "$FFFB" }; uInt16 bank = myCart.getBank(); buf << "Bank = " << std::dec << bank << ", hotspot = " << spot[bank]; diff --git a/src/debugger/gui/CartCVPlusWidget.cxx b/src/debugger/gui/CartCVPlusWidget.cxx index bd27175b9..98c98373d 100644 --- a/src/debugger/gui/CartCVPlusWidget.cxx +++ b/src/debugger/gui/CartCVPlusWidget.cxx @@ -44,7 +44,7 @@ CartridgeCVPlusWidget::CartridgeCVPlusWidget( VarList::push_back(items, Variant(i).toString() + " ($3D)"); ostringstream label; - label << "Set bank ($F800 - $FFFF): "; + label << "Set bank ($F800 - $FFFF) "; myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("xxx ($3D) "), myLineHeight, items, label.str(), diff --git a/src/debugger/gui/CartDASHWidget.cxx b/src/debugger/gui/CartDASHWidget.cxx index b8a720fdd..cf617856f 100644 --- a/src/debugger/gui/CartDASHWidget.cxx +++ b/src/debugger/gui/CartDASHWidget.cxx @@ -99,7 +99,7 @@ CartridgeDASHWidget::CartridgeDASHWidget( int xoffset = xpos_s+t->getWidth() + 10; myBankState[2*i] = new EditTextWidget(boss, _font, xoffset, ypos_s, w - xoffset - 10, myLineHeight, ""); - myBankState[2*i]->setEditable(false); + myBankState[2*i]->setEditable(false, true); ypos_s += myLineHeight + 4; label.str(""); @@ -109,7 +109,7 @@ CartridgeDASHWidget::CartridgeDASHWidget( myBankState[2*i+1] = new EditTextWidget(boss, _font, xoffset, ypos_s, w - xoffset - 10, myLineHeight, ""); - myBankState[2*i+1]->setEditable(false); + myBankState[2*i+1]->setEditable(false, true); xpos = 10; ypos+= 2 * myLineHeight; diff --git a/src/debugger/gui/CartDFSCWidget.cxx b/src/debugger/gui/CartDFSCWidget.cxx index 5ef0191b1..d4450326f 100644 --- a/src/debugger/gui/CartDFSCWidget.cxx +++ b/src/debugger/gui/CartDFSCWidget.cxx @@ -40,50 +40,50 @@ CartridgeDFSCWidget::CartridgeDFSCWidget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << std::dec << i << " @ $" << Common::Base::HEX4 << (start + 0x100) - << " - " << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << " - " << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; VariantList items; - VarList::push_back(items, " 0 ($FC0)"); - VarList::push_back(items, " 1 ($FC1)"); - VarList::push_back(items, " 2 ($FC2)"); - VarList::push_back(items, " 3 ($FC3)"); - VarList::push_back(items, " 4 ($FC4)"); - VarList::push_back(items, " 5 ($FC5)"); - VarList::push_back(items, " 6 ($FC6)"); - VarList::push_back(items, " 7 ($FC7)"); - VarList::push_back(items, " 8 ($FC8)"); - VarList::push_back(items, " 9 ($FC9)"); - VarList::push_back(items, "10 ($FCA)"); - VarList::push_back(items, "11 ($FCB)"); - VarList::push_back(items, "12 ($FCC)"); - VarList::push_back(items, "13 ($FCD)"); - VarList::push_back(items, "14 ($FCE)"); - VarList::push_back(items, "15 ($FCF)"); - VarList::push_back(items, "16 ($FD0)"); - VarList::push_back(items, "17 ($FD1)"); - VarList::push_back(items, "18 ($FD2)"); - VarList::push_back(items, "19 ($FD3)"); - VarList::push_back(items, "20 ($FD4)"); - VarList::push_back(items, "21 ($FD5)"); - VarList::push_back(items, "22 ($FD6)"); - VarList::push_back(items, "23 ($FD7)"); - VarList::push_back(items, "24 ($FD8)"); - VarList::push_back(items, "25 ($FD9)"); - VarList::push_back(items, "26 ($FDA)"); - VarList::push_back(items, "27 ($FDB)"); - VarList::push_back(items, "28 ($FDC)"); - VarList::push_back(items, "29 ($FDD)"); - VarList::push_back(items, "30 ($FDE)"); - VarList::push_back(items, "31 ($FDF)"); + VarList::push_back(items, " 0 ($FFC0)"); + VarList::push_back(items, " 1 ($FFC1)"); + VarList::push_back(items, " 2 ($FFC2)"); + VarList::push_back(items, " 3 ($FFC3)"); + VarList::push_back(items, " 4 ($FFC4)"); + VarList::push_back(items, " 5 ($FFC5)"); + VarList::push_back(items, " 6 ($FFC6)"); + VarList::push_back(items, " 7 ($FFC7)"); + VarList::push_back(items, " 8 ($FFC8)"); + VarList::push_back(items, " 9 ($FFC9)"); + VarList::push_back(items, "10 ($FFCA)"); + VarList::push_back(items, "11 ($FFCB)"); + VarList::push_back(items, "12 ($FFCC)"); + VarList::push_back(items, "13 ($FFCD)"); + VarList::push_back(items, "14 ($FFCE)"); + VarList::push_back(items, "15 ($FFCF)"); + VarList::push_back(items, "16 ($FFD0)"); + VarList::push_back(items, "17 ($FFD1)"); + VarList::push_back(items, "18 ($FFD2)"); + VarList::push_back(items, "19 ($FFD3)"); + VarList::push_back(items, "20 ($FFD4)"); + VarList::push_back(items, "21 ($FFD5)"); + VarList::push_back(items, "22 ($FFD6)"); + VarList::push_back(items, "23 ($FFD7)"); + VarList::push_back(items, "24 ($FFD8)"); + VarList::push_back(items, "25 ($FFD9)"); + VarList::push_back(items, "26 ($FFDA)"); + VarList::push_back(items, "27 ($FFDB)"); + VarList::push_back(items, "28 ($FFDC)"); + VarList::push_back(items, "29 ($FFDD)"); + VarList::push_back(items, "30 ($FFDE)"); + VarList::push_back(items, "31 ($FFDF)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FE0) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FFE0) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -126,10 +126,10 @@ string CartridgeDFSCWidget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$FC0", "$FC1", "$FC2", "$FC3", "$FC4", "$FC5", "$FC6", "$FC7", - "$FC8", "$FC9", "$FCA", "$FCB", "$FCC", "$FCD", "$FCE", "$FCF", - "$FD0", "$FD1", "$FD2", "$FD3", "$FD4", "$FD5", "$FD6", "$FE7", - "$FD8", "$FD9", "$FDA", "$FDB", "$FDC", "$FDD", "$FDE", "$FDF" + "$FFC0", "$FFC1", "$FFC2", "$FFC3", "$FFC4", "$FFC5", "$FFC6", "$FFC7", + "$FFC8", "$FFC9", "$FFCA", "$FFCB", "$FFCC", "$FFCD", "$FFCE", "$FFCF", + "$FFD0", "$FFD1", "$FFD2", "$FFD3", "$FFD4", "$FFD5", "$FFD6", "$FFE7", + "$FFD8", "$FFD9", "$FFDA", "$FFDB", "$FFDC", "$FFDD", "$FFDE", "$FFDF" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartDFWidget.cxx b/src/debugger/gui/CartDFWidget.cxx index 40f52272c..00faa7e24 100644 --- a/src/debugger/gui/CartDFWidget.cxx +++ b/src/debugger/gui/CartDFWidget.cxx @@ -38,50 +38,50 @@ CartridgeDFWidget::CartridgeDFWidget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << std::dec << i << " @ $" << Common::Base::HEX4 << start << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; VariantList items; - VarList::push_back(items, " 0 ($FC0)"); - VarList::push_back(items, " 1 ($FC1)"); - VarList::push_back(items, " 2 ($FC2)"); - VarList::push_back(items, " 3 ($FC3)"); - VarList::push_back(items, " 4 ($FC4)"); - VarList::push_back(items, " 5 ($FC5)"); - VarList::push_back(items, " 6 ($FC6)"); - VarList::push_back(items, " 7 ($FC7)"); - VarList::push_back(items, " 8 ($FC8)"); - VarList::push_back(items, " 9 ($FC9)"); - VarList::push_back(items, "10 ($FCA)"); - VarList::push_back(items, "11 ($FCB)"); - VarList::push_back(items, "12 ($FCC)"); - VarList::push_back(items, "13 ($FCD)"); - VarList::push_back(items, "14 ($FCE)"); - VarList::push_back(items, "15 ($FCF)"); - VarList::push_back(items, "16 ($FD0)"); - VarList::push_back(items, "17 ($FD1)"); - VarList::push_back(items, "18 ($FD2)"); - VarList::push_back(items, "19 ($FD3)"); - VarList::push_back(items, "20 ($FD4)"); - VarList::push_back(items, "21 ($FD5)"); - VarList::push_back(items, "22 ($FD6)"); - VarList::push_back(items, "23 ($FD7)"); - VarList::push_back(items, "24 ($FD8)"); - VarList::push_back(items, "25 ($FD9)"); - VarList::push_back(items, "26 ($FDA)"); - VarList::push_back(items, "27 ($FDB)"); - VarList::push_back(items, "28 ($FDC)"); - VarList::push_back(items, "29 ($FDD)"); - VarList::push_back(items, "30 ($FDE)"); - VarList::push_back(items, "31 ($FDF)"); + VarList::push_back(items, " 0 ($FFC0)"); + VarList::push_back(items, " 1 ($FFC1)"); + VarList::push_back(items, " 2 ($FFC2)"); + VarList::push_back(items, " 3 ($FFC3)"); + VarList::push_back(items, " 4 ($FFC4)"); + VarList::push_back(items, " 5 ($FFC5)"); + VarList::push_back(items, " 6 ($FFC6)"); + VarList::push_back(items, " 7 ($FFC7)"); + VarList::push_back(items, " 8 ($FFC8)"); + VarList::push_back(items, " 9 ($FFC9)"); + VarList::push_back(items, "10 ($FFCA)"); + VarList::push_back(items, "11 ($FFCB)"); + VarList::push_back(items, "12 ($FFCC)"); + VarList::push_back(items, "13 ($FFCD)"); + VarList::push_back(items, "14 ($FFCE)"); + VarList::push_back(items, "15 ($FFCF)"); + VarList::push_back(items, "16 ($FFD0)"); + VarList::push_back(items, "17 ($FFD1)"); + VarList::push_back(items, "18 ($FFD2)"); + VarList::push_back(items, "19 ($FFD3)"); + VarList::push_back(items, "20 ($FFD4)"); + VarList::push_back(items, "21 ($FFD5)"); + VarList::push_back(items, "22 ($FFD6)"); + VarList::push_back(items, "23 ($FFD7)"); + VarList::push_back(items, "24 ($FFD8)"); + VarList::push_back(items, "25 ($FFD9)"); + VarList::push_back(items, "26 ($FFDA)"); + VarList::push_back(items, "27 ($FFDB)"); + VarList::push_back(items, "28 ($FFDC)"); + VarList::push_back(items, "29 ($FFDD)"); + VarList::push_back(items, "30 ($FFDE)"); + VarList::push_back(items, "31 ($FFDF)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FDF) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FFDF) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -113,10 +113,10 @@ string CartridgeDFWidget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$FC0", "$FC1", "$FC2", "$FC3", "$FC4", "$FC5", "$FC6", "$FC7", - "$FC8", "$FC9", "$FCA", "$FCB", "$FCC", "$FCD", "$FCE", "$FCF", - "$FD0", "$FD1", "$FD2", "$FD3", "$FD4", "$FD5", "$FD6", "$FD7", - "$FD8", "$FD9", "$FDA", "$FDB", "$FDC", "$FDD", "$FDE", "$FDF" + "$FFC0", "$FFC1", "$FFC2", "$FFC3", "$FFC4", "$FFC5", "$FFC6", "$FFC7", + "$FFC8", "$FFC9", "$FFCA", "$FFCB", "$FFCC", "$FFCD", "$FFCE", "$FFCF", + "$FFD0", "$FFD1", "$FFD2", "$FFD3", "$FFD4", "$FFD5", "$FFD6", "$FFD7", + "$FFD8", "$FFD9", "$FFDA", "$FFDB", "$FFDC", "$FFDD", "$FFDE", "$FFDF" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartDPCPlusWidget.cxx b/src/debugger/gui/CartDPCPlusWidget.cxx index 009dcb8d1..a4ea0feaa 100644 --- a/src/debugger/gui/CartDPCPlusWidget.cxx +++ b/src/debugger/gui/CartDPCPlusWidget.cxx @@ -34,7 +34,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( << "8K DPC RAM\n" << "DPC registers accessible @ $F000 - $F07F\n" << " $F000 - $F03F (R), $F040 - $F07F (W)\n" - << "Banks accessible at hotspots $FF6 to $FFB\n" + << "Banks accessible at hotspots $FFF6 to $FFFB\n" << "Startup bank = " << cart.myStartBank << "\n"; #if 0 @@ -53,24 +53,24 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( myLineHeight; VariantList items; - VarList::push_back(items, "0 ($FF6)"); - VarList::push_back(items, "1 ($FF7)"); - VarList::push_back(items, "2 ($FF8)"); - VarList::push_back(items, "3 ($FF9)"); - VarList::push_back(items, "4 ($FFA)"); - VarList::push_back(items, "5 ($FFB)"); + VarList::push_back(items, "0 ($FFF6)"); + VarList::push_back(items, "1 ($FFF7)"); + VarList::push_back(items, "2 ($FFF8)"); + VarList::push_back(items, "3 ($FFF9)"); + VarList::push_back(items, "4 ($FFFA)"); + VarList::push_back(items, "5 ($FFFB)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); // Top registers - int lwidth = _font.getStringWidth("Counter Registers: "); + int lwidth = _font.getStringWidth("Counter Registers "); xpos = 10; ypos += myLineHeight + 8; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Top Registers: ", kTextAlignLeft); + myFontHeight, "Top Registers ", kTextAlignLeft); xpos += lwidth; myTops = new DataGridWidget(boss, _nfont, xpos, ypos-2, 8, 1, 2, 8, Common::Base::F_16); @@ -80,7 +80,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( // Bottom registers xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Bottom Registers: ", kTextAlignLeft); + myFontHeight, "Bottom Registers ", kTextAlignLeft); xpos += lwidth; myBottoms = new DataGridWidget(boss, _nfont, xpos, ypos-2, 8, 1, 2, 8, Common::Base::F_16); @@ -90,7 +90,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( // Counter registers xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Counter Registers: ", kTextAlignLeft); + myFontHeight, "Counter Registers ", kTextAlignLeft); xpos += lwidth; myCounters = new DataGridWidget(boss, _nfont, xpos, ypos-2, 8, 1, 4, 16, Common::Base::F_16_4); @@ -100,7 +100,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( // Fractional counter registers xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Frac Counters: ", kTextAlignLeft); + myFontHeight, "Frac Counters ", kTextAlignLeft); xpos += lwidth; myFracCounters = new DataGridWidget(boss, _nfont, xpos, ypos-2, 4, 2, 8, 32, Common::Base::F_16_8); @@ -110,7 +110,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( // Fractional increment registers xpos = 10; ypos += myFracCounters->getHeight() + 8; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Frac Increments: ", kTextAlignLeft); + myFontHeight, "Frac Increments ", kTextAlignLeft); xpos += lwidth; myFracIncrements = new DataGridWidget(boss, _nfont, xpos, ypos-2, 8, 1, 2, 8, Common::Base::F_16); @@ -120,7 +120,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( // Special function parameters xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Function Params: ", kTextAlignLeft); + myFontHeight, "Function Params ", kTextAlignLeft); xpos += lwidth; myParameter = new DataGridWidget(boss, _nfont, xpos, ypos-2, 8, 1, 2, 8, Common::Base::F_16); @@ -130,7 +130,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( // Music counters xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Music Counters: ", kTextAlignLeft); + myFontHeight, "Music Counters ", kTextAlignLeft); xpos += lwidth; myMusicCounters = new DataGridWidget(boss, _nfont, xpos, ypos-2, 3, 1, 8, 32, Common::Base::F_16_8); @@ -140,7 +140,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( // Music frequencies xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Music Frequencies: ", kTextAlignLeft); + myFontHeight, "Music Frequencies ", kTextAlignLeft); xpos += lwidth; myMusicFrequencies = new DataGridWidget(boss, _nfont, xpos, ypos-2, 3, 1, 8, 32, Common::Base::F_16_8); @@ -150,7 +150,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( // Music waveforms xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Music Waveforms: ", kTextAlignLeft); + myFontHeight, "Music Waveforms ", kTextAlignLeft); xpos += lwidth; myMusicWaveforms = new DataGridWidget(boss, _nfont, xpos, ypos-2, 3, 1, 4, 16, Common::Base::F_16_4); @@ -158,10 +158,10 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget( myMusicWaveforms->setEditable(false); // Current random number - lwidth = _font.getStringWidth("Current random number: "); + lwidth = _font.getStringWidth("Current random number "); xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Current random number: ", kTextAlignLeft); + myFontHeight, "Current random number ", kTextAlignLeft); xpos += lwidth; myRandom = new DataGridWidget(boss, _nfont, xpos, ypos-2, 1, 1, 8, 32, Common::Base::F_16_8); @@ -325,7 +325,7 @@ string CartridgeDPCPlusWidget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" + "$FFF6", "$FFF7", "$FFF8", "$FFF9", "$FFFA", "$FFFB" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartDPCWidget.cxx b/src/debugger/gui/CartDPCWidget.cxx index ce7587f79..fddf7f550 100644 --- a/src/debugger/gui/CartDPCWidget.cxx +++ b/src/debugger/gui/CartDPCWidget.cxx @@ -42,7 +42,7 @@ CartridgeDPCWidget::CartridgeDPCWidget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << i << " @ $" << Common::Base::HEX4 << (start + 0x80) << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, @@ -50,26 +50,26 @@ CartridgeDPCWidget::CartridgeDPCWidget( myLineHeight; VariantList items; - VarList::push_back(items, "0 ($FF8)"); - VarList::push_back(items, "1 ($FF9)"); + VarList::push_back(items, "0 ($FFF8)"); + VarList::push_back(items, "1 ($FFF9)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); ypos += myLineHeight + 8; // Data fetchers - int lwidth = _font.getStringWidth("Data Fetchers: "); + int lwidth = _font.getStringWidth("Data Fetchers "); new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Data Fetchers: ", kTextAlignLeft); + myFontHeight, "Data Fetchers ", kTextAlignLeft); // Top registers - lwidth = _font.getStringWidth("Counter Registers: "); + lwidth = _font.getStringWidth("Counter Registers "); xpos = 18; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Top Registers: ", kTextAlignLeft); + myFontHeight, "Top Registers ", kTextAlignLeft); xpos += lwidth; myTops = new DataGridWidget(boss, _nfont, xpos, ypos-2, 8, 1, 2, 8, Common::Base::F_16); @@ -79,7 +79,7 @@ CartridgeDPCWidget::CartridgeDPCWidget( // Bottom registers xpos = 18; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Bottom Registers: ", kTextAlignLeft); + myFontHeight, "Bottom Registers ", kTextAlignLeft); xpos += lwidth; myBottoms = new DataGridWidget(boss, _nfont, xpos, ypos-2, 8, 1, 2, 8, Common::Base::F_16); @@ -89,7 +89,7 @@ CartridgeDPCWidget::CartridgeDPCWidget( // Counter registers xpos = 18; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Counter Registers: ", kTextAlignLeft); + myFontHeight, "Counter Registers ", kTextAlignLeft); xpos += lwidth; myCounters = new DataGridWidget(boss, _nfont, xpos, ypos-2, 8, 1, 4, 16, Common::Base::F_16_4); @@ -99,7 +99,7 @@ CartridgeDPCWidget::CartridgeDPCWidget( // Flag registers xpos = 18; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Flag Registers: ", kTextAlignLeft); + myFontHeight, "Flag Registers ", kTextAlignLeft); xpos += lwidth; myFlags = new DataGridWidget(boss, _nfont, xpos, ypos-2, 8, 1, 2, 8, Common::Base::F_16); @@ -108,9 +108,9 @@ CartridgeDPCWidget::CartridgeDPCWidget( // Music mode xpos = 10; ypos += myLineHeight + 12; - lwidth = _font.getStringWidth("Music mode (DF5/DF6/DF7): "); + lwidth = _font.getStringWidth("Music mode (DF5/DF6/DF7) "); new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Music mode (DF5/DF6/DF7): ", kTextAlignLeft); + myFontHeight, "Music mode (DF5/DF6/DF7) ", kTextAlignLeft); xpos += lwidth; myMusicMode = new DataGridWidget(boss, _nfont, xpos, ypos-2, 3, 1, 2, 8, Common::Base::F_16); @@ -120,7 +120,7 @@ CartridgeDPCWidget::CartridgeDPCWidget( // Current random number xpos = 10; ypos += myLineHeight + 4; new StaticTextWidget(boss, _font, xpos, ypos, lwidth, - myFontHeight, "Current random number: ", kTextAlignLeft); + myFontHeight, "Current random number ", kTextAlignLeft); xpos += lwidth; myRandom = new DataGridWidget(boss, _nfont, xpos, ypos-2, 1, 1, 2, 8, Common::Base::F_16); @@ -227,7 +227,7 @@ string CartridgeDPCWidget::bankState() { ostringstream& buf = buffer(); - static const char* spot[] = { "$FF8", "$FF9" }; + static const char* spot[] = { "$FFF8", "$FFF9" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartE0Widget.cxx b/src/debugger/gui/CartE0Widget.cxx index 189797bf9..7ffe02305 100644 --- a/src/debugger/gui/CartE0Widget.cxx +++ b/src/debugger/gui/CartE0Widget.cxx @@ -20,16 +20,16 @@ #include "CartE0Widget.hxx" static const char* seg0[] = { - "0 ($FE0)", "1 ($FE1)", "2 ($FE2)", "3 ($FE3)", - "4 ($FE4)", "5 ($FE5)", "6 ($FE6)", "7 ($FE7)" + "0 ($FFE0)", "1 ($FFE1)", "2 ($FFE2)", "3 ($FFE3)", + "4 ($FFE4)", "5 ($FFE5)", "6 ($FFE6)", "7 ($FFE7)" }; static const char* seg1[] = { - "0 ($FE8)", "1 ($FE9)", "2 ($FEA)", "3 ($FEB)", - "4 ($FEC)", "5 ($FED)", "6 ($FEE)", "7 ($FEF)" + "0 ($FFE8)", "1 ($FFE9)", "2 ($FFEA)", "3 ($FFEB)", + "4 ($FFEC)", "5 ($FFED)", "6 ($FFEE)", "7 ($FFEF)" }; static const char* seg2[] = { - "0 ($FF0)", "1 ($FF1)", "2 ($FF2)", "3 ($FF3)", - "4 ($FF4)", "5 ($FF5)", "6 ($FF6)", "7 ($FF7)" + "0 ($FFF0)", "1 ($FFF1)", "2 ($FFF2)", "3 ($FFF3)", + "4 ($FFF4)", "5 ($FFF5)", "6 ($FFF6)", "7 ($FFF7)" }; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -70,26 +70,26 @@ CartridgeE0Widget::CartridgeE0Widget( VarList::push_back(items2, seg2[i]); } - const int lwidth = _font.getStringWidth("Set slice for segment X: "); + const int lwidth = _font.getStringWidth("Set slice for segment X "); mySlice0 = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("7 ($FF7)"), - myLineHeight, items0, "Set slice for segment 0: ", + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("7 ($FFF7)"), + myLineHeight, items0, "Set slice for segment 0 ", lwidth, kSlice0Changed); mySlice0->setTarget(this); addFocusWidget(mySlice0); ypos += mySlice0->getHeight() + 4; mySlice1 = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("7 ($FF7)"), - myLineHeight, items1, "Set slice for segment 1: ", + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("7 ($FFF7)"), + myLineHeight, items1, "Set slice for segment 1 ", lwidth, kSlice1Changed); mySlice1->setTarget(this); addFocusWidget(mySlice1); ypos += mySlice1->getHeight() + 4; mySlice2 = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("7 ($FF7)"), - myLineHeight, items2, "Set slice for segment 2: ", + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("7 ($FFF7)"), + myLineHeight, items2, "Set slice for segment 2 ", lwidth, kSlice2Changed); mySlice2->setTarget(this); addFocusWidget(mySlice2); diff --git a/src/debugger/gui/CartE7Widget.cxx b/src/debugger/gui/CartE7Widget.cxx index ba005848d..790a52bb7 100644 --- a/src/debugger/gui/CartE7Widget.cxx +++ b/src/debugger/gui/CartE7Widget.cxx @@ -20,11 +20,11 @@ #include "CartE7Widget.hxx" static const char* spot_lower[] = { - "0 - ROM ($FE0)", "1 - ROM ($FE1)", "2 - ROM ($FE2)", "3 - ROM ($FE3)", - "4 - ROM ($FE4)", "5 - ROM ($FE5)", "6 - ROM ($FE6)", "7 - RAM ($FE7)" + "0 - ROM ($FFE0)", "1 - ROM ($FFE1)", "2 - ROM ($FFE2)", "3 - ROM ($FFE3)", + "4 - ROM ($FFE4)", "5 - ROM ($FFE5)", "6 - ROM ($FFE6)", "7 - RAM ($FFE7)" }; static const char* spot_upper[] = { - "0 - RAM ($FE8)", "1 - RAM ($FE9)", "2 - RAM ($FEA)", "3 - RAM ($FEB)" + "0 - RAM ($FFE8)", "1 - RAM ($FFE9)", "2 - RAM ($FFEA)", "3 - RAM ($FFEB)" }; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -65,18 +65,18 @@ CartridgeE7Widget::CartridgeE7Widget( for(int i = 0; i < 4; ++i) VarList::push_back(items1, spot_upper[i]); - const int lwidth = _font.getStringWidth("Set slice for upper 256B: "), - fwidth = _font.getStringWidth("3 - RAM ($FEB)"); + const int lwidth = _font.getStringWidth("Set slice for upper 256B "), + fwidth = _font.getStringWidth("3 - RAM ($FFEB)"); myLower2K = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, myLineHeight, items0, - "Set slice for lower 2K: ", lwidth, kLowerChanged); + "Set slice for lower 2K ", lwidth, kLowerChanged); myLower2K->setTarget(this); addFocusWidget(myLower2K); ypos += myLower2K->getHeight() + 4; myUpper256B = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, myLineHeight, items1, - "Set slice for upper 256B: ", lwidth, kUpperChanged); + "Set slice for upper 256B ", lwidth, kUpperChanged); myUpper256B->setTarget(this); addFocusWidget(myUpper256B); } diff --git a/src/debugger/gui/CartEFSCWidget.cxx b/src/debugger/gui/CartEFSCWidget.cxx index 37546e35f..838a39aa1 100644 --- a/src/debugger/gui/CartEFSCWidget.cxx +++ b/src/debugger/gui/CartEFSCWidget.cxx @@ -40,7 +40,7 @@ CartridgeEFSCWidget::CartridgeEFSCWidget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << std::dec << i << " @ $" << Common::Base::HEX4 << (start + 0x100) - << " - " << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << " - " << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, @@ -48,26 +48,26 @@ CartridgeEFSCWidget::CartridgeEFSCWidget( info.str()) + myLineHeight; VariantList items; - VarList::push_back(items, " 0 ($FE0)"); - VarList::push_back(items, " 1 ($FE1)"); - VarList::push_back(items, " 2 ($FE2)"); - VarList::push_back(items, " 3 ($FE3)"); - VarList::push_back(items, " 4 ($FE4)"); - VarList::push_back(items, " 5 ($FE5)"); - VarList::push_back(items, " 6 ($FE6)"); - VarList::push_back(items, " 7 ($FE7)"); - VarList::push_back(items, " 8 ($FE8)"); - VarList::push_back(items, " 9 ($FE9)"); - VarList::push_back(items, "10 ($FEA)"); - VarList::push_back(items, "11 ($FEB)"); - VarList::push_back(items, "12 ($FEC)"); - VarList::push_back(items, "13 ($FED)"); - VarList::push_back(items, "14 ($FEE)"); - VarList::push_back(items, "15 ($FEF)"); + VarList::push_back(items, " 0 ($FFE0)"); + VarList::push_back(items, " 1 ($FFE1)"); + VarList::push_back(items, " 2 ($FFE2)"); + VarList::push_back(items, " 3 ($FFE3)"); + VarList::push_back(items, " 4 ($FFE4)"); + VarList::push_back(items, " 5 ($FFE5)"); + VarList::push_back(items, " 6 ($FFE6)"); + VarList::push_back(items, " 7 ($FFE7)"); + VarList::push_back(items, " 8 ($FFE8)"); + VarList::push_back(items, " 9 ($FFE9)"); + VarList::push_back(items, "10 ($FFEA)"); + VarList::push_back(items, "11 ($FFEB)"); + VarList::push_back(items, "12 ($FFEC)"); + VarList::push_back(items, "13 ($FFED)"); + VarList::push_back(items, "14 ($FFEE)"); + VarList::push_back(items, "15 ($FFEF)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FE0) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FFE0) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -110,8 +110,8 @@ string CartridgeEFSCWidget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$FE0", "$FE1", "$FE2", "$FE3", "$FE4", "$FE5", "$FE6", "$FE7", - "$FE8", "$FE9", "$FEA", "$FEB", "$FEC", "$FED", "$FEE", "$FEF" + "$FFE0", "$FFE1", "$FFE2", "$FFE3", "$FFE4", "$FFE5", "$FFE6", "$FFE7", + "$FFE8", "$FFE9", "$FFEA", "$FFEB", "$FFEC", "$FFED", "$FFEE", "$FFEF" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartEFWidget.cxx b/src/debugger/gui/CartEFWidget.cxx index bd15302c4..9eda82221 100644 --- a/src/debugger/gui/CartEFWidget.cxx +++ b/src/debugger/gui/CartEFWidget.cxx @@ -38,7 +38,7 @@ CartridgeEFWidget::CartridgeEFWidget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << std::dec << i << " @ $" << Common::Base::HEX4 << start << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, @@ -46,26 +46,26 @@ CartridgeEFWidget::CartridgeEFWidget( info.str()) + myLineHeight; VariantList items; - VarList::push_back(items, " 0 ($FE0)"); - VarList::push_back(items, " 1 ($FE1)"); - VarList::push_back(items, " 2 ($FE2)"); - VarList::push_back(items, " 3 ($FE3)"); - VarList::push_back(items, " 4 ($FE4)"); - VarList::push_back(items, " 5 ($FE5)"); - VarList::push_back(items, " 6 ($FE6)"); - VarList::push_back(items, " 7 ($FE7)"); - VarList::push_back(items, " 8 ($FE8)"); - VarList::push_back(items, " 9 ($FE9)"); - VarList::push_back(items, "10 ($FEA)"); - VarList::push_back(items, "11 ($FEB)"); - VarList::push_back(items, "12 ($FEC)"); - VarList::push_back(items, "13 ($FED)"); - VarList::push_back(items, "14 ($FEE)"); - VarList::push_back(items, "15 ($FEF)"); + VarList::push_back(items, " 0 ($FFE0)"); + VarList::push_back(items, " 1 ($FFE1)"); + VarList::push_back(items, " 2 ($FFE2)"); + VarList::push_back(items, " 3 ($FFE3)"); + VarList::push_back(items, " 4 ($FFE4)"); + VarList::push_back(items, " 5 ($FFE5)"); + VarList::push_back(items, " 6 ($FFE6)"); + VarList::push_back(items, " 7 ($FFE7)"); + VarList::push_back(items, " 8 ($FFE8)"); + VarList::push_back(items, " 9 ($FFE9)"); + VarList::push_back(items, "10 ($FFEA)"); + VarList::push_back(items, "11 ($FFEB)"); + VarList::push_back(items, "12 ($FFEC)"); + VarList::push_back(items, "13 ($FFED)"); + VarList::push_back(items, "14 ($FFEE)"); + VarList::push_back(items, "15 ($FFEF)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FE0) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FFE0) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -97,8 +97,8 @@ string CartridgeEFWidget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$FE0", "$FE1", "$FE2", "$FE3", "$FE4", "$FE5", "$FE6", "$FE7", - "$FE8", "$FE9", "$FEA", "$FEB", "$FEC", "$FED", "$FEE", "$FEF" + "$FFE0", "$FFE1", "$FFE2", "$FFE3", "$FFE4", "$FFE5", "$FFE6", "$FFE7", + "$FFE8", "$FFE9", "$FFEA", "$FFEB", "$FFEC", "$FFED", "$FFEE", "$FFEF" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartF0Widget.cxx b/src/debugger/gui/CartF0Widget.cxx index 1d57da240..353126c4f 100644 --- a/src/debugger/gui/CartF0Widget.cxx +++ b/src/debugger/gui/CartF0Widget.cxx @@ -65,8 +65,8 @@ CartridgeF0Widget::CartridgeF0Widget( VarList::push_back(items, " 15"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 15 "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -97,7 +97,7 @@ string CartridgeF0Widget::bankState() { ostringstream& buf = buffer(); - buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = $FF0"; + buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = $FFF0"; return buf.str(); } diff --git a/src/debugger/gui/CartF4SCWidget.cxx b/src/debugger/gui/CartF4SCWidget.cxx index e54ad7de9..1452bf531 100644 --- a/src/debugger/gui/CartF4SCWidget.cxx +++ b/src/debugger/gui/CartF4SCWidget.cxx @@ -40,25 +40,25 @@ CartridgeF4SCWidget::CartridgeF4SCWidget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << i << " @ $" << Common::Base::HEX4 << (start + 0x100) << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, ypos = addBaseInformation(size, "Atari", info.str(), 15) + myLineHeight; VariantList items; - VarList::push_back(items, "0 ($FF4)"); - VarList::push_back(items, "1 ($FF5)"); - VarList::push_back(items, "2 ($FF6)"); - VarList::push_back(items, "3 ($FF7)"); - VarList::push_back(items, "4 ($FF8)"); - VarList::push_back(items, "5 ($FF9)"); - VarList::push_back(items, "6 ($FFA)"); - VarList::push_back(items, "7 ($FFB)"); + VarList::push_back(items, "0 ($FFF4)"); + VarList::push_back(items, "1 ($FFF5)"); + VarList::push_back(items, "2 ($FFF6)"); + VarList::push_back(items, "3 ($FFF7)"); + VarList::push_back(items, "4 ($FFF8)"); + VarList::push_back(items, "5 ($FFF9)"); + VarList::push_back(items, "6 ($FFFA)"); + VarList::push_back(items, "7 ($FFFB)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -101,7 +101,7 @@ string CartridgeF4SCWidget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$FF4", "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" + "$FFF4", "$FFF5", "$FFF6", "$FFF7", "$FFF8", "$FFF9", "$FFFA", "$FFFB" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartF4Widget.cxx b/src/debugger/gui/CartF4Widget.cxx index fab3b3ade..a1a0ab95b 100644 --- a/src/debugger/gui/CartF4Widget.cxx +++ b/src/debugger/gui/CartF4Widget.cxx @@ -38,25 +38,25 @@ CartridgeF4Widget::CartridgeF4Widget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << i << " @ $" << Common::Base::HEX4 << start << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, ypos = addBaseInformation(size, "Atari", info.str(), 15) + myLineHeight; VariantList items; - VarList::push_back(items, "0 ($FF4)"); - VarList::push_back(items, "1 ($FF5)"); - VarList::push_back(items, "2 ($FF6)"); - VarList::push_back(items, "3 ($FF7)"); - VarList::push_back(items, "4 ($FF8)"); - VarList::push_back(items, "5 ($FF9)"); - VarList::push_back(items, "6 ($FFA)"); - VarList::push_back(items, "7 ($FFB)"); + VarList::push_back(items, "0 ($FFF4)"); + VarList::push_back(items, "1 ($FFF5)"); + VarList::push_back(items, "2 ($FFF6)"); + VarList::push_back(items, "3 ($FFF7)"); + VarList::push_back(items, "4 ($FFF8)"); + VarList::push_back(items, "5 ($FFF9)"); + VarList::push_back(items, "6 ($FFFA)"); + VarList::push_back(items, "7 ($FFFB)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -88,7 +88,7 @@ string CartridgeF4Widget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$FF4", "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" + "$FFF4", "$FFF5", "$FFF6", "$FFF7", "$FFF8", "$FFF9", "$FFFA", "$FFFB" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartF6SCWidget.cxx b/src/debugger/gui/CartF6SCWidget.cxx index cac35d4ee..62aa33ce7 100644 --- a/src/debugger/gui/CartF6SCWidget.cxx +++ b/src/debugger/gui/CartF6SCWidget.cxx @@ -40,21 +40,21 @@ CartridgeF6SCWidget::CartridgeF6SCWidget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << i << " @ $" << Common::Base::HEX4 << (start + 0x100) << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; VariantList items; - VarList::push_back(items, "0 ($FF6)"); - VarList::push_back(items, "1 ($FF7)"); - VarList::push_back(items, "2 ($FF8)"); - VarList::push_back(items, "3 ($FF9)"); + VarList::push_back(items, "0 ($FFF6)"); + VarList::push_back(items, "1 ($FFF7)"); + VarList::push_back(items, "2 ($FFF8)"); + VarList::push_back(items, "3 ($FFF9)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -96,7 +96,7 @@ string CartridgeF6SCWidget::bankState() { ostringstream& buf = buffer(); - static const char* spot[] = { "$FF6", "$FF7", "$FF8", "$FF9" }; + static const char* spot[] = { "$FFF6", "$FFF7", "$FFF8", "$FFF9" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartF6Widget.cxx b/src/debugger/gui/CartF6Widget.cxx index c2191b633..971afd96d 100644 --- a/src/debugger/gui/CartF6Widget.cxx +++ b/src/debugger/gui/CartF6Widget.cxx @@ -38,21 +38,21 @@ CartridgeF6Widget::CartridgeF6Widget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << i << " @ $" << Common::Base::HEX4 << start << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; VariantList items; - VarList::push_back(items, "0 ($FF6)"); - VarList::push_back(items, "1 ($FF7)"); - VarList::push_back(items, "2 ($FF8)"); - VarList::push_back(items, "3 ($FF9)"); + VarList::push_back(items, "0 ($FFF6)"); + VarList::push_back(items, "1 ($FFF7)"); + VarList::push_back(items, "2 ($FFF8)"); + VarList::push_back(items, "3 ($FFF9)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -83,7 +83,7 @@ string CartridgeF6Widget::bankState() { ostringstream& buf = buffer(); - static const char* spot[] = { "$FF6", "$FF7", "$FF8", "$FF9" }; + static const char* spot[] = { "$FFF6", "$FFF7", "$FFF8", "$FFF9" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartF8SCWidget.cxx b/src/debugger/gui/CartF8SCWidget.cxx index 6af9fd713..7b16242ad 100644 --- a/src/debugger/gui/CartF8SCWidget.cxx +++ b/src/debugger/gui/CartF8SCWidget.cxx @@ -40,19 +40,19 @@ CartridgeF8SCWidget::CartridgeF8SCWidget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << i << " @ $" << Common::Base::HEX4 << (start + 0x100) << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; VariantList items; - VarList::push_back(items, "0 ($FF8)"); - VarList::push_back(items, "1 ($FF9)"); + VarList::push_back(items, "0 ($FFF8)"); + VarList::push_back(items, "1 ($FFF9)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -78,7 +78,7 @@ void CartridgeF8SCWidget::loadConfig() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void CartridgeF8SCWidget::handleCommand(CommandSender* sender, - int cmd, int data, int id) + int cmd, int data, int id) { if(cmd == kBankChanged) { @@ -94,7 +94,7 @@ string CartridgeF8SCWidget::bankState() { ostringstream& buf = buffer(); - static const char* spot[] = { "$FF8", "$FF9" }; + static const char* spot[] = { "$FFF8", "$FFF9" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartF8Widget.cxx b/src/debugger/gui/CartF8Widget.cxx index 9cb5bdac6..3070a61bc 100644 --- a/src/debugger/gui/CartF8Widget.cxx +++ b/src/debugger/gui/CartF8Widget.cxx @@ -38,19 +38,19 @@ CartridgeF8Widget::CartridgeF8Widget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << i << " @ $" << Common::Base::HEX4 << start << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; VariantList items; - VarList::push_back(items, "0 ($FF8)"); - VarList::push_back(items, "1 ($FF9)"); + VarList::push_back(items, "0 ($FFF8)"); + VarList::push_back(items, "1 ($FFF9)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -81,7 +81,7 @@ string CartridgeF8Widget::bankState() { ostringstream& buf = buffer(); - static const char* spot[] = { "$FF8", "$FF9" }; + static const char* spot[] = { "$FFF8", "$FFF9" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartFA2Widget.cxx b/src/debugger/gui/CartFA2Widget.cxx index 069bceb21..7e86f2252 100644 --- a/src/debugger/gui/CartFA2Widget.cxx +++ b/src/debugger/gui/CartFA2Widget.cxx @@ -32,7 +32,7 @@ CartridgeFA2Widget::CartridgeFA2Widget( info << "Modified FA RAM+, six or seven 4K banks\n" << "256 bytes RAM @ $F000 - $F1FF\n" << " $F100 - $F1FF (R), $F000 - $F0FF (W)\n" - << "RAM can be loaded/saved to Harmony flash by accessing $FF4\n" + << "RAM can be loaded/saved to Harmony flash by accessing $FFF4\n" << "Startup bank = " << cart.myStartBank << "\n"; // Eventually, we should query this from the debugger/disassembler @@ -42,7 +42,7 @@ CartridgeFA2Widget::CartridgeFA2Widget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << i << " @ $" << Common::Base::HEX4 << (start + 0x200) << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, @@ -50,19 +50,19 @@ CartridgeFA2Widget::CartridgeFA2Widget( info.str(), 15) + myLineHeight; VariantList items; - VarList::push_back(items, "0 ($FF5)"); - VarList::push_back(items, "1 ($FF6)"); - VarList::push_back(items, "2 ($FF7)"); - VarList::push_back(items, "3 ($FF8)"); - VarList::push_back(items, "4 ($FF9)"); - VarList::push_back(items, "5 ($FFA)"); + VarList::push_back(items, "0 ($FFF5)"); + VarList::push_back(items, "1 ($FFF6)"); + VarList::push_back(items, "2 ($FFF7)"); + VarList::push_back(items, "3 ($FFF8)"); + VarList::push_back(items, "4 ($FFF9)"); + VarList::push_back(items, "5 ($FFFA)"); if(cart.bankCount() == 7) - VarList::push_back(items, "6 ($FFB)"); + VarList::push_back(items, "6 ($FFFB)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); ypos += myLineHeight + 20; @@ -70,8 +70,8 @@ CartridgeFA2Widget::CartridgeFA2Widget( const int bwidth = _font.getStringWidth("Erase") + 20; StaticTextWidget* t = new StaticTextWidget(boss, _font, xpos, ypos, - _font.getStringWidth("Harmony Flash: "), - myFontHeight, "Harmony Flash: ", kTextAlignLeft); + _font.getStringWidth("Harmony Flash "), + myFontHeight, "Harmony Flash ", kTextAlignLeft); xpos += t->getWidth() + 4; myFlashErase = @@ -147,7 +147,7 @@ string CartridgeFA2Widget::bankState() ostringstream& buf = buffer(); static const char* spot[] = { - "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" + "$FFF5", "$FFF6", "$FFF7", "$FFF8", "$FFF9", "$FFFA", "$FFFB" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartFAWidget.cxx b/src/debugger/gui/CartFAWidget.cxx index cd455974a..bbd6a04f0 100644 --- a/src/debugger/gui/CartFAWidget.cxx +++ b/src/debugger/gui/CartFAWidget.cxx @@ -40,20 +40,20 @@ CartridgeFAWidget::CartridgeFAWidget( uInt16 start = (cart.myImage[offset+1] << 8) | cart.myImage[offset]; start -= start % 0x1000; info << "Bank " << i << " @ $" << Common::Base::HEX4 << (start + 0x200) << " - " - << "$" << (start + 0xFFF) << " (hotspot = $" << (spot+i) << ")\n"; + << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; } int xpos = 10, ypos = addBaseInformation(size, "CBS", info.str()) + myLineHeight; VariantList items; - VarList::push_back(items, "0 ($FF8)"); - VarList::push_back(items, "1 ($FF9)"); - VarList::push_back(items, "2 ($FFA)"); + VarList::push_back(items, "0 ($FFF8)"); + VarList::push_back(items, "1 ($FFF9)"); + VarList::push_back(items, "2 ($FFFA)"); myBank = - new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } @@ -95,7 +95,7 @@ string CartridgeFAWidget::bankState() { ostringstream& buf = buffer(); - static const char* spot[] = { "$FF8", "$FF9", "$FFA" }; + static const char* spot[] = { "$FFF8", "$FFF9", "$FFFA" }; buf << "Bank = " << std::dec << myCart.myCurrentBank << ", hotspot = " << spot[myCart.myCurrentBank]; diff --git a/src/debugger/gui/CartMCWidget.cxx b/src/debugger/gui/CartMCWidget.cxx index da7514111..e0902cebf 100644 --- a/src/debugger/gui/CartMCWidget.cxx +++ b/src/debugger/gui/CartMCWidget.cxx @@ -56,12 +56,12 @@ CartridgeMCWidget::CartridgeMCWidget( VarList::push_back(items, b + " (RAM)", b); } - const int lwidth = _font.getStringWidth("Set slice for segment X ($3X): "), + const int lwidth = _font.getStringWidth("Set slice for segment X ($3X) "), fwidth = _font.getStringWidth("255 (ROM)"); mySlice0 = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, - myLineHeight, items, "Set slice for segment 0 ($3C): ", + myLineHeight, items, "Set slice for segment 0 ($3C) ", lwidth, kSlice0Changed); mySlice0->setTarget(this); addFocusWidget(mySlice0); @@ -69,7 +69,7 @@ CartridgeMCWidget::CartridgeMCWidget( mySlice1 = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, - myLineHeight, items, "Set slice for segment 1 ($3D): ", + myLineHeight, items, "Set slice for segment 1 ($3D) ", lwidth, kSlice1Changed); mySlice1->setTarget(this); addFocusWidget(mySlice1); @@ -77,7 +77,7 @@ CartridgeMCWidget::CartridgeMCWidget( mySlice2 = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, - myLineHeight, items, "Set slice for segment 2 ($3E): ", + myLineHeight, items, "Set slice for segment 2 ($3E) ", lwidth, kSlice2Changed); mySlice2->setTarget(this); addFocusWidget(mySlice2); @@ -85,7 +85,7 @@ CartridgeMCWidget::CartridgeMCWidget( mySlice3 = new PopUpWidget(boss, _font, xpos, ypos-2, fwidth, - myLineHeight, items, "Set slice for segment 3 ($3F): ", + myLineHeight, items, "Set slice for segment 3 ($3F) ", lwidth, kSlice3Changed); mySlice3->setTarget(this); addFocusWidget(mySlice3); diff --git a/src/debugger/gui/CartMDMWidget.cxx b/src/debugger/gui/CartMDMWidget.cxx index 952534739..4cd13fffc 100644 --- a/src/debugger/gui/CartMDMWidget.cxx +++ b/src/debugger/gui/CartMDMWidget.cxx @@ -48,8 +48,8 @@ CartridgeMDMWidget::CartridgeMDMWidget( myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("xxx ($0FFF) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); diff --git a/src/debugger/gui/CartSBWidget.cxx b/src/debugger/gui/CartSBWidget.cxx index c2d963400..29b925494 100644 --- a/src/debugger/gui/CartSBWidget.cxx +++ b/src/debugger/gui/CartSBWidget.cxx @@ -56,8 +56,8 @@ CartridgeSBWidget::CartridgeSBWidget( myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("XX ($800) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } diff --git a/src/debugger/gui/CartUAWidget.cxx b/src/debugger/gui/CartUAWidget.cxx index 390f87464..5a80a5745 100644 --- a/src/debugger/gui/CartUAWidget.cxx +++ b/src/debugger/gui/CartUAWidget.cxx @@ -50,8 +50,8 @@ CartridgeUAWidget::CartridgeUAWidget( VarList::push_back(items, "1 ($240)"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx) "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } diff --git a/src/debugger/gui/CartWDWidget.cxx b/src/debugger/gui/CartWDWidget.cxx index d31ca103b..ce36cb015 100644 --- a/src/debugger/gui/CartWDWidget.cxx +++ b/src/debugger/gui/CartWDWidget.cxx @@ -57,8 +57,8 @@ CartridgeWDWidget::CartridgeWDWidget( VarList::push_back(items, "15 ($3F) [6,0,5,1*]", 15); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($3F) [6,0,5,1*]"), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } diff --git a/src/debugger/gui/CartX07Widget.cxx b/src/debugger/gui/CartX07Widget.cxx index d32218bf8..00d51c9b7 100644 --- a/src/debugger/gui/CartX07Widget.cxx +++ b/src/debugger/gui/CartX07Widget.cxx @@ -66,8 +66,8 @@ CartridgeX07Widget::CartridgeX07Widget( VarList::push_back(items, " 15"); myBank = new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 15 "), - myLineHeight, items, "Set bank: ", - _font.getStringWidth("Set bank: "), kBankChanged); + myLineHeight, items, "Set bank ", + _font.getStringWidth("Set bank "), kBankChanged); myBank->setTarget(this); addFocusWidget(myBank); } diff --git a/src/debugger/gui/RomWidget.cxx b/src/debugger/gui/RomWidget.cxx index 9de78da8d..921c322c8 100644 --- a/src/debugger/gui/RomWidget.cxx +++ b/src/debugger/gui/RomWidget.cxx @@ -48,7 +48,7 @@ RomWidget::RomWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& n "Bank", kTextAlignLeft); xpos += t->getWidth() + 5; - myBank = new EditTextWidget(boss, nfont, xpos, ypos-1, + myBank = new EditTextWidget(boss, nfont, xpos, ypos-2, _w - 2 - xpos, nfont.getLineHeight()); // Create rom listing