notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #735 from pcercuei/fix-win32-build-part-2
[pcsx_rearmed.git]
/
libpcsxcore
/
new_dynarec
/
assem_arm64.c
diff --git
a/libpcsxcore/new_dynarec/assem_arm64.c
b/libpcsxcore/new_dynarec/assem_arm64.c
index
67ce02a
..
6f9c91d
100644
(file)
--- a/
libpcsxcore/new_dynarec/assem_arm64.c
+++ b/
libpcsxcore/new_dynarec/assem_arm64.c
@@
-463,7
+463,7
@@
static void emit_loadreg(u_int r, u_int hr)
//case HIREG: addr = &hi; break;
//case LOREG: addr = &lo; break;
case CCREG: addr = &cycle_count; break;
//case HIREG: addr = &hi; break;
//case LOREG: addr = &lo; break;
case CCREG: addr = &cycle_count; break;
- case CSREG: addr = &psxRegs.CP0.n.S
tatus
; break;
+ case CSREG: addr = &psxRegs.CP0.n.S
R
; break;
case INVCP: addr = &invc_ptr; is64 = 1; break;
case ROREG: addr = &ram_offset; is64 = 1; break;
default:
case INVCP: addr = &invc_ptr; is64 = 1; break;
case ROREG: addr = &ram_offset; is64 = 1; break;
default:
@@
-629,6
+629,11
@@
static void emit_addimm64(u_int rs, uintptr_t imm, u_int rt)
emit_addimm_s(0, 1, rs, imm, rt);
}
emit_addimm_s(0, 1, rs, imm, rt);
}
+static void emit_addimm_ptr(u_int rs, uintptr_t imm, u_int rt)
+{
+ emit_addimm64(rs, imm, rt);
+}
+
static void emit_addimm_and_set_flags(int imm, u_int rt)
{
emit_addimm_s(1, 0, rt, imm, rt);
static void emit_addimm_and_set_flags(int imm, u_int rt)
{
emit_addimm_s(1, 0, rt, imm, rt);