Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-20 00:17:16 +00:00
Code Issues Projects Releases Wiki Activity

Remove TEXT() and _T(). (PR #1379)

Browse Source
This commit is contained in:
Andrea
2025-02-13 20:48:37 +00:00
committed by GitHub
parent b35a4d17d2
commit acbef19489
37 changed files with 779 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/CmdLine.cpp
+2 -2
View File
@@ -457,7 +457,7 @@ bool ProcessCmdLine(LPSTR lpCmdLine)
{
std::string msg = "Failed to load video rom (not found or not exactly 2/4/8/16KiB)\n";
LogFileOutput("%s", msg.c_str());
GetFrame().FrameMessageBox(msg.c_str(), TEXT("AppleWin Error"), MB_OK);
GetFrame().FrameMessageBox(msg.c_str(), "AppleWin Error", MB_OK);
}
else
{
@@ -681,7 +681,7 @@ bool ProcessCmdLine(LPSTR lpCmdLine)
if (!SNESMAXCard::ParseControllerMappingFile(joyNum, lpCmdLine, errorMsg))
{
LogFileOutput("%s", errorMsg.c_str());
GetFrame().FrameMessageBox(errorMsg.c_str(), TEXT("AppleWin Error"), MB_OK);
GetFrame().FrameMessageBox(errorMsg.c_str(), "AppleWin Error", MB_OK);
}
}
else if (strcmp(lpCmdLine, "-wav-speaker") == 0)
source/Common.h
+13 -13
View File
@@ -46,20 +46,20 @@ enum AppMode_e
#define BTN_SETUP 7
// TODO: Move to StringTable.h
#define TITLE_APPLE_2 TEXT("Apple ][ Emulator")
#define TITLE_APPLE_2_PLUS TEXT("Apple ][+ Emulator")
#define TITLE_APPLE_2_JPLUS TEXT("Apple ][ J-Plus Emulator")
#define TITLE_APPLE_2E TEXT("Apple //e Emulator")
#define TITLE_APPLE_2E_ENHANCED TEXT("Enhanced Apple //e Emulator")
#define TITLE_APPLE_2C TEXT("Apple //e Emulator")
#define TITLE_PRAVETS_82 TEXT("Pravets 82 Emulator")
#define TITLE_PRAVETS_8M TEXT("Pravets 8M Emulator")
#define TITLE_PRAVETS_8A TEXT("Pravets 8A Emulator")
#define TITLE_TK3000_2E TEXT("TK3000 //e Emulator")
#define TITLE_BASE64A TEXT("Base64A Emulator")
#define TITLE_APPLE_2 "Apple ][ Emulator"
#define TITLE_APPLE_2_PLUS "Apple ][+ Emulator"
#define TITLE_APPLE_2_JPLUS "Apple ][ J-Plus Emulator"
#define TITLE_APPLE_2E "Apple //e Emulator"
#define TITLE_APPLE_2E_ENHANCED "Enhanced Apple //e Emulator"
#define TITLE_APPLE_2C "Apple //e Emulator"
#define TITLE_PRAVETS_82 "Pravets 82 Emulator"
#define TITLE_PRAVETS_8M "Pravets 8M Emulator"
#define TITLE_PRAVETS_8A "Pravets 8A Emulator"
#define TITLE_TK3000_2E "TK3000 //e Emulator"
#define TITLE_BASE64A "Base64A Emulator"
#define TITLE_PAUSED TEXT("* PAUSED *")
#define TITLE_STEPPING TEXT("Stepping")
#define TITLE_PAUSED "* PAUSED *"
#define TITLE_STEPPING "Stepping"
// Configuration
#define REG_CONFIG "Configuration"
source/Configuration/About.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ static INT_PTR CALLBACK DlgProcAbout(HWND hWnd, UINT message, WPARAM wparam, LPA
case WM_INITDIALOG:
{
HICON hIcon = LoadIcon(GetFrame().g_hInstance, TEXT("APPLEWIN_ICON"));
HICON hIcon = LoadIcon(GetFrame().g_hInstance, "APPLEWIN_ICON");
SendDlgItemMessage(hWnd, IDC_APPLEWIN_ICON, STM_SETIMAGE, IMAGE_ICON, reinterpret_cast<LPARAM>(hIcon));
std::string strAppleWinVersion = "AppleWin v" + g_VERSIONSTRING;
source/Configuration/PageAdvanced.cpp
+8 -8
View File
@@ -38,11 +38,11 @@ CPageAdvanced* CPageAdvanced::ms_this = 0; // reinit'd in ctor
enum CLONECHOICE {MENUITEM_CLONEMIN, MENUITEM_PRAVETS82=MENUITEM_CLONEMIN, MENUITEM_PRAVETS8M, MENUITEM_PRAVETS8A, MENUITEM_TK30002E, MENUITEM_BASE64A, MENUITEM_CLONEMAX};
const char CPageAdvanced::m_CloneChoices[] =
TEXT("Pravets 82\0") // Bulgarian
TEXT("Pravets 8M\0") // Bulgarian
TEXT("Pravets 8A\0") // Bulgarian
TEXT("TK3000 //e\0") // Brazilian
TEXT("Base 64A\0"); // Taiwanese
"Pravets 82\0" // Bulgarian
"Pravets 8M\0" // Bulgarian
"Pravets 8A\0" // Bulgarian
"TK3000 //e\0" // Brazilian
"Base 64A\0"; // Taiwanese
const char CPageAdvanced::m_gameIOConnectorChoices[] =
"Empty\0"
@@ -98,12 +98,12 @@ INT_PTR CPageAdvanced::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, L
case IDC_SAVESTATE_FILENAME:
break;
case IDC_SAVESTATE_BROWSE:
if(m_PropertySheetHelper.SaveStateSelectImage(hWnd, TEXT("Select Save State file"), true))
if(m_PropertySheetHelper.SaveStateSelectImage(hWnd, "Select Save State file", true))
SendDlgItemMessage(hWnd, IDC_SAVESTATE_FILENAME, WM_SETTEXT, 0, (LPARAM)m_PropertySheetHelper.GetSSNewFilename().c_str());
break;
case IDC_PRINTER_DUMP_FILENAME_BROWSE:
{
std::string strPrinterDumpLoc = m_PropertySheetHelper.BrowseToFile(hWnd, TEXT("Select printer dump file"), REGVALUE_PRINTER_FILENAME, TEXT("Text files (*.txt)\0*.txt\0") TEXT("All Files\0*.*\0"));
std::string strPrinterDumpLoc = m_PropertySheetHelper.BrowseToFile(hWnd, "Select printer dump file", REGVALUE_PRINTER_FILENAME, "Text files (*.txt)\0*.txt\0" "All Files\0*.*\0");
SendDlgItemMessage(hWnd, IDC_PRINTER_DUMP_FILENAME, WM_SETTEXT, 0, (LPARAM)strPrinterDumpLoc.c_str());
}
break;
@@ -195,7 +195,7 @@ void CPageAdvanced::DlgOK(HWND hWnd)
}
g_bSaveStateOnExit = IsDlgButtonChecked(hWnd, IDC_SAVESTATE_ON_EXIT) ? true : false;
REGSAVE(TEXT(REGVALUE_SAVE_STATE_ON_EXIT), g_bSaveStateOnExit ? 1 : 0);
REGSAVE(REGVALUE_SAVE_STATE_ON_EXIT, g_bSaveStateOnExit ? 1 : 0);
// Save the copy protection dongle type
RegSetConfigGameIOConnectorNewDongleType(GAME_IO_CONNECTOR, GetCopyProtectionDongleType());
source/Configuration/PageConfig.cpp
+24 -24
View File
@@ -40,12 +40,12 @@ CPageConfig* CPageConfig::ms_this = 0; // reinit'd in ctor
enum APPLEIICHOICE {MENUITEM_IIORIGINAL, MENUITEM_IIPLUS, MENUITEM_IIJPLUS, MENUITEM_IIE, MENUITEM_ENHANCEDIIE, MENUITEM_CLONE};
const char CPageConfig::m_ComputerChoices[] =
TEXT("Apple ][ (Original)\0")
TEXT("Apple ][+\0")
TEXT("Apple ][ J-Plus\0")
TEXT("Apple //e\0")
TEXT("Enhanced Apple //e\0")
TEXT("Clone\0");
"Apple ][ (Original)\0"
"Apple ][+\0"
"Apple ][ J-Plus\0"
"Apple //e\0"
"Enhanced Apple //e\0"
"Clone\0";
INT_PTR CALLBACK CPageConfig::DlgProc(HWND hWnd, UINT message, WPARAM wparam, LPARAM lparam)
{
@@ -171,12 +171,12 @@ INT_PTR CPageConfig::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPA
#if 0
case IDC_RECALIBRATE:
RegSaveValue(TEXT(""),TEXT("RunningOnOS"),0,0);
RegSaveValue("","RunningOnOS",0,0);
if (MessageBox(hWnd,
TEXT("The emulator has been set to recalibrate ")
TEXT("itself the next time it is started.\n\n")
TEXT("Would you like to restart the emulator now?"),
TEXT(REG_CONFIG),
"The emulator has been set to recalibrate "
"itself the next time it is started.\n\n"
"Would you like to restart the emulator now?",
REG_CONFIG,
MB_ICONQUESTION | MB_OKCANCEL | MB_SETFOREGROUND) == IDOK)
{
PropSheet_PressButton(GetParent(hWnd), PSBTN_OK);
@@ -246,7 +246,7 @@ INT_PTR CPageConfig::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPA
if (g_dwSpeed == SPEED_NORMAL)
{
uint32_t dwCustomSpeed;
REGLOAD_DEFAULT(TEXT(REGVALUE_CUSTOM_SPEED), &dwCustomSpeed, 0);
REGLOAD_DEFAULT(REGVALUE_CUSTOM_SPEED, &dwCustomSpeed, 0);
bCustom = dwCustomSpeed ? TRUE : FALSE;
}
CheckRadioButton(hWnd, IDC_AUTHENTIC_SPEED, IDC_CUSTOM_SPEED, bCustom ? IDC_CUSTOM_SPEED : IDC_AUTHENTIC_SPEED);
@@ -354,7 +354,7 @@ void CPageConfig::DlgOK(HWND hWnd)
if (win32Frame.GetFullScreenShowSubunitStatus() != bNewFSSubunitStatus)
{
REGSAVE(TEXT(REGVALUE_FS_SHOW_SUBUNIT_STATUS), bNewFSSubunitStatus ? 1 : 0);
REGSAVE(REGVALUE_FS_SHOW_SUBUNIT_STATUS, bNewFSSubunitStatus ? 1 : 0);
win32Frame.SetFullScreenShowSubunitStatus(bNewFSSubunitStatus);
if (win32Frame.IsFullScreen())
@@ -366,7 +366,7 @@ void CPageConfig::DlgOK(HWND hWnd)
const BOOL bNewConfirmReboot = IsDlgButtonChecked(hWnd, IDC_CHECK_CONFIRM_REBOOT) ? 1 : 0;
if (win32Frame.g_bConfirmReboot != bNewConfirmReboot)
{
REGSAVE(TEXT(REGVALUE_CONFIRM_REBOOT), bNewConfirmReboot);
REGSAVE(REGVALUE_CONFIRM_REBOOT, bNewConfirmReboot);
win32Frame.g_bConfirmReboot = bNewConfirmReboot;
}
@@ -387,8 +387,8 @@ void CPageConfig::DlgOK(HWND hWnd)
SetCurrentCLK6502();
REGSAVE(TEXT(REGVALUE_CUSTOM_SPEED), IsDlgButtonChecked(hWnd, IDC_CUSTOM_SPEED));
REGSAVE(TEXT(REGVALUE_EMULATION_SPEED), g_dwSpeed);
REGSAVE(REGVALUE_CUSTOM_SPEED, IsDlgButtonChecked(hWnd, IDC_CUSTOM_SPEED));
REGSAVE(REGVALUE_EMULATION_SPEED, g_dwSpeed);
m_PropertySheetHelper.PostMsgAfterClose(hWnd, m_Page);
}
@@ -440,9 +440,9 @@ bool CPageConfig::IsOkToBenchmark(HWND hWnd, const bool bConfigChanged)
if (bConfigChanged)
{
if (MessageBox(hWnd,
TEXT("The hardware configuration has changed. Benchmarking will lose these changes.\n\n")
TEXT("Are you sure you want to do this?"),
TEXT("Benchmarks"),
"The hardware configuration has changed. Benchmarking will lose these changes.\n\n"
"Are you sure you want to do this?",
"Benchmarks",
MB_ICONQUESTION | MB_OKCANCEL | MB_SETFOREGROUND) == IDCANCEL)
return false;
}
@@ -451,11 +451,11 @@ bool CPageConfig::IsOkToBenchmark(HWND hWnd, const bool bConfigChanged)
return true;
if (MessageBox(hWnd,
TEXT("Running the benchmarks will reset the state of ")
TEXT("the emulated machine, causing you to lose any ")
TEXT("unsaved work.\n\n")
TEXT("Are you sure you want to do this?"),
TEXT("Benchmarks"),
"Running the benchmarks will reset the state of "
"the emulated machine, causing you to lose any "
"unsaved work.\n\n"
"Are you sure you want to do this?",
"Benchmarks",
MB_ICONQUESTION | MB_OKCANCEL | MB_SETFOREGROUND) == IDCANCEL)
return false;
source/Configuration/PageDisk.cpp
+8 -8
View File
@@ -38,12 +38,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
CPageDisk* CPageDisk::ms_this = 0; // reinit'd in ctor
const char CPageDisk::m_defaultDiskOptions[] =
TEXT("Select Disk...\0")
TEXT("Eject Disk\0");
"Select Disk...\0"
"Eject Disk\0";
const char CPageDisk::m_defaultHDDOptions[] =
TEXT("Select Hard Disk Image...\0")
TEXT("Unplug Hard Disk Image\0");
"Select Hard Disk Image...\0"
"Unplug Hard Disk Image\0";
INT_PTR CALLBACK CPageDisk::DlgProc(HWND hWnd, UINT message, WPARAM wparam, LPARAM lparam)
{
@@ -173,7 +173,7 @@ INT_PTR CPageDisk::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPARA
break;
case IDC_CIDERPRESS_BROWSE:
{
std::string CiderPressLoc = m_PropertySheetHelper.BrowseToFile(hWnd, TEXT("Select path to CiderPress"), REGVALUE_CIDERPRESSLOC, TEXT("Applications (*.exe)\0*.exe\0") TEXT("All Files\0*.*\0") );
std::string CiderPressLoc = m_PropertySheetHelper.BrowseToFile(hWnd, "Select path to CiderPress", REGVALUE_CIDERPRESSLOC, "Applications (*.exe)\0*.exe\0" "All Files\0*.*\0" );
SendDlgItemMessage(hWnd, IDC_CIDERPRESS_FILENAME, WM_SETTEXT, 0, (LPARAM) CiderPressLoc.c_str());
}
break;
@@ -194,7 +194,7 @@ INT_PTR CPageDisk::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPARA
InitComboHDD(hWnd, SLOT7);
char PathToCiderPress[MAX_PATH];
RegLoadString(TEXT(REG_CONFIG), REGVALUE_CIDERPRESSLOC, 1, PathToCiderPress, MAX_PATH, TEXT(""));
RegLoadString(REG_CONFIG, REGVALUE_CIDERPRESSLOC, 1, PathToCiderPress, MAX_PATH, "");
SendDlgItemMessage(hWnd, IDC_CIDERPRESS_FILENAME ,WM_SETTEXT, 0, (LPARAM)PathToCiderPress);
CheckDlgButton(hWnd, IDC_HDD_ENABLE, (GetCardMgr().QuerySlot(SLOT7) == CT_GenericHDD) ? BST_CHECKED : BST_UNCHECKED);
@@ -271,14 +271,14 @@ void CPageDisk::DlgOK(HWND hWnd)
nLineLength = nLineLength > sizeof(szFilename)-1 ? sizeof(szFilename)-1 : nLineLength;
szFilename[nLineLength] = 0x00;
RegSaveString(TEXT(REG_CONFIG), REGVALUE_CIDERPRESSLOC, 1, szFilename);
RegSaveString(REG_CONFIG, REGVALUE_CIDERPRESSLOC, 1, szFilename);
}
const bool bNewEnhanceDisk = IsDlgButtonChecked(hWnd, IDC_ENHANCE_DISK_ENABLE) ? true : false;
if (bNewEnhanceDisk != GetCardMgr().GetDisk2CardMgr().GetEnhanceDisk())
{
GetCardMgr().GetDisk2CardMgr().SetEnhanceDisk(bNewEnhanceDisk);
REGSAVE(TEXT(REGVALUE_ENHANCE_DISK_SPEED), (uint32_t)bNewEnhanceDisk);
REGSAVE(REGVALUE_ENHANCE_DISK_SPEED, (uint32_t)bNewEnhanceDisk);
}
Win32Frame& win32Frame = Win32Frame::GetWin32Frame();
source/Configuration/PageInput.cpp
+32 -32
View File
@@ -34,13 +34,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
CPageInput* CPageInput::ms_this = 0; // reinit'd in ctor
// Joystick option choices - NOTE maximum text length is MaxMenuChoiceLen = 40
const char CPageInput::m_szJoyChoice0[] = TEXT("Disabled\0");
const char CPageInput::m_szJoyChoice1[] = TEXT("PC Joystick #1\0");
const char CPageInput::m_szJoyChoice2[] = TEXT("PC Joystick #2\0");
const char CPageInput::m_szJoyChoice3[] = TEXT("Keyboard (cursors)\0");
const char CPageInput::m_szJoyChoice4[] = TEXT("Keyboard (numpad)\0");
const char CPageInput::m_szJoyChoice5[] = TEXT("Mouse\0");
const char CPageInput::m_szJoyChoice6[] = TEXT("PC Joystick #1 Thumbstick 2\0");
const char CPageInput::m_szJoyChoice0[] = "Disabled\0";
const char CPageInput::m_szJoyChoice1[] = "PC Joystick #1\0";
const char CPageInput::m_szJoyChoice2[] = "PC Joystick #2\0";
const char CPageInput::m_szJoyChoice3[] = "Keyboard (cursors)\0";
const char CPageInput::m_szJoyChoice4[] = "Keyboard (numpad)\0";
const char CPageInput::m_szJoyChoice5[] = "Mouse\0";
const char CPageInput::m_szJoyChoice6[] = "PC Joystick #1 Thumbstick 2\0";
const char* const CPageInput::m_pszJoy0Choices[J0C_MAX] = {
CPageInput::m_szJoyChoice0,
@@ -57,22 +57,22 @@ const char* const CPageInput::m_pszJoy1Choices[J1C_MAX] = {
CPageInput::m_szJoyChoice5,
CPageInput::m_szJoyChoice6 };
const char CPageInput::m_szCPMSlotChoice_Slot4[] = TEXT("Slot 4\0");
const char CPageInput::m_szCPMSlotChoice_Slot5[] = TEXT("Slot 5\0");
const char CPageInput::m_szCPMSlotChoice_Unplugged[] = TEXT("Unplugged\0");
const char CPageInput::m_szCPMSlotChoice_Unavailable[] = TEXT("Unavailable\0");
const char CPageInput::m_szCPMSlotChoice_Slot4[] = "Slot 4\0";
const char CPageInput::m_szCPMSlotChoice_Slot5[] = "Slot 5\0";
const char CPageInput::m_szCPMSlotChoice_Unplugged[] = "Unplugged\0";
const char CPageInput::m_szCPMSlotChoice_Unavailable[] = "Unavailable\0";
const char CPageInput::m_szFourPlaySlotChoice_Slot3[] = TEXT("Slot 3\0");
const char CPageInput::m_szFourPlaySlotChoice_Slot4[] = TEXT("Slot 4\0");
const char CPageInput::m_szFourPlaySlotChoice_Slot5[] = TEXT("Slot 5\0");
const char CPageInput::m_szFourPlaySlotChoice_Unplugged[] = TEXT("Unplugged\0");
const char CPageInput::m_szFourPlaySlotChoice_Unavailable[] = TEXT("Unavailable\0");
const char CPageInput::m_szFourPlaySlotChoice_Slot3[] = "Slot 3\0";
const char CPageInput::m_szFourPlaySlotChoice_Slot4[] = "Slot 4\0";
const char CPageInput::m_szFourPlaySlotChoice_Slot5[] = "Slot 5\0";
const char CPageInput::m_szFourPlaySlotChoice_Unplugged[] = "Unplugged\0";
const char CPageInput::m_szFourPlaySlotChoice_Unavailable[] = "Unavailable\0";
const char CPageInput::m_szSNESMAXSlotChoice_Slot3[] = TEXT("Slot 3\0");
const char CPageInput::m_szSNESMAXSlotChoice_Slot4[] = TEXT("Slot 4\0");
const char CPageInput::m_szSNESMAXSlotChoice_Slot5[] = TEXT("Slot 5\0");
const char CPageInput::m_szSNESMAXSlotChoice_Unplugged[] = TEXT("Unplugged\0");
const char CPageInput::m_szSNESMAXSlotChoice_Unavailable[] = TEXT("Unavailable\0");
const char CPageInput::m_szSNESMAXSlotChoice_Slot3[] = "Slot 3\0";
const char CPageInput::m_szSNESMAXSlotChoice_Slot4[] = "Slot 4\0";
const char CPageInput::m_szSNESMAXSlotChoice_Slot5[] = "Slot 5\0";
const char CPageInput::m_szSNESMAXSlotChoice_Unplugged[] = "Unplugged\0";
const char CPageInput::m_szSNESMAXSlotChoice_Unavailable[] = "Unavailable\0";
INT_PTR CALLBACK CPageInput::DlgProc(HWND hWnd, UINT message, WPARAM wparam, LPARAM lparam)
{
@@ -295,12 +295,12 @@ void CPageInput::DlgOK(HWND hWnd)
if (JoySetEmulationType(hWnd, m_nJoy0ChoiceTranlationTbl[uNewJoyType0], JN_JOYSTICK0, bIsSlot4Mouse))
{
REGSAVE(TEXT(REGVALUE_JOYSTICK0_EMU_TYPE), JoyGetJoyType(0));
REGSAVE(REGVALUE_JOYSTICK0_EMU_TYPE, JoyGetJoyType(0));
}
if (JoySetEmulationType(hWnd, m_nJoy1ChoiceTranlationTbl[uNewJoyType1], JN_JOYSTICK1, bIsSlot4Mouse))
{
REGSAVE(TEXT(REGVALUE_JOYSTICK1_EMU_TYPE), JoyGetJoyType(1));
REGSAVE(REGVALUE_JOYSTICK1_EMU_TYPE, JoyGetJoyType(1));
}
JoySetTrim((short)SendDlgItemMessage(hWnd, IDC_SPIN_XTRIM, UDM_GETPOS, 0, 0), true);
@@ -313,15 +313,15 @@ void CPageInput::DlgOK(HWND hWnd)
m_uMouseShowCrosshair = IsDlgButtonChecked(hWnd, IDC_MOUSE_CROSSHAIR) ? 1 : 0;
m_uMouseRestrictToWindow = IsDlgButtonChecked(hWnd, IDC_MOUSE_RESTRICT_TO_WINDOW) ? 1 : 0;
REGSAVE(TEXT(REGVALUE_PDL_XTRIM), JoyGetTrim(true));
REGSAVE(TEXT(REGVALUE_PDL_YTRIM), JoyGetTrim(false));
REGSAVE(TEXT(REGVALUE_SCROLLLOCK_TOGGLE), m_uScrollLockToggle);
REGSAVE(TEXT(REGVALUE_CURSOR_CONTROL), m_uCursorControl);
REGSAVE(TEXT(REGVALUE_AUTOFIRE), m_bmAutofire);
REGSAVE(TEXT(REGVALUE_SWAP_BUTTONS_0_AND_1), m_bSwapButtons0and1);
REGSAVE(TEXT(REGVALUE_CENTERING_CONTROL), m_uCenteringControl);
REGSAVE(TEXT(REGVALUE_MOUSE_CROSSHAIR), m_uMouseShowCrosshair);
REGSAVE(TEXT(REGVALUE_MOUSE_RESTRICT_TO_WINDOW), m_uMouseRestrictToWindow);
REGSAVE(REGVALUE_PDL_XTRIM, JoyGetTrim(true));
REGSAVE(REGVALUE_PDL_YTRIM, JoyGetTrim(false));
REGSAVE(REGVALUE_SCROLLLOCK_TOGGLE, m_uScrollLockToggle);
REGSAVE(REGVALUE_CURSOR_CONTROL, m_uCursorControl);
REGSAVE(REGVALUE_AUTOFIRE, m_bmAutofire);
REGSAVE(REGVALUE_SWAP_BUTTONS_0_AND_1, m_bSwapButtons0and1);
REGSAVE(REGVALUE_CENTERING_CONTROL, m_uCenteringControl);
REGSAVE(REGVALUE_MOUSE_CROSSHAIR, m_uMouseShowCrosshair);
REGSAVE(REGVALUE_MOUSE_RESTRICT_TO_WINDOW, m_uMouseRestrictToWindow);
m_PropertySheetHelper.PostMsgAfterClose(hWnd, m_Page);
}
source/Configuration/PageSound.cpp
+5 -5
View File
@@ -35,8 +35,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
CPageSound* CPageSound::ms_this = 0; // reinit'd in ctor
const char CPageSound::m_soundchoices[] = TEXT("Disabled\0")
TEXT("Sound Card\0");
const char CPageSound::m_soundchoices[] = "Disabled\0"
"Sound Card\0";
const char CPageSound::m_soundCardChoices[] = "Mockingboard\0"
@@ -159,14 +159,14 @@ void CPageSound::DlgOK(HWND hWnd)
SpkrSetEmulationType(newSoundType);
uint32_t dwSoundType = (soundtype == SOUND_NONE) ? REG_SOUNDTYPE_NONE : REG_SOUNDTYPE_WAVE;
REGSAVE(TEXT(REGVALUE_SOUND_EMULATION), dwSoundType);
REGSAVE(REGVALUE_SOUND_EMULATION, dwSoundType);
// NB. Volume: 0=Loudest, VOLUME_MAX=Silence
SpkrSetVolume(dwSpkrVolume, VOLUME_MAX);
GetCardMgr().GetMockingboardCardMgr().SetVolume(dwMBVolume, VOLUME_MAX);
REGSAVE(TEXT(REGVALUE_SPKR_VOLUME), SpkrGetVolume());
REGSAVE(TEXT(REGVALUE_MB_VOLUME), GetCardMgr().GetMockingboardCardMgr().GetVolume());
REGSAVE(REGVALUE_SPKR_VOLUME, SpkrGetVolume());
REGSAVE(REGVALUE_MB_VOLUME, GetCardMgr().GetMockingboardCardMgr().GetVolume());
m_PropertySheetHelper.PostMsgAfterClose(hWnd, m_Page);
}
source/Configuration/PropertySheet.cpp
+2 -2
View File
@@ -93,8 +93,8 @@ uint32_t CPropertySheet::GetVolumeMax()
// Called when F11/F12 is pressed
bool CPropertySheet::SaveStateSelectImage(HWND hWindow, bool bSave)
{
if(m_PropertySheetHelper.SaveStateSelectImage(hWindow, bSave ? TEXT("Select Save State file")
: TEXT("Select Load State file"), bSave))
if(m_PropertySheetHelper.SaveStateSelectImage(hWindow, bSave ? "Select Save State file"
: "Select Load State file", bSave))
{
m_PropertySheetHelper.SaveStateUpdate();
return true;
source/Configuration/PropertySheetHelper.cpp
+22 -22
View File
@@ -114,13 +114,13 @@ void CPropertySheetHelper::SaveComputerType(eApple2Type NewApple2Type)
void CPropertySheetHelper::ConfigSaveApple2Type(eApple2Type apple2Type)
{
REGSAVE(TEXT(REGVALUE_APPLE2_TYPE), apple2Type);
REGSAVE(REGVALUE_APPLE2_TYPE, apple2Type);
LogFileOutput("Config: Apple2 Type changed to %d\n", apple2Type);
}
void CPropertySheetHelper::SaveCpuType(eCpuType NewCpuType)
{
REGSAVE(TEXT(REGVALUE_CPU_TYPE), NewCpuType);
REGSAVE(REGVALUE_CPU_TYPE, NewCpuType);
}
void CPropertySheetHelper::SetSlot(UINT slot, SS_CARDTYPE newCardType)
@@ -142,7 +142,7 @@ void CPropertySheetHelper::SetSlot(UINT slot, SS_CARDTYPE newCardType)
std::string CPropertySheetHelper::BrowseToFile(HWND hWindow, const char* pszTitle, const char* REGVALUE, const char* FILEMASKS)
{
char szFilename[MAX_PATH];
RegLoadString(REG_CONFIG, REGVALUE, 1, szFilename, MAX_PATH, TEXT(""));
RegLoadString(REG_CONFIG, REGVALUE, 1, szFilename, MAX_PATH, "");
std::string pathname = szFilename;
OPENFILENAME ofn;
@@ -152,9 +152,9 @@ std::string CPropertySheetHelper::BrowseToFile(HWND hWindow, const char* pszTitl
ofn.hwndOwner = hWindow;
ofn.hInstance = GetFrame().g_hInstance;
ofn.lpstrFilter = FILEMASKS;
/*ofn.lpstrFilter = TEXT("Applications (*.exe)\0*.exe\0")
TEXT("Text files (*.txt)\0*.txt\0")
TEXT("All Files\0*.*\0");*/
/*ofn.lpstrFilter = "Applications (*.exe)\0*.exe\0"
"Text files (*.txt)\0*.txt\0"
"All Files\0*.*\0";*/
ofn.lpstrFile = szFilename;
ofn.nMaxFile = MAX_PATH;
ofn.lpstrInitialDir = "";
@@ -173,7 +173,7 @@ void CPropertySheetHelper::SaveStateUpdate()
if (m_bSSNewFilename)
{
Snapshot_SetFilename(m_szSSNewFilename, m_szSSNewDirectory);
RegSaveString(TEXT(REG_CONFIG), TEXT(REGVALUE_SAVESTATE_FILENAME), 1, Snapshot_GetPathname());
RegSaveString(REG_CONFIG, REGVALUE_SAVESTATE_FILENAME, 1, Snapshot_GetPathname());
}
}
@@ -198,8 +198,8 @@ int CPropertySheetHelper::SaveStateSelectImage(HWND hWindow, const char* pszTitl
ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = hWindow;
ofn.hInstance = GetFrame().g_hInstance;
ofn.lpstrFilter = TEXT("Save State files (*.aws.yaml)\0*.aws.yaml\0")
TEXT("All Files\0*.*\0");
ofn.lpstrFilter = "Save State files (*.aws.yaml)\0*.aws.yaml\0"
"All Files\0*.*\0";
ofn.lpstrFile = szFilename; // Dialog strips the last .EXT from this string (eg. file.aws.yaml is displayed as: file.aws
ofn.nMaxFile = sizeof(szFilename);
ofn.lpstrInitialDir = szDirectory.c_str();
@@ -355,12 +355,12 @@ void CPropertySheetHelper::ApplyNewConfig(const CConfigNeedingRestart& ConfigNew
if (CONFIG_CHANGED_LOCAL(m_bEnableTheFreezesF8Rom))
{
REGSAVE(TEXT(REGVALUE_THE_FREEZES_F8_ROM), ConfigNew.m_bEnableTheFreezesF8Rom);
REGSAVE(REGVALUE_THE_FREEZES_F8_ROM, ConfigNew.m_bEnableTheFreezesF8Rom);
}
if (CONFIG_CHANGED_LOCAL(m_videoRefreshRate))
{
REGSAVE(TEXT(REGVALUE_VIDEO_REFRESH_RATE), ConfigNew.m_videoRefreshRate);
REGSAVE(REGVALUE_VIDEO_REFRESH_RATE, ConfigNew.m_videoRefreshRate);
}
}
@@ -368,8 +368,8 @@ void CPropertySheetHelper::ApplyNewConfigFromSnapshot(const CConfigNeedingRestar
{
SaveComputerType(ConfigNew.m_Apple2Type);
SaveCpuType(ConfigNew.m_CpuType);
REGSAVE(TEXT(REGVALUE_THE_FREEZES_F8_ROM), ConfigNew.m_bEnableTheFreezesF8Rom);
REGSAVE(TEXT(REGVALUE_VIDEO_REFRESH_RATE), ConfigNew.m_videoRefreshRate);
REGSAVE(REGVALUE_THE_FREEZES_F8_ROM, ConfigNew.m_bEnableTheFreezesF8Rom);
REGSAVE(REGVALUE_VIDEO_REFRESH_RATE, ConfigNew.m_videoRefreshRate);
}
void CPropertySheetHelper::ApplyNewConfig(void)
@@ -406,9 +406,9 @@ bool CPropertySheetHelper::IsOkToSaveLoadState(HWND hWnd, const bool bConfigChan
if (bConfigChanged)
{
if (MessageBox(hWnd,
TEXT("The hardware configuration has changed. Save/Load state will lose these changes.\n\n")
TEXT("Are you sure you want to do this?"),
TEXT(REG_CONFIG),
"The hardware configuration has changed. Save/Load state will lose these changes.\n\n"
"Are you sure you want to do this?",
REG_CONFIG,
MB_ICONQUESTION | MB_OKCANCEL | MB_SETFOREGROUND) == IDCANCEL)
return false;
}
@@ -422,11 +422,11 @@ bool CPropertySheetHelper::IsOkToRestart(HWND hWnd)
return true;
if (MessageBox(hWnd,
TEXT("Restarting the emulator will reset the state ")
TEXT("of the emulated machine, causing you to lose any ")
TEXT("unsaved work.\n\n")
TEXT("Are you sure you want to do this?"),
TEXT(REG_CONFIG),
"Restarting the emulator will reset the state "
"of the emulated machine, causing you to lose any "
"unsaved work.\n\n"
"Are you sure you want to do this?",
REG_CONFIG,
MB_ICONQUESTION | MB_OKCANCEL | MB_SETFOREGROUND) == IDCANCEL)
return false;
@@ -483,7 +483,7 @@ bool CPropertySheetHelper::HardwareConfigChanged(HWND hWnd)
if (MessageBox(hWnd,
strMsg.c_str(),
TEXT(REG_CONFIG),
REG_CONFIG,
MB_ICONQUESTION | MB_OKCANCEL | MB_SETFOREGROUND) == IDCANCEL)
return false;
source/Debugger/Debug.cpp
+40 -40
View File
@@ -145,7 +145,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
std::vector<int> g_vPotentialCommands; // global, since TAB-completion also needs
std::vector<Command_t> g_vSortedCommands;
// static const char g_aFlagNames[_6502_NUM_FLAGS+1] = TEXT("CZIDBRVN");// Reversed since arrays are from left-to-right
// static const char g_aFlagNames[_6502_NUM_FLAGS+1] = "CZIDBRVN";// Reversed since arrays are from left-to-right
// Cursor (Console Input) _____________________________________________________
@@ -178,17 +178,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
int g_nDisasmWinHeight = 0;
// char g_aConfigDisasmAddressColon[] = TEXT(" :");
// char g_aConfigDisasmAddressColon[] = " :";
extern const int WINDOW_DATA_BYTES_PER_LINE = 8;
#if OLD_FONT
// Font
char g_sFontNameDefault[ MAX_FONT_NAME ] = TEXT("Courier New");
char g_sFontNameConsole[ MAX_FONT_NAME ] = TEXT("Courier New");
char g_sFontNameDisasm [ MAX_FONT_NAME ] = TEXT("Courier New");
char g_sFontNameInfo [ MAX_FONT_NAME ] = TEXT("Courier New");
char g_sFontNameBranch [ MAX_FONT_NAME ] = TEXT("Webdings");
char g_sFontNameDefault[ MAX_FONT_NAME ] = "Courier New";
char g_sFontNameConsole[ MAX_FONT_NAME ] = "Courier New";
char g_sFontNameDisasm [ MAX_FONT_NAME ] = "Courier New";
char g_sFontNameInfo [ MAX_FONT_NAME ] = "Courier New";
char g_sFontNameBranch [ MAX_FONT_NAME ] = "Webdings";
HFONT g_hFontWebDings = (HFONT)0;
#endif
int g_iFontSpacing = FONT_SPACING_CLEAN;
@@ -246,7 +246,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
ProfileOpmode_t g_aProfileOpmodes[ NUM_OPMODES ];
unsigned __int64 g_nProfileBeginCycles = 0; // g_nCumulativeCycles // PROFILE RESET
const std::string g_FileNameProfile = TEXT("Profile.txt"); // changed from .csv to .txt since Excel doesn't give import options.
const std::string g_FileNameProfile = "Profile.txt"; // changed from .csv to .txt since Excel doesn't give import options.
int g_nProfileLine = 0;
char g_aProfileLine[ NUM_PROFILE_LINES ][ CONSOLE_WIDTH ];
@@ -742,7 +742,7 @@ Update_t CmdBookmarkSave (int nArgs)
if (ConfigSave_BufferToDisk( g_aArgs[ 1 ].sArg, CONFIG_SAVE_FILE_CREATE ))
{
ConsoleBufferPush( TEXT( "Saved." ) );
ConsoleBufferPush( "Saved." );
return ConsoleUpdate();
}
}
@@ -786,7 +786,7 @@ Update_t CmdBenchmarkStop (int nArgs)
uint32_t currtime = GetTickCount();
while ((extbench = GetTickCount()) != currtime)
; // intentional busy-waiting
KeybQueueKeypress(TEXT(' ') ,ASCII);
KeybQueueKeypress(' ' ,ASCII);
return UPDATE_ALL; // 0;
}
@@ -812,7 +812,7 @@ Update_t CmdProfile (int nArgs)
{
ProfileReset();
g_bProfiling = 1;
ConsoleBufferPush( TEXT(" Resetting profile data." ) );
ConsoleBufferPush( " Resetting profile data." );
}
else
{
@@ -1007,14 +1007,14 @@ Update_t CmdBreakOpcode (int nArgs) // Breakpoint IFF Full-speed!
if (nArgs > 1)
return HelpLastCommand();
char sAction[ CONSOLE_WIDTH ] = TEXT("Current"); // default to display
char sAction[ CONSOLE_WIDTH ] = "Current"; // default to display
if (nArgs == 1)
{
int iOpcode = g_aArgs[ 1] .nValue;
g_iDebugBreakOnOpcode = iOpcode & 0xFF;
strcpy( sAction, TEXT("Setting") );
strcpy( sAction, "Setting" );
if (iOpcode >= NUM_OPCODES)
{
@@ -1062,12 +1062,12 @@ Update_t CmdBreakOnInterrupt (int nArgs)
if (nArgs == 1 && nActive == -1)
return HelpLastCommand();
char sAction[CONSOLE_WIDTH] = TEXT("Current"); // default to display
char sAction[CONSOLE_WIDTH] = "Current"; // default to display
if (nArgs == 1)
{
g_bDebugBreakOnInterrupt = (iParam == PARAM_ON) ? true : false;
strcpy(sAction, TEXT("Setting"));
strcpy(sAction, "Setting");
}
ConsoleBufferPushFormat("%s Break on Interrupt: %s"
@@ -2074,7 +2074,7 @@ Update_t CmdBreakpointSave (int nArgs)
if (ConfigSave_BufferToDisk( g_aArgs[ 1 ].sArg, CONFIG_SAVE_FILE_CREATE ))
{
ConsoleBufferPush( TEXT( "Saved." ) );
ConsoleBufferPush( "Saved." );
return ConsoleUpdate();
}
}
@@ -2492,7 +2492,7 @@ Update_t CmdUnassemble (int nArgs)
Update_t CmdKey (int nArgs)
{
KeybQueueKeypress(
nArgs ? g_aArgs[1].nValue ? g_aArgs[1].nValue : g_aArgs[1].sArg[0] : TEXT(' '), ASCII); // FIXME!!!
nArgs ? g_aArgs[1].nValue ? g_aArgs[1].nValue : g_aArgs[1].sArg[0] : ' ', ASCII); // FIXME!!!
return UPDATE_CONSOLE_DISPLAY;
}
@@ -2557,7 +2557,7 @@ Update_t CmdNOP (int nArgs)
Update_t CmdOut (int nArgs)
{
// if ((!nArgs) ||
// ((g_aArgs[1].sArg[0] != TEXT('0')) && (!g_aArgs[1].nValue) && (!GetAddress(g_aArgs[1].sArg))))
// ((g_aArgs[1].sArg[0] != '0') && (!g_aArgs[1].nValue) && (!GetAddress(g_aArgs[1].sArg))))
// return DisplayHelp(CmdInput);
if (!nArgs)
@@ -2645,7 +2645,7 @@ Update_t CmdConfigColorMono (int nArgs)
if (iParam == PARAM_RESET)
{
ConfigColorsReset();
ConsoleBufferPush( TEXT(" Resetting colors." ) );
ConsoleBufferPush( " Resetting colors." );
}
else
if (iParam == PARAM_SAVE)
@@ -3085,7 +3085,7 @@ Update_t CmdCursorLineDown (int nArgs)
if (g_bDisasmCurBad)
{
// MessageBox( NULL, TEXT("Bad Disassembly of opcodes"), TEXT("Debugger"), MB_OK );
// MessageBox( NULL, "Bad Disassembly of opcodes", "Debugger", MB_OK );
// g_nDisasmCurAddress = nCur;
// g_bDisasmCurBad = false;
@@ -3619,12 +3619,12 @@ Update_t CmdFlagSet (int nArgs)
//===========================================================================
Update_t CmdFlag (int nArgs)
{
// if (g_aArgs[0].sArg[0] == g_aParameters[PARAM_FLAG_CLEAR].aName[0] ) // TEXT('R')
// if (g_aArgs[0].sArg[0] == g_aParameters[PARAM_FLAG_CLEAR].aName[0] ) // 'R'
if (g_iCommand == CMD_FLAG_CLEAR)
return CmdFlagClear( nArgs );
else
if (g_iCommand == CMD_FLAG_SET)
// if (g_aArgs[0].sArg[0] == g_aParameters[PARAM_FLAG_SET].aName[0] ) // TEXT('S')
// if (g_aArgs[0].sArg[0] == g_aParameters[PARAM_FLAG_SET].aName[0] ) // 'S'
return CmdFlagSet( nArgs );
return UPDATE_ALL; // 0;
@@ -3990,7 +3990,7 @@ Update_t CmdMemoryEdit (int nArgs)
Update_t CmdMemoryEnterByte (int nArgs)
{
if ((nArgs < 2) ||
((g_aArgs[2].sArg[0] != TEXT('0')) && (!g_aArgs[2].nValue))) // arg2 not numeric or not specified
((g_aArgs[2].sArg[0] != '0') && (!g_aArgs[2].nValue))) // arg2 not numeric or not specified
{
Help_Arg_1( CMD_MEMORY_ENTER_WORD );
}
@@ -4020,7 +4020,7 @@ Update_t CmdMemoryEnterByte (int nArgs)
Update_t CmdMemoryEnterWord (int nArgs)
{
if ((nArgs < 2) ||
((g_aArgs[2].sArg[0] != TEXT('0')) && (!g_aArgs[2].nValue))) // arg2 not numeric or not specified
((g_aArgs[2].sArg[0] != '0') && (!g_aArgs[2].nValue))) // arg2 not numeric or not specified
{
Help_Arg_1( CMD_MEMORY_ENTER_WORD );
}
@@ -4327,13 +4327,13 @@ Update_t CmdMemoryLoad (int nArgs)
{
*pDst++ = *pSrc++;
}
ConsoleBufferPush( TEXT( "Loaded." ) );
ConsoleBufferPush( "Loaded." );
}
fclose( hFile );
}
else
{
ConsoleBufferPush( TEXT( "ERROR: Bad filename" ) );
ConsoleBufferPush( "ERROR: Bad filename" );
CmdConfigGetDebugDir( 0 );
@@ -4496,7 +4496,7 @@ Update_t CmdMemoryLoad (int nArgs)
BYTE * const pMemBankBase = bBankSpecified ? MemGetBankPtr(nBank) : mem;
if (!pMemBankBase)
{
ConsoleBufferPush( TEXT( "Error: Bank out of range." ) );
ConsoleBufferPush( "Error: Bank out of range." );
return ConsoleUpdate();
}
@@ -4695,7 +4695,7 @@ Update_t CmdMemorySave (int nArgs)
FILE *hFile = fopen( sLoadSaveFilePath, "rb" );
if (hFile)
{
ConsoleBufferPush( TEXT( "Warning: File already exists. Overwriting." ) );
ConsoleBufferPush( "Warning: File already exists. Overwriting." );
fclose( hFile );
}
@@ -4705,11 +4705,11 @@ Update_t CmdMemorySave (int nArgs)
size_t nWrote = fwrite( pMemory, nAddressLen, 1, hFile );
if (nWrote == 1) // (size_t)nAddressLen)
{
ConsoleBufferPush( TEXT( "Saved." ) );
ConsoleBufferPush( "Saved." );
}
else
{
ConsoleBufferPush( TEXT( "Error saving." ) );
ConsoleBufferPush( "Error saving." );
}
fclose( hFile );
}
@@ -4755,7 +4755,7 @@ Update_t CmdMemorySave (int nArgs)
}
else
{
ConsoleBufferPush( TEXT( "Last saved: none" ) );
ConsoleBufferPush( "Last saved: none" );
}
}
else
@@ -4835,14 +4835,14 @@ Update_t CmdMemorySave (int nArgs)
const BYTE * const pMemBankBase = bBankSpecified ? MemGetBankPtr(nBank) : mem;
if (!pMemBankBase)
{
ConsoleBufferPush( TEXT( "Error: Bank out of range." ) );
ConsoleBufferPush( "Error: Bank out of range." );
return ConsoleUpdate();
}
FILE *hFile = fopen( sLoadSaveFilePath.c_str(), "rb" );
if (hFile)
{
ConsoleBufferPush( TEXT( "Warning: File already exists. Overwriting." ) );
ConsoleBufferPush( "Warning: File already exists. Overwriting." );
fclose( hFile );
// TODO: BUG: Is this a bug/feature that we can over-write files and the user has no control over that?
}
@@ -4853,17 +4853,17 @@ Update_t CmdMemorySave (int nArgs)
size_t nWrote = fwrite( pMemBankBase+nAddressStart, nAddressLen, 1, hFile );
if (nWrote == 1)
{
ConsoleBufferPush( TEXT( "Saved." ) );
ConsoleBufferPush( "Saved." );
}
else
{
ConsoleBufferPush( TEXT( "Error saving." ) );
ConsoleBufferPush( "Error saving." );
}
fclose( hFile );
}
else
{
ConsoleBufferPush( TEXT( "Error opening file." ) );
ConsoleBufferPush( "Error opening file." );
}
}
}
@@ -5466,7 +5466,7 @@ Update_t CmdNTSC (int nArgs)
if (iParam == PARAM_RESET)
{
NTSC_VideoInitChroma();
ConsoleBufferPush( TEXT(" Resetting NTSC palette." ) );
ConsoleBufferPush( " Resetting NTSC palette." );
}
else
if (iParam == PARAM_SAVE)
@@ -5503,12 +5503,12 @@ Update_t CmdNTSC (int nArgs)
ConsoleFilename::update( "Saved" );
}
else
ConsoleBufferPush( TEXT( "Error saving." ) );
ConsoleBufferPush( "Error saving." );
}
else
{
ConsoleFilename::update( "File" );
ConsoleBufferPush( TEXT( "Error couldn't open file for writing." ) );
ConsoleBufferPush( "Error couldn't open file for writing." );
}
}
else
@@ -6064,7 +6064,7 @@ Update_t CmdMemorySearchHex (int nArgs)
//===========================================================================
Update_t CmdRegisterSet (int nArgs)
{
if (nArgs < 2) // || ((g_aArgs[2].sArg[0] != TEXT('0')) && !g_aArgs[2].nValue))
if (nArgs < 2) // || ((g_aArgs[2].sArg[0] != '0') && !g_aArgs[2].nValue))
{
return Help_Arg_1( CMD_REGISTER_SET );
}
source/Debugger/Debugger_Assembler.cpp
+29 -29
View File
@@ -43,23 +43,23 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
AddressingMode_t g_aOpmodes[ NUM_ADDRESSING_MODES ] =
{ // Output, but eventually used for Input when Assembler is working.
{TEXT("") , 1 , "(implied)" }, // (implied)
{TEXT("") , 1 , "n/a 1" }, // INVALID1
{TEXT("") , 2 , "n/a 2" }, // INVALID2
{TEXT("") , 3 , "n/a 3" }, // INVALID3
{TEXT("%02X") , 2 , "Immediate" }, // AM_M // #$%02X -> %02X
{TEXT("%04X") , 3 , "Absolute" }, // AM_A
{TEXT("%02X") , 2 , "Zero Page" }, // AM_Z
{TEXT("%04X,X") , 3 , "Absolute,X" }, // AM_AX // %s,X
{TEXT("%04X,Y") , 3 , "Absolute,Y" }, // AM_AY // %s,Y
{TEXT("%02X,X") , 2 , "Zero Page,X" }, // AM_ZX // %s,X
{TEXT("%02X,Y") , 2 , "Zero Page,Y" }, // AM_ZY // %s,Y
{TEXT("%s") , 2 , "Relative" }, // AM_R
{TEXT("(%02X,X)"), 2 , "(Zero Page),X" }, // AM_IZX // ($%02X,X) -> %s,X
{TEXT("(%04X,X)"), 3 , "(Absolute),X" }, // AM_IAX // ($%04X,X) -> %s,X
{TEXT("(%02X),Y"), 2 , "(Zero Page),Y" }, // AM_NZY // ($%02X),Y
{TEXT("(%02X)") , 2 , "(Zero Page)" }, // AM_NZ // ($%02X) -> $%02X
{TEXT("(%04X)") , 3 , "(Absolute)" } // AM_NA // (%04X) -> %s
{"" , 1 , "(implied)" }, // (implied)
{"" , 1 , "n/a 1" }, // INVALID1
{"" , 2 , "n/a 2" }, // INVALID2
{"" , 3 , "n/a 3" }, // INVALID3
{"%02X" , 2 , "Immediate" }, // AM_M // #$%02X -> %02X
{"%04X" , 3 , "Absolute" }, // AM_A
{"%02X" , 2 , "Zero Page" }, // AM_Z
{"%04X,X" , 3 , "Absolute,X" }, // AM_AX // %s,X
{"%04X,Y" , 3 , "Absolute,Y" }, // AM_AY // %s,Y
{"%02X,X" , 2 , "Zero Page,X" }, // AM_ZX // %s,X
{"%02X,Y" , 2 , "Zero Page,Y" }, // AM_ZY // %s,Y
{"%s" , 2 , "Relative" }, // AM_R
{"(%02X,X)", 2 , "(Zero Page),X" }, // AM_IZX // ($%02X,X) -> %s,X
{"(%04X,X)", 3 , "(Absolute),X" }, // AM_IAX // ($%04X,X) -> %s,X
{"(%02X),Y", 2 , "(Zero Page),Y" }, // AM_NZY // ($%02X),Y
{"(%02X)" , 2 , "(Zero Page)" }, // AM_NZ // ($%02X) -> $%02X
{"(%04X)" , 3 , "(Absolute)" } // AM_NA // (%04X) -> %s
};
@@ -1138,12 +1138,12 @@ bool AssemblerGetArgs( int iArg, int nArgs, WORD nBaseAddress )
{
if (eNextState != AS_GET_MNEMONIC_PARM)
{
ConsoleBufferPush( TEXT( " Syntax Error: '#'" ) );
ConsoleBufferPush( " Syntax Error: '#'" );
return false;
}
if (TestFlag( AF_HaveHash ))
{
ConsoleBufferPush( TEXT( " Syntax Error: Extra '#'" ) ); // No thanks, we already have one
ConsoleBufferPush( " Syntax Error: Extra '#'" ); // No thanks, we already have one
return false;
}
SetFlag( AF_HaveHash );
@@ -1157,7 +1157,7 @@ bool AssemblerGetArgs( int iArg, int nArgs, WORD nBaseAddress )
{
if (TestFlag( AF_HaveDollar ))
{
ConsoleBufferPush( TEXT( " Syntax Error: Extra '$'" ) ); // No thanks, we already have one
ConsoleBufferPush( " Syntax Error: Extra '$'" ); // No thanks, we already have one
return false;
}
@@ -1176,7 +1176,7 @@ bool AssemblerGetArgs( int iArg, int nArgs, WORD nBaseAddress )
{
if (TestFlag( AF_HaveLeftParen ))
{
ConsoleBufferPush( TEXT( " Syntax Error: Extra '('" ) ); // No thanks, we already have one
ConsoleBufferPush( " Syntax Error: Extra '('" ); // No thanks, we already have one
return false;
}
SetFlag( AF_HaveLeftParen );
@@ -1189,7 +1189,7 @@ bool AssemblerGetArgs( int iArg, int nArgs, WORD nBaseAddress )
{
if (TestFlag( AF_HaveRightParen ))
{
ConsoleBufferPush( TEXT( " Syntax Error: Extra ')'" ) ); // No thanks, we already have one
ConsoleBufferPush( " Syntax Error: Extra ')'" ); // No thanks, we already have one
return false;
}
SetFlag( AF_HaveRightParen );
@@ -1202,7 +1202,7 @@ bool AssemblerGetArgs( int iArg, int nArgs, WORD nBaseAddress )
{
if (TestFlag( AF_HaveComma ))
{
ConsoleBufferPush( TEXT( " Syntax Error: Extra ','" ) ); // No thanks, we already have one
ConsoleBufferPush( " Syntax Error: Extra ','" ); // No thanks, we already have one
return false;
}
SetFlag( AF_HaveComma );
@@ -1294,7 +1294,7 @@ bool AssemblerGetArgs( int iArg, int nArgs, WORD nBaseAddress )
{
if (! TestFlag( AF_HaveComma ))
{
ConsoleBufferPush( TEXT( " Syntax Error: Missing ','" ) );
ConsoleBufferPush( " Syntax Error: Missing ','" );
return false;
}
SetFlag( AF_HaveRegisterX );
@@ -1303,7 +1303,7 @@ bool AssemblerGetArgs( int iArg, int nArgs, WORD nBaseAddress )
{
if (! (TestFlag( AF_HaveComma )))
{
ConsoleBufferPush( TEXT( " Syntax Error: Missing ','" ) );
ConsoleBufferPush( " Syntax Error: Missing ','" );
return false;
}
SetFlag( AF_HaveRegisterY );
@@ -1328,13 +1328,13 @@ bool AssemblerUpdateAddressingMode()
if ((TestFlag( AF_HaveLeftParen )) && (! TestFlag( AF_HaveRightParen )))
{
ConsoleBufferPush( TEXT( " Syntax Error: Missing ')'" ) );
ConsoleBufferPush( " Syntax Error: Missing ')'" );
return false;
}
if ((! TestFlag( AF_HaveLeftParen )) && ( TestFlag( AF_HaveRightParen )))
{
ConsoleBufferPush( TEXT( " Syntax Error: Missing '('" ) );
ConsoleBufferPush( " Syntax Error: Missing '('" );
return false;
}
@@ -1342,7 +1342,7 @@ bool AssemblerUpdateAddressingMode()
{
if ((! TestFlag( AF_HaveRegisterX )) && (! TestFlag( AF_HaveRegisterY )))
{
ConsoleBufferPush( TEXT( " Syntax Error: Index 'X' or 'Y'" ) );
ConsoleBufferPush( " Syntax Error: Index 'X' or 'Y'" );
return false;
}
}
@@ -1536,7 +1536,7 @@ bool Assemble( int iArg, int nArgs, WORD nAddress )
{
// Check for assembler directive
ConsoleBufferPush( TEXT(" Syntax Error: Invalid mnemonic") );
ConsoleBufferPush( " Syntax Error: Invalid mnemonic" );
return false;
}
else
source/Debugger/Debugger_Commands.cpp
+365 -365
View File
@@ -40,191 +40,191 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Command_t g_aCommands[] =
{
// Assembler
// {TEXT("!") , CmdAssemberMini , CMD_ASSEMBLER_MINI , "Mini assembler" },
{TEXT("A") , CmdAssemble , CMD_ASSEMBLE , "Assemble instructions" },
// {"!" , CmdAssemberMini , CMD_ASSEMBLER_MINI , "Mini assembler" },
{"A" , CmdAssemble , CMD_ASSEMBLE , "Assemble instructions" },
// CPU (Main)
{TEXT(".") , CmdCursorJumpPC , CMD_CURSOR_JUMP_PC , "Locate the cursor in the disasm window" }, // centered
{TEXT("=") , CmdCursorSetPC , CMD_CURSOR_SET_PC , "Sets the PC to the current instruction" },
{TEXT("G") , CmdGoNormalSpeed , CMD_GO_NORMAL_SPEED , "Run at normal speed [until PC == address]" },
{TEXT("GG") , CmdGoFullSpeed , CMD_GO_FULL_SPEED , "Run at full speed [until PC == address]" },
{TEXT("IN") , CmdIn , CMD_IN , "Input byte from IO $C0xx" },
{TEXT("KEY") , CmdKey , CMD_INPUT_KEY , "Feed key into emulator" },
{TEXT("JSR") , CmdJSR , CMD_JSR , "Call sub-routine" },
{TEXT("NOP") , CmdNOP , CMD_NOP , "Zap the current instruction with a NOP" },
{TEXT("OUT") , CmdOut , CMD_OUT , "Output byte to IO $C0xx" },
{TEXT("LBR") , CmdLBR , CMD_LBR , "Show Last Branch Record" },
{"." , CmdCursorJumpPC , CMD_CURSOR_JUMP_PC , "Locate the cursor in the disasm window" }, // centered
{"=" , CmdCursorSetPC , CMD_CURSOR_SET_PC , "Sets the PC to the current instruction" },
{"G" , CmdGoNormalSpeed , CMD_GO_NORMAL_SPEED , "Run at normal speed [until PC == address]" },
{"GG" , CmdGoFullSpeed , CMD_GO_FULL_SPEED , "Run at full speed [until PC == address]" },
{"IN" , CmdIn , CMD_IN , "Input byte from IO $C0xx" },
{"KEY" , CmdKey , CMD_INPUT_KEY , "Feed key into emulator" },
{"JSR" , CmdJSR , CMD_JSR , "Call sub-routine" },
{"NOP" , CmdNOP , CMD_NOP , "Zap the current instruction with a NOP" },
{"OUT" , CmdOut , CMD_OUT , "Output byte to IO $C0xx" },
{"LBR" , CmdLBR , CMD_LBR , "Show Last Branch Record" },
// CPU - Meta Info
{TEXT("PROFILE") , CmdProfile , CMD_PROFILE , "List/Save 6502 profiling" },
{TEXT("R") , CmdRegisterSet , CMD_REGISTER_SET , "Set register" },
{"PROFILE" , CmdProfile , CMD_PROFILE , "List/Save 6502 profiling" },
{"R" , CmdRegisterSet , CMD_REGISTER_SET , "Set register" },
// CPU - Stack
{TEXT("POP") , CmdStackPop , CMD_STACK_POP },
{TEXT("PPOP") , CmdStackPopPseudo , CMD_STACK_POP_PSEUDO },
{TEXT("PUSH") , CmdStackPop , CMD_STACK_PUSH },
// {TEXT("RTS") , CmdStackReturn , CMD_STACK_RETURN },
{TEXT("P") , CmdStepOver , CMD_STEP_OVER , "Step current instruction" },
{TEXT("RTS") , CmdStepOut , CMD_STEP_OUT , "Step out of subroutine" },
{"POP" , CmdStackPop , CMD_STACK_POP },
{"PPOP" , CmdStackPopPseudo , CMD_STACK_POP_PSEUDO },
{"PUSH" , CmdStackPop , CMD_STACK_PUSH },
// {"RTS" , CmdStackReturn , CMD_STACK_RETURN },
{"P" , CmdStepOver , CMD_STEP_OVER , "Step current instruction" },
{"RTS" , CmdStepOut , CMD_STEP_OUT , "Step out of subroutine" },
// CPU - Meta Info
{TEXT("T") , CmdTrace , CMD_TRACE , "Trace current instruction" },
{TEXT("TF") , CmdTraceFile , CMD_TRACE_FILE , "Save trace to filename [with video scanner info]" },
{TEXT("TL") , CmdTraceLine , CMD_TRACE_LINE , "Trace (with cycle counting)" },
{TEXT("U") , CmdUnassemble , CMD_UNASSEMBLE , "Disassemble instructions" },
// {TEXT("WAIT") , CmdWait , CMD_WAIT , "Run until
{"T" , CmdTrace , CMD_TRACE , "Trace current instruction" },
{"TF" , CmdTraceFile , CMD_TRACE_FILE , "Save trace to filename [with video scanner info]" },
{"TL" , CmdTraceLine , CMD_TRACE_LINE , "Trace (with cycle counting)" },
{"U" , CmdUnassemble , CMD_UNASSEMBLE , "Disassemble instructions" },
// {"WAIT" , CmdWait , CMD_WAIT , "Run until
// Bookmarks
{TEXT("BM") , CmdBookmark , CMD_BOOKMARK , "Alias for BMA (Bookmark Add)" },
{TEXT("BMA") , CmdBookmarkAdd , CMD_BOOKMARK_ADD , "Add/Update addess to bookmark" },
{TEXT("BMC") , CmdBookmarkClear , CMD_BOOKMARK_CLEAR , "Clear (remove) bookmark" },
{TEXT("BML") , CmdBookmarkList , CMD_BOOKMARK_LIST , "List all bookmarks" },
{TEXT("BMG") , CmdBookmarkGoto , CMD_BOOKMARK_GOTO , "Move cursor to bookmark" },
// {TEXT("BMLOAD") , CmdBookmarkLoad , CMD_BOOKMARK_LOAD , "Load bookmarks" },
{TEXT("BMSAVE") , CmdBookmarkSave , CMD_BOOKMARK_SAVE , "Save bookmarks" },
{"BM" , CmdBookmark , CMD_BOOKMARK , "Alias for BMA (Bookmark Add)" },
{"BMA" , CmdBookmarkAdd , CMD_BOOKMARK_ADD , "Add/Update addess to bookmark" },
{"BMC" , CmdBookmarkClear , CMD_BOOKMARK_CLEAR , "Clear (remove) bookmark" },
{"BML" , CmdBookmarkList , CMD_BOOKMARK_LIST , "List all bookmarks" },
{"BMG" , CmdBookmarkGoto , CMD_BOOKMARK_GOTO , "Move cursor to bookmark" },
// {"BMLOAD" , CmdBookmarkLoad , CMD_BOOKMARK_LOAD , "Load bookmarks" },
{"BMSAVE" , CmdBookmarkSave , CMD_BOOKMARK_SAVE , "Save bookmarks" },
// Breakpoints
{TEXT("BRK") , CmdBreakInvalid , CMD_BREAK_INVALID , "Enter debugger on BRK or INVALID" },
{TEXT("BRKOP") , CmdBreakOpcode , CMD_BREAK_OPCODE , "Enter debugger on opcode" },
{TEXT("BRKINT") , CmdBreakOnInterrupt , CMD_BREAK_ON_INTERRUPT , "Enter debugger on interrupt" },
{TEXT("BP") , CmdBreakpoint , CMD_BREAKPOINT , "Alias for BPR (Breakpoint Register Add)" },
{TEXT("BPA") , CmdBreakpointAddSmart, CMD_BREAKPOINT_ADD_SMART , "Add (smart) breakpoint" },
// {TEXT("BPP") , CmdBreakpointAddFlag , CMD_BREAKPOINT_ADD_FLAG , "Add breakpoint on flags" },
{TEXT("BPR") , CmdBreakpointAddReg , CMD_BREAKPOINT_ADD_REG , "Add breakpoint on register value" }, // NOTE! Different from SoftICE !!!!
{TEXT("BPX") , CmdBreakpointAddPC , CMD_BREAKPOINT_ADD_PC , "Add breakpoint at current instruction" },
{TEXT("BPIO") , CmdBreakpointAddIO , CMD_BREAKPOINT_ADD_IO , "Add breakpoint for IO address $C0xx" },
{TEXT("BPM") , CmdBreakpointAddMemA , CMD_BREAKPOINT_ADD_MEM , "Add breakpoint on memory access" }, // SoftICE
{TEXT("BPMR") , CmdBreakpointAddMemR , CMD_BREAKPOINT_ADD_MEMR , "Add breakpoint on memory read access" },
{TEXT("BPMW") , CmdBreakpointAddMemW , CMD_BREAKPOINT_ADD_MEMW , "Add breakpoint on memory write access" },
{TEXT("BPV") , CmdBreakpointAddVideo, CMD_BREAKPOINT_ADD_VIDEO , "Add breakpoint on video scanner position" },
{"BRK" , CmdBreakInvalid , CMD_BREAK_INVALID , "Enter debugger on BRK or INVALID" },
{"BRKOP" , CmdBreakOpcode , CMD_BREAK_OPCODE , "Enter debugger on opcode" },
{"BRKINT" , CmdBreakOnInterrupt , CMD_BREAK_ON_INTERRUPT , "Enter debugger on interrupt" },
{"BP" , CmdBreakpoint , CMD_BREAKPOINT , "Alias for BPR (Breakpoint Register Add)" },
{"BPA" , CmdBreakpointAddSmart, CMD_BREAKPOINT_ADD_SMART , "Add (smart) breakpoint" },
// {"BPP" , CmdBreakpointAddFlag , CMD_BREAKPOINT_ADD_FLAG , "Add breakpoint on flags" },
{"BPR" , CmdBreakpointAddReg , CMD_BREAKPOINT_ADD_REG , "Add breakpoint on register value" }, // NOTE! Different from SoftICE !!!!
{"BPX" , CmdBreakpointAddPC , CMD_BREAKPOINT_ADD_PC , "Add breakpoint at current instruction" },
{"BPIO" , CmdBreakpointAddIO , CMD_BREAKPOINT_ADD_IO , "Add breakpoint for IO address $C0xx" },
{"BPM" , CmdBreakpointAddMemA , CMD_BREAKPOINT_ADD_MEM , "Add breakpoint on memory access" }, // SoftICE
{"BPMR" , CmdBreakpointAddMemR , CMD_BREAKPOINT_ADD_MEMR , "Add breakpoint on memory read access" },
{"BPMW" , CmdBreakpointAddMemW , CMD_BREAKPOINT_ADD_MEMW , "Add breakpoint on memory write access" },
{"BPV" , CmdBreakpointAddVideo, CMD_BREAKPOINT_ADD_VIDEO , "Add breakpoint on video scanner position" },
{TEXT("BPC") , CmdBreakpointClear , CMD_BREAKPOINT_CLEAR , "Clear (remove) breakpoint" }, // SoftICE
{TEXT("BPD") , CmdBreakpointDisable , CMD_BREAKPOINT_DISABLE , "Disable breakpoint- it is still in the list, just not active" }, // SoftICE
{TEXT("BPEDIT") , CmdBreakpointEdit , CMD_BREAKPOINT_EDIT , "Edit breakpoint" }, // SoftICE
{TEXT("BPE") , CmdBreakpointEnable , CMD_BREAKPOINT_ENABLE , "(Re)Enable disabled breakpoint" }, // SoftICE
{TEXT("BPL") , CmdBreakpointList , CMD_BREAKPOINT_LIST , "List all breakpoints" }, // SoftICE
// {TEXT("BPLOAD") , CmdBreakpointLoad , CMD_BREAKPOINT_LOAD , "Loads breakpoints" },
{TEXT("BPSAVE") , CmdBreakpointSave , CMD_BREAKPOINT_SAVE , "Saves breakpoints" },
{TEXT("BPCHANGE") , CmdBreakpointChange , CMD_BREAKPOINT_CHANGE , "Change breakpoint" },
{"BPC" , CmdBreakpointClear , CMD_BREAKPOINT_CLEAR , "Clear (remove) breakpoint" }, // SoftICE
{"BPD" , CmdBreakpointDisable , CMD_BREAKPOINT_DISABLE , "Disable breakpoint- it is still in the list, just not active" }, // SoftICE
{"BPEDIT" , CmdBreakpointEdit , CMD_BREAKPOINT_EDIT , "Edit breakpoint" }, // SoftICE
{"BPE" , CmdBreakpointEnable , CMD_BREAKPOINT_ENABLE , "(Re)Enable disabled breakpoint" }, // SoftICE
{"BPL" , CmdBreakpointList , CMD_BREAKPOINT_LIST , "List all breakpoints" }, // SoftICE
// {"BPLOAD" , CmdBreakpointLoad , CMD_BREAKPOINT_LOAD , "Loads breakpoints" },
{"BPSAVE" , CmdBreakpointSave , CMD_BREAKPOINT_SAVE , "Saves breakpoints" },
{"BPCHANGE" , CmdBreakpointChange , CMD_BREAKPOINT_CHANGE , "Change breakpoint" },
// Config
{TEXT("BENCHMARK") , CmdBenchmark , CMD_BENCHMARK , "Benchmark the emulator" },
{TEXT("BW") , CmdConfigColorMono , CMD_CONFIG_BW , "Sets/Shows RGB for Black & White scheme" },
{TEXT("COLOR") , CmdConfigColorMono , CMD_CONFIG_COLOR , "Sets/Shows RGB for color scheme" },
// {TEXT("OPTION") , CmdConfigMenu , CMD_CONFIG_MENU , "Access config options" },
{TEXT("DISASM") , CmdConfigDisasm , CMD_CONFIG_DISASM , "Sets/Shows disassembly view options." },
{TEXT("FONT") , CmdConfigFont , CMD_CONFIG_FONT , "Shows current font or sets new one" },
{TEXT("HCOLOR") , CmdConfigHColor , CMD_CONFIG_HCOLOR , "Sets/Shows colors mapped to Apple HGR" },
{TEXT("LOAD") , CmdConfigLoad , CMD_CONFIG_LOAD , "Load debugger configuration" },
{TEXT("MONO") , CmdConfigColorMono , CMD_CONFIG_MONOCHROME , "Sets/Shows RGB for monochrome scheme" },
{TEXT("SAVE") , CmdConfigSave , CMD_CONFIG_SAVE , "Save debugger configuration" },
{TEXT("PWD") , CmdConfigGetDebugDir , CMD_CONFIG_GET_DEBUG_DIR , "Displays the current debugger directory. Used for scripts & mem load/save." },
{TEXT("CD") , CmdConfigSetDebugDir , CMD_CONFIG_SET_DEBUG_DIR , "Updates the current debugger directory." },
{"BENCHMARK" , CmdBenchmark , CMD_BENCHMARK , "Benchmark the emulator" },
{"BW" , CmdConfigColorMono , CMD_CONFIG_BW , "Sets/Shows RGB for Black & White scheme" },
{"COLOR" , CmdConfigColorMono , CMD_CONFIG_COLOR , "Sets/Shows RGB for color scheme" },
// {"OPTION" , CmdConfigMenu , CMD_CONFIG_MENU , "Access config options" },
{"DISASM" , CmdConfigDisasm , CMD_CONFIG_DISASM , "Sets/Shows disassembly view options." },
{"FONT" , CmdConfigFont , CMD_CONFIG_FONT , "Shows current font or sets new one" },
{"HCOLOR" , CmdConfigHColor , CMD_CONFIG_HCOLOR , "Sets/Shows colors mapped to Apple HGR" },
{"LOAD" , CmdConfigLoad , CMD_CONFIG_LOAD , "Load debugger configuration" },
{"MONO" , CmdConfigColorMono , CMD_CONFIG_MONOCHROME , "Sets/Shows RGB for monochrome scheme" },
{"SAVE" , CmdConfigSave , CMD_CONFIG_SAVE , "Save debugger configuration" },
{"PWD" , CmdConfigGetDebugDir , CMD_CONFIG_GET_DEBUG_DIR , "Displays the current debugger directory. Used for scripts & mem load/save." },
{"CD" , CmdConfigSetDebugDir , CMD_CONFIG_SET_DEBUG_DIR , "Updates the current debugger directory." },
// Cursor
{TEXT("RET") , CmdCursorJumpRetAddr , CMD_CURSOR_JUMP_RET_ADDR , "Sets the cursor to the sub-routine caller" },
{TEXT( "^") , NULL , CMD_CURSOR_LINE_UP }, // \x2191 = Up Arrow (Unicode)
{TEXT("Shift ^") , NULL , CMD_CURSOR_LINE_UP_1 },
{TEXT( "v") , NULL , CMD_CURSOR_LINE_DOWN }, // \x2193 = Dn Arrow (Unicode)
{TEXT("Shift v") , NULL , CMD_CURSOR_LINE_DOWN_1 },
{TEXT("PAGEUP" ) , CmdCursorPageUp , CMD_CURSOR_PAGE_UP , "Scroll up one screen" },
{TEXT("PAGEUP256") , CmdCursorPageUp256 , CMD_CURSOR_PAGE_UP_256 , "Scroll up 256 bytes" }, // Shift
{TEXT("PAGEUP4K" ) , CmdCursorPageUp4K , CMD_CURSOR_PAGE_UP_4K , "Scroll up 4096 bytes" }, // Ctrl
{TEXT("PAGEDN" ) , CmdCursorPageDown , CMD_CURSOR_PAGE_DOWN , "Scroll down one scren" },
{TEXT("PAGEDOWN256") , CmdCursorPageDown256 , CMD_CURSOR_PAGE_DOWN_256 , "Scroll down 256 bytes" }, // Shift
{TEXT("PAGEDOWN4K" ) , CmdCursorPageDown4K , CMD_CURSOR_PAGE_DOWN_4K , "Scroll down 4096 bytes" }, // Ctrl
{"RET" , CmdCursorJumpRetAddr , CMD_CURSOR_JUMP_RET_ADDR , "Sets the cursor to the sub-routine caller" },
{"^" , NULL , CMD_CURSOR_LINE_UP }, // \x2191 = Up Arrow (Unicode)
{"Shift ^" , NULL , CMD_CURSOR_LINE_UP_1 },
{"v" , NULL , CMD_CURSOR_LINE_DOWN }, // \x2193 = Dn Arrow (Unicode)
{"Shift v" , NULL , CMD_CURSOR_LINE_DOWN_1 },
{"PAGEUP" , CmdCursorPageUp , CMD_CURSOR_PAGE_UP , "Scroll up one screen" },
{"PAGEUP256" , CmdCursorPageUp256 , CMD_CURSOR_PAGE_UP_256 , "Scroll up 256 bytes" }, // Shift
{"PAGEUP4K" , CmdCursorPageUp4K , CMD_CURSOR_PAGE_UP_4K , "Scroll up 4096 bytes" }, // Ctrl
{"PAGEDN" , CmdCursorPageDown , CMD_CURSOR_PAGE_DOWN , "Scroll down one scren" },
{"PAGEDOWN256" , CmdCursorPageDown256 , CMD_CURSOR_PAGE_DOWN_256 , "Scroll down 256 bytes" }, // Shift
{"PAGEDOWN4K" , CmdCursorPageDown4K , CMD_CURSOR_PAGE_DOWN_4K , "Scroll down 4096 bytes" }, // Ctrl
// Cycles info
{TEXT("CYCLES") , CmdCyclesInfo , CMD_CYCLES_INFO, "Cycles display configuration" },
{TEXT("RCC") , CmdCyclesReset , CMD_CYCLES_RESET, "Reset cycles counter" },
{"CYCLES" , CmdCyclesInfo , CMD_CYCLES_INFO, "Cycles display configuration" },
{"RCC" , CmdCyclesReset , CMD_CYCLES_RESET, "Reset cycles counter" },
// Disassembler Data
{TEXT("Z") , CmdDisasmDataDefByte1 , CMD_DISASM_DATA , "Treat byte [range] as data" },
{TEXT("X") , CmdDisasmDataDefCode , CMD_DISASM_CODE , "Treat byte [range] as code" },
{"Z" , CmdDisasmDataDefByte1 , CMD_DISASM_DATA , "Treat byte [range] as data" },
{"X" , CmdDisasmDataDefCode , CMD_DISASM_CODE , "Treat byte [range] as code" },
// TODO: Conflicts with monitor command #L -> 000DL
{TEXT("B") , CmdDisasmDataList , CMD_DISASM_LIST , "List all byte ranges treated as data" },
{"B" , CmdDisasmDataList , CMD_DISASM_LIST , "List all byte ranges treated as data" },
// without symbol lookup
{TEXT("DB") , CmdDisasmDataDefByte1 , CMD_DEFINE_DATA_BYTE1, "Define byte(s)" },
{TEXT("DB2") , CmdDisasmDataDefByte2 , CMD_DEFINE_DATA_BYTE2, "Define byte array, display 2 bytes/line" },
{TEXT("DB4") , CmdDisasmDataDefByte4 , CMD_DEFINE_DATA_BYTE4, "Define byte array, display 4 bytes/line" },
{TEXT("DB8") , CmdDisasmDataDefByte8 , CMD_DEFINE_DATA_BYTE8, "Define byte array, display 8 bytes/line" },
{TEXT("DW") , CmdDisasmDataDefWord1 , CMD_DEFINE_DATA_WORD1, "Define address array" },
{TEXT("DW2") , CmdDisasmDataDefWord2 , CMD_DEFINE_DATA_WORD2, "Define address array, display 2 words/line" },
{TEXT("DW4") , CmdDisasmDataDefWord4 , CMD_DEFINE_DATA_WORD4, "Define address array, display 4 words/line" },
{TEXT("ASC") , CmdDisasmDataDefString , CMD_DEFINE_DATA_STR , "Define text string" }, // 2.7.0.26 Changed: DS to ASC because DS is used as "Define Space" assembler directive
{TEXT("DF") , CmdDisasmDataDefFloat , CMD_DEFINE_DATA_FLOAT, "Define AppleSoft (packed) Float" },
// {TEXT("DFX") , CmdDisasmDataDefFloatUnpack , CMD_DEFINE_DATA_FLOAT2,"Define AppleSoft (unpacked) Float" },
{"DB" , CmdDisasmDataDefByte1 , CMD_DEFINE_DATA_BYTE1, "Define byte(s)" },
{"DB2" , CmdDisasmDataDefByte2 , CMD_DEFINE_DATA_BYTE2, "Define byte array, display 2 bytes/line" },
{"DB4" , CmdDisasmDataDefByte4 , CMD_DEFINE_DATA_BYTE4, "Define byte array, display 4 bytes/line" },
{"DB8" , CmdDisasmDataDefByte8 , CMD_DEFINE_DATA_BYTE8, "Define byte array, display 8 bytes/line" },
{"DW" , CmdDisasmDataDefWord1 , CMD_DEFINE_DATA_WORD1, "Define address array" },
{"DW2" , CmdDisasmDataDefWord2 , CMD_DEFINE_DATA_WORD2, "Define address array, display 2 words/line" },
{"DW4" , CmdDisasmDataDefWord4 , CMD_DEFINE_DATA_WORD4, "Define address array, display 4 words/line" },
{"ASC" , CmdDisasmDataDefString , CMD_DEFINE_DATA_STR , "Define text string" }, // 2.7.0.26 Changed: DS to ASC because DS is used as "Define Space" assembler directive
{"DF" , CmdDisasmDataDefFloat , CMD_DEFINE_DATA_FLOAT, "Define AppleSoft (packed) Float" },
// {"DFX" , CmdDisasmDataDefFloatUnpack , CMD_DEFINE_DATA_FLOAT2,"Define AppleSoft (unpacked) Float" },
// with symbol lookup
// {TEXT("DA<>") , CmdDisasmDataDefAddress8HL , CMD_DEFINE_ADDR_8_HL , "Define split array of addresses, high byte section followed by low byte section" },
// {TEXT("DA><") , CmdDisasmDataDefAddress8LH , CMD_DEFINE_ADDR_8_LH , "Define split array of addresses, low byte section followed by high byte section" },
// {TEXT("DA<") , CmdDisasmDataDefAddress8H , CMD_DEFINE_ADDR_BYTE_H , "Define array of high byte addresses" },
// {TEXT("DB>") , CmdDisasmDataDefAddress8L , CMD_DEFINE_ADDR_BYTE_L , "Define array of low byte addresses" }
{TEXT("DA") , CmdDisasmDataDefAddress16 , CMD_DEFINE_ADDR_WORD , "Define array of word addresses" },
// {"DA<>" , CmdDisasmDataDefAddress8HL , CMD_DEFINE_ADDR_8_HL , "Define split array of addresses, high byte section followed by low byte section" },
// {"DA><" , CmdDisasmDataDefAddress8LH , CMD_DEFINE_ADDR_8_LH , "Define split array of addresses, low byte section followed by high byte section" },
// {"DA<" , CmdDisasmDataDefAddress8H , CMD_DEFINE_ADDR_BYTE_H , "Define array of high byte addresses" },
// {"DB>" , CmdDisasmDataDefAddress8L , CMD_DEFINE_ADDR_BYTE_L , "Define array of low byte addresses" }
{"DA" , CmdDisasmDataDefAddress16 , CMD_DEFINE_ADDR_WORD , "Define array of word addresses" },
// TODO: Rename config cmd: DISASM or ID (Interactive Disassembly)
// {TEXT("UA") , CmdDisasmDataSmart , CMD_SMART_DISASSEMBLE, "Analyze opcodes to determine if code or data" },
// {"UA" , CmdDisasmDataSmart , CMD_SMART_DISASSEMBLE, "Analyze opcodes to determine if code or data" },
// Disk
{TEXT("DISK") , CmdDisk , CMD_DISK , "Access Disk Drive Functions" },
{"DISK" , CmdDisk , CMD_DISK , "Access Disk Drive Functions" },
// Flags
// {TEXT("FC") , CmdFlag , CMD_FLAG_CLEAR , "Clear specified Flag" }, // NVRBDIZC see AW_CPU.cpp AF_*
// {"FC" , CmdFlag , CMD_FLAG_CLEAR , "Clear specified Flag" }, // NVRBDIZC see AW_CPU.cpp AF_*
// TODO: Conflicts with monitor command #L -> 000CL
{TEXT("CL") , CmdFlag , CMD_FLAG_CLEAR , "Clear specified Flag" }, // NVRBDIZC see AW_CPU.cpp AF_*
{"CL" , CmdFlag , CMD_FLAG_CLEAR , "Clear specified Flag" }, // NVRBDIZC see AW_CPU.cpp AF_*
{TEXT("CLC") , CmdFlagClear , CMD_FLAG_CLR_C , "Clear Flag Carry" }, // 0 // Legacy
{TEXT("CLZ") , CmdFlagClear , CMD_FLAG_CLR_Z , "Clear Flag Zero" }, // 1
{TEXT("CLI") , CmdFlagClear , CMD_FLAG_CLR_I , "Clear Flag Interrupts Disabled" }, // 2
{TEXT("CLD") , CmdFlagClear , CMD_FLAG_CLR_D , "Clear Flag Decimal (BCD)" }, // 3
{TEXT("CLB") , CmdFlagClear , CMD_FLAG_CLR_B , "CLear Flag Break" }, // 4 // Legacy
{TEXT("CLR") , CmdFlagClear , CMD_FLAG_CLR_R , "Clear Flag Reserved" }, // 5
{TEXT("CLV") , CmdFlagClear , CMD_FLAG_CLR_V , "Clear Flag Overflow" }, // 6
{TEXT("CLN") , CmdFlagClear , CMD_FLAG_CLR_N , "Clear Flag Negative (Sign)" }, // 7
{"CLC" , CmdFlagClear , CMD_FLAG_CLR_C , "Clear Flag Carry" }, // 0 // Legacy
{"CLZ" , CmdFlagClear , CMD_FLAG_CLR_Z , "Clear Flag Zero" }, // 1
{"CLI" , CmdFlagClear , CMD_FLAG_CLR_I , "Clear Flag Interrupts Disabled" }, // 2
{"CLD" , CmdFlagClear , CMD_FLAG_CLR_D , "Clear Flag Decimal (BCD)" }, // 3
{"CLB" , CmdFlagClear , CMD_FLAG_CLR_B , "CLear Flag Break" }, // 4 // Legacy
{"CLR" , CmdFlagClear , CMD_FLAG_CLR_R , "Clear Flag Reserved" }, // 5
{"CLV" , CmdFlagClear , CMD_FLAG_CLR_V , "Clear Flag Overflow" }, // 6
{"CLN" , CmdFlagClear , CMD_FLAG_CLR_N , "Clear Flag Negative (Sign)" }, // 7
// {TEXT("FS") , CmdFlag , CMD_FLAG_SET , "Set specified Flag" },
{TEXT("SE") , CmdFlag , CMD_FLAG_SET , "Set specified Flag" },
// {"FS" , CmdFlag , CMD_FLAG_SET , "Set specified Flag" },
{"SE" , CmdFlag , CMD_FLAG_SET , "Set specified Flag" },
{TEXT("SEC") , CmdFlagSet , CMD_FLAG_SET_C , "Set Flag Carry" }, // 0
{TEXT("SEZ") , CmdFlagSet , CMD_FLAG_SET_Z , "Set Flag Zero" }, // 1
{TEXT("SEI") , CmdFlagSet , CMD_FLAG_SET_I , "Set Flag Interrupts Disabled" }, // 2
{TEXT("SED") , CmdFlagSet , CMD_FLAG_SET_D , "Set Flag Decimal (BCD)" }, // 3
{TEXT("SEB") , CmdFlagSet , CMD_FLAG_SET_B , "Set Flag Break" }, // 4 // Legacy
{TEXT("SER") , CmdFlagSet , CMD_FLAG_SET_R , "Set Flag Reserved" }, // 5
{TEXT("SEV") , CmdFlagSet , CMD_FLAG_SET_V , "Set Flag Overflow" }, // 6
{TEXT("SEN") , CmdFlagSet , CMD_FLAG_SET_N , "Set Flag Negative" }, // 7
{"SEC" , CmdFlagSet , CMD_FLAG_SET_C , "Set Flag Carry" }, // 0
{"SEZ" , CmdFlagSet , CMD_FLAG_SET_Z , "Set Flag Zero" }, // 1
{"SEI" , CmdFlagSet , CMD_FLAG_SET_I , "Set Flag Interrupts Disabled" }, // 2
{"SED" , CmdFlagSet , CMD_FLAG_SET_D , "Set Flag Decimal (BCD)" }, // 3
{"SEB" , CmdFlagSet , CMD_FLAG_SET_B , "Set Flag Break" }, // 4 // Legacy
{"SER" , CmdFlagSet , CMD_FLAG_SET_R , "Set Flag Reserved" }, // 5
{"SEV" , CmdFlagSet , CMD_FLAG_SET_V , "Set Flag Overflow" }, // 6
{"SEN" , CmdFlagSet , CMD_FLAG_SET_N , "Set Flag Negative" }, // 7
// Help
{TEXT("?") , CmdHelpList , CMD_HELP_LIST , "List all available commands" },
{TEXT("HELP") , CmdHelpSpecific , CMD_HELP_SPECIFIC , "Help on specific command" },
{TEXT("VERSION") , CmdVersion , CMD_VERSION , "Displays version of emulator/debugger" },
{TEXT("MOTD") , CmdMOTD , CMD_MOTD }, // MOTD: Message Of The Day
{"?" , CmdHelpList , CMD_HELP_LIST , "List all available commands" },
{"HELP" , CmdHelpSpecific , CMD_HELP_SPECIFIC , "Help on specific command" },
{"VERSION" , CmdVersion , CMD_VERSION , "Displays version of emulator/debugger" },
{"MOTD" , CmdMOTD , CMD_MOTD }, // MOTD: Message Of The Day
// Memory
{TEXT("MC") , CmdMemoryCompare , CMD_MEMORY_COMPARE },
{"MC" , CmdMemoryCompare , CMD_MEMORY_COMPARE },
{TEXT("MD1") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 , "Hex dump in the mini memory area 1" },
{TEXT("MD2") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_2 , "Hex dump in the mini memory area 2" },
{"MD1" , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 , "Hex dump in the mini memory area 1" },
{"MD2" , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_2 , "Hex dump in the mini memory area 2" },
{TEXT("MA1") , CmdMemoryMiniDumpAscii,CMD_MEM_MINI_DUMP_ASCII_1, "ASCII text in mini memory area 1" },
{TEXT("MA2") , CmdMemoryMiniDumpAscii,CMD_MEM_MINI_DUMP_ASCII_2, "ASCII text in mini memory area 2" },
{TEXT("MT1") , CmdMemoryMiniDumpApple,CMD_MEM_MINI_DUMP_APPLE_1, "Apple Text in mini memory area 1" },
{TEXT("MT2") , CmdMemoryMiniDumpApple,CMD_MEM_MINI_DUMP_APPLE_2, "Apple Text in mini memory area 2" },
// {TEXT("ML1") , CmdMemoryMiniDumpLow , CMD_MEM_MINI_DUMP_TXT_LO_1, "Text (Ctrl) in mini memory dump area 1" },
// {TEXT("ML2") , CmdMemoryMiniDumpLow , CMD_MEM_MINI_DUMP_TXT_LO_2, "Text (Ctrl) in mini memory dump area 2" },
// {TEXT("MH1") , CmdMemoryMiniDumpHigh, CMD_MEM_MINI_DUMP_TXT_HI_1, "Text (High) in mini memory dump area 1" },
// {TEXT("MH2") , CmdMemoryMiniDumpHigh, CMD_MEM_MINI_DUMP_TXT_HI_2, "Text (High) in mini memory dump area 2" },
{"MA1" , CmdMemoryMiniDumpAscii,CMD_MEM_MINI_DUMP_ASCII_1, "ASCII text in mini memory area 1" },
{"MA2" , CmdMemoryMiniDumpAscii,CMD_MEM_MINI_DUMP_ASCII_2, "ASCII text in mini memory area 2" },
{"MT1" , CmdMemoryMiniDumpApple,CMD_MEM_MINI_DUMP_APPLE_1, "Apple Text in mini memory area 1" },
{"MT2" , CmdMemoryMiniDumpApple,CMD_MEM_MINI_DUMP_APPLE_2, "Apple Text in mini memory area 2" },
// {"ML1" , CmdMemoryMiniDumpLow , CMD_MEM_MINI_DUMP_TXT_LO_1, "Text (Ctrl) in mini memory dump area 1" },
// {"ML2" , CmdMemoryMiniDumpLow , CMD_MEM_MINI_DUMP_TXT_LO_2, "Text (Ctrl) in mini memory dump area 2" },
// {"MH1" , CmdMemoryMiniDumpHigh, CMD_MEM_MINI_DUMP_TXT_HI_1, "Text (High) in mini memory dump area 1" },
// {"MH2" , CmdMemoryMiniDumpHigh, CMD_MEM_MINI_DUMP_TXT_HI_2, "Text (High) in mini memory dump area 2" },
{TEXT("ME") , CmdMemoryEdit , CMD_MEMORY_EDIT , "Memory Editor - Not Implemented!" }, // TODO: like Copy ][+ Sector Edit
{TEXT("MEB") , CmdMemoryEnterByte , CMD_MEMORY_ENTER_BYTE , "Enter byte" },
{TEXT("MEW") , CmdMemoryEnterWord , CMD_MEMORY_ENTER_WORD , "Enter word" },
{TEXT("BLOAD") , CmdMemoryLoad , CMD_MEMORY_LOAD , "Load a region of memory" },
{TEXT("M") , CmdMemoryMove , CMD_MEMORY_MOVE , "Memory move" },
{TEXT("BSAVE") , CmdMemorySave , CMD_MEMORY_SAVE , "Save a region of memory" },
{TEXT("S") , CmdMemorySearch , CMD_MEMORY_SEARCH , "Search memory for text / hex values" },
{TEXT("@") ,_SearchMemoryDisplay , CMD_MEMORY_FIND_RESULTS , "Display search memory results" },
// {TEXT("SA") , CmdMemorySearchAscii, CMD_MEMORY_SEARCH_ASCII , "Search ASCII text" },
// {TEXT("ST") , CmdMemorySearchApple , CMD_MEMORY_SEARCH_APPLE , "Search Apple text (hi-bit)" },
{TEXT("SH") , CmdMemorySearchHex , CMD_MEMORY_SEARCH_HEX , "Search memory for hex values" },
{TEXT("F") , CmdMemoryFill , CMD_MEMORY_FILL , "Memory fill" },
{"ME" , CmdMemoryEdit , CMD_MEMORY_EDIT , "Memory Editor - Not Implemented!" }, // TODO: like Copy ][+ Sector Edit
{"MEB" , CmdMemoryEnterByte , CMD_MEMORY_ENTER_BYTE , "Enter byte" },
{"MEW" , CmdMemoryEnterWord , CMD_MEMORY_ENTER_WORD , "Enter word" },
{"BLOAD" , CmdMemoryLoad , CMD_MEMORY_LOAD , "Load a region of memory" },
{"M" , CmdMemoryMove , CMD_MEMORY_MOVE , "Memory move" },
{"BSAVE" , CmdMemorySave , CMD_MEMORY_SAVE , "Save a region of memory" },
{"S" , CmdMemorySearch , CMD_MEMORY_SEARCH , "Search memory for text / hex values" },
{"@" ,_SearchMemoryDisplay , CMD_MEMORY_FIND_RESULTS , "Display search memory results" },
// {"SA" , CmdMemorySearchAscii, CMD_MEMORY_SEARCH_ASCII , "Search ASCII text" },
// {"ST" , CmdMemorySearchApple , CMD_MEMORY_SEARCH_APPLE , "Search Apple text (hi-bit)" },
{"SH" , CmdMemorySearchHex , CMD_MEMORY_SEARCH_HEX , "Search memory for hex values" },
{"F" , CmdMemoryFill , CMD_MEMORY_FILL , "Memory fill" },
{TEXT("NTSC") , CmdNTSC , CMD_NTSC , "Save/Load the NTSC palette" },
{TEXT("TSAVE") , CmdTextSave , CMD_TEXT_SAVE , "Save text screen" },
{"NTSC" , CmdNTSC , CMD_NTSC , "Save/Load the NTSC palette" },
{"TSAVE" , CmdTextSave , CMD_TEXT_SAVE , "Save text screen" },
// Output / Scripts
{TEXT("CALC") , CmdOutputCalc , CMD_OUTPUT_CALC , "Display mini calc result" },
{TEXT("ECHO") , CmdOutputEcho , CMD_OUTPUT_ECHO , "Echo string to console" }, // or toggle command echoing"
{TEXT("PRINT") , CmdOutputPrint , CMD_OUTPUT_PRINT , "Display string and/or hex values" },
{TEXT("PRINTF") , CmdOutputPrintf , CMD_OUTPUT_PRINTF , "Display formatted string" },
{TEXT("RUN") , CmdOutputRun , CMD_OUTPUT_RUN , "Run script file of debugger commands" },
{"CALC" , CmdOutputCalc , CMD_OUTPUT_CALC , "Display mini calc result" },
{"ECHO" , CmdOutputEcho , CMD_OUTPUT_ECHO , "Echo string to console" }, // or toggle command echoing"
{"PRINT" , CmdOutputPrint , CMD_OUTPUT_PRINT , "Display string and/or hex values" },
{"PRINTF" , CmdOutputPrintf , CMD_OUTPUT_PRINTF , "Display formatted string" },
{"RUN" , CmdOutputRun , CMD_OUTPUT_RUN , "Run script file of debugger commands" },
// Source Level Debugging
{TEXT("SOURCE") , CmdSource , CMD_SOURCE , "Starts/Stops source level debugging" },
{TEXT("SYNC") , CmdSync , CMD_SYNC , "Syncs the cursor to the source file" },
{"SOURCE" , CmdSource , CMD_SOURCE , "Starts/Stops source level debugging" },
{"SYNC" , CmdSync , CMD_SYNC , "Syncs the cursor to the source file" },
// Symbols
{TEXT("SYM") , CmdSymbols , CMD_SYMBOLS_LOOKUP , "Lookup symbol or address, or define symbol" },
{"SYM" , CmdSymbols , CMD_SYMBOLS_LOOKUP , "Lookup symbol or address, or define symbol" },
{"SYMMAIN" , CmdSymbolsCommand , CMD_SYMBOLS_ROM , "Main/ROM symbol table lookup/menu" }, // CLEAR,LOAD,SAVE
{"SYMBASIC" , CmdSymbolsCommand , CMD_SYMBOLS_APPLESOFT , "Applesoft symbol table lookup/menu" }, // CLEAR,LOAD,SAVE
@@ -236,140 +236,140 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
{"SYMDOS33" , CmdSymbolsCommand , CMD_SYMBOLS_DOS33 , "DOS 3.3 symbol table lookup/menu" }, // CLEAR,LOAD,SAVE
{"SYMPRODOS" , CmdSymbolsCommand , CMD_SYMBOLS_PRODOS , "ProDOS symbol table lookup/menu" }, // CLEAR,LOAD,SAVE
// {TEXT("SYMCLEAR") , CmdSymbolsClear , CMD_SYMBOLS_CLEAR }, // can't use SC = SetCarry
{TEXT("SYMINFO") , CmdSymbolsInfo , CMD_SYMBOLS_INFO , "Display summary of symbols" },
{TEXT("SYMLIST") , CmdSymbolsList , CMD_SYMBOLS_LIST , "Lookup symbol in main/user/src tables" }, // 'symbolname', can't use param '*'
// {"SYMCLEAR" , CmdSymbolsClear , CMD_SYMBOLS_CLEAR }, // can't use SC = SetCarry
{"SYMINFO" , CmdSymbolsInfo , CMD_SYMBOLS_INFO , "Display summary of symbols" },
{"SYMLIST" , CmdSymbolsList , CMD_SYMBOLS_LIST , "Lookup symbol in main/user/src tables" }, // 'symbolname', can't use param '*'
// Variables
// {TEXT("CLEAR") , CmdVarsClear , CMD_VARIABLES_CLEAR },
// {TEXT("VAR") , CmdVarsDefine , CMD_VARIABLES_DEFINE },
// {TEXT("INT8") , CmdVarsDefineInt8 , CMD_VARIABLES_DEFINE_INT8},
// {TEXT("INT16") , CmdVarsDefineInt16 , CMD_VARIABLES_DEFINE_INT16},
// {TEXT("VARS") , CmdVarsList , CMD_VARIABLES_LIST },
// {TEXT("VARSLOAD") , CmdVarsLoad , CMD_VARIABLES_LOAD },
// {TEXT("VARSSAVE") , CmdVarsSave , CMD_VARIABLES_SAVE },
// {TEXT("SET") , CmdVarsSet , CMD_VARIABLES_SET },
// {"CLEAR" , CmdVarsClear , CMD_VARIABLES_CLEAR },
// {"VAR" , CmdVarsDefine , CMD_VARIABLES_DEFINE },
// {"INT8" , CmdVarsDefineInt8 , CMD_VARIABLES_DEFINE_INT8},
// {"INT16" , CmdVarsDefineInt16 , CMD_VARIABLES_DEFINE_INT16},
// {"VARS" , CmdVarsList , CMD_VARIABLES_LIST },
// {"VARSLOAD" , CmdVarsLoad , CMD_VARIABLES_LOAD },
// {"VARSSAVE" , CmdVarsSave , CMD_VARIABLES_SAVE },
// {"SET" , CmdVarsSet , CMD_VARIABLES_SET },
// Video-scanner info
{TEXT("VIDEOINFO") , CmdVideoScannerInfo , CMD_VIDEO_SCANNER_INFO, "Video-scanner display configuration" },
{"VIDEOINFO" , CmdVideoScannerInfo , CMD_VIDEO_SCANNER_INFO, "Video-scanner display configuration" },
// View
{TEXT("TEXT") , CmdViewOutput_Text4X , CMD_VIEW_TEXT4X, "View Text screen (current page)" },
{TEXT("TEXT1") , CmdViewOutput_Text41 , CMD_VIEW_TEXT41, "View Text screen Page 1" },
{TEXT("TEXT2") , CmdViewOutput_Text42 , CMD_VIEW_TEXT42, "View Text screen Page 2" },
{TEXT("TEXT80") , CmdViewOutput_Text8X , CMD_VIEW_TEXT8X, "View 80-col Text screen (current page)" },
{TEXT("TEXT81") , CmdViewOutput_Text81 , CMD_VIEW_TEXT81, "View 80-col Text screen Page 1" },
{TEXT("TEXT82") , CmdViewOutput_Text82 , CMD_VIEW_TEXT82, "View 80-col Text screen Page 2" },
{TEXT("GR") , CmdViewOutput_GRX , CMD_VIEW_GRX , "View Lo-Res screen (current page)" },
{TEXT("GR1") , CmdViewOutput_GR1 , CMD_VIEW_GR1 , "View Lo-Res screen Page 1" },
{TEXT("GR2") , CmdViewOutput_GR2 , CMD_VIEW_GR2 , "View Lo-Res screen Page 2" },
{TEXT("DGR") , CmdViewOutput_DGRX , CMD_VIEW_DGRX , "View Double lo-res (current page)" },
{TEXT("DGR1") , CmdViewOutput_DGR1 , CMD_VIEW_DGR1 , "View Double lo-res Page 1" },
{TEXT("DGR2") , CmdViewOutput_DGR2 , CMD_VIEW_DGR2 , "View Double lo-res Page 2" },
{TEXT("HGR") , CmdViewOutput_HGRX , CMD_VIEW_HGRX , "View Hi-res (current page)" },
{TEXT("HGR0") , CmdViewOutput_HGR0 , CMD_VIEW_HGR0 , "View pseudo Hi-res Page 0 ($0000)" },
{TEXT("HGR1") , CmdViewOutput_HGR1 , CMD_VIEW_HGR1 , "View Hi-res Page 1 ($2000)" },
{TEXT("HGR2") , CmdViewOutput_HGR2 , CMD_VIEW_HGR2 , "View Hi-res Page 2 ($4000)" },
{TEXT("HGR3") , CmdViewOutput_HGR3 , CMD_VIEW_HGR3 , "View pseudo Hi-res Page 3 ($6000)" },
{TEXT("HGR4") , CmdViewOutput_HGR4 , CMD_VIEW_HGR4 , "View pseudo Hi-res Page 4 ($8000)" },
{TEXT("HGR5") , CmdViewOutput_HGR5 , CMD_VIEW_HGR5 , "View pseudo Hi-res Page 5 ($A000)" },
{TEXT("DHGR") , CmdViewOutput_DHGRX , CMD_VIEW_DHGRX , "View Double Hi-res (current page)" },
{TEXT("DHGR1") , CmdViewOutput_DHGR1 , CMD_VIEW_DHGR1 , "View Double Hi-res Page 1" },
{TEXT("DHGR2") , CmdViewOutput_DHGR2 , CMD_VIEW_DHGR2 , "View Double Hi-res Page 2" },
{TEXT("SHR") , CmdViewOutput_SHR , CMD_VIEW_SHR , "View Super Hi-res" },
{"TEXT" , CmdViewOutput_Text4X , CMD_VIEW_TEXT4X, "View Text screen (current page)" },
{"TEXT1" , CmdViewOutput_Text41 , CMD_VIEW_TEXT41, "View Text screen Page 1" },
{"TEXT2" , CmdViewOutput_Text42 , CMD_VIEW_TEXT42, "View Text screen Page 2" },
{"TEXT80" , CmdViewOutput_Text8X , CMD_VIEW_TEXT8X, "View 80-col Text screen (current page)" },
{"TEXT81" , CmdViewOutput_Text81 , CMD_VIEW_TEXT81, "View 80-col Text screen Page 1" },
{"TEXT82" , CmdViewOutput_Text82 , CMD_VIEW_TEXT82, "View 80-col Text screen Page 2" },
{"GR" , CmdViewOutput_GRX , CMD_VIEW_GRX , "View Lo-Res screen (current page)" },
{"GR1" , CmdViewOutput_GR1 , CMD_VIEW_GR1 , "View Lo-Res screen Page 1" },
{"GR2" , CmdViewOutput_GR2 , CMD_VIEW_GR2 , "View Lo-Res screen Page 2" },
{"DGR" , CmdViewOutput_DGRX , CMD_VIEW_DGRX , "View Double lo-res (current page)" },
{"DGR1" , CmdViewOutput_DGR1 , CMD_VIEW_DGR1 , "View Double lo-res Page 1" },
{"DGR2" , CmdViewOutput_DGR2 , CMD_VIEW_DGR2 , "View Double lo-res Page 2" },
{"HGR" , CmdViewOutput_HGRX , CMD_VIEW_HGRX , "View Hi-res (current page)" },
{"HGR0" , CmdViewOutput_HGR0 , CMD_VIEW_HGR0 , "View pseudo Hi-res Page 0 ($0000)" },
{"HGR1" , CmdViewOutput_HGR1 , CMD_VIEW_HGR1 , "View Hi-res Page 1 ($2000)" },
{"HGR2" , CmdViewOutput_HGR2 , CMD_VIEW_HGR2 , "View Hi-res Page 2 ($4000)" },
{"HGR3" , CmdViewOutput_HGR3 , CMD_VIEW_HGR3 , "View pseudo Hi-res Page 3 ($6000)" },
{"HGR4" , CmdViewOutput_HGR4 , CMD_VIEW_HGR4 , "View pseudo Hi-res Page 4 ($8000)" },
{"HGR5" , CmdViewOutput_HGR5 , CMD_VIEW_HGR5 , "View pseudo Hi-res Page 5 ($A000)" },
{"DHGR" , CmdViewOutput_DHGRX , CMD_VIEW_DHGRX , "View Double Hi-res (current page)" },
{"DHGR1" , CmdViewOutput_DHGR1 , CMD_VIEW_DHGR1 , "View Double Hi-res Page 1" },
{"DHGR2" , CmdViewOutput_DHGR2 , CMD_VIEW_DHGR2 , "View Double Hi-res Page 2" },
{"SHR" , CmdViewOutput_SHR , CMD_VIEW_SHR , "View Super Hi-res" },
// Watch
{TEXT("W") , CmdWatchAdd , CMD_WATCH , "Alias for WA (Watch Add)" },
{TEXT("WA") , CmdWatchAdd , CMD_WATCH_ADD , "Add/Update address or symbol to watch" },
{TEXT("WC") , CmdWatchClear , CMD_WATCH_CLEAR , "Clear (remove) watch" },
{TEXT("WD") , CmdWatchDisable , CMD_WATCH_DISABLE , "Disable specific watch - it is still in the list, just not active" },
{TEXT("WE") , CmdWatchEnable , CMD_WATCH_ENABLE , "(Re)Enable disabled watch" },
{TEXT("WL") , CmdWatchList , CMD_WATCH_LIST , "List all watches" },
// {TEXT("WLOAD") , CmdWatchLoad , CMD_WATCH_LOAD , "Load Watches" }, // Cant use as param to W
{TEXT("WSAVE") , CmdWatchSave , CMD_WATCH_SAVE , "Save Watches" }, // due to symbol look-up
{"W" , CmdWatchAdd , CMD_WATCH , "Alias for WA (Watch Add)" },
{"WA" , CmdWatchAdd , CMD_WATCH_ADD , "Add/Update address or symbol to watch" },
{"WC" , CmdWatchClear , CMD_WATCH_CLEAR , "Clear (remove) watch" },
{"WD" , CmdWatchDisable , CMD_WATCH_DISABLE , "Disable specific watch - it is still in the list, just not active" },
{"WE" , CmdWatchEnable , CMD_WATCH_ENABLE , "(Re)Enable disabled watch" },
{"WL" , CmdWatchList , CMD_WATCH_LIST , "List all watches" },
// {"WLOAD" , CmdWatchLoad , CMD_WATCH_LOAD , "Load Watches" }, // Cant use as param to W
{"WSAVE" , CmdWatchSave , CMD_WATCH_SAVE , "Save Watches" }, // due to symbol look-up
// Window
{TEXT("WIN") , CmdWindow , CMD_WINDOW , "Show specified debugger window" },
{"WIN" , CmdWindow , CMD_WINDOW , "Show specified debugger window" },
// CODE 0, CODE 1, CODE 2 ... ???
{TEXT("CODE") , CmdWindowViewCode , CMD_WINDOW_CODE , "Switch to full code window" }, // Can't use WC = WatchClear
{TEXT("CODE1") , CmdWindowShowCode1 , CMD_WINDOW_CODE_1 , "Show code on top split window" },
{TEXT("CODE2") , CmdWindowShowCode2 , CMD_WINDOW_CODE_2 , "Show code on bottom split window" },
{TEXT("CONSOLE") , CmdWindowViewConsole , CMD_WINDOW_CONSOLE , "Switch to full console window" },
{TEXT("DATA") , CmdWindowViewData , CMD_WINDOW_DATA , "Switch to full data window" },
{TEXT("DATA1") , CmdWindowShowData1 , CMD_WINDOW_DATA_1 , "Show data on top split window" },
{TEXT("DATA2") , CmdWindowShowData2 , CMD_WINDOW_DATA_2 , "Show data on bottom split window" },
{TEXT("SOURCE1") , CmdWindowShowSource1 , CMD_WINDOW_SOURCE_1, "Show source on top split screen" },
{TEXT("SOURCE2") , CmdWindowShowSource2 , CMD_WINDOW_SOURCE_2, "Show source on bottom split screen" },
{"CODE" , CmdWindowViewCode , CMD_WINDOW_CODE , "Switch to full code window" }, // Can't use WC = WatchClear
{"CODE1" , CmdWindowShowCode1 , CMD_WINDOW_CODE_1 , "Show code on top split window" },
{"CODE2" , CmdWindowShowCode2 , CMD_WINDOW_CODE_2 , "Show code on bottom split window" },
{"CONSOLE" , CmdWindowViewConsole , CMD_WINDOW_CONSOLE , "Switch to full console window" },
{"DATA" , CmdWindowViewData , CMD_WINDOW_DATA , "Switch to full data window" },
{"DATA1" , CmdWindowShowData1 , CMD_WINDOW_DATA_1 , "Show data on top split window" },
{"DATA2" , CmdWindowShowData2 , CMD_WINDOW_DATA_2 , "Show data on bottom split window" },
{"SOURCE1" , CmdWindowShowSource1 , CMD_WINDOW_SOURCE_1, "Show source on top split screen" },
{"SOURCE2" , CmdWindowShowSource2 , CMD_WINDOW_SOURCE_2, "Show source on bottom split screen" },
{TEXT("\\") , CmdWindowViewOutput , CMD_WINDOW_OUTPUT , "Display Apple output until key pressed" },
// {TEXT("INFO") , CmdToggleInfoPanel , CMD_WINDOW_TOGGLE },
// {TEXT("WINSOURCE") , CmdWindowShowSource , CMD_WINDOW_SOURCE },
// {TEXT("ZEROPAGE") , CmdWindowShowZeropage, CMD_WINDOW_ZEROPAGE },
{"\\" , CmdWindowViewOutput , CMD_WINDOW_OUTPUT , "Display Apple output until key pressed" },
// {"INFO" , CmdToggleInfoPanel , CMD_WINDOW_TOGGLE },
// {"WINSOURCE" , CmdWindowShowSource , CMD_WINDOW_SOURCE },
// {"ZEROPAGE" , CmdWindowShowZeropage, CMD_WINDOW_ZEROPAGE },
// Zero Page
{TEXT("ZP") , CmdZeroPageAdd , CMD_ZEROPAGE_POINTER , "Alias for ZPA (Zero Page Add)" },
{TEXT("ZP0") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_0 , "Set/Update/Remove ZP watch 0 " },
{TEXT("ZP1") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_1 , "Set/Update/Remove ZP watch 1" },
{TEXT("ZP2") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_2 , "Set/Update/Remove ZP watch 2" },
{TEXT("ZP3") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_3 , "Set/Update/Remove ZP watch 3" },
{TEXT("ZP4") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_4 , "Set/Update/Remove ZP watch 4" },
{TEXT("ZP5") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_5 , "Set/Update/Remove ZP watch 5 " },
{TEXT("ZP6") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_6 , "Set/Update/Remove ZP watch 6" },
{TEXT("ZP7") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_7 , "Set/Update/Remove ZP watch 7" },
{TEXT("ZPA") , CmdZeroPageAdd , CMD_ZEROPAGE_POINTER_ADD , "Add/Update address to zero page pointer"},
{TEXT("ZPC") , CmdZeroPageClear , CMD_ZEROPAGE_POINTER_CLEAR , "Clear (remove) zero page pointer" },
{TEXT("ZPD") , CmdZeroPageDisable , CMD_ZEROPAGE_POINTER_DISABLE,"Disable zero page pointer - it is still in the list, just not active" },
{TEXT("ZPE") , CmdZeroPageEnable , CMD_ZEROPAGE_POINTER_ENABLE, "(Re)Enable disabled zero page pointer" },
{TEXT("ZPL") , CmdZeroPageList , CMD_ZEROPAGE_POINTER_LIST , "List all zero page pointers" },
// {TEXT("ZPLOAD") , CmdZeroPageLoad , CMD_ZEROPAGE_POINTER_LOAD , "Load zero page pointers" }, // Cant use as param to ZP
{TEXT("ZPSAVE") , CmdZeroPageSave , CMD_ZEROPAGE_POINTER_SAVE , "Save zero page pointers" }, // due to symbol look-up
{"ZP" , CmdZeroPageAdd , CMD_ZEROPAGE_POINTER , "Alias for ZPA (Zero Page Add)" },
{"ZP0" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_0 , "Set/Update/Remove ZP watch 0 " },
{"ZP1" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_1 , "Set/Update/Remove ZP watch 1" },
{"ZP2" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_2 , "Set/Update/Remove ZP watch 2" },
{"ZP3" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_3 , "Set/Update/Remove ZP watch 3" },
{"ZP4" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_4 , "Set/Update/Remove ZP watch 4" },
{"ZP5" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_5 , "Set/Update/Remove ZP watch 5 " },
{"ZP6" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_6 , "Set/Update/Remove ZP watch 6" },
{"ZP7" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_7 , "Set/Update/Remove ZP watch 7" },
{"ZPA" , CmdZeroPageAdd , CMD_ZEROPAGE_POINTER_ADD , "Add/Update address to zero page pointer"},
{"ZPC" , CmdZeroPageClear , CMD_ZEROPAGE_POINTER_CLEAR , "Clear (remove) zero page pointer" },
{"ZPD" , CmdZeroPageDisable , CMD_ZEROPAGE_POINTER_DISABLE,"Disable zero page pointer - it is still in the list, just not active" },
{"ZPE" , CmdZeroPageEnable , CMD_ZEROPAGE_POINTER_ENABLE, "(Re)Enable disabled zero page pointer" },
{"ZPL" , CmdZeroPageList , CMD_ZEROPAGE_POINTER_LIST , "List all zero page pointers" },
// {"ZPLOAD" , CmdZeroPageLoad , CMD_ZEROPAGE_POINTER_LOAD , "Load zero page pointers" }, // Cant use as param to ZP
{"ZPSAVE" , CmdZeroPageSave , CMD_ZEROPAGE_POINTER_SAVE , "Save zero page pointers" }, // due to symbol look-up
// {TEXT("TIMEDEMO"),CmdTimeDemo, CMD_TIMEDEMO }, // CmdBenchmarkStart(), CmdBenchmarkStop()
// {TEXT("WC"),CmdShowCodeWindow}, // Can't use since WatchClear
// {TEXT("WD"),CmdShowDataWindow}, //
// {"TIMEDEMO",CmdTimeDemo, CMD_TIMEDEMO }, // CmdBenchmarkStart(), CmdBenchmarkStop()
// {"WC",CmdShowCodeWindow}, // Can't use since WatchClear
// {"WD",CmdShowDataWindow}, //
// Internal Consistency Check
{ DEBUGGER__COMMANDS_VERIFY_TXT__, NULL, NUM_COMMANDS },
// Aliasies - Can be in any order
{TEXT("->") , NULL , CMD_CURSOR_JUMP_PC },
{TEXT("Ctrl ->" ) , NULL , CMD_CURSOR_SET_PC },
{TEXT("Shift ->") , NULL , CMD_CURSOR_JUMP_PC }, // at top
{TEXT("INPUT") , CmdIn , CMD_IN },
{"->" , NULL , CMD_CURSOR_JUMP_PC },
{"Ctrl ->" , NULL , CMD_CURSOR_SET_PC },
{"Shift ->" , NULL , CMD_CURSOR_JUMP_PC }, // at top
{"INPUT" , CmdIn , CMD_IN },
// Data
// Flags - Clear
{TEXT("RC") , CmdFlagClear , CMD_FLAG_CLR_C , "Clear Flag Carry" }, // 0 // Legacy
{TEXT("RZ") , CmdFlagClear , CMD_FLAG_CLR_Z , "Clear Flag Zero" }, // 1
{TEXT("RI") , CmdFlagClear , CMD_FLAG_CLR_I , "Clear Flag Interrupts Disabled" }, // 2
{TEXT("RD") , CmdFlagClear , CMD_FLAG_CLR_D , "Clear Flag Decimal (BCD)" }, // 3
{TEXT("RB") , CmdFlagClear , CMD_FLAG_CLR_B , "CLear Flag Break" }, // 4 // Legacy
{TEXT("RR") , CmdFlagClear , CMD_FLAG_CLR_R , "Clear Flag Reserved" }, // 5
{TEXT("RV") , CmdFlagClear , CMD_FLAG_CLR_V , "Clear Flag Overflow" }, // 6
{TEXT("RN") , CmdFlagClear , CMD_FLAG_CLR_N , "Clear Flag Negative (Sign)" }, // 7
{"RC" , CmdFlagClear , CMD_FLAG_CLR_C , "Clear Flag Carry" }, // 0 // Legacy
{"RZ" , CmdFlagClear , CMD_FLAG_CLR_Z , "Clear Flag Zero" }, // 1
{"RI" , CmdFlagClear , CMD_FLAG_CLR_I , "Clear Flag Interrupts Disabled" }, // 2
{"RD" , CmdFlagClear , CMD_FLAG_CLR_D , "Clear Flag Decimal (BCD)" }, // 3
{"RB" , CmdFlagClear , CMD_FLAG_CLR_B , "CLear Flag Break" }, // 4 // Legacy
{"RR" , CmdFlagClear , CMD_FLAG_CLR_R , "Clear Flag Reserved" }, // 5
{"RV" , CmdFlagClear , CMD_FLAG_CLR_V , "Clear Flag Overflow" }, // 6
{"RN" , CmdFlagClear , CMD_FLAG_CLR_N , "Clear Flag Negative (Sign)" }, // 7
// Flags - Set
{TEXT("SC") , CmdFlagSet , CMD_FLAG_SET_C , "Set Flag Carry" }, // 0
{TEXT("SZ") , CmdFlagSet , CMD_FLAG_SET_Z , "Set Flag Zero" }, // 1
{TEXT("SI") , CmdFlagSet , CMD_FLAG_SET_I , "Set Flag Interrupts Disabled" }, // 2
{TEXT("SD") , CmdFlagSet , CMD_FLAG_SET_D , "Set Flag Decimal (BCD)" }, // 3
{TEXT("SB") , CmdFlagSet , CMD_FLAG_SET_B , "CLear Flag Break" }, // 4 // Legacy
{TEXT("SR") , CmdFlagSet , CMD_FLAG_SET_R , "Clear Flag Reserved" }, // 5
{TEXT("SV") , CmdFlagSet , CMD_FLAG_SET_V , "Clear Flag Overflow" }, // 6
{TEXT("SN") , CmdFlagSet , CMD_FLAG_SET_N , "Clear Flag Negative" }, // 7
{"SC" , CmdFlagSet , CMD_FLAG_SET_C , "Set Flag Carry" }, // 0
{"SZ" , CmdFlagSet , CMD_FLAG_SET_Z , "Set Flag Zero" }, // 1
{"SI" , CmdFlagSet , CMD_FLAG_SET_I , "Set Flag Interrupts Disabled" }, // 2
{"SD" , CmdFlagSet , CMD_FLAG_SET_D , "Set Flag Decimal (BCD)" }, // 3
{"SB" , CmdFlagSet , CMD_FLAG_SET_B , "CLear Flag Break" }, // 4 // Legacy
{"SR" , CmdFlagSet , CMD_FLAG_SET_R , "Clear Flag Reserved" }, // 5
{"SV" , CmdFlagSet , CMD_FLAG_SET_V , "Clear Flag Overflow" }, // 6
{"SN" , CmdFlagSet , CMD_FLAG_SET_N , "Clear Flag Negative" }, // 7
// Memory
{TEXT("D") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 , "Hex dump in the mini memory area 1" }, // FIXME: Must also work in DATA screen
{TEXT("M1") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 }, // alias
{TEXT("M2") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_2 }, // alias
{"D" , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 , "Hex dump in the mini memory area 1" }, // FIXME: Must also work in DATA screen
{"M1" , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 }, // alias
{"M2" , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_2 }, // alias
{TEXT("ME8") , CmdMemoryEnterByte , CMD_MEMORY_ENTER_BYTE }, // changed from EB -- bugfix: EB:## ##
{TEXT("ME16") , CmdMemoryEnterWord , CMD_MEMORY_ENTER_WORD },
{TEXT("MM") , CmdMemoryMove , CMD_MEMORY_MOVE },
{TEXT("MS") , CmdMemorySearch , CMD_MEMORY_SEARCH }, // CmdMemorySearch
{TEXT("P0") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_0 },
{TEXT("P1") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_1 },
{TEXT("P2") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_2 },
{TEXT("P3") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_3 },
{TEXT("P4") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_4 },
{TEXT("REGISTER") , CmdRegisterSet , CMD_REGISTER_SET },
// {TEXT("RET") , CmdStackReturn , CMD_STACK_RETURN },
{TEXT("TRACE") , CmdTrace , CMD_TRACE },
{"ME8" , CmdMemoryEnterByte , CMD_MEMORY_ENTER_BYTE }, // changed from EB -- bugfix: EB:## ##
{"ME16" , CmdMemoryEnterWord , CMD_MEMORY_ENTER_WORD },
{"MM" , CmdMemoryMove , CMD_MEMORY_MOVE },
{"MS" , CmdMemorySearch , CMD_MEMORY_SEARCH }, // CmdMemorySearch
{"P0" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_0 },
{"P1" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_1 },
{"P2" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_2 },
{"P3" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_3 },
{"P4" , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_4 },
{"REGISTER" , CmdRegisterSet , CMD_REGISTER_SET },
// {"RET" , CmdStackReturn , CMD_STACK_RETURN },
{"TRACE" , CmdTrace , CMD_TRACE },
// {TEXT("SYMBOLS") , CmdSymbols , CMD_SYMBOLS_LOOKUP , "Return " },
// {TEXT("SYMBOLS1") , CmdSymbolsInfo , CMD_SYMBOLS_1 },
// {TEXT("SYMBOLS2") , CmdSymbolsInfo , CMD_SYMBOLS_2 },
// {"SYMBOLS" , CmdSymbols , CMD_SYMBOLS_LOOKUP , "Return " },
// {"SYMBOLS1" , CmdSymbolsInfo , CMD_SYMBOLS_1 },
// {"SYMBOLS2" , CmdSymbolsInfo , CMD_SYMBOLS_2 },
// {"SYM0" , CmdSymbolsInfo , CMD_SYMBOLS_ROM },
// {"SYM1" , CmdSymbolsInfo , CMD_SYMBOLS_APPLESOFT },
// {"SYM2" , CmdSymbolsInfo , CMD_SYMBOLS_ASSEMBLY },
@@ -380,20 +380,20 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
{"SYMDOS" , CmdSymbolsCommand , CMD_SYMBOLS_DOS33 },
{"SYMPRO" , CmdSymbolsCommand , CMD_SYMBOLS_PRODOS },
{TEXT("TEXT40") , CmdViewOutput_Text4X , CMD_VIEW_TEXT4X },
{TEXT("TEXT41") , CmdViewOutput_Text41 , CMD_VIEW_TEXT41 },
{TEXT("TEXT42") , CmdViewOutput_Text42 , CMD_VIEW_TEXT42 },
{"TEXT40" , CmdViewOutput_Text4X , CMD_VIEW_TEXT4X },
{"TEXT41" , CmdViewOutput_Text41 , CMD_VIEW_TEXT41 },
{"TEXT42" , CmdViewOutput_Text42 , CMD_VIEW_TEXT42 },
// {TEXT("WATCH") , CmdWatchAdd , CMD_WATCH_ADD },
{TEXT("WINDOW") , CmdWindow , CMD_WINDOW },
// {TEXT("W?") , CmdWatchAdd , CMD_WATCH_ADD },
{TEXT("ZAP") , CmdNOP , CMD_NOP },
// {"WATCH" , CmdWatchAdd , CMD_WATCH_ADD },
{"WINDOW" , CmdWindow , CMD_WINDOW },
// {"W?" , CmdWatchAdd , CMD_WATCH_ADD },
{"ZAP" , CmdNOP , CMD_NOP },
// DEPRECATED -- Probably should be removed in a future version
{TEXT("BENCH") , CmdBenchmarkStart , CMD_BENCHMARK },
{TEXT("EXITBENCH") , NULL , CMD_BENCHMARK }, // 2.8.03 was incorrectly alias with 'E' Bug #246. // CmdBenchmarkStop
{TEXT("MDB") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 }, // MemoryDumpByte // Did anyone actually use this??
// {TEXT("MEMORY") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 }, // MemoryDumpByte // Did anyone actually use this??
{"BENCH" , CmdBenchmarkStart , CMD_BENCHMARK },
{"EXITBENCH" , NULL , CMD_BENCHMARK }, // 2.8.03 was incorrectly alias with 'E' Bug #246. // CmdBenchmarkStop
{"MDB" , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 }, // MemoryDumpByte // Did anyone actually use this??
// {"MEMORY" , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 }, // MemoryDumpByte // Did anyone actually use this??
};
const int NUM_COMMANDS_WITH_ALIASES = sizeof(g_aCommands) / sizeof (Command_t); // Determined at compile-time ;-)
@@ -406,78 +406,78 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Command_t g_aParameters[] =
{
// Breakpoint
{TEXT("<=") , NULL, PARAM_BP_LESS_EQUAL },
{TEXT("<" ) , NULL, PARAM_BP_LESS_THAN },
{TEXT("=" ) , NULL, PARAM_BP_EQUAL },
{TEXT("!=") , NULL, PARAM_BP_NOT_EQUAL },
{TEXT("!" ) , NULL, PARAM_BP_NOT_EQUAL_1 },
{TEXT(">" ) , NULL, PARAM_BP_GREATER_THAN },
{TEXT(">=") , NULL, PARAM_BP_GREATER_EQUAL },
{TEXT("R") , NULL, PARAM_BP_READ },
{TEXT("?") , NULL, PARAM_BP_READ },
{TEXT("W") , NULL, PARAM_BP_WRITE },
{TEXT("@") , NULL, PARAM_BP_WRITE },
{TEXT("*") , NULL, PARAM_BP_READ_WRITE },
{"<=" , NULL, PARAM_BP_LESS_EQUAL },
{"<" , NULL, PARAM_BP_LESS_THAN },
{"=" , NULL, PARAM_BP_EQUAL },
{"!=" , NULL, PARAM_BP_NOT_EQUAL },
{"!" , NULL, PARAM_BP_NOT_EQUAL_1 },
{">" , NULL, PARAM_BP_GREATER_THAN },
{">=" , NULL, PARAM_BP_GREATER_EQUAL },
{"R" , NULL, PARAM_BP_READ },
{"?" , NULL, PARAM_BP_READ },
{"W" , NULL, PARAM_BP_WRITE },
{"@" , NULL, PARAM_BP_WRITE },
{"*" , NULL, PARAM_BP_READ_WRITE },
// Breakpoint Change, See: CmdBreakpointChange ()
{TEXT("E") , NULL, PARAM_BP_CHANGE_ENABLE },
{TEXT("e") , NULL, PARAM_BP_CHANGE_DISABLE },
{TEXT("T") , NULL, PARAM_BP_CHANGE_TEMP_ON },
{TEXT("t") , NULL, PARAM_BP_CHANGE_TEMP_OFF },
{TEXT("S") , NULL, PARAM_BP_CHANGE_STOP_ON },
{TEXT("s") , NULL, PARAM_BP_CHANGE_STOP_OFF },
{"E" , NULL, PARAM_BP_CHANGE_ENABLE },
{"e" , NULL, PARAM_BP_CHANGE_DISABLE },
{"T" , NULL, PARAM_BP_CHANGE_TEMP_ON },
{"t" , NULL, PARAM_BP_CHANGE_TEMP_OFF },
{"S" , NULL, PARAM_BP_CHANGE_STOP_ON },
{"s" , NULL, PARAM_BP_CHANGE_STOP_OFF },
// Regs (for PUSH / POP)
{TEXT("A") , NULL, PARAM_REG_A },
{TEXT("X") , NULL, PARAM_REG_X },
{TEXT("Y") , NULL, PARAM_REG_Y },
{TEXT("PC") , NULL, PARAM_REG_PC },
{TEXT("S") , NULL, PARAM_REG_SP },
{"A" , NULL, PARAM_REG_A },
{"X" , NULL, PARAM_REG_X },
{"Y" , NULL, PARAM_REG_Y },
{"PC" , NULL, PARAM_REG_PC },
{"S" , NULL, PARAM_REG_SP },
// Flags
{TEXT("P") , NULL, PARAM_FLAGS },
{TEXT("C") , NULL, PARAM_FLAG_C }, // ---- ---1 Carry
{TEXT("Z") , NULL, PARAM_FLAG_Z }, // ---- --1- Zero
{TEXT("I") , NULL, PARAM_FLAG_I }, // ---- -1-- Interrupt
{TEXT("D") , NULL, PARAM_FLAG_D }, // ---- 1--- Decimal
{TEXT("B") , NULL, PARAM_FLAG_B }, // ---1 ---- Break
{TEXT("R") , NULL, PARAM_FLAG_R }, // --1- ---- Reserved
{TEXT("V") , NULL, PARAM_FLAG_V }, // -1-- ---- Overflow
{TEXT("N") , NULL, PARAM_FLAG_N }, // 1--- ---- Sign
{"P" , NULL, PARAM_FLAGS },
{"C" , NULL, PARAM_FLAG_C }, // ---- ---1 Carry
{"Z" , NULL, PARAM_FLAG_Z }, // ---- --1- Zero
{"I" , NULL, PARAM_FLAG_I }, // ---- -1-- Interrupt
{"D" , NULL, PARAM_FLAG_D }, // ---- 1--- Decimal
{"B" , NULL, PARAM_FLAG_B }, // ---1 ---- Break
{"R" , NULL, PARAM_FLAG_R }, // --1- ---- Reserved
{"V" , NULL, PARAM_FLAG_V }, // -1-- ---- Overflow
{"N" , NULL, PARAM_FLAG_N }, // 1--- ---- Sign
// Disasm
{TEXT("BRANCH") , NULL, PARAM_CONFIG_BRANCH },
{TEXT("CLICK") , NULL, PARAM_CONFIG_CLICK }, // GH#462
{TEXT("COLON") , NULL, PARAM_CONFIG_COLON },
{TEXT("OPCODE") , NULL, PARAM_CONFIG_OPCODE },
{TEXT("POINTER") , NULL, PARAM_CONFIG_POINTER },
{TEXT("SPACES") , NULL, PARAM_CONFIG_SPACES },
{TEXT("TARGET") , NULL, PARAM_CONFIG_TARGET },
{"BRANCH" , NULL, PARAM_CONFIG_BRANCH },
{"CLICK" , NULL, PARAM_CONFIG_CLICK }, // GH#462
{"COLON" , NULL, PARAM_CONFIG_COLON },
{"OPCODE" , NULL, PARAM_CONFIG_OPCODE },
{"POINTER" , NULL, PARAM_CONFIG_POINTER },
{"SPACES" , NULL, PARAM_CONFIG_SPACES },
{"TARGET" , NULL, PARAM_CONFIG_TARGET },
// Disk
{TEXT("INFO") , NULL, PARAM_DISK_INFO },
{TEXT("SLOT") , NULL, PARAM_DISK_SET_SLOT },
{TEXT("EJECT") , NULL, PARAM_DISK_EJECT },
{TEXT("PROTECT") , NULL, PARAM_DISK_PROTECT },
{TEXT("READ") , NULL, PARAM_DISK_READ },
{"INFO" , NULL, PARAM_DISK_INFO },
{"SLOT" , NULL, PARAM_DISK_SET_SLOT },
{"EJECT" , NULL, PARAM_DISK_EJECT },
{"PROTECT" , NULL, PARAM_DISK_PROTECT },
{"READ" , NULL, PARAM_DISK_READ },
// Font (Config)
{TEXT("MODE") , NULL, PARAM_FONT_MODE }, // also INFO, CONSOLE, DISASM (from Window)
{"MODE" , NULL, PARAM_FONT_MODE }, // also INFO, CONSOLE, DISASM (from Window)
// General
{TEXT("FIND") , NULL, PARAM_FIND },
{TEXT("BRANCH") , NULL, PARAM_BRANCH },
{"FIND" , NULL, PARAM_FIND },
{"BRANCH" , NULL, PARAM_BRANCH },
{"CATEGORY" , NULL, PARAM_CATEGORY },
{TEXT("CLEAR") , NULL, PARAM_CLEAR },
{TEXT("LOAD") , NULL, PARAM_LOAD },
{TEXT("LIST") , NULL, PARAM_LIST },
{TEXT("OFF") , NULL, PARAM_OFF },
{TEXT("ON") , NULL, PARAM_ON },
{TEXT("RESET") , NULL, PARAM_RESET },
{TEXT("SAVE") , NULL, PARAM_SAVE },
{TEXT("START") , NULL, PARAM_START }, // benchmark
{TEXT("STOP") , NULL, PARAM_STOP }, // benchmark
{TEXT("ALL") , NULL, PARAM_ALL },
{"CLEAR" , NULL, PARAM_CLEAR },
{"LOAD" , NULL, PARAM_LOAD },
{"LIST" , NULL, PARAM_LIST },
{"OFF" , NULL, PARAM_OFF },
{"ON" , NULL, PARAM_ON },
{"RESET" , NULL, PARAM_RESET },
{"SAVE" , NULL, PARAM_SAVE },
{"START" , NULL, PARAM_START }, // benchmark
{"STOP" , NULL, PARAM_STOP }, // benchmark
{"ALL" , NULL, PARAM_ALL },
// Help Categories
{"*" , NULL, PARAM_WILDSTAR },
{"BOOKMARKS" , NULL, PARAM_CAT_BOOKMARKS },
{"BREAKPOINTS" , NULL, PARAM_CAT_BREAKPOINTS },
{"CONFIG" , NULL, PARAM_CAT_CONFIG },
{"CPU" , NULL, PARAM_CAT_CPU },
// {TEXT("EXPRESSION") ,
// {"EXPRESSION" ,
{"FLAGS" , NULL, PARAM_CAT_FLAGS },
{"HELP" , NULL, PARAM_CAT_HELP },
{"KEYBOARD" , NULL, PARAM_CAT_KEYBOARD },
@@ -485,42 +485,42 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
{"OUTPUT" , NULL, PARAM_CAT_OUTPUT },
{"OPERATORS" , NULL, PARAM_CAT_OPERATORS },
{"RANGE" , NULL, PARAM_CAT_RANGE },
// {TEXT("REGISTERS") , NULL, PARAM_CAT_REGISTERS },
// {"REGISTERS" , NULL, PARAM_CAT_REGISTERS },
{"SYMBOLS" , NULL, PARAM_CAT_SYMBOLS },
{"VIEW" , NULL, PARAM_CAT_VIEW },
{"WATCHES" , NULL, PARAM_CAT_WATCHES },
{"WINDOW" , NULL, PARAM_CAT_WINDOW },
{"ZEROPAGE" , NULL, PARAM_CAT_ZEROPAGE },
// Memory
{TEXT("?") , NULL, PARAM_MEM_SEARCH_WILD },
// {TEXT("*") , NULL, PARAM_MEM_SEARCH_BYTE },
{"?" , NULL, PARAM_MEM_SEARCH_WILD },
// {"*" , NULL, PARAM_MEM_SEARCH_BYTE },
// Source level debugging
{TEXT("MEM") , NULL, PARAM_SRC_MEMORY },
{TEXT("MEMORY") , NULL, PARAM_SRC_MEMORY },
{TEXT("SYM") , NULL, PARAM_SRC_SYMBOLS },
{TEXT("SYMBOLS") , NULL, PARAM_SRC_SYMBOLS },
{TEXT("MERLIN") , NULL, PARAM_SRC_MERLIN },
{TEXT("ORCA") , NULL, PARAM_SRC_ORCA },
{"MEM" , NULL, PARAM_SRC_MEMORY },
{"MEMORY" , NULL, PARAM_SRC_MEMORY },
{"SYM" , NULL, PARAM_SRC_SYMBOLS },
{"SYMBOLS" , NULL, PARAM_SRC_SYMBOLS },
{"MERLIN" , NULL, PARAM_SRC_MERLIN },
{"ORCA" , NULL, PARAM_SRC_ORCA },
// View
// {TEXT("VIEW") , NULL, PARAM_SRC_??? },
// {"VIEW" , NULL, PARAM_SRC_??? },
// Window Win Cmd WinEffects CmdEffects
{TEXT("CODE") , NULL, PARAM_CODE }, // x x code win only switch to code window
// {TEXT("CODE1") , NULL, PARAM_CODE_1 }, // - x code/data win
{TEXT("CODE2") , NULL, PARAM_CODE_2 }, // - x code/data win
{TEXT("CONSOLE") , NULL, PARAM_CONSOLE }, // x - switch to console window
{TEXT("DATA") , NULL, PARAM_DATA }, // x x data win only switch to data window
// {TEXT("DATA1") , NULL, PARAM_DATA_1 }, // - x code/data win
{TEXT("DATA2") , NULL, PARAM_DATA_2 }, // - x code/data win
{TEXT("DISASM") , NULL, PARAM_DISASM }, //
{TEXT("INFO") , NULL, PARAM_INFO }, // - x code/data Toggles showing/hiding Regs/Stack/BP/Watches/ZP
{TEXT("SOURCE") , NULL, PARAM_SOURCE }, // x x switch to source window
{TEXT("SRC") , NULL, PARAM_SOURCE }, // alias
// {TEXT("SOURCE_1") , NULL, PARAM_SOURCE_1 }, // - x code/data
{TEXT("SOURCE2 ") , NULL, PARAM_SOURCE_2 }, // - x
{TEXT("SYMBOLS") , NULL, PARAM_SYMBOLS }, // x x code/data win switch to symbols window
{TEXT("SYM") , NULL, PARAM_SYMBOLS }, // alias x SOURCE [SYM] [MEM] filename
// {TEXT("SYMBOL1") , NULL, PARAM_SYMBOL_1 }, // - x code/data win
{TEXT("SYMBOL2") , NULL, PARAM_SYMBOL_2 }, // - x code/data win
{"CODE" , NULL, PARAM_CODE }, // x x code win only switch to code window
// {"CODE1" , NULL, PARAM_CODE_1 }, // - x code/data win
{"CODE2" , NULL, PARAM_CODE_2 }, // - x code/data win
{"CONSOLE" , NULL, PARAM_CONSOLE }, // x - switch to console window
{"DATA" , NULL, PARAM_DATA }, // x x data win only switch to data window
// {"DATA1" , NULL, PARAM_DATA_1 }, // - x code/data win
{"DATA2" , NULL, PARAM_DATA_2 }, // - x code/data win
{"DISASM" , NULL, PARAM_DISASM }, //
{"INFO" , NULL, PARAM_INFO }, // - x code/data Toggles showing/hiding Regs/Stack/BP/Watches/ZP
{"SOURCE" , NULL, PARAM_SOURCE }, // x x switch to source window
{"SRC" , NULL, PARAM_SOURCE }, // alias
// {"SOURCE_1" , NULL, PARAM_SOURCE_1 }, // - x code/data
{"SOURCE2 " , NULL, PARAM_SOURCE_2 }, // - x
{"SYMBOLS" , NULL, PARAM_SYMBOLS }, // x x code/data win switch to symbols window
{"SYM" , NULL, PARAM_SYMBOLS }, // alias x SOURCE [SYM] [MEM] filename
// {"SYMBOL1" , NULL, PARAM_SYMBOL_1 }, // - x code/data win
{"SYMBOL2" , NULL, PARAM_SYMBOL_2 }, // - x code/data win
// Internal Consistency Check
{ DEBUGGER__PARAMS_VERIFY_TXT__, NULL, NUM_PARAMS },
};
source/Debugger/Debugger_Console.h
+3 -3
View File
@@ -223,8 +223,8 @@
extern char g_sConsoleCursor[];
// Display
extern char g_aConsolePrompt[];// = TEXT(">!"); // input, assembler // NUM_PROMPTS
extern char g_sConsolePrompt[];// = TEXT(">"); // No, NOT Integer Basic! The nostalgic '*' "Monitor" doesn't look as good, IMHO. :-(
extern char g_aConsolePrompt[];// = ">!"; // input, assembler // NUM_PROMPTS
extern char g_sConsolePrompt[];// = ">"; // No, NOT Integer Basic! The nostalgic '*' "Monitor" doesn't look as good, IMHO. :-(
extern int g_nConsolePromptLen;
extern bool g_bConsoleFullWidth;// = false;
@@ -238,7 +238,7 @@
// Input History
extern int g_nHistoryLinesStart;// = 0;
extern int g_nHistoryLinesTotal;// = 0; // number of commands entered
extern char g_aHistoryLines[ HISTORY_HEIGHT ][ HISTORY_WIDTH ];// = {TEXT("")};
extern char g_aHistoryLines[ HISTORY_HEIGHT ][ HISTORY_WIDTH ];// = {""};
// Input Line
// Raw input Line (has prompt)
source/Debugger/Debugger_Help.cpp
+4 -4
View File
@@ -45,7 +45,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
http://www.codeproject.com/cpp/unicode.asp
TEXT() _tcsrev
_tcsrev
_UNICODE Unicode _wcsrev
_MBCS Multi-byte _mbsrev
n/a ASCII strrev
@@ -1216,11 +1216,11 @@ Update_t CmdHelpSpecific (int nArgs)
break;
case CMD_OUTPUT_ECHO:
ConsoleColorizePrint( " Usage: string" );
// ConsoleBufferPush( TEXT(" Examples:" ) );
// ConsoleBufferPush( " Examples:" );
Help_Examples();
ConsolePrintFormat( "%s %s Checkpoint", CHC_EXAMPLE, pCommand->m_sName );
ConsolePrintFormat( "%s %s PC" , CHC_EXAMPLE, pCommand->m_sName );
// ConsoleBufferPush( TEXT(" Echo the string to the console" ) );
// ConsoleBufferPush( " Echo the string to the console" );
break;
case CMD_OUTPUT_PRINT:
ConsoleColorizePrint( " Usage: <string | expression> [, string | expression]*" );
@@ -1487,7 +1487,7 @@ Update_t CmdVersion (int nArgs)
ConsoleBufferPushFormat( " Cursor(%d) T: %04X C: %04X B: %04X %c D: %02X", // Top, Cur, Bot, Delta
g_nDisasmCurLine, g_nDisasmTopAddress, g_nDisasmCurAddress, g_nDisasmBotAddress,
g_bDisasmCurBad ? TEXT('*') : TEXT(' ')
g_bDisasmCurBad ? '*' : ' '
, g_nDisasmBotAddress - g_nDisasmTopAddress
);
source/Debugger/Debugger_Parser.cpp
+10 -10
View File
@@ -39,14 +39,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Arg_t g_aArgRaw[ MAX_ARGS ]; // pre-processing
Arg_t g_aArgs [ MAX_ARGS ]; // post-processing (cooked)
const char TCHAR_LF = TEXT('\x0D');
const char TCHAR_CR = TEXT('\x0A');
const char TCHAR_SPACE = TEXT(' ');
const char TCHAR_TAB = TEXT('\t');
// const char TCHAR_QUOTED = TEXT('"');
const char TCHAR_QUOTE_DOUBLE = TEXT('"');
const char TCHAR_QUOTE_SINGLE = TEXT('\'');
const char TCHAR_ESCAPE = TEXT('\x1B');
const char TCHAR_LF = '\x0D';
const char TCHAR_CR = '\x0A';
const char TCHAR_SPACE = ' ';
const char TCHAR_TAB = '\t';
// const char TCHAR_QUOTED = '"';
const char TCHAR_QUOTE_DOUBLE = '"';
const char TCHAR_QUOTE_SINGLE = '\'';
const char TCHAR_ESCAPE = '\x1B';
// NOTE: ArgToken_e and g_aTokens must match!
@@ -76,13 +76,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
{ TOKEN_PERCENT , TYPE_OPERATOR, "%" }, // mod
{ TOKEN_PIPE , TYPE_OPERATOR, "|" }, // bit-or
{ TOKEN_PLUS , TYPE_OPERATOR, "+" }, // add
// { TOKEN_QUESTION , TYPE_OPERATOR, TEXT('?') }, // Not a token 1) wildcard needs to stay together with other chars
// { TOKEN_QUESTION , TYPE_OPERATOR, '?' }, // Not a token 1) wildcard needs to stay together with other chars
{ TOKEN_QUOTE_SINGLE, TYPE_QUOTED_1, "\'" },
{ TOKEN_QUOTE_DOUBLE, TYPE_QUOTED_2, "\"" }, // for strings
{ TOKEN_SEMI , TYPE_STRING , ";" },
{ TOKEN_SPACE , TYPE_STRING , " " }, // space is also a delimiter between tokens/args
{ TOKEN_STAR , TYPE_OPERATOR, "*" }, // Not a token 1) wildcard needs to stay together with other chars
// { TOKEN_TAB , TYPE_STRING , TEXT('\t') }
// { TOKEN_TAB , TYPE_STRING , '\t' }
{ TOKEN_TILDE , TYPE_OPERATOR, "~" }, // C/C++: Not. Used for console.
{ TOKEN_COMMENT_EOL , TYPE_STRING , "//" },
source/Debugger/Debugger_Parser.h
+2 -2
View File
@@ -35,8 +35,8 @@ inline const char* SkipUntilToken( const char *pSrc, const TokenTable_t *aTokens
extern const char TCHAR_LF ;//= 0x0D;
extern const char TCHAR_CR ;//= 0x0A;
extern const char TCHAR_SPACE ;//= TEXT(' ');
extern const char TCHAR_TAB ;//= TEXT('\t');
extern const char TCHAR_SPACE ;//= ' ';
extern const char TCHAR_TAB ;//= '\t';
extern const char TCHAR_QUOTE_DOUBLE;
extern const char TCHAR_QUOTE_SINGLE;
source/Debugger/Debugger_Symbols.cpp
+6 -6
View File
@@ -234,9 +234,9 @@ bool String2Address( LPCTSTR pText, WORD & nAddress_ )
pText = sHexApple;
}
if (pText[0] == TEXT('0'))
if (pText[0] == '0')
{
if ((pText[1] == TEXT('X')) || pText[1] == TEXT('x'))
if ((pText[1] == 'X') || pText[1] == 'x')
{
if (!TextIsHexString( pText+2))
return false;
@@ -890,7 +890,7 @@ void SymbolUpdate ( SymbolTable_Index_e eSymbolTable, const char *pSymbolName, W
{
if (bRemoveSymbol)
{
ConsoleBufferPush( TEXT(" Removing symbol." ) );
ConsoleBufferPush( " Removing symbol." );
}
g_aSymbols[ eSymbolTable ].erase( nAddressPrev );
@@ -911,7 +911,7 @@ void SymbolUpdate ( SymbolTable_Index_e eSymbolTable, const char *pSymbolName, W
{
if (bRemoveSymbol)
{
ConsoleBufferPush( TEXT(" Symbol not in table." ) );
ConsoleBufferPush( " Symbol not in table." );
}
}
@@ -1034,7 +1034,7 @@ Update_t _CmdSymbolsCommon ( int nArgs, int bSymbolTables )
{
// Shouldn't have multiple symbol tables selected
// nArgs = _Arg_1( eSymbolsTable );
ConsoleBufferPush( TEXT(" Error: Unknown Symbol Table Type") );
ConsoleBufferPush( " Error: Unknown Symbol Table Type" );
return ConsoleUpdate();
}
}
@@ -1054,7 +1054,7 @@ Update_t _CmdSymbolsCommon ( int nArgs, int bSymbolTables )
}
else
{
ConsoleBufferPush( TEXT(" Error: Unknown Symbol Table Type") );
ConsoleBufferPush( " Error: Unknown Symbol Table Type" );
}
return ConsoleUpdate();
}
source/Disk.cpp
+6 -6
View File
@@ -202,7 +202,7 @@ void Disk2InterfaceCard::LoadLastDiskImage(const int drive)
char pathname[MAX_PATH];
std::string regSection = RegGetConfigSlotSection(m_slot);
if (RegLoadString(regSection.c_str(), regKey.c_str(), TRUE, pathname, MAX_PATH, TEXT("")) && (pathname[0] != 0))
if (RegLoadString(regSection.c_str(), regKey.c_str(), TRUE, pathname, MAX_PATH, "") && (pathname[0] != 0))
{
m_saveDiskImage = false;
ImageError_e error = InsertDisk(drive, pathname, IMAGE_USE_FILES_WRITE_PROTECT_STATUS, IMAGE_DONT_CREATE);
@@ -1831,7 +1831,7 @@ bool Disk2InterfaceCard::UserSelectNewDiskImage(const int drive, LPCSTR pszFilen
StringCbCopy(filename, MAX_PATH, pszFilename);
RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_START_DIR), 1, directory, MAX_PATH, TEXT(""));
RegLoadString(REG_PREFS, REGVALUE_PREF_START_DIR, 1, directory, MAX_PATH, "");
std::string title = StrFormat("Select Disk Image For Drive %d", drive + 1);
OPENFILENAME ofn;
@@ -1839,9 +1839,9 @@ bool Disk2InterfaceCard::UserSelectNewDiskImage(const int drive, LPCSTR pszFilen
ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = GetFrame().g_hFrameWindow;
ofn.hInstance = GetFrame().g_hInstance;
ofn.lpstrFilter = TEXT("All Images\0*.bin;*.do;*.dsk;*.nib;*.po;*.gz;*.woz;*.zip;*.2mg;*.2img;*.iie;*.apl\0")
TEXT("Disk Images (*.bin,*.do,*.dsk,*.nib,*.po,*.gz,*.woz,*.zip,*.2mg,*.2img,*.iie)\0*.bin;*.do;*.dsk;*.nib;*.po;*.gz;*.woz;*.zip;*.2mg;*.2img;*.iie\0")
TEXT("All Files\0*.*\0");
ofn.lpstrFilter = "All Images\0*.bin;*.do;*.dsk;*.nib;*.po;*.gz;*.woz;*.zip;*.2mg;*.2img;*.iie;*.apl\0"
"Disk Images (*.bin,*.do,*.dsk,*.nib,*.po,*.gz,*.woz,*.zip,*.2mg,*.2img,*.iie)\0*.bin;*.do;*.dsk;*.nib;*.po;*.gz;*.woz;*.zip;*.2mg;*.2img;*.iie\0"
"All Files\0*.*\0";
ofn.lpstrFile = filename;
ofn.nMaxFile = MAX_PATH;
ofn.lpstrInitialDir = directory;
@@ -1854,7 +1854,7 @@ bool Disk2InterfaceCard::UserSelectNewDiskImage(const int drive, LPCSTR pszFilen
{
std::string openFilename = filename;
if ((!ofn.nFileExtension) || !filename[ofn.nFileExtension])
openFilename += TEXT(".dsk");
openFilename += ".dsk";
ImageError_e Error = InsertDisk(drive, openFilename, ofn.Flags & OFN_READONLY, IMAGE_CREATE);
if (Error == eIMAGE_ERROR_NONE)
source/DiskImage.cpp
+4 -4
View File
@@ -265,8 +265,8 @@ void GetImageTitle(LPCTSTR pPathname, std::string & pImageName, std::string & pF
LPCTSTR startpos = pPathname;
// imagetitle = <FILENAME.EXT>
if (strrchr(startpos, TEXT(PATH_SEPARATOR)))
startpos = strrchr(startpos, TEXT(PATH_SEPARATOR))+1;
if (strrchr(startpos, PATH_SEPARATOR))
startpos = strrchr(startpos, PATH_SEPARATOR)+1;
strncpy(imagetitle, startpos, MAX_DISK_FULL_NAME);
imagetitle[MAX_DISK_FULL_NAME] = 0;
@@ -291,8 +291,8 @@ void GetImageTitle(LPCTSTR pPathname, std::string & pImageName, std::string & pF
if (imagetitle[0])
{
LPTSTR dot = imagetitle;
if (strrchr(dot, TEXT('.')))
dot = strrchr(dot, TEXT('.'));
if (strrchr(dot, '.'))
dot = strrchr(dot, '.');
if (dot > imagetitle)
*dot = 0;
}
source/DiskImageHelper.cpp
+5 -5
View File
@@ -1581,11 +1581,11 @@ void CImageHelperBase::GetCharLowerExt(char* pszExt, LPCTSTR pszImageFilename, c
{
LPCTSTR pImageFileExt = pszImageFilename;
if (strrchr(pImageFileExt, TEXT(PATH_SEPARATOR)))
pImageFileExt = strrchr(pImageFileExt, TEXT(PATH_SEPARATOR))+1;
if (strrchr(pImageFileExt, PATH_SEPARATOR))
pImageFileExt = strrchr(pImageFileExt, PATH_SEPARATOR)+1;
if (strrchr(pImageFileExt, TEXT('.')))
pImageFileExt = strrchr(pImageFileExt, TEXT('.'));
if (strrchr(pImageFileExt, '.'))
pImageFileExt = strrchr(pImageFileExt, '.');
strncpy(pszExt, pImageFileExt, uExtSize);
pszExt[uExtSize - 1] = 0;
@@ -1599,7 +1599,7 @@ void CImageHelperBase::GetCharLowerExt2(char* pszExt, LPCTSTR pszImageFilename,
strncpy(szFilename, pszImageFilename, MAX_PATH);
szFilename[MAX_PATH - 1] = 0;
char* pLastDot = strrchr(szFilename, TEXT('.'));
char* pLastDot = strrchr(szFilename, '.');
if (pLastDot)
*pLastDot = 0;
source/Harddisk.cpp
+7 -7
View File
@@ -297,7 +297,7 @@ void HarddiskInterfaceCard::LoadLastDiskImage(const int drive)
char pathname[MAX_PATH];
std::string regSection = RegGetConfigSlotSection(m_slot);
if (RegLoadString(regSection.c_str(), regKey.c_str(), TRUE, pathname, MAX_PATH, TEXT("")) && (pathname[0] != 0))
if (RegLoadString(regSection.c_str(), regKey.c_str(), TRUE, pathname, MAX_PATH, "") && (pathname[0] != 0))
{
m_saveDiskImage = false;
bool res = Insert(drive, pathname);
@@ -466,7 +466,7 @@ bool HarddiskInterfaceCard::SelectImage(const int drive, LPCSTR pszFilename)
StringCbCopy(filename, MAX_PATH, pszFilename);
RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_HDV_START_DIR), 1, directory, MAX_PATH, TEXT(""));
RegLoadString(REG_PREFS, REGVALUE_PREF_HDV_START_DIR, 1, directory, MAX_PATH, "");
std::string title = StrFormat("Select HDV Image For HDD %d", drive + 1);
OPENFILENAME ofn;
@@ -474,8 +474,8 @@ bool HarddiskInterfaceCard::SelectImage(const int drive, LPCSTR pszFilename)
ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = GetFrame().g_hFrameWindow;
ofn.hInstance = GetFrame().g_hInstance;
ofn.lpstrFilter = TEXT("Hard Disk Images (*.hdv,*.po,*.2mg,*.2img,*.gz,*.zip)\0*.hdv;*.po;*.2mg;*.2img;*.gz;*.zip\0")
TEXT("All Files\0*.*\0");
ofn.lpstrFilter = "Hard Disk Images (*.hdv,*.po,*.2mg,*.2img,*.gz,*.zip)\0*.hdv;*.po;*.2mg;*.2img;*.gz;*.zip\0"
"All Files\0*.*\0";
ofn.lpstrFile = filename;
ofn.nMaxFile = MAX_PATH;
ofn.lpstrInitialDir = directory;
@@ -488,7 +488,7 @@ bool HarddiskInterfaceCard::SelectImage(const int drive, LPCSTR pszFilename)
{
std::string openFilename = filename;
if ((!ofn.nFileExtension) || !filename[ofn.nFileExtension])
openFilename += TEXT(".hdv");
openFilename += ".hdv";
if (Insert(drive, openFilename))
{
@@ -505,7 +505,7 @@ bool HarddiskInterfaceCard::SelectImage(const int drive, LPCSTR pszFilename)
bool HarddiskInterfaceCard::Select(const int iDrive)
{
return SelectImage(iDrive, TEXT(""));
return SelectImage(iDrive, "");
}
//===========================================================================
@@ -1443,7 +1443,7 @@ bool HarddiskInterfaceCard::LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT ve
userSelectedImageFolder |= LoadSnapshotHDDUnit(yamlLoadHelper, i, version);
if (!userSelectedImageFolder)
RegSaveString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_HDV_START_DIR), 1, Snapshot_GetPath());
RegSaveString(REG_PREFS, REGVALUE_PREF_HDV_START_DIR, 1, Snapshot_GetPath());
GetFrame().FrameRefreshStatus(DRAW_LEDS | DRAW_DISK_STATUS);
source/Joystick.cpp
+28 -28
View File
@@ -809,22 +809,22 @@ BOOL JoySetEmulationType(HWND window, uint32_t newtype, int nJoystickNumber, con
if (nJoyID < 0 || joyGetDevCaps(nJoyID, &caps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
{
MessageBox(window,
TEXT("The emulator is unable to read your PC joystick. ")
TEXT("Ensure that your game port is configured properly, ")
TEXT("that the joystick is firmly plugged in, and that ")
TEXT("you have a joystick driver installed."),
TEXT("Configuration"),
"The emulator is unable to read your PC joystick. "
"Ensure that your game port is configured properly, "
"that the joystick is firmly plugged in, and that "
"you have a joystick driver installed.",
"Configuration",
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
return 0;
}
if ((joyinfo[newtype] == DEVICE_JOYSTICK_THUMBSTICK2) && (caps.wNumAxes < 4))
{
MessageBox(window,
TEXT("The emulator is unable to read thumbstick 2. ")
TEXT("Ensure that your game port is configured properly, ")
TEXT("that the joystick is firmly plugged in, and that ")
TEXT("you have a joystick driver installed."),
TEXT("Configuration"),
"The emulator is unable to read thumbstick 2. "
"Ensure that your game port is configured properly, "
"that the joystick is firmly plugged in, and that "
"you have a joystick driver installed.",
"Configuration",
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
return 0;
}
@@ -836,22 +836,22 @@ BOOL JoySetEmulationType(HWND window, uint32_t newtype, int nJoystickNumber, con
{
// Shouldn't be necessary, since Property Sheet's logic should prevent this option being given to the user.
MessageBox(window,
TEXT("Mouse interface card is enabled - unable to use mouse for joystick emulation."),
TEXT("Configuration"),
"Mouse interface card is enabled - unable to use mouse for joystick emulation.",
"Configuration",
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
return 0;
}
MessageBox(window,
TEXT("To begin emulating a joystick with your mouse, move ")
TEXT("the mouse cursor over the emulated screen of a running ")
TEXT("program and click the left mouse button. During the ")
TEXT("time the mouse is emulating a joystick, you will not ")
TEXT("be able to use it to perform mouse functions, and the ")
TEXT("mouse cursor will not be visible. To end joystick ")
TEXT("emulation and regain the mouse cursor, click the left ")
TEXT("mouse button while pressing Ctrl."),
TEXT("Configuration"),
"To begin emulating a joystick with your mouse, move "
"the mouse cursor over the emulated screen of a running "
"program and click the left mouse button. During the "
"time the mouse is emulating a joystick, you will not "
"be able to use it to perform mouse functions, and the "
"mouse cursor will not be visible. To end joystick "
"emulation and regain the mouse cursor, click the left "
"mouse button while pressing Ctrl.",
"Configuration",
MB_ICONINFORMATION | MB_SETFOREGROUND);
}
else if (joyinfo[newtype] == DEVICE_KEYBOARD)
@@ -859,13 +859,13 @@ BOOL JoySetEmulationType(HWND window, uint32_t newtype, int nJoystickNumber, con
if (newtype == J0C_KEYBD_CURSORS || newtype == J1C_KEYBD_CURSORS)
{
MessageBox(window,
TEXT("Using cursor keys to emulate a joystick can cause conflicts.\n\n")
TEXT("Be aware that 'cursor-up' = CTRL+K, and 'cursor-down' = CTRL+J.\n")
TEXT("EG. Lode Runner uses CTRL+K/J to switch between keyboard/joystick modes ")
TEXT("(and cursor-left/right to control speed).\n\n")
TEXT("Also if cursor keys are blocked from being read from the Apple keyboard ")
TEXT("then even simple AppleSoft command-line editing (cursor left/right) will not work."),
TEXT("Configuration"),
"Using cursor keys to emulate a joystick can cause conflicts.\n\n"
"Be aware that 'cursor-up' = CTRL+K, and 'cursor-down' = CTRL+J.\n"
"EG. Lode Runner uses CTRL+K/J to switch between keyboard/joystick modes "
"(and cursor-left/right to control speed).\n\n"
"Also if cursor keys are blocked from being read from the Apple keyboard "
"then even simple AppleSoft command-line editing (cursor left/right) will not work.",
"Configuration",
MB_ICONINFORMATION | MB_SETFOREGROUND);
}
}
source/Memory.cpp
+16 -16
View File
@@ -1849,8 +1849,8 @@ void MemInitialize()
if (!memaux || !memdirty || !memimage || !memmain || !memrom || !pCxRomInternal || !pCxRomPeripheral)
{
GetFrame().FrameMessageBox(
TEXT("The emulator was unable to allocate the memory it ")
TEXT("requires. Further execution is not possible."),
"The emulator was unable to allocate the memory it "
"requires. Further execution is not possible.",
g_pAppTitle.c_str(),
MB_ICONSTOP | MB_SETFOREGROUND);
ExitProcess(1);
@@ -1915,19 +1915,19 @@ void MemInitializeROM(void)
char sRomFileName[ MAX_PATH ];
switch (g_Apple2Type)
{
case A2TYPE_APPLE2: strcpy(sRomFileName, TEXT("APPLE2.ROM" )); break;
case A2TYPE_APPLE2PLUS: strcpy(sRomFileName, TEXT("APPLE2_PLUS.ROM" )); break;
case A2TYPE_APPLE2JPLUS: strcpy(sRomFileName, TEXT("APPLE2_JPLUS.ROM" )); break;
case A2TYPE_APPLE2E: strcpy(sRomFileName, TEXT("APPLE2E.ROM" )); break;
case A2TYPE_APPLE2EENHANCED:strcpy(sRomFileName, TEXT("APPLE2E_ENHANCED.ROM")); break;
case A2TYPE_PRAVETS82: strcpy(sRomFileName, TEXT("PRAVETS82.ROM" )); break;
case A2TYPE_PRAVETS8M: strcpy(sRomFileName, TEXT("PRAVETS8M.ROM" )); break;
case A2TYPE_PRAVETS8A: strcpy(sRomFileName, TEXT("PRAVETS8C.ROM" )); break;
case A2TYPE_TK30002E: strcpy(sRomFileName, TEXT("TK3000e.ROM" )); break;
case A2TYPE_BASE64A: strcpy(sRomFileName, TEXT("BASE64A.ROM" )); break;
case A2TYPE_APPLE2: strcpy(sRomFileName, "APPLE2.ROM"); break;
case A2TYPE_APPLE2PLUS: strcpy(sRomFileName, "APPLE2_PLUS.ROM"); break;
case A2TYPE_APPLE2JPLUS: strcpy(sRomFileName, "APPLE2_JPLUS.ROM"); break;
case A2TYPE_APPLE2E: strcpy(sRomFileName, "APPLE2E.ROM"); break;
case A2TYPE_APPLE2EENHANCED:strcpy(sRomFileName, "APPLE2E_ENHANCED.ROM"); break;
case A2TYPE_PRAVETS82: strcpy(sRomFileName, "PRAVETS82.ROM"); break;
case A2TYPE_PRAVETS8M: strcpy(sRomFileName, "PRAVETS8M.ROM"); break;
case A2TYPE_PRAVETS8A: strcpy(sRomFileName, "PRAVETS8C.ROM"); break;
case A2TYPE_TK30002E: strcpy(sRomFileName, "TK3000e.ROM"); break;
case A2TYPE_BASE64A: strcpy(sRomFileName, "BASE64A.ROM"); break;
default:
{
strcpy(sRomFileName, TEXT("Unknown type!"));
strcpy(sRomFileName, "Unknown type!");
GetPropertySheet().ConfigSaveApple2Type(A2TYPE_APPLE2EENHANCED);
}
}
@@ -1969,7 +1969,7 @@ void MemInitializeCustomF8ROM(void)
BYTE* pData = frame.GetResource(IDR_APPLE2_PLUS_ROM, "ROM", Apple2RomSize);
if (pData == NULL)
{
frame.FrameMessageBox("Failed to read F8 (auto-start) ROM for language card in original Apple][", TEXT("AppleWin Error"), MB_OK);
frame.FrameMessageBox("Failed to read F8 (auto-start) ROM for language card in original Apple][", "AppleWin Error", MB_OK);
}
else
{
@@ -1994,7 +1994,7 @@ void MemInitializeCustomF8ROM(void)
if (!bRes)
{
GetFrame().FrameMessageBox( "Failed to read custom F8 rom", TEXT("AppleWin Error"), MB_OK );
GetFrame().FrameMessageBox( "Failed to read custom F8 rom", "AppleWin Error", MB_OK );
CloseHandle(g_hCustomRomF8);
g_hCustomRomF8 = INVALID_HANDLE_VALUE;
// Failed, so use default rom...
@@ -2046,7 +2046,7 @@ void MemInitializeCustomROM(void)
if (!bRes)
{
GetFrame().FrameMessageBox( "Failed to read custom rom", TEXT("AppleWin Error"), MB_OK );
GetFrame().FrameMessageBox( "Failed to read custom rom", "AppleWin Error", MB_OK );
CloseHandle(g_hCustomRom);
g_hCustomRom = INVALID_HANDLE_VALUE;
// Failed, so use default rom...
source/ParallelPrinter.cpp
+2 -2
View File
@@ -60,7 +60,7 @@ bool ParallelPrinterCard::CheckPrint(void)
{
//char filepath[MAX_PATH * 2];
//strncpy(filepath, g_sProgramDir, MAX_PATH);
//_tcsncat(filepath, _T("Printer.txt"), MAX_PATH);
//_tcsncat(filepath, "Printer.txt", MAX_PATH);
//file = fopen(filepath, "wb");
if (m_bPrinterAppend )
m_file = fopen(ParallelPrinterCard::GetFilename().c_str(), "ab");
@@ -204,7 +204,7 @@ void ParallelPrinterCard::GetRegistryConfig(void)
if (RegLoadValue(regSection.c_str(), REGVALUE_PRINTER_APPEND, TRUE, &dwTmp))
SetPrinterAppend(dwTmp ? true : false);
if (RegLoadString(regSection.c_str(), REGVALUE_PRINTER_FILENAME, 1, szFilename, MAX_PATH, TEXT("")))
if (RegLoadString(regSection.c_str(), REGVALUE_PRINTER_FILENAME, 1, szFilename, MAX_PATH, ""))
SetFilename(szFilename);
if (RegLoadValue(regSection.c_str(), REGVALUE_PRINTER_IDLE_LIMIT, TRUE, &dwTmp))
source/Registry.h
+3 -3
View File
@@ -2,9 +2,9 @@
#include "Card.h"
#include "CopyProtectionDongles.h"
#define REGLOAD(a, b) RegLoadValue(TEXT(REG_CONFIG), (a), TRUE, (b))
#define REGLOAD_DEFAULT(a, b, c) RegLoadValue(TEXT(REG_CONFIG), (a), TRUE, (b), (c))
#define REGSAVE(a, b) RegSaveValue(TEXT(REG_CONFIG), (a), TRUE, (b))
#define REGLOAD(a, b) RegLoadValue(REG_CONFIG, (a), TRUE, (b))
#define REGLOAD_DEFAULT(a, b, c) RegLoadValue(REG_CONFIG, (a), TRUE, (b), (c))
#define REGSAVE(a, b) RegSaveValue(REG_CONFIG, (a), TRUE, (b))
BOOL RegLoadString (LPCTSTR section, LPCTSTR key, BOOL peruser, LPTSTR buffer, uint32_t chars);
BOOL RegLoadString (LPCTSTR section, LPCTSTR key, BOOL peruser, LPTSTR buffer, uint32_t chars, LPCTSTR defaultValue);
source/SaveState.cpp
+3 -3
View File
@@ -444,7 +444,7 @@ static void Snapshot_LoadState_v2(void)
{
frame.FrameMessageBox(
szMessage.what(),
TEXT("Load State"),
"Load State",
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
if (restart)
@@ -464,7 +464,7 @@ void Snapshot_LoadState()
GetFrame().FrameMessageBox(
"Save-state v1 no longer supported.\n"
"Please load using AppleWin 1.27, and re-save as a v2 state file.",
TEXT("Load State"),
"Load State",
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
return;
@@ -531,7 +531,7 @@ void Snapshot_SaveState(void)
{
GetFrame().FrameMessageBox(
szMessage.what(),
TEXT("Save State"),
"Save State",
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
}
}
source/SerialComms.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ CSuperSerialCard::CSuperSerialCard(UINT slot) :
const size_t SERIALCHOICE_ITEM_LENGTH = 12;
char serialPortName[SERIALCHOICE_ITEM_LENGTH];
std::string regSection = RegGetConfigSlotSection(m_slot);
RegLoadString(regSection.c_str(), REGVALUE_SERIAL_PORT_NAME, TRUE, serialPortName, sizeof(serialPortName), TEXT(""));
RegLoadString(regSection.c_str(), REGVALUE_SERIAL_PORT_NAME, TRUE, serialPortName, sizeof(serialPortName), "");
SetSerialPortName(serialPortName);
}
source/SerialComms.h
+2 -2
View File
@@ -19,8 +19,8 @@ typedef struct
bool bInterrupts; // NB. Can't be read from s/w
} SSC_DIPSW;
#define TEXT_SERIAL_COM TEXT("COM")
#define TEXT_SERIAL_TCP TEXT("TCP")
#define TEXT_SERIAL_COM "COM"
#define TEXT_SERIAL_TCP "TCP"
class CSuperSerialCard : public Card
{
source/Speaker.cpp
+7 -7
View File
@@ -259,13 +259,13 @@ void SpkrInitialize ()
if (!g_bSpkrAvailable)
{
GetFrame().FrameMessageBox(
TEXT("The emulator is unable to initialize a waveform ")
TEXT("output device. Make sure you have a sound card ")
TEXT("and a driver installed and that Windows is ")
TEXT("correctly configured to use the driver. Also ")
TEXT("ensure that no other program is currently using ")
TEXT("the device."),
TEXT("Configuration"),
"The emulator is unable to initialize a waveform "
"output device. Make sure you have a sound card "
"and a driver installed and that Windows is "
"correctly configured to use the driver. Also "
"ensure that no other program is currently using "
"the device.",
"Configuration",
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
}
}
source/Tfe/PCapBackend.cpp
+1 -1
View File
@@ -118,7 +118,7 @@ std::string PCapBackend::GetRegistryInterface(UINT slot)
{
char interfaceName[MAX_PATH];
std::string regSection = RegGetConfigSlotSection(slot);
RegLoadString(regSection.c_str(), REGVALUE_UTHERNET_INTERFACE, TRUE, interfaceName, sizeof(interfaceName), TEXT(""));
RegLoadString(regSection.c_str(), REGVALUE_UTHERNET_INTERFACE, TRUE, interfaceName, sizeof(interfaceName), "");
return interfaceName;
}
source/Utilities.cpp
+40 -40
View File
@@ -56,7 +56,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
static void LoadConfigOldJoystick_v1(const UINT uJoyNum)
{
uint32_t dwOldJoyType;
if (!REGLOAD(TEXT(uJoyNum==0 ? REGVALUE_OLD_JOYSTICK0_EMU_TYPE1 : REGVALUE_OLD_JOYSTICK1_EMU_TYPE1), &dwOldJoyType))
if (!REGLOAD(uJoyNum==0 ? REGVALUE_OLD_JOYSTICK0_EMU_TYPE1 : REGVALUE_OLD_JOYSTICK1_EMU_TYPE1, &dwOldJoyType))
return; // EG. Old AppleWin never installed
UINT uNewJoyType;
@@ -94,7 +94,7 @@ void LoadConfiguration(bool loadImages)
uint32_t dwComputerType = 0;
eApple2Type apple2Type = A2TYPE_APPLE2EENHANCED;
if (REGLOAD(TEXT(REGVALUE_APPLE2_TYPE), &dwComputerType))
if (REGLOAD(REGVALUE_APPLE2_TYPE, &dwComputerType))
{
const uint32_t dwLoadedComputerType = dwComputerType;
@@ -125,7 +125,7 @@ void LoadConfiguration(bool loadImages)
apple2Type = (eApple2Type) dwComputerType;
}
else if (REGLOAD(TEXT(REGVALUE_OLD_APPLE2_TYPE), &dwComputerType)) // Support older AppleWin registry entries
else if (REGLOAD(REGVALUE_OLD_APPLE2_TYPE, &dwComputerType)) // Support older AppleWin registry entries
{
switch (dwComputerType)
{
@@ -142,7 +142,7 @@ void LoadConfiguration(bool loadImages)
//
uint32_t dwMainCpuType;
REGLOAD_DEFAULT(TEXT(REGVALUE_CPU_TYPE), &dwMainCpuType, CPU_65C02);
REGLOAD_DEFAULT(REGVALUE_CPU_TYPE, &dwMainCpuType, CPU_65C02);
if (dwMainCpuType != CPU_6502 && dwMainCpuType != CPU_65C02)
dwMainCpuType = CPU_65C02;
SetMainCpu((eCpuType)dwMainCpuType);
@@ -150,16 +150,16 @@ void LoadConfiguration(bool loadImages)
//
uint32_t dwJoyType;
if (REGLOAD(TEXT(REGVALUE_JOYSTICK0_EMU_TYPE), &dwJoyType))
if (REGLOAD(REGVALUE_JOYSTICK0_EMU_TYPE, &dwJoyType))
JoySetJoyType(JN_JOYSTICK0, dwJoyType);
else if (REGLOAD(TEXT(REGVALUE_OLD_JOYSTICK0_EMU_TYPE2), &dwJoyType)) // GH#434
else if (REGLOAD(REGVALUE_OLD_JOYSTICK0_EMU_TYPE2, &dwJoyType)) // GH#434
JoySetJoyType(JN_JOYSTICK0, dwJoyType);
else
LoadConfigOldJoystick_v1(JN_JOYSTICK0);
if (REGLOAD(TEXT(REGVALUE_JOYSTICK1_EMU_TYPE), &dwJoyType))
if (REGLOAD(REGVALUE_JOYSTICK1_EMU_TYPE, &dwJoyType))
JoySetJoyType(JN_JOYSTICK1, dwJoyType);
else if (REGLOAD(TEXT(REGVALUE_OLD_JOYSTICK1_EMU_TYPE2), &dwJoyType)) // GH#434
else if (REGLOAD(REGVALUE_OLD_JOYSTICK1_EMU_TYPE2, &dwJoyType)) // GH#434
JoySetJoyType(JN_JOYSTICK1, dwJoyType);
else
LoadConfigOldJoystick_v1(JN_JOYSTICK1);
@@ -172,7 +172,7 @@ void LoadConfiguration(bool loadImages)
SetCopyProtectionDongleType(DT_EMPTY);
uint32_t dwSoundType;
REGLOAD_DEFAULT(TEXT(REGVALUE_SOUND_EMULATION), &dwSoundType, REG_SOUNDTYPE_WAVE);
REGLOAD_DEFAULT(REGVALUE_SOUND_EMULATION, &dwSoundType, REG_SOUNDTYPE_WAVE);
switch (dwSoundType)
{
case REG_SOUNDTYPE_NONE:
@@ -186,7 +186,7 @@ void LoadConfiguration(bool loadImages)
break;
}
REGLOAD_DEFAULT(TEXT(REGVALUE_EMULATION_SPEED), &g_dwSpeed, SPEED_NORMAL);
REGLOAD_DEFAULT(REGVALUE_EMULATION_SPEED, &g_dwSpeed, SPEED_NORMAL);
GetVideo().Config_Load_Video();
SetCurrentCLK6502(); // Pre: g_dwSpeed && Config_Load_Video()->SetVideoRefreshRate()
@@ -194,44 +194,44 @@ void LoadConfiguration(bool loadImages)
uint32_t dwTmp = 0;
if(REGLOAD(TEXT(REGVALUE_FS_SHOW_SUBUNIT_STATUS), &dwTmp))
if(REGLOAD(REGVALUE_FS_SHOW_SUBUNIT_STATUS, &dwTmp))
GetFrame().SetFullScreenShowSubunitStatus(dwTmp ? true : false);
if (REGLOAD(TEXT(REGVALUE_SHOW_DISKII_STATUS), &dwTmp))
if (REGLOAD(REGVALUE_SHOW_DISKII_STATUS, &dwTmp))
GetFrame().SetWindowedModeShowDiskiiStatus(dwTmp ? true : false);
if(REGLOAD(TEXT(REGVALUE_THE_FREEZES_F8_ROM), &dwTmp))
if(REGLOAD(REGVALUE_THE_FREEZES_F8_ROM, &dwTmp))
GetPropertySheet().SetTheFreezesF8Rom(dwTmp);
if(REGLOAD(TEXT(REGVALUE_SPKR_VOLUME), &dwTmp))
if(REGLOAD(REGVALUE_SPKR_VOLUME, &dwTmp))
SpkrSetVolume(dwTmp, GetPropertySheet().GetVolumeMax());
if(REGLOAD(TEXT(REGVALUE_MB_VOLUME), &dwTmp))
if(REGLOAD(REGVALUE_MB_VOLUME, &dwTmp))
GetCardMgr().GetMockingboardCardMgr().SetVolume(dwTmp, GetPropertySheet().GetVolumeMax());
if(REGLOAD(TEXT(REGVALUE_SAVE_STATE_ON_EXIT), &dwTmp))
if(REGLOAD(REGVALUE_SAVE_STATE_ON_EXIT, &dwTmp))
g_bSaveStateOnExit = dwTmp ? true : false;
if(REGLOAD(TEXT(REGVALUE_PDL_XTRIM), &dwTmp))
if(REGLOAD(REGVALUE_PDL_XTRIM, &dwTmp))
JoySetTrim((short)dwTmp, true);
if(REGLOAD(TEXT(REGVALUE_PDL_YTRIM), &dwTmp))
if(REGLOAD(REGVALUE_PDL_YTRIM, &dwTmp))
JoySetTrim((short)dwTmp, false);
if(REGLOAD(TEXT(REGVALUE_SCROLLLOCK_TOGGLE), &dwTmp))
if(REGLOAD(REGVALUE_SCROLLLOCK_TOGGLE, &dwTmp))
GetPropertySheet().SetScrollLockToggle(dwTmp);
if(REGLOAD(TEXT(REGVALUE_CURSOR_CONTROL), &dwTmp))
if(REGLOAD(REGVALUE_CURSOR_CONTROL, &dwTmp))
GetPropertySheet().SetJoystickCursorControl(dwTmp);
if(REGLOAD(TEXT(REGVALUE_AUTOFIRE), &dwTmp))
if(REGLOAD(REGVALUE_AUTOFIRE, &dwTmp))
GetPropertySheet().SetAutofire(dwTmp);
if(REGLOAD(TEXT(REGVALUE_SWAP_BUTTONS_0_AND_1), &dwTmp))
if(REGLOAD(REGVALUE_SWAP_BUTTONS_0_AND_1, &dwTmp))
GetPropertySheet().SetButtonsSwapState(dwTmp ? true : false);
if(REGLOAD(TEXT(REGVALUE_CENTERING_CONTROL), &dwTmp))
if(REGLOAD(REGVALUE_CENTERING_CONTROL, &dwTmp))
GetPropertySheet().SetJoystickCenteringControl(dwTmp);
if(REGLOAD(TEXT(REGVALUE_MOUSE_CROSSHAIR), &dwTmp))
if(REGLOAD(REGVALUE_MOUSE_CROSSHAIR, &dwTmp))
GetPropertySheet().SetMouseShowCrosshair(dwTmp);
if(REGLOAD(TEXT(REGVALUE_MOUSE_RESTRICT_TO_WINDOW), &dwTmp))
if(REGLOAD(REGVALUE_MOUSE_RESTRICT_TO_WINDOW, &dwTmp))
GetPropertySheet().SetMouseRestrictToWindow(dwTmp);
//
@@ -252,19 +252,19 @@ void LoadConfiguration(bool loadImages)
{
if (slot == SLOT3)
{
RegLoadString(TEXT(REG_CONFIG), TEXT(REGVALUE_UTHERNET_INTERFACE), 1, szFilename, MAX_PATH, TEXT(""));
RegLoadString(REG_CONFIG, REGVALUE_UTHERNET_INTERFACE, 1, szFilename, MAX_PATH, "");
// copy it to the new location
PCapBackend::SetRegistryInterface(slot, szFilename);
uint32_t tfeEnabled;
REGLOAD_DEFAULT(TEXT(REGVALUE_UTHERNET_ACTIVE), &tfeEnabled, 0);
REGLOAD_DEFAULT(REGVALUE_UTHERNET_ACTIVE, &tfeEnabled, 0);
GetCardMgr().Insert(SLOT3, tfeEnabled ? CT_Uthernet : CT_Empty);
}
else if (slot == SLOT4 && REGLOAD(TEXT(REGVALUE_SLOT4), &dwTmp))
else if (slot == SLOT4 && REGLOAD(REGVALUE_SLOT4, &dwTmp))
GetCardMgr().Insert(SLOT4, (SS_CARDTYPE)dwTmp);
else if (slot == SLOT5 && REGLOAD(TEXT(REGVALUE_SLOT5), &dwTmp))
else if (slot == SLOT5 && REGLOAD(REGVALUE_SLOT5, &dwTmp))
GetCardMgr().Insert(SLOT5, (SS_CARDTYPE)dwTmp);
else if (slot == SLOT7 && REGLOAD(TEXT(REGVALUE_HDD_ENABLED), &dwTmp) && dwTmp == 1) // GH#1015
else if (slot == SLOT7 && REGLOAD(REGVALUE_HDD_ENABLED, &dwTmp) && dwTmp == 1) // GH#1015
GetCardMgr().Insert(SLOT7, CT_GenericHDD);
}
}
@@ -290,12 +290,12 @@ void LoadConfiguration(bool loadImages)
// Load save-state pathname *before* inserting any harddisk/disk images (for both init & reinit cases)
// NB. inserting harddisk/disk can change snapshot pathname
RegLoadString(TEXT(REG_CONFIG), TEXT(REGVALUE_SAVESTATE_FILENAME), 1, szFilename, MAX_PATH, TEXT("")); // Can be pathname or just filename
RegLoadString(REG_CONFIG, REGVALUE_SAVESTATE_FILENAME, 1, szFilename, MAX_PATH, ""); // Can be pathname or just filename
Snapshot_SetFilename(szFilename); // If not in Registry than default will be used (ie. g_sCurrentDir + default filename)
//
RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_HDV_START_DIR), 1, szFilename, MAX_PATH, TEXT(""));
RegLoadString(REG_PREFS, REGVALUE_PREF_HDV_START_DIR, 1, szFilename, MAX_PATH, "");
if (szFilename[0] == '\0')
GetCurrentDirectory(sizeof(szFilename), szFilename);
SetCurrentImageDir(szFilename);
@@ -312,7 +312,7 @@ void LoadConfiguration(bool loadImages)
//
// Current/Starting Dir is the "root" of where the user keeps their disk images
RegLoadString(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_START_DIR), 1, szFilename, MAX_PATH, TEXT(""));
RegLoadString(REG_PREFS, REGVALUE_PREF_START_DIR, 1, szFilename, MAX_PATH, "");
if (szFilename[0] == '\0')
GetCurrentDirectory(sizeof(szFilename), szFilename);
SetCurrentImageDir(szFilename);
@@ -322,7 +322,7 @@ void LoadConfiguration(bool loadImages)
// Do this after populating the slots with Disk II controller(s)
uint32_t dwEnhanceDisk;
REGLOAD_DEFAULT(TEXT(REGVALUE_ENHANCE_DISK_SPEED), &dwEnhanceDisk, 1);
REGLOAD_DEFAULT(REGVALUE_ENHANCE_DISK_SPEED, &dwEnhanceDisk, 1);
GetCardMgr().GetDisk2CardMgr().SetEnhanceDisk(dwEnhanceDisk ? true : false);
//
@@ -332,10 +332,10 @@ void LoadConfiguration(bool loadImages)
//
if (REGLOAD(TEXT(REGVALUE_WINDOW_SCALE), &dwTmp))
if (REGLOAD(REGVALUE_WINDOW_SCALE, &dwTmp))
GetFrame().SetViewportScale(dwTmp);
if (REGLOAD(TEXT(REGVALUE_CONFIRM_REBOOT), &dwTmp))
if (REGLOAD(REGVALUE_CONFIRM_REBOOT, &dwTmp))
GetFrame().g_bConfirmReboot = dwTmp;
}
@@ -514,14 +514,14 @@ void GetAppleWindowTitle()
g_pAppTitle += " (S6-13) ";
if (g_hCustomRomF8 != INVALID_HANDLE_VALUE)
g_pAppTitle += TEXT(" (custom rom)");
g_pAppTitle += " (custom rom)";
else if (GetPropertySheet().GetTheFreezesF8Rom() && IsApple2PlusOrClone(GetApple2Type()))
g_pAppTitle += TEXT(" (The Freeze's non-autostart F8 rom)");
g_pAppTitle += " (The Freeze's non-autostart F8 rom)";
switch (g_nAppMode)
{
case MODE_PAUSED: g_pAppTitle += std::string(TEXT(" [")) + TITLE_PAUSED + TEXT("]"); break;
case MODE_STEPPING: g_pAppTitle += std::string(TEXT(" [")) + TITLE_STEPPING + TEXT("]"); break;
case MODE_PAUSED: g_pAppTitle += std::string(" [") + TITLE_PAUSED + "]"; break;
case MODE_STEPPING: g_pAppTitle += std::string(" [") + TITLE_STEPPING + "]"; break;
}
}
source/Video.cpp
+11 -11
View File
@@ -678,16 +678,16 @@ void Video::Config_Load_Video()
uint32_t dwTmp;
REGLOAD_DEFAULT(TEXT(REGVALUE_VIDEO_MODE), &dwTmp, (uint32_t)VT_DEFAULT);
REGLOAD_DEFAULT(REGVALUE_VIDEO_MODE, &dwTmp, (uint32_t)VT_DEFAULT);
g_eVideoType = dwTmp;
REGLOAD_DEFAULT(TEXT(REGVALUE_VIDEO_STYLE), &dwTmp, (uint32_t)VS_HALF_SCANLINES);
REGLOAD_DEFAULT(REGVALUE_VIDEO_STYLE, &dwTmp, (uint32_t)VS_HALF_SCANLINES);
g_eVideoStyle = (VideoStyle_e)dwTmp;
REGLOAD_DEFAULT(TEXT(REGVALUE_VIDEO_MONO_COLOR), &dwTmp, (uint32_t)RGB(0xC0, 0xC0, 0xC0));
REGLOAD_DEFAULT(REGVALUE_VIDEO_MONO_COLOR, &dwTmp, (uint32_t)RGB(0xC0, 0xC0, 0xC0));
g_nMonochromeRGB = (COLORREF)dwTmp;
REGLOAD_DEFAULT(TEXT(REGVALUE_VIDEO_REFRESH_RATE), &dwTmp, (uint32_t)VR_60HZ);
REGLOAD_DEFAULT(REGVALUE_VIDEO_REFRESH_RATE, &dwTmp, (uint32_t)VR_60HZ);
SetVideoRefreshRate((VideoRefreshRate_e)dwTmp);
//
@@ -696,14 +696,14 @@ void Video::Config_Load_Video()
if (pOldVersion[0] == 1 && pOldVersion[1] <= 28 && pOldVersion[2] <= 1)
{
uint32_t dwHalfScanLines;
REGLOAD_DEFAULT(TEXT(REGVALUE_VIDEO_HALF_SCAN_LINES), &dwHalfScanLines, 0);
REGLOAD_DEFAULT(REGVALUE_VIDEO_HALF_SCAN_LINES, &dwHalfScanLines, 0);
if (dwHalfScanLines)
g_eVideoStyle = (VideoStyle_e) ((uint32_t)g_eVideoStyle | VS_HALF_SCANLINES);
else
g_eVideoStyle = (VideoStyle_e) ((uint32_t)g_eVideoStyle & ~VS_HALF_SCANLINES);
REGSAVE(TEXT(REGVALUE_VIDEO_STYLE), g_eVideoStyle);
REGSAVE(REGVALUE_VIDEO_STYLE, g_eVideoStyle);
}
//
@@ -722,7 +722,7 @@ void Video::Config_Load_Video()
default: g_eVideoType = VT_DEFAULT; break;
}
REGSAVE(TEXT(REGVALUE_VIDEO_MODE), g_eVideoType);
REGSAVE(REGVALUE_VIDEO_MODE, g_eVideoType);
}
if (g_eVideoType >= NUM_VIDEO_MODES)
@@ -731,10 +731,10 @@ void Video::Config_Load_Video()
void Video::Config_Save_Video()
{
REGSAVE(TEXT(REGVALUE_VIDEO_MODE) ,g_eVideoType);
REGSAVE(TEXT(REGVALUE_VIDEO_STYLE) ,g_eVideoStyle);
REGSAVE(TEXT(REGVALUE_VIDEO_MONO_COLOR),g_nMonochromeRGB);
REGSAVE(TEXT(REGVALUE_VIDEO_REFRESH_RATE), GetVideoRefreshRate());
REGSAVE(REGVALUE_VIDEO_MODE ,g_eVideoType);
REGSAVE(REGVALUE_VIDEO_STYLE ,g_eVideoStyle);
REGSAVE(REGVALUE_VIDEO_MONO_COLOR,g_nMonochromeRGB);
REGSAVE(REGVALUE_VIDEO_REFRESH_RATE, GetVideoRefreshRate());
}
//===========================================================================
source/Windows/AppleWin.cpp
+5 -5
View File
@@ -353,7 +353,7 @@ static void GetProgramDirectory(void)
int loop = g_sProgramDir.size();
while (loop--)
{
if ((g_sProgramDir[loop] == TEXT(PATH_SEPARATOR)) || (g_sProgramDir[loop] == TEXT(':')))
if ((g_sProgramDir[loop] == PATH_SEPARATOR) || (g_sProgramDir[loop] == ':'))
{
g_sProgramDir.resize(loop + 1); // this reduces the size
break;
@@ -506,7 +506,7 @@ static void ExceptionHandler(const char* pError)
{
GetFrame().FrameMessageBox(
pError,
TEXT("Runtime Exception"),
"Runtime Exception",
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
LogFileOutput("Runtime Exception: %s\n", pError);
@@ -605,7 +605,7 @@ static void GetAppleWinVersion(void)
VS_FIXEDFILEINFO* pFixedFileInfo;
UINT pFixedFileInfoLen;
VerQueryValue(pVerInfoBlock, TEXT("\\"), (LPVOID*) &pFixedFileInfo, (PUINT) &pFixedFileInfoLen);
VerQueryValue(pVerInfoBlock, "\\", (LPVOID*) &pFixedFileInfo, (PUINT) &pFixedFileInfoLen);
// Construct version string from fixed file info block
@@ -955,7 +955,7 @@ static void RepeatInitialization(void)
if (!g_bSysClkOK)
{
GetFrame().FrameMessageBox("DirectX failed to create SystemClock instance", TEXT("AppleWin Error"), MB_OK);
GetFrame().FrameMessageBox("DirectX failed to create SystemClock instance", "AppleWin Error", MB_OK);
g_cmdLine.bShutdown = true;
}
@@ -966,7 +966,7 @@ static void RepeatInitialization(void)
: "Unsupported -rom and -f8rom being used at the same time\n";
LogFileOutput("%s", msg.c_str());
GetFrame().FrameMessageBox(msg.c_str(), TEXT("AppleWin Error"), MB_OK);
GetFrame().FrameMessageBox(msg.c_str(), "AppleWin Error", MB_OK);
g_cmdLine.bShutdown = true;
}
source/Windows/DirectInput.cpp
+5 -5
View File
@@ -126,10 +126,10 @@ namespace DIMouse
{
DirectInputUninit(hDlg);
LogFileOutput("DirectInputInit: DirectInputUninit()n");
//MessageBox( hDlg, _T("SetCooperativeLevel() returned DIERR_UNSUPPORTED.\n")
// _T("For security reasons, background exclusive mouse\n")
// _T("access is not allowed."),
// _T("Mouse"), MB_OK );
//MessageBox( hDlg, "SetCooperativeLevel() returned DIERR_UNSUPPORTED.\n"
// "For security reasons, background exclusive mouse\n"
// "access is not allowed.",
// "Mouse", MB_OK );
return S_OK;
}
@@ -240,7 +240,7 @@ namespace DIMouse
if( hr == DIERR_OTHERAPPHASPRIO ||
hr == DIERR_NOTACQUIRED )
{
//SetDlgItemText( hDlg, IDC_DATA, TEXT("Unacquired") );
//SetDlgItemText( hDlg, IDC_DATA, "Unacquired" );
}
// hr may be DIERR_OTHERAPPHASPRIO or other errors. This
source/Windows/Win32Frame.cpp
+5 -5
View File
@@ -242,10 +242,10 @@ void Win32Frame::Benchmark(void)
// CPU BENCHMARK, REPORT AN ERROR AND OPTIONALLY TRACK IT DOWN
if ((regs.pc < 0x300) || (regs.pc > 0x400))
if (FrameMessageBox(
TEXT("The emulator has detected a problem while running ")
TEXT("the CPU benchmark. Would you like to gather more ")
TEXT("information?"),
TEXT("Benchmarks"),
"The emulator has detected a problem while running "
"the CPU benchmark. Would you like to gather more "
"information?",
"Benchmarks",
MB_ICONQUESTION | MB_YESNO | MB_SETFOREGROUND) == IDYES) {
BOOL error = 0;
WORD lastpc = 0x300;
@@ -404,7 +404,7 @@ void Win32Frame::DisplayLogo(void)
}
// DRAW THE VERSION NUMBER
char sFontName[] = TEXT("Arial");
char sFontName[] = "Arial";
HFONT font = CreateFont(-20, 0, 0, 0, FW_NORMAL, 0, 0, 0, ANSI_CHARSET,
OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
VARIABLE_PITCH | 4 | FF_SWISS,
source/Windows/WinFrame.cpp
+52 -52
View File
@@ -178,55 +178,55 @@ void Win32Frame::CreateGdiObjects(void)
{
memset(buttonbitmap, 0, BUTTONS*sizeof(HBITMAP));
buttonbitmap[BTN_HELP] = (HBITMAP)LOADBUTTONBITMAP(TEXT("HELP_BUTTON"));
buttonbitmap[BTN_HELP] = (HBITMAP)LOADBUTTONBITMAP("HELP_BUTTON");
switch (g_Apple2Type)
{
case A2TYPE_PRAVETS82:
case A2TYPE_PRAVETS8M:
case A2TYPE_PRAVETS8A:
buttonbitmap[BTN_RUN] = (HBITMAP)LOADBUTTONBITMAP(TEXT("RUNP_BUTTON"));
buttonbitmap[BTN_RUN] = (HBITMAP)LOADBUTTONBITMAP("RUNP_BUTTON");
break;
case A2TYPE_TK30002E:
buttonbitmap[BTN_RUN] = (HBITMAP)LOADBUTTONBITMAP(TEXT("RUN3000E_BUTTON"));
buttonbitmap[BTN_RUN] = (HBITMAP)LOADBUTTONBITMAP("RUN3000E_BUTTON");
break;
case A2TYPE_BASE64A:
buttonbitmap[BTN_RUN] = (HBITMAP)LOADBUTTONBITMAP(TEXT("RUNBASE64A_BUTTON"));
buttonbitmap[BTN_RUN] = (HBITMAP)LOADBUTTONBITMAP("RUNBASE64A_BUTTON");
break;
default:
buttonbitmap[BTN_RUN] = (HBITMAP)LOADBUTTONBITMAP(TEXT("RUN_BUTTON"));
buttonbitmap[BTN_RUN] = (HBITMAP)LOADBUTTONBITMAP("RUN_BUTTON");
break;
}
buttonbitmap[BTN_DRIVE1 ] = (HBITMAP)LOADBUTTONBITMAP(TEXT("DRIVE1_BUTTON"));
buttonbitmap[BTN_DRIVE2 ] = (HBITMAP)LOADBUTTONBITMAP(TEXT("DRIVE2_BUTTON"));
buttonbitmap[BTN_DRIVESWAP] = (HBITMAP)LOADBUTTONBITMAP(TEXT("DRIVESWAP_BUTTON"));
buttonbitmap[BTN_FULLSCR ] = (HBITMAP)LOADBUTTONBITMAP(TEXT("FULLSCR_BUTTON"));
buttonbitmap[BTN_DEBUG ] = (HBITMAP)LOADBUTTONBITMAP(TEXT("DEBUG_BUTTON"));
buttonbitmap[BTN_SETUP ] = (HBITMAP)LOADBUTTONBITMAP(TEXT("SETUP_BUTTON"));
buttonbitmap[BTN_DRIVE1 ] = (HBITMAP)LOADBUTTONBITMAP("DRIVE1_BUTTON");
buttonbitmap[BTN_DRIVE2 ] = (HBITMAP)LOADBUTTONBITMAP("DRIVE2_BUTTON");
buttonbitmap[BTN_DRIVESWAP] = (HBITMAP)LOADBUTTONBITMAP("DRIVESWAP_BUTTON");
buttonbitmap[BTN_FULLSCR ] = (HBITMAP)LOADBUTTONBITMAP("FULLSCR_BUTTON");
buttonbitmap[BTN_DEBUG ] = (HBITMAP)LOADBUTTONBITMAP("DEBUG_BUTTON");
buttonbitmap[BTN_SETUP ] = (HBITMAP)LOADBUTTONBITMAP("SETUP_BUTTON");
//
g_hCapsLockBitmap[0] = (HBITMAP)LOADBUTTONBITMAP(TEXT("LED_CAPSOFF_BITMAP"));
g_hCapsLockBitmap[1] = (HBITMAP)LOADBUTTONBITMAP(TEXT("LED_CAPSON_BITMAP"));
g_hCapsLockBitmap[0] = (HBITMAP)LOADBUTTONBITMAP("LED_CAPSOFF_BITMAP");
g_hCapsLockBitmap[1] = (HBITMAP)LOADBUTTONBITMAP("LED_CAPSON_BITMAP");
//Pravets8 only
g_hCapsBitmapP8[0] = (HBITMAP)LOADBUTTONBITMAP(TEXT("LED_CAPSOFF_P8_BITMAP"));
g_hCapsBitmapP8[1] = (HBITMAP)LOADBUTTONBITMAP(TEXT("LED_CAPSON_P8_BITMAP"));
g_hCapsBitmapLat[0] = (HBITMAP)LOADBUTTONBITMAP(TEXT("LED_LATOFF_BITMAP"));
g_hCapsBitmapLat[1] = (HBITMAP)LOADBUTTONBITMAP(TEXT("LED_LATON_BITMAP"));
g_hCapsBitmapP8[0] = (HBITMAP)LOADBUTTONBITMAP("LED_CAPSOFF_P8_BITMAP");
g_hCapsBitmapP8[1] = (HBITMAP)LOADBUTTONBITMAP("LED_CAPSON_P8_BITMAP");
g_hCapsBitmapLat[0] = (HBITMAP)LOADBUTTONBITMAP("LED_LATOFF_BITMAP");
g_hCapsBitmapLat[1] = (HBITMAP)LOADBUTTONBITMAP("LED_LATON_BITMAP");
/*charsetbitmap[0] = (HBITMAP)LOADBUTTONBITMAP(TEXT("CHARSET_APPLE_BITMAP"));
charsetbitmap[1] = (HBITMAP)LOADBUTTONBITMAP(TEXT("CHARSET_82_BITMAP"));
charsetbitmap[2] = (HBITMAP)LOADBUTTONBITMAP(TEXT("CHARSET_8A_BITMAP"));
charsetbitmap[3] = (HBITMAP)LOADBUTTONBITMAP(TEXT("CHARSET_8M_BITMAP"));
/*charsetbitmap[0] = (HBITMAP)LOADBUTTONBITMAP("CHARSET_APPLE_BITMAP");
charsetbitmap[1] = (HBITMAP)LOADBUTTONBITMAP("CHARSET_82_BITMAP");
charsetbitmap[2] = (HBITMAP)LOADBUTTONBITMAP("CHARSET_8A_BITMAP");
charsetbitmap[3] = (HBITMAP)LOADBUTTONBITMAP("CHARSET_8M_BITMAP");
*/
//===========================
g_hDiskWindowedLED[ DISK_STATUS_OFF ] = (HBITMAP)LOADBUTTONBITMAP(TEXT("DISKOFF_BITMAP"));
g_hDiskWindowedLED[ DISK_STATUS_READ ] = (HBITMAP)LOADBUTTONBITMAP(TEXT("DISKREAD_BITMAP"));
g_hDiskWindowedLED[ DISK_STATUS_WRITE] = (HBITMAP)LOADBUTTONBITMAP(TEXT("DISKWRITE_BITMAP"));
g_hDiskWindowedLED[ DISK_STATUS_PROT ] = (HBITMAP)LOADBUTTONBITMAP(TEXT("DISKPROT_BITMAP"));
g_hDiskWindowedLED[ DISK_STATUS_EMPTY] = (HBITMAP)LOADBUTTONBITMAP(TEXT("DISKOFF_BITMAP"));
g_hDiskWindowedLED[ DISK_STATUS_SPIN ] = (HBITMAP)LOADBUTTONBITMAP(TEXT("DISKREAD_BITMAP"));
g_hDiskWindowedLED[ DISK_STATUS_OFF ] = (HBITMAP)LOADBUTTONBITMAP("DISKOFF_BITMAP");
g_hDiskWindowedLED[ DISK_STATUS_READ ] = (HBITMAP)LOADBUTTONBITMAP("DISKREAD_BITMAP");
g_hDiskWindowedLED[ DISK_STATUS_WRITE] = (HBITMAP)LOADBUTTONBITMAP("DISKWRITE_BITMAP");
g_hDiskWindowedLED[ DISK_STATUS_PROT ] = (HBITMAP)LOADBUTTONBITMAP("DISKPROT_BITMAP");
g_hDiskWindowedLED[ DISK_STATUS_EMPTY] = (HBITMAP)LOADBUTTONBITMAP("DISKOFF_BITMAP");
g_hDiskWindowedLED[ DISK_STATUS_SPIN ] = (HBITMAP)LOADBUTTONBITMAP("DISKREAD_BITMAP");
btnfacebrush = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
btnfacepen = CreatePen(PS_SOLID,1,GetSysColor(COLOR_BTNFACE));
@@ -235,7 +235,7 @@ void Win32Frame::CreateGdiObjects(void)
smallfont = CreateFont(smallfontHeight,6,0,0,FW_NORMAL,0,0,0,ANSI_CHARSET,
OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,
DEFAULT_QUALITY,VARIABLE_PITCH | FF_SWISS,
TEXT("Small Fonts"));
"Small Fonts");
}
//===========================================================================
@@ -579,10 +579,10 @@ void Win32Frame::FrameDrawDiskLEDS( HDC passdc )
SetTextAlign(dc,TA_LEFT | TA_TOP);
SetTextColor(dc, g_aDiskFullScreenColorsLED[g_eStatusDrive1]);
TextOut(dc,x+ 3,y+2,TEXT("1"),1);
TextOut(dc,x+ 3,y+2,"1",1);
SetTextColor(dc, g_aDiskFullScreenColorsLED[g_eStatusDrive2]);
TextOut(dc,x+13,y+2,TEXT("2"),1);
TextOut(dc,x+13,y+2,"2",1);
}
else
{
@@ -772,10 +772,10 @@ void Win32Frame::FrameDrawDiskStatus( HDC passdc )
TextOut(dc, x, y, text.c_str(), text.length());
SetTextColor(dc, g_aDiskFullScreenColorsLED[g_eStatusDrive1]);
TextOut(dc, x + 3, y + smallfontHeight, TEXT("1"), 1);
TextOut(dc, x + 3, y + smallfontHeight, "1", 1);
SetTextColor(dc, g_aDiskFullScreenColorsLED[g_eStatusDrive2]);
TextOut(dc, x + 13, y + smallfontHeight, TEXT("2"), 1);
TextOut(dc, x + 13, y + smallfontHeight, "2", 1);
}
else
{
@@ -836,7 +836,7 @@ void Win32Frame::DrawStatusArea(HDC passdc, int drawflags)
{
SetTextAlign(dc, TA_RIGHT | TA_TOP);
SetTextColor(dc, g_aDiskFullScreenColorsLED[eHardDriveStatus]);
TextOut(dc, x + 23, y + 2, TEXT("H"), 1);
TextOut(dc, x + 23, y + 2, "H", 1);
}
if (!IS_APPLE2)
@@ -846,7 +846,7 @@ void Win32Frame::DrawStatusArea(HDC passdc, int drawflags)
? RGB(128,128,128)
: RGB( 0, 0, 0) ));
TextOut(dc,x+BUTTONCX,y+2,TEXT("A"),1); // NB. Caps Lock indicator is already flush right!
TextOut(dc,x+BUTTONCX,y+2,"A",1); // NB. Caps Lock indicator is already flush right!
}
//
@@ -895,7 +895,7 @@ void Win32Frame::DrawStatusArea(HDC passdc, int drawflags)
TextOut(dc, x + 27, y + yOffsetSlot6LEDNumbers, "2", 1);
// Add text for Slot7 harddrive: "H"
TextOut(dc, x + 7, y + yOffsetCapsLock, TEXT("H"), 1);
TextOut(dc, x + 7, y + yOffsetCapsLock, "H", 1);
if (g_nViewportScale > 1)
{
@@ -1031,8 +1031,8 @@ LRESULT Win32Frame::WndProc(
SetNormalMode();
if (!IsIconic(window))
GetWindowRect(window,&framerect);
RegSaveValue(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_WINDOW_X_POS), 1, framerect.left);
RegSaveValue(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_WINDOW_Y_POS), 1, framerect.top);
RegSaveValue(REG_PREFS, REGVALUE_PREF_WINDOW_X_POS, 1, framerect.left);
RegSaveValue(REG_PREFS, REGVALUE_PREF_WINDOW_Y_POS, 1, framerect.top);
FrameReleaseDC();
SetUsingCursor(FALSE);
if (helpquit) {
@@ -1091,8 +1091,8 @@ LRESULT Win32Frame::WndProc(
case WM_DDE_INITIATE: {
LogFileOutput("WM_DDE_INITIATE\n");
ATOM application = GlobalAddAtom(TEXT("applewin"));
ATOM topic = GlobalAddAtom(TEXT("system"));
ATOM application = GlobalAddAtom("applewin");
ATOM topic = GlobalAddAtom("system");
if(LOWORD(lparam) == application && HIWORD(lparam) == topic)
SendMessage((HWND)wparam,WM_DDE_ACK,(WPARAM)window,MAKELPARAM(application,topic));
GlobalDeleteAtom(application);
@@ -1329,13 +1329,13 @@ LRESULT Win32Frame::WndProc(
{
case '0': // Toggle speed: custom speed / Full-Speed
if (g_dwSpeed == SPEED_MAX)
REGLOAD_DEFAULT(TEXT(REGVALUE_EMULATION_SPEED), &g_dwSpeed, SPEED_NORMAL);
REGLOAD_DEFAULT(REGVALUE_EMULATION_SPEED, &g_dwSpeed, SPEED_NORMAL);
else
g_dwSpeed = SPEED_MAX;
keyHandled = true; break;
case '1': // Speed = 1 MHz
g_dwSpeed = SPEED_NORMAL;
REGSAVE(TEXT(REGVALUE_EMULATION_SPEED), g_dwSpeed);
REGSAVE(REGVALUE_EMULATION_SPEED, g_dwSpeed);
keyHandled = true; break;
case '3': // Speed = Full-Speed
g_dwSpeed = SPEED_MAX;
@@ -1940,7 +1940,7 @@ void Win32Frame::ScreenWindowResize(const bool bCtrlKey)
else if (bCtrlKey) // if normal screen && CTRL: then toggle scaling
{
FrameResizeWindow( (g_nViewportScale == 1) ? 2 : 1 ); // Toggle between 1x and 2x
REGSAVE(TEXT(REGVALUE_WINDOW_SCALE), g_nViewportScale);
REGSAVE(REGVALUE_WINDOW_SCALE, g_nViewportScale);
}
else
{
@@ -1982,12 +1982,12 @@ void Win32Frame::ProcessButtonClick(int button, bool bFromButtonUI /*=false*/)
case BTN_HELP:
{
const std::string filename = g_sProgramDir + TEXT("APPLEWIN.CHM");
const std::string filename = g_sProgramDir + "APPLEWIN.CHM";
// (GH#437) For any internet downloaded AppleWin.chm files (stored on an NTFS drive) there may be an Alt Data Stream containing a Zone Identifier
// - try to delete it, otherwise the content won't be displayed unless it's unblock (via File Properties)
{
const std::string filename_with_zone_identifier = filename + TEXT(":Zone.Identifier");
const std::string filename_with_zone_identifier = filename + ":Zone.Identifier";
DeleteFile(filename_with_zone_identifier.c_str());
}
@@ -2110,12 +2110,12 @@ void Win32Frame::ProcessDiskPopupMenu(HWND hwnd, POINT pt, const int iDrive)
// It shall not be left blank, otherwise an explorer window will be open.
char PathToCiderPress[MAX_PATH];
RegLoadString(
TEXT("Configuration"),
"Configuration",
REGVALUE_CIDERPRESSLOC,
1,
PathToCiderPress,
MAX_PATH,
TEXT("C:\\Program Files\\faddenSoft\\CiderPress\\CiderPress.exe"));
"C:\\Program Files\\faddenSoft\\CiderPress\\CiderPress.exe");
//TODO: A directory is open if an empty path to CiderPress is set. This has to be fixed.
std::string filename1= "\"";
@@ -2575,7 +2575,7 @@ void Win32Frame::FrameCreateWindow(void)
{
const int nXScreen = GetSystemMetrics(SM_CXSCREEN) - nWidth;
if (RegLoadValue(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_WINDOW_X_POS), 1, (uint32_t*)&nXPos))
if (RegLoadValue(REG_PREFS, REGVALUE_PREF_WINDOW_X_POS, 1, (uint32_t*)&nXPos))
{
if ((nXPos > nXScreen) && !g_bMultiMon)
nXPos = -1; // Not fully visible, so default to centre position
@@ -2590,7 +2590,7 @@ void Win32Frame::FrameCreateWindow(void)
{
const int nYScreen = GetSystemMetrics(SM_CYSCREEN) - nHeight;
if (RegLoadValue(TEXT(REG_PREFS), TEXT(REGVALUE_PREF_WINDOW_Y_POS), 1, (uint32_t*)&nYPos))
if (RegLoadValue(REG_PREFS, REGVALUE_PREF_WINDOW_Y_POS, 1, (uint32_t*)&nYPos))
{
if ((nYPos > nYScreen) && !g_bMultiMon)
nYPos = -1; // Not fully visible, so default to centre position
@@ -2609,7 +2609,7 @@ void Win32Frame::FrameCreateWindow(void)
// NB. g_hFrameWindow also set by WM_CREATE - NB. CreateWindow() must synchronously send WM_CREATE
g_hFrameWindow = CreateWindow(
TEXT("APPLE2FRAME"),
"APPLE2FRAME",
g_pAppTitle.c_str(),
WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU |
WS_MINIMIZEBOX | WS_VISIBLE,
@@ -2664,14 +2664,14 @@ void Win32Frame::FrameRegisterClass () {
wndclass.style = CS_OWNDC | CS_BYTEALIGNCLIENT;
wndclass.lpfnWndProc = FrameWndProc;
wndclass.hInstance = g_hInstance;
wndclass.hIcon = LoadIcon(g_hInstance,TEXT("APPLEWIN_ICON"));
wndclass.hIcon = LoadIcon(g_hInstance,"APPLEWIN_ICON");
wndclass.hCursor = LoadCursor(0,IDC_ARROW);
wndclass.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
#if ENABLE_MENU
wndclass.lpszMenuName = (LPCSTR)IDR_MENU1;
#endif
wndclass.lpszClassName = TEXT("APPLE2FRAME");
wndclass.hIconSm = (HICON)LoadImage(g_hInstance,TEXT("APPLEWIN_ICON"),
wndclass.lpszClassName = "APPLE2FRAME";
wndclass.hIconSm = (HICON)LoadImage(g_hInstance,"APPLEWIN_ICON",
IMAGE_ICON,16,16,LR_DEFAULTCOLOR);
RegisterClassEx(&wndclass);
}