bfin: latest gcc/binutils is working fine. checked with gdb sim and real hardware

5 files changed, 5 insertions, 1753 deletions

diff --git a/target/bfin/uclibc-ng.config b/target/bfin/uclibc-ng.config
index 71fabb7f2..c35843ab0 100644
--- a/target/bfin/uclibc-ng.config
+++ b/target/bfin/uclibc-ng.config
@@ -198,8 +198,7 @@ UCLIBC_HAS_GNU_GETSUBOPT=y
 
 #
 # Big and Tall
-# ICE in gcc
-# UCLIBC_HAS_REGEX is not set
+UCLIBC_HAS_REGEX=y
 UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index 3ab18c8cb..94f4a710b 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -4,7 +4,6 @@
 choice
 prompt "Binutils version"
 default ADK_TOOLCHAIN_BINUTILS_2_20_1 if ADK_TARGET_ARCH_AVR32
-default ADK_TOOLCHAIN_BINUTILS_2_22 if ADK_TARGET_ARCH_BFIN
 default ADK_TOOLCHAIN_BINUTILS_2_23_ARC if ADK_TARGET_ARCH_ARC
 default ADK_TOOLCHAIN_BINUTILS_2_25_1
 
@@ -36,8 +35,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_23_ARC
 
 config ADK_TOOLCHAIN_BINUTILS_2_22
 	bool "2.22"
-	depends on ADK_TARGET_ARCH_BFIN \
-		|| ADK_CPU_CRIS_V10
+	depends on ADK_CPU_CRIS_V10
 
 config ADK_TOOLCHAIN_BINUTILS_2_20_1
 	bool "2.20.1"
diff --git a/target/config/Config.in.gcc b/target/config/Config.in.gcc
index d6a3a9c8e..b054fb28a 100644
--- a/target/config/Config.in.gcc
+++ b/target/config/Config.in.gcc
@@ -5,7 +5,6 @@ choice
 prompt "GCC version"
 default ADK_TOOLCHAIN_GCC_4_2_4 if ADK_TARGET_ARCH_METAG
 default ADK_TOOLCHAIN_GCC_4_4_7 if ADK_TARGET_ARCH_AVR32
-default ADK_TOOLCHAIN_GCC_4_5_4 if ADK_TARGET_ARCH_BFIN
 default ADK_TOOLCHAIN_GCC_4_8_5 if ADK_TARGET_ARCH_C6X
 default ADK_TOOLCHAIN_GCC_4_8_ARC if ADK_TARGET_ARCH_ARC
 default ADK_TOOLCHAIN_GCC_4_9_OR1K_UCLIBC_NG if ADK_TARGET_ARCH_OR1K && ADK_TARGET_LIB_UCLIBC_NG
@@ -24,6 +23,7 @@ config ADK_TOOLCHAIN_GCC_5_2_0
 	bool "5.2.0"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_METAG
@@ -33,6 +33,7 @@ config ADK_TOOLCHAIN_GCC_4_9_3
 	bool "4.9.3"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_METAG
@@ -77,10 +78,6 @@ config ADK_TOOLCHAIN_GCC_4_7_4
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_OR1K
 
-config ADK_TOOLCHAIN_GCC_4_5_4
-	bool "4.5.4"
-	depends on ADK_TARGET_ARCH_BFIN
-
 config ADK_TOOLCHAIN_GCC_4_4_7
 	bool "4.4.7"
 	depends on ADK_TARGET_ARCH_AVR32
diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb
index 87c384095..1e1c361db 100644
--- a/target/config/Config.in.gdb
+++ b/target/config/Config.in.gdb
@@ -9,6 +9,7 @@ default ADK_TOOLCHAIN_GDB_7_10
 config ADK_TOOLCHAIN_GDB_GIT
 	bool "git"
 	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_BFIN
 
 config ADK_TOOLCHAIN_GDB_7_10
 	bool "7.10"
