summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorGPUCode <geoster3d@gmail.com>2023-11-19 10:21:53 +0100
committert895 <clombardo169@gmail.com>2023-11-25 06:47:35 +0100
commit6de2edcca1624982e99a72741d4fa289dc9d7551 (patch)
tree8c355b39a6f71e333ccc2f929816ce96e40d3f2c /src/core/hle
parentandroid: Add cpu bakend gui toggle (diff)
downloadyuzu-6de2edcca1624982e99a72741d4fa289dc9d7551.tar
yuzu-6de2edcca1624982e99a72741d4fa289dc9d7551.tar.gz
yuzu-6de2edcca1624982e99a72741d4fa289dc9d7551.tar.bz2
yuzu-6de2edcca1624982e99a72741d4fa289dc9d7551.tar.lz
yuzu-6de2edcca1624982e99a72741d4fa289dc9d7551.tar.xz
yuzu-6de2edcca1624982e99a72741d4fa289dc9d7551.tar.zst
yuzu-6de2edcca1624982e99a72741d4fa289dc9d7551.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/kernel/k_page_table_base.cpp2
-rw-r--r--src/core/hle/kernel/k_process.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/core/hle/kernel/k_page_table_base.cpp b/src/core/hle/kernel/k_page_table_base.cpp
index f2ffc39c1..f7f1e8a3b 100644
--- a/src/core/hle/kernel/k_page_table_base.cpp
+++ b/src/core/hle/kernel/k_page_table_base.cpp
@@ -96,9 +96,11 @@ constexpr Common::MemoryPermission ConvertToMemoryPermission(KMemoryPermission p
if (True(perm & KMemoryPermission::UserWrite)) {
perms |= Common::MemoryPermission::Write;
}
+#ifdef ARCHITECTURE_arm64
if (True(perm & KMemoryPermission::UserExecute)) {
perms |= Common::MemoryPermission::Execute;
}
+#endif
return perms;
}
diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h
index 7b97d452b..e5f796ac7 100644
--- a/src/core/hle/kernel/k_process.h
+++ b/src/core/hle/kernel/k_process.h
@@ -472,10 +472,6 @@ public:
return m_post_handlers;
}
- KernelCore& GetKernel() noexcept {
- return m_kernel;
- }
-
public:
// Attempts to insert a watchpoint into a free slot. Returns false if none are available.
bool InsertWatchpoint(KProcessAddress addr, u64 size, DebugWatchpointType type);