pnx/m16vm
1
0
Fork 0
mirror of https://github.com/pnx/m16vm synced 2026-06-16 03:44:55 +02:00
Code Releases Activity

vm/vm.c: Use debug module and get flags from command line.

Browse source
This commit is contained in:
Henrik Hautakoski 2019-01-29 14:08:31 +01:00
parent 065e86e655
commit c27029001e
No known key found for this signature in database
GPG key ID: 839F3A7EAFAEAFAA
1 changed files with 28 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

62
vm/vm.c
View file

@ -18,41 +18,14 @@
* MA 02110-1301, USA. * MA 02110-1301, USA.
*/ */
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include "program.h" #include "program.h"
#include "mm.h" #include "mm.h"
#include "cpu.h" #include "cpu.h"
#include "debug.h"
#ifdef M16_DEBUG_MEM static unsigned debug_mem = 0;
void print_memory() { static unsigned debug_reg = 0;
int i = 0;
printf("\n");
for(i = 0; i < 32; i++) {
printf("%.2X ", memory[i]);
}
printf("\n");
}
#else
#define print_memory()
#endif /* ! M16_DEBUG_MEM */
#ifdef M16_DEBUG_REG
void print_regs(int16_t *regs) {
int i = 0;
printf("\n");
for(i = 0; i < CPU_NUM_REGS; i++) {
printf("r%i = %i\n", i, regs[i]);
}
printf("\n");
}
#else
#define print_regs(regs)
#endif /* ! M16_DEBUG_REG */
void run(struct program *prog) { void run(struct program *prog) {
@ -68,9 +41,11 @@ void run(struct program *prog) {
rc = cpu_tick(&state); rc = cpu_tick(&state);
} while(rc == 0); } while(rc == 0);
print_regs(state.reg); if (debug_reg)
debug_print_regs(state.reg);
print_memory(); if (debug_mem)
debug_print_memory(memory);
mm_exit(); mm_exit();
} }
@ -78,13 +53,32 @@ void run(struct program *prog) {
int main(int argc, char **argv) { int main(int argc, char **argv) {
struct program prog = { 0 }; struct program prog = { 0 };
const char *filename;
int i;
if (argc < 2) { if (argc < 2) {
fprintf(stderr, "usage: %s <file>\n", argv[0]); fprintf(stderr, "usage: %s <file>\n", argv[0]);
return 1; return 1;
} }
if (program_loadfromfile(&prog, argv[1]) < 0) // Parse options.
for(i = 1; i < argc; i++) {
if (argv[i][0] == '-') {
if (!strcmp(argv[i], "-dmem")) {
debug_mem = 1;
} else if (!strcmp(argv[i], "-dreg")) {
debug_reg = 1;
} else {
fprintf(stderr, "Invalid option '%s'\n", argv[i]);
}
} else {
filename = argv[i];
break;
}
}
if (program_loadfromfile(&prog, filename) < 0)
return 1; return 1;
// Execute the program. // Execute the program.