提交: 503123c9f01e86eb3c6ec0557c2d85deea15ee80 - binutils_gdb (git)

Commit MetaInfo

• 修订版: 503123c9f01e86eb3c6ec0557c2d85deea15ee80 (tree)
• 时间: 2015-12-26 22:24:02
• 作者: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

SCI simulation fix

更改概述

• modified: sim/rx/mem.c

差异

--- a/sim/rx/mem.c
+++ b/sim/rx/mem.c
@@ -785,13 +785,14 @@ enum {PORT_NONE, PORT_PTY,PORT_NET};
 static int sci_port_type = PORT_NONE;
 
 
-static void set_sciir(int ch, unsigned char ssr)
+static void set_sciir(int ch, unsigned char scr, unsigned char ssr)
 {
   unsigned char mask[] = {0x38, 0x40, 0x80, 0x04};
+  unsigned char enable[] = {0x40, 0x40, 0x80, 0x04};
   unsigned char *irptr = rx_mem_ptr(IRADR(214 + ch * 4), MPA_WRITING);
   unsigned int i;
   for (i = 0; i < 4; i++)
-    *irptr++ = !!(ssr & mask[i]);
+    *irptr++ = ((ssr & mask[i]) && (scr & enable[i]));
 }
 
 static unsigned int 
@@ -976,20 +977,21 @@ sci(unsigned int cycles_diff)
     {
       st = &sci_state[ch];
       /* clear internal ssr */
-      st->ssr &= SSR(ch);
+      if (get_rw_flag(0x00088243 + ch * 8) == mem_w)
+	st->ssr &= SSR(ch);
 
       /* Tx request */
       if((SCR(ch) & 0x20) && 
-	 (get_rw_flag(0x00088243 + ch * 8) == mem_w) && (st->txstate == 0))
+	 (get_rw_flag(0x00088243 + ch * 8) == mem_w) && (st->txstate == 0) && !(SSR(ch) & 0x80))
 	{
 	  sci_send_data(ch,TDR(ch));
-	  st->ssr &= ~0x04;
 	  /* TSR shift time */
 	  st->tx_end_time = 1;
 	  st->txstate = 1;
 	  set_rw_flag(0x00088243 + ch * 8, mem_none);
 	}
-      st->tx_end_time -= cycles_diff;
+      if(st->tx_end_time > 0)
+	st->tx_end_time -= cycles_diff;
       /* Tx complete check */
       if(((st->ssr & 0x84) != 0x84) &&
 	 (st->tx_end_time <= 0))
@@ -1004,7 +1006,8 @@ sci(unsigned int cycles_diff)
 	    st->ssr |= 0x04;
 	  }
 	}
-      st->rx_end_time -= cycles_diff;
+      if(st->rx_end_time > 0)
+	st->rx_end_time -= cycles_diff;
       /* Rx check */
       if (st->rx_end_time <= 0)
 	/* RSR free & Rx Enabled */
@@ -1028,8 +1031,8 @@ sci(unsigned int cycles_diff)
 	  }
 
       /* update SSR */
-      SSR(ch) = st->ssr & 0xfc; 
-      set_sciir(ch, st->ssr);
+      SSR(ch) = st->ssr & 0xfc;
+      set_sciir(ch, SCR(ch), st->ssr);
     }
 }