diff options
| author | 2020-06-15 18:59:54 +0100 | |
|---|---|---|
| committer | 2020-06-15 18:59:54 +0100 | |
| commit | d563017dfe63aaa26e7c08369995838f8b9fdafb (patch) | |
| tree | 9ddaa9082abcdf5c98f13e37a921a45041c0ec99 /src/video_core/macro | |
| parent | xbyak_abi: Fix ABI_PushRegistersAndAdjustStack (diff) | |
| download | yuzu-d563017dfe63aaa26e7c08369995838f8b9fdafb.tar.gz yuzu-d563017dfe63aaa26e7c08369995838f8b9fdafb.tar.xz yuzu-d563017dfe63aaa26e7c08369995838f8b9fdafb.zip | |
xbyak_abi: Remove *GPS variants of stack manipulation functions
Diffstat (limited to 'src/video_core/macro')
| -rw-r--r-- | src/video_core/macro/macro_jit_x64.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/macro/macro_jit_x64.cpp b/src/video_core/macro/macro_jit_x64.cpp index 11c1cc3be..2d82c8cff 100644 --- a/src/video_core/macro/macro_jit_x64.cpp +++ b/src/video_core/macro/macro_jit_x64.cpp | |||
| @@ -302,22 +302,22 @@ void MacroJITx64Impl::Compile_Read(Macro::Opcode opcode) { | |||
| 302 | sub(result, opcode.immediate * -1); | 302 | sub(result, opcode.immediate * -1); |
| 303 | } | 303 | } |
| 304 | } | 304 | } |
| 305 | Common::X64::ABI_PushRegistersAndAdjustStackGPS(*this, PersistentCallerSavedRegs(), 0); | 305 | Common::X64::ABI_PushRegistersAndAdjustStack(*this, PersistentCallerSavedRegs(), 0); |
| 306 | mov(Common::X64::ABI_PARAM1, qword[STATE]); | 306 | mov(Common::X64::ABI_PARAM1, qword[STATE]); |
| 307 | mov(Common::X64::ABI_PARAM2, RESULT); | 307 | mov(Common::X64::ABI_PARAM2, RESULT); |
| 308 | Common::X64::CallFarFunction(*this, &Read); | 308 | Common::X64::CallFarFunction(*this, &Read); |
| 309 | Common::X64::ABI_PopRegistersAndAdjustStackGPS(*this, PersistentCallerSavedRegs(), 0); | 309 | Common::X64::ABI_PopRegistersAndAdjustStack(*this, PersistentCallerSavedRegs(), 0); |
| 310 | mov(RESULT, Common::X64::ABI_RETURN.cvt32()); | 310 | mov(RESULT, Common::X64::ABI_RETURN.cvt32()); |
| 311 | Compile_ProcessResult(opcode.result_operation, opcode.dst); | 311 | Compile_ProcessResult(opcode.result_operation, opcode.dst); |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | void Tegra::MacroJITx64Impl::Compile_Send(Xbyak::Reg32 value) { | 314 | void Tegra::MacroJITx64Impl::Compile_Send(Xbyak::Reg32 value) { |
| 315 | Common::X64::ABI_PushRegistersAndAdjustStackGPS(*this, PersistentCallerSavedRegs(), 0); | 315 | Common::X64::ABI_PushRegistersAndAdjustStack(*this, PersistentCallerSavedRegs(), 0); |
| 316 | mov(Common::X64::ABI_PARAM1, qword[STATE]); | 316 | mov(Common::X64::ABI_PARAM1, qword[STATE]); |
| 317 | mov(Common::X64::ABI_PARAM2, METHOD_ADDRESS); | 317 | mov(Common::X64::ABI_PARAM2, METHOD_ADDRESS); |
| 318 | mov(Common::X64::ABI_PARAM3, value); | 318 | mov(Common::X64::ABI_PARAM3, value); |
| 319 | Common::X64::CallFarFunction(*this, &Send); | 319 | Common::X64::CallFarFunction(*this, &Send); |
| 320 | Common::X64::ABI_PopRegistersAndAdjustStackGPS(*this, PersistentCallerSavedRegs(), 0); | 320 | Common::X64::ABI_PopRegistersAndAdjustStack(*this, PersistentCallerSavedRegs(), 0); |
| 321 | 321 | ||
| 322 | Xbyak::Label dont_process{}; | 322 | Xbyak::Label dont_process{}; |
| 323 | // Get increment | 323 | // Get increment |
| @@ -421,7 +421,7 @@ void MacroJITx64Impl::Compile() { | |||
| 421 | bool keep_executing = true; | 421 | bool keep_executing = true; |
| 422 | labels.fill(Xbyak::Label()); | 422 | labels.fill(Xbyak::Label()); |
| 423 | 423 | ||
| 424 | Common::X64::ABI_PushRegistersAndAdjustStackGPS(*this, Common::X64::ABI_ALL_CALLEE_SAVED, 8); | 424 | Common::X64::ABI_PushRegistersAndAdjustStack(*this, Common::X64::ABI_ALL_CALLEE_SAVED, 8); |
| 425 | // JIT state | 425 | // JIT state |
| 426 | mov(STATE, Common::X64::ABI_PARAM1); | 426 | mov(STATE, Common::X64::ABI_PARAM1); |
| 427 | mov(PARAMETERS, qword[Common::X64::ABI_PARAM1 + | 427 | mov(PARAMETERS, qword[Common::X64::ABI_PARAM1 + |
| @@ -463,7 +463,7 @@ void MacroJITx64Impl::Compile() { | |||
| 463 | 463 | ||
| 464 | L(end_of_code); | 464 | L(end_of_code); |
| 465 | 465 | ||
| 466 | Common::X64::ABI_PopRegistersAndAdjustStackGPS(*this, Common::X64::ABI_ALL_CALLEE_SAVED, 8); | 466 | Common::X64::ABI_PopRegistersAndAdjustStack(*this, Common::X64::ABI_ALL_CALLEE_SAVED, 8); |
| 467 | ret(); | 467 | ret(); |
| 468 | ready(); | 468 | ready(); |
| 469 | program = getCode<ProgramType>(); | 469 | program = getCode<ProgramType>(); |