avoid fn call for the if check on whether anything needs
to be done.
Signed-off-by: Øyvind Harboe <oyvind.har...@zylin.com>
---
src/target/arm_jtag.c | 75 +++++++++++++++++++++----------------------------
src/target/arm_jtag.h | 37 ++++++++++++++++++++++--
2 files changed, 66 insertions(+), 46 deletions(-)
diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index af626ec..f7a540a 100644
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -31,65 +31,54 @@
#define _ARM_JTAG_SCAN_N_CHECK_
#endif
-int arm_jtag_set_instr(struct arm_jtag *jtag_info, uint32_t new_instr, void
*no_verify_capture)
+int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,
void *no_verify_capture)
{
struct jtag_tap *tap;
tap = jtag_info->tap;
- if (tap == NULL)
- return ERROR_FAIL;
+ struct scan_field field;
+ uint8_t t[4];
- if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
+ field.tap = tap;
+ field.num_bits = tap->ir_length;
+ field.out_value = t;
+ buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
+ field.in_value = NULL;
+
+ if (no_verify_capture == NULL)
+ {
+ jtag_add_ir_scan(1, &field, jtag_get_end_state());
+ } else
{
- struct scan_field field;
- uint8_t t[4];
-
- field.tap = tap;
- field.num_bits = tap->ir_length;
- field.out_value = t;
- buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
- field.in_value = NULL;
-
-
-
- if (no_verify_capture == NULL)
- {
- jtag_add_ir_scan(1, &field, jtag_get_end_state());
- } else
- {
- /* FIX!!!! this is a kludge!!! arm926ejs.c should
reimplement this arm_jtag_set_instr to
- * have special verification code.
- */
- jtag_add_ir_scan_noverify(1, &field,
jtag_get_end_state());
- }
+ /* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement
this arm_jtag_set_instr to
+ * have special verification code.
+ */
+ jtag_add_ir_scan_noverify(1, &field, jtag_get_end_state());
}
return ERROR_OK;
}
-int arm_jtag_scann(struct arm_jtag *jtag_info, uint32_t new_scan_chain)
+int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain)
{
int retval = ERROR_OK;
- if (jtag_info->cur_scan_chain != new_scan_chain)
- {
- uint32_t values[1];
- int num_bits[1];
+ uint32_t values[1];
+ int num_bits[1];
- values[0]=new_scan_chain;
- num_bits[0]=jtag_info->scann_size;
+ values[0]=new_scan_chain;
+ num_bits[0]=jtag_info->scann_size;
- if ((retval = arm_jtag_set_instr(jtag_info,
jtag_info->scann_instr, NULL)) != ERROR_OK)
- {
- return retval;
- }
+ if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr,
NULL)) != ERROR_OK)
+ {
+ return retval;
+ }
- jtag_add_dr_out(jtag_info->tap,
- 1,
- num_bits,
- values,
- jtag_get_end_state());
+ jtag_add_dr_out(jtag_info->tap,
+ 1,
+ num_bits,
+ values,
+ jtag_get_end_state());
- jtag_info->cur_scan_chain = new_scan_chain;
- }
+ jtag_info->cur_scan_chain = new_scan_chain;
return retval;
}
diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index 6f03fc6..cf230b4 100644
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -36,9 +36,40 @@ struct arm_jtag
uint32_t intest_instr;
};
-int arm_jtag_set_instr(struct arm_jtag *jtag_info,
- uint32_t new_instr, void *verify_capture);
-int arm_jtag_scann(struct arm_jtag *jtag_info, uint32_t new_scan_chain);
+int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,
void *no_verify_capture);
+static inline int arm_jtag_set_instr(struct arm_jtag *jtag_info,
+ uint32_t new_instr, void *no_verify_capture)
+{
+ /* inline most common code path */
+ struct jtag_tap *tap;
+ tap = jtag_info->tap;
+ if (tap == NULL)
+ return ERROR_FAIL;
+
+ if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
+ {
+ return arm_jtag_set_instr_inner(jtag_info, new_instr,
no_verify_capture);
+ }
+
+ return ERROR_OK;
+
+}
+
+
+int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain);
+static inline int arm_jtag_scann(struct arm_jtag *jtag_info, uint32_t
new_scan_chain)
+{
+ /* inline most common code path */
+ int retval = ERROR_OK;
+ if (jtag_info->cur_scan_chain != new_scan_chain)
+ {
+ return arm_jtag_scann_inner(jtag_info, new_scan_chain);
+ }
+
+ return retval;
+}
+
+
int arm_jtag_setup_connection(struct arm_jtag *jtag_info);
/* use this as a static so we can inline it in -O3 and refer to it via a
pointer */
--
1.6.3.3
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
