ugly whitespace cleanup

This commit is contained in:
hap 2015-05-24 15:49:49 +02:00
parent 04d6212706
commit 832bab865a

View File

@ -41,26 +41,26 @@
#define M_MVI(R) R=ARG() #define M_MVI(R) R=ARG()
/* rotate */ /* rotate */
#define M_RLC { \ #define M_RLC { \
m_AF.b.h = (m_AF.b.h << 1) | (m_AF.b.h >> 7); \ m_AF.b.h = (m_AF.b.h << 1) | (m_AF.b.h >> 7); \
m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \ m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \
} }
#define M_RRC { \ #define M_RRC { \
m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \ m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \
m_AF.b.h = (m_AF.b.h >> 1) | (m_AF.b.h << 7); \ m_AF.b.h = (m_AF.b.h >> 1) | (m_AF.b.h << 7); \
} }
#define M_RAL { \ #define M_RAL { \
int c = m_AF.b.l&CF; \ int c = m_AF.b.l&CF; \
m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h >> 7); \ m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h >> 7); \
m_AF.b.h = (m_AF.b.h << 1) | c; \ m_AF.b.h = (m_AF.b.h << 1) | c; \
} }
#define M_RAR { \ #define M_RAR { \
int c = (m_AF.b.l&CF) << 7; \ int c = (m_AF.b.l&CF) << 7; \
m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \ m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \
m_AF.b.h = (m_AF.b.h >> 1) | c; \ m_AF.b.h = (m_AF.b.h >> 1) | c; \
} }
/* logical */ /* logical */
@ -73,116 +73,116 @@
#define M_DCR(R) {UINT8 hc = ((R & 0x0f) != 0x00) ? HF : 0; --R; m_AF.b.l= (m_AF.b.l & CF ) | ZSP[R] | hc | VF; } #define M_DCR(R) {UINT8 hc = ((R & 0x0f) != 0x00) ? HF : 0; --R; m_AF.b.l= (m_AF.b.l & CF ) | ZSP[R] | hc | VF; }
/* arithmetic */ /* arithmetic */
#define M_ADD(R) { \ #define M_ADD(R) { \
int q = m_AF.b.h+R; \ int q = m_AF.b.h+R; \
m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \ m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \
m_AF.b.h=q; \ m_AF.b.h=q; \
} }
#define M_ADC(R) { \ #define M_ADC(R) { \
int q = m_AF.b.h+R+(m_AF.b.l&CF); \ int q = m_AF.b.h+R+(m_AF.b.l&CF); \
m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \ m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \
m_AF.b.h=q; \ m_AF.b.h=q; \
} }
#define M_SUB(R) { \ #define M_SUB(R) { \
int q = m_AF.b.h-R; \ int q = m_AF.b.h-R; \
m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \ m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \
m_AF.b.h=q; \ m_AF.b.h=q; \
} }
#define M_SBB(R) { \ #define M_SBB(R) { \
int q = m_AF.b.h-R-(m_AF.b.l&CF); \ int q = m_AF.b.h-R-(m_AF.b.l&CF); \
m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \ m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \
m_AF.b.h=q; \ m_AF.b.h=q; \
} }
#define M_CMP(R) { \ #define M_CMP(R) { \
int q = m_AF.b.h-R; \ int q = m_AF.b.h-R; \
m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \ m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \
} }
#define M_DAD(R) { \ #define M_DAD(R) { \
int q = m_HL.d + m_##R.d; \ int q = m_HL.d + m_##R.d; \
m_AF.b.l = (m_AF.b.l & ~CF) | (q>>16 & CF ); \ m_AF.b.l = (m_AF.b.l & ~CF) | (q>>16 & CF ); \
m_HL.w.l = q; \ m_HL.w.l = q; \
} }
// DSUB is 8085-only, not sure if H flag handling is correct // DSUB is 8085-only, not sure if H flag handling is correct
#define M_DSUB() { \ #define M_DSUB() { \
int q = m_HL.b.l-m_BC.b.l; \ int q = m_HL.b.l-m_BC.b.l; \
m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \ m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \
((m_HL.b.l^q^m_BC.b.l)&HF)| \ ((m_HL.b.l^q^m_BC.b.l)&HF)| \
(((m_BC.b.l^m_HL.b.l)&(m_HL.b.l^q)&SF)>>5); \ (((m_BC.b.l^m_HL.b.l)&(m_HL.b.l^q)&SF)>>5); \
m_HL.b.l=q; \ m_HL.b.l=q; \
q = m_HL.b.h-m_BC.b.h-(m_AF.b.l&CF); \ q = m_HL.b.h-m_BC.b.h-(m_AF.b.l&CF); \
m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \ m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \
((m_HL.b.h^q^m_BC.b.h)&HF)| \ ((m_HL.b.h^q^m_BC.b.h)&HF)| \
(((m_BC.b.h^m_HL.b.h)&(m_HL.b.h^q)&SF)>>5); \ (((m_BC.b.h^m_HL.b.h)&(m_HL.b.h^q)&SF)>>5); \
if (m_HL.b.l!=0) m_AF.b.l&=~ZF; \ if (m_HL.b.l!=0) m_AF.b.l&=~ZF; \
} }
/* i/o */ /* i/o */
#define M_IN \ #define M_IN \
m_STATUS = 0x42; \ m_STATUS = 0x42; \
m_WZ.d=ARG(); \ m_WZ.d=ARG(); \
m_AF.b.h=m_io->read_byte(m_WZ.d); m_AF.b.h=m_io->read_byte(m_WZ.d);
#define M_OUT \ #define M_OUT \
m_STATUS = 0x10; \ m_STATUS = 0x10; \
m_WZ.d=ARG(); \ m_WZ.d=ARG(); \
m_io->write_byte(m_WZ.d,m_AF.b.h) m_io->write_byte(m_WZ.d,m_AF.b.h)
/* stack */ /* stack */
#define M_PUSH(R) { \ #define M_PUSH(R) { \
m_STATUS = 0x04; \ m_STATUS = 0x04; \
m_program->write_byte(--m_SP.w.l, m_##R.b.h); \ m_program->write_byte(--m_SP.w.l, m_##R.b.h); \
m_program->write_byte(--m_SP.w.l, m_##R.b.l); \ m_program->write_byte(--m_SP.w.l, m_##R.b.l); \
} }
#define M_POP(R) { \ #define M_POP(R) { \
m_STATUS = 0x86; \ m_STATUS = 0x86; \
m_##R.b.l = m_program->read_byte(m_SP.w.l++); \ m_##R.b.l = m_program->read_byte(m_SP.w.l++); \
m_##R.b.h = m_program->read_byte(m_SP.w.l++); \ m_##R.b.h = m_program->read_byte(m_SP.w.l++); \
} }
/* jumps */ /* jumps */
// On 8085 jump if condition is not satisfied is shorter // On 8085 jump if condition is not satisfied is shorter
#define M_JMP(cc) { \ #define M_JMP(cc) { \
if (cc) { \ if (cc) { \
m_PC.w.l = ARG16(); \ m_PC.w.l = ARG16(); \
} else { \ } else { \
m_PC.w.l += 2; \ m_PC.w.l += 2; \
m_icount += (IS_8085()) ? 3 : 0; \ m_icount += (IS_8085()) ? 3 : 0; \
} \ } \
} }
// On 8085 call if condition is not satisfied is 9 ticks // On 8085 call if condition is not satisfied is 9 ticks
#define M_CALL(cc) \ #define M_CALL(cc) \
{ \ { \
if (cc) \ if (cc) \
{ \ { \
UINT16 a = ARG16(); \ UINT16 a = ARG16(); \
m_icount -= (IS_8085()) ? 7 : 6 ; \ m_icount -= (IS_8085()) ? 7 : 6 ; \
M_PUSH(PC); \ M_PUSH(PC); \
m_PC.d = a; \ m_PC.d = a; \
} else { \ } else { \
m_PC.w.l += 2; \ m_PC.w.l += 2; \
m_icount += (IS_8085()) ? 2 : 0; \ m_icount += (IS_8085()) ? 2 : 0; \
} \ } \
} }
// conditional RET only // conditional RET only
#define M_RET(cc) \ #define M_RET(cc) \
{ \ { \
if (cc) \ if (cc) \
{ \ { \
m_icount -= 6; \ m_icount -= 6; \
M_POP(PC); \ M_POP(PC); \
} \ } \
} }
#define M_RST(nn) { \ #define M_RST(nn) { \
M_PUSH(PC); \ M_PUSH(PC); \
m_PC.d = 8 * nn; \ m_PC.d = 8 * nn; \
} }