David Brownell <david-b@pacbell.net>: This patch adds annotations to
the key command_*() helper functions, fixng the bugs that turned up. Several of these bugs were from misuse of PRIi64; that's for 64-bit integers, NOT for "long long" or "u64" (which work best with %lld). git-svn-id: svn://svn.berlios.de/openocd/trunk@1873 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
@@ -342,7 +342,7 @@ int handle_armv4_5_reg_command(struct command_context_s *cmd_ctx, char *cmd, cha
|
||||
output_len += snprintf(output + output_len, 128 - output_len, "%8s: %8.8x ", ARMV4_5_CORE_REG_MODENUM(armv4_5->core_cache, mode, num).name,
|
||||
buf_get_u32(ARMV4_5_CORE_REG_MODENUM(armv4_5->core_cache, mode, num).value, 0, 32));
|
||||
}
|
||||
command_print(cmd_ctx, output);
|
||||
command_print(cmd_ctx, "%s", output);
|
||||
}
|
||||
command_print(cmd_ctx, " cpsr: %8.8x spsr_fiq: %8.8x spsr_irq: %8.8x spsr_svc: %8.8x spsr_abt: %8.8x spsr_und: %8.8x",
|
||||
buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
|
||||
|
||||
@@ -299,7 +299,7 @@ int armv4_5_mmu_handle_md_phys_command(command_context_t *cmd_ctx, char *cmd, ch
|
||||
|
||||
if ((i % 8 == 7) || (i == count - 1))
|
||||
{
|
||||
command_print(cmd_ctx, output);
|
||||
command_print(cmd_ctx, "%s", output);
|
||||
output_len = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1674,7 +1674,7 @@ static int handle_etm_trigger_percent_command(struct command_context_s *cmd_ctx,
|
||||
|
||||
if ((new_value < 2) || (new_value > 100))
|
||||
{
|
||||
command_print(cmd_ctx, "valid settings are 2% to 100%");
|
||||
command_print(cmd_ctx, "valid settings are 2%% to 100%%");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -1910,7 +1910,7 @@ static int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char
|
||||
|
||||
if ((i%line_modulo == line_modulo-1) || (i == count - 1))
|
||||
{
|
||||
command_print(cmd_ctx, output);
|
||||
command_print(cmd_ctx, "%s", output);
|
||||
output_len = 0;
|
||||
}
|
||||
}
|
||||
@@ -2168,7 +2168,8 @@ static int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cm
|
||||
|
||||
if (retval==ERROR_OK)
|
||||
{
|
||||
command_print(cmd_ctx, "dumped %"PRIi64" byte in %s", fileio.size, duration_text);
|
||||
command_print(cmd_ctx, "dumped %lld byte in %s",
|
||||
fileio.size, duration_text);
|
||||
free(duration_text);
|
||||
}
|
||||
|
||||
@@ -2369,7 +2370,8 @@ static int handle_bp_command(struct command_context_s *cmd_ctx, char *cmd, char
|
||||
}
|
||||
else
|
||||
{
|
||||
command_print(cmd_ctx, "breakpoint added at address 0x%8.8x", strtoul(args[0], NULL, 0));
|
||||
command_print(cmd_ctx, "breakpoint added at address 0x%8.8lx",
|
||||
strtoul(args[0], NULL, 0));
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -60,7 +60,7 @@ static int handle_trace_point_command(struct command_context_s *cmd_ctx, char *c
|
||||
|
||||
for (i = 0; i < trace->num_trace_points; i++)
|
||||
{
|
||||
command_print(cmd_ctx, "trace point 0x%8.8x (%"PRIi64" times hit)",
|
||||
command_print(cmd_ctx, "trace point 0x%8.8x (%lld times hit)",
|
||||
trace->trace_points[i].address,
|
||||
trace->trace_points[i].hit_counter);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user