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

DECI2: correct NUL writing for logging to remove garbage 

IOP: Fix return value on ioman.write(1, str) (stdout)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3080 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
sudonim1 2010-05-25 22:12:14 +00:00
parent d7468b7d20
commit 9708f279e0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/IopBios.cpp
View File

@ -21,6 +21,7 @@
namespace R3000A { namespace R3000A {
#define v0 (psxRegs.GPR.n.v0)
#define a0 (psxRegs.GPR.n.a0) #define a0 (psxRegs.GPR.n.a0)
#define a1 (psxRegs.GPR.n.a1) #define a1 (psxRegs.GPR.n.a1)
#define a2 (psxRegs.GPR.n.a2) #define a2 (psxRegs.GPR.n.a2)
@ -42,6 +43,7 @@ namespace ioman {
{ {
Console.Write(ConColor_IOP, L"%s", ShiftJIS_ConvertString(Ra1, a2).c_str()); Console.Write(ConColor_IOP, L"%s", ShiftJIS_ConvertString(Ra1, a2).c_str());
pc = ra; pc = ra;
v0 = a2;
return 1; return 1;
} }
#endif #endif

2
pcsx2/R5900OpcodeImpl.cpp
View File

@ -200,7 +200,7 @@ static int __Deci2Call(int call, u32 *addr)
const int copylen = std::min<uint>(255, d2ptr[1]-0xc); const int copylen = std::min<uint>(255, d2ptr[1]-0xc);
memcpy(deci2buffer, pdeciaddr, copylen ); memcpy(deci2buffer, pdeciaddr, copylen );
deci2buffer[255] = '\0'; deci2buffer[copylen] = '\0';
if( EmuConfig.Log.Deci2 ) if( EmuConfig.Log.Deci2 )
Console.Write( ConColor_EE, L"%s", ShiftJIS_ConvertString(deci2buffer).c_str() ); Console.Write( ConColor_EE, L"%s", ShiftJIS_ConvertString(deci2buffer).c_str() );