mirror of https://github.com/PCSX2/pcsx2.git
Reverted some changes related to dyna_block_discard that appears to cause random crashing. Also improved the deci2Call behavior to be more correct.
git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@676 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
Jake.Stine
Gregory Hainaut
parent
8594b87177
commit
5f42a79cec
|
|
@ -65,7 +65,6 @@ extern u8 g_RealGSMem[0x2000];
|
|||
|
||||
//#define _PSM(mem) (memLUTR[(mem) >> 12] == 0 ? NULL : (void*)(memLUTR[(mem) >> 12] + ((mem) & 0xfff)))
|
||||
#define PSM(mem) (vtlb_GetPhyPtr(mem&0x1fffffff)) //pcsx2 is a competition.The one with most hacks wins :D
|
||||
#define FREE(ptr) _aligned_free(ptr)
|
||||
|
||||
#define psMs8(mem) (*(s8 *)&PS2MEM_BASE[(mem) & 0x1ffffff])
|
||||
#define psMs16(mem) (*(s16*)&PS2MEM_BASE[(mem) & 0x1ffffff])
|
||||
|
|
|
|||
|
|
@ -561,34 +561,39 @@ char deci2buffer[256];
|
|||
* int Deci2Call(int, u_int *);
|
||||
*/
|
||||
|
||||
int __Deci2Call(int call, u32 *addr) {
|
||||
int __Deci2Call(int call, u32 *addr)
|
||||
{
|
||||
if (call > 0x10)
|
||||
return -1;
|
||||
|
||||
// fixme: is this an indication of bad emulation, that addr is sometimes null?
|
||||
// Games affected include Samurai Warriors 2 XL (and others I don't know offhand)
|
||||
// (air)
|
||||
|
||||
if( addr == NULL )
|
||||
switch (call)
|
||||
{
|
||||
Console::Notice( "Deci2Call > Ignoring Null Pointer." );
|
||||
return -1;
|
||||
}
|
||||
|
||||
switch (call) {
|
||||
case 1: // open
|
||||
if( addr != NULL )
|
||||
{
|
||||
deci2addr = (u32*)PSM(addr[1]);
|
||||
BIOS_LOG("deci2open: %x,%x,%x,%x\n",
|
||||
addr[3], addr[2], addr[1], addr[0]);
|
||||
deci2handler = addr[2];
|
||||
}
|
||||
else
|
||||
{
|
||||
deci2handler = NULL;
|
||||
DevCon::Notice( "Deci2Call.Open > NULL address ignored." );
|
||||
}
|
||||
return 1;
|
||||
|
||||
case 2: // close
|
||||
return 1;
|
||||
|
||||
case 3: // reqsend
|
||||
BIOS_LOG("deci2reqsend: %x,%x,%x,%x: deci2addr: %x,%x,%x,buf=%x %x,%x,len=%x,%x\n",
|
||||
addr[3], addr[2], addr[1], addr[0],
|
||||
{
|
||||
char reqaddr[128];
|
||||
if( addr != NULL )
|
||||
sprintf( reqaddr, "%x %x %x %x", addr[3], addr[2], addr[1], addr[0] );
|
||||
|
||||
BIOS_LOG("deci2reqsend: %s: deci2addr: %x,%x,%x,buf=%x %x,%x,len=%x,%x\n",
|
||||
(( addr == NULL ) ? "NULL" : reqaddr),
|
||||
deci2addr[7], deci2addr[6], deci2addr[5], deci2addr[4],
|
||||
deci2addr[3], deci2addr[2], deci2addr[1], deci2addr[0]);
|
||||
|
||||
|
|
@ -597,18 +602,21 @@ int __Deci2Call(int call, u32 *addr) {
|
|||
if (deci2addr == NULL) return 1;
|
||||
if (deci2addr[1]>0xc){
|
||||
u8* pdeciaddr = (u8*)dmaGetAddr(deci2addr[4]+0xc);
|
||||
if( pdeciaddr == NULL ) pdeciaddr = (u8*)PSM(deci2addr[4]+0xc);
|
||||
else pdeciaddr += (deci2addr[4]+0xc)%16;
|
||||
if( pdeciaddr == NULL )
|
||||
pdeciaddr = (u8*)PSM(deci2addr[4]+0xc);
|
||||
else
|
||||
pdeciaddr += (deci2addr[4]+0xc)%16;
|
||||
memcpy(deci2buffer, pdeciaddr, deci2addr[1]-0xc);
|
||||
deci2buffer[deci2addr[1]-0xc>=255?255:deci2addr[1]-0xc]='\0';
|
||||
Console::Write( Color_Cyan, deci2buffer );
|
||||
}
|
||||
deci2addr[3] = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
case 4: // poll
|
||||
BIOS_LOG("deci2poll: %x,%x,%x,%x\n",
|
||||
addr[3], addr[2], addr[1], addr[0]);
|
||||
if( addr != NULL )
|
||||
BIOS_LOG("deci2poll: %x,%x,%x,%x\n", addr[3], addr[2], addr[1], addr[0]);
|
||||
return 1;
|
||||
|
||||
case 5: // exrecv
|
||||
|
|
@ -618,6 +626,7 @@ int __Deci2Call(int call, u32 *addr) {
|
|||
return 1;
|
||||
|
||||
case 0x10://kputs
|
||||
if( addr != NULL )
|
||||
Console::Write( Color_Cyan, "%s", params PSM(*addr));
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -626,21 +635,28 @@ int __Deci2Call(int call, u32 *addr) {
|
|||
}
|
||||
|
||||
|
||||
void SYSCALL() {
|
||||
#ifdef BIOS_LOG
|
||||
void SYSCALL()
|
||||
{
|
||||
u8 call;
|
||||
|
||||
if (cpuRegs.GPR.n.v1.SL[0] < 0)
|
||||
call = (u8)(-cpuRegs.GPR.n.v1.SL[0]);
|
||||
else call = cpuRegs.GPR.n.v1.UC[0];
|
||||
else
|
||||
call = cpuRegs.GPR.n.v1.UC[0];
|
||||
|
||||
BIOS_LOG("Bios call: %s (%x)\n", bios[call], call);
|
||||
if (call == 0x7c && cpuRegs.GPR.n.a0.UL[0] == 0x10) {
|
||||
Console::Write( Color_Cyan, "%s", params PSM(PSMu32(cpuRegs.GPR.n.a1.UL[0])));
|
||||
} else
|
||||
//if (call == 0x7c) SysPrintf("Deci2Call: %x\n", cpuRegs.GPR.n.a0.UL[0]);
|
||||
if (call == 0x7c) __Deci2Call(cpuRegs.GPR.n.a0.UL[0], (u32*)PSM(cpuRegs.GPR.n.a1.UL[0]));
|
||||
if (call == 0x77) {
|
||||
struct t_sif_dma_transfer *dmat;
|
||||
|
||||
if (call == 0x7c)
|
||||
{
|
||||
if(cpuRegs.GPR.n.a0.UL[0] == 0x10)
|
||||
Console::Write( Color_Cyan, (char*)PSM(PSMu32(cpuRegs.GPR.n.a1.UL[0])) );
|
||||
else
|
||||
__Deci2Call( cpuRegs.GPR.n.a0.UL[0], (u32*)PSM(cpuRegs.GPR.n.a1.UL[0]) );
|
||||
}
|
||||
|
||||
if (call == 0x77)
|
||||
{
|
||||
t_sif_dma_transfer *dmat;
|
||||
//struct t_sif_cmd_header *hdr;
|
||||
//struct t_sif_rpc_bind *bind;
|
||||
//struct t_rpc_server_data *server;
|
||||
|
|
@ -649,19 +665,18 @@ void SYSCALL() {
|
|||
//int sid;
|
||||
|
||||
n_transfer = cpuRegs.GPR.n.a1.UL[0] - 1;
|
||||
if (n_transfer >= 0) {
|
||||
addr = cpuRegs.GPR.n.a0.UL[0] + n_transfer * sizeof(struct t_sif_dma_transfer);
|
||||
dmat = (struct t_sif_dma_transfer*)PSM(addr);
|
||||
if (n_transfer >= 0)
|
||||
{
|
||||
addr = cpuRegs.GPR.n.a0.UL[0] + n_transfer * sizeof(t_sif_dma_transfer);
|
||||
dmat = (t_sif_dma_transfer*)PSM(addr);
|
||||
|
||||
BIOS_LOG("bios_%s: n_transfer=%d, size=%x, attr=%x, dest=%x, src=%x\n",
|
||||
bios[cpuRegs.GPR.n.v1.UC[0]], n_transfer,
|
||||
dmat->size, dmat->attr,
|
||||
dmat->dest, dmat->src);
|
||||
}
|
||||
//Log=1;
|
||||
}
|
||||
#endif
|
||||
// if (cpuRegs.GPR.n.v1.UD[0] == 0x77) Log=1;
|
||||
|
||||
cpuRegs.pc -= 4;
|
||||
cpuException(0x20, cpuRegs.branch);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ u32 maxrecmem = 0;
|
|||
uptr *recLUT = NULL;
|
||||
|
||||
u32 s_nBlockCycles = 0; // cycles of current block recompiling
|
||||
u8* dyna_block_discard_recmem=0;
|
||||
//u8* dyna_block_discard_recmem=0;
|
||||
|
||||
u32 pc; // recompiler pc
|
||||
int branch; // set for branch
|
||||
|
|
@ -588,10 +588,14 @@ void recResetEE( void )
|
|||
memcpy_fast( recLUT + 0x8000, recLUT, 0x2000 * sizeof(uptr) );
|
||||
memcpy_fast( recLUT + 0xa000, recLUT, 0x2000 * sizeof(uptr) );
|
||||
|
||||
// This may or may not be needed anymore...
|
||||
x86SetPtr(recMem+REC_CACHEMEM);
|
||||
dyna_block_discard_recmem=(u8*)x86Ptr;
|
||||
JMP32( (uptr)&dyna_block_discard - ( (u32)x86Ptr + 5 ));
|
||||
// drk||Raziel says this is useful but I'm not sure why. Something to do with forward jumps.
|
||||
// Anyways, it causes random crashing for some reasom, possibly because of memory
|
||||
// corrupition elsewhere in the recs. I can't reproduce the problem here though,
|
||||
// so a fix will have to wait until later. -_- (air)
|
||||
|
||||
//x86SetPtr(recMem+REC_CACHEMEM);
|
||||
//dyna_block_discard_recmem=(u8*)x86Ptr;
|
||||
//JMP32( (uptr)&dyna_block_discard - ( (u32)x86Ptr + 5 ));
|
||||
|
||||
x86SetPtr(recMem);
|
||||
|
||||
|
|
@ -699,7 +703,7 @@ static __naked void DispatcherClear()
|
|||
// calc PC_GETBLOCK
|
||||
s_pDispatchBlock = PC_GETBLOCK(cpuRegs.pc);
|
||||
|
||||
if( s_pDispatchBlock->startpc == cpuRegs.pc )
|
||||
if( s_pDispatchBlock != NULL && s_pDispatchBlock->startpc == cpuRegs.pc )
|
||||
{
|
||||
assert( s_pDispatchBlock->pFnptr != 0 );
|
||||
|
||||
|
|
@ -1928,8 +1932,9 @@ StartRecomp:
|
|||
u32 stg=pgsz;
|
||||
while(stg>0)
|
||||
{
|
||||
// was dyna_block_discard_recmem. See note in recResetEE for details.
|
||||
CMP32ItoM((uptr)PSM(lpc),*(u32*)PSM(lpc));
|
||||
JNE32(((u32)&dyna_block_discard_recmem)- ( (u32)x86Ptr + 6 ));
|
||||
JNE32(((u32)&dyna_block_discard)- ( (u32)x86Ptr + 6 ));
|
||||
|
||||
stg-=4;
|
||||
lpc+=4;
|
||||
|
|
|
|||
Loading…
Reference in New Issue