summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-06-10 04:40:52 +0200
committerbunnei <ericbunnie@gmail.com>2014-06-13 15:51:18 +0200
commitedaefe9fa6f354b5de45a46adfcdd129f549185b (patch)
tree92a38eca1a3314f9630676f624d41a9602d369c1
parentSVC: Renamed all function wrapper templates to Wrap, moved to HLE namespace. (diff)
downloadyuzu-edaefe9fa6f354b5de45a46adfcdd129f549185b.tar
yuzu-edaefe9fa6f354b5de45a46adfcdd129f549185b.tar.gz
yuzu-edaefe9fa6f354b5de45a46adfcdd129f549185b.tar.bz2
yuzu-edaefe9fa6f354b5de45a46adfcdd129f549185b.tar.lz
yuzu-edaefe9fa6f354b5de45a46adfcdd129f549185b.tar.xz
yuzu-edaefe9fa6f354b5de45a46adfcdd129f549185b.tar.zst
yuzu-edaefe9fa6f354b5de45a46adfcdd129f549185b.zip
-rw-r--r--src/core/hle/function_wrappers.h6
-rw-r--r--src/core/hle/hle.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h
index aa5278c8a..0bed78653 100644
--- a/src/core/hle/function_wrappers.h
+++ b/src/core/hle/function_wrappers.h
@@ -10,6 +10,9 @@
namespace HLE {
+#define PARAM(n) Core::g_app_core->GetReg(n)
+#define RETURN(n) Core::g_app_core->SetReg(0, n)
+
////////////////////////////////////////////////////////////////////////////////////////////////////
// Function wrappers that return type s32
@@ -105,4 +108,7 @@ template<void func(const char*)> void Wrap() {
func(Memory::GetCharPointer(PARAM(0)));
}
+#undef PARAM
+#undef RETURN
+
} // namespace HLE
diff --git a/src/core/hle/hle.h b/src/core/hle/hle.h
index 0397da5d9..bf4d84575 100644
--- a/src/core/hle/hle.h
+++ b/src/core/hle/hle.h
@@ -9,11 +9,6 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
-#define PARAM(n) Core::g_app_core->GetReg(n)
-#define RETURN(n) Core::g_app_core->SetReg(0, n)
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
namespace HLE {
extern bool g_reschedule; ///< If true, immediately reschedules the CPU to a new thread