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

AddConstToX86Reg: pointer-to-int truncation fixed

This commit is contained in:
unknown 2015-10-30 14:08:19 -04:00
parent 69ebe1672b
commit e7fed940de
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/RSP/Recompiler Ops.c
View File

@ -5447,7 +5447,7 @@ void Compile_Opcode_LRV ( void ) {
LeaSourceAndOffset(x86_EAX, x86_EAX, (size_t)&RSP_Vect[RSPOpC.rt].B[0]); LeaSourceAndOffset(x86_EAX, x86_EAX, (size_t)&RSP_Vect[RSPOpC.rt].B[0]);
DecX86reg(x86_EAX); DecX86reg(x86_EAX);
*/ */
AddConstToX86Reg(x86_EAX, ((DWORD)&RSP_Vect[RSPOpC.rt].UB[0]) - 2); AddConstToX86Reg(x86_EAX, ((size_t)&RSP_Vect[RSPOpC.rt].UB[0]) - 2);
CPU_Message(" Loop:"); CPU_Message(" Loop:");
Loop = RecompPos; Loop = RecompPos;

10
Source/RSP/X86.c
View File

@ -152,9 +152,15 @@ void AddConstToVariable (DWORD Const, void *Variable, char *VariableName) {
PUTDST32(RecompPos,Const); PUTDST32(RecompPos,Const);
} }
void AddConstToX86Reg (int x86Reg, DWORD Const) { void AddConstToX86Reg(int x86Reg, size_t Const)
{
const size_t zero_extension_mask = 0x00000000000000007F;
const size_t sign_extension_mask = ~(zero_extension_mask);
const size_t extension_from_8bit = Const & sign_extension_mask;
/* To do: if 64-bit x86, then what if `Const' upper DWORD set? */
CPU_Message(" add %s, %Xh",x86_Name(x86Reg),Const); CPU_Message(" add %s, %Xh",x86_Name(x86Reg),Const);
if ((Const & 0xFFFFFF80) != 0 && (Const & 0xFFFFFF80) != 0xFFFFFF80) { if (extension_from_8bit != 0 && extension_from_8bit != sign_extension_mask) {
switch (x86Reg) { switch (x86Reg) {
case x86_EAX: PUTDST16(RecompPos,0xC081); break; case x86_EAX: PUTDST16(RecompPos,0xC081); break;
case x86_EBX: PUTDST16(RecompPos,0xC381); break; case x86_EBX: PUTDST16(RecompPos,0xC381); break;

2
Source/RSP/X86.h
View File

@ -46,7 +46,7 @@ void AdcConstToX86reg ( BYTE Constant, int x86reg );
void AdcConstToVariable ( void *Variable, char *VariableName, BYTE Constant ); void AdcConstToVariable ( void *Variable, char *VariableName, BYTE Constant );
void AdcConstHalfToVariable ( void *Variable, char *VariableName, BYTE Constant ); void AdcConstHalfToVariable ( void *Variable, char *VariableName, BYTE Constant );
void AddConstToVariable ( DWORD Const, void *Variable, char *VariableName ); void AddConstToVariable ( DWORD Const, void *Variable, char *VariableName );
void AddConstToX86Reg ( int x86Reg, DWORD Const ); void AddConstToX86Reg ( int x86Reg, size_t Const );
void AddVariableToX86reg ( int x86reg, void * Variable, char * VariableName ); void AddVariableToX86reg ( int x86reg, void * Variable, char * VariableName );
void AddX86regToVariable ( int x86reg, void * Variable, char * VariableName ); void AddX86regToVariable ( int x86reg, void * Variable, char * VariableName );
void AddX86regHalfToVariable ( int x86reg, void * Variable, char * VariableName ); void AddX86regHalfToVariable ( int x86reg, void * Variable, char * VariableName );