FlooohZ80 - revert any changes to source header

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