* mips.igen (check_mf_hilo): Correct check.

2 files changed, 52 insertions, 104 deletions

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 17eafa7..4b8f87d 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,50 @@
+Mon Jun 29 09:21:07 1998  Gavin Koch  <gavin@cygnus.com>
+
+	* mips.igen (check_mf_hilo): Correct check.
+
+start-sanitize-r5900
+Fri Jun 19 14:44:46 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* sim-main.h (NR_COP0_GPR, COP0_GPR, cop0_gpr, NR_COP0_BP,
+ 	COP0_BP, cop0_bp, NR_COP0_P, COP0_P, cop0_p): Add 32 COP0 general
+ 	purpose registers, add 8 COP0 break-point registers, add 64 COP0
+ 	performance registers.
+
+	* interp.c (decode_coproc): Accept any MTC0/MFC0, MTBP/MFBP, MTP*
+ 	MFP* instructions.  Just transfer value to/from corresponding
+ 	register.
+
+	* r5900.igen (BC0F, BC0FL, BC0T, BC0TL): Implement, assume COP0
+ 	status is always true.
+	(CACHE, TLBP, TPGWI, TLBWR): Treat as NOP.
+	(EI, DI): Set/clear Status-EIE bit.
+	
+end-sanitize-r5900
+start-sanitize-sky
+Fri Jun 19 14:44:46 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* mips.igen (BC0F, BC0FL, BC0T, BC0TL): Move to sky code to
+ 	r5900.igen.
+	
+end-sanitize-sky
+Wed Jun 17 12:20:49 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+start-sanitize-sky
+	* sky-vu.c (vu0_read_cop2_register, vu0_write_cop2_register): Call
+ 	ASSERT not assert.
+	* sky-gdb.c: Include "sim-assert.h".
+
+end-sanitize-sky
+	* sim-main.h (interrupt_event): Add prototype.
+
+start-sanitize-tx3904
+	* dv-tx3904tmr.c (tx3904tmr_io_write_buffer): Delete unused
+ 	register_ptr, register_value.
+	(deliver_tx3904tmr_tick): Fix types passed to printf fmt.
+
+end-sanitize-tx3904
+	* sim-main.h (tracefh): Make extern.
+
 start-sanitize-tx3904
 Tue Jun 16 14:39:00 1998  Frank Ch. Eigler  <fche@cygnus.com>
 
