jepler/umac
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

discs: Add write support

Browse source 
The unix_main gets another option, -w, that enables the disc
mapping to reflect writes back to the backing file.

The disc emulation code now handles writes, which are copied
back to the disc data.

This still doesn't abstract read/write ops to disc, which will
be the next step (to support, for example, block-based storage).
This commit is contained in:
Matt Evans 2024-07-15 23:10:19 +01:00
parent 563626a382
commit 1ce7c5bc91
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/disc.c
View file

@ -87,7 +87,7 @@ int disc_pv_hook(uint8_t opcode)
#define ReadMacInt16(addr) RAM_RD16(addr)
#define ReadMacInt8(addr) RAM_RD8(addr)
#define Mac2HostAddr(addr) (ram_get_base() + (addr))
#define Mac2HostAddr(addr) (ram_get_base() + ADR24(addr))
// These access host pointers, in BE/unaligned:
#define WriteBEInt32(addr, val) WRITE_LONG(((uint8_t *)(addr)), 0, val)
@ -303,13 +303,15 @@ int16_t SonyPrime(uint32_t pb, uint32_t dce)
WriteMacInt32(0x300, 0);
WriteMacInt32(0x304, 0);
} else {
DDBG("DISC: WRITE %ld to +0x%x (not performed)\n", length, position);
DDBG("DISC: WRITE %ld to +0x%x\n", length, position);
// Write
if (info->read_only)
return set_dsk_err(wPrErr);
// FIXME: Add write code here, if required.
return set_dsk_err(wPrErr);
DDBG("DISC: WRITE %ld to +0x%x\n", length, position);
DDBG(" (Write buffer: %p)\n", (void *)&info->data[position]);
memcpy(&info->data[position], buffer, length);
}
// Update ParamBlock and DCE

25
src/unix_main.c
View file

@ -50,6 +50,7 @@ static void print_help(char *n)
"\t-r <rom path>\t\tDefault 'rom.bin'\n"
"\t-W <rom dump path>\tDump ROM after patching\n"
"\t-d <disc path>\n"
"\t-w\t\t\tEnable persistent disc writes (default R/O)\n"
"\t-i\t\t\tDisassembled instruction trace\n", n);
}
@ -98,11 +99,12 @@ int main(int argc, char *argv[])
int ofd;
int ch;
int opt_disassemble = 0;
int opt_write = 0;
////////////////////////////////////////////////////////////////////////
// Args
while ((ch = getopt(argc, argv, "r:d:W:ih")) != -1) {
while ((ch = getopt(argc, argv, "r:d:W:ihw")) != -1) {
switch (ch) {
case 'r':
rom_filename = strdup(optarg);
@ -116,6 +118,10 @@ int main(int argc, char *argv[])
disc_filename = strdup(optarg);
break;
case 'w':
opt_write = 1;
break;
case 'W':
rom_dump_filename = strdup(optarg);
break;
@ -190,8 +196,8 @@ int main(int argc, char *argv[])
if (disc_filename) {
printf("Opening disc '%s'\n", disc_filename);
// FIXME: R/W, >1 disc
ofd = open(disc_filename, O_RDONLY);
// FIXME: >1 disc
ofd = open(disc_filename, opt_write ? O_RDWR : O_RDONLY);
if (ofd < 0) {
perror("Disc");
return 1;
@ -199,7 +205,16 @@ int main(int argc, char *argv[])
fstat(ofd, &sb);
size_t disc_size = sb.st_size;
disc_base = mmap(0, disc_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, ofd, 0);
/* Discs are always _writable_ from the perspective of
* the Mac, but by default data is a MAP_PRIVATE copy
* and is not synchronised to the backing file. If
* opt_write, we use MAP_SHARED and open the file RW,
* so writes persist to the disc image.
*/
disc_base = mmap(0, disc_size, PROT_READ | PROT_WRITE,
opt_write ? MAP_SHARED : MAP_PRIVATE,
ofd, 0);
if (disc_base == MAP_FAILED) {
printf("Can't mmap disc!\n");
return 1;
@ -207,7 +222,7 @@ int main(int argc, char *argv[])
printf("Disc mapped at %p, size %ld\n", (void *)disc_base, disc_size);
discs[0].base = disc_base;
discs[0].read_only = 1;
discs[0].read_only = 0; /* See above */
discs[0].size = disc_size;
}