RTX5: Fixed name clash in SVC macros for ICCARM.
Renamed SVC_Setup macro to SVC_ArgF because SVC_Setup is also used as an API function.
@@ -163,7 +163,7 @@ __STATIC_INLINE t __svc##f (t1 a1, t2 a2, t3 a3, t4 a4) { \
#elif defined(__ICCARM__)
-#define SVC_Setup(f) \
+#define SVC_ArgF(f) \
__asm( \
"mov r12,%0\n" \
:: "r"(&f): "r12" \
@@ -177,7 +177,7 @@ __SVC_INDIRECT(0) t svc##f (); \
t svcRtx##f (void); \
__attribute__((always_inline)) \
__STATIC_INLINE t __svc##f (void) { \
- SVC_Setup(svcRtx##f); \
+ SVC_ArgF(svcRtx##f); \
svc##f(); \
}
@@ -186,7 +186,7 @@ __SVC_INDIRECT(0) t svc##f (); \
t svcRtx##f (void); \
__attribute__((always_inline)) \
__STATIC_INLINE t __svc##f (void) { \
- SVC_Setup(svcRtx##f); \
+ SVC_ArgF(svcRtx##f); \
return svc##f(); \
}
@@ -195,7 +195,7 @@ __SVC_INDIRECT(0) t svc##f (t1 a1); \
t svcRtx##f (t1 a1); \
__attribute__((always_inline)) \
__STATIC_INLINE t __svc##f (t1 a1) { \
- SVC_Setup(svcRtx##f); \
+ SVC_ArgF(svcRtx##f); \
svc##f(a1); \
}
@@ -204,7 +204,7 @@ __SVC_INDIRECT(0) t svc##f (t1 a1); \
t svcRtx##f (t1 a1); \
__attribute__((always_inline)) \
__STATIC_INLINE t __svc##f (t1 a1) { \
- SVC_Setup(svcRtx##f); \
+ SVC_ArgF(svcRtx##f); \
return svc##f(a1); \
}
@@ -213,7 +213,7 @@ __SVC_INDIRECT(0) t svc##f (t1 a1, t2 a2); \
t svcRtx##f (t1 a1, t2 a2); \
__attribute__((always_inline)) \
__STATIC_INLINE t __svc##f (t1 a1, t2 a2) { \
- SVC_Setup(svcRtx##f); \
+ SVC_ArgF(svcRtx##f); \
return svc##f(a1,a2); \
}
@@ -222,7 +222,7 @@ __SVC_INDIRECT(0) t svc##f (t1 a1, t2 a2, t3 a3); \
t svcRtx##f (t1 a1, t2 a2, t3 a3); \
__attribute__((always_inline)) \
__STATIC_INLINE t __svc##f (t1 a1, t2 a2, t3 a3) { \
- SVC_Setup(svcRtx##f); \
+ SVC_ArgF(svcRtx##f); \
return svc##f(a1,a2,a3); \
}
@@ -231,7 +231,7 @@ __SVC_INDIRECT(0) t svc##f (t1 a1, t2 a2, t3 a3, t4 a4); \
t svcRtx##f (t1 a1, t2 a2, t3 a3, t4 a4); \
__attribute__((always_inline)) \
__STATIC_INLINE t __svc##f (t1 a1, t2 a2, t3 a3, t4 a4) { \
- SVC_Setup(svcRtx##f); \
+ SVC_ArgF(svcRtx##f); \
return svc##f(a1,a2,a3,a4); \
}