diff --git a/sim/mips/mips.igen b/sim/mips/mips.igen
index 3e48d7a..7783f63 100644
--- a/sim/mips/mips.igen
+++ b/sim/mips/mips.igen
@@ -174,7 +174,11 @@
   int ok = 1;
   if (peer != NULL
       && peer->mt.timestamp > history->op.timestamp
-      && history->mf.timestamp < history->op.timestamp)
+      && history->mt.timestamp < history->op.timestamp
+      && ! (history->mf.timestamp > history->op.timestamp
+	    && history->mf.timestamp < peer->mt.timestamp)
+      && ! (peer->mf.timestamp > history->op.timestamp
+	    && peer->mf.timestamp < peer->mt.timestamp))
     {
       /* The peer has been written to since the last OP yet we have
          not */
@@ -5367,26 +5371,6 @@
 // start-sanitize-vr5400
 *vr5400:
 // end-sanitize-vr5400
-// start-sanitize-r5900
-*r5900:
-// start-sanitize-sky
-{
-#ifdef TARGET_SKY
-  extern int sky_cpcond0A;
-  if (sky_cpcond0A == 0)
-    {
-      address_word dest = NIA + (EXTEND16 (OFFSET) << 2);
-      TRACE_BRANCH_RESULT (dest);
-      DELAY_SLOT (dest);
-    }
-  else
-    {
-      TRACE_BRANCH_RESULT (NIA);
-    }
-#endif    
-}
-// end-sanitize-sky
-// end-sanitize-r5900
 
 
 010000,01000,00010,16.OFFSET:COP0:32::BC0FL
@@ -5399,52 +5383,11 @@
 // start-sanitize-vr5400
 *vr5400:
 // end-sanitize-vr5400
-// start-sanitize-r5900
-*r5900:
-// start-sanitize-sky
-{
-#ifdef TARGET_SKY
-  extern int sky_cpcond0A;
-  if (sky_cpcond0A == 0)
-    {
-      address_word dest = NIA + (EXTEND16 (OFFSET) << 2);
-      TRACE_BRANCH_RESULT (dest);
-      DELAY_SLOT (dest);
-    }
-  else
-    {
-      TRACE_BRANCH_RESULT (0);
-      NULLIFY_NEXT_INSTRUCTION ();
-    }
-#endif
-}
-// end-sanitize-sky
-// end-sanitize-r5900
 
 
 010000,01000,00001,16.OFFSET:COP0:32::BC0T
 "bc0t <OFFSET>"
 *mipsI,mipsII,mipsIII,mipsIV:
-// start-sanitize-r5900
-*r5900:
-// start-sanitize-sky
-{
-#ifdef TARGET_SKY
-  extern int sky_cpcond0A;
-  if (sky_cpcond0A != 0)
-    {
-      address_word dest = NIA + (EXTEND16 (OFFSET) << 2);
-      TRACE_BRANCH_RESULT (dest);
-      DELAY_SLOT (dest);
-    }
-  else
-    {
-      TRACE_BRANCH_RESULT (NIA);
-    }
-#endif
-}
-// end-sanitize-sky
-// end-sanitize-r5900
 
 
 
@@ -5458,27 +5401,6 @@
 // start-sanitize-vr5400
 *vr5400:
 // end-sanitize-vr5400
-// start-sanitize-r5900
-*r5900:
-// start-sanitize-sky
-{
-#ifdef TARGET_SKY
-  extern int sky_cpcond0A;
-  if (sky_cpcond0A != 0)
-    {
-      address_word dest = NIA + (EXTEND16 (OFFSET) << 2);
-      TRACE_BRANCH_RESULT (dest);
-      DELAY_SLOT (dest);
-    }
-  else
-    {
-      TRACE_BRANCH_RESULT (0);
-      NULLIFY_NEXT_INSTRUCTION ();
-    }
-#endif
-}
-// end-sanitize-sky
-// end-sanitize-r5900
 
 
 101111,5.BASE,5.OP,16.OFFSET:NORMAL:32::CACHE
@@ -5491,9 +5413,6 @@
 // start-sanitize-vr5400
 *vr5400:
 // end-sanitize-vr5400
-// start-sanitize-r5900
-*r5900:
-// end-sanitize-r5900
 *r3900:
 // start-sanitize-tx19
 *tx19:
@@ -5523,9 +5442,6 @@
 // start-sanitize-vr5400
 *vr5400:
 // end-sanitize-vr5400
-// start-sanitize-r5900
-*r5900:
-// end-sanitize-r5900
 
 
 010000,10000,000000000000000,111000:COP0:32::EI
@@ -5538,9 +5454,6 @@
 // start-sanitize-vr5400
 *vr5400:
 // end-sanitize-vr5400
-// start-sanitize-r5900
-*r5900:
-// end-sanitize-r5900
 
 
 010000,10000,000000000000000,011000:COP0:32::ERET
@@ -5663,9 +5576,6 @@
 // start-sanitize-vr5400
 *vr5400:
 // end-sanitize-vr5400
-// start-sanitize-r5900
-*r5900:
-// end-sanitize-r5900
 
 
 010000,10000,000000000000000,000001:COP0:32::TLBR
@@ -5678,9 +5588,6 @@
 // start-sanitize-vr5400
 *vr5400:
 // end-sanitize-vr5400
-// start-sanitize-r5900
-*r5900:
-// end-sanitize-r5900
 
 
 010000,10000,000000000000000,000010:COP0:32::TLBWI
@@ -5693,9 +5600,6 @@
 // start-sanitize-vr5400
 *vr5400:
 // end-sanitize-vr5400
-// start-sanitize-r5900
-*r5900:
-// end-sanitize-r5900
 
 
 010000,10000,000000000000000,000110:COP0:32::TLBWR
@@ -5708,9 +5612,6 @@
 // start-sanitize-vr5400
 *vr5400:
 // end-sanitize-vr5400
-// start-sanitize-r5900
-*r5900:
-// end-sanitize-r5900
 
 
 :include:::m16.igen