diff options
| author | Nicolas Pitre <nico@fluxnic.net> | 2009-12-05 01:01:54 -0500 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-04 23:07:10 -0800 |
| commit | e8599cc3d81c659c3b8fdf65177006689865d4f4 (patch) | |
| tree | ea00c87d3f60d2ae02a026e9a2d1a9dcf6c61196 | |
| parent | 899c9975e750ff0144d4a4f63e0f2a619c0b0e58 (diff) | |
| download | openocd+libswd-e8599cc3d81c659c3b8fdf65177006689865d4f4.tar.gz openocd+libswd-e8599cc3d81c659c3b8fdf65177006689865d4f4.tar.bz2 openocd+libswd-e8599cc3d81c659c3b8fdf65177006689865d4f4.tar.xz openocd+libswd-e8599cc3d81c659c3b8fdf65177006689865d4f4.zip | |
ARM semihosting: work with both low and high vectors
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
| -rw-r--r-- | src/target/arm_semihosting.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/target/arm_semihosting.c b/src/target/arm_semihosting.c index 39625f61..d448d54e 100644 --- a/src/target/arm_semihosting.c +++ b/src/target/arm_semihosting.c @@ -414,18 +414,16 @@ static int do_semihosting(struct target *target) int arm_semihosting(struct target *target, int *retval) { struct arm *arm = target_to_arm(target); - uint32_t lr, spsr; + uint32_t pc, lr, spsr; struct reg *r; if (!arm->is_semihosting || arm->core_mode != ARM_MODE_SVC) return 0; - /* Check for PC == 8: Supervisor Call vector - * REVISIT: assumes low exception vectors, not hivecs... - * safer to test "was this entry from a vector catch". - */ + /* Check for PC == 0x00000008 or 0xffff0008: Supervisor Call vector. */ r = arm->core_cache->reg_list + 15; - if (buf_get_u32(r->value, 0, 32) != 0x08) + pc = buf_get_u32(r->value, 0, 32); + if (pc != 0x00000008 && pc != 0xffff0008) return 0; r = arm_reg_current(arm, 14); |