From 8b6a5f2eccbab5951b9b2ddae88b409dfe7c58bb Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 18 Nov 2014 01:06:25 -0800 Subject: [PATCH] mips: Duh, oops. LUI is one reg, of course. --- Common/MipsEmitter.cpp | 6 +++--- Common/MipsEmitter.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Common/MipsEmitter.cpp b/Common/MipsEmitter.cpp index 4e9c5d531a..2465f76faf 100644 --- a/Common/MipsEmitter.cpp +++ b/Common/MipsEmitter.cpp @@ -236,10 +236,10 @@ void MIPSXEmitter::XORI(MIPSReg rt, MIPSReg rs, s16 imm) { _dbg_assert_msg_(JIT, rs < F_BASE && rt < F_BASE, "Bad emitter arguments"); Write32Fields(26, 0x0e, 21, rs, 16, rt, 0, (u16)imm); } -void MIPSXEmitter::LUI(MIPSReg rt, MIPSReg rs, s16 imm) { +void MIPSXEmitter::LUI(MIPSReg rt, s16 imm) { // 001111 sssss ttttt iiiiiiiiiiiiiiii - _dbg_assert_msg_(JIT, rs < F_BASE && rt < F_BASE, "Bad emitter arguments"); - Write32Fields(26, 0x0f, 21, rs, 16, rt, 0, (u16)imm); + _dbg_assert_msg_(JIT, rt < F_BASE, "Bad emitter arguments"); + Write32Fields(26, 0x0f, 21, rt, 0, (u16)imm); } void MIPSXCodeBlock::AllocCodeSpace(int size) { diff --git a/Common/MipsEmitter.h b/Common/MipsEmitter.h index 4a4c6ae1d4..083698f617 100644 --- a/Common/MipsEmitter.h +++ b/Common/MipsEmitter.h @@ -146,7 +146,7 @@ public: void XORI(MIPSReg rt, MIPSReg rs, s16 imm); // Clears the lower bits. - void LUI(MIPSReg rt, MIPSReg rs, s16 imm); + void LUI(MIPSReg rt, s16 imm); protected: inline void Write32(u32 value) {