X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Farm_simulator.h;h=5bdbf562cc33357866f32c1fccd3e80b72f81437;hb=40dd1e5284a9d4bb07fdbba5c8e7c5772b06b44f;hp=daca371170a872fdb880116d53e391286d8e315e;hpb=df0e90ec8c728be50f1457ecc513d78de044f5a4;p=fw%2Fopenocd
diff --git a/src/target/arm_simulator.h b/src/target/arm_simulator.h
index daca37117..5bdbf562c 100644
--- a/src/target/arm_simulator.h
+++ b/src/target/arm_simulator.h
@@ -13,35 +13,27 @@
* 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 . *
***************************************************************************/
-#ifndef ARM_SIMULATOR_H
-#define ARM_SIMULATOR_H
-#include
+#ifndef OPENOCD_TARGET_ARM_SIMULATOR_H
+#define OPENOCD_TARGET_ARM_SIMULATOR_H
struct target;
-struct arm_sim_interface
-{
+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);
+ enum arm_state (*get_state)(struct arm_sim_interface *sim);
+ void (*set_state)(struct arm_sim_interface *sim, enum arm_state mode);
+ enum arm_mode (*get_mode)(struct arm_sim_interface *sim);
};
/* armv4_5 version */
int arm_simulate_step(struct target *target, uint32_t *dry_run_pc);
-/* a generic arm simulator. Caller must implement the sim interface */
-int arm_simulate_step_core(struct target *target,
- uint32_t *dry_run_pc, struct arm_sim_interface *sim);
-
-#endif /* ARM_SIMULATOR_H */
+#endif /* OPENOCD_TARGET_ARM_SIMULATOR_H */