[incubator-nuttx] branch master updated: tools: Fix nuttx-gdbinit for armv7-m without FPU

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davids5 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new a92e394  tools: Fix nuttx-gdbinit for armv7-m without FPU
a92e394 is described below

commit a92e394884154e1c80fce511c4255f62e0064d41
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Wed Sep 23 16:18:00 2020 +0900

    tools: Fix nuttx-gdbinit for armv7-m without FPU
    
    Summary:
    - I noticed that call stack for Cortex-M3 was incorrect
    - This commit fixes this issue
    
    Impact:
    - Affects nuttx-gdbinit for armv7-m without FPU
    
    Testing:
    - Tested with lm3s6965-ek:discover (qemu)
    - Tested with spresense:wifi
    - Tested with sim
    
    Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
 tools/nuttx-gdbinit | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/nuttx-gdbinit b/tools/nuttx-gdbinit
index 8927215..2266bf4 100644
--- a/tools/nuttx-gdbinit
+++ b/tools/nuttx-gdbinit
@@ -163,16 +163,16 @@ define _save_tcb_armv7e-m
   set $tcb.xcp.regs[8] = $r10
   set $tcb.xcp.regs[9] = $r11
   # TODO: EXC_RETURN (protected)
-  set $tcb.xcp.regs[10] = $r0
-  set $tcb.xcp.regs[11] = $r1
-  set $tcb.xcp.regs[12] = $r2
-  set $tcb.xcp.regs[13] = $r3
-  set $tcb.xcp.regs[14] = $r12
-  set $tcb.xcp.regs[15] = $lr
-  set $tcb.xcp.regs[16] = $pc
+  set $tcb.xcp.regs[11] = $r0
+  set $tcb.xcp.regs[12] = $r1
+  set $tcb.xcp.regs[13] = $r2
+  set $tcb.xcp.regs[14] = $r3
+  set $tcb.xcp.regs[15] = $r12
+  set $tcb.xcp.regs[16] = $lr
+  set $tcb.xcp.regs[17] = $pc
   # TODO: xPSR
 
-  set $_pc_reg_idx = 16
+  set $_pc_reg_idx = 17
 end
 
 define _switch_tcb_armv7e-m
@@ -188,13 +188,13 @@ define _switch_tcb_armv7e-m
   set $r10 = $tcb.xcp.regs[8]
   set $r11 = $tcb.xcp.regs[9]
   # TODO: EXC_RETURN (protected)
-  set $r0 = $tcb.xcp.regs[10]
-  set $r1 = $tcb.xcp.regs[11]
-  set $r2 = $tcb.xcp.regs[12]
-  set $r3 = $tcb.xcp.regs[13]
-  set $r12 = $tcb.xcp.regs[14]
-  set $lr = $tcb.xcp.regs[15]
-  set $pc = $tcb.xcp.regs[16]
+  set $r0 = $tcb.xcp.regs[11]
+  set $r1 = $tcb.xcp.regs[12]
+  set $r2 = $tcb.xcp.regs[13]
+  set $r3 = $tcb.xcp.regs[14]
+  set $r12 = $tcb.xcp.regs[15]
+  set $lr = $tcb.xcp.regs[16]
+  set $pc = $tcb.xcp.regs[17]
   # TODO: xPSR
 end