eitan.c/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #1367 from yuriks/jit-jmp

Browse source 
Shader JIT: Fix off-by-one error when compiling JMPs
This commit is contained in:
bunnei 2016-01-27 09:19:28 -05:00
commit a43f8d2fb7
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/video_core/shader/shader_jit_x64.cpp
View file

@ -653,7 +653,7 @@ void JitCompiler::Compile_IF(Instruction instr) {
FixupBranch b = J_CC(CC_Z, true); FixupBranch b = J_CC(CC_Z, true);
// Compile the code that corresponds to the condition evaluating as true // Compile the code that corresponds to the condition evaluating as true
Compile_Block(instr.flow_control.dest_offset - 1); Compile_Block(instr.flow_control.dest_offset);
// If there isn't an "ELSE" condition, we are done here // If there isn't an "ELSE" condition, we are done here
if (instr.flow_control.num_instructions == 0) { if (instr.flow_control.num_instructions == 0) {
@ -667,7 +667,7 @@ void JitCompiler::Compile_IF(Instruction instr) {
// This code corresponds to the "ELSE" condition // This code corresponds to the "ELSE" condition
// Comple the code that corresponds to the condition evaluating as false // Comple the code that corresponds to the condition evaluating as false
Compile_Block(instr.flow_control.dest_offset + instr.flow_control.num_instructions - 1); Compile_Block(instr.flow_control.dest_offset + instr.flow_control.num_instructions);
SetJumpTarget(b2); SetJumpTarget(b2);
} }
@ -691,7 +691,7 @@ void JitCompiler::Compile_LOOP(Instruction instr) {
auto loop_start = GetCodePtr(); auto loop_start = GetCodePtr();
Compile_Block(instr.flow_control.dest_offset); Compile_Block(instr.flow_control.dest_offset + 1);
ADD(32, R(LOOPCOUNT_REG), R(LOOPINC)); // Increment LOOPCOUNT_REG by Z-component ADD(32, R(LOOPCOUNT_REG), R(LOOPINC)); // Increment LOOPCOUNT_REG by Z-component
SUB(32, R(LOOPCOUNT), Imm8(1)); // Increment loop count by 1 SUB(32, R(LOOPCOUNT), Imm8(1)); // Increment loop count by 1
@ -719,12 +719,12 @@ void JitCompiler::Compile_JMP(Instruction instr) {
SetJumpTarget(b); SetJumpTarget(b);
} }
void JitCompiler::Compile_Block(unsigned stop) { void JitCompiler::Compile_Block(unsigned end) {
// Save current offset pointer // Save current offset pointer
unsigned* prev_offset_ptr = offset_ptr; unsigned* prev_offset_ptr = offset_ptr;
unsigned offset = *prev_offset_ptr; unsigned offset = *prev_offset_ptr;
while (offset <= stop) while (offset < end)
Compile_NextInstr(&offset); Compile_NextInstr(&offset);
// Restore current offset pointer // Restore current offset pointer

2
src/video_core/shader/shader_jit_x64.h
View file

@ -61,7 +61,7 @@ public:
void Compile_MAD(Instruction instr); void Compile_MAD(Instruction instr);
private: private:
void Compile_Block(unsigned stop); void Compile_Block(unsigned end);
void Compile_NextInstr(unsigned* offset); void Compile_NextInstr(unsigned* offset);
void Compile_SwizzleSrc(Instruction instr, unsigned src_num, SourceRegister src_reg, Gen::X64Reg dest); void Compile_SwizzleSrc(Instruction instr, unsigned src_num, SourceRegister src_reg, Gen::X64Reg dest);