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

Renamed _int64 to __int64

This commit is contained in:
zilmar 2012-11-06 19:23:17 +11:00
parent b02959e7bb
commit d23d06fa98
6 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp
View File

@ -723,7 +723,7 @@ void R4300iOp32::ADDIU (void) {
}
void R4300iOp32::SLTI (void) {
if (_GPR[m_Opcode.rs].W[0] < (_int64)((short)m_Opcode.immediate)) {
if (_GPR[m_Opcode.rs].W[0] < (__int64)((short)m_Opcode.immediate)) {
_GPR[m_Opcode.rt].W[0] = 1;
} else {
_GPR[m_Opcode.rt].W[0] = 0;

14
Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp
View File

@ -836,7 +836,7 @@ void R4300iOp::ADDIU (void) {
}
void R4300iOp::SLTI (void) {
if (_GPR[m_Opcode.rs].DW < (_int64)((short)m_Opcode.immediate)) {
if (_GPR[m_Opcode.rs].DW < (__int64)((short)m_Opcode.immediate)) {
_GPR[m_Opcode.rt].DW = 1;
} else {
_GPR[m_Opcode.rt].DW = 0;
@ -942,7 +942,7 @@ void R4300iOp::BGTZL (void) {
}
void R4300iOp::DADDIU (void) {
_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].DW + (_int64)((short)m_Opcode.immediate);
_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].DW + (__int64)((short)m_Opcode.immediate);
}
QWORD LDL_MASK[8] = { 0,0xFF,0xFFFF,0xFFFFFF,0xFFFFFFFF,0xFFFFFFFFFF,
@ -1497,13 +1497,13 @@ void R4300iOp::SPECIAL_DSRAV (void) {
}
void R4300iOp::SPECIAL_MULT (void) {
_RegHI->DW = (_int64)(_GPR[m_Opcode.rs].W[0]) * (_int64)(_GPR[m_Opcode.rt].W[0]);
_RegHI->DW = (__int64)(_GPR[m_Opcode.rs].W[0]) * (__int64)(_GPR[m_Opcode.rt].W[0]);
_RegLO->DW = _RegHI->W[0];
_RegHI->DW = _RegHI->W[1];
}
void R4300iOp::SPECIAL_MULTU (void) {
_RegHI->DW = (unsigned _int64)(_GPR[m_Opcode.rs].UW[0]) * (unsigned _int64)(_GPR[m_Opcode.rt].UW[0]);
_RegHI->DW = (unsigned __int64)(_GPR[m_Opcode.rs].UW[0]) * (unsigned __int64)(_GPR[m_Opcode.rt].UW[0]);
_RegLO->DW = _RegHI->W[0];
_RegHI->DW = _RegHI->W[1];
}
@ -1534,9 +1534,9 @@ void R4300iOp::SPECIAL_DMULT (void) {
MIPS_DWORD Tmp[3];
_RegLO->UDW = (QWORD)_GPR[m_Opcode.rs].UW[0] * (QWORD)_GPR[m_Opcode.rt].UW[0];
Tmp[0].UDW = (_int64)_GPR[m_Opcode.rs].W[1] * (_int64)(QWORD)_GPR[m_Opcode.rt].UW[0];
Tmp[1].UDW = (_int64)(QWORD)_GPR[m_Opcode.rs].UW[0] * (_int64)_GPR[m_Opcode.rt].W[1];
_RegHI->UDW = (_int64)_GPR[m_Opcode.rs].W[1] * (_int64)_GPR[m_Opcode.rt].W[1];
Tmp[0].UDW = (__int64)_GPR[m_Opcode.rs].W[1] * (__int64)(QWORD)_GPR[m_Opcode.rt].UW[0];
Tmp[1].UDW = (__int64)(QWORD)_GPR[m_Opcode.rs].UW[0] * (__int64)_GPR[m_Opcode.rt].W[1];
_RegHI->UDW = (__int64)_GPR[m_Opcode.rs].W[1] * (__int64)_GPR[m_Opcode.rt].W[1];
Tmp[2].UDW = (QWORD)_RegLO->UW[1] + (QWORD)Tmp[0].UW[0] + (QWORD)Tmp[1].UW[0];
_RegLO->UDW += ((QWORD)Tmp[0].UW[0] + (QWORD)Tmp[1].UW[0]) << 32;

24
Source/Project64/N64 System/N64 Class.cpp
View File

@ -1261,12 +1261,12 @@ bool CN64System::SaveState(void)
WriteFile( hSaveFile,_Rom->GetRomAddress(),0x40,&dwWritten,NULL);
WriteFile( hSaveFile,&NextViTimer,sizeof(DWORD),&dwWritten,NULL);
WriteFile( hSaveFile,&m_Reg.m_PROGRAM_COUNTER,sizeof(m_Reg.m_PROGRAM_COUNTER),&dwWritten,NULL);
WriteFile( hSaveFile,m_Reg.m_GPR,sizeof(_int64)*32,&dwWritten,NULL);
WriteFile( hSaveFile,m_Reg.m_FPR,sizeof(_int64)*32,&dwWritten,NULL);
WriteFile( hSaveFile,m_Reg.m_GPR,sizeof(__int64)*32,&dwWritten,NULL);
WriteFile( hSaveFile,m_Reg.m_FPR,sizeof(__int64)*32,&dwWritten,NULL);
WriteFile( hSaveFile,m_Reg.m_CP0,sizeof(DWORD)*32,&dwWritten,NULL);
WriteFile( hSaveFile,m_Reg.m_FPCR,sizeof(DWORD)*32,&dwWritten,NULL);
WriteFile( hSaveFile,&m_Reg.m_HI,sizeof(_int64),&dwWritten,NULL);
WriteFile( hSaveFile,&m_Reg.m_LO,sizeof(_int64),&dwWritten,NULL);
WriteFile( hSaveFile,&m_Reg.m_HI,sizeof(__int64),&dwWritten,NULL);
WriteFile( hSaveFile,&m_Reg.m_LO,sizeof(__int64),&dwWritten,NULL);
WriteFile( hSaveFile,m_Reg.m_RDRAM_Registers,sizeof(DWORD)*10,&dwWritten,NULL);
WriteFile( hSaveFile,m_Reg.m_SigProcessor_Interface,sizeof(DWORD)*10,&dwWritten,NULL);
WriteFile( hSaveFile,m_Reg.m_Display_ControlReg,sizeof(DWORD)*10,&dwWritten,NULL);
@ -1397,12 +1397,12 @@ bool CN64System::LoadState(LPCSTR FileName) {
_Settings->SaveDword(Game_RDRamSize,SaveRDRAMSize);
unzReadCurrentFile(file,&NextVITimer,sizeof(NextVITimer));
unzReadCurrentFile(file,&m_Reg.m_PROGRAM_COUNTER,sizeof(m_Reg.m_PROGRAM_COUNTER));
unzReadCurrentFile(file,m_Reg.m_GPR,sizeof(_int64)*32);
unzReadCurrentFile(file,m_Reg.m_FPR,sizeof(_int64)*32);
unzReadCurrentFile(file,m_Reg.m_GPR,sizeof(__int64)*32);
unzReadCurrentFile(file,m_Reg.m_FPR,sizeof(__int64)*32);
unzReadCurrentFile(file,m_Reg.m_CP0,sizeof(DWORD)*32);
unzReadCurrentFile(file,m_Reg.m_FPCR,sizeof(DWORD)*32);
unzReadCurrentFile(file,&m_Reg.m_HI,sizeof(_int64));
unzReadCurrentFile(file,&m_Reg.m_LO,sizeof(_int64));
unzReadCurrentFile(file,&m_Reg.m_HI,sizeof(__int64));
unzReadCurrentFile(file,&m_Reg.m_LO,sizeof(__int64));
unzReadCurrentFile(file,m_Reg.m_RDRAM_Registers,sizeof(DWORD)*10);
unzReadCurrentFile(file,m_Reg.m_SigProcessor_Interface,sizeof(DWORD)*10);
unzReadCurrentFile(file,m_Reg.m_Display_ControlReg,sizeof(DWORD)*10);
@ -1457,12 +1457,12 @@ bool CN64System::LoadState(LPCSTR FileName) {
ReadFile( hSaveFile,&NextVITimer,sizeof(NextVITimer),&dwRead,NULL);
ReadFile( hSaveFile,&m_Reg.m_PROGRAM_COUNTER,sizeof(m_Reg.m_PROGRAM_COUNTER),&dwRead,NULL);
ReadFile( hSaveFile,m_Reg.m_GPR,sizeof(_int64)*32,&dwRead,NULL);
ReadFile( hSaveFile,m_Reg.m_FPR,sizeof(_int64)*32,&dwRead,NULL);
ReadFile( hSaveFile,m_Reg.m_GPR,sizeof(__int64)*32,&dwRead,NULL);
ReadFile( hSaveFile,m_Reg.m_FPR,sizeof(__int64)*32,&dwRead,NULL);
ReadFile( hSaveFile,m_Reg.m_CP0,sizeof(DWORD)*32,&dwRead,NULL);
ReadFile( hSaveFile,m_Reg.m_FPCR,sizeof(DWORD)*32,&dwRead,NULL);
ReadFile( hSaveFile,&m_Reg.m_HI,sizeof(_int64),&dwRead,NULL);
ReadFile( hSaveFile,&m_Reg.m_LO,sizeof(_int64),&dwRead,NULL);
ReadFile( hSaveFile,&m_Reg.m_HI,sizeof(__int64),&dwRead,NULL);
ReadFile( hSaveFile,&m_Reg.m_LO,sizeof(__int64),&dwRead,NULL);
ReadFile( hSaveFile,m_Reg.m_RDRAM_Registers,sizeof(DWORD)*10,&dwRead,NULL);
ReadFile( hSaveFile,m_Reg.m_SigProcessor_Interface,sizeof(DWORD)*10,&dwRead,NULL);
ReadFile( hSaveFile,m_Reg.m_Display_ControlReg,sizeof(DWORD)*10,&dwRead,NULL);

2
Source/Project64/User Interface/Rom Browser Class.cpp
View File

@ -715,7 +715,7 @@ void CRomBrowser::FillRomList ( strlist & FileList, const CPath & BaseDirectory,
}
int CRomBrowser::GetCicChipID (BYTE * RomData) {
_int64 CRC = 0;
__int64 CRC = 0;
int count;
for (count = 0x40; count < 0x1000; count += 4) {

12
Source/RSP/Profiling.cpp
View File

@ -199,7 +199,7 @@ void GenerateTimerResults (void) {
typedef struct {
char Label[100];
_int64 TimeTotal;
__int64 TimeTotal;
} TIME_STAMP_ENTRY;
DWORD StartTimeHi, StartTimeLo, StopTimeHi, StopTimeLo, TSE_Count, TSE_Max;
@ -238,8 +238,8 @@ void StopTimer (void) {
for (count = 0; count < TSE_Count; count ++) {
if (strcmp(LastLabel,TS_Entries[count].Label) == 0) {
_int64 Time = ((unsigned _int64)StopTimeHi << 32) + (unsigned _int64)StopTimeLo;
Time -= ((unsigned _int64)StartTimeHi << 32) + (unsigned _int64)StartTimeLo;
__int64 Time = ((unsigned __int64)StopTimeHi << 32) + (unsigned __int64)StopTimeLo;
Time -= ((unsigned __int64)StartTimeHi << 32) + (unsigned __int64)StartTimeLo;
TS_Entries[count].TimeTotal += Time;
return;
}
@ -259,8 +259,8 @@ void StopTimer (void) {
}
}
strcpy(TS_Entries[TSE_Count].Label,LastLabel);
TS_Entries[TSE_Count].TimeTotal = ((unsigned _int64)StopTimeHi << 32) + (unsigned _int64)StopTimeLo;
TS_Entries[TSE_Count].TimeTotal -= ((unsigned _int64)StartTimeHi << 32) + (unsigned _int64)StartTimeLo;
TS_Entries[TSE_Count].TimeTotal = ((unsigned __int64)StopTimeHi << 32) + (unsigned __int64)StopTimeLo;
TS_Entries[TSE_Count].TimeTotal -= ((unsigned __int64)StartTimeHi << 32) + (unsigned __int64)StartTimeLo;
TSE_Count +=1;
}
@ -269,7 +269,7 @@ void GenerateTimerResults (void) {
char fname[_MAX_FNAME],ext[_MAX_EXT], LogFileName[_MAX_PATH];
DWORD dwWritten, count, count2;
HANDLE hLogFile = NULL;
_int64 TotalTime;
__int64 TotalTime;
StopTimer();

8
Source/RSP/Types.h
View File

@ -39,8 +39,8 @@ typedef union tagUWORD {
typedef union tagUDWORD {
double D;
_int64 DW;
unsigned _int64 UDW;
__int64 DW;
unsigned __int64 UDW;
long W[2];
float F[2];
unsigned long UW[2];
@ -52,8 +52,8 @@ typedef union tagUDWORD {
typedef union tagVect {
double FD[2];
_int64 DW[2];
unsigned _int64 UDW[2];
__int64 DW[2];
unsigned __int64 UDW[2];
long W[4];
float FS[4];
unsigned long UW[4];