2001-02-23 Ben Elliston <bje@redhat.com>

	* sim-main.h (ENGINE_ISSUE_PREFIX_HOOK): Only define if not
	already defined elsewhere.

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index f3cb60918dc4f082ccb50c5fe79241fb3c3b2116..3ff893a9f260fcfc83f46b2b3efbb0ea276e1065 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-23  Ben Elliston  <bje@redhat.com>
+
+       * sim-main.h (ENGINE_ISSUE_PREFIX_HOOK): Only define if not
+       already defined elsewhere.
+
 2001-02-19  Ben Elliston  <bje@redhat.com>
 
        * sim-main.h (sim_monitor): Return an int.

diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index 9e87fbf109f4311e7128cfad59009be08d3ca13e..3ccd4a92d241dbb56daccc4078882b38fb5b5e88 100644 (file)
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -328,6 +328,7 @@ struct _sim_cpu {
 #define simSIGINT      (1 << 28)  /* 0 = do nothing; 1 = SIGINT has occured */
 #define simJALDELAYSLOT        (1 << 29) /* 1 = in jal delay slot */
 
+#ifndef ENGINE_ISSUE_PREFIX_HOOK
 #define ENGINE_ISSUE_PREFIX_HOOK() \
   { \
     /* Perform any pending writes */ \
@@ -343,6 +344,7 @@ struct _sim_cpu {
     else \
      STATE &= ~simPCOC0; \
   }
+#endif /* ENGINE_ISSUE_PREFIX_HOOK */
 
 
 /* This is nasty, since we have to rely on matching the register