From bee1f986a9f5363b9c71bf88ebdf10bf0a73fd74 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Sat, 18 Nov 2023 14:58:42 +1000
Subject: [PATCH] CMake: Fix incorrect library for HTTPDownloaderCurl

---
 src/core/cpu_newrec_compiler_aarch64.cpp           | 3 ++-
 src/core/cpu_newrec_compiler_riscv64.cpp           | 1 +
 src/core/cpu_recompiler_code_generator_aarch64.cpp | 2 +-
 src/util/CMakeLists.txt                            | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/cpu_newrec_compiler_aarch64.cpp b/src/core/cpu_newrec_compiler_aarch64.cpp
index df0398633..4533068e6 100644
--- a/src/core/cpu_newrec_compiler_aarch64.cpp
+++ b/src/core/cpu_newrec_compiler_aarch64.cpp
@@ -224,7 +224,7 @@ void CPU::NewRec::AArch64Compiler::GenerateBlockProtectCheck(const u8* ram_ptr,
     armAsm->ldr(vtmp, MemOperand(RXARG2, offset));
     armAsm->cmeq(dst, dst, vtmp);
     if (!first)
-      armAsm->and_(dst.V16B(), dst.V16B(), vtmp.V16B());
+      armAsm->and_(v0.V16B(), v0.V16B(), dst.V16B());
     else
       first = false;
 
@@ -1967,6 +1967,7 @@ void CPU::NewRec::AArch64Compiler::TestInterrupts(const vixl::aarch64::WRegister
                                                                 (inst + 1)->cop.cop_n));
     EmitMov(RWARG2, m_compiler_pc);
     EmitCall(reinterpret_cast<const void*>(static_cast<void (*)(u32, u32)>(&CPU::RaiseException)));
+    m_dirty_pc = false;
     EndAndLinkBlock(std::nullopt, true, false);
   }
   else
diff --git a/src/core/cpu_newrec_compiler_riscv64.cpp b/src/core/cpu_newrec_compiler_riscv64.cpp
index 6ad9c2e32..c96aeeca3 100644
--- a/src/core/cpu_newrec_compiler_riscv64.cpp
+++ b/src/core/cpu_newrec_compiler_riscv64.cpp
@@ -2223,6 +2223,7 @@ void CPU::NewRec::RISCV64Compiler::TestInterrupts(const biscuit::GPR& sr)
                                                                (inst + 1)->cop.cop_n));
     EmitMov(RARG2, m_compiler_pc);
     EmitCall(reinterpret_cast<const void*>(static_cast<void (*)(u32, u32)>(&CPU::RaiseException)));
+    m_dirty_pc = false;
     EndAndLinkBlock(std::nullopt, true, false);
   }
   else
diff --git a/src/core/cpu_recompiler_code_generator_aarch64.cpp b/src/core/cpu_recompiler_code_generator_aarch64.cpp
index 76c7b6fc7..a8510cece 100644
--- a/src/core/cpu_recompiler_code_generator_aarch64.cpp
+++ b/src/core/cpu_recompiler_code_generator_aarch64.cpp
@@ -2270,7 +2270,7 @@ void CodeGenerator::EmitBlockProtectCheck(const u8* ram_ptr, const u8* shadow_pt
     m_emit->ldr(vtmp, a64::MemOperand(RXARG2, offset));
     m_emit->cmeq(dst, dst, vtmp);
     if (!first)
-      m_emit->and_(dst.V16B(), dst.V16B(), vtmp.V16B());
+      m_emit->and_(a64::v0.V16B(), a64::v0.V16B(), dst.V16B());
     else
       first = false;
 
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index b0edf9b00..7564f1a1a 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -284,11 +284,11 @@ elseif(NOT ANDROID)
 endif()
 
 if(NOT WIN32 AND NOT ANDROID)
-  target_sources(common PRIVATE
+  target_sources(util PRIVATE
     http_downloader_curl.cpp
     http_downloader_curl.h
   )
-  target_link_libraries(common PRIVATE
+  target_link_libraries(util PRIVATE
     CURL::libcurl
   )
 endif()