You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/10/02 13:15:32 UTC
(nuttx) branch master updated: assert:read content of undefinedinsn address
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 0e2bf8ce2c assert:read content of undefinedinsn address
0e2bf8ce2c is described below
commit 0e2bf8ce2c9d255b156daef8148f4061aa185c13
Author: liaoao <li...@xiaomi.com>
AuthorDate: Thu Nov 9 12:18:51 2023 +0800
assert:read content of undefinedinsn address
read content of undefinedinsn address, and compare it with what it is in elf to check if there is a ram bit flip
Signed-off-by: liaoao <li...@xiaomi.com>
---
arch/arm/src/arm/arm_undefinedinsn.c | 11 ++++++++++-
arch/arm/src/armv7-a/arm_undefinedinsn.c | 11 ++++++++++-
arch/arm/src/armv7-r/arm_undefinedinsn.c | 11 ++++++++++-
arch/arm/src/armv8-r/arm_undefinedinsn.c | 11 ++++++++++-
boards/arm/lpc31xx/ea3131/scripts/pg-ld.script | 2 ++
5 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/arch/arm/src/arm/arm_undefinedinsn.c b/arch/arm/src/arm/arm_undefinedinsn.c
index 7e9253a552..fb20aced9e 100644
--- a/arch/arm/src/arm/arm_undefinedinsn.c
+++ b/arch/arm/src/arm/arm_undefinedinsn.c
@@ -42,7 +42,16 @@
void arm_undefinedinsn(uint32_t *regs)
{
- _alert("Undefined instruction at 0x%" PRIx32 "\n", regs[REG_PC]);
+ if (regs[REG_PC] >= (uint32_t)_stext && regs[REG_PC] < (uint32_t)_etext)
+ {
+ _alert("Undefined instruction at 0x%" PRIx32 ": 0x%" PRIx32 "\n",
+ regs[REG_PC], *(uint32_t *)regs[REG_PC]);
+ }
+ else
+ {
+ _alert("Undefined instruction at 0x%" PRIx32 "\n", regs[REG_PC]);
+ }
+
up_set_current_regs(regs);
PANIC_WITH_REGS("panic", regs);
diff --git a/arch/arm/src/armv7-a/arm_undefinedinsn.c b/arch/arm/src/armv7-a/arm_undefinedinsn.c
index 3fb7af2bfb..7a6fc8ef57 100644
--- a/arch/arm/src/armv7-a/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-a/arm_undefinedinsn.c
@@ -42,7 +42,16 @@
uint32_t *arm_undefinedinsn(uint32_t *regs)
{
- _alert("Undefined instruction at 0x%" PRIx32 "\n", regs[REG_PC]);
+ if (regs[REG_PC] >= (uint32_t)_stext && regs[REG_PC] < (uint32_t)_etext)
+ {
+ _alert("Undefined instruction at 0x%" PRIx32 ": 0x%" PRIx32 "\n",
+ regs[REG_PC], *(uint32_t *)regs[REG_PC]);
+ }
+ else
+ {
+ _alert("Undefined instruction at 0x%" PRIx32 "\n", regs[REG_PC]);
+ }
+
up_set_current_regs(regs);
PANIC_WITH_REGS("panic", regs);
diff --git a/arch/arm/src/armv7-r/arm_undefinedinsn.c b/arch/arm/src/armv7-r/arm_undefinedinsn.c
index 69dda47de7..6e069cbc40 100644
--- a/arch/arm/src/armv7-r/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-r/arm_undefinedinsn.c
@@ -42,7 +42,16 @@
uint32_t *arm_undefinedinsn(uint32_t *regs)
{
- _alert("Undefined instruction at 0x%" PRIx32 "\n", regs[REG_PC]);
+ if (regs[REG_PC] >= (uint32_t)_stext && regs[REG_PC] < (uint32_t)_etext)
+ {
+ _alert("Undefined instruction at 0x%" PRIx32 ": 0x%" PRIx32 "\n",
+ regs[REG_PC], *(uint32_t *)regs[REG_PC]);
+ }
+ else
+ {
+ _alert("Undefined instruction at 0x%" PRIx32 "\n", regs[REG_PC]);
+ }
+
up_set_current_regs(regs);
PANIC_WITH_REGS("panic", regs);
diff --git a/arch/arm/src/armv8-r/arm_undefinedinsn.c b/arch/arm/src/armv8-r/arm_undefinedinsn.c
index 02025361c5..47568d953e 100644
--- a/arch/arm/src/armv8-r/arm_undefinedinsn.c
+++ b/arch/arm/src/armv8-r/arm_undefinedinsn.c
@@ -42,7 +42,16 @@
uint32_t *arm_undefinedinsn(uint32_t *regs)
{
- _alert("Undefined instruction at 0x%" PRIx32 "\n", regs[REG_PC]);
+ if (regs[REG_PC] >= (uint32_t)_stext && regs[REG_PC] < (uint32_t)_etext)
+ {
+ _alert("Undefined instruction at 0x%" PRIx32 ": 0x%" PRIx32 "\n",
+ regs[REG_PC], *(uint32_t *)regs[REG_PC]);
+ }
+ else
+ {
+ _alert("Undefined instruction at 0x%" PRIx32 "\n", regs[REG_PC]);
+ }
+
up_set_current_regs(regs);
PANIC_WITH_REGS("panic", regs);
diff --git a/boards/arm/lpc31xx/ea3131/scripts/pg-ld.script b/boards/arm/lpc31xx/ea3131/scripts/pg-ld.script
index de06fb53b3..372d476c77 100644
--- a/boards/arm/lpc31xx/ea3131/scripts/pg-ld.script
+++ b/boards/arm/lpc31xx/ea3131/scripts/pg-ld.script
@@ -99,6 +99,7 @@ SECTIONS
.paged : {
_spaged = ABSOLUTE(.);
+ _stext = _spaged;
*(.text .text.*)
*(.fixup)
*(.gnu.warning)
@@ -110,6 +111,7 @@ SECTIONS
*(.gcc_except_table)
*(.gnu.linkonce.r.*)
_epaged = ABSOLUTE(.);
+ _etext = _epaged;
} > paged
.data : {