SPM: Sort up inline assembly

Purposes:

- Fix IAR toolchain build errors.
- Convert 'extend asm' into 'basic asm' for naked functions.
- Group 'thread call' interface in a section for easy the near jump.

Change-Id: I2eafceddd6d2be1e759163e50b3b6dc007257618
Signed-off-by: Ken Liu <Ken.Liu@arm.com>
diff --git a/secure_fw/spm/include/tfm_arch_v8m.h b/secure_fw/spm/include/tfm_arch_v8m.h
index 0c2f519..f03b40a 100644
--- a/secure_fw/spm/include/tfm_arch_v8m.h
+++ b/secure_fw/spm/include/tfm_arch_v8m.h
@@ -45,7 +45,8 @@
 #define EXC_NUM_SVCALL                          (11)
 #define EXC_NUM_PENDSV                          (14)
 
-#define VTOR_BASE                       (0xE000ED08)
+#define ICSR_ADDR                       (0xE000ED04)
+#define VTOR_ADDR                       (0xE000ED08)
 
 /* Disable NS exceptions by setting NS PRIMASK to 1 */
 #define TFM_NS_EXC_DISABLE()    __TZ_set_PRIMASK_NS(1)
diff --git a/secure_fw/spm/include/utilities.h b/secure_fw/spm/include/utilities.h
index aec3ea0..2f27487 100644
--- a/secure_fw/spm/include/utilities.h
+++ b/secure_fw/spm/include/utilities.h
@@ -37,8 +37,8 @@
 /* FixMe: Replace ERROR_MSG() in platform code with a suitable API */
 #define ERROR_MSG(msg) SPMLOG_ERRMSG(msg "\r\n")
 
-/* Preprocessor to reference C MACRO to string in inline asm */
-#define M2S_HELPER(x)  #x
-#define M2S(m)         M2S_HELPER(m)
+/* Stringify preprocessors, no leading underscore. ('STRINGIFY') */
+#define STRINGIFY_EXPAND(x) #x
+#define M2S(m) STRINGIFY_EXPAND(m)
 
 #endif /* __TFM_UTILS_H__ */