From 0df3ef56fdeef9aaf413cbc98968fd0cf47aece1 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Thu, 25 Mar 2021 04:44:36 +1100 Subject: trs80: improved cmd quickloader --- src/mame/machine/trs80.cpp | 46 ++++++++++++++++++++++++------------------- src/mame/machine/trs80m3.cpp | 47 +++++++++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 40 deletions(-) diff --git a/src/mame/machine/trs80.cpp b/src/mame/machine/trs80.cpp index 898ff364550..8c03dccb633 100644 --- a/src/mame/machine/trs80.cpp +++ b/src/mame/machine/trs80.cpp @@ -418,43 +418,49 @@ QUICKLOAD_LOAD_MEMBER(trs80_state::quickload_cb) image.fread( &type, 1); image.fread( &length, 1); - length -= 2; - int block_length = length ? length : 256; - switch (type) { - case CMD_TYPE_OBJECT_CODE: + case CMD_TYPE_OBJECT_CODE: // 01 - block of data { - image.fread( &addr, 2); - uint16_t address = (addr[1] << 8) | addr[0]; - if (LOG) logerror("/CMD object code block: address %04x length %u\n", address, block_length); - ptr = program.get_write_ptr(address); - image.fread( ptr, block_length); + length -= 2; + u16 block_length = length ? length : 256; + image.fread( &addr, 2); + u16 address = (addr[1] << 8) | addr[0]; + if (LOG) logerror("/CMD object code block: address %04x length %u\n", address, block_length); + if (address < 0x4000) + { + image.seterror(IMAGE_ERROR_UNSPECIFIED, "Attempting to write outside of RAM"); + return image_init_result::FAIL; + } + ptr = program.get_write_ptr(address); + image.fread( ptr, block_length); } break; - case CMD_TYPE_TRANSFER_ADDRESS: + case CMD_TYPE_TRANSFER_ADDRESS: // 02 - go address { - image.fread( &addr, 2); - uint16_t address = (addr[1] << 8) | addr[0]; - if (LOG) logerror("/CMD transfer address %04x\n", address); - m_maincpu->set_state_int(Z80_PC, address); + image.fread( &addr, 2); + u16 address = (addr[1] << 8) | addr[0]; + if (LOG) logerror("/CMD transfer address %04x\n", address); + m_maincpu->set_state_int(Z80_PC, address); } - break; + return image_init_result::PASS; - case CMD_TYPE_LOAD_MODULE_HEADER: - image.fread( &data, block_length); + case CMD_TYPE_LOAD_MODULE_HEADER: // 05 - name + image.fread( &data, length); if (LOG) logerror("/CMD load module header '%s'\n", data); break; - case CMD_TYPE_COPYRIGHT_BLOCK: - image.fread( &data, block_length); + case CMD_TYPE_COPYRIGHT_BLOCK: // 1F - copyright info + image.fread( &data, length); if (LOG) logerror("/CMD copyright block '%s'\n", data); break; default: - image.fread( &data, block_length); + image.fread( &data, length); logerror("/CMD unsupported block type %u!\n", type); + image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported or invalid block type"); + return image_init_result::FAIL; } } diff --git a/src/mame/machine/trs80m3.cpp b/src/mame/machine/trs80m3.cpp index 957dae31c48..f46132b358b 100644 --- a/src/mame/machine/trs80m3.cpp +++ b/src/mame/machine/trs80m3.cpp @@ -656,43 +656,50 @@ QUICKLOAD_LOAD_MEMBER(trs80m3_state::quickload_cb) image.fread( &type, 1); image.fread( &length, 1); - length -= 2; - int block_length = length ? length : 256; - switch (type) { - case CMD_TYPE_OBJECT_CODE: + case CMD_TYPE_OBJECT_CODE: // 01 - block of data { - image.fread( &addr, 2); - uint16_t address = (addr[1] << 8) | addr[0]; - if (LOG) logerror("/CMD object code block: address %04x length %u\n", address, block_length); - ptr = program.get_write_ptr(address); - image.fread( ptr, block_length); + length -= 2; + u16 block_length = length ? length : 256; + image.fread( &addr, 2); + u16 address = (addr[1] << 8) | addr[0]; + if (LOG) logerror("/CMD object code block: address %04x length %u\n", address, block_length); + // Todo: the below only applies for non-ram + //if (address < 0x4000) + //{ + //image.seterror(IMAGE_ERROR_UNSPECIFIED, "Attempting to write outside of RAM"); + //return image_init_result::FAIL; + //} + ptr = program.get_write_ptr(address); + image.fread( ptr, block_length); } break; - case CMD_TYPE_TRANSFER_ADDRESS: + case CMD_TYPE_TRANSFER_ADDRESS: // 02 - go address { - image.fread( &addr, 2); - uint16_t address = (addr[1] << 8) | addr[0]; - if (LOG) logerror("/CMD transfer address %04x\n", address); - m_maincpu->set_state_int(Z80_PC, address); + image.fread( &addr, 2); + u16 address = (addr[1] << 8) | addr[0]; + if (LOG) logerror("/CMD transfer address %04x\n", address); + m_maincpu->set_state_int(Z80_PC, address); } - break; + return image_init_result::PASS; - case CMD_TYPE_LOAD_MODULE_HEADER: - image.fread( &data, block_length); + case CMD_TYPE_LOAD_MODULE_HEADER: // 05 - name + image.fread( &data, length); if (LOG) logerror("/CMD load module header '%s'\n", data); break; - case CMD_TYPE_COPYRIGHT_BLOCK: - image.fread( &data, block_length); + case CMD_TYPE_COPYRIGHT_BLOCK: // 1F - copyright info + image.fread( &data, length); if (LOG) logerror("/CMD copyright block '%s'\n", data); break; default: - image.fread( &data, block_length); + image.fread( &data, length); logerror("/CMD unsupported block type %u!\n", type); + image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported or invalid block type"); + return image_init_result::FAIL; } } -- cgit v1.2.3