Fixes #31 - Allow RAM images to be loaded from disk

This commit is contained in:
Stefan Arentz 2016-11-21 20:47:27 -05:00
parent d10de168ee
commit f981835e44
2 changed files with 36 additions and 2 deletions

34
cpu.c
View File

@ -221,9 +221,13 @@ static void _ram_write(struct cpu_t *cpu, struct mem_t *mem, uint16_t addr, uint
}
void cpu_add_ram(struct cpu_t *cpu, uint16_t start, uint16_t length) {
cpu_add_ram_data(cpu, start, length, calloc(length, 0x01));
}
void cpu_add_ram_data(struct cpu_t *cpu, uint16_t start, uint16_t length, uint8_t *data) {
struct mem_t *mem = (struct mem_t*) malloc(sizeof(struct mem_t));
mem->type = MEM_TYPE_RAM;
mem->obj = malloc(length);
mem->obj = data;
mem->start = start;
mem->length = length;
mem->read_handler = _ram_read;
@ -232,6 +236,34 @@ void cpu_add_ram(struct cpu_t *cpu, uint16_t start, uint16_t length) {
cpu_add_mem(cpu, mem);
}
void cpu_add_ram_file(struct cpu_t *cpu, uint16_t start, char *path) {
int fd = open(path, O_RDONLY);
if (fd == -1) {
return;
}
struct stat file_info;
if (fstat(fd, &file_info) == -1) {
close(fd);
return;
}
if (file_info.st_size > (64 * 1024 - start)) {
close(fd);
return;
}
char *data = malloc(file_info.st_size);
if (read(fd, data, file_info.st_size) != file_info.st_size) {
close(fd);
return;
}
close(fd);
cpu_add_ram_data(cpu, start, file_info.st_size, (uint8_t*) data);
}
// ROM Memory
static uint8_t _rom_read(struct cpu_t *cpu, struct mem_t *mem, uint16_t addr) {

4
cpu.h
View File

@ -83,8 +83,10 @@ void cpu_shutdown(struct cpu_t *cpu);
void cpu_add_mem(struct cpu_t *cpu, struct mem_t *mem);
void cpu_add_ram(struct cpu_t *cpu, uint16_t start, uint16_t length);
void cpu_add_rom_file(struct cpu_t *cpu, uint16_t start, char *path);
void cpu_add_ram_data(struct cpu_t *cpu, uint16_t start, uint16_t length, uint8_t *data);
void cpu_add_ram_file(struct cpu_t *cpu, uint16_t start, char *path);
void cpu_add_rom_data(struct cpu_t *cpu, uint16_t start, uint16_t length, uint8_t *data);
void cpu_add_rom_file(struct cpu_t *cpu, uint16_t start, char *path);
void cpu_add_iom(struct cpu_t *cpu, uint16_t start, uint16_t length, void *obj, mem_read_handler_t read_handler, mem_write_handler_t write_handler);
void cpu_strict(struct cpu_t *cpu, bool strict);