summaryrefslogtreecommitdiff
path: root/src/target
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-11-29 13:06:12 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2009-11-29 13:06:12 -0800
commit5219b35be63e56d576f6c877162e4e2f50db5294 (patch)
tree220f8f3730acdf9d42c39fe7cfd89ccc35f5d5fe /src/target
parent8c8e53baf6a5842046a1d31057ec3c9a0906a0d5 (diff)
downloadopenocd_libswd-5219b35be63e56d576f6c877162e4e2f50db5294.tar.gz
openocd_libswd-5219b35be63e56d576f6c877162e4e2f50db5294.tar.bz2
openocd_libswd-5219b35be63e56d576f6c877162e4e2f50db5294.tar.xz
openocd_libswd-5219b35be63e56d576f6c877162e4e2f50db5294.zip
XScale: clean up full_context() (#2)
Streamline the loop by continuing as soon as we know there's no work to be done; this lets us un-indent almost everything. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target')
-rw-r--r--src/target/xscale.c69
1 files changed, 30 insertions, 39 deletions
diff --git a/src/target/xscale.c b/src/target/xscale.c
index 6d2d81dd..bf5d0afa 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -1712,50 +1712,41 @@ static int xscale_full_context(struct target *target)
mode, j).valid)
valid = false;
}
+ if (valid)
+ continue;
- if (!valid)
- {
- uint32_t tmp_cpsr;
-
- /* request banked registers */
- xscale_send_u32(target, 0x0);
+ /* request banked registers */
+ xscale_send_u32(target, 0x0);
- tmp_cpsr = 0x0;
- tmp_cpsr |= mode;
- tmp_cpsr |= 0xc0; /* I/F bits */
-
- /* send CPSR for desired mode */
- xscale_send_u32(target, tmp_cpsr);
+ /* send CPSR for desired bank mode */
+ xscale_send_u32(target, mode | 0xc0 /* I/F bits */);
- /* get banked registers: r8 to r14; and SPSR
- * if not in USR/SYS mode
- */
- if (mode != ARMV4_5_MODE_SYS) {
- /* SPSR */
- r = &ARMV4_5_CORE_REG_MODE(
- armv4_5->core_cache,
- mode, 16);
-
- xscale_receive(target, buffer, 8);
-
- buf_set_u32(r->value, 0, 32, buffer[7]);
- r->dirty = false;
- r->valid = true;
- } else {
- xscale_receive(target, buffer, 7);
- }
+ /* get banked registers: r8 to r14; and SPSR
+ * except in USR/SYS mode
+ */
+ if (mode != ARMV4_5_MODE_SYS) {
+ /* SPSR */
+ r = &ARMV4_5_CORE_REG_MODE(armv4_5->core_cache,
+ mode, 16);
+
+ xscale_receive(target, buffer, 8);
+
+ buf_set_u32(r->value, 0, 32, buffer[7]);
+ r->dirty = false;
+ r->valid = true;
+ } else {
+ xscale_receive(target, buffer, 7);
+ }
- /* move data from buffer to register cache */
- for (j = 8; j <= 14; j++)
- {
- r = &ARMV4_5_CORE_REG_MODE(
- armv4_5->core_cache,
- mode, j);
+ /* move data from buffer to register cache */
+ for (j = 8; j <= 14; j++)
+ {
+ r = &ARMV4_5_CORE_REG_MODE(armv4_5->core_cache,
+ mode, j);
- buf_set_u32(r->value, 0, 32, buffer[j - 8]);
- r->dirty = false;
- r->valid = true;
- }
+ buf_set_u32(r->value, 0, 32, buffer[j - 8]);
+ r->dirty = false;
+ r->valid = true;
}
}