Apple-1-Tools
/
Ryukojiro-apple1
mirror of https://github.com/RyuKojiro/apple1.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use dis6502_printAnnotatedInstruction from libdis6502, instead of having a resident copy of the implementation 

git-svn-id: svn+ssh://svn.phoenixbox.net/svn/apple1/trunk@25 64f78de7-aa59-e511-a0e8-0002a5492df0
This commit is contained in:
Daniel Loffgren 2015-09-17 04:20:15 +00:00
parent acc9106313
commit 229d04b9cd
2 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,5 +1,5 @@
PROG= a1
SRCS= apple1/main.c apple1/pia.c
SRCS= apple1/main.c apple1/pia.c v6502/v6502/log.c
V6502_PREFIX= v6502
LIBV6502_DIR= $(V6502_PREFIX)/v6502

32
apple1/main.c
View File

@ -12,6 +12,7 @@
#include "pia.h"
#include <unistd.h>
#include <dis6502/reverse.h>
#include <v6502/log.h>
#define ROM_START 0xF000
#define ROM_SIZE 0x00FF
@ -46,34 +47,6 @@ uint8_t romMirrorCallback(struct _v6502_memory *memory, uint16_t offset, int tra
return memory->bytes[offset % ROM_SIZE];
}
static int printSingleInstruction(FILE *output, v6502_cpu *cpu, uint16_t address) {
char instruction[MAX_INSTRUCTION_LEN];
int instructionLength;
dis6502_stringForInstruction(instruction, MAX_INSTRUCTION_LEN, cpu->memory->bytes[address], cpu->memory->bytes[address + 2], cpu->memory->bytes[address + 1]);
instructionLength = v6502_instructionLengthForOpcode(cpu->memory->bytes[address]);
fprintf(output, "0x%04x: ", address);
switch (instructionLength) {
case 1: {
fprintf(output, "%02x ", cpu->memory->bytes[address]);
} break;
case 2: {
fprintf(output, "%02x %02x ", cpu->memory->bytes[address], cpu->memory->bytes[address + 1]);
} break;
case 3: {
fprintf(output, "%02x %02x %02x", cpu->memory->bytes[address], cpu->memory->bytes[address + 1], cpu->memory->bytes[address + 2]);
} break;
default: {
fprintf(output, " ");
} break;
}
fprintf(output, " - %s\r\n", instruction);
return instructionLength;
}
int main(int argc, const char * argv[])
{
int faulted = 0;
@ -100,7 +73,8 @@ int main(int argc, const char * argv[])
FILE *asmfile = fopen("runtime.s", "w");
while (!faulted) {
v6502_step(cpu);
printSingleInstruction(asmfile, cpu, cpu->pc);
dis6502_printAnnotatedInstruction(asmfile, cpu, cpu->pc);
v6502_printCpuState(asmfile, cpu);
}
fclose(asmfile);