sim: update to reduce generated file differences

Put binutils-gdb commit db7858e227f3 (Mike Frysinger 2015-06-12) and
13a590ca65f7 (Mike Frysinger 2017-02-13) in the source rather than
generated files.

OK?

diff --git a/sim-cpu.scm b/sim-cpu.scm
index dc5b4ab..bde9f78 100644
--- a/sim-cpu.scm
+++ b/sim-cpu.scm
@@ -1183,7 +1183,7 @@ CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_" "attr)")
 
 /* If hyper-fast [well not unnecessarily slow] execution is selected, turn
    off frills like tracing and profiling.  */
-/* FIXME: A better way would be to have TRACE_RESULT check for something
+/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something
    that can cause it to be optimized out.  Another way would be to emit
    special handlers into the instruction \"stream\".  */
 
diff --git a/sim-decode.scm b/sim-decode.scm
index 88fdd28..19c0d46 100644
--- a/sim-decode.scm
+++ b/sim-decode.scm
@@ -157,7 +157,7 @@ void
     init_idesc (cpu, id, t);
 
   /* Now fill in the values for the chosen cpu.  */
-  for (t = @prefix@_insn_sem, tend = t + sizeof (@prefix@_insn_sem) / sizeof (*t);
+  for (t = @prefix@_insn_sem, tend = t + ARRAY_SIZE (@prefix@_insn_sem);
        t != tend; ++t)
     {
       init_idesc (cpu, & table[t->index], t);\n"

-- 
Alan Modra
Australia Development Lab, IBM