From ff1f6d3d4f7ecb5cd967488f3b9f6ceb96774813 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Mon, 27 Jul 2015 04:07:05 +0300 Subject: [PATCH] PPUInterpreter formal fix (affects nothing) --- rpcs3/Emu/Cell/PPUInterpreter.cpp | 12 ++++++------ rpcs3/Emu/Cell/PPUInterpreter.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/Emu/Cell/PPUInterpreter.cpp index ce2c2330c2..21b45365b5 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/PPUInterpreter.cpp @@ -2488,7 +2488,7 @@ void ppu_interpreter::LVLX(PPUThread& CPU, ppu_opcode_t op) void ppu_interpreter::LDBRX(PPUThread& CPU, ppu_opcode_t op) { const u64 addr = op.ra ? CPU.GPR[op.ra] + CPU.GPR[op.rb] : CPU.GPR[op.rb]; - CPU.GPR[op.rd] = vm::get_ref(VM_CAST(addr)); + CPU.GPR[op.rd] = vm::get_ref>(VM_CAST(addr)); } void ppu_interpreter::LSWX(PPUThread& CPU, ppu_opcode_t op) @@ -2514,7 +2514,7 @@ void ppu_interpreter::LSWX(PPUThread& CPU, ppu_opcode_t op) void ppu_interpreter::LWBRX(PPUThread& CPU, ppu_opcode_t op) { const u64 addr = op.ra ? CPU.GPR[op.ra] + CPU.GPR[op.rb] : CPU.GPR[op.rb]; - CPU.GPR[op.rd] = vm::get_ref(VM_CAST(addr)); + CPU.GPR[op.rd] = vm::get_ref>(VM_CAST(addr)); } void ppu_interpreter::LFSX(PPUThread& CPU, ppu_opcode_t op) @@ -2619,7 +2619,7 @@ void ppu_interpreter::STVLX(PPUThread& CPU, ppu_opcode_t op) void ppu_interpreter::STDBRX(PPUThread& CPU, ppu_opcode_t op) { const u64 addr = op.ra ? CPU.GPR[op.ra] + CPU.GPR[op.rb] : CPU.GPR[op.rb]; - vm::get_ref(VM_CAST(addr)) = CPU.GPR[op.rs]; + vm::get_ref>(VM_CAST(addr)) = CPU.GPR[op.rs]; } void ppu_interpreter::STSWX(PPUThread& CPU, ppu_opcode_t op) @@ -2644,7 +2644,7 @@ void ppu_interpreter::STSWX(PPUThread& CPU, ppu_opcode_t op) void ppu_interpreter::STWBRX(PPUThread& CPU, ppu_opcode_t op) { const u64 addr = op.ra ? CPU.GPR[op.ra] + CPU.GPR[op.rb] : CPU.GPR[op.rb]; - vm::get_ref(VM_CAST(addr)) = (u32)CPU.GPR[op.rs]; + vm::get_ref>(VM_CAST(addr)) = (u32)CPU.GPR[op.rs]; } void ppu_interpreter::STFSX(PPUThread& CPU, ppu_opcode_t op) @@ -2722,7 +2722,7 @@ void ppu_interpreter::LVLXL(PPUThread& CPU, ppu_opcode_t op) void ppu_interpreter::LHBRX(PPUThread& CPU, ppu_opcode_t op) { const u64 addr = op.ra ? CPU.GPR[op.ra] + CPU.GPR[op.rb] : CPU.GPR[op.rb]; - CPU.GPR[op.rd] = vm::get_ref(VM_CAST(addr)); + CPU.GPR[op.rd] = vm::get_ref>(VM_CAST(addr)); } void ppu_interpreter::SRAW(PPUThread& CPU, ppu_opcode_t op) @@ -2809,7 +2809,7 @@ void ppu_interpreter::STVLXL(PPUThread& CPU, ppu_opcode_t op) void ppu_interpreter::STHBRX(PPUThread& CPU, ppu_opcode_t op) { const u64 addr = op.ra ? CPU.GPR[op.ra] + CPU.GPR[op.rb] : CPU.GPR[op.rb]; - vm::get_ref(VM_CAST(addr)) = (u16)CPU.GPR[op.rs]; + vm::get_ref>(VM_CAST(addr)) = (u16)CPU.GPR[op.rs]; } void ppu_interpreter::EXTSH(PPUThread& CPU, ppu_opcode_t op) diff --git a/rpcs3/Emu/Cell/PPUInterpreter.h b/rpcs3/Emu/Cell/PPUInterpreter.h index 94948cc7bd..c9c4ea7482 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.h +++ b/rpcs3/Emu/Cell/PPUInterpreter.h @@ -3072,7 +3072,7 @@ private: void LDBRX(u32 rd, u32 ra, u32 rb) { const u64 addr = ra ? CPU.GPR[ra] + CPU.GPR[rb] : CPU.GPR[rb]; - CPU.GPR[rd] = vm::get_ref(VM_CAST(addr)); + CPU.GPR[rd] = vm::get_ref>(VM_CAST(addr)); } void LSWX(u32 rd, u32 ra, u32 rb) { @@ -3096,7 +3096,7 @@ private: void LWBRX(u32 rd, u32 ra, u32 rb) { const u64 addr = ra ? CPU.GPR[ra] + CPU.GPR[rb] : CPU.GPR[rb]; - CPU.GPR[rd] = vm::get_ref(VM_CAST(addr)); + CPU.GPR[rd] = vm::get_ref>(VM_CAST(addr)); } void LFSX(u32 frd, u32 ra, u32 rb) { @@ -3208,7 +3208,7 @@ private: void STDBRX(u32 rs, u32 ra, u32 rb) { const u64 addr = ra ? CPU.GPR[ra] + CPU.GPR[rb] : CPU.GPR[rb]; - vm::get_ref(VM_CAST(addr)) = CPU.GPR[rs]; + vm::get_ref>(VM_CAST(addr)) = CPU.GPR[rs]; } void STSWX(u32 rs, u32 ra, u32 rb) { @@ -3231,7 +3231,7 @@ private: void STWBRX(u32 rs, u32 ra, u32 rb) { const u64 addr = ra ? CPU.GPR[ra] + CPU.GPR[rb] : CPU.GPR[rb]; - vm::get_ref(VM_CAST(addr)) = (u32)CPU.GPR[rs]; + vm::get_ref>(VM_CAST(addr)) = (u32)CPU.GPR[rs]; } void STFSX(u32 frs, u32 ra, u32 rb) { @@ -3321,7 +3321,7 @@ private: void LHBRX(u32 rd, u32 ra, u32 rb) { const u64 addr = ra ? CPU.GPR[ra] + CPU.GPR[rb] : CPU.GPR[rb]; - CPU.GPR[rd] = vm::get_ref(VM_CAST(addr)); + CPU.GPR[rd] = vm::get_ref>(VM_CAST(addr)); } void SRAW(u32 ra, u32 rs, u32 rb, u32 rc) { @@ -3402,7 +3402,7 @@ private: void STHBRX(u32 rs, u32 ra, u32 rb) { const u64 addr = ra ? CPU.GPR[ra] + CPU.GPR[rb] : CPU.GPR[rb]; - vm::get_ref(VM_CAST(addr)) = (u16)CPU.GPR[rs]; + vm::get_ref>(VM_CAST(addr)) = (u16)CPU.GPR[rs]; } void EXTSH(u32 ra, u32 rs, u32 rc) {