diff options
author | bunnei <bunneidev@gmail.com> | 2015-09-02 14:46:58 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-09-02 14:46:58 +0200 |
commit | 918ca40c68838503b0c94891b9672762d734269f (patch) | |
tree | 9686b400e74867f13ba3b837caedd52d618f9466 /src/video_core/shader | |
parent | Merge pull request #1099 from aroulin/video-core-format-specifier (diff) | |
parent | x64: Proper stack alignment in shader JIT function calls (diff) | |
download | yuzu-918ca40c68838503b0c94891b9672762d734269f.tar yuzu-918ca40c68838503b0c94891b9672762d734269f.tar.gz yuzu-918ca40c68838503b0c94891b9672762d734269f.tar.bz2 yuzu-918ca40c68838503b0c94891b9672762d734269f.tar.lz yuzu-918ca40c68838503b0c94891b9672762d734269f.tar.xz yuzu-918ca40c68838503b0c94891b9672762d734269f.tar.zst yuzu-918ca40c68838503b0c94891b9672762d734269f.zip |
Diffstat (limited to 'src/video_core/shader')
-rw-r--r-- | src/video_core/shader/shader_jit_x64.cpp | 43 | ||||
-rw-r--r-- | src/video_core/shader/shader_jit_x64.h | 3 |
2 files changed, 18 insertions, 28 deletions
diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp index 1039c8df4..b9a0b19e3 100644 --- a/src/video_core/shader/shader_jit_x64.cpp +++ b/src/video_core/shader/shader_jit_x64.cpp @@ -122,6 +122,14 @@ static const X64Reg ONE = XMM14; /// Constant vector of [-0.f, -0.f, -0.f, -0.f], used to efficiently negate a vector with XOR static const X64Reg NEGBIT = XMM15; +// State registers that must not be modified by external functions calls +// Scratch registers, e.g., SRC1 and SCRATCH, have to be saved on the side if needed +static const BitSet32 persistent_regs = { + UNIFORMS, REGISTERS, // Pointers to register blocks + ADDROFFS_REG_0, ADDROFFS_REG_1, LOOPCOUNT_REG, COND0, COND1, // Cached registers + ONE+16, NEGBIT+16, // Constants +}; + /// Raw constant for the source register selector that indicates no swizzling is performed static const u8 NO_SRC_REG_SWIZZLE = 0x1b; /// Raw constant for the destination register enable mask that indicates all components are enabled @@ -295,20 +303,8 @@ void JitCompiler::Compile_UniformCondition(Instruction instr) { CMP(sizeof(bool) * 8, MDisp(UNIFORMS, offset), Imm8(0)); } -void JitCompiler::Compile_PushCallerSavedXMM() { -#ifndef _WIN32 - SUB(64, R(RSP), Imm8(2 * 16)); - MOVUPS(MDisp(RSP, 16), ONE); - MOVUPS(MDisp(RSP, 0), NEGBIT); -#endif -} - -void JitCompiler::Compile_PopCallerSavedXMM() { -#ifndef _WIN32 - MOVUPS(NEGBIT, MDisp(RSP, 0)); - MOVUPS(ONE, MDisp(RSP, 16)); - ADD(64, R(RSP), Imm8(2 * 16)); -#endif +BitSet32 JitCompiler::PersistentCallerSavedRegs() { + return persistent_regs & ABI_ALL_CALLER_SAVED; } void JitCompiler::Compile_ADD(Instruction instr) { @@ -390,12 +386,9 @@ void JitCompiler::Compile_EX2(Instruction instr) { Compile_SwizzleSrc(instr, 1, instr.common.src1, SRC1); MOVSS(XMM0, R(SRC1)); - // The following will actually break the stack alignment - ABI_PushAllCallerSavedRegsAndAdjustStack(); - Compile_PushCallerSavedXMM(); + ABI_PushRegistersAndAdjustStack(PersistentCallerSavedRegs(), 0); ABI_CallFunction(reinterpret_cast<const void*>(exp2f)); - Compile_PopCallerSavedXMM(); - ABI_PopAllCallerSavedRegsAndAdjustStack(); + ABI_PopRegistersAndAdjustStack(PersistentCallerSavedRegs(), 0); SHUFPS(XMM0, R(XMM0), _MM_SHUFFLE(0, 0, 0, 0)); MOVAPS(SRC1, R(XMM0)); @@ -406,12 +399,9 @@ void JitCompiler::Compile_LG2(Instruction instr) { Compile_SwizzleSrc(instr, 1, instr.common.src1, SRC1); MOVSS(XMM0, R(SRC1)); - // The following will actually break the stack alignment - ABI_PushAllCallerSavedRegsAndAdjustStack(); - Compile_PushCallerSavedXMM(); + ABI_PushRegistersAndAdjustStack(PersistentCallerSavedRegs(), 0); ABI_CallFunction(reinterpret_cast<const void*>(log2f)); - Compile_PopCallerSavedXMM(); - ABI_PopAllCallerSavedRegsAndAdjustStack(); + ABI_PopRegistersAndAdjustStack(PersistentCallerSavedRegs(), 0); SHUFPS(XMM0, R(XMM0), _MM_SHUFFLE(0, 0, 0, 0)); MOVAPS(SRC1, R(XMM0)); @@ -560,7 +550,7 @@ void JitCompiler::Compile_NOP(Instruction instr) { } void JitCompiler::Compile_END(Instruction instr) { - ABI_PopAllCalleeSavedRegsAndAdjustStack(); + ABI_PopRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8); RET(); } @@ -756,7 +746,8 @@ CompiledShader* JitCompiler::Compile() { const auto& code = g_state.vs.program_code; unsigned offset = g_state.regs.vs.main_offset; - ABI_PushAllCalleeSavedRegsAndAdjustStack(); + // The stack pointer is 8 modulo 16 at the entry of a procedure + ABI_PushRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8); MOV(PTRBITS, R(REGISTERS), R(ABI_PARAM1)); MOV(PTRBITS, R(UNIFORMS), ImmPtr(&g_state.vs.uniforms)); diff --git a/src/video_core/shader/shader_jit_x64.h b/src/video_core/shader/shader_jit_x64.h index 58828ecc8..8668cfff4 100644 --- a/src/video_core/shader/shader_jit_x64.h +++ b/src/video_core/shader/shader_jit_x64.h @@ -77,8 +77,7 @@ private: void Compile_EvaluateCondition(Instruction instr); void Compile_UniformCondition(Instruction instr); - void Compile_PushCallerSavedXMM(); - void Compile_PopCallerSavedXMM(); + BitSet32 PersistentCallerSavedRegs(); /// Pointer to the variable that stores the current Pica code offset. Used to handle nested code blocks. unsigned* offset_ptr = nullptr; |