mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 20:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

sf: fix service macro C++ compat

Browse Source
This commit is contained in:
Michael Scire 2023-10-25 04:44:09 -07:00 committed by fincs
parent 412c48eab5
commit 08373603f7
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nx/include/switch/sf/service.h
View File

@ -6,6 +6,7 @@
* @copyright libnx Authors * @copyright libnx Authors
*/ */
#pragma once #pragma once
#include <assert.h>
#include "hipc.h" #include "hipc.h"
#include "cmif.h" #include "cmif.h"
@ -473,23 +474,45 @@ NX_INLINE Result serviceDispatchImpl(
return rc; return rc;
} }
#ifndef __cplusplus
#define serviceMacroDetectIsSameType(a, b) __builtin_types_compatible_p(typeof(a), typeof(b)) #define serviceMacroDetectIsSameType(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
#define serviceMacroDetectIsPointerOrArray(p) (__builtin_classify_type(p) == 5) #define serviceMacroDetectIsPointerOrArray(p) (__builtin_classify_type(p) == 5)
#define serviceMacroDecay(p) (&*__builtin_choose_expr(serviceMacroDetectIsPointerOrArray(p), p, NULL)) #define serviceMacroDecay(p) (&*__builtin_choose_expr(serviceMacroDetectIsPointerOrArray(p), p, NULL))
#define serviceMacroDetectIsPointer(p) serviceMacroDetectIsSameType(p, serviceMacroDecay(p)) #define serviceMacroDetectIsPointer(p) serviceMacroDetectIsSameType(p, serviceMacroDecay(p))
#else
extern "C++" {
namespace libnx::impl {
template<typename T> struct is_pointer { static constexpr bool value = false; };
template<typename T> struct is_pointer<T*> { static constexpr bool value = true; };
template<typename T> struct is_pointer<T* const> { static constexpr bool value = true; };
template<typename T> struct is_pointer<T* volatile> { static constexpr bool value = true; };
template<typename T> struct is_pointer<T* const volatile> { static constexpr bool value = true; };
}
}
#define serviceMacroDetectIsPointer(p) (::libnx::impl::is_pointer<decltype(p)>::value)
#endif
#define serviceDispatch(_s,_rid,...) \ #define serviceDispatch(_s,_rid,...) \
serviceDispatchImpl((_s),(_rid),NULL,0,NULL,0,(SfDispatchParams){ __VA_ARGS__ }) serviceDispatchImpl((_s),(_rid),NULL,0,NULL,0,(SfDispatchParams){ __VA_ARGS__ })
#define serviceDispatchIn(_s,_rid,_in,...) \ #define serviceDispatchIn(_s,_rid,_in,...) \
({ _Static_assert(!(serviceMacroDetectIsPointer(_in))); \ ({ static_assert(!(serviceMacroDetectIsPointer(_in))); \
serviceDispatchImpl((_s),(_rid),&(_in),sizeof(_in),NULL,0,(SfDispatchParams){ __VA_ARGS__ }); }) serviceDispatchImpl((_s),(_rid),&(_in),sizeof(_in),NULL,0,(SfDispatchParams){ __VA_ARGS__ }); })
#define serviceDispatchOut(_s,_rid,_out,...) \ #define serviceDispatchOut(_s,_rid,_out,...) \
({ _Static_assert(!(serviceMacroDetectIsPointer(_out))); \ ({ static_assert(!(serviceMacroDetectIsPointer(_out))); \
serviceDispatchImpl((_s),(_rid),NULL,0,&(_out),sizeof(_out),(SfDispatchParams){ __VA_ARGS__ }); }) serviceDispatchImpl((_s),(_rid),NULL,0,&(_out),sizeof(_out),(SfDispatchParams){ __VA_ARGS__ }); })
#define serviceDispatchInOut(_s,_rid,_in,_out,...) \ #define serviceDispatchInOut(_s,_rid,_in,_out,...) \
({ _Static_assert(!(serviceMacroDetectIsPointer(_in))); \ ({ static_assert(!(serviceMacroDetectIsPointer(_in))); \
_Static_assert(!(serviceMacroDetectIsPointer(_out))); \ static_assert(!(serviceMacroDetectIsPointer(_out))); \
serviceDispatchImpl((_s),(_rid),&(_in),sizeof(_in),&(_out),sizeof(_out),(SfDispatchParams){ __VA_ARGS__ }); }) serviceDispatchImpl((_s),(_rid),&(_in),sizeof(_in),&(_out),sizeof(_out),(SfDispatchParams){ __VA_ARGS__ }); })