diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-07 14:54:12 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-07 14:57:43 -0800 |
| commit | 7b0314c377cc7c6a90db34d6d3e9e723d6d2b94a (patch) | |
| tree | 30b5d55ebf10f8d802a5746533a178a39997c481 /src/target/arm720t.c | |
| parent | 7936ab16da93f91258e17e4699360dc3f43728ce (diff) | |
| download | openocd+libswd-7b0314c377cc7c6a90db34d6d3e9e723d6d2b94a.tar.gz openocd+libswd-7b0314c377cc7c6a90db34d6d3e9e723d6d2b94a.tar.bz2 openocd+libswd-7b0314c377cc7c6a90db34d6d3e9e723d6d2b94a.tar.xz openocd+libswd-7b0314c377cc7c6a90db34d6d3e9e723d6d2b94a.zip | |
ARM: remove mrc_opcode(), use MRC() or MCR()
Get rid of mrc_opcode() in favor of ARMV4_5_MRC() or, where
arm*20t should have used it, ARMV4_5_MCR() instead.
Basically, *writing* coprocessor registers shouldn't have
used the *read* opcode ... and both should stick to standard
opcode constructors, not rearranging parameter sequence any
more than already needed.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/arm720t.c')
| -rw-r--r-- | src/target/arm720t.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/target/arm720t.c b/src/target/arm720t.c index 48cfdf01..207db787 100644 --- a/src/target/arm720t.c +++ b/src/target/arm720t.c @@ -481,7 +481,10 @@ COMMAND_HANDLER(arm720t_handle_cp15_command) return ERROR_OK; } -static int arm720t_mrc(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value) +static int arm720t_mrc(struct target *target, int cpnum, + uint32_t op1, uint32_t op2, + uint32_t CRn, uint32_t CRm, + uint32_t *value) { if (cpnum!=15) { @@ -489,11 +492,17 @@ static int arm720t_mrc(struct target *target, int cpnum, uint32_t op1, uint32_t return ERROR_FAIL; } - return arm720t_read_cp15(target, mrc_opcode(cpnum, op1, op2, CRn, CRm), value); + /* read "to" r0 */ + return arm720t_read_cp15(target, + ARMV4_5_MRC(cpnum, op1, 0, CRn, CRm, op2), + value); } -static int arm720t_mcr(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value) +static int arm720t_mcr(struct target *target, int cpnum, + uint32_t op1, uint32_t op2, + uint32_t CRn, uint32_t CRm, + uint32_t value) { if (cpnum!=15) { @@ -501,7 +510,10 @@ static int arm720t_mcr(struct target *target, int cpnum, uint32_t op1, uint32_t return ERROR_FAIL; } - return arm720t_write_cp15(target, mrc_opcode(cpnum, op1, op2, CRn, CRm), value); + /* write "from" r0 */ + return arm720t_write_cp15(target, + ARMV4_5_MCR(cpnum, op1, 0, CRn, CRm, op2), + value); } static const struct command_registration arm720t_exec_command_handlers[] = { |