d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed file_poke

This commit is contained in:
Andrew Alderwick 2021-04-21 13:37:41 +01:00
parent bbf05cb4ec
commit 400c49e96b
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/debugger.c
View File

@ -54,22 +54,20 @@ console_poke(Device *d, Uint8 b0, Uint8 b1)
Uint8 Uint8
file_poke(Device *d, Uint8 b0, Uint8 b1) file_poke(Device *d, Uint8 b0, Uint8 b1)
{ {
/*
Uint8 read = b0 == 0xd; Uint8 read = b0 == 0xd;
if(read || b0 == 0xf) { if(read || b0 == 0xf) {
char *name = (char *)&d->mem[mempeek16(m, 0x8)]; char *name = (char *)&d->mem[mempeek16(d->dat, 0x8)];
Uint16 result = 0, length = mempeek16(m, 0xa); Uint16 result = 0, length = mempeek16(d->dat, 0xa);
Uint16 offset = mempeek16(m, 0x4); Uint16 offset = mempeek16(d->dat, 0x4);
Uint16 addr = (m[b0 - 1] << 8) | b1; Uint16 addr = (d->dat[b0 - 1] << 8) | b1;
FILE *f = fopen(name, read ? "r" : (offset ? "a" : "w")); FILE *f = fopen(name, read ? "r" : (offset ? "a" : "w"));
if(f) { if(f) {
if(fseek(f, offset, SEEK_SET) != -1 && (result = read ? fread(&m[addr], 1, length, f) : fwrite(&m[addr], 1, length, f))) if(fseek(f, offset, SEEK_SET) != -1 && (result = read ? fread(&d->mem[addr], 1, length, f) : fwrite(&d->mem[addr], 1, length, f)))
printf("%s %d bytes, at %04x from %s\n", read ? "Loaded" : "Saved", length, addr, name); printf("%s %d bytes, at %04x from %s\n", read ? "Loaded" : "Saved", length, addr, name);
fclose(f); fclose(f);
} }
mempoke16(m, 0x2, result); mempoke16(d->dat, 0x2, result);
} }
*/
return b1; return b1;
} }

16
src/emulator.c
View File

@ -225,24 +225,20 @@ screen_poke(Device *d, Uint8 b0, Uint8 b1)
Uint8 Uint8
file_poke(Device *d, Uint8 b0, Uint8 b1) file_poke(Device *d, Uint8 b0, Uint8 b1)
{ {
/* TODO: Figure out why fwrite doesn't work with d->mem
Uint8 read = b0 == 0xd; Uint8 read = b0 == 0xd;
if(read || b0 == 0xf) { if(read || b0 == 0xf) {
char *name = (char *)&d->mem[mempeek16(m, 0x8)]; char *name = (char *)&d->mem[mempeek16(d->dat, 0x8)];
Uint16 result = 0, length = mempeek16(m, 0xa); Uint16 result = 0, length = mempeek16(d->dat, 0xa);
Uint16 offset = mempeek16(m, 0x4); Uint16 offset = mempeek16(d->dat, 0x4);
Uint16 addr = (m[b0 - 1] << 8) | b1; Uint16 addr = (d->dat[b0 - 1] << 8) | b1;
FILE *f = fopen(name, read ? "r" : (offset ? "a" : "w")); FILE *f = fopen(name, read ? "r" : (offset ? "a" : "w"));
if(f) { if(f) {
if(fseek(f, offset, SEEK_SET) != -1 && (result = read ? fread(d->mem[addr], 1, length, f) : fwrite(&d->mem[addr], 1, length, f))) if(fseek(f, offset, SEEK_SET) != -1 && (result = read ? fread(&d->mem[addr], 1, length, f) : fwrite(&d->mem[addr], 1, length, f)))
printf("%s %d bytes, at %04x from %s\n", read ? "Loaded" : "Saved", length, addr, name); printf("%s %d bytes, at %04x from %s\n", read ? "Loaded" : "Saved", length, addr, name);
fclose(f); fclose(f);
} }
mempoke16(m, 0x2, result); mempoke16(d->dat, 0x2, result);
} }
*/
(void)d;
(void)b0;
return b1; return b1;
} }