ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #510 from cxd4/lool 

[RSP] Continue to use standard int types for multiply operands.
This commit is contained in:
zilmar 2015-06-22 11:11:32 +10:00
parent b58bd8035f ee13bf0c82
commit a6ed4e05bb
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/RSP/Interpreter Ops.c
View File

@ -450,8 +450,8 @@ void RSP_Vector_VMULF (void) {
for (el = 0; el < 8; el ++ ) { for (el = 0; el < 8; el ++ ) {
del = EleSpec[RSPOpC.rs].B[el]; del = EleSpec[RSPOpC.rs].B[el];
if (RSP_Vect[RSPOpC.rd].UHW[el] != 0x8000 || RSP_Vect[RSPOpC.rt].UHW[del] != 0x8000) { if (RSP_Vect[RSPOpC.rd].UHW[el] != 0x8000 || RSP_Vect[RSPOpC.rt].UHW[del] != 0x8000) {
temp.W = ((long)RSP_Vect[RSPOpC.rd].HW[el] * (long)RSP_Vect[RSPOpC.rt].HW[del]) << 1; temp.W = ((int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)RSP_Vect[RSPOpC.rt].HW[del]) << 1;
temp.UW += 0x8000; temp.UW += 0x8000;
RSP_ACCUM[el].HW[2] = temp.HW[1]; RSP_ACCUM[el].HW[2] = temp.HW[1];
RSP_ACCUM[el].HW[1] = temp.HW[0]; RSP_ACCUM[el].HW[1] = temp.HW[0];
@ -474,11 +474,11 @@ void RSP_Vector_VMULU (void) {
for (el = 0; el < 8; el ++ ) { for (el = 0; el < 8; el ++ ) {
del = EleSpec[RSPOpC.rs].B[el]; del = EleSpec[RSPOpC.rs].B[el];
RSP_ACCUM[el].DW = (__int64)(RSP_Vect[RSPOpC.rd].HW[el] * RSP_Vect[RSPOpC.rt].HW[del]) << 17; RSP_ACCUM[el].DW = (int64_t)(RSP_Vect[RSPOpC.rd].HW[el] * RSP_Vect[RSPOpC.rt].HW[del]) << 17;
RSP_ACCUM[el].DW += 0x80000000; RSP_ACCUM[el].DW += 0x80000000;
if (RSP_ACCUM[el].DW < 0) { if (RSP_ACCUM[el].DW < 0) {
result.HW[el] = 0; result.HW[el] = 0;
} else if ((short)(RSP_ACCUM[el].UHW[3] ^ RSP_ACCUM[el].UHW[2]) < 0) { } else if ((int16_t)(RSP_ACCUM[el].UHW[3] ^ RSP_ACCUM[el].UHW[2]) < 0) {
result.HW[el] = -1; result.HW[el] = -1;
} else { } else {
result.HW[el] = RSP_ACCUM[el].HW[2]; result.HW[el] = RSP_ACCUM[el].HW[2];
@ -495,7 +495,7 @@ void RSP_Vector_VMUDL (void) {
for (el = 0; el < 8; el ++ ) { for (el = 0; el < 8; el ++ ) {
del = EleSpec[RSPOpC.rs].B[el]; del = EleSpec[RSPOpC.rs].B[el];
temp.UW = (DWORD)RSP_Vect[RSPOpC.rd].UHW[el] * (DWORD)RSP_Vect[RSPOpC.rt].UHW[del]; temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
RSP_ACCUM[el].W[1] = 0; RSP_ACCUM[el].W[1] = 0;
RSP_ACCUM[el].HW[1] = temp.HW[1]; RSP_ACCUM[el].HW[1] = temp.HW[1];
result.HW[el] = RSP_ACCUM[el].HW[1]; result.HW[el] = RSP_ACCUM[el].HW[1];
@ -511,7 +511,7 @@ void RSP_Vector_VMUDM (void) {
for (el = 0; el < 8; el ++ ) { for (el = 0; el < 8; el ++ ) {
del = EleSpec[RSPOpC.rs].B[el]; del = EleSpec[RSPOpC.rs].B[el];
temp.UW = (DWORD)((long)RSP_Vect[RSPOpC.rd].HW[el]) * (DWORD)RSP_Vect[RSPOpC.rt].UHW[del]; temp.UW = (uint32_t)((int32_t)RSP_Vect[RSPOpC.rd].HW[el]) * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
if (temp.W < 0) { if (temp.W < 0) {
RSP_ACCUM[el].HW[3] = -1; RSP_ACCUM[el].HW[3] = -1;
} else { } else {
@ -532,7 +532,7 @@ void RSP_Vector_VMUDN (void) {
for (el = 0; el < 8; el ++ ) { for (el = 0; el < 8; el ++ ) {
del = EleSpec[RSPOpC.rs].B[el]; del = EleSpec[RSPOpC.rs].B[el];
temp.UW = (DWORD)RSP_Vect[RSPOpC.rd].UHW[el] * (DWORD)(long)(RSP_Vect[RSPOpC.rt].HW[del]); temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)((int32_t)RSP_Vect[RSPOpC.rt].HW[del]);
if (temp.W < 0) { if (temp.W < 0) {
RSP_ACCUM[el].HW[3] = -1; RSP_ACCUM[el].HW[3] = -1;
} else { } else {
@ -551,8 +551,8 @@ void RSP_Vector_VMUDH (void) {
for (el = 0; el < 8; el ++ ) { for (el = 0; el < 8; el ++ ) {
del = EleSpec[RSPOpC.rs].B[el]; del = EleSpec[RSPOpC.rs].B[el];
RSP_ACCUM[el].W[1] = (long)RSP_Vect[RSPOpC.rd].HW[el] * (long)RSP_Vect[RSPOpC.rt].HW[del]; RSP_ACCUM[el].W[1] = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)RSP_Vect[RSPOpC.rt].HW[del];
RSP_ACCUM[el].HW[1] = 0; RSP_ACCUM[el].HW[1] = 0;
if (RSP_ACCUM[el].HW[3] < 0) { if (RSP_ACCUM[el].HW[3] < 0) {
if (RSP_ACCUM[el].UHW[3] != 0xFFFF) { if (RSP_ACCUM[el].UHW[3] != 0xFFFF) {
@ -595,8 +595,8 @@ void RSP_Vector_VMACF (void) {
temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1]; temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
RSP_ACCUM[el].HW[2] = temp2.HW[0]; RSP_ACCUM[el].HW[2] = temp2.HW[0];
RSP_ACCUM[el].HW[3] += temp2.HW[1];*/ RSP_ACCUM[el].HW[3] += temp2.HW[1];*/
temp.W = (long)RSP_Vect[RSPOpC.rd].HW[el] * (long)(DWORD)RSP_Vect[RSPOpC.rt].HW[del]; temp.W = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)(uint32_t)RSP_Vect[RSPOpC.rt].HW[del];
RSP_ACCUM[el].DW += ((__int64)temp.W) << 17; RSP_ACCUM[el].DW += ((int64_t)temp.W) << 17;
if (RSP_ACCUM[el].HW[3] < 0) { if (RSP_ACCUM[el].HW[3] < 0) {
if (RSP_ACCUM[el].UHW[3] != 0xFFFF) { if (RSP_ACCUM[el].UHW[3] != 0xFFFF) {
result.HW[el] = 0x8000; result.HW[el] = 0x8000;
@ -630,7 +630,7 @@ void RSP_Vector_VMACU (void) {
for (el = 0; el < 8; el ++ ) { for (el = 0; el < 8; el ++ ) {
del = EleSpec[RSPOpC.rs].B[el]; del = EleSpec[RSPOpC.rs].B[el];
temp.W = (long)RSP_Vect[RSPOpC.rd].HW[el] * (long)(DWORD)RSP_Vect[RSPOpC.rt].HW[del]; temp.W = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)(uint32_t)RSP_Vect[RSPOpC.rt].HW[del];
RSP_ACCUM[el].UHW[3] = (RSP_ACCUM[el].UHW[3] + (WORD)(temp.W >> 31)) & 0xFFFF; RSP_ACCUM[el].UHW[3] = (RSP_ACCUM[el].UHW[3] + (WORD)(temp.W >> 31)) & 0xFFFF;
temp.UW = temp.UW << 1; temp.UW = temp.UW << 1;
temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1]; temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1];
@ -706,7 +706,7 @@ void RSP_Vector_VMADL (void) {
for (el = 0; el < 8; el ++ ) { for (el = 0; el < 8; el ++ ) {
del = EleSpec[RSPOpC.rs].B[el]; del = EleSpec[RSPOpC.rs].B[el];
temp.UW = (DWORD)RSP_Vect[RSPOpC.rd].UHW[el] * (DWORD)RSP_Vect[RSPOpC.rt].UHW[del]; temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[1]; temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[1];
RSP_ACCUM[el].HW[1] = temp2.HW[0]; RSP_ACCUM[el].HW[1] = temp2.HW[0];
temp2.UW = RSP_ACCUM[el].UHW[2] + temp2.UHW[1]; temp2.UW = RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
@ -745,7 +745,7 @@ void RSP_Vector_VMADM (void) {
for (el = 0; el < 8; el ++ ) { for (el = 0; el < 8; el ++ ) {
del = EleSpec[RSPOpC.rs].B[el]; del = EleSpec[RSPOpC.rs].B[el];
temp.UW = (DWORD)((long)RSP_Vect[RSPOpC.rd].HW[el]) * (DWORD)RSP_Vect[RSPOpC.rt].UHW[del]; temp.UW = (uint32_t)((int32_t)RSP_Vect[RSPOpC.rd].HW[el]) * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1]; temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1];
RSP_ACCUM[el].HW[1] = temp2.HW[0]; RSP_ACCUM[el].HW[1] = temp2.HW[0];
temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1]; temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
@ -788,7 +788,7 @@ void RSP_Vector_VMADN (void) {
for (el = 0; el < 8; el ++ ) { for (el = 0; el < 8; el ++ ) {
del = EleSpec[RSPOpC.rs].B[el]; del = EleSpec[RSPOpC.rs].B[el];
temp.UW = (DWORD)RSP_Vect[RSPOpC.rd].UHW[el] * (DWORD)((long)RSP_Vect[RSPOpC.rt].HW[del]); temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)((int32_t)RSP_Vect[RSPOpC.rt].HW[del]);
temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1]; temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1];
RSP_ACCUM[el].HW[1] = temp2.HW[0]; RSP_ACCUM[el].HW[1] = temp2.HW[0];
temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1]; temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
@ -828,8 +828,8 @@ void RSP_Vector_VMADH (void) {
for (el = 0; el < 8; el ++ ) { for (el = 0; el < 8; el ++ ) {
del = EleSpec[RSPOpC.rs].B[el]; del = EleSpec[RSPOpC.rs].B[el];
RSP_ACCUM[el].W[1] += (long)RSP_Vect[RSPOpC.rd].HW[el] * (long)RSP_Vect[RSPOpC.rt].HW[del]; RSP_ACCUM[el].W[1] += (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)RSP_Vect[RSPOpC.rt].HW[del];
if (RSP_ACCUM[el].HW[3] < 0) { if (RSP_ACCUM[el].HW[3] < 0) {
if (RSP_ACCUM[el].UHW[3] != 0xFFFF) { if (RSP_ACCUM[el].UHW[3] != 0xFFFF) {
result.HW[el] = 0x8000; result.HW[el] = 0x8000;