Win32 debugger tweaks and fixes

src/asm.cpp

@@ -254,8 +254,8 @@ int Assemble(unsigned char *output, int addr, char *str) {
 	return 0;
 }
 
-///disassembles the opcodes in the buffer assuming the provided address. Uses GetMem() and 6502 current registers to query referenced values. returns a static string buffer.
-char *Disassemble(int addr, uint8 *opcode) {
+///Disassembles the instruction bytes in the buffer using the provided address for trace info. Uses GetMem() and 6502 current registers to query referenced values. Returns a static string buffer.
+char *Disassemble(int addr, uint8 *opcode, bool showTrace) {
 	static char str[64]={0},chr[5]={0};
 	uint16 tmp,tmp2;
 
@@ -333,7 +333,9 @@ char *Disassemble(int addr, uint8 *opcode) {
 		case 0xE1: strcpy(chr,"SBC"); goto _indirectx;
 		_indirectx:
 			indirectX(tmp);
-			sprintf(str,"%s ($%02X,X) @ $%04X = #$%02X", chr,opcode[1],tmp,GetMem(tmp));
+			showTrace
+				? sprintf(str,"%s ($%02X,X) @ $%04X = #$%02X", chr,opcode[1],tmp,GetMem(tmp))
+				: sprintf(str,"%s ($%02X,X)",                  chr,opcode[1]);
 			break;
 
 		//Zero Page
@@ -359,10 +361,10 @@ char *Disassemble(int addr, uint8 *opcode) {
 		case 0xE5: strcpy(chr,"SBC"); goto _zeropage;
 		case 0xE6: strcpy(chr,"INC"); goto _zeropage;
 		_zeropage:
-		// ################################## Start of SP CODE ###########################
 		// Change width to %04X // don't!
-			sprintf(str,"%s $%02X = #$%02X", chr,opcode[1],GetMem(opcode[1]));
-		// ################################## End of SP CODE ###########################
+			showTrace 
+				? sprintf(str,"%s $%02X = #$%02X", chr,opcode[1],GetMem(opcode[1]))
+				: sprintf(str,"%s $%02X",          chr,opcode[1]);
 			break;
 
 		//#Immediate
@@ -406,7 +408,9 @@ char *Disassemble(int addr, uint8 *opcode) {
 		case 0xEE: strcpy(chr,"INC"); goto _absolute;
 		_absolute:
 			absolute(tmp);
-			sprintf(str,"%s $%04X = #$%02X", chr,tmp,GetMem(tmp));
+			showTrace
+				? sprintf(str,"%s $%04X = #$%02X", chr,tmp,GetMem(tmp))
+				: sprintf(str,"%s $%04X",          chr,tmp);
 			break;
 
 		//branches
@@ -434,7 +438,9 @@ char *Disassemble(int addr, uint8 *opcode) {
 		case 0xF1: strcpy(chr,"SBC"); goto _indirecty;
 		_indirecty:
 			indirectY(tmp);
-			sprintf(str,"%s ($%02X),Y @ $%04X = #$%02X", chr,opcode[1],tmp,GetMem(tmp));
+			showTrace
+				? sprintf(str,"%s ($%02X),Y @ $%04X = #$%02X", chr,opcode[1],tmp,GetMem(tmp))
+				: sprintf(str,"%s ($%02X),Y",                  chr,opcode[1]); 
 			break;
 
 		//Zero Page,X
@@ -456,10 +462,10 @@ char *Disassemble(int addr, uint8 *opcode) {
 		case 0xF6: strcpy(chr,"INC"); goto _zeropagex;
 		_zeropagex:
 			zpIndex(tmp,RX);
-		// ################################## Start of SP CODE ###########################
 		// Change width to %04X // don't!
-			sprintf(str,"%s $%02X,X @ $%04X = #$%02X", chr,opcode[1],tmp,GetMem(tmp));
-		// ################################## End of SP CODE ###########################
+			showTrace
+				? sprintf(str,"%s $%02X,X @ $%04X = #$%02X", chr,opcode[1],tmp,GetMem(tmp))
+				: sprintf(str,"%s $%02X,X",                  chr,opcode[1]);
 			break;
 
 		//Absolute,Y
@@ -475,7 +481,9 @@ char *Disassemble(int addr, uint8 *opcode) {
 		_absolutey:
 			absolute(tmp);
 			tmp2=(tmp+RY);
-			sprintf(str,"%s $%04X,Y @ $%04X = #$%02X", chr,tmp,tmp2,GetMem(tmp2));
+			showTrace
+				? sprintf(str,"%s $%04X,Y @ $%04X = #$%02X", chr,tmp,tmp2,GetMem(tmp2))
+				: sprintf(str,"%s $%04X,Y",                  chr,tmp);
 			break;
 
 		//Absolute,X
@@ -497,7 +505,9 @@ char *Disassemble(int addr, uint8 *opcode) {
 		_absolutex:
 			absolute(tmp);
 			tmp2=(tmp+RX);
-			sprintf(str,"%s $%04X,X @ $%04X = #$%02X", chr,tmp,tmp2,GetMem(tmp2));
+			showTrace
+			    ? sprintf(str,"%s $%04X,X @ $%04X = #$%02X", chr,tmp,tmp2,GetMem(tmp2))
+				: sprintf(str,"%s $%04X,X",                  chr,tmp);
 			break;
 
 		//jumps
@@ -514,10 +524,10 @@ char *Disassemble(int addr, uint8 *opcode) {
 		case 0xB6: strcpy(chr,"LDX"); goto _zeropagey;
 		_zeropagey:
 			zpIndex(tmp,RY);
-		// ################################## Start of SP CODE ###########################
 		// Change width to %04X // don't!
-			sprintf(str,"%s $%02X,Y @ $%04X = #$%02X", chr,opcode[1],tmp,GetMem(tmp));
-		// ################################## End of SP CODE ###########################
+			showTrace
+				? sprintf(str,"%s $%02X,Y @ $%04X = #$%02X", chr,opcode[1],tmp,GetMem(tmp))
+				: sprintf(str,"%s $%02X,Y",                  chr,opcode[1]);
 			break;
 
 		//UNDEFINED
@@ -527,3 +537,83 @@ char *Disassemble(int addr, uint8 *opcode) {
 
 	return str;
 }
+
+char *DisassembleLine(int addr, bool showTrace, bool showRomOffsets) {
+	uint8 instruction[] = {GetMem(addr), GetMem(addr + 1), GetMem(addr + 2)};
+	return DisassembleData(addr, instruction, showTrace, showRomOffsets);
+}
+
+int formatAddress(char *str, int addr, bool showRomOffsets) {
+	if (addr >= 0x8000)
+	{
+		if (showRomOffsets && GetNesFileAddress(addr) != -1)
+		{
+			return sprintf(str, " %06X: ", GetNesFileAddress(addr));
+		}
+		else
+		{
+			return sprintf(str, "%02X:%04X: ", getBank(addr), addr);
+		}
+	}
+	else
+	{
+		return sprintf(str, "  :%04X: ", addr);
+	}
+}
+
+char *DisassembleData(int addr, uint8 *opcode, bool showTrace, bool showRomOffsets) {
+	static char str[64] = { 0 }, chr[25] = { 0 };
+	char *c;
+	int size, j;
+
+	formatAddress(str, addr, showRomOffsets);
+
+	size = opsize[opcode[0]];
+	if (size == 0)
+	{
+		sprintf(chr, "%02X        UNDEFINED", opcode[0]);
+		strcat(str, chr);
+	}
+	else
+	{
+		if ((addr + size) > 0x10000)
+		{
+			sprintf(chr, "%02X        OVERFLOW", opcode[0]);
+			strcat(str, chr);
+		}
+		else
+		{
+			for (j = 0; j < size; j++)
+			{
+				sprintf(chr, "%02X ", opcode[j]);
+				addr++;
+				strcat(str, chr);
+			}
+			while (size < 3)
+			{
+				strcat(str, "   "); //pad output to align ASM
+				size++;
+			}
+			strcat(strcat(str, " "), Disassemble(addr, opcode, showTrace));
+		}
+	}
+	return str;
+}
+
+/// Disassembles a data block of the given length, regardless of any cdlogger info.
+char *DisassembleDataBlock(int addr, int length, bool showTrace, bool showRomOffsets) {
+	static char str[64] = { 0 }, chr[25] = { 0 };
+	int size;
+
+	formatAddress(str, addr, showRomOffsets);
+
+	sprintf(chr, ".db $%02X", GetMem(addr));
+	strcat(str, chr);
+
+	for (int i = addr + 1; i < addr + length && i < 0x10000; i++) {
+		sprintf(chr, ", $%02X", GetMem(i));
+		strcat(str, chr);
+	}
+
+	return str;
+}

src/asm.h

@@ -1,2 +1,7 @@
+#pragma once
+
 int Assemble(unsigned char *output, int addr, char *str);
-char *Disassemble(int addr, uint8 *opcode);
+char *Disassemble(int addr, uint8 *opcode, bool showTrace = false);
+char *DisassembleLine(int addr, bool showTrace = false, bool showRomOffsets = false);
+char *DisassembleData(int addr, uint8 *opcode, bool showTrace = false, bool showRomOffsets = false);
+char *DisassembleDataBlock(int addr, int length, bool showTrace = false, bool showRomOffsets = false);

src/drivers/win/assembler.cpp

@@ -0,0 +1,159 @@
+#include <Windows.h>
+
+#include "types.h"
+#include "gui.h"
+#include "resource.h"
+#include "debugger.h"
+#include "../../debug.h"
+#include "asm.h"
+#include "../../x6502.h"
+#include "../../fceu.h"
+#include "../../debug.h"
+#include "../../nsf.h"
+#include "../../ppu.h"
+#include "../../cart.h"
+#include "../../ines.h"
+#include "../../asm.h"
+
+int AddAsmHistory(HWND hwndDlg, int id, char *str) {
+	int index;
+	index = SendDlgItemMessage(hwndDlg, id, CB_FINDSTRINGEXACT, -1, (LPARAM)(LPSTR)str);
+	if (index == CB_ERR) {
+		SendDlgItemMessage(hwndDlg, id, CB_INSERTSTRING, -1, (LPARAM)(LPSTR)str);
+		return 0;
+	}
+	return 1;
+}
+
+INT_PTR CALLBACK AssemblerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	int romaddr, count, i, j;
+	char str[128], *dasm;
+	static int patchlen, applied, saved, lastundo;
+	static uint8 patchdata[64][3], undodata[64 * 3];
+	uint8 *ptr;
+
+	switch (uMsg) {
+	case WM_INITDIALOG:
+		CenterWindow(hwndDlg);
+
+		//set font
+		SendDlgItemMessage(hwndDlg, IDC_ASSEMBLER_DISASSEMBLY, WM_SETFONT, (WPARAM)debugSystem->hFixedFont, FALSE);
+		SendDlgItemMessage(hwndDlg, IDC_ASSEMBLER_PATCH_DISASM, WM_SETFONT, (WPARAM)debugSystem->hFixedFont, FALSE);
+
+		//set limits
+		SendDlgItemMessage(hwndDlg, IDC_ASSEMBLER_HISTORY, CB_LIMITTEXT, 20, 0);
+
+		SetDlgItemText(hwndDlg, IDC_ASSEMBLER_DISASSEMBLY, DisassembleLine(iaPC));
+		SetFocus(GetDlgItem(hwndDlg, IDC_ASSEMBLER_HISTORY));
+
+		patchlen = 0;
+		applied = 0;
+		saved = 0;
+		lastundo = 0;
+		break;
+	case WM_CLOSE:
+	case WM_QUIT:
+		EndDialog(hwndDlg, 0);
+		break;
+	case WM_COMMAND:
+	{
+		switch (HIWORD(wParam))
+		{
+		case BN_CLICKED:
+		{
+			switch (LOWORD(wParam))
+			{
+			case IDC_ASSEMBLER_APPLY:
+				if (patchlen) {
+					ptr = GetNesPRGPointer(GetNesFileAddress(iaPC) - 16);
+					count = 0;
+					for (i = 0; i < patchlen; i++) {
+						for (j = 0; j < opsize[patchdata[i][0]]; j++) {
+							if (count == lastundo) undodata[lastundo++] = ptr[count];
+							ptr[count++] = patchdata[i][j];
+						}
+					}
+					SetWindowText(hwndDlg, "Inline Assembler  *Patches Applied*");
+					applied = 1;
+				}
+				break;
+			case IDC_ASSEMBLER_SAVE:
+				if (applied) {
+					count = romaddr = GetNesFileAddress(iaPC);
+					for (i = 0; i < patchlen; i++)
+					{
+						count += opsize[patchdata[i][0]];
+					}
+					if (patchlen) sprintf(str, "Write patch data to file at addresses 0x%06X - 0x%06X?", romaddr, count - 1);
+					else sprintf(str, "Undo all previously applied patches?");
+					if (MessageBox(hwndDlg, str, "Save changes to file?", MB_YESNO | MB_ICONINFORMATION) == IDYES) {
+						if (iNesSave()) {
+							saved = 1;
+							applied = 0;
+						}
+						else MessageBox(hwndDlg, "Unable to save changes to file", "Error saving to file", MB_OK | MB_ICONERROR);
+					}
+				}
+				break;
+			case IDC_ASSEMBLER_UNDO:
+				if ((count = SendDlgItemMessage(hwndDlg, IDC_ASSEMBLER_PATCH_DISASM, LB_GETCOUNT, 0, 0))) {
+					SendDlgItemMessage(hwndDlg, IDC_ASSEMBLER_PATCH_DISASM, LB_DELETESTRING, count - 1, 0);
+					patchlen--;
+					count = 0;
+					for (i = 0; i < patchlen; i++)
+					{
+						count += opsize[patchdata[i][0]];
+					}
+					if (count < lastundo) {
+						ptr = GetNesPRGPointer(GetNesFileAddress(iaPC) - 16);
+						j = opsize[patchdata[patchlen][0]];
+						for (i = count; i < (count + j); i++) {
+							ptr[i] = undodata[i];
+						}
+						lastundo -= j;
+						applied = 1;
+					}
+					SetDlgItemText(hwndDlg, IDC_ASSEMBLER_DISASSEMBLY, DisassembleLine(iaPC + count));
+				}
+				break;
+			case IDC_ASSEMBLER_DEFPUSHBUTTON:
+				count = 0;
+				for (i = 0; i < patchlen; i++)
+				{
+					count += opsize[patchdata[i][0]];
+				}
+				GetDlgItemText(hwndDlg, IDC_ASSEMBLER_HISTORY, str, 21);
+				if (!Assemble(patchdata[patchlen], (iaPC + count), str)) {
+					count = iaPC;
+					for (i = 0; i <= patchlen; i++)
+					{
+						count += opsize[patchdata[i][0]];
+					}
+					if (count > 0x10000) { //note: don't use 0xFFFF!
+						MessageBox(hwndDlg, "Patch data cannot exceed address 0xFFFF", "Address error", MB_OK | MB_ICONERROR);
+						break;
+					}
+					SetDlgItemText(hwndDlg, IDC_ASSEMBLER_HISTORY, "");
+					if (count < 0x10000) SetDlgItemText(hwndDlg, IDC_ASSEMBLER_DISASSEMBLY, DisassembleLine(count));
+					else SetDlgItemText(hwndDlg, IDC_ASSEMBLER_DISASSEMBLY, "OVERFLOW");
+					dasm = DisassembleData((count - opsize[patchdata[patchlen][0]]), patchdata[patchlen]);
+					SendDlgItemMessage(hwndDlg, IDC_ASSEMBLER_PATCH_DISASM, LB_INSERTSTRING, -1, (LPARAM)(LPSTR)dasm);
+					AddAsmHistory(hwndDlg, IDC_ASSEMBLER_HISTORY, dasm + 16);
+					SetWindowText(hwndDlg, "Inline Assembler");
+					patchlen++;
+				}
+				else { //ERROR!
+					SetWindowText(hwndDlg, "Inline Assembler  *Syntax Error*");
+					MessageBeep(MB_ICONEXCLAMATION);
+				}
+				break;
+			}
+			SetFocus(GetDlgItem(hwndDlg, IDC_ASSEMBLER_HISTORY)); //set focus to combo box after anything is pressed!
+			break;
+		}
+		}
+		break;
+	}
+	}
+	return FALSE;
+}

src/drivers/win/assembler.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <Windows.h>
+
+INT_PTR CALLBACK AssemblerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);