RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sh2 drc, fix conditional immediate for armv7

Browse source
This commit is contained in:
kub 2024-05-19 20:45:44 +00:00
parent 735a987b27
commit 65b37c5a3b
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cpu/drc/emit_arm.c
View file

@ -425,11 +425,11 @@ static void emith_flush(void)
#define EOP_MSR_IMM(ror2,imm) EOP_C_MSR_IMM(A_COND_AL,ror2,imm) #define EOP_MSR_IMM(ror2,imm) EOP_C_MSR_IMM(A_COND_AL,ror2,imm)
#define EOP_MSR_REG(rm) EOP_C_MSR_REG(A_COND_AL,rm) #define EOP_MSR_REG(rm) EOP_C_MSR_REG(A_COND_AL,rm)
#define EOP_MOVW(rd,imm) \ #define EOP_MOVW(cond,rd,imm) \
EMIT(0xe3000000 | ((rd)<<12) | ((imm)&0xfff) | (((imm)<<4)&0xf0000), M1(rd), NO) EMIT(((cond)<<28) | 0x03000000 | ((rd)<<12) | ((imm)&0xfff) | (((imm)<<4)&0xf0000), M1(rd), NO)
#define EOP_MOVT(rd,imm) \ #define EOP_MOVT(cond,rd,imm) \
EMIT(0xe3400000 | ((rd)<<12) | (((imm)>>16)&0xfff) | (((imm)>>12)&0xf0000), M1(rd), NO) EMIT(((cond)<<28) | 0x03400000 | ((rd)<<12) | (((imm)>>16)&0xfff) | (((imm)>>12)&0xf0000), M1(rd), NO)
// host literal pool; must be significantly smaller than 1024 (max LDR offset = 4096) // host literal pool; must be significantly smaller than 1024 (max LDR offset = 4096)
#define MAX_HOST_LITERALS 128 #define MAX_HOST_LITERALS 128
@ -486,9 +486,9 @@ static void emith_op_imm2(int cond, int s, int op, int rd, int rn, unsigned int
if (op == A_OP_MVN) if (op == A_OP_MVN)
imm = ~imm; imm = ~imm;
// ...prefer movw/movt // ...prefer movw/movt
EOP_MOVW(rd, imm); EOP_MOVW(cond,rd, imm);
if (imm & 0xffff0000) if (imm & 0xffff0000)
EOP_MOVT(rd, imm); EOP_MOVT(cond,rd, imm);
return; return;
} }
#else #else
@ -512,7 +512,7 @@ static void emith_op_imm2(int cond, int s, int op, int rd, int rn, unsigned int
EOP_C_DOP_IMM(cond, A_OP_ADD, 0,rd,rd,0,o); EOP_C_DOP_IMM(cond, A_OP_ADD, 0,rd,rd,0,o);
else if (o < 0) else if (o < 0)
EOP_C_DOP_IMM(cond, A_OP_SUB, 0,rd,rd,0,-o); EOP_C_DOP_IMM(cond, A_OP_SUB, 0,rd,rd,0,-o);
return; return;
} }
#endif #endif
break; break;