aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornotaz2011-06-07 12:34:50 +0300
committernotaz2011-06-07 12:48:07 +0300
commitc2e3bd42a14cb253ec5cc3e04dd86a2f83e13615 (patch)
tree1a620b9246f5cc12ac35531173461cae86dbafc4
parent8b440215108475924eeb7b613f4bdd1924b5f86a (diff)
downloadpcsx_rearmed-c2e3bd42a14cb253ec5cc3e04dd86a2f83e13615.tar.gz
pcsx_rearmed-c2e3bd42a14cb253ec5cc3e04dd86a2f83e13615.tar.bz2
pcsx_rearmed-c2e3bd42a14cb253ec5cc3e04dd86a2f83e13615.zip
drc: fix warning in my code
-rw-r--r--libpcsxcore/new_dynarec/assem_arm.c3
-rw-r--r--libpcsxcore/new_dynarec/new_dynarec.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/libpcsxcore/new_dynarec/assem_arm.c b/libpcsxcore/new_dynarec/assem_arm.c
index 41d2e71..539ee4e 100644
--- a/libpcsxcore/new_dynarec/assem_arm.c
+++ b/libpcsxcore/new_dynarec/assem_arm.c
@@ -845,7 +845,8 @@ u_int rd_rn_imm_shift(u_int rd, u_int rn, u_int imm, u_int shift)
}
u_int genimm(u_int imm,u_int *encoded)
{
- if(imm==0) {*encoded=0;return 1;}
+ *encoded=0;
+ if(imm==0) return 1;
int i=32;
while(i>0)
{
diff --git a/libpcsxcore/new_dynarec/new_dynarec.c b/libpcsxcore/new_dynarec/new_dynarec.c
index d0cdc5c..553d5bb 100644
--- a/libpcsxcore/new_dynarec/new_dynarec.c
+++ b/libpcsxcore/new_dynarec/new_dynarec.c
@@ -3744,7 +3744,7 @@ void c2ls_assemble(int i,struct regstat *i_regs)
int ar;
int offset;
int memtarget=0,c=0;
- int jaddr,jaddr2=0,jaddr3,type;
+ int jaddr2=0,jaddr3,type;
int agr=AGEN1+(i&1);
u_int hr,reglist=0;
u_int copr=(source[i]>>16)&0x1f;
@@ -7899,7 +7899,7 @@ int new_recompile_block(int addr)
#ifdef PCSX
if(!sp_in_mirror&&(signed int)(psxRegs.GPR.n.sp&0xffe00000)>0x80200000&&
0x10000<=psxRegs.GPR.n.sp&&(psxRegs.GPR.n.sp&~0xe0e00000)<RAM_SIZE) {
- printf("SP hack enabled (%08x), @%08x\n", psxRegs.GPR.n.sp);
+ printf("SP hack enabled (%08x), @%08x\n", psxRegs.GPR.n.sp, psxRegs.pc);
sp_in_mirror=1;
}
if (Config.HLE && start == 0x80001000) // hlecall