diff --git a/toolchain/gdb/patches/git/h8300-sim-io.patch b/toolchain/gdb/patches/git/h8300-sim-io.patch
deleted file mode 100644
index 8d940eea4..000000000
--- a/toolchain/gdb/patches/git/h8300-sim-io.patch
+++ /dev/null
@@ -1,1743 +0,0 @@
-diff -Nur binutils-gdb.orig/gdb/h8300-tdep.c binutils-gdb/gdb/h8300-tdep.c
---- binutils-gdb.orig/gdb/h8300-tdep.c	2015-11-16 11:55:54.522178529 +0100
-+++ binutils-gdb/gdb/h8300-tdep.c	2015-11-16 11:52:52.474025949 +0100
-@@ -1248,8 +1248,8 @@
- h8300_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr,
- 			  int *lenptr)
- {
--  /*static unsigned char breakpoint[] = { 0x7A, 0xFF }; *//* ??? */
--  static unsigned char breakpoint[] = { 0x01, 0x80 };	/* Sleep */
-+  static unsigned char breakpoint[] = { 0x7A, 0xFF };   /* ??? */
-+  /*static unsigned char breakpoint[] = { 0x01, 0x80 };*/	/* Sleep */
- 
-   *lenptr = sizeof (breakpoint);
-   return breakpoint;
-diff -Nur binutils-gdb.orig/sim/h8300/Makefile.in binutils-gdb/sim/h8300/Makefile.in
---- binutils-gdb.orig/sim/h8300/Makefile.in	2015-11-16 11:55:55.634179462 +0100
-+++ binutils-gdb/sim/h8300/Makefile.in	2015-11-16 11:53:33.474060312 +0100
-@@ -17,7 +17,7 @@
- 
- ## COMMON_PRE_CONFIG_FRAG
- 
--SIM_OBJS = compile.o \
-+SIM_OBJS = compile.o io.o \
- 	$(SIM_NEW_COMMON_OBJS)
- 
- ## COMMON_POST_CONFIG_FRAG
-@@ -27,3 +27,5 @@
- 	   $(srcdir)/../../include/opcode/h8300.h \
- 	   $(srcdir)/../../include/gdb/remote-sim.h \
- 	   $(srcdir)/../../include/gdb/callback.h
-+
-+io.o: io.c sim-main.h
-diff -Nur binutils-gdb.orig/sim/h8300/compile.c binutils-gdb/sim/h8300/compile.c
---- binutils-gdb.orig/sim/h8300/compile.c	2015-11-16 11:55:55.634179462 +0100
-+++ binutils-gdb/sim/h8300/compile.c	2015-11-16 11:52:52.502025971 +0100
-@@ -41,11 +41,14 @@
- #endif
- 
- int debug;
-+int h8300_interrupt_mode;
- 
- host_callback *sim_callback;
- 
- static SIM_OPEN_KIND sim_kind;
- static char *myname;
-+static int verbose_interrupt = 0;
-+static int logging = 0;
- 
- /* FIXME: Needs to live in header file.
-    This header should also include the things in remote-sim.h.
-@@ -578,10 +581,8 @@
- static int
- cmdline_location()
- {
--  if (h8300smode && !h8300_normal_mode)
--    return 0xffff00L;
--  else if (h8300hmode && !h8300_normal_mode)
--    return 0x2ff00L;
-+  if ((h8300hmode || h8300smode) && !h8300_normal_mode)
-+    return 0xff0000L;
-   else
-     return 0xff00L;
- }
-@@ -1037,12 +1038,15 @@
- 
- 			    /* 8-bit ABS is displacement from SBR.
- 			       16 and 32-bit ABS are displacement from ZERO.
--			       (SBR will always be zero except for h8/sx)
-+			       (SBR will always be 0xffff00 except for h8/sx)
- 			    */
- 			    if ((x & SIZE) == L_8)
- 			      p->reg = SBR_REGNUM;
- 			    else
--			      p->reg = ZERO_REGNUM;;
-+			      p->reg = ZERO_REGNUM;
-+			    /* address extend for @x:16 */
-+			    if ((x & SIZE) == L_16U)
-+			      p->literal += (p->literal >= 0x8000)?0xff0000:0x000000;
- 			  }
- 			else if ((x & MODE) == MEMIND ||
- 				 (x & MODE) == VECIND)
-@@ -1253,6 +1257,39 @@
-   h8_set_cache_idx (sd, pc, idx);
- }
- 
-+enum mem_access_type {MEM_RL,MEM_RW,MEM_RB,MEM_WL,MEM_WW,MEM_WB};
-+
-+struct memlog {
-+  unsigned long pc;
-+  unsigned long addr;
-+  unsigned long data;
-+  enum mem_access_type type;
-+};
-+
-+static struct memlog *memlog_buffer;
-+static int memlogtail;
-+static int memlogsize;
-+
-+static add_memlog(unsigned long pc, unsigned long addr, 
-+		  enum mem_access_type type, unsigned long data)
-+{
-+  if (!logging)
-+    return;
-+  if (memlogsize == memlogtail) {
-+         memlog_buffer = (struct memlog *)realloc(memlog_buffer, 
-+                                                 (memlogsize * sizeof(struct memlog) + 65536));
-+         memlogsize += 65536 / sizeof(struct memlog);
-+  }
-+  if (memlog_buffer) {
-+    memlog_buffer[memlogtail].pc = pc;
-+    memlog_buffer[memlogtail].addr = addr;
-+    memlog_buffer[memlogtail].type = type;
-+    memlog_buffer[memlogtail].data = data;
-+    memlogtail++;
-+  }
-+}
-+
-+static int pc;
- 
- static unsigned char  *breg[32];
- static unsigned short *wreg[16];
-@@ -1265,33 +1302,46 @@
- #define GET_L_REG(X)     h8_get_reg (sd, X)
- #define SET_L_REG(X, Y)  h8_set_reg (sd, X, Y)
- 
--#define GET_MEMORY_L(X) \
--  ((X) < memory_size \
--   ? ((h8_get_memory (sd, (X)+0) << 24) | (h8_get_memory (sd, (X)+1) << 16)  \
--    | (h8_get_memory (sd, (X)+2) <<  8) | (h8_get_memory (sd, (X)+3) <<  0)) \
--   : ((h8_get_eightbit (sd, ((X)+0) & 0xff) << 24) \
--    | (h8_get_eightbit (sd, ((X)+1) & 0xff) << 16) \
--    | (h8_get_eightbit (sd, ((X)+2) & 0xff) <<  8) \
--    | (h8_get_eightbit (sd, ((X)+3) & 0xff) <<  0)))
--
--#define GET_MEMORY_W(X) \
--  ((X) < memory_size \
--   ? ((h8_get_memory   (sd, (X)+0) << 8) \
--    | (h8_get_memory   (sd, (X)+1) << 0)) \
--   : ((h8_get_eightbit (sd, ((X)+0) & 0xff) << 8) \
--    | (h8_get_eightbit (sd, ((X)+1) & 0xff) << 0)))
--
--
--#define GET_MEMORY_B(X) \
--  ((X) < memory_size ? (h8_get_memory   (sd, (X))) \
--                     : (h8_get_eightbit (sd, (X) & 0xff)))
-+#define GET_MEMORY_L(X) _get_memory_l(sd, X)
-+
-+static inline unsigned long _get_memory_l(SIM_DESC sd, unsigned long addr)
-+{
-+  unsigned long result;
-+  result =
-+    ((h8_get_memory (sd, addr+0) << 24) | (h8_get_memory (sd, addr+1) << 16)
-+     | (h8_get_memory (sd, addr+2) <<  8) | (h8_get_memory (sd, addr+3) <<  0));
-+  add_memlog(pc, addr, MEM_RL, result);
-+  return result;
-+}
-+
-+#define GET_MEMORY_W(X) _get_memory_w(sd, X)
-+
-+static inline unsigned short _get_memory_w(SIM_DESC sd, unsigned long addr)
-+{
-+  unsigned short result;
-+  result =
-+     (h8_get_memory (sd, addr+0) <<  8) | (h8_get_memory (sd, addr+1) <<  0);
-+  add_memlog(pc, addr, MEM_RW, result);
-+  return result;
-+}
-+
-+#define GET_MEMORY_B(X) _get_memory_b(sd, X)
- 
-+static inline unsigned short _get_memory_b(SIM_DESC sd, unsigned long addr)
-+{
-+  unsigned short result;
-+  result = h8_get_memory (sd, addr+0);
-+  add_memlog(pc, addr, MEM_RB, result);
-+  return result;
-+}
-+ 
- #define SET_MEMORY_L(X, Y)  \
- {  register unsigned char *_p; register int __y = (Y); \
-    _p = ((X) < memory_size ? h8_get_memory_buf   (sd) +  (X) : \
-                              h8_get_eightbit_buf (sd) + ((X) & 0xff)); \
-    _p[0] = __y >> 24; _p[1] = __y >> 16; \
-    _p[2] = __y >>  8; _p[3] = __y >>  0; \
-+   add_memlog(pc, X, MEM_WL, Y);	 \
- }
- 
- #define SET_MEMORY_W(X, Y) \
-@@ -1299,11 +1349,13 @@
-    _p = ((X) < memory_size ? h8_get_memory_buf   (sd) +  (X) : \
-                              h8_get_eightbit_buf (sd) + ((X) & 0xff)); \
-    _p[0] = __y >> 8; _p[1] = __y; \
-+   add_memlog(pc, X, MEM_WW, Y); \
- }
- 
- #define SET_MEMORY_B(X, Y) \
-   ((X) < memory_size ? (h8_set_memory   (sd, (X), (Y))) \
--                     : (h8_set_eightbit (sd, (X) & 0xff, (Y))))
-+		     : (h8_set_eightbit (sd, (X) & 0xff, (Y))));	\
-+   add_memlog(pc, X, MEM_WB, Y)
- 
- /* Simulate a memory fetch.
-    Return 0 for success, -1 for failure.
-@@ -1779,15 +1831,13 @@
- 	free (h8_get_memory_buf (sd));
-       if (h8_get_cache_idx_buf (sd))
- 	free (h8_get_cache_idx_buf (sd));
--      if (h8_get_eightbit_buf (sd))
--	free (h8_get_eightbit_buf (sd));
- 
-       h8_set_memory_buf (sd, (unsigned char *) 
- 			 calloc (sizeof (char), memory_size));
-       h8_set_cache_idx_buf (sd, (unsigned short *) 
- 			    calloc (sizeof (short), memory_size));
-       sd->memory_size = memory_size;
--      h8_set_eightbit_buf (sd, (unsigned char *) calloc (sizeof (char), 256));
-+      h8_set_eightbit_buf (sd, (unsigned char *)h8_get_memory_buf(sd) + 0xffff00);
- 
-       h8_set_mask (sd, memory_size - 1);
- 
-@@ -1865,6 +1915,105 @@
-   goto next;					\
- }
- 
-+static unsigned long *trace_buffer;
-+static unsigned long tracesize;
-+static unsigned long tracetail;
-+
-+static void add_trace(unsigned long pc)
-+{
-+  static unsigned long last_pc = 0xfffffff;
-+
-+  if (pc == last_pc || logging == 0)
-+    return;
-+  last_pc = pc;
-+  if (tracesize == tracetail) {
-+         trace_buffer = (unsigned long *)realloc(trace_buffer, 
-+                                                 (tracesize * sizeof(unsigned long) + 65536));
-+    tracesize += 65536 / sizeof(unsigned long);
-+  }
-+  if (trace_buffer)
-+    trace_buffer[tracetail++] = pc;
-+}
-+
-+static void init_history(void)
-+{
-+  if(trace_buffer) {
-+    free(trace_buffer);
-+    trace_buffer = NULL;
-+  }
-+  tracesize = tracetail = 0;
-+  if(memlog_buffer) {
-+    free(memlog_buffer);
-+    memlog_buffer = NULL;
-+  }
-+  memlogsize = memlogtail = 0;
-+}
-+
-+static int intlevel(SIM_DESC sd)
-+{
-+  if(h8300smode && (h8300_interrupt_mode == 2)) {
-+    return  h8_get_ccr (sd) & 0x80?0x100:h8_get_exr (sd) << 8;
-+  } else if (h8300_interrupt_mode == 1) {
-+    switch((h8_get_ccr (sd) >> 6) & 3) {
-+    case 0:
-+    case 1:
-+      return -1;
-+    case 2:
-+      return 1 << 8;
-+    case 3:
-+      return 0x100 << 8;
-+    }
-+  } else {
-+    return h8_get_ccr (sd) & 0x80?0x100 << 8:-1;
-+  }
-+}
-+
-+int iosimulation(SIM_DESC, int);
-+
-+#define exception(vector, pri)					\
-+do {									\
-+  unsigned int ccr;							\
-+  unsigned long vbr = 0;						\
-+  int tmp;								\
-+  if (verbose_interrupt)						\
-+    (*sim_callback->printf_filtered)					\
-+      (sim_callback, "sim_resume: interrupt occured %d\n", (vector));	\
-+  BUILDSR (sd);								\
-+  ccr = h8_get_ccr (sd);						\
-+  tmp = h8_get_reg (sd, SP_REGNUM);					\
-+  tmp -= 4;								\
-+  if (h8300sxmode)							\
-+    vbr = h8_get_vbr(sd);						\
-+  if (!h8300hmode || h8300_normal_mode)					\
-+    {									\
-+      SET_MEMORY_W (tmp, (ccr << 8) | ccr);				\
-+      SET_MEMORY_W (tmp, pc);						\
-+      pc = GET_MEMORY_W (vbr + (vector) * 2) & 0xffff;			\
-+    }									\
-+  else									\
-+    {									\
-+      SET_MEMORY_L (tmp, (ccr << 24) | pc);				\
-+      pc=GET_MEMORY_L(vbr + (vector) * 4) & 0xffffff;			\
-+    }									\
-+  if (h8300smode && (h8300_interrupt_mode == 2))			\
-+    {									\
-+      int exr;								\
-+      exr = h8_get_exr (sd);						\
-+      tmp -= 2;								\
-+      SET_MEMORY_W (tmp, exr << 8);					\
-+      if ((pri) >= 0)							\
-+	{								\
-+	  exr = pri;							\
-+	  h8_set_exr (sd, exr);						\
-+	  intMask = pri;						\
-+	}								\
-+    }									\
-+  h8_set_reg (sd, SP_REGNUM, tmp);					\
-+  ccr |= (h8300_interrupt_mode == 1)?0xc0:0x80;				\
-+  h8_set_ccr (sd, ccr);							\
-+  GETSR(sd);								\
-+ } while(0)
-+
- void
- sim_resume (SIM_DESC sd, int step, int siggnal)
- {
-@@ -1878,12 +2027,12 @@
-   int rd;
-   int ea;
-   int bit;
--  int pc;
-   int c, nz, v, n, u, h, ui, intMaskBit;
-   int trace, intMask;
-   int oldmask;
-   enum sim_stop reason;
-   int sigrc;
-+  int vector;
- 
-   init_pointers (sd);
- 
-@@ -1908,7 +2057,7 @@
-   /* Get Status Register (flags).  */
-   GETSR (sd);
- 
--  if (h8300smode)	/* Get exr.  */
-+  if (h8300smode && h8300_interrupt_mode)	/* Get exr.  */
-     {
-       trace = (h8_get_exr (sd) >> 7) & 1;
-       intMask = h8_get_exr (sd) & 7;
-@@ -1923,6 +2072,7 @@
-       decoded_inst *code;
- 
-     top:
-+      add_trace(pc);
-       cidx = h8_get_cache_idx (sd, pc);
-       if (cidx == (unsigned short) -1 ||
- 	  cidx >= sd->sim_cache_size)
-@@ -1943,6 +2093,15 @@
- 	{
- 	  cycles += code->cycles;
- 	  insts++;
-+	  add_trace(pc);
-+	  if ((vector = iosimulation (sd, cycles)) && 
-+	      (intlevel(sd) < (vector & 0xff00)))
-+	    {
-+	      if (code->opcode == O (O_SLEEP, SN))
-+		pc += 2;
-+	      exception(vector & 0xff, (vector & 0xff00) >> 8);
-+	      goto end;
-+	    }
- 	}
- 
-       switch (code->opcode)
-@@ -3253,7 +3412,7 @@
- 	    goto end;
- 
- 	  if (code->src.type == X (OP_IMM, SB))
--	    fetch (sd, &code->src, &ea);
-+ 	    fetch (sd, &code->src, &ea);
- 	  else
- 	    ea = 1;
- 
-@@ -3548,16 +3707,20 @@
- 	  /* Pops exr and ccr before pc -- otherwise identical to rts.  */
- 	  tmp = h8_get_reg (sd, SP_REGNUM);
- 
--	  if (h8300smode)			/* pop exr */
-+	  if (h8300smode && (h8300_interrupt_mode == 2))	/* pop exr */
- 	    {
--	      h8_set_exr (sd, GET_MEMORY_L (tmp));
--	      tmp += 4;
-+	      unsigned char exr;
-+	      exr = GET_MEMORY_W (tmp) >> 8;
-+	      h8_set_exr (sd, exr);
-+	      intMask = exr & 7;
-+	      trace = exr & 0x80;
-+	      tmp += 2;
- 	    }
- 	  if (h8300hmode && !h8300_normal_mode)
- 	    {
--	      h8_set_ccr (sd, GET_MEMORY_L (tmp));
--	      tmp += 4;
- 	      pc = GET_MEMORY_L (tmp);
-+	      h8_set_ccr (sd, pc >> 24);
-+	      pc &= 0x00ffffff;
- 	      tmp += 4;
- 	    }
- 	  else
-@@ -3614,49 +3777,25 @@
- 	      sim_engine_set_run_state (sd, sim_stopped, 
- 					SIM_WSTOPSIG (h8_get_reg (sd, 0)));
- 	    }
--#endif
- 	  else
- 	    {
- 	      /* Treat it as a sigtrap.  */
- 	      sim_engine_set_run_state (sd, sim_stopped, SIGTRAP);
- 	    }
-+#else
-+	  else
-+	    sleep(0);
-+#endif
- 	  goto end;
- 
--	case O (O_TRAPA, SB):		/* trapa */
-+	case O (O_TRAPA, SB):	{	/* trapa */
- 	  if (fetch (sd, &code->src, &res))
-    	    goto end;			/* res is vector number.  */
--  
--   	  tmp = h8_get_reg (sd, SP_REGNUM);
--   	  if(h8300_normal_mode)
--   	    {
--   	      tmp -= 2;
--   	      SET_MEMORY_W (tmp, code->next_pc);
--   	      tmp -= 2;
--   	      SET_MEMORY_W (tmp, h8_get_ccr (sd));
--   	    }
--   	  else
--   	    {
--   	      tmp -= 4;
--   	      SET_MEMORY_L (tmp, code->next_pc);
--   	      tmp -= 4;
--   	      SET_MEMORY_L (tmp, h8_get_ccr (sd));
--   	    }
--   	  intMaskBit = 1;
--   	  BUILDSR (sd);
-- 
--	  if (h8300smode)
--	    {
--	      tmp -= 4;
--	      SET_MEMORY_L (tmp, h8_get_exr (sd));
--	    }
--
--	  h8_set_reg (sd, SP_REGNUM, tmp);
--
--	  if(h8300_normal_mode)
--	    pc = GET_MEMORY_L (0x10 + res * 2); /* Vector addresses are 0x10,0x12,0x14 and 0x16 */
--	  else
--	    pc = GET_MEMORY_L (0x20 + res * 4);
-+	  res += 8;
-+	  pc += 2;
-+	  exception(res, -1);
- 	  goto end;
-+	}
- 
- 	case O (O_BPT, SN):
- 	  sim_engine_set_run_state (sd, sim_stopped, SIGTRAP);
-@@ -5005,15 +5144,13 @@
-     free (h8_get_memory_buf (sd));
-   if (h8_get_cache_idx_buf (sd))
-     free (h8_get_cache_idx_buf (sd));
--  if (h8_get_eightbit_buf (sd))
--    free (h8_get_eightbit_buf (sd));
- 
-   h8_set_memory_buf (sd, (unsigned char *) 
- 		     calloc (sizeof (char), memory_size));
-   h8_set_cache_idx_buf (sd, (unsigned short *) 
- 			calloc (sizeof (short), memory_size));
-   sd->memory_size = memory_size;
--  h8_set_eightbit_buf (sd, (unsigned char *) calloc (sizeof (char), 256));
-+  h8_set_eightbit_buf (sd, (unsigned char *)h8_get_memory_buf(sd) + 0xffff00);
- 
-   /* `msize' must be a power of two.  */
-   if ((memory_size & (memory_size - 1)) != 0)
-@@ -5024,6 +5161,8 @@
-     }
-   h8_set_mask (sd, memory_size - 1);
- 
-+  init_history();
-+  init_ioregs(sd);
-   if (sim_load_file (sd, myname, sim_callback, prog, prog_bfd,
- 		     sim_kind == SIM_OPEN_DEBUG,
- 		     0, sim_write)
-@@ -5074,3 +5213,187 @@
-   
-   return SIM_RC_OK;
- }
-+
-+static void show_trace(int lines)
-+{
-+  unsigned long idx;
-+  idx = tracetail - lines;
-+  for (; lines > 0; --lines)
-+    {
-+      if (trace_buffer[idx] != -1)
-+	(*sim_callback->printf_filtered) (sim_callback,
-+					  "0x%06x\n", trace_buffer[idx]);
-+      idx++;
-+    }
-+  (*sim_callback->printf_filtered) (sim_callback, "\n");
-+}
-+
-+static void save_trace(const char *filename)
-+{
-+  FILE *fp;
-+  unsigned long idx;
-+  fp = fopen(filename, "w");
-+  if (!fp)
-+    {
-+      (*sim_callback->printf_filtered) (sim_callback,
-+					"save-history: file open failed.\n");
-+      return ;
-+    }
-+  for (idx = 0; idx < tracetail; idx++)
-+    fprintf(fp, "0x%06x\n", trace_buffer[idx]);
-+  fclose(fp);
-+}
-+
-+static const char *memtype_str[]={"RL","RW","RB","WL","WW","WB"};
-+
-+static void show_memlog(int lines)
-+{
-+  unsigned long idx;
-+  idx = memlogtail - lines;
-+  if (memlog_buffer == NULL)
-+    {
-+      (*sim_callback->printf_filtered) (sim_callback, "no memlog\n");
-+      return;
-+    }
-+  for (; lines > 0; --lines)
-+    {
-+      (*sim_callback->printf_filtered) (sim_callback,
-+					"0x%06x 0x%06x %s %08x\n",
-+					memlog_buffer[idx].pc,
-+					memlog_buffer[idx].addr,
-+					memtype_str[memlog_buffer[idx].type],
-+					memlog_buffer[idx].data);
-+      idx++;
-+    }
-+  (*sim_callback->printf_filtered) (sim_callback, "\n");
-+}
-+
-+static void save_memlog(const char *filename)
-+{
-+  FILE *fp;
-+  unsigned long idx;
-+  if (memlog_buffer == NULL)
-+    {
-+      (*sim_callback->printf_filtered) (sim_callback, "no memlog\n");
-+      return;
-+    }
-+  fp = fopen(filename, "w");
-+  if (!fp)
-+    {
-+      (*sim_callback->printf_filtered) (sim_callback,
-+					"save-history: file open failed.\n");
-+      return ;
-+    }
-+  for (idx = 0; idx < memlogtail; idx++)
-+    fprintf(fp, "0x%06x 0x%06x %s %08x\n",
-+	    memlog_buffer[idx].pc,
-+	    memlog_buffer[idx].addr,
-+	    memtype_str[memlog_buffer[idx].type],
-+	    memlog_buffer[idx].data);
-+  fclose(fp);
-+}
-+
-+void
-+sim_do_command (SIM_DESC sd, const char *cmd)
-+{
-+  if (cmd == NULL || *cmd == '\0')
-+    cmd = "help";
-+  if (strncmp(cmd, "show-trace", 10) == 0)
-+    {
-+      int lines = 16;
-+      cmd += 10;
-+      if (*cmd)
-+       lines = atoi(cmd);
-+      if (lines > 0)
-+       show_trace(lines);
-+      else
-+       (*sim_callback->printf_filtered) (sim_callback,
-+                                         "Invalid lines\n");
-+      return;
-+    }
-+  else if (strncmp(cmd, "save-trace", 10) == 0)
-+    {
-+      cmd += 10;
-+      while(isspace(*cmd))
-+	cmd++;
-+
-+      if (*cmd)
-+	save_trace(cmd);
-+      else
-+	(*sim_callback->printf_filtered) (sim_callback,
-+					  "Invalid filename\n");
-+    }
-+  else if (strncmp(cmd, "show-mem", 8) == 0)
-+    {
-+      int lines = 16;
-+      cmd += 8;
-+      if (*cmd)
-+	lines = atoi(cmd);
-+      if (lines > 0)
-+	show_memlog(lines);
-+      else
-+	(*sim_callback->printf_filtered) (sim_callback,
-+					  "Invalid lines\n");
-+      return;
-+    }
-+  else if (strncmp(cmd, "save-mem", 8) == 0)
-+    {
-+      cmd += 8;
-+      while(isspace(*cmd))
-+       cmd++;
-+      if (*cmd)
-+       save_memlog(cmd);
-+      else
-+       (*sim_callback->printf_filtered) (sim_callback,
-+                                         "Invalid filename\n");
-+    }
-+  else if (strncmp (cmd, "sci", 3) == 0)
-+    {
-+      cmd += 3;
-+      while(isspace(*cmd)) cmd++;
-+      if (strncmp (cmd, "pty", 3) == 0)
-+	sci_open_pty(sim_callback);
-+      else if (strncmp(cmd, "net", 3) == 0)
-+	{
-+	  cmd += 3;
-+	  while(isspace(*cmd)) cmd++;
-+	  sci_open_net(sim_callback, atoi(cmd));
-+	}
-+    }
-+  else if (strncmp (cmd, "verbose-int", 11) == 0)
-+    {
-+      cmd += 11;
-+      while(isspace(*cmd)) cmd++;
-+      verbose_interrupt = atoi(cmd);
-+    }
-+  else if (strncmp(cmd, "help", 4) == 0)
-+    (*sim_callback->printf_filtered) (sim_callback,
-+				      "List of H8/300 Simulator commands\n\n"
-+				      "show-trace <n> -- show trace history\n"
-+				      "save-trace filename -- save trace history\n"
-+				      "show-mem <n> -- show memory access log\n"
-+				      "save-mem filename -- save memory access log\n"
-+				      "sci [pty|net port] -- open sci port\n"
-+				      "intmode mode -- set interrupt mode\n"
-+				      "verbose-int -- verbose interrupt\n"
-+				      "trace [on|off] -- trace switch\n"
-+	    );
-+  else if (strncmp(cmd, "intmode", 7) == 0)
-+    {
-+      cmd += 7;
-+      while(isspace(*cmd)) cmd++;
-+      h8300_interrupt_mode = atoi(cmd);
-+    }
-+  else if (strncmp (cmd, "trace", 5) == 0)
-+    {
-+      cmd += 5;
-+      while(isspace(*cmd)) cmd++;
-+      if (strncmp (cmd, "on", 2) == 0)
-+	logging = 1;
-+      else if (strncmp(cmd, "off", 3) == 0)
-+	logging = 0;
-+    }
-+  else
-+    (*sim_callback->printf_filtered) (sim_callback,
-+				      "Error: Unknown \"%s\" command\n", cmd);
-+}
-diff -Nur binutils-gdb.orig/sim/h8300/io.c binutils-gdb/sim/h8300/io.c
---- binutils-gdb.orig/sim/h8300/io.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-gdb/sim/h8300/io.c	2015-11-16 11:52:52.502025971 +0100
-@@ -0,0 +1,1058 @@
-+/*
-+ H8 simulator Internal Peripheral Support
-+*/
-+
-+#include <unistd.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/time.h>
-+#include <string.h>
-+#define _XOPEN_SOURCE
-+#include <stdlib.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
-+#include "sim-main.h"
-+#undef CSIZE
-+#include <termios.h>
-+
-+#define MAX_SCI_CH 3
-+
-+#define SMR(ch) (STATE_CPU(sd, 0)->eightbit[sci_base[ch]+0])
-+#define BRR(ch) (STATE_CPU(sd, 0)->eightbit[sci_base[ch]+1])
-+#define SCR(ch) (STATE_CPU(sd, 0)->eightbit[sci_base[ch]+2])
-+#define TDR(ch) (STATE_CPU(sd, 0)->eightbit[sci_base[ch]+3])
-+#define SSR(ch) (STATE_CPU(sd, 0)->eightbit[sci_base[ch]+4])
-+#define RDR(ch) (STATE_CPU(sd, 0)->eightbit[sci_base[ch]+5])
-+
-+#define TCR8(ch)   (STATE_CPU(sd, 0)->eightbit[timer8_base[ch] + 0])
-+#define TCSR8(ch)  (STATE_CPU(sd, 0)->eightbit[timer8_base[ch] + 2])
-+#define TCORA8(ch) (STATE_CPU(sd, 0)->eightbit[timer8_base[ch] + 4])
-+#define TCORB8(ch) (STATE_CPU(sd, 0)->eightbit[timer8_base[ch] + 6])
-+#define TCNT8(ch)  (STATE_CPU(sd, 0)->eightbit[timer8_base[ch] + 8])
-+
-+#define TSTR16 (STATE_CPU(sd, 0)->eightbit[0x60])
-+#define TISRA16  (STATE_CPU(sd, 0)->eightbit[0x64])
-+#define TISRB16  (STATE_CPU(sd, 0)->eightbit[0x65])
-+#define TISRC16  (STATE_CPU(sd, 0)->eightbit[0x66])
-+#define TCR16(ch) (STATE_CPU(sd, 0)->eightbit[0x68 + (ch) * 8])
-+#define TCNT16H(ch) (STATE_CPU(sd, 0)->eightbit[0x6a + (ch) * 8])
-+#define TCNT16L(ch) (STATE_CPU(sd, 0)->eightbit[0x6b + (ch) * 8])
-+#define GRA16H(ch) (STATE_CPU(sd, 0)->eightbit[0x6c + (ch) * 8])
-+#define GRA16L(ch) (STATE_CPU(sd, 0)->eightbit[0x6d + (ch) * 8])
-+#define GRB16H(ch) (STATE_CPU(sd, 0)->eightbit[0x6e + (ch) * 8])
-+#define GRB16L(ch) (STATE_CPU(sd, 0)->eightbit[0x6f + (ch) * 8])
-+
-+#define TPU_CH 6
-+#define TPU_TSTR (STATE_CPU(sd, 0)->eightbit[0xc0])
-+#define TPU_TCR(ch) (STATE_CPU(sd, 0)->memory[tpubase[ch] + 0])
-+#define TPU_TSR(ch) (STATE_CPU(sd, 0)->memory[tpubase[ch] + 5])
-+#define TPU_TCNTH(ch) (STATE_CPU(sd, 0)->memory[tpubase[ch] + 6])
-+#define TPU_TCNTL(ch) (STATE_CPU(sd, 0)->memory[tpubase[ch] + 7])
-+#define TPU_GRAH(ch) (STATE_CPU(sd, 0)->memory[tpubase[ch] + 8])
-+#define TPU_GRAL(ch) (STATE_CPU(sd, 0)->memory[tpubase[ch] + 9])
-+#define TPU_GRBH(ch) (STATE_CPU(sd, 0)->memory[tpubase[ch] + 10])
-+#define TPU_GRBL(ch) (STATE_CPU(sd, 0)->memory[tpubase[ch] + 11])
-+
-+#define IPRA_H8300H 0xfee018
-+#define IPRB_H8300H 0xfee019
-+
-+#define IPRA_H8300S 0xfffe00
-+
-+struct int_list_t {
-+  int vector;
-+  unsigned int  isr_adr;
-+  unsigned char isr_mask;
-+  unsigned int  ier_adr;
-+  unsigned char ier_mask;
-+};
-+
-+static const unsigned char *sci_base;
-+static unsigned char ssr[MAX_SCI_CH];
-+static const unsigned char *timer8_base;
-+static const struct int_list_t *int_table;
-+
-+static const unsigned char h8300h_timer8_base[] = {0x80,0x81,0x90,0x91,0};
-+static const unsigned char h8300s_timer8_base[] = {0xb0,0xb1,0};
-+static const unsigned int tpubase[] = {0xffffd0,0xffffe0,0xfffff0,
-+				       0xfffe80,0xfffe90,0xfffea0};
-+static const unsigned char h8300h_sci_base[] = {0xb0,0xb8,0xc0};
-+static const unsigned char h8300s_sci_base[] = {0x78,0x80,0x88};
-+static const unsigned char h8300sx_sci_base[] = {0x80,0x88,0x60};
-+
-+extern int h8300hmode;
-+extern int h8300smode;
-+extern int h8300sxmode;
-+
-+static const struct int_list_t h8300h_int_table[]= {
-+  {24,0xffff64,0x01,0xffff64,0x10},	/* IMIA0 */
-+  {25,0xffff65,0x01,0xffff65,0x10},	/* IMIB0 */
-+  {26,0xffff66,0x01,0xffff66,0x10},	/* OVI0  */
-+  {28,0xffff64,0x02,0xffff64,0x20},	/* IMIA1 */
-+  {29,0xffff65,0x02,0xffff65,0x20},	/* IMIB1 */
-+  {30,0xffff66,0x02,0xffff66,0x20},	/* OVI1  */
-+  {32,0xffff64,0x04,0xffff64,0x40},	/* IMIA2 */
-+  {33,0xffff65,0x04,0xffff65,0x40},	/* IMIB2 */
-+  {34,0xffff66,0x04,0xffff66,0x40},	/* OVI2  */
-+  {36,0xffff82,0x40,0xffff80,0x40},	/* CMIA0 */
-+  {37,0xffff82,0x80,0xffff80,0x80},	/* CMIB0 */
-+  {38,0xffff83,0x40,0xffff81,0x40},	/* CMIA1 */
-+  {38,0xffff83,0x80,0xffff81,0x40},	/* CMIB1 */
-+  {39,0xffff82,0x20,0xffff80,0x20},	/* TOVI0 */
-+  {39,0xffff83,0x20,0xffff81,0x20},	/* TOVI1 */
-+  {40,0xffff92,0x40,0xffff90,0x40},	/* CMIA2 */
-+  {41,0xffff92,0x80,0xffff90,0x80},	/* CMIB2 */
-+  {42,0xffff93,0x40,0xffff91,0x40},	/* CMIA3 */
-+  {42,0xffff93,0x80,0xffff91,0x40},	/* CMIB3 */
-+  {43,0xffff92,0x20,0xffff90,0x20},	/* TOVI2 */
-+  {43,0xffff93,0x20,0xffff91,0x20},	/* TOVI3 */
-+  {52,0xffffb4,0x38,0xffffb2,0x40},	/* ERI0 */
-+  {53,0xffffb4,0x40,0xffffb2,0x40},	/* RXI0 */
-+  {54,0xffffb4,0x80,0xffffb2,0x80},	/* TXI0 */
-+  {55,0xffffb4,0x04,0xffffb2,0x04},	/* TEI0 */
-+  {56,0xffffbc,0x38,0xffffba,0x40},	/* ERI1 */
-+  {57,0xffffbc,0x40,0xffffba,0x40},	/* RXI1 */
-+  {58,0xffffbc,0x80,0xffffba,0x80},	/* TXI1 */
-+  {59,0xffffbc,0x04,0xffffba,0x04},	/* TEI1 */
-+  {60,0xffffc4,0x38,0xffffc2,0x40},	/* ERI2 */
-+  {61,0xffffc4,0x40,0xffffc2,0x40},	/* RXI2 */
-+  {62,0xffffc4,0x80,0xffffc2,0x80},	/* TXI2 */
-+  {63,0xffffc4,0x04,0xffffc2,0x04},	/* TEI2 */
-+  {-1,0,0,0,0}
-+};
-+
-+static const struct int_list_t h8300s_int_table[]= {
-+  {40,0xffffd5,0x01,0xffffd4,0x01},	/* TGI0A */
-+  {41,0xffffd5,0x02,0xffffd4,0x02},	/* TGI0B */
-+  {43,0xffffd5,0x10,0xffffd4,0x10},	/* TGI0V */
-+  {48,0xffffe5,0x01,0xffffe4,0x01},	/* TGI1A */
-+  {49,0xffffe5,0x01,0xffffe4,0x02},	/* TGI1B */
-+  {50,0xffffe5,0x10,0xffffe4,0x10},	/* TGI1V */
-+  {52,0xfffff5,0x01,0xfffff4,0x01},	/* TGI2A */
-+  {53,0xfffff5,0x02,0xfffff4,0x02},	/* TGI2B */
-+  {54,0xfffff5,0x10,0xfffff4,0x10},	/* TGI2V */
-+  {56,0xfffe85,0x01,0xfffe84,0x01},	/* TGI3A */
-+  {57,0xfffe85,0x02,0xfffe84,0x02},	/* TGI3B */
-+  {60,0xfffe85,0x10,0xfffe84,0x10},	/* TGI3V */
-+  {64,0xfffe95,0x01,0xfffe94,0x01},	/* TGI4A */
-+  {65,0xfffe95,0x02,0xfffe94,0x02},	/* TGI4B */
-+  {66,0xfffe95,0x10,0xfffe94,0x10},	/* TGI4V */
-+  {68,0xfffea5,0x01,0xfffea4,0x01},	/* TGI5A */
-+  {69,0xfffea5,0x02,0xfffea4,0x02},	/* TGI5B */
-+  {70,0xfffea5,0x10,0xfffea4,0x10},	/* TGI5V */
-+  {72,0xffffb2,0x40,0xffffb0,0x40},	/* CMIA0 */
-+  {73,0xffffb2,0x80,0xffffb0,0x80},	/* CMIB0 */
-+  {74,0xffffb2,0x20,0xffffb0,0x20},	/* CMIA1 */
-+  {76,0xffffb3,0x40,0xffffb1,0x40},	/* CMIB1 */
-+  {77,0xffffb3,0x80,0xffffb1,0x40},	/* TOVI0 */
-+  {78,0xffffb3,0x20,0xffffb1,0x20},	/* TOVI1 */
-+  {88,0xffff7c,0x38,0xffff7a,0x40},	/* ERI0 */
-+  {89,0xffff7c,0x40,0xffff7a,0x40},	/* RXI0 */
-+  {90,0xffff7c,0x80,0xffff7a,0x80},	/* TXI0 */
-+  {91,0xffff7c,0x04,0xffff7a,0x04}, 	/* TEI0 */
-+  {92,0xffff84,0x38,0xffff82,0x40},	/* ERI1 */
-+  {93,0xffff84,0x40,0xffff82,0x40},	/* RXI1 */
-+  {94,0xffff84,0x80,0xffff82,0x80},	/* TXI1 */
-+  {95,0xffff84,0x04,0xffff82,0x04}, 	/* TEI1 */
-+  {96,0xffff8c,0x38,0xffff8a,0x40},	/* ERI2 */
-+  {97,0xffff8c,0x40,0xffff8a,0x40},	/* RXI2 */
-+  {98,0xffff8c,0x80,0xffff8a,0x80},	/* TXI2 */
-+  {99,0xffff8c,0x04,0xffff8a,0x04}, 	/* TEI2 */
-+  {-1,0,0,0,0}
-+};
-+static const struct int_list_t h8300sx_int_table[]= {
-+  {88,0xffffd5,0x01,0xffffd4,0x01},	/* TGI0A */
-+  {89,0xffffd5,0x02,0xffffd4,0x02},	/* TGI0B */
-+  {90,0xffffd5,0x01,0xffffd4,0x01},	/* TGI0C */
-+  {91,0xffffd5,0x02,0xffffd4,0x02},	/* TGI0D */
-+  {93,0xffffe5,0x01,0xffffe4,0x01},	/* TGI1A */
-+  {94,0xffffe5,0x01,0xffffe4,0x02},	/* TGI1B */
-+  {95,0xffffe5,0x10,0xffffe4,0x10},	/* TGI1V */
-+  {96,0xffffe5,0x10,0xffffe4,0x10},	/* TGI1U */
-+  {97,0xfffff5,0x01,0xfffff4,0x01},	/* TGI2A */
-+  {98,0xfffff5,0x02,0xfffff4,0x02},	/* TGI2B */
-+  {99,0xfffff5,0x10,0xfffff4,0x10},	/* TGI2V */
-+  {100,0xfffff5,0x10,0xfffff4,0x10},	/* TGI2U */
-+  {101,0xfffe85,0x01,0xfffe84,0x01},	/* TGI3A */
-+  {102,0xfffe85,0x02,0xfffe84,0x02},	/* TGI3B */
-+  {103,0xfffe85,0x01,0xfffe84,0x01},	/* TGI3A */
-+  {104,0xfffe85,0x02,0xfffe84,0x02},	/* TGI3B */
-+  {105,0xfffe85,0x10,0xfffe84,0x10},	/* TGI3V */
-+  {106,0xfffe95,0x01,0xfffe94,0x01},	/* TGI4A */
-+  {107,0xfffe95,0x02,0xfffe94,0x02},	/* TGI4B */
-+  {108,0xfffe95,0x10,0xfffe94,0x10},	/* TGI4V */
-+  {109,0xfffe95,0x10,0xfffe94,0x10},	/* TGI4U */
-+  {110,0xfffea5,0x01,0xfffea4,0x01},	/* TGI5A */
-+  {111,0xfffea5,0x02,0xfffea4,0x02},	/* TGI5B */
-+  {112,0xfffea5,0x10,0xfffea4,0x10},	/* TGI5V */
-+  {113,0xfffea5,0x10,0xfffea4,0x10},	/* TGI5V */
-+  {116,0xffffb2,0x40,0xffffb0,0x40},	/* CMIA0 */
-+  {117,0xffffb2,0x80,0xffffb0,0x80},	/* CMIB0 */
-+  {118,0xffffb3,0x80,0xffffb1,0x40},	/* OVI0 */
-+  {119,0xffffb2,0x20,0xffffb0,0x20},	/* CMIA1 */
-+  {120,0xffffb3,0x40,0xffffb1,0x40},	/* CMIB1 */
-+  {121,0xffffb3,0x20,0xffffb1,0x20},	/* OVI1 */
-+  {144,0xffff7c,0x38,0xffff7a,0x40},	/* ERI0 */
-+  {145,0xffff7c,0x40,0xffff7a,0x40},	/* RXI0 */
-+  {146,0xffff7c,0x80,0xffff7a,0x80},	/* TXI0 */
-+  {147,0xffff7c,0x04,0xffff7a,0x04}, 	/* TEI0 */
-+  {148,0xffff84,0x38,0xffff82,0x40},	/* ERI1 */
-+  {149,0xffff84,0x40,0xffff82,0x40},	/* RXI1 */
-+  {150,0xffff84,0x80,0xffff82,0x80},	/* TXI1 */
-+  {151,0xffff84,0x04,0xffff82,0x04}, 	/* TEI1 */
-+  {152,0xffff8c,0x38,0xffff8a,0x40},	/* ERI2 */
-+  {153,0xffff8c,0x40,0xffff8a,0x40},	/* RXI2 */
-+  {154,0xffff8c,0x80,0xffff8a,0x80},	/* TXI2 */
-+  {155,0xffff8c,0x04,0xffff8a,0x04}, 	/* TEI2 */
-+  {-1,0,0,0,0}
-+};
-+
-+void 
-+timer8(SIM_DESC sd, unsigned int cycles_diff)
-+{
-+  static int prescale[3]={8,64,8192};
-+  const int prescale_div[3]={8,64,8192};
-+  static unsigned char tcsr[4]={0x00,0x00,0x00,0x00};
-+  int tm, cnt, pcnt, cor;
-+  for (pcnt = 0; pcnt < 3; pcnt++)
-+    {
-+      prescale[pcnt] -= cycles_diff;
-+      
-+      if (prescale[pcnt]<=0) 
-+	{
-+	  /* input time pulse */
-+	  for(tm=0; timer8_base[tm] != 0; tm++)
-+	    {
-+	      if ((TCR8(tm) & 0x07) == 0)
-+		continue;
-+	      /* internal TCSR status clear */
-+	      tcsr[tm] &= (TCSR8(tm) & 0xf0);
-+	      
-+	      if ((TCR8(tm & 2) & 0x7) == 0x04)
-+		{
-+		  /* 16bit mode */
-+		  if (tm & 1)
-+		    continue;
-+		  tcsr[tm+1] &= (TCSR8(tm+1) & 0xf0);
-+		  cnt = TCNT8(tm) << 8 | TCNT8(tm+1);
-+		  cnt++;
-+		  if (cnt >= 0x10000)
-+		    {
-+		      tcsr[tm] |= 0x20;
-+		      cnt = 0;
-+		    }
-+		  TCNT8(tm) = cnt >> 8;
-+		  TCNT8(tm-1) = cnt & 0xff;
-+		  /* TCORA compare match check */
-+		  cor = TCORA8(tm) << 8 | TCORA8(tm+1);
-+		  if (cnt >= cor)
-+		    {
-+		      tcsr[tm]|=0x40;
-+		      if ((TCR8(tm) & 0x18) == 0x08)
-+			cnt = 0;
-+		    }
-+		  if ((cnt & 0xff) >= (cor & 0xff))
-+		    tcsr[tm+1]|=0x40;
-+		  /* TCORB compare match check */
-+		  cor = TCORB8(tm) << 8 | TCORB8(tm+1);