X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fregister.h;h=d3b2c31c23b8e39a33ce080775cf2f9206c8e2f7;hb=d376f7f51831ca8816bb4aca00076b0668462775;hp=422fbd29318b5f0c8fdb67f9b085c94e3f1c6f33;hpb=74d09617b927ed7011098d5a65087dee1ef1e87a;p=openocd.git

diff --git a/src/target/register.h b/src/target/register.h
index 422fbd2931..d3b2c31c23 100644
--- a/src/target/register.h
+++ b/src/target/register.h
@@ -16,60 +16,137 @@
  *   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 REGISTER_H
-#define REGISTER_H
 
-#include "types.h"
+#ifndef OPENOCD_TARGET_REGISTER_H
+#define OPENOCD_TARGET_REGISTER_H
 
-struct target_s;
+struct target;
 
-struct bitfield_desc
-{
-	char *name;
-	int num_bits;
+enum reg_type {
+	REG_TYPE_INT,
+	REG_TYPE_INT8,
+	REG_TYPE_INT16,
+	REG_TYPE_INT32,
+	REG_TYPE_INT64,
+	REG_TYPE_INT128,
+	REG_TYPE_UINT8,
+	REG_TYPE_UINT16,
+	REG_TYPE_UINT32,
+	REG_TYPE_UINT64,
+	REG_TYPE_UINT128,
+	REG_TYPE_CODE_PTR,
+	REG_TYPE_DATA_PTR,
+	REG_TYPE_FLOAT,
+	REG_TYPE_IEEE_SINGLE,
+	REG_TYPE_IEEE_DOUBLE,
+	REG_TYPE_ARCH_DEFINED,
 };
 
-typedef struct reg_s
-{
-	char *name;
+struct reg_feature {
+	const char *name;
+};
+
+struct reg_data_type_vector {
+	struct reg_data_type *type;
+	uint32_t count;
+};
+
+struct reg_data_type_union_field {
+	const char *name;
+	struct reg_data_type *type;
+	struct reg_data_type_union_field *next;
+};
+
+struct reg_data_type_union {
+	struct reg_data_type_union_field *fields;
+};
+
+struct reg_data_type_bitfield {
+	uint32_t start;
+	uint32_t end;
+};
+
+struct reg_data_type_struct_field {
+	const char *name;
+	bool use_bitfields;
+	union {
+		struct reg_data_type_bitfield *bitfield;
+		struct reg_data_type *type;
+	};
+	struct reg_data_type_struct_field *next;
+};
+
+struct reg_data_type_struct {
+	uint32_t size;
+	struct reg_data_type_struct_field *fields;
+};
+
+struct reg_data_type_flags_field {
+	const char *name;
+	struct reg_data_type_bitfield *bitfield;
+	struct reg_data_type_flags_field *next;
+};
+
+struct reg_data_type_flags {
+	uint32_t size;
+	struct reg_data_type_flags_field *fields;
+};
+
+enum reg_data_type_class {
+	REG_TYPE_CLASS_VECTOR,
+	REG_TYPE_CLASS_UNION,
+	REG_TYPE_CLASS_STRUCT,
+	REG_TYPE_CLASS_FLAGS,
+};
+
+struct reg_data_type {
+	enum reg_type type;
+	const char *id;
+	enum reg_data_type_class type_class;
+	union {
+		struct reg_data_type_vector *reg_type_vector;
+		struct reg_data_type_union *reg_type_union;
+		struct reg_data_type_struct *reg_type_struct;
+		struct reg_data_type_flags *reg_type_flags;
+	};
+};
+
+struct reg {
+	const char *name;
+	uint32_t number;
+	struct reg_feature *feature;
+	bool caller_save;
 	void *value;
-	int dirty;
-	int valid;
+	bool dirty;
+	bool valid;
+	bool exist;
 	uint32_t size;
-	struct bitfield_desc *bitfield_desc;
-	int num_bitfields;
+	struct reg_data_type *reg_data_type;
+	const char *group;
 	void *arch_info;
-	int arch_type;
-} reg_t;
+	const struct reg_arch_type *type;
+};
 
-struct reg_cache
-{
-	char *name;
+struct reg_cache {
+	const char *name;
 	struct reg_cache *next;
-	reg_t *reg_list;
-	int num_regs;
+	struct reg *reg_list;
+	unsigned num_regs;
 };
 
-typedef struct reg_arch_type_s
-{
-	int id;
-	int (*get)(reg_t *reg);
-	int (*set)(reg_t *reg, uint8_t *buf);
-	struct reg_arch_type_s *next;
-} reg_arch_type_t;
+struct reg_arch_type {
+	int (*get)(struct reg *reg);
+	int (*set)(struct reg *reg, uint8_t *buf);
+};
 
-reg_t* register_get_by_name(struct reg_cache *first,
+struct reg *register_get_by_name(struct reg_cache *first,
 		const char *name, bool search_all);
-struct reg_cache** register_get_last_cache_p(struct reg_cache **first);
-
-int register_reg_arch_type(int (*get)(reg_t *reg),
-		int (*set)(reg_t *reg, uint8_t *buf));
-reg_arch_type_t* register_get_arch_type(int id);
+struct reg_cache **register_get_last_cache_p(struct reg_cache **first);
+void register_unlink_cache(struct reg_cache **cache_p, const struct reg_cache *cache);
+void register_cache_invalidate(struct reg_cache *cache);
 
-void register_init_dummy(reg_t *reg);
+void register_init_dummy(struct reg *reg);
 
-#endif /* REGISTER_H */
+#endif /* OPENOCD_TARGET_REGISTER_H */