From cbbfa871ae3d9db3852d9122a6d8355896c073ed Mon Sep 17 00:00:00 2001 From: João Silva Date: Mon, 16 Jan 2017 22:39:57 +0000 Subject: Many cleanups. --- source/sa1.h | 78 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 40 deletions(-) (limited to 'source/sa1.h') diff --git a/source/sa1.h b/source/sa1.h index 84ec94a..0958fc2 100644 --- a/source/sa1.h +++ b/source/sa1.h @@ -10,49 +10,49 @@ typedef struct { uint8_t PB; uint8_t DB; - pair P; - pair A; - pair D; - pair S; - pair X; - pair Y; + pair P; + pair A; + pair D; + pair S; + pair X; + pair Y; uint16_t PC; } SSA1Registers; typedef struct { - SOpcodes* S9xOpcodes; - uint8_t _Carry; - uint8_t _Zero; - uint8_t _Negative; - uint8_t _Overflow; - bool CPUExecuting; - uint32_t ShiftedPB; - uint32_t ShiftedDB; - uint32_t Flags; - bool Executing; - bool NMIActive; - uint8_t IRQActive; - bool WaitingForInterrupt; - bool Waiting; - uint8_t* PC; - uint8_t* PCBase; - uint8_t* BWRAM; - uint8_t* PCAtOpcodeStart; - uint8_t* WaitAddress; - uint32_t WaitCounter; - uint8_t* WaitByteAddress1; - uint8_t* WaitByteAddress2; - uint8_t* Map [MEMMAP_NUM_BLOCKS]; - uint8_t* WriteMap [MEMMAP_NUM_BLOCKS]; - int16_t op1; - int16_t op2; - int arithmetic_op; - int64_t sum; - bool overflow; - uint8_t VirtualBitmapFormat; - bool in_char_dma; - uint8_t variable_bit_pos; + SOpcodes* S9xOpcodes; + uint8_t _Carry; + uint8_t _Zero; + uint8_t _Negative; + uint8_t _Overflow; + bool CPUExecuting; + uint32_t ShiftedPB; + uint32_t ShiftedDB; + uint32_t Flags; + bool Executing; + bool NMIActive; + uint8_t IRQActive; + bool WaitingForInterrupt; + bool Waiting; + uint8_t* PC; + uint8_t* PCBase; + uint8_t* BWRAM; + uint8_t* PCAtOpcodeStart; + uint8_t* WaitAddress; + uint32_t WaitCounter; + uint8_t* WaitByteAddress1; + uint8_t* WaitByteAddress2; + uint8_t* Map [MEMMAP_NUM_BLOCKS]; + uint8_t* WriteMap [MEMMAP_NUM_BLOCKS]; + int16_t op1; + int16_t op2; + int arithmetic_op; + int64_t sum; + bool overflow; + uint8_t VirtualBitmapFormat; + bool in_char_dma; + uint8_t variable_bit_pos; SSA1Registers Registers; } SSA1; @@ -70,7 +70,6 @@ typedef struct #define SA1SetFlags(f) (SA1.Registers.P.W |= (f)) #define SA1CheckFlag(f) (SA1.Registers.PL & (f)) - uint8_t S9xSA1GetByte(uint32_t); uint16_t S9xSA1GetWord(uint32_t); void S9xSA1SetByte(uint8_t, uint32_t); @@ -128,4 +127,3 @@ static inline void S9xSA1FixCycles(void) } } #endif - -- cgit v1.2.3