From 682dd761c3c749cfe9a53f2c0af02910188a06fa Mon Sep 17 00:00:00 2001 From: Asnivor Date: Mon, 7 Oct 2024 06:32:48 +0100 Subject: [PATCH] FlooohZ80 - revert any changes to source header --- Assets/dll/FlooohZ80.dll | Bin 36352 -> 36352 bytes ExternalProjects/FlooohZ80/z80.h | 53 ++----------------------------- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/Assets/dll/FlooohZ80.dll b/Assets/dll/FlooohZ80.dll index 71a78f5f878202e0c6c05490b74ecc5a3eeda861..382474a9a733733a71c13653077ffcb90a039578 100644 GIT binary patch delta 3067 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 diff --git a/ExternalProjects/FlooohZ80/z80.h b/ExternalProjects/FlooohZ80/z80.h index 309b51cdcf..1fd13a37f3 100644 --- a/ExternalProjects/FlooohZ80/z80.h +++ b/ExternalProjects/FlooohZ80/z80.h @@ -334,51 +334,6 @@ extern "C" { #define Z80_SF (1<<7) // sign // CPU state - -#pragma pack(push, 1) -typedef struct { - uint16_t step; // the currently active decoder step - uint16_t addr; // effective address for (HL),(IX+d),(IY+d) - uint8_t dlatch; // temporary store for data bus value - uint8_t opcode; // current opcode - uint8_t hlx_idx; // index into hlx[] for mapping hl to ix or iy (0: hl, 1: ix, 2: iy) - bool prefix_active; // true if any prefix currently active (only needed in z80_opdone()) - uint64_t pins; // last pin state, used for NMI detection - uint64_t int_bits; // track INT and NMI state - union { - struct { uint8_t pcl; uint8_t pch; }; - uint16_t pc; - }; - union { - struct { uint8_t f; uint8_t a; }; - uint16_t af; - }; - union { - struct { uint8_t c; uint8_t b; }; - uint16_t bc; - }; - union { - struct { uint8_t e; uint8_t d; }; - uint16_t de; - }; - union { - struct { - union { struct { uint8_t l; uint8_t h; }; uint16_t hl; }; - union { struct { uint8_t ixl; uint8_t ixh; }; uint16_t ix; }; - union { struct { uint8_t iyl; uint8_t iyh; }; uint16_t iy; }; - }; - struct { union { struct { uint8_t l; uint8_t h; }; uint16_t hl; }; } hlx[3]; - }; - union { struct { uint8_t wzl; uint8_t wzh; }; uint16_t wz; }; - union { struct { uint8_t spl; uint8_t sph; }; uint16_t sp; }; - union { struct { uint8_t r; uint8_t i; }; uint16_t ir; }; - uint16_t af2, bc2, de2, hl2; // shadow register bank - uint8_t im; - bool iff1, iff2; -} z80_t; -#pragma pack(pop) - -/* typedef struct { uint16_t step; // the currently active decoder step uint16_t addr; // effective address for (HL),(IX+d),(IY+d) @@ -409,7 +364,7 @@ typedef struct { uint8_t im; bool iff1, iff2; } z80_t; - */ + // initialize a new Z80 instance and return initial pin mask uint64_t z80_init(z80_t* cpu); // immediately put Z80 into reset state @@ -421,8 +376,6 @@ typedef struct { // return true when full instruction has finished bool z80_opdone(z80_t* cpu); - - #ifdef __cplusplus } // extern C #endif @@ -1832,8 +1785,6 @@ uint64_t z80_prefetch(z80_t* cpu, uint16_t new_pc) { return 0; } - - // pin helper macros #define _sa(ab) pins=_z80_set_ab(pins,ab) #define _sax(ab,x) pins=_z80_set_ab_x(pins,ab,x) @@ -4839,4 +4790,4 @@ return pins; #undef _cc_p #undef _cc_m -#endif // CHIPS_IMPL#pragma once +#endif // CHIPS_IMPL \ No newline at end of file