diff options
| author | SND\dario86_cp <SND\dario86_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-02-19 02:15:18 +0000 |
|---|---|---|
| committer | SND\dario86_cp <SND\dario86_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-02-19 02:15:18 +0000 |
| commit | 79c267cda79b52cff2ce83397af87aac64d049d7 (patch) | |
| tree | 43f49fa80e13ee9303d5472f0176c5062fc2e5dc /libpcsxcore/gte.c | |
| parent | 12ddb091ed0a98ef323f2ee9e743386f570a4325 (diff) | |
| download | pcsxr-79c267cda79b52cff2ce83397af87aac64d049d7.tar.gz | |
Updated Free Software Foundation address (Jem256).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@75156 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/gte.c')
| -rw-r--r-- | libpcsxcore/gte.c | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/libpcsxcore/gte.c b/libpcsxcore/gte.c index a27bd0f3..1ce8fecf 100644 --- a/libpcsxcore/gte.c +++ b/libpcsxcore/gte.c @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ /* @@ -219,7 +219,7 @@ static inline float flimE(float result) { #define F(a) BOUNDS((a), 0x7fffffff, (1 << 31) | (1 << 16), -(s64)0x80000000, (1 << 31) | (1 << 15)) #define limG1(a) LIM((a), 0x3ff, -0x400, (1 << 31) | (1 << 14)) #define limG2(a) LIM((a), 0x3ff, -0x400, (1 << 31) | (1 << 13)) -#define limH(a) LIM((a), 0x1000, 0x0000, (1 << 12))
+#define limH(a) LIM((a), 0x1000, 0x0000, (1 << 12)) #define limG1_ia(a) LIM((a), 0x3ffffff, -0x4000000, (1 << 31) | (1 << 14)) #define limG2_ia(a) LIM((a), 0x3ffffff, -0x4000000, (1 << 31) | (1 << 13)) @@ -278,53 +278,53 @@ static inline void MTC2(u32 value, int reg) { case 30: { -#if 1
- int a;
- gteLZCS = value;
-
- // non-MAME code
- a = gteLZCS;
- if (a > 0) {
- int i;
- for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--);
- gteLZCR = 31 - i;
- } else if (a < 0) {
- int i;
- a ^= 0xffffffff;
- for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--);
- gteLZCR = 31 - i;
- } else {
- gteLZCR = 32;
- }
-#else
- // MAME
- u32 lzcs = value;
- u32 lzcr = 0;
-
- gteLZCS = value;
-
- if( ( lzcs & 0x80000000 ) == 0 )
- {
- lzcs = ~lzcs;
- }
- while( ( lzcs & 0x80000000 ) != 0 )
- {
- lzcr++;
- lzcs <<= 1;
- }
- gteLZCR = lzcr;
-#endif
+#if 1 + int a; + gteLZCS = value; + + // non-MAME code + a = gteLZCS; + if (a > 0) { + int i; + for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--); + gteLZCR = 31 - i; + } else if (a < 0) { + int i; + a ^= 0xffffffff; + for (i = 31; (a & (1 << i)) == 0 && i >= 0; i--); + gteLZCR = 31 - i; + } else { + gteLZCR = 32; + } +#else + // MAME + u32 lzcs = value; + u32 lzcr = 0; + + gteLZCS = value; + + if( ( lzcs & 0x80000000 ) == 0 ) + { + lzcs = ~lzcs; + } + while( ( lzcs & 0x80000000 ) != 0 ) + { + lzcr++; + lzcs <<= 1; + } + gteLZCR = lzcr; +#endif } break; -#if 1
- case 31:
- return;
-#else
- case 31:
- value = psxRegs.CP2D.r[reg];
- break;
-#endif
+#if 1 + case 31: + return; +#else + case 31: + value = psxRegs.CP2D.r[reg]; + break; +#endif default: psxRegs.CP2D.r[reg] = value; @@ -521,9 +521,9 @@ void gteSQR() { gteMAC1 = A1((gteIR1 * gteIR1) >> shift); gteMAC2 = A2((gteIR2 * gteIR2) >> shift); gteMAC3 = A3((gteIR3 * gteIR3) >> shift); - gteIR1 = limB1(gteMAC1, lm);
- gteIR2 = limB2(gteMAC2, lm);
- gteIR3 = limB3(gteMAC3, lm);
+ gteIR1 = limB1(gteMAC1, lm); + gteIR2 = limB2(gteMAC2, lm); + gteIR3 = limB3(gteMAC3, lm); } void gteNCCS() { |