Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 101ec4e)
retire jtag_set_check_value
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Fri, 8 May 2009 07:14:23 +0000 (07:14 +0000)
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Fri, 8 May 2009 07:14:23 +0000 (07:14 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@1666 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/target/etm.c patch | blob | history

diff --git a/src/target/etm.c b/src/target/etm.c
index 4acc041f396769348dbd236e582d517c43938043..24dd0ff7cdf1c00014e215a5ed9b3e2bdce3f7df 100644 (file)
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -339,42 +339,31 @@ int etm_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
        fields[0].tap = etm_reg->jtag_info->tap;
        fields[0].num_bits = 32;
        fields[0].out_value = reg->value;
        fields[0].tap = etm_reg->jtag_info->tap;
        fields[0].num_bits = 32;
        fields[0].out_value = reg->value;
-       
        fields[0].in_value = NULL;
        fields[0].in_value = NULL;
-       
-       
        fields[0].in_handler = NULL;
        fields[0].in_handler = NULL;
-       
 
        fields[1].tap = etm_reg->jtag_info->tap;
        fields[1].num_bits = 7;
        fields[1].out_value = malloc(1);
        buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
 
        fields[1].tap = etm_reg->jtag_info->tap;
        fields[1].num_bits = 7;
        fields[1].out_value = malloc(1);
        buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
-       
        fields[1].in_value = NULL;
        fields[1].in_value = NULL;
-       
-       
        fields[1].in_handler = NULL;
        fields[1].in_handler = NULL;
-       
 
        fields[2].tap = etm_reg->jtag_info->tap;
        fields[2].num_bits = 1;
        fields[2].out_value = malloc(1);
        buf_set_u32(fields[2].out_value, 0, 1, 0);
 
        fields[2].tap = etm_reg->jtag_info->tap;
        fields[2].num_bits = 1;
        fields[2].out_value = malloc(1);
        buf_set_u32(fields[2].out_value, 0, 1, 0);
-       
        fields[2].in_value = NULL;
        fields[2].in_value = NULL;
-       
-       
        fields[2].in_handler = NULL;
        fields[2].in_handler = NULL;
-       
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
        fields[0].in_value = reg->value;
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
        fields[0].in_value = reg->value;
-       jtag_set_check_value(fields+0, check_value, check_mask, NULL);
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
+       jtag_check_value_mask(fields+0, check_value, check_mask);
+
        free(fields[1].out_value);
        free(fields[2].out_value);
 
        free(fields[1].out_value);
        free(fields[2].out_value);
 
@@ -431,34 +420,34 @@ int etm_write_reg(reg_t *reg, u32 value)
        fields[0].num_bits = 32;
        fields[0].out_value = malloc(4);
        buf_set_u32(fields[0].out_value, 0, 32, value);
        fields[0].num_bits = 32;
        fields[0].out_value = malloc(4);
        buf_set_u32(fields[0].out_value, 0, 32, value);
-       
+
        fields[0].in_value = NULL;
        fields[0].in_value = NULL;
-       
-       
+
+
        fields[0].in_handler = NULL;
        fields[0].in_handler = NULL;
-       
+
 
        fields[1].tap = etm_reg->jtag_info->tap;
        fields[1].num_bits = 7;
        fields[1].out_value = malloc(1);
        buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
 
        fields[1].tap = etm_reg->jtag_info->tap;
        fields[1].num_bits = 7;
        fields[1].out_value = malloc(1);
        buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
-       
+
        fields[1].in_value = NULL;
        fields[1].in_value = NULL;
-       
-       
+
+
        fields[1].in_handler = NULL;
        fields[1].in_handler = NULL;
-       
+
 
        fields[2].tap = etm_reg->jtag_info->tap;
        fields[2].num_bits = 1;
        fields[2].out_value = malloc(1);
        buf_set_u32(fields[2].out_value, 0, 1, 1);
 
        fields[2].tap = etm_reg->jtag_info->tap;
        fields[2].num_bits = 1;
        fields[2].out_value = malloc(1);
        buf_set_u32(fields[2].out_value, 0, 1, 1);
-       
+
        fields[2].in_value = NULL;
        fields[2].in_value = NULL;
-       
-       
+
+
        fields[2].in_handler = NULL;
        fields[2].in_handler = NULL;
-       
+
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
@@ -993,7 +982,7 @@ static int etmv1_analyze_trace(etm_context_t *ctx, struct command_context_s *cmd
                {
                        if (((instruction.type == ARM_B) ||
                             (instruction.type == ARM_BL) ||
                {
                        if (((instruction.type == ARM_B) ||
                             (instruction.type == ARM_BL) ||
-                            (instruction.type == ARM_BLX)) &&   
+                            (instruction.type == ARM_BLX)) &&
                            (instruction.info.b_bl_bx_blx.target_address != 0xffffffff))
                        {
                                next_pc = instruction.info.b_bl_bx_blx.target_address;
                            (instruction.info.b_bl_bx_blx.target_address != 0xffffffff))
                        {
                                next_pc = instruction.info.b_bl_bx_blx.target_address;
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)