Browse Source

Make cortexm_pc_write static.

pull/86/head
Gareth McMullin 10 years ago
parent
commit
274b818517
  1. 9
      src/cortexm.c
  2. 1
      src/include/cortexm.h

9
src/cortexm.c

@ -24,9 +24,6 @@
* ARM doc DDI0403C. * ARM doc DDI0403C.
* *
* Also supports Cortex-M0 / ARMv6-M * Also supports Cortex-M0 / ARMv6-M
*
* Issues:
* There are way too many magic numbers used here.
*/ */
#include "general.h" #include "general.h"
#include "exception.h" #include "exception.h"
@ -421,16 +418,12 @@ static uint32_t cortexm_pc_read(target *t)
{ {
target_mem_write32(t, CORTEXM_DCRSR, 0x0F); target_mem_write32(t, CORTEXM_DCRSR, 0x0F);
return target_mem_read32(t, CORTEXM_DCRDR); return target_mem_read32(t, CORTEXM_DCRDR);
return 0;
} }
int cortexm_pc_write(target *t, const uint32_t val) static void cortexm_pc_write(target *t, const uint32_t val)
{ {
target_mem_write32(t, CORTEXM_DCRDR, val); target_mem_write32(t, CORTEXM_DCRDR, val);
target_mem_write32(t, CORTEXM_DCRSR, CORTEXM_DCRSR_REGWnR | 0x0F); target_mem_write32(t, CORTEXM_DCRSR, CORTEXM_DCRSR_REGWnR | 0x0F);
return 0;
} }
/* The following three routines implement target halt/resume /* The following three routines implement target halt/resume

1
src/include/cortexm.h

@ -148,7 +148,6 @@ void cortexm_detach(target *t);
void cortexm_halt_resume(target *t, bool step); void cortexm_halt_resume(target *t, bool step);
int cortexm_run_stub(target *t, uint32_t loadaddr, int cortexm_run_stub(target *t, uint32_t loadaddr,
uint32_t r0, uint32_t r1, uint32_t r2, uint32_t r3); uint32_t r0, uint32_t r1, uint32_t r2, uint32_t r3);
int cortexm_pc_write(target *t, const uint32_t val);
#endif #endif

Loading…
Cancel
Save