You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2024/08/11 17:28:18 UTC
(nuttx) branch master updated (3e171489bd -> fecc5091af)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 3e171489bd toolchain/ghs: Fix green hills toolchain build Vela link error
new 5bb805b229 toolchain/ghs: Fix green hills toolchain build Vela asarm errors
new 6da525704d toolchain/ghs: fix the inline assembly code register alloc compile error
new 693e869404 arm-m/barrier: fix green hills build ARM_ISB error
new ed9d57b501 greenhills: fix the arch_setjmp.S build error
new d76218e817 greenhills: fix the moblib asm compile error
new fecc5091af toolchain/ghs: Fix SP_DSB warnings
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/include/spinlock.h | 4 +-
arch/arm/include/syscall.h | 157 +++++++++++++++++++++++++++++
arch/arm/src/armv6-m/barriers.h | 12 +--
arch/arm/src/armv7-a/barriers.h | 4 +-
arch/arm/src/armv7-m/arm_exception.S | 9 +-
arch/arm/src/armv7-m/arm_saveusercontext.S | 8 ++
arch/arm/src/armv7-m/barriers.h | 12 +--
arch/arm/src/armv7-r/barriers.h | 4 +-
arch/arm/src/armv8-m/barriers.h | 8 +-
arch/arm/src/armv8-r/barriers.h | 4 +-
arch/arm/src/common/gnu/fork.S | 5 +-
arch/arm64/include/spinlock.h | 4 +-
arch/ceva/include/spinlock.h | 4 +-
arch/risc-v/include/spinlock.h | 4 +-
arch/x86_64/include/spinlock.h | 4 +-
libs/libc/machine/arm/gnu/arch_setjmp.S | 11 ++
libs/libc/modlib/modlib_globals.S | 4 +
17 files changed, 224 insertions(+), 34 deletions(-)
(nuttx) 02/06: toolchain/ghs: fix the inline assembly code register alloc compile error
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 6da525704d04255e245af9e559641c036808c662
Author: fangxinyong <fa...@xiaomi.com>
AuthorDate: Sun Apr 28 22:04:50 2024 +0800
toolchain/ghs: fix the inline assembly code register alloc compile error
The following are the compile error that reported
by GreenHills compiler:
"/mnt/yang/qixinwei_commit/nuttx/include/arch/syscall.h", line 156 (col. 17): error #2036-D:
cannot allocate "reg0" to specified caller-saved register
"/mnt/yang/qixinwei_commit/nuttx/include/arch/syscall.h", line 157 (col. 17): error #2036-D:
cannot allocate "reg1" to specified caller-saved register
Then we fix this greenhills compilation error by explicitly specifying
the registers in the clobber list in the inline assembly code.
This fix is successful in compiling on the
nuttx/boards/arm/mps/mps2-an500/configs/nsh platform and passes
the ostest test.
However, if we keep the implementation the same for both the default
and Greenhills compilers, the default compiler will report the
following two issues:
1. the "sys_call6" function will report compile error when
compiling on "./vendor/qemu/boards/smartspeaker/configs/smartspeaker-knsh"
platform, the detailed error info:
CC: proxies/PROXY_mq_getattr.c In file included from /home/guoshichao/work_profile/vela_os/vela_qemu_1/nuttx/include/sys/syscall.h:35,
from /home/guoshichao/work_profile/vela_os/vela_qemu_1/nuttx/include/syscall.h:30,
from proxies/PROXY_mmap.c:5:
In function 'sys_call6',
inlined from 'mmap' at proxies/PROXY_mmap.c:9:22:
/home/guoshichao/work_profile/vela_os/vela_qemu_1/nuttx/include/arch/syscall.h:297:3: error: 'asm' operand has impossible constraints
297 | __asm__ __volatile__
| ^~~~~~~
2. when running on qemu-armv7-a platform, the modification to
"smh_call()" function will make the system fail to boot up, so
we need to keep the default compiler implementation and greenhills
compiler implementation separate
Signed-off-by: fangxinyong <fa...@xiaomi.com>
(cherry picked from commit cb48b749b1c9cad8cfb96bff7c5e9b6ebf20fc8a)
---
arch/arm/include/syscall.h | 157 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 157 insertions(+)
diff --git a/arch/arm/include/syscall.h b/arch/arm/include/syscall.h
index 3b424bbb08..ae59f8be75 100644
--- a/arch/arm/include/syscall.h
+++ b/arch/arm/include/syscall.h
@@ -136,6 +136,18 @@
static inline uintptr_t sys_call0(unsigned int nbr)
{
+#ifdef __ghs__
+ register long reg0 = (long)(nbr);
+
+ __asm__ __volatile__
+ (
+ "mov r0, %2\n\t"
+ "svc %1"
+ : "=r"(reg0)
+ : "i"(SYS_syscall), "r"(reg0)
+ : "memory", "r14", "r0"
+ );
+#else
register long reg0 __asm__("r0") = (long)(nbr);
__asm__ __volatile__
@@ -145,6 +157,7 @@ static inline uintptr_t sys_call0(unsigned int nbr)
: "i"(SYS_syscall), "r"(reg0)
: "memory", "r14"
);
+#endif
return reg0;
}
@@ -153,6 +166,20 @@ static inline uintptr_t sys_call0(unsigned int nbr)
static inline uintptr_t sys_call1(unsigned int nbr, uintptr_t parm1)
{
+#ifdef __ghs__
+ register long reg0 = (long)(nbr);
+ register long reg1 = (long)(parm1);
+
+ __asm__ __volatile__
+ (
+ "mov r0, %2\n\t"
+ "mov r1, %3\n\t"
+ "svc %1"
+ : "=r"(reg0)
+ : "i"(SYS_syscall), "r"(reg0), "r"(reg1)
+ : "memory", "r14", "r0", "r1"
+ );
+#else
register long reg0 __asm__("r0") = (long)(nbr);
register long reg1 __asm__("r1") = (long)(parm1);
@@ -163,6 +190,7 @@ static inline uintptr_t sys_call1(unsigned int nbr, uintptr_t parm1)
: "i"(SYS_syscall), "r"(reg0), "r"(reg1)
: "memory", "r14"
);
+#endif
return reg0;
}
@@ -172,6 +200,22 @@ static inline uintptr_t sys_call1(unsigned int nbr, uintptr_t parm1)
static inline uintptr_t sys_call2(unsigned int nbr, uintptr_t parm1,
uintptr_t parm2)
{
+#ifdef __ghs__
+ register long reg0 = (long)nbr;
+ register long reg2 = (long)parm2;
+ register long reg1 = (long)parm1;
+
+ __asm__ __volatile__
+ (
+ "mov r0, %2\n\t"
+ "mov r1, %3\n\t"
+ "mov r2, %4\n\t"
+ "svc %1"
+ : "=r"(reg0)
+ : "i"(SYS_syscall), "r"(reg0), "r"(reg1), "r"(reg2)
+ : "memory", "r14", "r0", "r1", "r2"
+ );
+#else
register long reg0 __asm__("r0") = (long)(nbr);
register long reg2 __asm__("r2") = (long)(parm2);
register long reg1 __asm__("r1") = (long)(parm1);
@@ -183,6 +227,7 @@ static inline uintptr_t sys_call2(unsigned int nbr, uintptr_t parm1,
: "i"(SYS_syscall), "r"(reg0), "r"(reg1), "r"(reg2)
: "memory", "r14"
);
+#endif
return reg0;
}
@@ -192,6 +237,24 @@ static inline uintptr_t sys_call2(unsigned int nbr, uintptr_t parm1,
static inline uintptr_t sys_call3(unsigned int nbr, uintptr_t parm1,
uintptr_t parm2, uintptr_t parm3)
{
+#ifdef __ghs__
+ register long reg0 = (long)(nbr);
+ register long reg3 = (long)(parm3);
+ register long reg2 = (long)(parm2);
+ register long reg1 = (long)(parm1);
+
+ __asm__ __volatile__
+ (
+ "mov r0, %2\n\t"
+ "mov r1, %3\n\t"
+ "mov r2, %4\n\t"
+ "mov r3, %5\n\t"
+ "svc %1"
+ : "=r"(reg0)
+ : "i"(SYS_syscall), "r"(reg0), "r"(reg1), "r"(reg2), "r"(reg3)
+ : "memory", "r14", "r0", "r1", "r2", "r3"
+ );
+#else
register long reg0 __asm__("r0") = (long)(nbr);
register long reg3 __asm__("r3") = (long)(parm3);
register long reg2 __asm__("r2") = (long)(parm2);
@@ -204,6 +267,7 @@ static inline uintptr_t sys_call3(unsigned int nbr, uintptr_t parm1,
: "i"(SYS_syscall), "r"(reg0), "r"(reg1), "r"(reg2), "r"(reg3)
: "memory", "r14"
);
+#endif
return reg0;
}
@@ -214,6 +278,27 @@ static inline uintptr_t sys_call4(unsigned int nbr, uintptr_t parm1,
uintptr_t parm2, uintptr_t parm3,
uintptr_t parm4)
{
+#ifdef __ghs__
+ register long reg0 = (long)(nbr);
+ register long reg4 = (long)(parm4);
+ register long reg3 = (long)(parm3);
+ register long reg2 = (long)(parm2);
+ register long reg1 = (long)(parm1);
+
+ __asm__ __volatile__
+ (
+ "mov r0, %2\n\t"
+ "mov r1, %3\n\t"
+ "mov r2, %4\n\t"
+ "mov r3, %5\n\t"
+ "mov r4, %6\n\t"
+ "svc %1"
+ : "=r"(reg0)
+ : "i"(SYS_syscall), "r"(reg0), "r"(reg1), "r"(reg2),
+ "r"(reg3), "r"(reg4)
+ : "memory", "r14", "r0", "r1", "r2", "r3", "r4"
+ );
+#else
register long reg0 __asm__("r0") = (long)(nbr);
register long reg4 __asm__("r4") = (long)(parm4);
register long reg3 __asm__("r3") = (long)(parm3);
@@ -228,6 +313,7 @@ static inline uintptr_t sys_call4(unsigned int nbr, uintptr_t parm1,
"r"(reg3), "r"(reg4)
: "memory", "r14"
);
+#endif
return reg0;
}
@@ -238,6 +324,29 @@ static inline uintptr_t sys_call5(unsigned int nbr, uintptr_t parm1,
uintptr_t parm2, uintptr_t parm3,
uintptr_t parm4, uintptr_t parm5)
{
+#ifdef __ghs__
+ register long reg0 = (long)(nbr);
+ register long reg5 = (long)(parm5);
+ register long reg4 = (long)(parm4);
+ register long reg3 = (long)(parm3);
+ register long reg2 = (long)(parm2);
+ register long reg1 = (long)(parm1);
+
+ __asm__ __volatile__
+ (
+ "mov r0, %2\n\t"
+ "mov r1, %3\n\t"
+ "mov r2, %4\n\t"
+ "mov r3, %5\n\t"
+ "mov r4, %6\n\t"
+ "mov r5, %7\n\t"
+ "svc %1"
+ : "=r"(reg0)
+ : "i"(SYS_syscall), "r"(reg0), "r"(reg1), "r"(reg2),
+ "r"(reg3), "r"(reg4), "r"(reg5)
+ : "memory", "r14", "r0", "r1", "r2", "r3", "r4", "r5"
+ );
+#else
register long reg0 __asm__("r0") = (long)(nbr);
register long reg5 __asm__("r5") = (long)(parm5);
register long reg4 __asm__("r4") = (long)(parm4);
@@ -253,6 +362,7 @@ static inline uintptr_t sys_call5(unsigned int nbr, uintptr_t parm1,
"r"(reg3), "r"(reg4), "r"(reg5)
: "memory", "r14"
);
+#endif
return reg0;
}
@@ -264,6 +374,31 @@ static inline uintptr_t sys_call6(unsigned int nbr, uintptr_t parm1,
uintptr_t parm4, uintptr_t parm5,
uintptr_t parm6)
{
+#ifdef __ghs__
+ register long reg0 = (long)(nbr);
+ register long reg6 = (long)(parm6);
+ register long reg5 = (long)(parm5);
+ register long reg4 = (long)(parm4);
+ register long reg3 = (long)(parm3);
+ register long reg2 = (long)(parm2);
+ register long reg1 = (long)(parm1);
+
+ __asm__ __volatile__
+ (
+ "mov r0, %2\n\t"
+ "mov r1, %3\n\t"
+ "mov r2, %4\n\t"
+ "mov r3, %5\n\t"
+ "mov r4, %6\n\t"
+ "mov r5, %7\n\t"
+ "mov r6, %8\n\t"
+ "svc %1"
+ : "=r"(reg0)
+ : "i"(SYS_syscall), "r"(reg0), "r"(reg1), "r"(reg2),
+ "r"(reg3), "r"(reg4), "r"(reg5), "r"(reg6)
+ : "memory", "r14", "r0", "r1", "r2", "r3", "r4", "r5", "r6"
+ );
+#else
register long reg0 __asm__("r0") = (long)(nbr);
register long reg6 __asm__("r6") = (long)(parm6);
register long reg5 __asm__("r5") = (long)(parm5);
@@ -280,6 +415,7 @@ static inline uintptr_t sys_call6(unsigned int nbr, uintptr_t parm1,
"r"(reg3), "r"(reg4), "r"(reg5), "r"(reg6)
: "memory", "r14"
);
+#endif
return reg0;
}
@@ -288,6 +424,26 @@ static inline uintptr_t sys_call6(unsigned int nbr, uintptr_t parm1,
static inline long smh_call(unsigned int nbr, void *parm)
{
+#ifdef __ghs__
+ register long reg0 = (long)(nbr);
+ register long reg1 = (long)(parm);
+
+ __asm__ __volatile__
+ (
+ "mov r0, %2\n\t"
+ "mov r1, %3\n\t"
+#if defined(CONFIG_ARCH_ARMV6M) || \
+ defined(CONFIG_ARCH_ARMV7M) || \
+ defined(CONFIG_ARCH_ARMV8M)
+ "bkpt %1"
+#else
+ "svc %1"
+#endif
+ : "=r"(reg0)
+ : "i"(SYS_smhcall), "r"(reg0), "r"(reg1)
+ : "memory", "r14", "r0", "r1"
+ );
+#else
register long reg0 __asm__("r0") = (long)(nbr);
register long reg1 __asm__("r1") = (long)(parm);
@@ -304,6 +460,7 @@ static inline long smh_call(unsigned int nbr, void *parm)
: "i"(SYS_smhcall), "r"(reg0), "r"(reg1)
: "memory", "r14"
);
+#endif
return reg0;
}
(nuttx) 01/06: toolchain/ghs: Fix green hills toolchain build Vela asarm errors
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5bb805b22992a36bafdc16b113085bcfe208d26c
Author: yanghuatao <ya...@xiaomi.com>
AuthorDate: Wed Apr 24 00:13:06 2024 +0800
toolchain/ghs: Fix green hills toolchain build Vela asarm errors
common/gnu/fork.S 29: unknown instruction
.syntax unified
--^
[asarm] (error #2230) common/gnu/fork.S 81: bad directive
.type up_fork , function
------------------^
[asarm] (error #2067) armv7-m/arm_saveusercontext.S 31: unknown instruction
.syntax unified
--^
[asarm] (error #2230) armv7-m/arm_saveusercontext.S 55: bad directive
.type up_saveusercontext , % function
--^
[asarm] (error #2004) armv7-m/arm_saveusercontext.S 65: not within valid register range
str r12 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 4 ) ) ]
------^
[asarm] (error #2004) armv7-m/arm_saveusercontext.S 66: not within valid register range
str r14 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 5 ) ) ]
------^
[asarm] (error #2004) armv7-m/arm_saveusercontext.S 67: not within valid register range
str r14 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 6 ) ) ]
------^
[asarm] (error #2014) armv7-m/arm_saveusercontext.S 72: expected a register
str r1 , [ r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 7 ) ) ]
------------------^
[asarm] (error #2004) armv7-m/arm_saveusercontext.S 75: not within valid register range
add r1 , r0 , ( 4 * ( ( ( 12 ) + ( 16 ) ) + 8 ) )
-----------^
[asarm] (error #2071) armv7-m/arm_saveusercontext.S 89: bad parameter
stmia r0 ! , { r2 - r11 }
--------^
[asarm] (error #2014) armv7-m/arm_saveusercontext.S 93: expected a register
mov r1 , - 1
-----------^
Signed-off-by: yanghuatao <ya...@xiaomi.com>
---
arch/arm/src/armv7-m/arm_exception.S | 9 ++++++++-
arch/arm/src/armv7-m/arm_saveusercontext.S | 8 ++++++++
arch/arm/src/common/gnu/fork.S | 5 ++++-
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/armv7-m/arm_exception.S b/arch/arm/src/armv7-m/arm_exception.S
index d2478aadd2..4f057ae113 100644
--- a/arch/arm/src/armv7-m/arm_exception.S
+++ b/arch/arm/src/armv7-m/arm_exception.S
@@ -87,9 +87,12 @@
****************************************************************************/
.globl exception_common
-
+#ifdef __ghs__
+ .thumb2
+#else
.syntax unified
.thumb
+#endif
.file "arm_exception.S"
/****************************************************************************
@@ -119,8 +122,12 @@
.text
.section .text.exception_common
+#ifdef __ghs__
+ .type exception_common, $function
+#else
.thumb_func
.type exception_common, function
+#endif
exception_common:
mrs r0, ipsr /* R0=exception number */
diff --git a/arch/arm/src/armv7-m/arm_saveusercontext.S b/arch/arm/src/armv7-m/arm_saveusercontext.S
index 58d02f575f..5e67be0e6c 100644
--- a/arch/arm/src/armv7-m/arm_saveusercontext.S
+++ b/arch/arm/src/armv7-m/arm_saveusercontext.S
@@ -28,8 +28,12 @@
.file "arm_saveusercontext.S"
.text
+#ifdef __ghs__
+ .thumb2
+#else
.syntax unified
.thumb
+#endif
/****************************************************************************
* Public Functions
@@ -52,7 +56,11 @@
.globl up_saveusercontext
.globl up_saveusercontext
+#ifdef __ghs__
+ .type up_saveusercontext, $function
+#else
.type up_saveusercontext, %function
+#endif
up_saveusercontext:
diff --git a/arch/arm/src/common/gnu/fork.S b/arch/arm/src/common/gnu/fork.S
index 7697561a27..d98003d4da 100644
--- a/arch/arm/src/common/gnu/fork.S
+++ b/arch/arm/src/common/gnu/fork.S
@@ -26,7 +26,6 @@
#include "arm_fork.h"
- .syntax unified
.file "fork.S"
/****************************************************************************
@@ -78,7 +77,11 @@
****************************************************************************/
.globl up_fork
+#ifdef __ghs__
+ .type up_fork, $function
+#else
.type up_fork, function
+#endif
up_fork:
/* Create a stack frame */
(nuttx) 06/06: toolchain/ghs: Fix SP_DSB warnings
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit fecc5091af8a6d2e48840c7b361ffbc2e1487314
Author: yanghuatao <ya...@xiaomi.com>
AuthorDate: Tue Apr 23 17:25:32 2024 +0800
toolchain/ghs: Fix SP_DSB warnings
"/mnt/yang/qixinwei_vela_warnings/nuttx/include/nuttx/spinlock.h", line 252: warning #76-D:
argument to macro is empty
SP_DSB();
^
"/mnt/yang/qixinwei_vela_warnings/nuttx/include/nuttx/spinlock.h", line 261: warning #76-D:
argument to macro is empty
SP_DMB();
^
"/mnt/yang/qixinwei_vela_warnings/nuttx/include/nuttx/spinlock.h", line 252: warning #76-D:
argument to macro is empty
SP_DSB();
^
"/mnt/yang/qixinwei_vela_warnings/nuttx/include/nuttx/spinlock.h", line 261: warning #76-D:
argument to macro is empty
SP_DMB();
^
"/mnt/yang/qixinwei_vela_warnings/nuttx/include/nuttx/spinlock.h", line 296: warning #76-D:
argument to macro is empty
SP_DSB();
^
Signed-off-by: yanghuatao <ya...@xiaomi.com>
---
arch/arm/include/spinlock.h | 4 ++--
arch/arm64/include/spinlock.h | 4 ++--
arch/ceva/include/spinlock.h | 4 ++--
arch/risc-v/include/spinlock.h | 4 ++--
arch/x86_64/include/spinlock.h | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/include/spinlock.h b/arch/arm/include/spinlock.h
index b9c53d9418..519cbae8f9 100644
--- a/arch/arm/include/spinlock.h
+++ b/arch/arm/include/spinlock.h
@@ -59,8 +59,8 @@
* all memory accesses are complete
*/
-#define SP_DSB(n) __asm__ __volatile__ ("dsb sy" : : : "memory")
-#define SP_DMB(n) __asm__ __volatile__ ("dmb st" : : : "memory")
+#define SP_DSB() __asm__ __volatile__ ("dsb sy" : : : "memory")
+#define SP_DMB() __asm__ __volatile__ ("dmb st" : : : "memory")
#ifdef CONFIG_ARM_HAVE_WFE_SEV
#define SP_WFE() __asm__ __volatile__ ("wfe" : : : "memory")
diff --git a/arch/arm64/include/spinlock.h b/arch/arm64/include/spinlock.h
index 5eee94bb55..ced899e13b 100644
--- a/arch/arm64/include/spinlock.h
+++ b/arch/arm64/include/spinlock.h
@@ -59,8 +59,8 @@
* all memory accesses are complete
*/
-#define SP_DSB(n) __asm__ __volatile__ ("dsb sy" : : : "memory")
-#define SP_DMB(n) __asm__ __volatile__ ("dmb st" : : : "memory")
+#define SP_DSB() __asm__ __volatile__ ("dsb sy" : : : "memory")
+#define SP_DMB() __asm__ __volatile__ ("dmb st" : : : "memory")
#define SP_WFE() __asm__ __volatile__ ("wfe" : : : "memory")
#define SP_SEV() __asm__ __volatile__ ("sev" : : : "memory")
diff --git a/arch/ceva/include/spinlock.h b/arch/ceva/include/spinlock.h
index 13cc8fb1b2..de125f07bd 100644
--- a/arch/ceva/include/spinlock.h
+++ b/arch/ceva/include/spinlock.h
@@ -61,8 +61,8 @@
*
*/
-#define SP_DSB(n) up_dsb()
-#define SP_DMB(n) up_dmb()
+#define SP_DSB() up_dsb()
+#define SP_DMB() up_dmb()
/****************************************************************************
* Public Types
diff --git a/arch/risc-v/include/spinlock.h b/arch/risc-v/include/spinlock.h
index 427e1ef51f..3bfe430338 100644
--- a/arch/risc-v/include/spinlock.h
+++ b/arch/risc-v/include/spinlock.h
@@ -59,8 +59,8 @@
*
*/
-#define SP_DSB(n) __asm__ __volatile__ ("fence")
-#define SP_DMB(n) __asm__ __volatile__ ("fence")
+#define SP_DSB() __asm__ __volatile__ ("fence")
+#define SP_DMB() __asm__ __volatile__ ("fence")
/****************************************************************************
* Public Types
diff --git a/arch/x86_64/include/spinlock.h b/arch/x86_64/include/spinlock.h
index ac5b7d8b4f..d315a32daf 100644
--- a/arch/x86_64/include/spinlock.h
+++ b/arch/x86_64/include/spinlock.h
@@ -55,8 +55,8 @@
*
*/
-#define SP_DSB(n) __asm__ __volatile__ ("mfence")
-#define SP_DMB(n) __asm__ __volatile__ ("mfence")
+#define SP_DSB() __asm__ __volatile__ ("mfence")
+#define SP_DMB() __asm__ __volatile__ ("mfence")
/****************************************************************************
* Public Types
(nuttx) 05/06: greenhills: fix the moblib asm compile error
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit d76218e817a13f17763ffe03cdc349cae01c3124
Author: guoshichao <gu...@xiaomi.com>
AuthorDate: Thu Aug 1 21:36:03 2024 +0800
greenhills: fix the moblib asm compile error
CC: assert/lib_assert.c [asarm] (error #2179) modlib/modlib_globals.S 61: unexpected token type (char) encountered; expected type (identifier)
.size \ globalNames , . - \ globalNames
--------^
[asarm] (error #2179) modlib/modlib_globals.S 67: unexpected token type (char) encountered; expected type (identifier)
.size \ nglobals , . - \ nglobals
--------^
[asarm] (error #2179) modlib/modlib_globals.S 72: unexpected token type (char) encountered; expected type (identifier)
.size \ global_table , . - \ global_table
--------^
Signed-off-by: guoshichao <gu...@xiaomi.com>
---
libs/libc/modlib/modlib_globals.S | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libs/libc/modlib/modlib_globals.S b/libs/libc/modlib/modlib_globals.S
index bdc8912271..b65edfb51a 100644
--- a/libs/libc/modlib/modlib_globals.S
+++ b/libs/libc/modlib/modlib_globals.S
@@ -16,7 +16,11 @@
.type SYMBOL(\ep), "object"
.endm
.macro SIZE ep
+# if defined(__ghs__)
+ .size SYMBOL(ep), . - SYMBOL(ep)
+# else
.size SYMBOL(\ep), . - SYMBOL(\ep)
+# endif
.endm
#else
# define SYMBOL(s) _##s
(nuttx) 04/06: greenhills: fix the arch_setjmp.S build error
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit ed9d57b5012a1c1c26138a6783730526b3b7bf32
Author: guoshichao <gu...@xiaomi.com>
AuthorDate: Mon Jul 22 14:42:30 2024 +0800
greenhills: fix the arch_setjmp.S build error
CC: bch/bchlib_read.c [asarm] (error #2067) machine/arm/gnu/arch_setjmp.S 34: unknown instruction
.syntax unified
--^
[asarm] (error #2230) machine/arm/gnu/arch_setjmp.S 62: bad directive
.type setjmp , function
-----------------^
[asarm] (error) errors during processing
Signed-off-by: guoshichao <gu...@xiaomi.com>
---
libs/libc/machine/arm/gnu/arch_setjmp.S | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/libs/libc/machine/arm/gnu/arch_setjmp.S b/libs/libc/machine/arm/gnu/arch_setjmp.S
index cae0f259fe..77a26adfdd 100644
--- a/libs/libc/machine/arm/gnu/arch_setjmp.S
+++ b/libs/libc/machine/arm/gnu/arch_setjmp.S
@@ -31,7 +31,9 @@
.globl setjmp
.globl longjmp
+#ifndef __ghs__
.syntax unified
+#endif
.file "setjmp.S"
/****************************************************************************
@@ -59,7 +61,12 @@
*
****************************************************************************/
+#ifndef __ghs__
.type setjmp, function
+#else
+ .type setjmp, $function
+#endif
+
setjmp:
/* Store callee-saved Core registers */
@@ -121,7 +128,11 @@ setjmp:
*
****************************************************************************/
+#ifndef __ghs__
.type longjmp, function
+#else
+ .type longjmp, $function
+#endif
longjmp:
/* Load callee-saved Core registers */
(nuttx) 03/06: arm-m/barrier: fix green hills build ARM_ISB error
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 693e869404d157a725e67dc032cc23f6de3c3892
Author: guoshichao <gu...@xiaomi.com>
AuthorDate: Wed Jun 19 15:20:30 2024 +0800
arm-m/barrier: fix green hills build ARM_ISB error
according to armv6-m/armv7-m arch reference manual:
the three ISB {<opt>}, DSB {<opt>}, DMB {<opt>} instructions <opt>
field are defined as:
Specifies an optional limitation on the ISB/DSB/DMB operation. Allowered
values are:
Full system ISB/DSB/DMB operation, encoded as option=='1111'. Can be
omitted.
All other encodings of the options are RESERVED.
the "#opt" field of "isb #opt"
So we could remove the options field in Armv7-m platform.
The following are the build error with greenhills compiler:
CC: common/arm_exit.c [asarm] (error #2071) /tmp/gh_001h70j1.si 92: bad parameter
isb 15
------^
[asarm] (error #2071) /tmp/gh_001h70j1.si 112: bad parameter
isb 15
------^
[asarm] (error) errors during processing
According to armv8-m arch reference manual:
the ISB/DMB instruction's "opt" encoding rule is same as
armv6-m/armv7-m, but the "DSB" instruction is different, in armv8-m, the
"DSB {<opt>}" field has two valid encoding options: 0b0000, 0b0100.
and all other encoding options are reserved.
In Armv7-a/Armv8-a, the dsb/dmb option field has 8 valid state value.
Signed-off-by: guoshichao <gu...@xiaomi.com>
---
arch/arm/src/armv6-m/barriers.h | 12 ++++++------
arch/arm/src/armv7-a/barriers.h | 4 ++--
arch/arm/src/armv7-m/barriers.h | 12 ++++++------
arch/arm/src/armv7-r/barriers.h | 4 ++--
arch/arm/src/armv8-m/barriers.h | 8 ++++----
arch/arm/src/armv8-r/barriers.h | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/arch/arm/src/armv6-m/barriers.h b/arch/arm/src/armv6-m/barriers.h
index 20c1a089db..e0b661bc94 100644
--- a/arch/arm/src/armv6-m/barriers.h
+++ b/arch/arm/src/armv6-m/barriers.h
@@ -31,12 +31,12 @@
/* ARMv6-M memory barriers */
-#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory")
-#define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory")
-#define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory")
+#define arm_dsb() __asm__ __volatile__ ("dsb " : : : "memory")
+#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory")
+#define arm_dmb() __asm__ __volatile__ ("dmb " : : : "memory")
-#define ARM_DSB() arm_dsb(15)
-#define ARM_ISB() arm_isb(15)
-#define ARM_DMB() arm_dmb(15)
+#define ARM_DSB() arm_dsb()
+#define ARM_ISB() arm_isb()
+#define ARM_DMB() arm_dmb()
#endif /* __ARCH_ARM_SRC_ARMV6_M_BARRIERS_H */
diff --git a/arch/arm/src/armv7-a/barriers.h b/arch/arm/src/armv7-a/barriers.h
index e8b5d94f93..2258e4110f 100644
--- a/arch/arm/src/armv7-a/barriers.h
+++ b/arch/arm/src/armv7-a/barriers.h
@@ -31,15 +31,15 @@
/* ARMv7-A memory barriers */
-#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory")
#define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory")
#define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory")
+#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory")
#define arm_nop() __asm__ __volatile__ ("nop\n")
#define arm_sev() __asm__ __volatile__ ("sev\n")
#define ARM_DSB() arm_dsb(15)
-#define ARM_ISB() arm_isb(15)
#define ARM_DMB() arm_dmb(15)
+#define ARM_ISB() arm_isb()
#define ARM_NOP() arm_nop()
#define ARM_SEV() arm_sev()
diff --git a/arch/arm/src/armv7-m/barriers.h b/arch/arm/src/armv7-m/barriers.h
index b8d91fddac..b020427a62 100644
--- a/arch/arm/src/armv7-m/barriers.h
+++ b/arch/arm/src/armv7-m/barriers.h
@@ -31,12 +31,12 @@
/* ARMv7-M memory barriers */
-#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory")
-#define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory")
-#define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory")
+#define arm_dsb() __asm__ __volatile__ ("dsb " : : : "memory")
+#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory")
+#define arm_dmb() __asm__ __volatile__ ("dmb " : : : "memory")
-#define ARM_DSB() arm_dsb(15)
-#define ARM_ISB() arm_isb(15)
-#define ARM_DMB() arm_dmb(15)
+#define ARM_DSB() arm_dsb()
+#define ARM_ISB() arm_isb()
+#define ARM_DMB() arm_dmb()
#endif /* __ARCH_ARM_SRC_ARMV7_M_BARRIERS_H */
diff --git a/arch/arm/src/armv7-r/barriers.h b/arch/arm/src/armv7-r/barriers.h
index fe17d57db3..71005f4a4d 100644
--- a/arch/arm/src/armv7-r/barriers.h
+++ b/arch/arm/src/armv7-r/barriers.h
@@ -31,15 +31,15 @@
/* ARMv7-R memory barriers */
-#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory")
#define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory")
#define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory")
+#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory")
#define arm_nop() __asm__ __volatile__ ("nop\n")
#define arm_sev() __asm__ __volatile__ ("sev\n")
#define ARM_DSB() arm_dsb(15)
-#define ARM_ISB() arm_isb(15)
#define ARM_DMB() arm_dmb(15)
+#define ARM_ISB() arm_isb()
#define ARM_NOP() arm_nop()
#define ARM_SEV() arm_sev()
diff --git a/arch/arm/src/armv8-m/barriers.h b/arch/arm/src/armv8-m/barriers.h
index 789268e567..22d896989b 100644
--- a/arch/arm/src/armv8-m/barriers.h
+++ b/arch/arm/src/armv8-m/barriers.h
@@ -31,12 +31,12 @@
/* ARMv8-M memory barriers */
-#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory")
+#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory")
+#define arm_dmb() __asm__ __volatile__ ("dmb " : : : "memory")
#define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory")
-#define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory")
+#define ARM_ISB() arm_isb()
+#define ARM_DMB() arm_dmb()
#define ARM_DSB() arm_dsb(15)
-#define ARM_ISB() arm_isb(15)
-#define ARM_DMB() arm_dmb(15)
#endif /* __ARCH_ARM_SRC_ARMV8_M_BARRIERS_H */
diff --git a/arch/arm/src/armv8-r/barriers.h b/arch/arm/src/armv8-r/barriers.h
index 0fd9f5790b..7e542eb99d 100644
--- a/arch/arm/src/armv8-r/barriers.h
+++ b/arch/arm/src/armv8-r/barriers.h
@@ -31,15 +31,15 @@
/* ARMv8-R memory barriers */
-#define arm_isb(n) __asm__ __volatile__ ("isb " #n : : : "memory")
#define arm_dsb(n) __asm__ __volatile__ ("dsb " #n : : : "memory")
#define arm_dmb(n) __asm__ __volatile__ ("dmb " #n : : : "memory")
+#define arm_isb() __asm__ __volatile__ ("isb " : : : "memory")
#define arm_nop() __asm__ __volatile__ ("nop\n")
#define arm_sev() __asm__ __volatile__ ("sev\n")
#define ARM_DSB() arm_dsb(15)
-#define ARM_ISB() arm_isb(15)
#define ARM_DMB() arm_dmb(15)
+#define ARM_ISB() arm_isb()
#define ARM_NOP() arm_nop()
#define ARM_SEV() arm_sev()