From fb11fd44402e6852754d6786a1921c57160def50 Mon Sep 17 00:00:00 2001 From: wheremyfoodat Date: Thu, 8 Jun 2023 22:50:59 +0300 Subject: [PATCH] Fix merge conflict screwing up everything --- include/PICA/dynapica/shader_rec_emitter_x64.hpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/PICA/dynapica/shader_rec_emitter_x64.hpp b/include/PICA/dynapica/shader_rec_emitter_x64.hpp index 16b7bc89..99517bd1 100644 --- a/include/PICA/dynapica/shader_rec_emitter_x64.hpp +++ b/include/PICA/dynapica/shader_rec_emitter_x64.hpp @@ -32,7 +32,13 @@ class ShaderEmitter : public Xbyak::CodeGenerator { return (opcode == ShaderOpcodes::CALL) || (opcode == ShaderOpcodes::CALLC) || (opcode == ShaderOpcodes::CALLU); } // Scan the shader code for call instructions to fill up the returnPCs vector before starting compilation - void scanForCalls(const PICAShader& shader); + void scanForCalls(const PICAShader& shaderUnit); + + // Load register with number "srcReg" indexed by index "idx" into the xmm register "reg" + void loadRegister(Xmm dest, const PICAShader& shader, u32 srcReg, u32 idx); + + // Instruction recompilation functions + void recMOV(const PICAShader& shader, u32 instruction); public: using InstructionCallback = const void(*)(PICAShader& shaderUnit); // Callback type used for instructions