You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/12/01 21:14:41 UTC
[nuttx] branch master updated (8ee2ed0b91 -> 77aede7c87)
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 8ee2ed0b91 littlefs: add a few Kconfig options
new d321080351 arm/cortex-[a|r]: generating assemble code in ARM states by default
new 9ab97df0a5 arm/cortex-[a|r]/thumb: force assembler files to be interpreted as Thumb code
new 77aede7c87 arm/thumb: outputs an implicit IT block to avoid build break
The 3 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/src/armv7-a/arm_cpuhead.S | 2 ++
arch/arm/src/armv7-a/arm_fpuconfig.S | 2 ++
arch/arm/src/armv7-a/arm_head.S | 2 ++
arch/arm/src/armv7-a/arm_pghead.S | 2 ++
arch/arm/src/armv7-a/arm_vectoraddrexcptn.S | 8 ++------
arch/arm/src/armv7-a/arm_vectors.S | 2 ++
arch/arm/src/armv7-a/arm_vectortab.S | 3 +++
arch/arm/src/armv7-r/arm_fpuconfig.S | 2 ++
arch/arm/src/armv7-r/arm_head.S | 2 ++
arch/arm/src/armv7-r/arm_vectoraddrexcptn.S | 8 ++------
arch/arm/src/armv7-r/arm_vectors.S | 2 ++
arch/arm/src/armv7-r/arm_vectortab.S | 3 +++
arch/arm/src/common/Toolchain.defs | 13 +++++++++++++
13 files changed, 39 insertions(+), 12 deletions(-)
[nuttx] 03/03: arm/thumb: outputs an implicit IT block to avoid build break
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 77aede7c87b3364eb30cce31db421a88321fb0d1
Author: chao an <an...@xiaomi.com>
AuthorDate: Fri Dec 2 03:03:57 2022 +0800
arm/thumb: outputs an implicit IT block to avoid build break
Fix build break on thumb2 mode:
opus/celt/arm/celt_pitch_xcorr_arm-gnu.S: Assembler messages:
opus/celt/arm/celt_pitch_xcorr_arm-gnu.S:146: Error: thumb conditional instruction should be in IT block -- `movle pc,lr'
Reference:
https://developer.arm.com/documentation/100067/0612/armclang-Command-line-Options/-mimplicit-it
In A32 code, the integrated assembler accepts all conditional instructions
without giving an error or warning. In T32 code, the integrated assembler
outputs an implicit IT block when there is a conditional instruction
without an enclosing IT block. The integrated assembler does not give an
error or warning about this.
Signed-off-by: chao an <an...@xiaomi.com>
---
arch/arm/src/common/Toolchain.defs | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/src/common/Toolchain.defs b/arch/arm/src/common/Toolchain.defs
index fa3624d2b0..bb81af0b0e 100644
--- a/arch/arm/src/common/Toolchain.defs
+++ b/arch/arm/src/common/Toolchain.defs
@@ -80,6 +80,11 @@ ifeq ($(CONFIG_ARM_THUMB),y)
# -mthumb option directly to the assembler by prefixing it with -Wa.
ARCHOPTIMIZATION += -Wa,-mthumb
+
+ # Outputs an implicit IT block when there is a conditional instruction
+ # without an enclosing IT block.
+
+ ARCHOPTIMIZATION += -Wa,-mimplicit-it=always
endif
ifeq ($(CONFIG_UNWINDER_ARM),y)
[nuttx] 02/03: arm/cortex-[a|r]/thumb: force assembler files to be interpreted as Thumb code
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 9ab97df0a57d92caf509824c9bc15309a71bc242
Author: chao an <an...@xiaomi.com>
AuthorDate: Fri Dec 2 02:20:09 2022 +0800
arm/cortex-[a|r]/thumb: force assembler files to be interpreted as Thumb code
The option '-mthumb' is only valid for C source files and it is not passed to the assembler.
If 'thumb' is not considered in some assembly projects, the system will generate
'undefined instructions' when running incompatible instruction:
arm_undefinedinsn: Undefined instruction at 0x380cfc98
This assembly file should be compiled with .thumb but it doesn't:
380cfc90 <hobot_i8_i32_gemm_nn_m4_n8_neon>:
380cfc90: e92d4ff0 push {r4, r5, r6, r7, r8, r9, sl, fp, lr}
380cfc94: ed2d8b10 vpush {d8-d15}
380cfc98: e59d4064 ldr r4, [sp, #100] ; 0x64 <-- Undefined instruction
380cfc9c: e59d5068 ldr r5, [sp, #104] ; 0x68
380cfca0: e59d606c ldr r6, [sp, #108] ; 0x6c
380cfca4: e59d7070 ldr r7, [sp, #112] ; 0x70
380cfca8: e1a08120 lsr r8, r0, #2
380cfcac: e1a091a1 lsr r9, r1, #3
380cfcb0: e1a0a122 lsr sl, r2, #2
After enable thumb:
.syntax unified
.thumb
or
-Wa,-mthumb
.Lhobot_i8_i32_gemm_nn_m4_n8_neon:
38001100: e92d 4ff0 stmdb sp!, {r4, r5, r6, r7, r8, r9, sl, fp, lr}
38001104: ed2d 8b10 vpush {d8-d15}
38001108: 9c19 ldr r4, [sp, #100] ; 0x64
3800110a: 9d1a ldr r5, [sp, #104] ; 0x68
3800110c: 9e1b ldr r6, [sp, #108] ; 0x6c
3800110e: 9f1c ldr r7, [sp, #112] ; 0x70
38001110: ea4f 0890 mov.w r8, r0, lsr #2
38001114: ea4f 09d1 mov.w r9, r1, lsr #3
38001118: ea4f 0a92 mov.w sl, r2, lsr #2
This commit will enable the thumb option of the assembly file by default,
so that when compiling the assembly file, the machine code and the system will be in a consistent state.
----------------------------------------------------------------
https://gcc.gnu.org/onlinedocs/gcc-4.5.2/gcc/ARM-Options.html
GCC Manual:
-mthumb
Generate code for the Thumb instruction set. The default is to use the 32-bit ARM
instruction set. This option automatically enables either 16-bit Thumb-1 or mixed 16/32-bit
Thumb-2 instructions based on the -mcpu=name and -march=name options.
** This option is not passed to the assembler. **
** If you want to force assembler files to be interpreted as Thumb code,
either add a `.thumb' directive to the source or pass the -mthumb option
directly to the assembler by prefixing it with -Wa. **
Signed-off-by: chao an <an...@xiaomi.com>
---
arch/arm/src/common/Toolchain.defs | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/src/common/Toolchain.defs b/arch/arm/src/common/Toolchain.defs
index c5c762bced..fa3624d2b0 100644
--- a/arch/arm/src/common/Toolchain.defs
+++ b/arch/arm/src/common/Toolchain.defs
@@ -72,6 +72,14 @@ endif
ifeq ($(CONFIG_ARM_THUMB),y)
ARCHOPTIMIZATION += -mthumb
+
+ # GCC Manual:
+ # -mthumb
+ # ... If you want to force assembler files to be interpreted as Thumb
+ # code, either add a `.thumb' directive to the source or pass the
+ # -mthumb option directly to the assembler by prefixing it with -Wa.
+
+ ARCHOPTIMIZATION += -Wa,-mthumb
endif
ifeq ($(CONFIG_UNWINDER_ARM),y)
[nuttx] 01/03: arm/cortex-[a|r]: generating assemble code in ARM states by default
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit d3210803512896607ef32ca5a90f4b3774aed8f7
Author: chao an <an...@xiaomi.com>
AuthorDate: Fri Dec 2 02:52:18 2022 +0800
arm/cortex-[a|r]: generating assemble code in ARM states by default
Signed-off-by: chao an <an...@xiaomi.com>
---
arch/arm/src/armv7-a/arm_cpuhead.S | 2 ++
arch/arm/src/armv7-a/arm_fpuconfig.S | 2 ++
arch/arm/src/armv7-a/arm_head.S | 2 ++
arch/arm/src/armv7-a/arm_pghead.S | 2 ++
arch/arm/src/armv7-a/arm_vectoraddrexcptn.S | 8 ++------
arch/arm/src/armv7-a/arm_vectors.S | 2 ++
arch/arm/src/armv7-a/arm_vectortab.S | 3 +++
arch/arm/src/armv7-r/arm_fpuconfig.S | 2 ++
arch/arm/src/armv7-r/arm_head.S | 2 ++
arch/arm/src/armv7-r/arm_vectoraddrexcptn.S | 8 ++------
arch/arm/src/armv7-r/arm_vectors.S | 2 ++
arch/arm/src/armv7-r/arm_vectortab.S | 3 +++
12 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/arch/arm/src/armv7-a/arm_cpuhead.S b/arch/arm/src/armv7-a/arm_cpuhead.S
index 07cd6fb12b..00edad25fb 100644
--- a/arch/arm/src/armv7-a/arm_cpuhead.S
+++ b/arch/arm/src/armv7-a/arm_cpuhead.S
@@ -68,6 +68,8 @@
****************************************************************************/
.text
+ .syntax unified
+ .arm
/****************************************************************************
* Name: __cpu[n]_start
diff --git a/arch/arm/src/armv7-a/arm_fpuconfig.S b/arch/arm/src/armv7-a/arm_fpuconfig.S
index 06fa011d03..a45a38f34f 100644
--- a/arch/arm/src/armv7-a/arm_fpuconfig.S
+++ b/arch/arm/src/armv7-a/arm_fpuconfig.S
@@ -47,6 +47,8 @@
****************************************************************************/
.text
+ .syntax unified
+ .arm
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-a/arm_head.S b/arch/arm/src/armv7-a/arm_head.S
index 1452602202..5f0a6c3b32 100644
--- a/arch/arm/src/armv7-a/arm_head.S
+++ b/arch/arm/src/armv7-a/arm_head.S
@@ -168,6 +168,8 @@
*/
.text
+ .syntax unified
+ .arm
.global __start
.type __start, #function
diff --git a/arch/arm/src/armv7-a/arm_pghead.S b/arch/arm/src/armv7-a/arm_pghead.S
index a76f53a4c1..b0c6533f2f 100644
--- a/arch/arm/src/armv7-a/arm_pghead.S
+++ b/arch/arm/src/armv7-a/arm_pghead.S
@@ -197,6 +197,8 @@
*/
.text
+ .syntax unified
+ .arm
.global __start
.type __start, #function
diff --git a/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S b/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S
index 6a2cf85110..af407a4f58 100644
--- a/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S
+++ b/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S
@@ -46,12 +46,8 @@
****************************************************************************/
.text
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
- .text
+ .syntax unified
+ .arm
/****************************************************************************
* Name: arm_vectoraddrexcptn
diff --git a/arch/arm/src/armv7-a/arm_vectors.S b/arch/arm/src/armv7-a/arm_vectors.S
index fb7c195c0f..12952621b4 100644
--- a/arch/arm/src/armv7-a/arm_vectors.S
+++ b/arch/arm/src/armv7-a/arm_vectors.S
@@ -152,6 +152,8 @@
****************************************************************************/
.text
+ .syntax unified
+ .arm
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-a/arm_vectortab.S b/arch/arm/src/armv7-a/arm_vectortab.S
index 39528d5c08..66c30fc371 100644
--- a/arch/arm/src/armv7-a/arm_vectortab.S
+++ b/arch/arm/src/armv7-a/arm_vectortab.S
@@ -38,6 +38,9 @@
.eabi_attribute Tag_ABI_align_preserved, 1
#endif
+ .syntax unified
+ .arm
+
.globl _vector_start
.globl _vector_end
diff --git a/arch/arm/src/armv7-r/arm_fpuconfig.S b/arch/arm/src/armv7-r/arm_fpuconfig.S
index 192aecb019..f6338c6cd5 100644
--- a/arch/arm/src/armv7-r/arm_fpuconfig.S
+++ b/arch/arm/src/armv7-r/arm_fpuconfig.S
@@ -47,6 +47,8 @@
****************************************************************************/
.text
+ .syntax unified
+ .arm
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-r/arm_head.S b/arch/arm/src/armv7-r/arm_head.S
index 5fd19f5dc4..5f417b5f15 100644
--- a/arch/arm/src/armv7-r/arm_head.S
+++ b/arch/arm/src/armv7-r/arm_head.S
@@ -131,6 +131,8 @@
*/
.text
+ .syntax unified
+ .arm
.global __start
.type __start, #function
diff --git a/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S b/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S
index 02354752ee..cefe180ac0 100644
--- a/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S
+++ b/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S
@@ -46,12 +46,8 @@
****************************************************************************/
.text
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
- .text
+ .syntax unified
+ .arm
/****************************************************************************
* Name: arm_vectoraddrexcptn
diff --git a/arch/arm/src/armv7-r/arm_vectors.S b/arch/arm/src/armv7-r/arm_vectors.S
index ab7a4b1b85..659ac8d249 100644
--- a/arch/arm/src/armv7-r/arm_vectors.S
+++ b/arch/arm/src/armv7-r/arm_vectors.S
@@ -106,6 +106,8 @@
****************************************************************************/
.text
+ .syntax unified
+ .arm
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-r/arm_vectortab.S b/arch/arm/src/armv7-r/arm_vectortab.S
index 41db3f67e8..db48a055c8 100644
--- a/arch/arm/src/armv7-r/arm_vectortab.S
+++ b/arch/arm/src/armv7-r/arm_vectortab.S
@@ -38,6 +38,9 @@
.eabi_attribute Tag_ABI_align_preserved, 1
#endif
+ .syntax unified
+ .arm
+
.globl _vector_start
.globl _vector_end