projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
target: remove needless "extern"s
[fw/openocd]
/
src
/
target
/
etm.c
diff --git
a/src/target/etm.c
b/src/target/etm.c
index 520e22f6089c9a20c5785992f4bd1a0e8abb3d8f..e0671d5039dda7cf427bd143ea958e76db057180 100644
(file)
--- a/
src/target/etm.c
+++ b/
src/target/etm.c
@@
-21,12
+21,14
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#include "arm
v4_5
.h"
+#include "arm.h"
#include "etm.h"
#include "etb.h"
#include "image.h"
#include "arm_disassembler.h"
#include "register.h"
#include "etm.h"
#include "etb.h"
#include "image.h"
#include "arm_disassembler.h"
#include "register.h"
+#include "etm_dummy.h"
+#include "oocd_trace.h"
/*
/*
@@
-613,13
+615,7
@@
static int etm_write_reg(struct reg *reg, uint32_t value)
}
}
-/* ETM trace analysis functionality
- *
- */
-extern struct etm_capture_driver etm_dummy_capture_driver;
-#if BUILD_OOCD_TRACE == 1
-extern struct etm_capture_driver oocd_trace_capture_driver;
-#endif
+/* ETM trace analysis functionality */
static struct etm_capture_driver *etm_capture_drivers[] =
{
static struct etm_capture_driver *etm_capture_drivers[] =
{
@@
-659,7
+655,7
@@
static int etm_read_instruction(struct etm_context *ctx, struct arm_instruction
return ERROR_TRACE_INSTRUCTION_UNAVAILABLE;
}
return ERROR_TRACE_INSTRUCTION_UNAVAILABLE;
}
- if (ctx->core_state == ARM
V4_5
_STATE_ARM)
+ if (ctx->core_state == ARM_STATE_ARM)
{
uint8_t buf[4];
if ((retval = image_read_section(ctx->image, section,
{
uint8_t buf[4];
if ((retval = image_read_section(ctx->image, section,
@@
-672,7
+668,7
@@
static int etm_read_instruction(struct etm_context *ctx, struct arm_instruction
opcode = target_buffer_get_u32(ctx->target, buf);
arm_evaluate_opcode(opcode, ctx->current_pc, instruction);
}
opcode = target_buffer_get_u32(ctx->target, buf);
arm_evaluate_opcode(opcode, ctx->current_pc, instruction);
}
- else if (ctx->core_state == ARM
V4_5
_STATE_THUMB)
+ else if (ctx->core_state == ARM_STATE_THUMB)
{
uint8_t buf[2];
if ((retval = image_read_section(ctx->image, section,
{
uint8_t buf[2];
if ((retval = image_read_section(ctx->image, section,
@@
-685,7
+681,7
@@
static int etm_read_instruction(struct etm_context *ctx, struct arm_instruction
opcode = target_buffer_get_u16(ctx->target, buf);
thumb_evaluate_opcode(opcode, ctx->current_pc, instruction);
}
opcode = target_buffer_get_u16(ctx->target, buf);
thumb_evaluate_opcode(opcode, ctx->current_pc, instruction);
}
- else if (ctx->core_state == ARM
V4_5
_STATE_JAZELLE)
+ else if (ctx->core_state == ARM_STATE_JAZELLE)
{
LOG_ERROR("BUG: tracing of jazelle code not supported");
return ERROR_FAIL;
{
LOG_ERROR("BUG: tracing of jazelle code not supported");
return ERROR_FAIL;
@@
-829,7
+825,7
@@
static int etmv1_branch_address(struct etm_context *ctx)
/* if a full address was output, we might have branched into Jazelle state */
if ((shift == 32) && (packet & 0x80))
{
/* if a full address was output, we might have branched into Jazelle state */
if ((shift == 32) && (packet & 0x80))
{
- ctx->core_state = ARM
V4_5
_STATE_JAZELLE;
+ ctx->core_state = ARM_STATE_JAZELLE;
}
else
{
}
else
{
@@
-837,12
+833,12
@@
static int etmv1_branch_address(struct etm_context *ctx)
* encoded in bit 0 of the branch target address */
if (ctx->last_branch & 0x1)
{
* encoded in bit 0 of the branch target address */
if (ctx->last_branch & 0x1)
{
- ctx->core_state = ARM
V4_5
_STATE_THUMB;
+ ctx->core_state = ARM_STATE_THUMB;
ctx->last_branch &= ~0x1;
}
else
{
ctx->last_branch &= ~0x1;
}
else
{
- ctx->core_state = ARM
V4_5
_STATE_ARM;
+ ctx->core_state = ARM_STATE_ARM;
ctx->last_branch &= ~0x3;
}
}
ctx->last_branch &= ~0x3;
}
}
@@
-1126,12
+1122,12
@@
static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
}
else
{
}
else
{
- next_pc += (ctx->core_state == ARM
V4_5
_STATE_ARM) ? 4 : 2;
+ next_pc += (ctx->core_state == ARM_STATE_ARM) ? 4 : 2;
}
}
else if (pipestat == STAT_IN)
{
}
}
else if (pipestat == STAT_IN)
{
- next_pc += (ctx->core_state == ARM
V4_5
_STATE_ARM) ? 4 : 2;
+ next_pc += (ctx->core_state == ARM_STATE_ARM) ? 4 : 2;
}
if ((pipestat != STAT_TD) && (pipestat != STAT_WT))
}
if ((pipestat != STAT_TD) && (pipestat != STAT_WT))
@@
-1498,7
+1494,7
@@
COMMAND_HANDLER(handle_etm_config_command)
etm_ctx->trigger_percent = 50;
etm_ctx->trace_data = NULL;
etm_ctx->portmode = portmode;
etm_ctx->trigger_percent = 50;
etm_ctx->trace_data = NULL;
etm_ctx->portmode = portmode;
- etm_ctx->core_state = ARM
V4_5
_STATE_ARM;
+ etm_ctx->core_state = ARM_STATE_ARM;
arm->etm = etm_ctx;
arm->etm = etm_ctx;