[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-278-g31bbb3c

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  31bbb3cf0c9cffb98dbda1a357356bbf519a456f (commit)
      from  54f3f8e4c1477bec077e132cdccd8097938332e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31bbb3cf0c9cffb98dbda1a357356bbf519a456f
Author: Øyvind Harboe <oyv...@zy...>
Date:   Wed May 5 19:00:21 2010 +0200

    verify: display up to 128 diff's
    
    Showing up to 128 differences.
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/target/target.c b/src/target/target.c
index c8c1012..01d9441 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2682,6 +2682,7 @@ static COMMAND_HELPER(handle_verify_image_command_internal, int verify)
 	}
 
 	image_size = 0x0;
+	int diffs = 0;
 	retval = ERROR_OK;
 	for (i = 0; i < image.num_sections; i++)
 	{
@@ -2716,7 +2717,10 @@ static COMMAND_HELPER(handle_verify_image_command_internal, int verify)
 				/* failed crc checksum, fall back to a binary compare */
 				uint8_t *data;
 
-				command_print(CMD_CTX, "checksum mismatch - attempting binary compare");
+				if (diffs == 0)
+				{
+					LOG_ERROR("checksum mismatch - attempting binary compare");
+				}
 
 				data = (uint8_t*)malloc(buf_cnt);
 
@@ -2737,22 +2741,22 @@ static COMMAND_HELPER(handle_verify_image_command_internal, int verify)
 						if (data[t] != buffer[t])
 						{
 							command_print(CMD_CTX,
-										  "Verify operation failed address 0x%08x. Was 0x%02x instead of 0x%02x\n",
+										  "diff %d address 0x%08x. Was 0x%02x instead of 0x%02x",
+										  diffs,
 										  (unsigned)(t + image.sections[i].base_address),
 										  data[t],
 										  buffer[t]);
-							free(data);
-							free(buffer);
-							retval = ERROR_FAIL;
-							goto done;
-						}
-						if ((t%16384) == 0)
-						{
-							keep_alive();
+							if (diffs++ >= 127)
+							{
+								command_print(CMD_CTX, "More than 128 errors, the rest are not printed.");
+								free(data);
+								free(buffer);
+								goto done;
+							}
 						}
+						keep_alive();
 					}
 				}
-
 				free(data);
 			}
 		} else
@@ -2766,6 +2770,10 @@ static COMMAND_HELPER(handle_verify_image_command_internal, int verify)
 		image_size += buf_cnt;
 	}
 done:
+	if (diffs > 0)
+	{
+		retval = ERROR_FAIL;
+	}
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
 		command_print(CMD_CTX, "verified %" PRIu32 " bytes "

-----------------------------------------------------------------------

Summary of changes:
 src/target/target.c |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository