summaryrefslogtreecommitdiff
path: root/src/core/hle
diff options
context:
space:
mode:
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
96 if (True(perm & KMemoryPermission::UserWrite)) { 96 if (True(perm & KMemoryPermission::UserWrite)) {
97 perms |= Common::MemoryPermission::Write; 97 perms |= Common::MemoryPermission::Write;
98 } 98 }
99#ifdef ARCHITECTURE_arm64
99 if (True(perm & KMemoryPermission::UserExecute)) { 100 if (True(perm & KMemoryPermission::UserExecute)) {
100 perms |= Common::MemoryPermission::Execute; 101 perms |= Common::MemoryPermission::Execute;
101 } 102 }
103#endif
102 return perms; 104 return perms;
103} 105}
104 106
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:
472 return m_post_handlers; 472 return m_post_handlers;
473 } 473 }
474 474
475 KernelCore& GetKernel() noexcept {
476 return m_kernel;
477 }
478
479public: 475public:
480 // Attempts to insert a watchpoint into a free slot. Returns false if none are available. 476 // Attempts to insert a watchpoint into a free slot. Returns false if none are available.
481 bool InsertWatchpoint(KProcessAddress addr, u64 size, DebugWatchpointType type); 477 bool InsertWatchpoint(KProcessAddress addr, u64 size, DebugWatchpointType type);