summaryrefslogtreecommitdiff
path: root/src/video_core/macro
diff options
context:
space:
mode:
authorGravatar bunnei2020-06-17 11:20:52 -0400
committerGravatar GitHub2020-06-17 11:20:52 -0400
commita8ac99b6191bbfd03f22b2de4ddc9ec55183172a (patch)
treed844e3f5c6bf903e92bb8542932bfe4525753bbf /src/video_core/macro
parentMerge pull request #4089 from MerryMage/macrojit-cleanup-1 (diff)
parentxbyak_abi: Prefer returning a struct to using out parameters in ABI_Calculate... (diff)
downloadyuzu-a8ac99b6191bbfd03f22b2de4ddc9ec55183172a.tar.gz
yuzu-a8ac99b6191bbfd03f22b2de4ddc9ec55183172a.tar.xz
yuzu-a8ac99b6191bbfd03f22b2de4ddc9ec55183172a.zip
Merge pull request #4086 from MerryMage/abi
xbyak_abi: Cleanup
Diffstat (limited to 'src/video_core/macro')
-rw-r--r--src/video_core/macro/macro_jit_x64.cpp12
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 2eb98173d..d4a97ec7b 100644
--- a/src/video_core/macro/macro_jit_x64.cpp
+++ b/src/video_core/macro/macro_jit_x64.cpp
@@ -295,22 +295,22 @@ void MacroJITx64Impl::Compile_Read(Macro::Opcode opcode) {
295 sub(result, opcode.immediate * -1); 295 sub(result, opcode.immediate * -1);
296 } 296 }
297 } 297 }
298 Common::X64::ABI_PushRegistersAndAdjustStackGPS(*this, PersistentCallerSavedRegs(), 0); 298 Common::X64::ABI_PushRegistersAndAdjustStack(*this, PersistentCallerSavedRegs(), 0);
299 mov(Common::X64::ABI_PARAM1, qword[STATE]); 299 mov(Common::X64::ABI_PARAM1, qword[STATE]);
300 mov(Common::X64::ABI_PARAM2, RESULT); 300 mov(Common::X64::ABI_PARAM2, RESULT);
301 Common::X64::CallFarFunction(*this, &Read); 301 Common::X64::CallFarFunction(*this, &Read);
302 Common::X64::ABI_PopRegistersAndAdjustStackGPS(*this, PersistentCallerSavedRegs(), 0); 302 Common::X64::ABI_PopRegistersAndAdjustStack(*this, PersistentCallerSavedRegs(), 0);
303 mov(RESULT, Common::X64::ABI_RETURN.cvt32()); 303 mov(RESULT, Common::X64::ABI_RETURN.cvt32());
304 Compile_ProcessResult(opcode.result_operation, opcode.dst); 304 Compile_ProcessResult(opcode.result_operation, opcode.dst);
305} 305}
306 306
307void Tegra::MacroJITx64Impl::Compile_Send(Xbyak::Reg32 value) { 307void Tegra::MacroJITx64Impl::Compile_Send(Xbyak::Reg32 value) {
308 Common::X64::ABI_PushRegistersAndAdjustStackGPS(*this, PersistentCallerSavedRegs(), 0); 308 Common::X64::ABI_PushRegistersAndAdjustStack(*this, PersistentCallerSavedRegs(), 0);
309 mov(Common::X64::ABI_PARAM1, qword[STATE]); 309 mov(Common::X64::ABI_PARAM1, qword[STATE]);
310 mov(Common::X64::ABI_PARAM2, METHOD_ADDRESS); 310 mov(Common::X64::ABI_PARAM2, METHOD_ADDRESS);
311 mov(Common::X64::ABI_PARAM3, value); 311 mov(Common::X64::ABI_PARAM3, value);
312 Common::X64::CallFarFunction(*this, &Send); 312 Common::X64::CallFarFunction(*this, &Send);
313 Common::X64::ABI_PopRegistersAndAdjustStackGPS(*this, PersistentCallerSavedRegs(), 0); 313 Common::X64::ABI_PopRegistersAndAdjustStack(*this, PersistentCallerSavedRegs(), 0);
314 314
315 Xbyak::Label dont_process{}; 315 Xbyak::Label dont_process{};
316 // Get increment 316 // Get increment
@@ -414,7 +414,7 @@ void MacroJITx64Impl::Compile() {
414 bool keep_executing = true; 414 bool keep_executing = true;
415 labels.fill(Xbyak::Label()); 415 labels.fill(Xbyak::Label());
416 416
417 Common::X64::ABI_PushRegistersAndAdjustStackGPS(*this, Common::X64::ABI_ALL_CALLEE_SAVED, 8); 417 Common::X64::ABI_PushRegistersAndAdjustStack(*this, Common::X64::ABI_ALL_CALLEE_SAVED, 8);
418 // JIT state 418 // JIT state
419 mov(STATE, Common::X64::ABI_PARAM1); 419 mov(STATE, Common::X64::ABI_PARAM1);
420 mov(PARAMETERS, Common::X64::ABI_PARAM2); 420 mov(PARAMETERS, Common::X64::ABI_PARAM2);
@@ -452,7 +452,7 @@ void MacroJITx64Impl::Compile() {
452 452
453 L(end_of_code); 453 L(end_of_code);
454 454
455 Common::X64::ABI_PopRegistersAndAdjustStackGPS(*this, Common::X64::ABI_ALL_CALLEE_SAVED, 8); 455 Common::X64::ABI_PopRegistersAndAdjustStack(*this, Common::X64::ABI_ALL_CALLEE_SAVED, 8);
456 ret(); 456 ret();
457 ready(); 457 ready();
458 program = getCode<ProgramType>(); 458 program = getCode<ProgramType>();