From d0bad21bc4e2f4b815441150fe22a8f7cd76b860 Mon Sep 17 00:00:00 2001 From: smf- Date: Thu, 11 Apr 2013 18:16:12 +0000 Subject: [PATCH] removed some unused #defines & whitespace changes (nw) --- src/emu/cpu/psx/gte.c | 10 +++------- src/emu/cpu/psx/gte.h | 3 --- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/emu/cpu/psx/gte.c b/src/emu/cpu/psx/gte.c index bb17a82312e..115bebad1e7 100644 --- a/src/emu/cpu/psx/gte.c +++ b/src/emu/cpu/psx/gte.c @@ -41,19 +41,15 @@ INLINE void ATTR_PRINTF(2,3) GTELOG( UINT32 pc, const char *a, ...) {} #define CV2( n ) ( n < 3 ? m_cp2cr[ ( n << 3 ) + 6 ].sd : 0 ) #define CV3( n ) ( n < 3 ? m_cp2cr[ ( n << 3 ) + 7 ].sd : 0 ) -#define VXY0 ( m_cp2dr[ 0 ].d ) #define VX0 ( m_cp2dr[ 0 ].sw.l ) #define VY0 ( m_cp2dr[ 0 ].sw.h ) #define VZ0 ( m_cp2dr[ 1 ].sw.l ) -#define VXY1 ( m_cp2dr[ 2 ].d ) #define VX1 ( m_cp2dr[ 2 ].w.l ) #define VY1 ( m_cp2dr[ 2 ].w.h ) #define VZ1 ( m_cp2dr[ 3 ].w.l ) -#define VXY2 ( m_cp2dr[ 4 ].d ) #define VX2 ( m_cp2dr[ 4 ].w.l ) #define VY2 ( m_cp2dr[ 4 ].w.h ) #define VZ2 ( m_cp2dr[ 5 ].w.l ) -#define RGB ( m_cp2dr[ 6 ].d ) #define R ( m_cp2dr[ 6 ].b.l ) #define G ( m_cp2dr[ 6 ].b.h ) #define B ( m_cp2dr[ 6 ].b.h2 ) @@ -2680,9 +2676,9 @@ int gte::docop2( UINT32 pc, int gteop ) case 0x1c: GTELOG( pc, "%08x CC", gteop ); - MAC1 = A1( ( (INT64) RBK << 12 ) + ( LR1 * IR1 ) + ( LR2 * IR2 ) + ( LR3 * IR3 ) ); - MAC2 = A2( ( (INT64) GBK << 12 ) + ( LG1 * IR1 ) + ( LG2 * IR2 ) + ( LG3 * IR3 ) ); - MAC3 = A3( ( (INT64) BBK << 12 ) + ( LB1 * IR1 ) + ( LB2 * IR2 ) + ( LB3 * IR3 ) ); + MAC1 = A1( ( ( (INT64) RBK ) << 12 ) + ( LR1 * IR1 ) + ( LR2 * IR2 ) + ( LR3 * IR3 ) ); + MAC2 = A2( ( ( (INT64) GBK ) << 12 ) + ( LG1 * IR1 ) + ( LG2 * IR2 ) + ( LG3 * IR3 ) ); + MAC3 = A3( ( ( (INT64) BBK ) << 12 ) + ( LB1 * IR1 ) + ( LB2 * IR2 ) + ( LB3 * IR3 ) ); IR1 = Lm_B1( MAC1, lm ); IR2 = Lm_B2( MAC2, lm ); IR3 = Lm_B3( MAC3, lm ); diff --git a/src/emu/cpu/psx/gte.h b/src/emu/cpu/psx/gte.h index 982cef469c7..0afc9f38e1a 100644 --- a/src/emu/cpu/psx/gte.h +++ b/src/emu/cpu/psx/gte.h @@ -14,14 +14,11 @@ #include "emu.h" -#define GTE_OP( op ) ( ( op >> 20 ) & 31 ) /* not used */ #define GTE_SF( op ) ( ( op >> 19 ) & 1 ) #define GTE_MX( op ) ( ( op >> 17 ) & 3 ) #define GTE_V( op ) ( ( op >> 15 ) & 3 ) #define GTE_CV( op ) ( ( op >> 13 ) & 3 ) -#define GTE_CD( op ) ( ( op >> 11 ) & 3 ) /* not used */ #define GTE_LM( op ) ( ( op >> 10 ) & 1 ) -#define GTE_CT( op ) ( ( op >> 6 ) & 15 ) /* not used */ #define GTE_FUNCT( op ) ( op & 63 ) class gte