folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ESP32 fixes

Browse source
This commit is contained in:
folkert van heusden 2022-03-15 21:48:36 +01:00
parent 30a69ce0a5
commit caf3aeda6b
3 changed files with 191 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

337
ESP32/main.ino
View file

@ -13,149 +13,152 @@ bus *b = new bus();
cpu *c = new cpu(b); cpu *c = new cpu(b);
tty *tty_ = nullptr; tty *tty_ = nullptr;
void loadbin(bus *const b, uint16_t base) uint16_t loadbin(bus *const b)
{ {
constexpr unsigned char ___tester_bin[] = { #define PROGRAM 1
0x01, 0x00, 0x8a, 0x07, 0x00, 0x02, 0xc6, 0x15, 0x00, 0x02, 0x77, 0x00,
0xb6, 0x05, 0xc0, 0x15, 0xcf, 0x03, 0xf7, 0x09, 0xe0, 0x05, 0xc1, 0x15, #if PROGRAM == 1
0x5d, 0x6b, 0x01, 0x8d, 0xa1, 0x00, 0xa2, 0x00, 0xa4, 0x00, 0xa8, 0x00, // xxd -i tester <-- raw, not the .bin!
0xc2, 0x8d, 0xc2, 0x45, 0xf0, 0x00, 0xc2, 0x8b, 0x01, 0x02, 0x87, 0x00, constexpr unsigned char tester[] = {
0x80, 0x10, 0xf7, 0x09, 0xde, 0x05, 0xc0, 0x15, 0xa0, 0x03, 0xf7, 0x09, 0xc6, 0x15, 0x00, 0x02, 0x77, 0x00, 0xb6, 0x05, 0xc0, 0x15, 0xcf, 0x03,
0xb8, 0x05, 0x87, 0x00, 0xa1, 0x00, 0xa2, 0x00, 0xa4, 0x00, 0xa8, 0x00, 0xf7, 0x09, 0xe0, 0x05, 0xc1, 0x15, 0x5d, 0x6b, 0x01, 0x8d, 0xa1, 0x00,
0x87, 0x00, 0xf7, 0x09, 0xf2, 0xff, 0xc1, 0x15, 0x00, 0x80, 0xc1, 0x8b, 0xa2, 0x00, 0xa4, 0x00, 0xa8, 0x00, 0xc2, 0x8d, 0xc2, 0x45, 0xf0, 0x00,
0x04, 0x03, 0xc2, 0x15, 0x01, 0x00, 0x77, 0x00, 0x2e, 0x01, 0xf7, 0x09, 0xc2, 0x8b, 0x01, 0x02, 0x87, 0x00, 0x80, 0x10, 0xf7, 0x09, 0xde, 0x05,
0xde, 0xff, 0xc1, 0x15, 0x80, 0x00, 0xc1, 0x8b, 0x04, 0x02, 0xc2, 0x15, 0xc0, 0x15, 0xa0, 0x03, 0xf7, 0x09, 0xb8, 0x05, 0x87, 0x00, 0xa1, 0x00,
0x02, 0x00, 0x77, 0x00, 0x1a, 0x01, 0xf7, 0x09, 0xca, 0xff, 0xc1, 0x15, 0xa2, 0x00, 0xa4, 0x00, 0xa8, 0x00, 0x87, 0x00, 0xf7, 0x09, 0xf2, 0xff,
0x7f, 0x00, 0x81, 0x8a, 0x04, 0x85, 0xc2, 0x15, 0x03, 0x00, 0x77, 0x00, 0xc1, 0x15, 0x00, 0x80, 0xc1, 0x8b, 0x04, 0x03, 0xc2, 0x15, 0x01, 0x00,
0x06, 0x01, 0xf7, 0x09, 0xb6, 0xff, 0xc1, 0x15, 0x80, 0xff, 0xc1, 0x8a, 0x77, 0x00, 0x2e, 0x01, 0xf7, 0x09, 0xde, 0xff, 0xc1, 0x15, 0x80, 0x00,
0x04, 0x85, 0xc2, 0x15, 0x04, 0x00, 0x77, 0x00, 0xf2, 0x00, 0xf7, 0x09, 0xc1, 0x8b, 0x04, 0x02, 0xc2, 0x15, 0x02, 0x00, 0x77, 0x00, 0x1a, 0x01,
0xa2, 0xff, 0xc1, 0x15, 0x7f, 0x00, 0x81, 0x8a, 0x04, 0x81, 0xc2, 0x15, 0xf7, 0x09, 0xca, 0xff, 0xc1, 0x15, 0x7f, 0x00, 0x81, 0x8a, 0x04, 0x85,
0x05, 0x00, 0x77, 0x00, 0xde, 0x00, 0xf7, 0x09, 0x8e, 0xff, 0xc1, 0x15, 0xc2, 0x15, 0x03, 0x00, 0x77, 0x00, 0x06, 0x01, 0xf7, 0x09, 0xb6, 0xff,
0x80, 0x00, 0xc1, 0x8a, 0x04, 0x80, 0xc2, 0x15, 0x06, 0x00, 0x77, 0x00, 0xc1, 0x15, 0x80, 0xff, 0xc1, 0x8a, 0x04, 0x85, 0xc2, 0x15, 0x04, 0x00,
0xca, 0x00, 0xf7, 0x09, 0x7a, 0xff, 0xc1, 0x15, 0x80, 0x00, 0xc1, 0x8c, 0x77, 0x00, 0xf2, 0x00, 0xf7, 0x09, 0xa2, 0xff, 0xc1, 0x15, 0x7f, 0x00,
0x04, 0x87, 0xc2, 0x15, 0x07, 0x00, 0x77, 0x00, 0xb6, 0x00, 0xf7, 0x09, 0x81, 0x8a, 0x04, 0x81, 0xc2, 0x15, 0x05, 0x00, 0x77, 0x00, 0xde, 0x00,
0x66, 0xff, 0xc1, 0x15, 0x40, 0x00, 0xc1, 0x8c, 0x04, 0x86, 0xc2, 0x15, 0xf7, 0x09, 0x8e, 0xff, 0xc1, 0x15, 0x80, 0x00, 0xc1, 0x8a, 0x04, 0x80,
0x08, 0x00, 0x77, 0x00, 0xa2, 0x00, 0xf7, 0x09, 0x52, 0xff, 0xc1, 0x15, 0xc2, 0x15, 0x06, 0x00, 0x77, 0x00, 0xca, 0x00, 0xf7, 0x09, 0x7a, 0xff,
0x00, 0x00, 0xc1, 0x0b, 0x04, 0x03, 0xc2, 0x15, 0x09, 0x00, 0x77, 0x00, 0xc1, 0x15, 0x80, 0x00, 0xc1, 0x8c, 0x04, 0x87, 0xc2, 0x15, 0x07, 0x00,
0x8e, 0x00, 0xf7, 0x09, 0x3e, 0xff, 0xc1, 0x15, 0x00, 0x80, 0xc1, 0x0b, 0x77, 0x00, 0xb6, 0x00, 0xf7, 0x09, 0x66, 0xff, 0xc1, 0x15, 0x40, 0x00,
0x04, 0x02, 0xc2, 0x15, 0x0a, 0x00, 0x77, 0x00, 0x7a, 0x00, 0xf7, 0x09, 0xc1, 0x8c, 0x04, 0x86, 0xc2, 0x15, 0x08, 0x00, 0x77, 0x00, 0xa2, 0x00,
0x2a, 0xff, 0xc1, 0x15, 0xff, 0x7f, 0x81, 0x0a, 0x04, 0x85, 0xc2, 0x15, 0xf7, 0x09, 0x52, 0xff, 0xc1, 0x15, 0x00, 0x00, 0xc1, 0x0b, 0x04, 0x03,
0x0b, 0x00, 0x77, 0x00, 0x66, 0x00, 0xf7, 0x09, 0x16, 0xff, 0xc1, 0x15, 0xc2, 0x15, 0x09, 0x00, 0x77, 0x00, 0x8e, 0x00, 0xf7, 0x09, 0x3e, 0xff,
0x00, 0x80, 0xc1, 0x0a, 0x04, 0x85, 0xc2, 0x15, 0x0c, 0x00, 0x77, 0x00, 0xc1, 0x15, 0x00, 0x80, 0xc1, 0x0b, 0x04, 0x02, 0xc2, 0x15, 0x0a, 0x00,
0x52, 0x00, 0xf7, 0x09, 0x02, 0xff, 0xc1, 0x15, 0xff, 0x7f, 0x81, 0x0a, 0x77, 0x00, 0x7a, 0x00, 0xf7, 0x09, 0x2a, 0xff, 0xc1, 0x15, 0xff, 0x7f,
0x04, 0x81, 0xc2, 0x15, 0x0d, 0x00, 0x77, 0x00, 0x3e, 0x00, 0xf7, 0x09, 0x81, 0x0a, 0x04, 0x85, 0xc2, 0x15, 0x0b, 0x00, 0x77, 0x00, 0x66, 0x00,
0xee, 0xfe, 0xc1, 0x15, 0x00, 0x80, 0xc1, 0x0a, 0x04, 0x80, 0xc2, 0x15, 0xf7, 0x09, 0x16, 0xff, 0xc1, 0x15, 0x00, 0x80, 0xc1, 0x0a, 0x04, 0x85,
0x0e, 0x00, 0x77, 0x00, 0x2a, 0x00, 0xf7, 0x09, 0xda, 0xfe, 0xc1, 0x15, 0xc2, 0x15, 0x0c, 0x00, 0x77, 0x00, 0x52, 0x00, 0xf7, 0x09, 0x02, 0xff,
0x00, 0x80, 0xc1, 0x0c, 0x04, 0x87, 0xc2, 0x15, 0x0f, 0x00, 0x77, 0x00, 0xc1, 0x15, 0xff, 0x7f, 0x81, 0x0a, 0x04, 0x81, 0xc2, 0x15, 0x0d, 0x00,
0x16, 0x00, 0xf7, 0x09, 0xc6, 0xfe, 0xc1, 0x15, 0x00, 0x40, 0xc1, 0x0c, 0x77, 0x00, 0x3e, 0x00, 0xf7, 0x09, 0xee, 0xfe, 0xc1, 0x15, 0x00, 0x80,
0x04, 0x86, 0xc2, 0x15, 0x10, 0x00, 0x77, 0x00, 0x02, 0x00, 0x87, 0x00, 0xc1, 0x0a, 0x04, 0x80, 0xc2, 0x15, 0x0e, 0x00, 0x77, 0x00, 0x2a, 0x00,
0xf7, 0x09, 0xb0, 0xfe, 0x80, 0x10, 0xf7, 0x09, 0x7e, 0x04, 0xc0, 0x8d, 0xf7, 0x09, 0xda, 0xfe, 0xc1, 0x15, 0x00, 0x80, 0xc1, 0x0c, 0x04, 0x87,
0xf7, 0x09, 0x78, 0x04, 0xc0, 0x15, 0xbc, 0x03, 0xf7, 0x09, 0x52, 0x04, 0xc2, 0x15, 0x0f, 0x00, 0x77, 0x00, 0x16, 0x00, 0xf7, 0x09, 0xc6, 0xfe,
0x87, 0x00, 0x4d, 0x46, 0x50, 0x53, 0x20, 0x2f, 0x20, 0x4d, 0x54, 0x50, 0xc1, 0x15, 0x00, 0x40, 0xc1, 0x0c, 0x04, 0x86, 0xc2, 0x15, 0x10, 0x00,
0x53, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x46, 0x77, 0x00, 0x02, 0x00, 0x87, 0x00, 0xf7, 0x09, 0xb0, 0xfe, 0x80, 0x10,
0x41, 0x49, 0x4c, 0x0d, 0x0a, 0x00, 0x50, 0x53, 0x57, 0x20, 0x74, 0x72, 0xf7, 0x09, 0x7e, 0x04, 0xc0, 0x8d, 0xf7, 0x09, 0x78, 0x04, 0xc0, 0x15,
0x69, 0x67, 0x67, 0x65, 0x72, 0x20, 0x66, 0x61, 0x69, 0x6c, 0x0d, 0x0a, 0xbc, 0x03, 0xf7, 0x09, 0x52, 0x04, 0x87, 0x00, 0x4d, 0x46, 0x50, 0x53,
0x00, 0x50, 0x53, 0x57, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x20, 0x2f, 0x20, 0x4d, 0x54, 0x50, 0x53, 0x20, 0x68, 0x61, 0x6e, 0x64,
0x67, 0x20, 0x74, 0x65, 0x73, 0x74, 0x0d, 0x0a, 0x00, 0x00, 0xc0, 0x15,
0xb4, 0x04, 0xf7, 0x09, 0x04, 0x04, 0xc0, 0x15, 0x01, 0x80, 0xc1, 0x15,
0x01, 0x01, 0xc0, 0x65, 0xeb, 0x03, 0x40, 0x0b, 0xc2, 0x8d, 0xc2, 0x45,
0xf0, 0xff, 0x80, 0x60, 0xc1, 0x0a, 0xc1, 0x0b, 0xf6, 0x02, 0xc0, 0x25,
0xf0, 0x72, 0x12, 0x02, 0xc0, 0x15, 0x01, 0x80, 0xc1, 0x15, 0x01, 0x01,
0xc0, 0x65, 0x0d, 0x00, 0x40, 0x8b, 0xc2, 0x8d, 0xc2, 0x45, 0xf0, 0xff,
0x80, 0x60, 0xc1, 0x0a, 0xc1, 0x0b, 0xf6, 0x02, 0xc0, 0x25, 0x0e, 0x90,
0x01, 0x02, 0x87, 0x00, 0xc0, 0x15, 0x3c, 0x04, 0xf7, 0x09, 0xb6, 0x03,
0x87, 0x00, 0x41, 0x44, 0x43, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69,
0x6e, 0x67, 0x20, 0x46, 0x41, 0x49, 0x4c, 0x0d, 0x0a, 0x00, 0xc0, 0x15,
0x01, 0x80, 0xc1, 0x15, 0x01, 0x01, 0xc0, 0xe5, 0xeb, 0x03, 0x80, 0x0b,
0xc2, 0x8d, 0xc2, 0x45, 0xf0, 0xff, 0x80, 0xe0, 0xc1, 0x0a, 0xc1, 0x0b,
0xf6, 0x02, 0xc0, 0x25, 0x0a, 0x8d, 0x12, 0x02, 0xc0, 0x15, 0x01, 0x80,
0xc1, 0x15, 0x01, 0x01, 0xc0, 0xe5, 0x0d, 0x00, 0x80, 0x8b, 0xc2, 0x8d,
0xc2, 0x45, 0xf0, 0xff, 0x80, 0xe0, 0xc1, 0x0a, 0xc1, 0x0b, 0xf6, 0x02,
0xc0, 0x25, 0xec, 0x6f, 0x01, 0x02, 0x87, 0x00, 0xc0, 0x15, 0xa0, 0x04,
0xf7, 0x09, 0x52, 0x03, 0x87, 0x00, 0x53, 0x42, 0x43, 0x20, 0x68, 0x61,
0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x46, 0x41, 0x49, 0x4c, 0x0d,
0x0a, 0x00, 0x41, 0x44, 0x43, 0x2f, 0x53, 0x42, 0x43, 0x20, 0x74, 0x65,
0x73, 0x74, 0x0d, 0x0a, 0x00, 0x00, 0xc0, 0x15, 0x3d, 0x06, 0xf7, 0x09,
0x24, 0x03, 0xc0, 0x15, 0x55, 0xaa, 0xc0, 0x25, 0x55, 0xaa, 0x04, 0x03,
0xc0, 0x15, 0x01, 0x00, 0x77, 0x00, 0x36, 0x01, 0xc0, 0x95, 0xf0, 0x00,
0xc0, 0x25, 0xf0, 0xff, 0x04, 0x03, 0xc0, 0x15, 0x02, 0x00, 0x77, 0x00,
0x24, 0x01, 0xc0, 0x95, 0x7f, 0x00, 0xc0, 0x25, 0x7f, 0x00, 0x04, 0x03,
0xc0, 0x15, 0x03, 0x00, 0x77, 0x00, 0x12, 0x01, 0xc0, 0x15, 0x52, 0x06,
0x01, 0x12, 0xc1, 0x25, 0xd2, 0x04, 0x04, 0x03, 0xc0, 0x15, 0x04, 0x00,
0x77, 0x00, 0xfe, 0x00, 0xc0, 0x15, 0x52, 0x06, 0x01, 0x92, 0xc1, 0x25,
0xd2, 0xff, 0x04, 0x03, 0xc0, 0x15, 0x05, 0x00, 0x77, 0x00, 0xea, 0x00,
0xc0, 0x15, 0x52, 0x06, 0x01, 0x92, 0xc1, 0x25, 0xd2, 0x04, 0x04, 0x02,
0xc0, 0x15, 0x06, 0x00, 0x77, 0x00, 0xd6, 0x00, 0xc0, 0x15, 0x52, 0x06,
0x01, 0x14, 0xc1, 0x25, 0xd2, 0x04, 0x04, 0x03, 0xc0, 0x15, 0x07, 0x00,
0x77, 0x00, 0xc2, 0x00, 0xc2, 0x15, 0x54, 0x06, 0x02, 0x20, 0x04, 0x03,
0xc0, 0x15, 0x08, 0x00, 0x77, 0x00, 0xb2, 0x00, 0xc0, 0x15, 0x52, 0x06,
0x01, 0x94, 0xc1, 0xa5, 0xd2, 0x00, 0x04, 0x03, 0xc0, 0x15, 0x09, 0x00,
0x77, 0x00, 0x9e, 0x00, 0xc0, 0x15, 0x52, 0x06, 0x00, 0x14, 0xc0, 0x25,
0xd2, 0x04, 0x04, 0x03, 0xc0, 0x15, 0x0a, 0x00, 0x77, 0x00, 0x8a, 0x00,
0xc0, 0x1d, 0xc8, 0x00, 0xc8, 0x25, 0xd2, 0x04, 0x04, 0x03, 0xc0, 0x15,
0x0c, 0x00, 0x77, 0x00, 0x78, 0x00, 0x01, 0x16, 0xc2, 0x15, 0x54, 0x06,
0x02, 0x20, 0x04, 0x03, 0xc0, 0x15, 0x0d, 0x00, 0x77, 0x00, 0x66, 0x00,
0xc0, 0x15, 0x52, 0x06, 0x01, 0x18, 0xc1, 0x25, 0x67, 0x11, 0x04, 0x03,
0xc0, 0x15, 0x0e, 0x00, 0x77, 0x00, 0x52, 0x00, 0xc2, 0x15, 0x50, 0x06,
0x02, 0x20, 0x04, 0x03, 0xc0, 0x15, 0x0f, 0x00, 0x77, 0x00, 0x42, 0x00,
0xc0, 0x15, 0x52, 0x06, 0x01, 0x98, 0xc1, 0xa5, 0x11, 0x00, 0x04, 0x03,
0xc0, 0x15, 0x10, 0x00, 0x77, 0x00, 0x2e, 0x00, 0xc0, 0x15, 0x52, 0x06,
0x01, 0x1c, 0x02, 0x00, 0xc1, 0x25, 0xe1, 0x10, 0x04, 0x03, 0xc0, 0x15,
0x11, 0x00, 0x77, 0x00, 0x18, 0x00, 0xc0, 0x15, 0x56, 0x06, 0x01, 0x1e,
0x02, 0x00, 0xc1, 0x25, 0xe1, 0x10, 0x04, 0x03, 0xc0, 0x15, 0x12, 0x00,
0x77, 0x00, 0x02, 0x00, 0x87, 0x00, 0xf7, 0x09, 0xf6, 0x01, 0xc0, 0x15,
0x22, 0x06, 0xf7, 0x09, 0xd0, 0x01, 0x87, 0x00, 0x61, 0x64, 0x64, 0x72,
0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c,
0x69, 0x6e, 0x67, 0x20, 0x46, 0x41, 0x49, 0x4c, 0x0d, 0x0a, 0x00, 0x61,
0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x65,
0x73, 0x74, 0x73, 0x0d, 0x0a, 0x00, 0x67, 0x11, 0xd2, 0x04, 0xe1, 0x10,
0x52, 0x06, 0x54, 0x06, 0xf7, 0x09, 0x66, 0xfe, 0x87, 0x00, 0xc0, 0x15,
0xce, 0x06, 0xf7, 0x09, 0x88, 0x01, 0xc0, 0x15, 0x03, 0x00, 0x00, 0x8d,
0xc0, 0x15, 0x00, 0x00, 0xc1, 0x8d, 0xc1, 0x45, 0xf0, 0xff, 0xc1, 0x25,
0x05, 0x00, 0x04, 0x03, 0xc0, 0x15, 0x01, 0x00, 0x77, 0x00, 0x20, 0x00,
0xc0, 0x15, 0x00, 0x00, 0x00, 0x8d, 0xc0, 0x15, 0x00, 0x80, 0xc1, 0x8d,
0xc1, 0x45, 0xf0, 0xff, 0xc1, 0xa5, 0x08, 0x00, 0x04, 0x03, 0xc0, 0x15,
0x02, 0x00, 0x77, 0x00, 0x02, 0x00, 0x87, 0x00, 0xf7, 0x09, 0x64, 0x01,
0x40, 0x10, 0xf7, 0x09, 0x5e, 0x01, 0xc0, 0x15, 0xba, 0x06, 0xf7, 0x09,
0x38, 0x01, 0x87, 0x00, 0x4d, 0x4f, 0x56, 0x20, 0x68, 0x61, 0x6e, 0x64,
0x6c, 0x69, 0x6e, 0x67, 0x20, 0x46, 0x41, 0x49, 0x4c, 0x0d, 0x0a, 0x00, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x46, 0x41, 0x49, 0x4c, 0x0d, 0x0a, 0x00,
0x4d, 0x4f, 0x56, 0x20, 0x66, 0x6c, 0x61, 0x67, 0x20, 0x74, 0x65, 0x73, 0x50, 0x53, 0x57, 0x20, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x20,
0x74, 0x0d, 0x0a, 0x00, 0xc0, 0x15, 0x50, 0x07, 0xf7, 0x09, 0x0a, 0x01, 0x66, 0x61, 0x69, 0x6c, 0x0d, 0x0a, 0x00, 0x50, 0x53, 0x57, 0x20, 0x68,
0xc0, 0x15, 0x0f, 0x00, 0x00, 0x8d, 0xc1, 0x15, 0x00, 0x00, 0xc1, 0x0b, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x65, 0x73, 0x74,
0xc2, 0x8d, 0xc2, 0x45, 0xf0, 0xff, 0xc2, 0x25, 0x04, 0x00, 0x04, 0x03, 0x0d, 0x0a, 0x00, 0x00, 0xc0, 0x15, 0xb4, 0x04, 0xf7, 0x09, 0x04, 0x04,
0xc0, 0x15, 0x01, 0x00, 0x77, 0x00, 0x22, 0x00, 0xc0, 0x15, 0x0f, 0x00, 0xc0, 0x15, 0x01, 0x80, 0xc1, 0x15, 0x01, 0x01, 0xc0, 0x65, 0xeb, 0x03,
0x00, 0x8d, 0xc1, 0x15, 0x00, 0x80, 0xc1, 0x0b, 0xc2, 0x8d, 0xc2, 0x45, 0x40, 0x0b, 0xc2, 0x8d, 0xc2, 0x45, 0xf0, 0xff, 0x80, 0x60, 0xc1, 0x0a,
0xf0, 0xff, 0xc2, 0x25, 0x08, 0x00, 0x04, 0x03, 0xc0, 0x15, 0x02, 0x00, 0xc1, 0x0b, 0xf6, 0x02, 0xc0, 0x25, 0xf0, 0x72, 0x12, 0x02, 0xc0, 0x15,
0x77, 0x00, 0x02, 0x00, 0x87, 0x00, 0xf7, 0x09, 0xe2, 0x00, 0x80, 0x10, 0x01, 0x80, 0xc1, 0x15, 0x01, 0x01, 0xc0, 0x65, 0x0d, 0x00, 0x40, 0x8b,
0xf7, 0x09, 0xdc, 0x00, 0xc0, 0x15, 0x3c, 0x07, 0xf7, 0x09, 0xb6, 0x00, 0xc2, 0x8d, 0xc2, 0x45, 0xf0, 0xff, 0x80, 0x60, 0xc1, 0x0a, 0xc1, 0x0b,
0x87, 0x00, 0x54, 0x53, 0x54, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0xf6, 0x02, 0xc0, 0x25, 0x0e, 0x90, 0x01, 0x02, 0x87, 0x00, 0xc0, 0x15,
0x6e, 0x67, 0x20, 0x46, 0x41, 0x49, 0x4c, 0x0d, 0x0a, 0x00, 0x54, 0x53, 0x3c, 0x04, 0xf7, 0x09, 0xb6, 0x03, 0x87, 0x00, 0x41, 0x44, 0x43, 0x20,
0x54, 0x20, 0x74, 0x65, 0x73, 0x74, 0x0d, 0x0a, 0x00, 0x00, 0xc0, 0x15, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x46, 0x41, 0x49,
0xb2, 0x07, 0xf7, 0x09, 0x8c, 0x00, 0xc0, 0x15, 0x08, 0x00, 0x00, 0x8d, 0x4c, 0x0d, 0x0a, 0x00, 0xc0, 0x15, 0x01, 0x80, 0xc1, 0x15, 0x01, 0x01,
0x02, 0x04, 0x77, 0x00, 0x08, 0x00, 0xc0, 0x15, 0x01, 0x00, 0x77, 0x00, 0xc0, 0xe5, 0xeb, 0x03, 0x80, 0x0b, 0xc2, 0x8d, 0xc2, 0x45, 0xf0, 0xff,
0x12, 0x00, 0xc0, 0x15, 0x0a, 0x00, 0x00, 0x8d, 0x04, 0x04, 0xc0, 0x15, 0x80, 0xe0, 0xc1, 0x0a, 0xc1, 0x0b, 0xf6, 0x02, 0xc0, 0x25, 0x0a, 0x8d,
0x02, 0x00, 0x77, 0x00, 0x02, 0x00, 0x87, 0x00, 0xf7, 0x09, 0x80, 0x00, 0x12, 0x02, 0xc0, 0x15, 0x01, 0x80, 0xc1, 0x15, 0x01, 0x01, 0xc0, 0xe5,
0x80, 0x10, 0xf7, 0x09, 0x7a, 0x00, 0xc0, 0x15, 0x9e, 0x07, 0xf7, 0x09, 0x0d, 0x00, 0x80, 0x8b, 0xc2, 0x8d, 0xc2, 0x45, 0xf0, 0xff, 0x80, 0xe0,
0x54, 0x00, 0x87, 0x00, 0x42, 0x47, 0x45, 0x20, 0x68, 0x61, 0x6e, 0x64, 0xc1, 0x0a, 0xc1, 0x0b, 0xf6, 0x02, 0xc0, 0x25, 0xec, 0x6f, 0x01, 0x02,
0x6c, 0x69, 0x6e, 0x67, 0x20, 0x46, 0x41, 0x49, 0x4c, 0x0d, 0x0a, 0x00, 0x87, 0x00, 0xc0, 0x15, 0xa0, 0x04, 0xf7, 0x09, 0x52, 0x03, 0x87, 0x00,
0x42, 0x47, 0x45, 0x20, 0x74, 0x65, 0x73, 0x74, 0x0d, 0x0a, 0x00, 0x00, 0x53, 0x42, 0x43, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67,
0xc0, 0x15, 0x5e, 0x08, 0xf7, 0x09, 0x2a, 0x00, 0xf7, 0x09, 0x3e, 0xfa, 0x20, 0x46, 0x41, 0x49, 0x4c, 0x0d, 0x0a, 0x00, 0x41, 0x44, 0x43, 0x2f,
0xf7, 0x09, 0x76, 0xfa, 0xf7, 0x09, 0x12, 0xfc, 0xf7, 0x09, 0x7a, 0xfc, 0x53, 0x42, 0x43, 0x20, 0x74, 0x65, 0x73, 0x74, 0x0d, 0x0a, 0x00, 0x00,
0xf7, 0x09, 0x80, 0xfe, 0xf7, 0x09, 0x82, 0xfe, 0xf7, 0x09, 0xfc, 0xfe, 0xc0, 0x15, 0x3d, 0x06, 0xf7, 0x09, 0x24, 0x03, 0xc0, 0x15, 0x55, 0xaa,
0xf7, 0x09, 0x76, 0xff, 0xc0, 0x15, 0x72, 0x08, 0xf7, 0x09, 0x02, 0x00, 0xc0, 0x25, 0x55, 0xaa, 0x04, 0x03, 0xc0, 0x15, 0x01, 0x00, 0x77, 0x00,
0x07, 0x89, 0x26, 0x10, 0xe6, 0x8d, 0xc8, 0x8b, 0x08, 0x03, 0x1f, 0x92, 0x36, 0x01, 0xc0, 0x95, 0xf0, 0x00, 0xc0, 0x25, 0xf0, 0xff, 0x04, 0x03,
0x76, 0xff, 0xdf, 0x8b, 0x74, 0xff, 0xfd, 0x80, 0x80, 0x0a, 0x77, 0x00, 0xc0, 0x15, 0x02, 0x00, 0x77, 0x00, 0x24, 0x01, 0xc0, 0x95, 0x7f, 0x00,
0xec, 0xff, 0x16, 0x8d, 0x80, 0x15, 0x87, 0x00, 0xe6, 0x8d, 0x26, 0x10, 0xc0, 0x25, 0x7f, 0x00, 0x04, 0x03, 0xc0, 0x15, 0x03, 0x00, 0x77, 0x00,
0x66, 0x10, 0xc1, 0x15, 0x10, 0x00, 0xc0, 0x0c, 0x07, 0x87, 0xdf, 0x8b, 0x12, 0x01, 0xc0, 0x15, 0x52, 0x06, 0x01, 0x12, 0xc1, 0x25, 0xd2, 0x04,
0x74, 0xff, 0xfd, 0x80, 0xdf, 0x95, 0x30, 0x00, 0x76, 0xff, 0x07, 0x01, 0x04, 0x03, 0xc0, 0x15, 0x04, 0x00, 0x77, 0x00, 0xfe, 0x00, 0xc0, 0x15,
0xdf, 0x8b, 0x74, 0xff, 0xfd, 0x80, 0xdf, 0x95, 0x31, 0x00, 0x76, 0xff, 0x52, 0x06, 0x01, 0x92, 0xc1, 0x25, 0xd2, 0xff, 0x04, 0x03, 0xc0, 0x15,
0x00, 0x01, 0xc1, 0x0a, 0xc1, 0x0b, 0xed, 0x02, 0xdf, 0x8b, 0x74, 0xff, 0x05, 0x00, 0x77, 0x00, 0xea, 0x00, 0xc0, 0x15, 0x52, 0x06, 0x01, 0x92,
0xfd, 0x80, 0xdf, 0x95, 0x20, 0x00, 0x76, 0xff, 0xdf, 0x8b, 0x74, 0xff, 0xc1, 0x25, 0xd2, 0x04, 0x04, 0x02, 0xc0, 0x15, 0x06, 0x00, 0x77, 0x00,
0xfd, 0x80, 0xdf, 0x95, 0x20, 0x00, 0x76, 0xff, 0x81, 0x15, 0x80, 0x15, 0xd6, 0x00, 0xc0, 0x15, 0x52, 0x06, 0x01, 0x14, 0xc1, 0x25, 0xd2, 0x04,
0x16, 0x8d, 0x87, 0x00, 0x74, 0x65, 0x73, 0x74, 0x65, 0x72, 0x20, 0x72, 0x04, 0x03, 0xc0, 0x15, 0x07, 0x00, 0x77, 0x00, 0xc2, 0x00, 0xc2, 0x15,
0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x2e, 0x2e, 0x0d, 0x0a, 0x00, 0x54, 0x06, 0x02, 0x20, 0x04, 0x03, 0xc0, 0x15, 0x08, 0x00, 0x77, 0x00,
0x74, 0x65, 0x73, 0x74, 0x65, 0x72, 0x20, 0x66, 0x69, 0x6e, 0x69, 0x73, 0xb2, 0x00, 0xc0, 0x15, 0x52, 0x06, 0x01, 0x94, 0xc1, 0xa5, 0xd2, 0x00,
0x68, 0x65, 0x64, 0x0d, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x03, 0xc0, 0x15, 0x09, 0x00, 0x77, 0x00, 0x9e, 0x00, 0xc0, 0x15,
0x52, 0x06, 0x00, 0x14, 0xc0, 0x25, 0xd2, 0x04, 0x04, 0x03, 0xc0, 0x15,
0x0a, 0x00, 0x77, 0x00, 0x8a, 0x00, 0xc0, 0x1d, 0xc8, 0x00, 0xc8, 0x25,
0xd2, 0x04, 0x04, 0x03, 0xc0, 0x15, 0x0c, 0x00, 0x77, 0x00, 0x78, 0x00,
0x01, 0x16, 0xc2, 0x15, 0x54, 0x06, 0x02, 0x20, 0x04, 0x03, 0xc0, 0x15,
0x0d, 0x00, 0x77, 0x00, 0x66, 0x00, 0xc0, 0x15, 0x52, 0x06, 0x01, 0x18,
0xc1, 0x25, 0x67, 0x11, 0x04, 0x03, 0xc0, 0x15, 0x0e, 0x00, 0x77, 0x00,
0x52, 0x00, 0xc2, 0x15, 0x50, 0x06, 0x02, 0x20, 0x04, 0x03, 0xc0, 0x15,
0x0f, 0x00, 0x77, 0x00, 0x42, 0x00, 0xc0, 0x15, 0x52, 0x06, 0x01, 0x98,
0xc1, 0xa5, 0x11, 0x00, 0x04, 0x03, 0xc0, 0x15, 0x10, 0x00, 0x77, 0x00,
0x2e, 0x00, 0xc0, 0x15, 0x52, 0x06, 0x01, 0x1c, 0x02, 0x00, 0xc1, 0x25,
0xe1, 0x10, 0x04, 0x03, 0xc0, 0x15, 0x11, 0x00, 0x77, 0x00, 0x18, 0x00,
0xc0, 0x15, 0x56, 0x06, 0x01, 0x1e, 0x02, 0x00, 0xc1, 0x25, 0xe1, 0x10,
0x04, 0x03, 0xc0, 0x15, 0x12, 0x00, 0x77, 0x00, 0x02, 0x00, 0x87, 0x00,
0xf7, 0x09, 0xf6, 0x01, 0xc0, 0x15, 0x22, 0x06, 0xf7, 0x09, 0xd0, 0x01,
0x87, 0x00, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6e, 0x67,
0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x46, 0x41,
0x49, 0x4c, 0x0d, 0x0a, 0x00, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
0x69, 0x6e, 0x67, 0x20, 0x74, 0x65, 0x73, 0x74, 0x73, 0x0d, 0x0a, 0x00,
0x67, 0x11, 0xd2, 0x04, 0xe1, 0x10, 0x52, 0x06, 0x54, 0x06, 0xf7, 0x09,
0x66, 0xfe, 0x87, 0x00, 0xc0, 0x15, 0xce, 0x06, 0xf7, 0x09, 0x88, 0x01,
0xc0, 0x15, 0x03, 0x00, 0x00, 0x8d, 0xc0, 0x15, 0x00, 0x00, 0xc1, 0x8d,
0xc1, 0x45, 0xf0, 0xff, 0xc1, 0x25, 0x05, 0x00, 0x04, 0x03, 0xc0, 0x15,
0x01, 0x00, 0x77, 0x00, 0x20, 0x00, 0xc0, 0x15, 0x00, 0x00, 0x00, 0x8d,
0xc0, 0x15, 0x00, 0x80, 0xc1, 0x8d, 0xc1, 0x45, 0xf0, 0xff, 0xc1, 0xa5,
0x08, 0x00, 0x04, 0x03, 0xc0, 0x15, 0x02, 0x00, 0x77, 0x00, 0x02, 0x00,
0x87, 0x00, 0xf7, 0x09, 0x64, 0x01, 0x40, 0x10, 0xf7, 0x09, 0x5e, 0x01,
0xc0, 0x15, 0xba, 0x06, 0xf7, 0x09, 0x38, 0x01, 0x87, 0x00, 0x4d, 0x4f,
0x56, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x46,
0x41, 0x49, 0x4c, 0x0d, 0x0a, 0x00, 0x4d, 0x4f, 0x56, 0x20, 0x66, 0x6c,
0x61, 0x67, 0x20, 0x74, 0x65, 0x73, 0x74, 0x0d, 0x0a, 0x00, 0xc0, 0x15,
0x50, 0x07, 0xf7, 0x09, 0x0a, 0x01, 0xc0, 0x15, 0x0f, 0x00, 0x00, 0x8d,
0xc1, 0x15, 0x00, 0x00, 0xc1, 0x0b, 0xc2, 0x8d, 0xc2, 0x45, 0xf0, 0xff,
0xc2, 0x25, 0x04, 0x00, 0x04, 0x03, 0xc0, 0x15, 0x01, 0x00, 0x77, 0x00,
0x22, 0x00, 0xc0, 0x15, 0x0f, 0x00, 0x00, 0x8d, 0xc1, 0x15, 0x00, 0x80,
0xc1, 0x0b, 0xc2, 0x8d, 0xc2, 0x45, 0xf0, 0xff, 0xc2, 0x25, 0x08, 0x00,
0x04, 0x03, 0xc0, 0x15, 0x02, 0x00, 0x77, 0x00, 0x02, 0x00, 0x87, 0x00,
0xf7, 0x09, 0xe2, 0x00, 0x80, 0x10, 0xf7, 0x09, 0xdc, 0x00, 0xc0, 0x15,
0x3c, 0x07, 0xf7, 0x09, 0xb6, 0x00, 0x87, 0x00, 0x54, 0x53, 0x54, 0x20,
0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x46, 0x41, 0x49,
0x4c, 0x0d, 0x0a, 0x00, 0x54, 0x53, 0x54, 0x20, 0x74, 0x65, 0x73, 0x74,
0x0d, 0x0a, 0x00, 0x00, 0xc0, 0x15, 0xb2, 0x07, 0xf7, 0x09, 0x8c, 0x00,
0xc0, 0x15, 0x08, 0x00, 0x00, 0x8d, 0x02, 0x04, 0x77, 0x00, 0x08, 0x00,
0xc0, 0x15, 0x01, 0x00, 0x77, 0x00, 0x12, 0x00, 0xc0, 0x15, 0x0a, 0x00,
0x00, 0x8d, 0x04, 0x04, 0xc0, 0x15, 0x02, 0x00, 0x77, 0x00, 0x02, 0x00,
0x87, 0x00, 0xf7, 0x09, 0x80, 0x00, 0x80, 0x10, 0xf7, 0x09, 0x7a, 0x00,
0xc0, 0x15, 0x9e, 0x07, 0xf7, 0x09, 0x54, 0x00, 0x87, 0x00, 0x42, 0x47,
0x45, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x46,
0x41, 0x49, 0x4c, 0x0d, 0x0a, 0x00, 0x42, 0x47, 0x45, 0x20, 0x74, 0x65,
0x73, 0x74, 0x0d, 0x0a, 0x00, 0x00, 0xc0, 0x15, 0x5e, 0x08, 0xf7, 0x09,
0x2a, 0x00, 0xf7, 0x09, 0x3e, 0xfa, 0xf7, 0x09, 0x76, 0xfa, 0xf7, 0x09,
0x12, 0xfc, 0xf7, 0x09, 0x7a, 0xfc, 0xf7, 0x09, 0x80, 0xfe, 0xf7, 0x09,
0x82, 0xfe, 0xf7, 0x09, 0xfc, 0xfe, 0xf7, 0x09, 0x76, 0xff, 0xc0, 0x15,
0x72, 0x08, 0xf7, 0x09, 0x02, 0x00, 0x07, 0x89, 0x26, 0x10, 0xe6, 0x8d,
0xc8, 0x8b, 0x08, 0x03, 0x1f, 0x92, 0x76, 0xff, 0xdf, 0x8b, 0x74, 0xff,
0xfd, 0x80, 0x80, 0x0a, 0x77, 0x00, 0xec, 0xff, 0x16, 0x8d, 0x80, 0x15,
0x87, 0x00, 0xe6, 0x8d, 0x26, 0x10, 0x66, 0x10, 0xc1, 0x15, 0x10, 0x00,
0xc0, 0x0c, 0x07, 0x87, 0xdf, 0x8b, 0x74, 0xff, 0xfd, 0x80, 0xdf, 0x95,
0x30, 0x00, 0x76, 0xff, 0x07, 0x01, 0xdf, 0x8b, 0x74, 0xff, 0xfd, 0x80,
0xdf, 0x95, 0x31, 0x00, 0x76, 0xff, 0x00, 0x01, 0xc1, 0x0a, 0xc1, 0x0b,
0xed, 0x02, 0xdf, 0x8b, 0x74, 0xff, 0xfd, 0x80, 0xdf, 0x95, 0x20, 0x00,
0x76, 0xff, 0xdf, 0x8b, 0x74, 0xff, 0xfd, 0x80, 0xdf, 0x95, 0x20, 0x00,
0x76, 0xff, 0x81, 0x15, 0x80, 0x15, 0x16, 0x8d, 0x87, 0x00, 0x74, 0x65,
0x73, 0x74, 0x65, 0x72, 0x20, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67,
0x2e, 0x2e, 0x2e, 0x0d, 0x0a, 0x00, 0x74, 0x65, 0x73, 0x74, 0x65, 0x72,
0x20, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x0d, 0x0a, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@ -176,16 +179,41 @@ void loadbin(bus *const b, uint16_t base)
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdf, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x06, 0x00, 0x00, 0x02 0x00, 0x00, 0x00, 0x00
}; };
constexpr unsigned int tester_len = 1924;
unsigned int ___tester_bin_len = 1937; uint16_t base = 512;
uint16_t exec = 512;
const unsigned char *code = tester;
unsigned int code_len = tester_len;
#endif
for(int i=0; i<___tester_bin_len; i++) #if PROGRAM == 2
b -> writeByte(base++, ___tester_bin[i]); constexpr unsigned char test2[] = {
0xc6, 0x15, 0x00, 0x02, 0xc0, 0x15, 0x24, 0x02, 0xdf, 0x09, 0x0e, 0x02,
0x07, 0x89, 0x66, 0x10, 0x05, 0x01, 0xdf, 0x8b, 0x74, 0xff, 0xfd, 0x03,
0x5f, 0x90, 0x76, 0xff, 0x01, 0x94, 0xf9, 0x02, 0x81, 0x15, 0x87, 0x00,
0x74, 0x68, 0x65, 0x20, 0x71, 0x75, 0x69, 0x63, 0x6b, 0x20, 0x62, 0x72,
0x6f, 0x77, 0x6e, 0x20, 0x2e, 0x2e, 0x2e, 0x00
};
constexpr unsigned int test2_len = 56;
uint16_t base = 512;
uint16_t exec = 512;
const unsigned char *code = test2;
unsigned int code_len = test2_len;
#endif
for(int i=0; i<code_len; i++)
b -> writeByte(base++, code[i]);
return exec;
} }
uint16_t exec_addr = 0;
void setup() { void setup() {
Serial.begin(115200); Serial.begin(115200);
@ -203,15 +231,15 @@ void setup() {
c->setEmulateMFPT(true); c->setEmulateMFPT(true);
Serial.println(F("Load program"));
loadbin(b, 01000);
c->setRegister(7, 01000);
Serial.println(F("Init TTY")); Serial.println(F("Init TTY"));
tty_ = new tty(false); tty_ = new tty(false);
Serial.println(F("Connect TTY to bus")); Serial.println(F("Connect TTY to bus"));
b->add_tty(tty_); b->add_tty(tty_);
Serial.println(F("Load program"));
exec_addr = loadbin(b);
c->setRegister(7, exec_addr);
Serial.println(F("Press <enter> to start")); Serial.println(F("Press <enter> to start"));
for(;;) { for(;;) {
@ -224,12 +252,17 @@ void setup() {
delay(1); delay(1);
} }
Serial.println(F("Emulation go!")); Serial.println(F("Emulation starting!"));
} }
void loop() { void loop() {
if (c->step()) { if (c->step()) {
c->setRegister(7, 01000); Serial.println(F(""));
Serial.println(F(" *** EMULATION STOPPED *** "));
delay(1000);
Serial.println(F(" *** EMULATION RESTARTING *** "));
c->setRegister(7, exec_addr);
c->resetHalt(); c->resetHalt();
} }
} }

2
cpu.cpp
View file

@ -1103,7 +1103,7 @@ bool cpu::misc_operations(const uint16_t instr)
case 0b0000000000000000: // HALT case 0b0000000000000000: // HALT
D(fprintf(stderr, "HALT\n");) D(fprintf(stderr, "HALT\n");)
// pretend HALT is not executed, proceed // pretend HALT is not executed, proceed
//haltFlag = true; haltFlag = true;
return true; return true;
case 0b0000000000000001: // WAIT case 0b0000000000000001: // WAIT

10
rk05.cpp
View file

@ -120,7 +120,7 @@ void rk05::writeWord(const uint16_t addr, uint16_t v)
else if (func == 1) { // write else if (func == 1) { // write
D(fprintf(stderr, "RK05 writing %zo bytes to offset %o (%d dec)\n", reclen, diskoffb, diskoffb);) D(fprintf(stderr, "RK05 writing %zo bytes to offset %o (%d dec)\n", reclen, diskoffb, diskoffb);)
int p = reclen; // FIXME uint32_t p = reclen; // FIXME
for(size_t i=0; i<reclen; i++) for(size_t i=0; i<reclen; i++)
xfer_buffer[i] = b -> readByte(memoff + i); xfer_buffer[i] = b -> readByte(memoff + i);
@ -150,15 +150,15 @@ void rk05::writeWord(const uint16_t addr, uint16_t v)
if (fseek(fh, diskoffb, SEEK_SET) == -1) if (fseek(fh, diskoffb, SEEK_SET) == -1)
fprintf(stderr, "RK05 seek error %s\n", strerror(errno)); fprintf(stderr, "RK05 seek error %s\n", strerror(errno));
int temp = reclen; uint32_t temp = reclen;
int p = memoff; uint32_t p = memoff;
while(temp > 0) { while(temp > 0) {
int cur = std::min(int(sizeof xfer_buffer), temp); uint32_t cur = std::min(uint32_t(sizeof xfer_buffer), temp);
if (fread(xfer_buffer, 1, cur, fh) != size_t(cur)) if (fread(xfer_buffer, 1, cur, fh) != size_t(cur))
D(fprintf(stderr, "RK05 fread error: %s\n", strerror(errno));) D(fprintf(stderr, "RK05 fread error: %s\n", strerror(errno));)
for(int i=0; i<cur; i++) { for(uint32_t i=0; i<cur; i++) {
if (p < 0160000) if (p < 0160000)
b -> writeByte(p, xfer_buffer[i]); b -> writeByte(p, xfer_buffer[i]);
p++; p++;