diff options
author | MerryMage <MerryMage@users.noreply.github.com> | 2020-06-15 21:55:02 +0200 |
---|---|---|
committer | MerryMage <MerryMage@users.noreply.github.com> | 2020-06-15 21:55:02 +0200 |
commit | 35db6e1c68f18f401bcae8bd8e8937648c7c67c6 (patch) | |
tree | 6df8312d33c9d1bbe849ef150396e4128fcd9106 | |
parent | macro_jit_x64: Remove METHOD_ADDRESS_64 (diff) | |
download | yuzu-35db6e1c68f18f401bcae8bd8e8937648c7c67c6.tar yuzu-35db6e1c68f18f401bcae8bd8e8937648c7c67c6.tar.gz yuzu-35db6e1c68f18f401bcae8bd8e8937648c7c67c6.tar.bz2 yuzu-35db6e1c68f18f401bcae8bd8e8937648c7c67c6.tar.lz yuzu-35db6e1c68f18f401bcae8bd8e8937648c7c67c6.tar.xz yuzu-35db6e1c68f18f401bcae8bd8e8937648c7c67c6.tar.zst yuzu-35db6e1c68f18f401bcae8bd8e8937648c7c67c6.zip |
-rw-r--r-- | src/video_core/macro/macro_jit_x64.cpp | 6 | ||||
-rw-r--r-- | src/video_core/macro/macro_jit_x64.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/video_core/macro/macro_jit_x64.cpp b/src/video_core/macro/macro_jit_x64.cpp index 1dcf9957c..f1d123f51 100644 --- a/src/video_core/macro/macro_jit_x64.cpp +++ b/src/video_core/macro/macro_jit_x64.cpp @@ -51,8 +51,7 @@ void MacroJITx64Impl::Execute(const std::vector<u32>& parameters, u32 method) { JITState state{}; state.maxwell3d = &maxwell3d; state.registers = {}; - state.parameters = parameters.data(); - program(&state); + program(&state, parameters.data()); } void MacroJITx64Impl::Compile_ALU(Macro::Opcode opcode) { @@ -422,8 +421,7 @@ void MacroJITx64Impl::Compile() { Common::X64::ABI_PushRegistersAndAdjustStackGPS(*this, Common::X64::ABI_ALL_CALLEE_SAVED, 8); // JIT state mov(STATE, Common::X64::ABI_PARAM1); - mov(PARAMETERS, qword[Common::X64::ABI_PARAM1 + - static_cast<Xbyak::uint32>(offsetof(JITState, parameters))]); + mov(PARAMETERS, Common::X64::ABI_PARAM2); mov(REGISTERS, Common::X64::ABI_PARAM1); add(REGISTERS, static_cast<Xbyak::uint32>(offsetof(JITState, registers))); xor_(RESULT, RESULT); diff --git a/src/video_core/macro/macro_jit_x64.h b/src/video_core/macro/macro_jit_x64.h index 377368086..9167b2a93 100644 --- a/src/video_core/macro/macro_jit_x64.h +++ b/src/video_core/macro/macro_jit_x64.h @@ -66,11 +66,10 @@ private: struct JITState { Engines::Maxwell3D* maxwell3d{}; std::array<u32, Macro::NUM_MACRO_REGISTERS> registers{}; - const u32* parameters{}; u32 carry_flag{}; }; static_assert(offsetof(JITState, maxwell3d) == 0, "Maxwell3D is not at 0x0"); - using ProgramType = void (*)(JITState*); + using ProgramType = void (*)(JITState*, const u32*); struct OptimizerState { bool can_skip_carry{}; |