nrf_svci.h does not compile with gcc, SDK 12.1.0

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

PekkaNikander — Fri, 18 Nov 2016 06:13:55 GMT

@syntroniks: You seem to have encountered another bug. Try the following. It may or may not work.

--- a/Nordic_SDK/nRF5_SDK_12.1.0_0d23e2a/components/libraries/svc/nrf_svc_function.h 
+++ b/Nordic_SDK/nRF5_SDK_12.1.0_0d23e2a/components/libraries/svc/nrf_svc_function.h
@@ -50,7 +50,7 @@ STATIC_ASSERT(sizeof(nrf_svc_func_reg_t) % 4 == 0);
  * @details     This macro places the variable in a section named "svc_data" that
             the SVC handler uses during regular operation.
  */
-#define SVC_REGISTER_FUNCTION(svc_var) NRF_SECTION_VARS_ADD(svc_data, svc_var)
+#define SVC_REGISTER_FUNCTION(svc_var) NRF_SECTION_VARS_REGISTER_VAR(svc_data, svc_var)
 
 
 #ifdef __cplusplus

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

syntroniks — Thu, 17 Nov 2016 21:57:41 GMT

@PekkaNikander: in response to your comment.

4> In file included from ../../../../../../components/libraries/crypto/nrf_crypto.h:17:0,
4>                  from C:/Work/nRF5_SDK_12.1.0_0d23e2a/examples/ble_peripheral/experimental_ble_app_buttonless_dfu/pca10040/s132/arm5_no_packs/../../../main.c:46:
4> ../../../../../../components/libraries/svc/nrf_svci.h:69:93: error: expected declaration specifiers or '...' before ')' token
4> ../../../../../../components/libraries/svc/nrf_svci.h:125:9: note: in expansion of macro 'SVCI_DECL'
4> ../../../../../../components/libraries/svc/nrf_svci.h:146:70: note: in expansion of macro 'SVCI_0'
4> ../../../../../../components/libraries/svc/nrf_svci.h:147:69: note: in expansion of macro 'SVCI_IMPLI'
4> ../../../../../../components/libraries/svc/nrf_svci.h:148:57: note: in expansion of macro 'SVCI_IMPL'
4> ../../../../../../components/libraries/crypto/nrf_crypto.h:105:1: note: in expansion of macro 'SVCI'
4> ../../../../../../components/libraries/crypto/nrf_crypto.h: In function 'nrf_crypto_init':
4> ../../../../../../components/libraries/svc/nrf_svci.h:126:65: warning: implicit declaration of function 'svci_nrf_crypto_init' [-Wimplicit-function-declaration]

After implementing the suggested workaround of ##__VA_ARGS__, I see

3> In file included from C:/Work/nRF5_SDK_12.1.0_0d23e2a/examples/ble_peripheral/experimental_ble_app_buttonless_dfu/pca10040/s132/arm5_no_packs/../../../../../../components/libraries/crypto/nrf_crypto_svc.c:13:0:
3> C:/Work/nRF5_SDK_12.1.0_0d23e2a/examples/ble_peripheral/experimental_ble_app_buttonless_dfu/pca10040/s132/arm5_no_packs/../../../../../../components/libraries/crypto/nrf_crypto_svc.c:23:23: error: expected ')' before 'const'
3> ../../../../../../components/libraries/svc/nrf_svc_function.h:53:71: note: in definition of macro 'SVC_REGISTER_FUNCTION'

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

syntroniks — Thu, 17 Nov 2016 21:53:58 GMT

I have posted my response as an 'answer' to this question because of its length.

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

PekkaNikander — Thu, 17 Nov 2016 19:37:13 GMT

What error message or messages do you get?

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

syntroniks — Thu, 17 Nov 2016 19:18:36 GMT

This solution does not work for me in Segger embedded studio. I can change the C standards (90, 99, 11), but can't figure out how to compel the ide to remove those flags. In short: I did not have much luck with your patch.

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

PekkaNikander — Wed, 16 Nov 2016 10:35:53 GMT

Note that this bug is still present in SDK 12.1.

The root of this problem appears to be that the __VA_ARGS__ expansion has changed for C99 and C11. In the old non-standard GCC days when __VA_ARGS__ expanded to empty, the preprocessor removed the preceding comma. Not so any more with C99 and C11. See stackoverflow.com/.../standard-alternative-to-gccs-va-args-trick

With GCC, you can get rid of the syntax error is as simple as replacing __VA_ARGS__ with ##__VA_ARGS__. However, that leads to a parameter type conflict with the expanded function declaration and definition. Basically, the declaration lists uint32_t svci_num as the first argument to the function, while the definition on the next lines does not.

For example, the first definition of nrf_crypto_init gets expanded from SVCI_DECL [sic] to the following:

__attribute__((naked, unused)) static uint32_t nrf_crypto_init(uint32_t NRF_CRYPTO_SVCI_INIT) ...

However, the following second definition expands to

static inline uint32_t nrf_crypto_init(void) ...

Apparently the mistake is that the first definition should actually define svci_nrf_crypto_init instead of defining nrf_crypto_init with a different signature.

