diff options
| author |  bunnei <ericbunnie@gmail.com> | 2014-06-09 22:40:52 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-06-13 09:51:18 -0400 |
| commit | edaefe9fa6f354b5de45a46adfcdd129f549185b (patch) | |
| tree | 92a38eca1a3314f9630676f624d41a9602d369c1 /src/core | |
| parent | 8957622d10784d5f04571e9ae01dbae13ed64c3e (diff) | |
HLE: Moved "PARAM" and "RETURN" macros to function_wrappers.h (this is only module where they are needed).
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/function_wrappers.h | 6 | ||||
| -rw-r--r-- | src/core/hle/hle.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h index aa5278c8..0bed7865 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 0397da5d..bf4d8457 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 |