X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftarget.h;h=fd7de560e3e375c113b7144a8b0852a838b63ab4;hb=b1256894598296b54a1827e7ac797ad1c60a0b18;hp=fededb95651890dff987417a4a5ae43f711f9306;hpb=cbea1ed71febd8cf64482b36381765eaabfc66ec;p=openocd.git diff --git a/src/target/target.h b/src/target/target.h index fededb9565..fd7de560e3 100644 --- a/src/target/target.h +++ b/src/target/target.h @@ -2,7 +2,7 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008,2009 Øyvind Harboe * + * Copyright (C) 2007-2010 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * Copyright (C) 2008 by Spencer Oliver * @@ -27,7 +27,6 @@ #define TARGET_H #include -#include struct reg; struct trace; @@ -85,7 +84,7 @@ enum target_debug_reason DBG_REASON_UNDEFINED = 6 }; -enum target_endianess +enum target_endianness { TARGET_ENDIAN_UNKNOWN = 0, TARGET_BIG_ENDIAN = 1, TARGET_LITTLE_ENDIAN = 2 @@ -95,7 +94,7 @@ struct working_area { uint32_t address; uint32_t size; - int free; + bool free; uint8_t *backup; struct working_area **user; struct working_area *next; @@ -108,6 +107,7 @@ struct target const char *cmd_name; /* tcl Name of target */ int target_number; /* DO NOT USE! field to be removed in 2010 */ struct jtag_tap *tap; /* where on the jtag chain is this */ + int coreid; /* which device on the TAP? */ const char *variant; /* what variant of this chip is it? */ /** @@ -118,6 +118,14 @@ struct target */ bool examined; + /** true iff the target is currently running a downloaded + * "algorithm" instetad of arbitrary user code. OpenOCD code + * invoking algorithms is trusted to maintain correctness of + * any cached state (e.g. for flash status), which arbitrary + * code will have no reason to know about. + */ + bool running_alg; + struct target_event_action *event_action; int reset_halt; /* attempt resetting the CPU into the halted mode? */ @@ -131,7 +139,7 @@ struct target uint32_t backup_working_area; /* whether the content of the working area has to be preserved */ struct working_area *working_areas;/* list of allocated working areas */ enum target_debug_reason debug_reason;/* reason why the target entered debug state */ - enum target_endianess endianness; /* target endianess */ + enum target_endianness endianness; /* target endianness */ // also see: target_state_name() enum target_state state; /* the current backend-state (running, halted, ...) */ struct reg_cache *reg_cache; /* the first register cache of the target (core regs) */ @@ -147,6 +155,11 @@ struct target * lots of halted/resumed info when stepping in debugger. */ bool halt_issued; /* did we transition to halted state? */ long long halt_issued_time; /* Note time when halt was issued */ + + bool dbgbase_set; /* By default the debug base is not set */ + uint32_t dbgbase; /* Really a Cortex-A specific option, but there is no + system in place to support target specific options + currently. */ }; /** Returns the instance-specific name of the specified target. */ @@ -214,7 +227,7 @@ enum target_event struct target_event_action { enum target_event event; - Jim_Interp *interp; + struct Jim_Interp *interp; struct Jim_Obj *body; int has_percent; struct target_event_action *next; @@ -240,11 +253,7 @@ struct target_timer_callback }; int target_register_commands(struct command_context *cmd_ctx); -int target_register_user_commands(struct command_context *cmd_ctx); -int target_init(struct command_context *cmd_ctx); int target_examine(void); -int target_process_reset(struct command_context *cmd_ctx, - enum target_reset_mode reset_mode); int target_register_event_callback( int (*callback)(struct target *target, @@ -254,6 +263,18 @@ int target_unregister_event_callback( int (*callback)(struct target *target, enum target_event event, void *priv), void *priv); +/* Poll the status of the target, detect any error conditions and report them. + * + * Also note that this fn will clear such error conditions, so a subsequent + * invocation will then succeed. + * + * These error conditions can be "sticky" error conditions. E.g. writing + * to memory could be implemented as an open loop and if memory writes + * fails, then a note is made of it, the error is sticky, but the memory + * write loop still runs to completion. This improves performance in the + * normal case as there is no need to verify that every single write succeed, + * yet it is possible to detect error condtions. + */ int target_poll(struct target *target); int target_resume(struct target *target, int current, uint32_t address, int handle_breakpoints, int debug_execution); @@ -266,7 +287,6 @@ int target_call_event_callbacks(struct target *target, enum target_event event); */ int target_register_timer_callback(int (*callback)(void *priv), int time_ms, int periodic, void *priv); -int target_unregister_timer_callback(int (*callback)(void *priv), void *priv); int target_call_timer_callbacks(void); /** @@ -372,12 +392,23 @@ int target_read_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer); /** * Write @a count items of @a size bytes to the memory of @a target at - * the @a address given. + * the @a address given. @a address must be aligned to @a size + * in target memory. + * + * The endianness is the same in the host and target memory for this + * function. + * + * \todo TODO: + * Really @a buffer should have been defined as "const void *" and + * @a buffer should have been aligned to @a size in the host memory. + * + * This is not enforced via e.g. assert's today and e.g. the + * target_write_buffer fn breaks this assumption. * * This routine is wrapper for target->type->write_memory. */ int target_write_memory(struct target *target, - uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer); + uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer); /** * Write @a count items of 4 bytes to the memory of @a target at @@ -387,7 +418,7 @@ int target_write_memory(struct target *target, * This routine is wrapper for target->type->bulk_write_memory. */ int target_bulk_write_memory(struct target *target, - uint32_t address, uint32_t count, uint8_t *buffer); + uint32_t address, uint32_t count, const uint8_t *buffer); /* * Write to target memory using the virtual address. @@ -414,7 +445,7 @@ int target_bulk_write_memory(struct target *target, * peripheral registers which do not support byte operations. */ int target_write_buffer(struct target *target, - uint32_t address, uint32_t size, uint8_t *buffer); + uint32_t address, uint32_t size, const uint8_t *buffer); int target_read_buffer(struct target *target, uint32_t address, uint32_t size, uint8_t *buffer); int target_checksum_memory(struct target *target, @@ -439,23 +470,25 @@ const char *target_state_name( struct target *target ); */ int target_alloc_working_area(struct target *target, uint32_t size, struct working_area **area); +/* Same as target_alloc_working_area, except that no error is logged + * when ERROR_TARGET_RESOURCE_NOT_AVAILABLE is returned. + * + * This allows the calling code to *try* to allocate target memory + * and have a fallback to another behavior(slower?). + */ +int target_alloc_working_area_try(struct target *target, + uint32_t size, struct working_area **area); int target_free_working_area(struct target *target, struct working_area *area); -int target_free_working_area_restore(struct target *target, - struct working_area *area, int restore); void target_free_all_working_areas(struct target *target); -void target_free_all_working_areas_restore(struct target *target, int restore); extern struct target *all_targets; -extern struct target_event_callback *target_event_callbacks; -extern struct target_timer_callback *target_timer_callbacks; - uint32_t target_buffer_get_u32(struct target *target, const uint8_t *buffer); +uint32_t target_buffer_get_u24(struct target *target, const uint8_t *buffer); uint16_t target_buffer_get_u16(struct target *target, const uint8_t *buffer); -uint8_t target_buffer_get_u8 (struct target *target, const uint8_t *buffer); void target_buffer_set_u32(struct target *target, uint8_t *buffer, uint32_t value); +void target_buffer_set_u24(struct target *target, uint8_t *buffer, uint32_t value); void target_buffer_set_u16(struct target *target, uint8_t *buffer, uint16_t value); -void target_buffer_set_u8 (struct target *target, uint8_t *buffer, uint8_t value); int target_read_u32(struct target *target, uint32_t address, uint32_t *value); int target_read_u16(struct target *target, uint32_t address, uint16_t *value); @@ -468,7 +501,6 @@ int target_write_u8(struct target *target, uint32_t address, uint8_t value); int target_arch_state(struct target *target); void target_handle_event(struct target *t, enum target_event e); -void target_all_handle_event(enum target_event e); #define ERROR_TARGET_INVALID (-300) #define ERROR_TARGET_INIT_FAILED (-301) @@ -482,6 +514,6 @@ void target_all_handle_event(enum target_event e); #define ERROR_TARGET_NOT_RUNNING (-310) #define ERROR_TARGET_NOT_EXAMINED (-311) -const char *target_strerror_safe(int err); +extern bool get_target_reset_nag(void); #endif /* TARGET_H */