Apple-2-Tools/bradgrantham-apple2e
1
0
Fork 0
mirror of https://github.com/bradgrantham/apple2e.git synced 2024-12-26 10:29:32 +00:00
Code Issues Projects Releases Wiki Activity

use snprintf

Browse Source
This commit is contained in:
Brad Grantham 2024-06-25 20:30:00 -07:00
parent 836e348f60
commit afd1101a74
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dis6502.cpp
View File

@ -10,6 +10,7 @@ tuple<int, string> disassemble_6502(int address, const unsigned char* buffer)
static char cstr[512];
int bytelength;
char *p = cstr;
size_t remaining = sizeof(cstr) - 1;
int currentbyte;
int previousbyte;
@ -67,8 +68,8 @@ tuple<int, string> disassemble_6502(int address, const unsigned char* buffer)
previousbyte = currentbyte;
currentbyte = ((unsigned char * ) buffer)[i];
if (paramcount == 0) {
sprintf(p, "%04X %n", address, &stored); //Display current address at beginning of line
p += stored;
snprintf(p, remaining, "%04X %n", address, &stored); //Display current address at beginning of line
p += stored; remaining -= stored;
paramcount = opcode_props[currentbyte][0]; //Get instruction length
bytelength = paramcount;
opcode = instruction[opcode_props[currentbyte][1]]; //Get opcode name
@ -78,28 +79,29 @@ tuple<int, string> disassemble_6502(int address, const unsigned char* buffer)
pad = padding[(paramcount - 1)]; //Calculate correct padding for output alignment
address = address + paramcount; //Increment address
}
if (paramcount != 0) //Keep track of possition within instruction
if (paramcount != 0) { //Keep track of possition within instruction
paramcount = paramcount - 1;
sprintf(p, "%02X %n", currentbyte, &stored); //Display the current byte in HEX
p += stored;
}
snprintf(p, remaining, "%02X %n", currentbyte, &stored); //Display the current byte in HEX
p += stored; remaining -= stored;
if (paramcount == 0) {
sprintf(p, " %s %s %s%n", pad, opcode, pre, &stored); //Pad text, display instruction name and pre-operand chars
p += stored;
snprintf(p, remaining, " %s %s %s%n", pad, opcode, pre, &stored); //Pad text, display instruction name and pre-operand chars
p += stored; remaining -= stored;
if (strcmp(pad, " ") == 0) { //Check if single operand instruction
if (addrmode != 8) { //If not using relative addressing ...
sprintf(p, "$%02X%n", currentbyte, &stored); //...display operand
p += stored;
snprintf(p, remaining, "$%02X%n", currentbyte, &stored); //...display operand
p += stored; remaining -= stored;
} else { //Addressing mode is relative...
sprintf(p, "$%02X%n", (address + ((currentbyte < 128) ? currentbyte : currentbyte - 256)), &stored); //...display relative address.
p += stored;
snprintf(p, remaining, "$%02X%n", (address + ((currentbyte < 128) ? currentbyte : currentbyte - 256)), &stored); //...display relative address.
p += stored; remaining -= stored;
}
}
if (strcmp(pad, "") == 0) { //Check if two operand instruction and if so...
sprintf(p, "$%02X%02X%n", currentbyte, previousbyte, &stored); //...display operand
p += stored;
snprintf(p, remaining, "$%02X%02X%n", currentbyte, previousbyte, &stored); //...display operand
p += stored; remaining -= stored;
}
sprintf(p, "%s%n", post, &stored); //Display post-operand chars
p += stored;
snprintf(p, remaining, "%s%n", post, &stored); //Display post-operand chars
p += stored; remaining -= stored;
break;
}
}