Here is a potential, mostly untested fix:

--- a/Product_Configurations/SampoDFU/include/nrf_svci.h
+++ b/Product_Configurations/SampoDFU/include/nrf_svci.h
@@ -66,7 +66,7 @@ extern "C" {
                 _Pragma("GCC diagnostic ignored \"-Wreturn-type\"")     \
                 __attribute__((naked, unused))                          \
                 static return_type function_name(uint32_t svci_num,  \
-                                                                                 __VA_ARGS__)           \
+                                                 ##__VA_ARGS__)           \
                 {                                                       \
                         __asm __volatile (                                  \
                                 "mov r12, %1\n\t"                               \
@@ -122,23 +122,23 @@ extern "C" {
 #else
 
 #define SVCI_0(svci_num, return_type, function_name) \
-        SVCI_DECL(svci_num, return_type, function_name) \
+        SVCI_DECL(svci_num, return_type, svci_##function_name) \
         static __INLINE return_type function_name(void) {return svci_##function_name(svci_num);}
 
 #define SVCI_1(svci_num, return_type, function_name, p0t, p0n) \
-        SVCI_DECL(svci_num, return_type, function_name, p0t p0n) \
+        SVCI_DECL(svci_num, return_type, svci_##function_name, p0t p0n) \
         static __INLINE return_type function_name(p0t p0n) {return svci_##function_name(svci_num, p0n);}
 
 #define SVCI_2(svci_num, return_type, function_name, p0t, p0n, p1t, p1n) \
-        SVCI_DECL(svci_num, return_type, function_name, p0t p0n, p1t p1n) \
+        SVCI_DECL(svci_num, return_type, svci_##function_name, p0t p0n, p1t p1n) \
         static __INLINE return_type function_name(p0t p0n, p1t p1n) {return svci_##function_name(svci_num, p0n, p1n);}
 
 #define SVCI_3(svci_num, return_type, function_name, p0t, p0n, p1t, p1n, p2t, p2n) \
-        SVCI_DECL(svci_num, return_type, function_name, p0t p0n, p1t p1n, p2t p2n) \
+        SVCI_DECL(svci_num, return_type, svci_##function_name, p0t p0n, p1t p1n, p2t p2n) \
         static __INLINE return_type function_name(p0t p0n, p1t p1n, p2t p2n) {return svci_##function_name(svci_num, p0n, 
p1n, p2n);}
 
 #define SVCI_4(svci_num, return_type, function_name, p0t, p0n, p1t, p1n, p2t, p2n, p3t, p3n) \
-        SVCI_DECL(svci_num, return_type, function_name, p0t p0n, p1t p1n, p2t p2n, p3t p3n) \
+        SVCI_DECL(svci_num, return_type, svci_##function_name, p0t p0n, p1t p1n, p2t p2n, p3t p3n) \
         static __INLINE return_type function_name(p0t p0n, p1t p1n, p2t p2n, p3t p3n) {return svci_##function_name(svci_n
um, p0n, p1n, p2n, p3n);}
 
 #endif  // SVCALL_AS_NORMAL_FUNCTION

Here is another tentative patch, to the other bug briefly discussed below. It may or may not work.

--- a/components/libraries/svc/nrf_svc_function.h 
+++ b/components/libraries/svc/nrf_svc_function.h
@@ -50,7 +50,7 @@ STATIC_ASSERT(sizeof(nrf_svc_func_reg_t) % 4 == 0);
  * @details     This macro places the variable in a section named "svc_data" that
             the SVC handler uses during regular operation.
  */
-#define SVC_REGISTER_FUNCTION(svc_var) NRF_SECTION_VARS_ADD(svc_data, svc_var)
+#define SVC_REGISTER_FUNCTION(svc_var) NRF_SECTION_VARS_REGISTER_VAR(svc_data, svc_var)
 
 
 #ifdef __cplusplus

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

Eliot Stock — Wed, 26 Oct 2016 07:52:33 GMT

Don't use CFLAGS += -std=gnu99 if you want this to compile (thanks: Nguyen Hoan Hoang).

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

Nguyen Hoan Hoang — Tue, 25 Oct 2016 12:22:51 GMT

I believe that is the problem.

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

Eliot Stock — Tue, 25 Oct 2016 06:55:55 GMT

I have "CFLAGS += -std=gnu99" in my Makefiles, whereas the example DFU bootloader Makefiles seem to be missing a value for -std. Is that it?

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

Nguyen Hoan Hoang — Tue, 25 Oct 2016 04:25:33 GMT

what is your compiler settings for std ? C11 or C89 ?

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

bjorn-spockeli — Mon, 24 Oct 2016 09:18:56 GMT

I did not have any issues with compiling the secure bootloader using GCC 4.9.3 and the supplied Makefile, however im on Windows.

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

Eliot Stock — Sun, 23 Oct 2016 16:53:27 GMT

But I'm not even using C++. Only C.

RE: nrf_svci.h does not compile with gcc, SDK 12.1.0

Nguyen Hoan Hoang — Sun, 23 Oct 2016 15:04:43 GMT

The cast has to be uint16_t not uint8_t