mirror of https://github.com/PCSX2/pcsx2.git
Repaired the interpreter such that it works, tho not tested much (takes hours to test it, heh). Fixed up the disassembler / instruction logger a little bit. It's more or less usable now, although most of the VU opcodes aren't implemented.
*NOTE* There is a stack corruption bug lingering in the recompilers. We know about its existence but not the cause yet. Until found it's going to cause generally random crash type behavior. (ouch!) git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@592 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
Jake.Stine
Gregory Hainaut
parent
e812cd997f
commit
7dfc3631ad
|
|
@ -40,7 +40,7 @@ namespace R5900
|
|||
{
|
||||
// [TODO] : These function names can be de-obfuscated with the help of a little namespace love.
|
||||
|
||||
void disR5900F( std::string& output, u32 code, u32 pc);
|
||||
void disR5900F( std::string& output, u32 code );
|
||||
void disR5900Fasm( std::string& output, u32 code, u32 pc);
|
||||
void disR5900AddSym(u32 addr, const char *name);
|
||||
const char* disR5900GetSym(u32 addr);
|
||||
|
|
|
|||
|
|
@ -67,18 +67,16 @@ static const char * const disRNameCP1c[] = {
|
|||
"*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "*RES*", "FStatus"};
|
||||
|
||||
// Type definition of our functions
|
||||
#define DisFInterface (string& output, u32 code, u32 pc)
|
||||
#define DisFInterfaceT (string&, u32, u32)
|
||||
#define DisFInterfaceN (output, code, pc)
|
||||
#define DisFInterface (string& output, u32 code)
|
||||
#define DisFInterfaceT (string&, u32)
|
||||
#define DisFInterfaceN (output, code)
|
||||
|
||||
typedef void (*TdisR5900F)DisFInterface;
|
||||
|
||||
// These macros are used to assemble the disassembler functions
|
||||
#define MakeDisF(fn, b) \
|
||||
void fn DisFInterface { \
|
||||
char ostr[128]; \
|
||||
sprintf (ostr, "%8.8x %8.8x:", pc, code); \
|
||||
output.append( ostr ); \
|
||||
ssprintf(output, "(%8.8x) ", params code); \
|
||||
b; \
|
||||
}
|
||||
|
||||
|
|
@ -124,8 +122,8 @@ typedef void (*TdisR5900F)DisFInterface;
|
|||
#define _nSa32_ _rSa32_, disRNameGPR[_Sa_]
|
||||
|
||||
#define _I_ _Im_, _Im_
|
||||
#define _Target_ ((pc & 0xf0000000) + ((code & 0x03ffffff) * 4))
|
||||
#define _Branch_ (pc + 4 + ((short)_Im_ * 4))
|
||||
#define _Target_ ((cpuRegs.pc & 0xf0000000) + ((code & 0x03ffffff) * 4))
|
||||
#define _Branch_ (cpuRegs.pc + 4 + ((short)_Im_ * 4))
|
||||
#define _OfB_ _Im_, _nRs_
|
||||
|
||||
#define _Fsf_ ((code >> 21) & 0x03)
|
||||
|
|
@ -135,7 +133,7 @@ typedef void (*TdisR5900F)DisFInterface;
|
|||
// the copy-paste marathon of code below more readable!
|
||||
#define _sap( str ) ssappendf( output, str, params
|
||||
|
||||
#define dName(i) _sap("%-7s,") i);
|
||||
#define dName(i) _sap("%-7s\t") i);
|
||||
#define dGPR128(i) _sap("%8.8x_%8.8x_%8.8x_%8.8x (%s),") cpuRegs.GPR.r[i].UL[3], cpuRegs.GPR.r[i].UL[2], cpuRegs.GPR.r[i].UL[1], cpuRegs.GPR.r[i].UL[0], disRNameGPR[i])
|
||||
#define dGPR64(i) _sap("%8.8x_%8.8x (%s),") cpuRegs.GPR.r[i].UL[1], cpuRegs.GPR.r[i].UL[0], disRNameGPR[i])
|
||||
#define dGPR64U(i) _sap("%8.8x_%8.8x (%s),") cpuRegs.GPR.r[i].UL[3], cpuRegs.GPR.r[i].UL[2], disRNameGPR[i])
|
||||
|
|
@ -768,7 +766,7 @@ MakeDisF(disVWAITQ, dName("VWAITQ");)
|
|||
MakeDisF(disSYNC, dName("SYNC");)
|
||||
MakeDisF(disBREAK, dName("BREAK");)
|
||||
MakeDisF(disSYSCALL, dName("SYSCALL"); dCode();)
|
||||
MakeDisF(disCACHE, sprintf(ostr, "%s %-7s, %x,", ostr, "CACHE", _Rt_); dOfB();)
|
||||
MakeDisF(disCACHE, ssappendf(output, "%-7s, %x,", params "CACHE", _Rt_); dOfB();)
|
||||
MakeDisF(disPREF, dName("PREF");)
|
||||
|
||||
MakeDisF(disMFSA, dName("MFSA"); dGPR64(_Rd_); dSaR();)
|
||||
|
|
@ -807,7 +805,10 @@ TdisR5900F disR5900_MMI0[] = { // Subset of disMMI0
|
|||
disPADDSB, disPSUBSB, disPEXTLB, disPPACB,
|
||||
disNULL, disNULL, disPEXTS, disPPACS};
|
||||
|
||||
MakeDisF(disMMI0, disR5900_MMI0[_Sa_] DisFInterfaceN)
|
||||
static void disMMI0( string& output, u32 code )
|
||||
{
|
||||
disR5900_MMI0[_Sa_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_MMI1[] = { // Subset of disMMI1
|
||||
disNULL, disPABSW, disPCEQW, disPMINW,
|
||||
|
|
@ -819,7 +820,10 @@ TdisR5900F disR5900_MMI1[] = { // Subset of disMMI1
|
|||
disPADDUB, disPSUBUB, disPEXTUB, disQFSRV,
|
||||
disNULL, disNULL, disNULL, disNULL};
|
||||
|
||||
MakeDisF(disMMI1, disR5900_MMI1[_Sa_] DisFInterfaceN)
|
||||
static void disMMI1( string& output, u32 code )
|
||||
{
|
||||
disR5900_MMI1[_Sa_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_MMI2[] = { // Subset of disMMI2
|
||||
disPMADDW, disNULL, disPSLLVW, disPSRLVW,
|
||||
|
|
@ -831,7 +835,10 @@ TdisR5900F disR5900_MMI2[] = { // Subset of disMMI2
|
|||
disNULL, disNULL, disPEXEH, disPREVH,
|
||||
disPMULTH, disPDIVBW, disPEXEW, disPROT3W};
|
||||
|
||||
MakeDisF(disMMI2, disR5900_MMI2[_Sa_] DisFInterfaceN)
|
||||
static void disMMI2( string& output, u32 code )
|
||||
{
|
||||
disR5900_MMI2[_Sa_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_MMI3[] = { // Subset of disMMI3
|
||||
disPMADDUW, disNULL, disNULL, disPSRAVW,
|
||||
|
|
@ -843,7 +850,10 @@ TdisR5900F disR5900_MMI3[] = { // Subset of disMMI3
|
|||
disNULL, disNULL, disPEXCH, disPCPYH,
|
||||
disNULL, disNULL, disPEXCW, disNULL};
|
||||
|
||||
MakeDisF(disMMI3, disR5900_MMI3[_Sa_] DisFInterfaceN)
|
||||
static void disMMI3( string& output, u32 code )
|
||||
{
|
||||
disR5900_MMI3[_Sa_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_MMI[] = { // Subset of disMMI
|
||||
disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
|
||||
|
|
@ -855,7 +865,10 @@ TdisR5900F disR5900_MMI[] = { // Subset of disMMI
|
|||
disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
|
||||
disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL};
|
||||
|
||||
MakeDisF(disMMI, disR5900_MMI[_Funct_] DisFInterfaceN)
|
||||
static void disMMI( string& output, u32 code )
|
||||
{
|
||||
disR5900_MMI[_Funct_]( output, code );
|
||||
}
|
||||
|
||||
|
||||
TdisR5900F disR5900_COP0_BC0[] = { //subset of disCOP0 BC
|
||||
|
|
@ -865,7 +878,10 @@ TdisR5900F disR5900_COP0_BC0[] = { //subset of disCOP0 BC
|
|||
disNULL, disNULL, disNULL , disNULL , disNULL, disNULL, disNULL, disNULL,
|
||||
};
|
||||
|
||||
MakeDisF(disCOP0_BC0, disR5900_COP0_BC0[_Rt_] DisFInterfaceN)
|
||||
static void disCOP0_BC0( string& output, u32 code )
|
||||
{
|
||||
disR5900_COP0_BC0[_Rt_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_COP0_Func[] = { //subset of disCOP0 Function
|
||||
disNULL, disTLBR, disTLBWI, disNULL, disNULL, disNULL, disTLBWR, disNULL,
|
||||
|
|
@ -877,7 +893,10 @@ TdisR5900F disR5900_COP0_Func[] = { //subset of disCOP0 Function
|
|||
disNULL, disNULL, disNULL , disNULL, disNULL, disNULL, disNULL , disNULL,
|
||||
disEI , disDI , disNULL , disNULL, disNULL, disNULL, disNULL , disNULL
|
||||
};
|
||||
MakeDisF(disCOP0_Func, disR5900_COP0_Func[_Funct_] DisFInterfaceN)
|
||||
static void disCOP0_Func( string& output, u32 code )
|
||||
{
|
||||
disR5900_COP0_Func[_Funct_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_COP0[] = { // Subset of disCOP0
|
||||
disMFC0, disNULL, disNULL, disNULL, disMTC0, disNULL, disNULL, disNULL,
|
||||
|
|
@ -885,7 +904,10 @@ TdisR5900F disR5900_COP0[] = { // Subset of disCOP0
|
|||
disCOP0_Func, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
|
||||
disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL};
|
||||
|
||||
MakeDisF(disCOP0, disR5900_COP0[_Rs_] DisFInterfaceN)
|
||||
static void disCOP0( string& output, u32 code )
|
||||
{
|
||||
disR5900_COP0[_Rs_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_COP1_S[] = { //subset of disCOP1 S
|
||||
disADDs, disSUBs, disMULs, disDIVs, disSQRTs, disABSs, disMOVs, disNEGs,
|
||||
|
|
@ -898,7 +920,10 @@ TdisR5900F disR5900_COP1_S[] = { //subset of disCOP1 S
|
|||
disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
|
||||
};
|
||||
|
||||
MakeDisF(disCOP1_S, disR5900_COP1_S[_Funct_] DisFInterfaceN)
|
||||
static void disCOP1_S( string& output, u32 code )
|
||||
{
|
||||
disR5900_COP1_S[_Funct_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_COP1_W[] = { //subset of disCOP1 W
|
||||
disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
|
||||
|
|
@ -911,7 +936,10 @@ TdisR5900F disR5900_COP1_W[] = { //subset of disCOP1 W
|
|||
disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
|
||||
};
|
||||
|
||||
MakeDisF(disCOP1_W, disR5900_COP1_W[_Funct_] DisFInterfaceN)
|
||||
static void disCOP1_W( string& output, u32 code )
|
||||
{
|
||||
disR5900_COP1_W[_Funct_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_COP1_BC1[] = { //subset of disCOP1 BC
|
||||
disBC1F, disBC1T, disBC1FL, disBC1TL, disNULL, disNULL, disNULL, disNULL,
|
||||
|
|
@ -920,7 +948,10 @@ TdisR5900F disR5900_COP1_BC1[] = { //subset of disCOP1 BC
|
|||
disNULL, disNULL, disNULL , disNULL , disNULL, disNULL, disNULL, disNULL,
|
||||
};
|
||||
|
||||
MakeDisF(disCOP1_BC1, disR5900_COP1_BC1[_Rt_] DisFInterfaceN)
|
||||
static void disCOP1_BC1( string& output, u32 code )
|
||||
{
|
||||
disR5900_COP1_BC1[_Rt_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_COP1[] = { // Subset of disCOP1
|
||||
disMFC1, disNULL, disCFC1, disNULL, disMTC1, disNULL, disCTC1, disNULL,
|
||||
|
|
@ -928,7 +959,10 @@ TdisR5900F disR5900_COP1[] = { // Subset of disCOP1
|
|||
disCOP1_S, disNULL, disNULL, disNULL, disCOP1_W, disNULL, disNULL, disNULL,
|
||||
disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL};
|
||||
|
||||
MakeDisF(disCOP1, disR5900_COP1[_Rs_] DisFInterfaceN)
|
||||
static void disCOP1( string& output, u32 code )
|
||||
{
|
||||
disR5900_COP1[_Rs_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_COP2_SPEC2[] = { //subset of disCOP2 SPEC2
|
||||
disVADDAx, disVADDAy, disVADDAz, disVADDAw, disVSUBAx, disVSUBAy, disVSUBAz, disVSUBAw,
|
||||
|
|
@ -949,7 +983,10 @@ TdisR5900F disR5900_COP2_SPEC2[] = { //subset of disCOP2 SPEC2
|
|||
disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL, disNULL,
|
||||
};
|
||||
|
||||
MakeDisF(disCOP2_SPEC2, disR5900_COP2_SPEC2[(code & 0x3) | ((code >> 4) & 0x7c)] DisFInterfaceN)
|
||||
static void disCOP2_SPEC2( string& output, u32 code )
|
||||
{
|
||||
disR5900_COP2_SPEC2[(code & 0x3) | ((code >> 4) & 0x7c)]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_COP2_SPEC1[] = { //subset of disCOP2 SPEC1
|
||||
disVADDx, disVADDy, disVADDz, disVADDw, disVSUBx, disVSUBy, disVSUBz, disVSUBw,
|
||||
|
|
@ -962,7 +999,10 @@ TdisR5900F disR5900_COP2_SPEC1[] = { //subset of disCOP2 SPEC1
|
|||
disVCALLMS, disVCALLMSR, disNULL, disNULL, disCOP2_SPEC2, disCOP2_SPEC2, disCOP2_SPEC2, disCOP2_SPEC2,
|
||||
};
|
||||
|
||||
MakeDisF(disCOP2_SPEC1, disR5900_COP2_SPEC1[_Funct_] DisFInterfaceN)
|
||||
static void disCOP2_SPEC1( string& output, u32 code )
|
||||
{
|
||||
disR5900_COP2_SPEC1[_Funct_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_COP2_BC2[] = { //subset of disCOP2 BC
|
||||
disBC2F, disBC2T, disBC2FL, disBC2TL, disNULL, disNULL, disNULL, disNULL,
|
||||
|
|
@ -971,7 +1011,10 @@ TdisR5900F disR5900_COP2_BC2[] = { //subset of disCOP2 BC
|
|||
disNULL, disNULL, disNULL , disNULL , disNULL, disNULL, disNULL, disNULL,
|
||||
};
|
||||
|
||||
MakeDisF(disCOP2_BC2, disR5900_COP2_BC2[_Rt_] DisFInterfaceN)
|
||||
static void disCOP2_BC2( string& output, u32 code )
|
||||
{
|
||||
disR5900_COP2_BC2[_Rt_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_COP2[] = { // Subset of disCOP2
|
||||
disNULL, disQMFC2, disCFC2, disNULL, disNULL, disQMTC2, disCTC2, disNULL,
|
||||
|
|
@ -979,7 +1022,10 @@ TdisR5900F disR5900_COP2[] = { // Subset of disCOP2
|
|||
disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1,
|
||||
disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1, disCOP2_SPEC1};
|
||||
|
||||
MakeDisF(disCOP2, disR5900_COP2[_Rs_] DisFInterfaceN)
|
||||
static void disCOP2( string& output, u32 code )
|
||||
{
|
||||
disR5900_COP2[_Rs_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_REGIMM[] = { // Subset of disREGIMM
|
||||
disBLTZ, disBGEZ, disBLTZL, disBGEZL, disNULL, disNULL, disNULL, disNULL,
|
||||
|
|
@ -987,7 +1033,10 @@ TdisR5900F disR5900_REGIMM[] = { // Subset of disREGIMM
|
|||
disBLTZAL, disBGEZAL, disBLTZALL, disBGEZALL, disNULL, disNULL, disNULL, disNULL,
|
||||
disMTSAB, disMTSAH , disNULL, disNULL, disNULL, disNULL, disNULL, disNULL};
|
||||
|
||||
MakeDisF(disREGIMM, disR5900_REGIMM[_Rt_] DisFInterfaceN)
|
||||
static void disREGIMM( string& output, u32 code )
|
||||
{
|
||||
disR5900_REGIMM[_Rt_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900_SPECIAL[] = {
|
||||
disSLL, disNULL, disSRL, disSRA, disSLLV, disNULL, disSRLV, disSRAV,
|
||||
|
|
@ -999,7 +1048,10 @@ TdisR5900F disR5900_SPECIAL[] = {
|
|||
disTGE, disTGEU, disTLT, disTLTU, disTEQ, disNULL, disTNE, disNULL,
|
||||
disDSLL, disNULL, disDSRL, disDSRA, disDSLL32, disNULL, disDSRL32,disDSRA32 };
|
||||
|
||||
MakeDisF(disSPECIAL, disR5900_SPECIAL[_Funct_] DisFInterfaceN)
|
||||
static void disSPECIAL( string& output, u32 code )
|
||||
{
|
||||
disR5900_SPECIAL[_Funct_]( output, code );
|
||||
}
|
||||
|
||||
TdisR5900F disR5900[] = {
|
||||
disSPECIAL, disREGIMM, disJ , disJAL , disBEQ , disBNE , disBLEZ , disBGTZ ,
|
||||
|
|
@ -1011,21 +1063,24 @@ TdisR5900F disR5900[] = {
|
|||
disNULL , disLWC1 , disNULL, disPREF , disNULL, disNULL, disLQC2 , disLD ,
|
||||
disNULL , disSWC1 , disNULL, disNULL , disNULL, disNULL, disSQC2 , disSD };
|
||||
|
||||
MakeDisF(disR5900F, disR5900[code >> 26] DisFInterfaceN)
|
||||
static void disR5900F( string& output, u32 code )
|
||||
{
|
||||
disR5900[code >> 26]( output, code );
|
||||
}
|
||||
|
||||
// returns a string representation of the cpuRegs current instruction.
|
||||
// The return value of this method is *not* thread safe!
|
||||
const string& DisR5900CurrentState::getString()
|
||||
{
|
||||
result.clear();
|
||||
disR5900F( result, cpuRegs.code, cpuRegs.pc );
|
||||
disR5900F( result, cpuRegs.code );
|
||||
return result;
|
||||
}
|
||||
|
||||
const char* DisR5900CurrentState::getCString()
|
||||
{
|
||||
result.clear();
|
||||
disR5900F( result, cpuRegs.code, cpuRegs.pc );
|
||||
disR5900F( result, cpuRegs.code );
|
||||
return result.c_str();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -501,7 +501,7 @@ void __fastcall convert_bgr15 (int width, int height, u32 accel, void * arg,
|
|||
convert_internal (CONVERT_BGR, 15, width, height, accel, arg, result);
|
||||
}
|
||||
|
||||
convert_t __fastcall * convert_rgb (int order, int bpp)
|
||||
__forceinline convert_t* convert_rgb (int order, int bpp)
|
||||
{
|
||||
if (order == CONVERT_RGB || order == CONVERT_BGR)
|
||||
switch (bpp) {
|
||||
|
|
|
|||
|
|
@ -52,6 +52,6 @@ convert_t convert_bgr15;
|
|||
|
||||
#define CONVERT_RGB 0
|
||||
#define CONVERT_BGR 1
|
||||
convert_t __fastcall * convert_rgb (int order, int bpp);
|
||||
extern convert_t* convert_rgb (int order, int bpp);
|
||||
|
||||
#endif /* YUV2RGB_H */
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ static u32 cpuBlockCycles = 0; // 3 bit fixed point version of cycle count
|
|||
|
||||
static std::string disOut;
|
||||
|
||||
static __forceinline void execI()
|
||||
static void execI()
|
||||
{
|
||||
#ifdef _DEBUG
|
||||
if (memRead32(cpuRegs.pc, &cpuRegs.code) == -1) return;
|
||||
|
|
@ -131,12 +131,7 @@ static bool EventRaised = false;
|
|||
|
||||
static __forceinline void _doBranch_shared(u32 tar)
|
||||
{
|
||||
// fixme: first off, cpuRegs.pc is assigned after execI(), which breaks exceptions
|
||||
// that might be thrown by execI(). I need to research how exceptions work again,
|
||||
// and make sure I record the correct PC
|
||||
|
||||
branch2 = cpuRegs.branch = 1;
|
||||
const u32 oldBranchPC = cpuRegs.pc;
|
||||
execI();
|
||||
|
||||
// branch being 0 means an exception was thrown, since only the exception
|
||||
|
|
@ -161,10 +156,17 @@ void __fastcall intDoBranch(u32 target)
|
|||
{
|
||||
//SysPrintf("Interpreter Branch \n");
|
||||
_doBranch_shared( target );
|
||||
|
||||
if( Cpu == &intCpu )
|
||||
{
|
||||
cpuRegs.cycle += cpuBlockCycles >> 3;
|
||||
cpuBlockCycles &= (1<<3)-1;
|
||||
EventRaised |= intEventTest();
|
||||
}
|
||||
}
|
||||
|
||||
void intSetBranch() {
|
||||
branch2 = 1;
|
||||
branch2 = /*cpuRegs.branch =*/ 1;
|
||||
}
|
||||
|
||||
void COP1_Unknown() {
|
||||
|
|
@ -179,10 +181,10 @@ namespace OpcodeImpl
|
|||
{
|
||||
void COP2()
|
||||
{
|
||||
std::string disOut;
|
||||
disR5900Fasm(disOut, cpuRegs.code, cpuRegs.pc);
|
||||
//std::string disOut;
|
||||
//disR5900Fasm(disOut, cpuRegs.code, cpuRegs.pc);
|
||||
|
||||
VU0_LOG("%s\n", disOut.c_str());
|
||||
//VU0_LOG("%s\n", disOut.c_str());
|
||||
Int_COP2PrintTable[_Rs_]();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -277,6 +277,7 @@ void SysAllocateDynarecs()
|
|||
// If both VUrecs failed, then make sure the SuperVU is totally closed out:
|
||||
if( !CHECK_VU0REC && !CHECK_VU1REC)
|
||||
Dynarec::SuperVUDestroy( -1 );
|
||||
|
||||
}
|
||||
|
||||
// This should be called last thing before Pcsx2 exits.
|
||||
|
|
@ -319,6 +320,9 @@ void SysResetExecutionState()
|
|||
psxCpu = &psxInt;
|
||||
}
|
||||
|
||||
#ifdef PCSX2_VIRTUAL_MEM
|
||||
PCSX2_MEM_PROTECT_BEGIN();
|
||||
#endif
|
||||
R5900::Cpu->Reset();
|
||||
psxCpu->Reset();
|
||||
|
||||
|
|
@ -326,4 +330,8 @@ void SysResetExecutionState()
|
|||
|
||||
// make sure the VU1 doesn't have lingering "skip" enabled.
|
||||
vu1MicroDisableSkip();
|
||||
|
||||
#ifdef PCSX2_VIRTUAL_MEM
|
||||
PCSX2_MEM_PROTECT_END();
|
||||
#endif
|
||||
}
|
||||
|
|
@ -304,20 +304,11 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
EnableFiberSafeOptimizations="true"
|
||||
WholeProgramOptimization="true"
|
||||
AdditionalIncludeDirectories="$(SolutionDir)\common"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32_PTHREADS"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="2"
|
||||
SmallerTypeCheck="false"
|
||||
RuntimeLibrary="0"
|
||||
StructMemberAlignment="5"
|
||||
BufferSecurityCheck="false"
|
||||
EnableFunctionLevelLinking="false"
|
||||
UsePrecompiledHeader="2"
|
||||
|
|
@ -728,10 +719,11 @@
|
|||
RelativePath="..\..\x86\fast_routines.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Devel vm|Win32"
|
||||
Name="Devel vtlb|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
|
|
@ -1159,7 +1151,7 @@
|
|||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="2"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
|
|
@ -1251,7 +1243,7 @@
|
|||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="2"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
|
|
@ -1390,6 +1382,14 @@
|
|||
<File
|
||||
RelativePath="..\..\x86\ix86\ix86_tools.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Devel vtlb|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
|
|
@ -2295,13 +2295,6 @@
|
|||
<File
|
||||
RelativePath="..\..\InterTables.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Devel vm|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\InterTables.h"
|
||||
|
|
@ -2634,13 +2627,6 @@
|
|||
<File
|
||||
RelativePath="..\..\IPU\coroutine.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Devel vm|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\IPU\coroutine.h"
|
||||
|
|
@ -2709,13 +2695,6 @@
|
|||
<File
|
||||
RelativePath="..\..\Ipu\yuv2rgb.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Devel vm|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Ipu\yuv2rgb.h"
|
||||
|
|
@ -2727,24 +2706,10 @@
|
|||
<File
|
||||
RelativePath="..\..\Ipu\mpeg2lib\Idct.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Devel vm|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Ipu\mpeg2lib\Mpeg.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Devel vm|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Ipu\mpeg2lib\Mpeg.h"
|
||||
|
|
|
|||
|
|
@ -117,7 +117,6 @@
|
|||
AdditionalIncludeDirectories=""$(InputDir)""
|
||||
PreprocessorDefinitions="PTW32_STATIC_LIB;PTW32_BUILD_INLINED;WIN32;NDEBUG;_LIB"
|
||||
StringPooling="true"
|
||||
MinimalRebuild="true"
|
||||
ExceptionHandling="2"
|
||||
RuntimeLibrary="0"
|
||||
StructMemberAlignment="5"
|
||||
|
|
|
|||
|
|
@ -589,7 +589,7 @@ static void execute( void )
|
|||
u8* fnptr;
|
||||
u32 oldesi;
|
||||
#else
|
||||
R5900FNPTR pfn;
|
||||
//R5900FNPTR pfn;
|
||||
#endif
|
||||
BASEBLOCK* pblock = PC_GETBLOCK(cpuRegs.pc);
|
||||
|
||||
|
|
@ -633,10 +633,9 @@ static void execute( void )
|
|||
#else
|
||||
|
||||
#ifdef _MSC_VER
|
||||
pfn = ((R5900FNPTR)pblock->pFnptr);
|
||||
// use call instead of pfn()
|
||||
//pfn = ((R5900FNPTR)pblock->pFnptr);
|
||||
__asm push ebp; // FIXME: need to preserve ebp or else the bios crashes, should find where ebp is getting corrupted instead.
|
||||
__asm call pfn;
|
||||
((R5900FNPTR)pblock->pFnptr)();
|
||||
__asm pop ebp; // restore ebp for the reason above
|
||||
#else
|
||||
__asm__("push %%ebp\n");
|
||||
|
|
@ -652,7 +651,7 @@ static void execute( void )
|
|||
void recStep( void ) {
|
||||
}
|
||||
|
||||
static __forceinline bool recEventTest()
|
||||
static bool recEventTest()
|
||||
{
|
||||
#ifdef PCSX2_DEVBUILD
|
||||
// dont' remove this check unless doing an official release
|
||||
|
|
@ -670,14 +669,16 @@ static __forceinline bool recEventTest()
|
|||
return retval;
|
||||
}
|
||||
|
||||
__forceinline void recExecute()
|
||||
void recExecute()
|
||||
{
|
||||
// Mem protection should be handled by the caller here so that it can be
|
||||
// done in a more optimized fashion.
|
||||
|
||||
while( true )
|
||||
{
|
||||
//Console::WriteLn( "Begin Block Execution" );
|
||||
execute();
|
||||
//Console::WriteLn( "Cycle > %x", params cpuRegs.cycle );
|
||||
if( recEventTest() ) break;
|
||||
}
|
||||
}
|
||||
|
|
@ -2208,4 +2209,4 @@ namespace R5900
|
|||
recShutdown
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue