summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/loader/nso.cpp9
-rw-r--r--src/video_core/macro/macro_jit_x64.cpp2
2 files changed, 5 insertions, 6 deletions
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp
index 8a938aa83..8dd956fc6 100644
--- a/src/core/loader/nso.cpp
+++ b/src/core/loader/nso.cpp
@@ -128,11 +128,10 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
128 128
129 // Apply patches if necessary 129 // Apply patches if necessary
130 if (pm && (pm->HasNSOPatch(nso_header.build_id) || Settings::values.dump_nso)) { 130 if (pm && (pm->HasNSOPatch(nso_header.build_id) || Settings::values.dump_nso)) {
131 std::vector<u8> pi_header; 131 std::vector<u8> pi_header(sizeof(NSOHeader) + program_image.size());
132 pi_header.insert(pi_header.begin(), reinterpret_cast<u8*>(&nso_header), 132 std::memcpy(pi_header.data(), &nso_header, sizeof(NSOHeader));
133 reinterpret_cast<u8*>(&nso_header) + sizeof(NSOHeader)); 133 std::memcpy(pi_header.data() + sizeof(NSOHeader), program_image.data(),
134 pi_header.insert(pi_header.begin() + sizeof(NSOHeader), program_image.data(), 134 program_image.size());
135 program_image.data() + program_image.size());
136 135
137 pi_header = pm->PatchNSO(pi_header, nso_file.GetName()); 136 pi_header = pm->PatchNSO(pi_header, nso_file.GetName());
138 137
diff --git a/src/video_core/macro/macro_jit_x64.cpp b/src/video_core/macro/macro_jit_x64.cpp
index dc5376501..aca25d902 100644
--- a/src/video_core/macro/macro_jit_x64.cpp
+++ b/src/video_core/macro/macro_jit_x64.cpp
@@ -411,7 +411,7 @@ void MacroJITx64Impl::Compile_Branch(Macro::Opcode opcode) {
411 411
412 Xbyak::Label end; 412 Xbyak::Label end;
413 auto value = Compile_GetRegister(opcode.src_a, eax); 413 auto value = Compile_GetRegister(opcode.src_a, eax);
414 test(value, value); 414 cmp(value, 0); // test(value, value);
415 if (optimizer.has_delayed_pc) { 415 if (optimizer.has_delayed_pc) {
416 switch (opcode.branch_condition) { 416 switch (opcode.branch_condition) {
417 case Macro::BranchCondition::Zero: 417 case Macro::BranchCondition::Zero: