This is an automated email from Gerrit.

Tomas Vanek ([email protected]) just uploaded a new patch set to Gerrit, which you 
can find at http://openocd.zylin.com/5203

-- gerrit

commit 80af6523d46236c3248746d5294b930288840f6f
Author: Tomas Vanek <[email protected]>
Date:   Wed Jun 5 01:09:15 2019 +0200

    target/armv7m: fix register number in armv7m_get_core_reg()
    
    armv7m_get_core_reg() calls arm->read_core_reg()
    arm->read_core_reg() expects the register number as an index
    to core reglist, not an ARMv7M specific register code.
    Use reg->number instead of armv7m_reg->num.
    
    The change solves assert
      src/target/armv7m.c:222: armv7m_read_core_reg: Assertion
      `num < (int)armv7m->arm.core_cache->num_regs' failed.
    when gdb 'info reg' is issued on a Cortex-M target and
    no cortex_m_debug_entry() has been called since OpenOCD start
    (target was halted before OpenOCD start).
    
    Change-Id: I32a2294693ef979b613be93aeceb3b0eb06ee6df
    Ticket: https://sourceforge.net/p/openocd/tickets/216/
    Signed-off-by: Tomas Vanek <[email protected]>

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 3d73b29..4b37774 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -191,7 +191,7 @@ static int armv7m_get_core_reg(struct reg *reg)
        if (target->state != TARGET_HALTED)
                return ERROR_TARGET_NOT_HALTED;
 
-       retval = arm->read_core_reg(target, reg, armv7m_reg->num, 
arm->core_mode);
+       retval = arm->read_core_reg(target, reg, reg->number, arm->core_mode);
 
        return retval;
 }

-- 


_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to