xscale: check that wp length does not exceed address

[openocd] / src / target / xscale.h

diff --git a/src/target/xscale.h b/src/target/xscale.h
index 9e19f45a9dac142d4ad34896775d66be671f2c28..d429336e190ca71a6a7a3275678148b517fef51c 100644 (file)
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -23,7 +23,7 @@
 #ifndef XSCALE_H
 #define XSCALE_H
 
-#include <target/armv4_5.h>
+#include "arm.h"
 #include "armv4_5_mmu.h"
 #include "trace.h"
 
@@ -67,6 +67,7 @@ struct xscale_trace_data
        uint32_t chkpt0;
        uint32_t chkpt1;
        uint32_t last_instruction;
+       unsigned int num_checkpoints;
        struct xscale_trace_data *next;
 };
 
@@ -77,9 +78,7 @@ struct xscale_trace
        struct xscale_trace_data *data;         /* linked list of collected trace data */
        int buffer_enabled;                             /* whether trace buffer is enabled */
        int buffer_fill;                                /* maximum number of trace runs to read (-1 for wrap-around) */
-       int pc_ok;
-       uint32_t current_pc;
-       armv4_5_state_t core_state;             /* current core state (ARM, Thumb, Jazelle) */
+       enum arm_state core_state;      /* current core state (ARM, Thumb) */
 };
 
 struct xscale_common
@@ -177,6 +176,6 @@ enum
        XSCALE_TXRXCTRL,
 };
 
-#define ERROR_XSCALE_NO_TRACE_DATA     (-1500)
+#define ERROR_XSCALE_NO_TRACE_DATA     (-700)
 
 #endif /* XSCALE_H */