X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Frtos%2Frtos.h;h=70c1193e54840c460afd1c520a7aaea7e2492d66;hp=890a99e0e0a8b4a656feeb41b122eae83f80950f;hb=f4dfa3b0d0abac55b7c60d333018d53d09b21bef;hpb=ebac7c963a76ba20b4e66b0525d12127295cdccb

diff --git a/src/rtos/rtos.h b/src/rtos/rtos.h
index 890a99e0e0..70c1193e54 100644
--- a/src/rtos/rtos.h
+++ b/src/rtos/rtos.h
@@ -13,17 +13,13 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef RTOS_H
-#define RTOS_H
-
+#ifndef OPENOCD_RTOS_RTOS_H
+#define OPENOCD_RTOS_RTOS_H
 
 #include "server/server.h"
-#include <helper/types.h>
 #include <jim-nvp.h>
 
 typedef int64_t threadid_t;
@@ -34,79 +30,82 @@ struct reg;
 /**
  * Table should be terminated by an element with NULL in symbol_name
  */
-typedef struct symbol_table_elem_struct
-{
-	char * symbol_name;
+typedef struct symbol_table_elem_struct {
+	const char *symbol_name;
 	symbol_address_t address;
-
+	bool optional;
 } symbol_table_elem_t;
 
-struct thread_detail
-{
+struct thread_detail {
 	threadid_t threadid;
 	bool exists;
-	char * display_str;
-	char * thread_name_str;
-	char * extra_info_str;
+	char *thread_name_str;
+	char *extra_info_str;
 };
 
-struct rtos
-{
+struct rtos {
 	const struct rtos_type *type;
 
-
-	symbol_table_elem_t * symbols;
+	symbol_table_elem_t *symbols;
 	struct target *target;
 	/*  add a context variable instead of global variable */
 	int64_t current_threadid;
 	threadid_t current_thread;
-	struct thread_detail* thread_details;
+	struct thread_detail *thread_details;
 	int thread_count;
-	int (*gdb_thread_packet)(struct connection *connection, char *packet, int packet_size);
-	void * rtos_specific_params;
-
-
+	int (*gdb_thread_packet)(struct connection *connection, char const *packet, int packet_size);
+	void *rtos_specific_params;
 };
 
-
-
-struct rtos_type
-{
-	char * name;
-	int (*detect_rtos)                 ( struct target* target );
-	int (*create)                      ( struct target* target );
+struct rtos_type {
+	const char *name;
+	int (*detect_rtos)(struct target *target);
+	int (*create)(struct target *target);
 	int (*smp_init)(struct target *target);
-	int (*update_threads)              ( struct rtos*   rtos );
-	int (*get_thread_reg_list)         ( struct rtos *rtos, int64_t thread_id, char ** hex_reg_list );
-	int (*get_symbol_list_to_lookup)   (symbol_table_elem_t * symbol_list[] );
+	int (*update_threads)(struct rtos *rtos);
+	int (*get_thread_reg_list)(struct rtos *rtos, int64_t thread_id, char **hex_reg_list);
+	int (*get_symbol_list_to_lookup)(symbol_table_elem_t *symbol_list[]);
 	int (*clean)(struct target *target);
+	char * (*ps_command)(struct target *target);
 };
 
-
-struct stack_register_offset
-{
-	signed short   offset;       // offset in bytes from stack head, or -1 to indicate register is not stacked, or -2 to indicate this is the stack pointer register
+struct stack_register_offset {
+	signed short offset;		/* offset in bytes from stack head, or -1 to indicate
+					 * register is not stacked, or -2 to indicate this is the
+					 * stack pointer register */
 	unsigned short width_bits;
-
 };
 
-struct rtos_register_stacking
-{
-	unsigned char                       stack_registers_size;
-	signed   char                       stack_growth_direction;
-	unsigned char                       num_output_registers;
-	unsigned char                       stack_alignment;
-	const struct stack_register_offset* register_offsets;
+struct rtos_register_stacking {
+	unsigned char stack_registers_size;
+	signed char stack_growth_direction;
+	unsigned char num_output_registers;
+	/* Some targets require evaluating the stack to determine the
+	 * actual stack pointer for a process.  If this field is NULL,
+	 * just use stacking->stack_registers_size * stack_growth_direction
+	 * to calculate adjustment.
+	 */
+	int64_t (*calculate_process_stack)(struct target *target,
+		const uint8_t *stack_data,
+		const struct rtos_register_stacking *stacking,
+		int64_t stack_ptr);
+	const struct stack_register_offset *register_offsets;
 };
 
 #define GDB_THREAD_PACKET_NOT_CONSUMED (-40)
 
-int rtos_create(Jim_GetOptInfo *goi, struct target * target);
-int rtos_generic_stack_read( struct target * target, const struct rtos_register_stacking* stacking, int64_t stack_ptr, char ** hex_reg_list );
-int rtos_try_next( struct target * target );
-int gdb_thread_packet(struct connection *connection, char *packet, int packet_size);
+int rtos_create(Jim_GetOptInfo *goi, struct target *target);
+int rtos_generic_stack_read(struct target *target,
+		const struct rtos_register_stacking *stacking,
+		int64_t stack_ptr,
+		char **hex_reg_list);
+int rtos_try_next(struct target *target);
+int gdb_thread_packet(struct connection *connection, char const *packet, int packet_size);
 int rtos_get_gdb_reg_list(struct connection *connection);
-int rtos_update_threads( struct target *target );
+int rtos_update_threads(struct target *target);
+void rtos_free_threadlist(struct rtos *rtos);
 int rtos_smp_init(struct target *target);
+/*  function for handling symbol access */
+int rtos_qsymbol(struct connection *connection, char const *packet, int packet_size);
 
-#endif // RTOS_H
+#endif /* OPENOCD_RTOS_RTOS_H */