JailDoctor/z80
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

- [NEW] Implementada decodificació parcial dels ports, tal i com ho fa el spectrum

Browse Source
This commit is contained in:
Raimon Zamora
2025-07-24 08:37:20 +02:00
parent 0df17bf4c9
commit 42da652aef
5 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main.cpp
View File

@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
z80dis::loadSymbols(); z80dis::loadSymbols();
z80::reset(); z80::reset();
z80::connect_port(0xfe, zx_ula::port_in, zx_ula::port_out); z80::connect_port(0xfe, 0x0001, zx_ula::port_in, zx_ula::port_out);
SDL_Init(SDL_INIT_EVERYTHING); SDL_Init(SDL_INIT_EVERYTHING);
z80debug::init(); z80debug::init();

62
z80.cpp
View File

@@ -3,23 +3,27 @@
#include "zx_mem.h" #include "zx_mem.h"
//#include "zx_tape.h" //#include "zx_tape.h"
#include <stdio.h> #include <stdio.h>
#include <vector>
namespace z80 namespace z80
{ {
//static uint8_t *memory = nullptr; struct port_t
//static uint8_t memtag[65536]; {
//static uint8_t memtouched[65536]; uint16_t value;
uint16_t mask;
int (*in)(int);
void (*out)(int, int);
};
static uint32_t clock = 3500000; static uint32_t clock = 3500000;
static uint32_t t = 0; static uint32_t t = 0;
static uint16_t current_opcode_address = 0; static uint16_t current_opcode_address = 0;
bool options[Z80_NUM_OPTIONS] = { true, false }; bool options[Z80_NUM_OPTIONS] = { true, false };
int calls_stacked = 0; int calls_stacked = 0;
int (*in_ports[256])(int); //int (*in_ports[256])(int);
void (*out_ports[256])(int, int); //void (*out_ports[256])(int, int);
std::vector<port_t> ports;
//#define _rM16(a) (uint16_t*)&memory[a]
//#define rM16(a) *_rM16(a)
#define fC 0b00000001 #define fC 0b00000001
#define fN 0b00000010 #define fN 0b00000010
@@ -991,16 +995,31 @@ namespace z80
port = (rA<<8) | port; port = (rA<<8) | port;
} }
if (in_ports[port&0xff]) { for (auto i: ports) {
const uint8_t val = (uint8_t)in_ports[port&0xff](port); if ( ((port ^ i.value) & i.mask) == 0 ) {
if (i.in) {
const uint8_t val = (uint8_t)i.in(port);
if (set_flags) { if (set_flags) {
KEEP_FLAGS(fC); KEEP_FLAGS(fC);
SET_PARITY_FLAG(val); SET_PARITY_FLAG(val);
FLAGS_SZXY(val); FLAGS_SZXY(val);
} }
return val; return val;
} else }
}
}
return 0xFF; return 0xFF;
//if (in_ports[port&0xff]) {
// const uint8_t val = (uint8_t)in_ports[port&0xff](port);
// if (set_flags) {
// KEEP_FLAGS(fC);
// SET_PARITY_FLAG(val);
// FLAGS_SZXY(val);
// }
// return val;
//} else
// return 0xFF;
} }
void OUT(uint8_t val, int port = 0x10000) void OUT(uint8_t val, int port = 0x10000)
@@ -1011,7 +1030,13 @@ namespace z80
} else { } else {
port = (rA<<8) | port; port = (rA<<8) | port;
} }
if (out_ports[port&0xff]) out_ports[port&0xff](port, val); for (auto i: ports) {
if ( ((port ^ i.value) & i.mask) == 0 ) {
if (i.out) i.out(port, val);
return;
}
}
//if (out_ports[port&0xff]) out_ports[port&0xff](port, val);
} }
void INI() void INI()
@@ -1122,8 +1147,9 @@ namespace z80
{ {
for (int i=0; i<256; ++i) for (int i=0; i<256; ++i)
{ {
in_ports[i] = nullptr; ports.clear();
out_ports[i] = nullptr; //in_ports[i] = nullptr;
//out_ports[i] = nullptr;
} }
mem::reset(); mem::reset();
@@ -1150,10 +1176,12 @@ namespace z80
void IY_INSTRUCTIONS(); void IY_INSTRUCTIONS();
void IY_BIT_INSTRUCTIONS(); void IY_BIT_INSTRUCTIONS();
void connect_port(int num, int (*in_ptr)(int), void (*out_ptr)(int,int)) void connect_port(uint16_t num, uint16_t mask, int (*in_ptr)(int), void (*out_ptr)(int,int))
{ {
if (in_ptr) in_ports[num] = in_ptr; port_t port {num, mask, in_ptr, out_ptr};
if (out_ptr) out_ports[num] = out_ptr; ports.push_back(port);
//if (in_ptr) in_ports in_ptr;
//if (out_ptr) out_ports[num] = out_ptr;
} }
bool opcode_ignored = false; bool opcode_ignored = false;

2
z80.h
View File

@@ -14,7 +14,7 @@ namespace z80
uint32_t getClock(); uint32_t getClock();
//void reset(uint8_t* mem); //void reset(uint8_t* mem);
void connect_port(int num, int (*in_ptr)(int), void (*out_ptr)(int,int)); void connect_port(uint16_t num, uint16_t mask, int (*in_ptr)(int), void (*out_ptr)(int,int));
void interrupt(); void interrupt();
uint32_t step(); uint32_t step();

2
z80debug.cpp
View File

@@ -800,7 +800,7 @@ namespace z80debug
z80analyze::refresh(); z80analyze::refresh();
} else if (strcmp(cmd, "r")==0 || strcmp(cmd, "reset")==0) { } else if (strcmp(cmd, "r")==0 || strcmp(cmd, "reset")==0) {
z80::reset(); z80::reset();
z80::connect_port(0xfe, zx_ula::port_in, zx_ula::port_out); z80::connect_port(0xfe, 0x0001, zx_ula::port_in, zx_ula::port_out);
history::reset(); history::reset();
z80debug::refresh(); z80debug::refresh();
z80analyze::refresh(); z80analyze::refresh();

2
zx_mem.cpp
View File

@@ -75,7 +75,7 @@ namespace mem
writable[0] = writable[1] = false; writable[0] = writable[1] = false;
for (int i=2;i<8;++i) writable[i] = true; for (int i=2;i<8;++i) writable[i] = true;
z80::connect_port(0xfd, nullptr, mem::zx_128_port_out); z80::connect_port(0x7ffd, 0x8002, nullptr, mem::zx_128_port_out);
break; break;
} }
} }