From fc407e509e1a87cc11a265e3c442bbedf9d6b375 Mon Sep 17 00:00:00 2001 From: Tom Lally Date: Sun, 28 Aug 2022 10:13:37 +0100 Subject: [PATCH] Removed NOINLINE --- src/Cafe/HW/Espresso/Interpreter/PPCInterpreterMain.cpp | 2 +- src/Cafe/OS/libs/coreinit/coreinit_Time.cpp | 2 +- src/Common/precompiled.h | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Cafe/HW/Espresso/Interpreter/PPCInterpreterMain.cpp b/src/Cafe/HW/Espresso/Interpreter/PPCInterpreterMain.cpp index 7cd27ab5..2d808fef 100644 --- a/src/Cafe/HW/Espresso/Interpreter/PPCInterpreterMain.cpp +++ b/src/Cafe/HW/Espresso/Interpreter/PPCInterpreterMain.cpp @@ -34,7 +34,7 @@ PPCInterpreter_t* PPCInterpreter_getCurrentInstance() return ppcInterpreterCurrentInstance; } -NOINLINE uint64 PPCInterpreter_getMainCoreCycleCounter() +uint64 PPCInterpreter_getMainCoreCycleCounter() { return PPCTimer_getFromRDTSC(); } diff --git a/src/Cafe/OS/libs/coreinit/coreinit_Time.cpp b/src/Cafe/OS/libs/coreinit/coreinit_Time.cpp index 6176ccca..e85b6adb 100644 --- a/src/Cafe/OS/libs/coreinit/coreinit_Time.cpp +++ b/src/Cafe/OS/libs/coreinit/coreinit_Time.cpp @@ -28,7 +28,7 @@ namespace coreinit osLib_returnFromFunction64(hCPU, osTime); } - NOINLINE uint64 coreinit_getTimeBase_dummy() + uint64 coreinit_getTimeBase_dummy() { return __rdtsc(); } diff --git a/src/Common/precompiled.h b/src/Common/precompiled.h index 262b4e94..ff8ba956 100644 --- a/src/Common/precompiled.h +++ b/src/Common/precompiled.h @@ -253,13 +253,6 @@ typedef union _LARGE_INTEGER { #error No definition for DLLEXPORT and DLLIMPORT #endif -#if defined(_MSC_VER) - #define NOINLINE __declspec(noinline) -#elif defined(__GNUC__) - #define NOINLINE __attribute__((noinline)) -#else - #error No definition for NOINLINE -#endif // MEMPTR #include "Common/MemPtr.h"