1
0
Fork 0
mirror of https://github.com/pnx/m16vm synced 2026-06-17 03:50:03 +02:00

src/cpu.c: alot of refactoring, store state in a struct. and make vm.c "own" the state.

This commit is contained in:
Henrik Hautakoski 2018-10-28 14:53:41 +01:00
parent 3db5f117d6
commit 6f60b1a74a
No known key found for this signature in database
GPG key ID: 839F3A7EAFAEAFAA
3 changed files with 120 additions and 73 deletions

View file

@ -25,8 +25,11 @@
#include <fcntl.h>
#include <errno.h>
#include <unistd.h>
#include "mm.h"
#include "cpu.h"
struct cpu_state state;
// Load program from file
unsigned long load_program(int fd, unsigned char **buf) {
@ -46,8 +49,53 @@ unsigned long load_program(int fd, unsigned char **buf) {
return rc;
}
void print_memory() {
int i = 0;
printf("\n");
for(i = 0; i < 32; i++) {
printf("%.2X ", memory[i]);
}
printf("\n");
}
void print_regs(uint16_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");
}
void run(unsigned char *instr_ptr, unsigned instr_len) {
int rc;
mm_init();
cpu_init(&state);
cpu_instr_load(&state, instr_ptr, instr_len);
do {
rc = cpu_tick(&state);
} while(rc == 0);
print_regs(state.reg);
print_memory();
mm_exit();
}
int main(int argc, char **argv) {
int rc;
int fd;
unsigned char *instr_ptr;
unsigned instr_len;
@ -70,9 +118,8 @@ int main(int argc, char **argv) {
if (instr_len < 0)
return 1;
cpu_instr_load(instr_ptr, instr_len);
cpu_run();
// Execute the program.
run(instr_ptr, instr_len);
if (instr_ptr)
free(instr_ptr);