X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ftarget%2Fetm.h;h=0b7b05addb7b494dc5ba821fc76cc6daafe5c213;hb=53d1f9b2ca5718e4996e9cf3406f857d0ed26df2;hp=65fd757c8d3971b117f11150d7250162d5cfefcd;hpb=7087b66f19a7d60025f7315baa26d682804f3640;p=openocd

diff --git a/src/target/etm.h b/src/target/etm.h
index 65fd757c..0b7b05ad 100644
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -120,11 +120,17 @@ typedef struct etm_capture_driver_s
 	int (*stop_capture)(struct etm_context_s *etm_ctx);
 } etm_capture_driver_t;
 
+enum
+{
+	ETMV1_TRACESYNC_CYCLE = 0x1,
+	ETMV1_TRIGGER_CYCLE = 0x2,
+};
+
 typedef struct etmv1_trace_data_s
 {
-	u8 pipestat;	/* pipeline cycle this packet belongs to */
-	u16 packet;	/* packet data (4, 8 or 16 bit) */
-	int tracesync;	/* 1 if tracesync was set on this packet */
+	u8 pipestat;	/* bits 0-2 pipeline status */
+	u16 packet;		/* packet data (4, 8 or 16 bit) */
+	int flags;		/* ETMV1_TRACESYNC_CYCLE, ETMV1_TRIGGER_CYCLE */
 } etmv1_trace_data_t;
 
 /* describe a trace context
@@ -134,6 +140,7 @@ typedef struct etmv1_trace_data_s
  */
 typedef struct etm_context_s
 {
+	target_t *target;				/* target this ETM is connected to */
 	reg_cache_t *reg_cache;			/* ETM register cache */
 	etm_capture_driver_t *capture_driver;	/* driver used to access ETM data */
 	void *capture_driver_priv;		/* capture driver private data */
@@ -143,13 +150,16 @@ typedef struct etm_context_s
 	etm_portmode_t portmode;		/* normal, multiplexed or demultiplexed */
 	etmv1_tracemode_t tracemode;	/* type of information the trace contains (data, addres, contextID, ...) */ 
 	armv4_5_state_t core_state;		/* current core state (ARM, Thumb, Jazelle) */
-	image_t image;					/* source for target opcodes */
+	image_t *image;					/* source for target opcodes */
 	u32 pipe_index;					/* current trace cycle */
 	u32 data_index;					/* cycle holding next data packet */
+	int data_half;					/* port half on a 16 bit port */
 	u32 current_pc;					/* current program counter */
 	u32 pc_ok;						/* full PC has been acquired */
 	u32 last_branch;				/* last branch address output */ 
+	u32 last_branch_reason;			/* branch reason code for the last branch encountered */
 	u32 last_ptr;					/* address of the last data access */
+	u32 ptr_ok;						/* whether last_ptr is valid */ 
 	u32 context_id;					/* context ID of the code being traced */
 } etm_context_t;