src/target: remove 'extern' and wrap headers

[fw/openocd] / src / target / arm_simulator.h

diff --git a/src/target/arm_simulator.h b/src/target/arm_simulator.h
index 9c28a086b19d94e5255082b9be83b0359b23f337..9e7b0400c76aefb8c807a4aa2138103f88a498b0 100644 (file)
--- a/src/target/arm_simulator.h
+++ b/src/target/arm_simulator.h
@@ -20,12 +20,28 @@
 #ifndef ARM_SIMULATOR_H
 #define ARM_SIMULATOR_H
 
-#include "target.h"
 #include "types.h"
 
-extern int arm_simulate_step(target_t *target, u32 *dry_run_pc);
+struct target_s;
 
+struct arm_sim_interface
+{
+       void *user_data;
+       uint32_t (*get_reg)(struct arm_sim_interface *sim, int reg);
+       void (*set_reg)(struct arm_sim_interface *sim, int reg, uint32_t value);
+       uint32_t (*get_reg_mode)(struct arm_sim_interface *sim, int reg);
+       void (*set_reg_mode)(struct arm_sim_interface *sim, int reg, uint32_t value);
+       uint32_t (*get_cpsr)(struct arm_sim_interface *sim, int pos, int bits);
+       enum armv4_5_state (*get_state)(struct arm_sim_interface *sim);
+       void (*set_state)(struct arm_sim_interface *sim, enum armv4_5_state mode);
+       enum armv4_5_mode (*get_mode)(struct arm_sim_interface *sim);
+};
 
-#define ERROR_ARM_SIMULATOR_NOT_IMPLEMENTED    (-1000)
+/* armv4_5 version */
+int arm_simulate_step(struct target_s *target, uint32_t *dry_run_pc);
+
+/* a generic arm simulator. Caller must implement the sim interface */
+int arm_simulate_step_core(target_t *target,
+               uint32_t *dry_run_pc, struct arm_sim_interface *sim);
 
 #endif /* ARM_SIMULATOR_H */