aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Evans <dje@google.com>1998-12-05 08:09:18 +0000
committerDoug Evans <dje@google.com>1998-12-05 08:09:18 +0000
commit0a18a6b8adb8e5d3ec215cf53e20dce1c600e201 (patch)
treec5a29530d9b639ef4a6234319390becd47ea2ecd
parentb61e2e146a85a1d93d1ad78f923005c8e4e2d7e4 (diff)
downloadgdb-0a18a6b8adb8e5d3ec215cf53e20dce1c600e201.zip
gdb-0a18a6b8adb8e5d3ec215cf53e20dce1c600e201.tar.gz
gdb-0a18a6b8adb8e5d3ec215cf53e20dce1c600e201.tar.bz2
* configure.in: Call SIM_AC_OPTION_INLINE.
* configure: Regenerate. * sim-main.h: Protect against multiple inclusion. Don't include cgen-scache.h,cgen-cpu.h,cgen-trace.h,cpuall.h. Done by cgen-sim.h now. * tconfig.in (SIM_HAVE_MODEL): Delete, moved to cgen-types.h. * cpuall.h: Regenerate. * cpu.h,decode.c,sem-switch.c,sem.c: Regenerate. * mloop.in (extract16): Make static inline again. Simplify with call to @cpu@_fill_argbuf,@cpu@_fill_argbuf_tp. (extract32): Ditto. Simplify with call to @cpu@_fill_argbuf,@cpu@_fill_argbuf_tp. (execute): Test ARGBUF_PROFILE_P before profiling. Update calls to TRACE_INSN_INIT,TRACE_INSN_FINI. * cpux.h,decodex.c,modelx.c,semx-switch.c: Regenerate. * mloopx.in: Rewrite.
Diffstat
-rw-r--r--sim/m32r/ChangeLog16
-rwxr-xr-xsim/m32r/configure639
-rw-r--r--sim/m32r/configure.in1
-rw-r--r--sim/m32r/cpu.h2
-rw-r--r--sim/m32r/cpux.h2
-rw-r--r--sim/m32r/decode.c108
-rw-r--r--sim/m32r/decodex.c130
-rw-r--r--sim/m32r/sem-switch.c240
-rw-r--r--sim/m32r/sem.c238
-rw-r--r--sim/m32r/semx-switch.c472
-rw-r--r--sim/m32r/sim-main.h16
11 files changed, 1068 insertions, 796 deletions
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index cea93d7..eec8a68 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,8 +1,22 @@
-Fri Dec 4 00:19:33 1998 Doug Evans <devans@canuck.cygnus.com>
+1998-12-04 Doug Evans <devans@casey.cygnus.com>
+ * configure.in: Call SIM_AC_OPTION_INLINE.
+ * configure: Regenerate.
+ * sim-main.h: Protect against multiple inclusion.
+ Don't include cgen-scache.h,cgen-cpu.h,cgen-trace.h,cpuall.h.
+ Done by cgen-sim.h now.
+ * tconfig.in (SIM_HAVE_MODEL): Delete, moved to cgen-types.h.
+ * cpuall.h: Regenerate.
* cpu.h,decode.c,sem-switch.c,sem.c: Regenerate.
+ * mloop.in (extract16): Make static inline again.
+ Simplify with call to @cpu@_fill_argbuf,@cpu@_fill_argbuf_tp.
+ (extract32): Ditto.
+ Simplify with call to @cpu@_fill_argbuf,@cpu@_fill_argbuf_tp.
+ (execute): Test ARGBUF_PROFILE_P before profiling.
+ Update calls to TRACE_INSN_INIT,TRACE_INSN_FINI.
start-sanitize-m32rx
* cpux.h,decodex.c,modelx.c,semx-switch.c: Regenerate.
+ * mloopx.in: Rewrite.
end-sanitize-m32rx
1998-11-22 Doug Evans <devans@tobor.to.cygnus.com>
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 1789d92..20d6c7b 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -133,7 +133,7 @@ sim_inline="-DDEFAULT_INLINE=0"
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12.1
+# Generated automatically using autoconf version 2.12.2
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
@@ -173,6 +173,10 @@ ac_help="$ac_help
--enable-sim-default-model=model Specify default model to simulate."
ac_help="$ac_help
--enable-sim-environment=environment Specify mixed, user, virtual or operating environment."
+ac_help="$ac_help
+ --enable-sim-inline=inlines Specify which functions should be inlined."
+ac_help="$ac_help
+ --enable-cgen-maint[=dir] build cgen generated files"
# Initialize some variables set by options.
# The variables have the same names as the options, with
@@ -495,7 +499,7 @@ EOF
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.12.1"
+ echo "configure generated by autoconf version 2.12.2"
exit 0 ;;
-with-* | --with-*)
@@ -665,9 +669,11 @@ ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
+ac_exeext=
+ac_objext=o
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -683,7 +689,7 @@ fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:687: checking how to run the C preprocessor" >&5
+echo "configure:693: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -698,14 +704,14 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 702 "configure"
+#line 708 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
else
@@ -715,14 +721,31 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 719 "configure"
+#line 725 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ :
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <<EOF
+#line 742 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
else
@@ -735,6 +758,8 @@ fi
rm -f conftest*
fi
rm -f conftest*
+fi
+rm -f conftest*
ac_cv_prog_CPP="$CPP"
fi
CPP="$ac_cv_prog_CPP"
@@ -744,7 +769,7 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:748: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:773: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -771,7 +796,7 @@ else
fi
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:775: checking for POSIXized ISC" >&5
+echo "configure:800: checking for POSIXized ISC" >&5
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
@@ -792,12 +817,12 @@ else
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:796: checking for ANSI C header files" >&5
+echo "configure:821: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 801 "configure"
+#line 826 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -805,8 +830,8 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
ac_cv_header_stdc=yes
@@ -822,7 +847,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 826 "configure"
+#line 851 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -840,7 +865,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 844 "configure"
+#line 869 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -861,7 +886,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 865 "configure"
+#line 890 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -872,7 +897,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -896,12 +921,12 @@ EOF
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:900: checking for working const" >&5
+echo "configure:925: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 905 "configure"
+#line 930 "configure"
#include "confdefs.h"
int main() {
@@ -950,7 +975,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -971,21 +996,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:975: checking for inline" >&5
+echo "configure:1000: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 982 "configure"
+#line 1007 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -1011,12 +1036,12 @@ EOF
esac
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1015: checking for off_t" >&5
+echo "configure:1040: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1020 "configure"
+#line 1045 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1044,12 +1069,12 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1048: checking for size_t" >&5
+echo "configure:1073: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1053 "configure"
+#line 1078 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1079,19 +1104,19 @@ fi
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1083: checking for working alloca.h" >&5
+echo "configure:1108: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1088 "configure"
+#line 1113 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:1095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -1112,25 +1137,30 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1116: checking for alloca" >&5
+echo "configure:1141: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1121 "configure"
+#line 1146 "configure"
#include "confdefs.h"
#ifdef __GNUC__
# define alloca __builtin_alloca
#else
-# if HAVE_ALLOCA_H
-# include <alloca.h>
+# ifdef _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
# else
-# ifdef _AIX
- #pragma alloca
+# if HAVE_ALLOCA_H
+# include <alloca.h>
# else
-# ifndef alloca /* predefined by HP cc +Olibcalls */
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca /* predefined by HP cc +Olibcalls */
char *alloca ();
+# endif
# endif
# endif
# endif
@@ -1140,7 +1170,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:1144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -1165,19 +1195,19 @@ if test $ac_cv_func_alloca_works = no; then
# that cause trouble. Some versions do not even contain alloca or
# contain a buggy version. If you still want to use their alloca,
# use ar to extract alloca.o from them instead of compiling alloca.c.
- ALLOCA=alloca.o
+ ALLOCA=alloca.${ac_objext}
cat >> confdefs.h <<\EOF
#define C_ALLOCA 1
EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1176: checking whether alloca needs Cray hooks" >&5
+echo "configure:1206: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1181 "configure"
+#line 1211 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -1202,12 +1232,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1206: checking for $ac_func" >&5
+echo "configure:1236: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1211 "configure"
+#line 1241 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1230,7 +1260,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1257,7 +1287,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:1261: checking stack direction for C alloca" >&5
+echo "configure:1291: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1265,7 +1295,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 1269 "configure"
+#line 1299 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -1284,7 +1314,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:1288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -1309,18 +1339,18 @@ for ac_hdr in unistd.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1313: checking for $ac_hdr" >&5
+echo "configure:1343: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1318 "configure"
+#line 1348 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -1348,12 +1378,12 @@ done
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1352: checking for $ac_func" >&5
+echo "configure:1382: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1357 "configure"
+#line 1387 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1376,7 +1406,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1401,7 +1431,7 @@ fi
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:1405: checking for working mmap" >&5
+echo "configure:1435: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1409,7 +1439,7 @@ else
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
-#line 1413 "configure"
+#line 1443 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
@@ -1549,7 +1579,7 @@ main()
}
EOF
-if { (eval echo configure:1553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_mmap_fixed_mapped=yes
else
@@ -1622,7 +1652,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1626: checking host system type" >&5
+echo "configure:1656: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -1643,7 +1673,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:1647: checking target system type" >&5
+echo "configure:1677: checking target system type" >&5
target_alias=$target
case "$target_alias" in
@@ -1661,7 +1691,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1665: checking build system type" >&5
+echo "configure:1695: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -1705,14 +1735,14 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1709: checking for $ac_word" >&5
+echo "configure:1739: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
@@ -1734,14 +1764,14 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1738: checking for $ac_word" >&5
+echo "configure:1768: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_prog_rejected=no
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
@@ -1778,25 +1808,58 @@ else
echo "$ac_t""no" 1>&6
fi
+ if test -z "$CC"; then
+ case "`uname -s`" in
+ *win32* | *WIN32*)
+ # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1818: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_CC="cl"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+ ;;
+ esac
+ fi
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1786: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1849: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 1796 "configure"
+#line 1859 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1816,12 +1879,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1820: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1883: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1825: checking whether we are using GNU C" >&5
+echo "configure:1888: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1830,7 +1893,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -1841,11 +1904,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
if test $ac_cv_prog_gcc = yes; then
GCC=yes
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1849: checking whether ${CC-cc} accepts -g" >&5
+else
+ GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:1916: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1860,16 +1927,20 @@ rm -f conftest*
fi
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS="$ac_save_CFLAGS"
- elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
CFLAGS="-g -O2"
else
- CFLAGS="-O2"
+ CFLAGS="-g"
fi
else
- GCC=
- test "${CFLAGS+set}" = set || CFLAGS="-g"
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
fi
# Find a good install program. We prefer a C program (faster),
@@ -1884,12 +1955,12 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1888: checking for a BSD compatible install" >&5
+echo "configure:1959: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
@@ -1950,14 +2021,14 @@ AR=${AR-ar}
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1954: checking for $ac_word" >&5
+echo "configure:2025: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
@@ -1984,18 +2055,18 @@ unistd.h values.h sys/param.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1988: checking for $ac_hdr" >&5
+echo "configure:2059: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1993 "configure"
+#line 2064 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -2024,12 +2095,12 @@ done
__argz_count __argz_stringify __argz_next
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2028: checking for $ac_func" >&5
+echo "configure:2099: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2033 "configure"
+#line 2104 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2052,7 +2123,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2081,12 +2152,12 @@ done
for ac_func in stpcpy
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2085: checking for $ac_func" >&5
+echo "configure:2156: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2090 "configure"
+#line 2161 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2109,7 +2180,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2143,19 +2214,19 @@ EOF
if test $ac_cv_header_locale_h = yes; then
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2147: checking for LC_MESSAGES" >&5
+echo "configure:2218: checking for LC_MESSAGES" >&5
if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2152 "configure"
+#line 2223 "configure"
#include "confdefs.h"
#include <locale.h>
int main() {
return LC_MESSAGES
; return 0; }
EOF
-if { (eval echo configure:2159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_val_LC_MESSAGES=yes
else
@@ -2176,7 +2247,7 @@ EOF
fi
fi
echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2180: checking whether NLS is requested" >&5
+echo "configure:2251: checking whether NLS is requested" >&5
# Check whether --enable-nls or --disable-nls was given.
if test "${enable_nls+set}" = set; then
enableval="$enable_nls"
@@ -2196,7 +2267,7 @@ fi
EOF
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2200: checking whether included gettext is requested" >&5
+echo "configure:2271: checking whether included gettext is requested" >&5
# Check whether --with-included-gettext or --without-included-gettext was given.
if test "${with_included_gettext+set}" = set; then
withval="$with_included_gettext"
@@ -2215,18 +2286,18 @@ fi
ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2219: checking for libintl.h" >&5
+echo "configure:2290: checking for libintl.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2224 "configure"
+#line 2295 "configure"
#include "confdefs.h"
#include <libintl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -2242,19 +2313,19 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:2246: checking for gettext in libc" >&5
+echo "configure:2317: checking for gettext in libc" >&5
if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2251 "configure"
+#line 2322 "configure"
#include "confdefs.h"
#include <libintl.h>
int main() {
return (int) gettext ("")
; return 0; }
EOF
-if { (eval echo configure:2258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
gt_cv_func_gettext_libc=yes
else
@@ -2270,7 +2341,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
if test "$gt_cv_func_gettext_libc" != "yes"; then
echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:2274: checking for bindtextdomain in -lintl" >&5
+echo "configure:2345: checking for bindtextdomain in -lintl" >&5
ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2278,7 +2349,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2282 "configure"
+#line 2353 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2289,7 +2360,7 @@ int main() {
bindtextdomain()
; return 0; }
EOF
-if { (eval echo configure:2293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2305,19 +2376,19 @@ fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:2309: checking for gettext in libintl" >&5
+echo "configure:2380: checking for gettext in libintl" >&5
if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2314 "configure"
+#line 2385 "configure"
#include "confdefs.h"
int main() {
return (int) gettext ("")
; return 0; }
EOF
-if { (eval echo configure:2321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
gt_cv_func_gettext_libintl=yes
else
@@ -2345,7 +2416,7 @@ EOF
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2349: checking for $ac_word" >&5
+echo "configure:2420: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2379,12 +2450,12 @@ fi
for ac_func in dcgettext
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2383: checking for $ac_func" >&5
+echo "configure:2454: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2388 "configure"
+#line 2459 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2407,7 +2478,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2434,7 +2505,7 @@ done
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2438: checking for $ac_word" >&5
+echo "configure:2509: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2446,7 +2517,7 @@ else
ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
@@ -2469,7 +2540,7 @@ fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2473: checking for $ac_word" >&5
+echo "configure:2544: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2501,7 +2572,7 @@ else
fi
cat > conftest.$ac_ext <<EOF
-#line 2505 "configure"
+#line 2576 "configure"
#include "confdefs.h"
int main() {
@@ -2509,7 +2580,7 @@ extern int _nl_msg_cat_cntr;
return _nl_msg_cat_cntr
; return 0; }
EOF
-if { (eval echo configure:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
CATOBJEXT=.gmo
DATADIRNAME=share
@@ -2541,7 +2612,7 @@ fi
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2545: checking for $ac_word" >&5
+echo "configure:2616: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2575,7 +2646,7 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2579: checking for $ac_word" >&5
+echo "configure:2650: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2587,7 +2658,7 @@ else
ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
@@ -2610,7 +2681,7 @@ fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2614: checking for $ac_word" >&5
+echo "configure:2685: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2700,7 +2771,7 @@ fi
LINGUAS=
else
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:2704: checking for catalogs to be installed" >&5
+echo "configure:2775: checking for catalogs to be installed" >&5
NEW_LINGUAS=
for lang in ${LINGUAS=$ALL_LINGUAS}; do
case "$ALL_LINGUAS" in
@@ -2728,18 +2799,18 @@ echo "configure:2704: checking for catalogs to be installed" >&5
if test "$CATOBJEXT" = ".cat"; then
ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:2732: checking for linux/version.h" >&5
+echo "configure:2803: checking for linux/version.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2737 "configure"
+#line 2808 "configure"
#include "confdefs.h"
#include <linux/version.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -2807,18 +2878,18 @@ for ac_hdr in stdlib.h string.h strings.h unistd.h time.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2811: checking for $ac_hdr" >&5
+echo "configure:2882: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2816 "configure"
+#line 2887 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -2847,18 +2918,18 @@ for ac_hdr in sys/time.h sys/resource.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2851: checking for $ac_hdr" >&5
+echo "configure:2922: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2856 "configure"
+#line 2927 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -2887,18 +2958,58 @@ for ac_hdr in fcntl.h fpu_control.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2891: checking for $ac_hdr" >&5
+echo "configure:2962: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2967 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_hdr in dlfcn.h errno.h sys/stat.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:3002: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2896 "configure"
+#line 3007 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:3012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
@@ -2926,12 +3037,12 @@ done
for ac_func in getrusage time sigaction __setfpucw
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2930: checking for $ac_func" >&5
+echo "configure:3041: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2935 "configure"
+#line 3046 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2954,7 +3065,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2979,6 +3090,102 @@ fi
done
+# Check for socket libraries
+echo $ac_n "checking for bind in -lsocket""... $ac_c" 1>&6
+echo "configure:3096: checking for bind in -lsocket" >&5
+ac_lib_var=`echo socket'_'bind | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lsocket $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3104 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char bind();
+
+int main() {
+bind()
+; return 0; }
+EOF
+if { (eval echo configure:3115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-lsocket $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:3143: checking for gethostbyname in -lnsl" >&5
+ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lnsl $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3151 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char gethostbyname();
+
+int main() {
+gethostbyname()
+; return 0; }
+EOF
+if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-lnsl $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
. ${srcdir}/../../bfd/configure.host
@@ -3127,12 +3334,12 @@ fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3131: checking return type of signal handlers" >&5
+echo "configure:3338: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3136 "configure"
+#line 3343 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -3149,7 +3356,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:3153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -3169,7 +3376,7 @@ EOF
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:3173: checking for executable suffix" >&5
+echo "configure:3380: checking for executable suffix" >&5
if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3326,14 +3533,14 @@ else
if test "x$cross_compiling" = "xno"; then
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3330: checking whether byte ordering is bigendian" >&5
+echo "configure:3537: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 3337 "configure"
+#line 3544 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -3344,11 +3551,11 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:3348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 3352 "configure"
+#line 3559 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -3359,7 +3566,7 @@ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:3363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@@ -3379,7 +3586,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3383 "configure"
+#line 3590 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@@ -3392,7 +3599,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:3396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
@@ -3426,7 +3633,7 @@ fi
fi
-default_sim_scache="1024"
+default_sim_scache="16384"
# Check whether --enable-sim-scache or --disable-sim-scache was given.
if test "${enable_sim_scache+set}" = set; then
enableval="$enable_sim_scache"
@@ -3482,37 +3689,83 @@ else
fi
-if test ${USE_MAINTAINER_MODE} = yes ; then
- # Extract the first word of "guile", so it can be a program name with args.
-set dummy guile; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3490: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_SCHEME'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test -n "$SCHEME"; then
- ac_cv_prog_SCHEME="$SCHEME" # Let the user override the test.
+default_sim_inline=""
+# Check whether --enable-sim-inline or --disable-sim-inline was given.
+if test "${enable_sim_inline+set}" = set; then
+ enableval="$enable_sim_inline"
+ sim_inline=""
+case "$enableval" in
+ no) sim_inline="-DDEFAULT_INLINE=0";;
+ 0) sim_inline="-DDEFAULT_INLINE=0";;
+ yes | 2) sim_inline="-DDEFAULT_INLINE=ALL_C_INLINE";;
+ 1) sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS";;
+ *) for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
+ new_flag=""
+ case "$x" in
+ *_INLINE=*) new_flag="-D$x";;
+ *=*) new_flag=`echo "$x" | sed -e "s/=/_INLINE=/" -e "s/^/-D/"`;;
+ *_INLINE) new_flag="-D$x=ALL_C_INLINE";;
+ *) new_flag="-D$x""_INLINE=ALL_C_INLINE";;
+ esac
+ if test x"$sim_inline" = x""; then
+ sim_inline="$new_flag"
+ else
+ sim_inline="$sim_inline $new_flag"
+ fi
+ done;;
+esac
+if test x"$silent" != x"yes" && test x"$sim_inline" != x""; then
+ echo "Setting inline flags = $sim_inline" 6>&1
+fi
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_SCHEME="guile"
- break
+
+if test "x$cross_compiling" = "xno"; then
+ if test x"$GCC" != "x" -a x"${default_sim_inline}" != "x" ; then
+ sim_inline="${default_sim_inline}"
+ if test x"$silent" != x"yes"; then
+ echo "Setting inline flags = $sim_inline" 6>&1
fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_SCHEME" && ac_cv_prog_SCHEME="guile"
+ else
+ sim_inline=""
+ fi
+else
+ sim_inline="-DDEFAULT_INLINE=0"
+fi
fi
+
+
+cgen_maint=no
+# Default is to use one in build tree.
+cgen=../../cgen/cgen
+cgendir='$(srcdir)/../../cgen'
+# Having --enable-maintainer-mode take arguments is another way to go.
+# ??? One can argue --with is more appropriate if one wants to specify
+# a directory name, but what we're doing here is an enable/disable kind
+# of thing and specifying both --enable and --with is klunky.
+# If you reeely want this to be --with, go ahead and change it.
+# Check whether --enable-cgen-maint or --disable-cgen-maint was given.
+if test "${enable_cgen_maint+set}" = set; then
+ enableval="$enable_cgen_maint"
+ case "${enableval}" in
+ yes) cgen_maint=yes ;;
+ no) cgen_maint=no ;;
+ *)
+ # argument is cgen install directory (not implemented yet).
+ # Having a `share' directory might be more appropriate for the .scm,
+ # .cpu, etc. files.
+ cgendir=${cgen_maint}/lib/cgen
+ cgen=${cgendir}/bin/cgen
+ ;;
+esac
fi
-SCHEME="$ac_cv_prog_SCHEME"
-if test -n "$SCHEME"; then
- echo "$ac_t""$SCHEME" 1>&6
+if test x${cgen_maint} != xno ; then
+ CGEN_MAINT=''
else
- echo "$ac_t""no" 1>&6
+ CGEN_MAINT='#'
fi
-fi
+
+
@@ -3539,7 +3792,7 @@ EOF
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
(set) 2>&1 |
- case `(ac_space=' '; set) 2>&1` in
+ case `(ac_space=' '; set) 2>&1 | grep ac_space` in
*ac_space=\ *)
# `set' does not quote correctly, so add quotes (double-quote substitution
# turns \\\\ into \\, and sed turns \\ into \).
@@ -3606,7 +3859,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.12.1"
+ echo "$CONFIG_STATUS generated by autoconf version 2.12.2"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -3635,8 +3888,8 @@ s%@sim_hostendian@%$sim_hostendian%g
s%@sim_float@%$sim_float%g
s%@sim_scache@%$sim_scache%g
s%@sim_default_model@%$sim_default_model%g
-s%@sim_hardware@%$sim_hardware%g
-s%@sim_hw_obj@%$sim_hw_obj%g
+s%@sim_hw_cflags@%$sim_hw_cflags%g
+s%@sim_hw_objs@%$sim_hw_objs%g
s%@sim_hw@%$sim_hw%g
s%@sim_inline@%$sim_inline%g
s%@sim_packages@%$sim_packages%g
@@ -3645,7 +3898,7 @@ s%@sim_reserved_bits@%$sim_reserved_bits%g
s%@sim_smp@%$sim_smp%g
s%@sim_stdcall@%$sim_stdcall%g
s%@sim_xor_endian@%$sim_xor_endian%g
-s%@sim_warnings@%$sim_warnings%g
+s%@build_warnings@%$build_warnings%g
s%@SHELL@%$SHELL%g
s%@CFLAGS@%$CFLAGS%g
s%@CPPFLAGS@%$CPPFLAGS%g
@@ -3721,7 +3974,9 @@ s%@sim_stdio@%$sim_stdio%g
s%@sim_trace@%$sim_trace%g
s%@sim_profile@%$sim_profile%g
s%@EXEEXT@%$EXEEXT%g
-s%@SCHEME@%$SCHEME%g
+s%@CGEN_MAINT@%$CGEN_MAINT%g
+s%@cgendir@%$cgendir%g
+s%@cgen@%$cgen%g
CEOF
EOF
diff --git a/sim/m32r/configure.in b/sim/m32r/configure.in
index bf57c2f..1a73fe3 100644
--- a/sim/m32r/configure.in
+++ b/sim/m32r/configure.in
@@ -14,6 +14,7 @@ SIM_AC_OPTION_HOSTENDIAN
SIM_AC_OPTION_SCACHE(16384)
SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)
SIM_AC_OPTION_ENVIRONMENT
+SIM_AC_OPTION_INLINE()
cgen_maint=no
# Default is to use one in build tree.
diff --git a/sim/m32r/cpu.h b/sim/m32r/cpu.h
index 563deca..7fa50ce 100644
--- a/sim/m32r/cpu.h
+++ b/sim/m32r/cpu.h
@@ -121,6 +121,8 @@ struct argbuf {
/* These are the baseclass definitions. */
PCADDR addr;
const IDESC *idesc;
+ char trace_p;
+ char profile_p;
/* cpu specific data follows */
union sem semantic;
int written;
diff --git a/sim/m32r/cpux.h b/sim/m32r/cpux.h
index c3dcf6f..8b0ff49 100644
--- a/sim/m32r/cpux.h
+++ b/sim/m32r/cpux.h
@@ -117,6 +117,8 @@ struct argbuf {
/* These are the baseclass definitions. */
PCADDR addr;
const IDESC *idesc;
+ char trace_p;
+ char profile_p;
/* cpu specific data follows */
union sem semantic;
int written;
diff --git a/sim/m32r/decode.c b/sim/m32r/decode.c
index bc7625b..2ff560f 100644
--- a/sim/m32r/decode.c
+++ b/sim/m32r/decode.c
@@ -679,7 +679,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_dr) = & CPU (h_gr)[f_r1];
FLD (i_sr) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_add", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_add", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -706,7 +706,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_add3", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_add3", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -732,7 +732,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_uimm16) = f_uimm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_and3", "sr 0x%x", 'x', f_r2, "uimm16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_and3", "sr 0x%x", 'x', f_r2, "uimm16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -758,7 +758,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_uimm16) = f_uimm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_or3", "sr 0x%x", 'x', f_r2, "ulo16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_or3", "sr 0x%x", 'x', f_r2, "ulo16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -783,7 +783,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_dr) = & CPU (h_gr)[f_r1];
FLD (f_simm8) = f_simm8;
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addi", "dr 0x%x", 'x', f_r1, "simm8 0x%x", 'x', f_simm8, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addi", "dr 0x%x", 'x', f_r1, "simm8 0x%x", 'x', f_simm8, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -808,7 +808,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_dr) = & CPU (h_gr)[f_r1];
FLD (i_sr) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addv", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addv", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -835,7 +835,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addv3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addv3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -860,7 +860,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_dr) = & CPU (h_gr)[f_r1];
FLD (i_sr) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addx", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addx", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -886,7 +886,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp8) = f_disp8;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -909,7 +909,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp24) = f_disp24;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -934,7 +934,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_disp16) = f_disp16;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_beq", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_beq", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -960,7 +960,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_disp16) = f_disp16;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_beqz", "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_beqz", "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -984,7 +984,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp8) = f_disp8;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1008,7 +1008,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp24) = f_disp24;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1032,7 +1032,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp8) = f_disp8;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1055,7 +1055,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp24) = f_disp24;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1078,7 +1078,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src1) = & CPU (h_gr)[f_r1];
FLD (i_src2) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_cmp", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_cmp", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1103,7 +1103,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_cmpi", "src2 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_cmpi", "src2 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1127,7 +1127,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_div", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_div", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1153,7 +1153,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_jl", "sr 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_jl", "sr 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1178,7 +1178,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_jmp", "sr 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_jmp", "sr 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1202,7 +1202,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1228,7 +1228,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1253,7 +1253,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1279,7 +1279,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldb_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldb_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1304,7 +1304,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldh", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldh", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1330,7 +1330,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldh_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldh_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1355,7 +1355,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld_plus", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld_plus", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1381,7 +1381,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_uimm24) = f_uimm24;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld24", "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld24", "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1405,7 +1405,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_simm8) = f_simm8;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldi8", "simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldi8", "simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1429,7 +1429,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldi16", "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldi16", "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1453,7 +1453,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_lock", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_lock", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1478,7 +1478,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src1) = & CPU (h_gr)[f_r1];
FLD (i_src2) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_machi", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_machi", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1503,7 +1503,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src1) = & CPU (h_gr)[f_r1];
FLD (i_src2) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mulhi", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mulhi", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1528,7 +1528,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mv", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mv", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1552,7 +1552,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvfachi", "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvfachi", "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1576,7 +1576,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_r2) = f_r2;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvfc", "scr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvfc", "scr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1599,7 +1599,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvtachi", "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvtachi", "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1623,7 +1623,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_r1) = f_r1;
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvtc", "sr 0x%x", 'x', f_r2, "dcr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvtc", "sr 0x%x", 'x', f_r2, "dcr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1645,7 +1645,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
EXTRACT_FMT_NOP_CODE
/* Record the fields for the semantic handler. */
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_nop", (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_nop", (char *) 0));
#undef FLD
BREAK (ex);
@@ -1660,7 +1660,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
EXTRACT_FMT_RAC_CODE
/* Record the fields for the semantic handler. */
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_rac", (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_rac", (char *) 0));
#undef FLD
BREAK (ex);
@@ -1676,7 +1676,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_rte", (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_rte", (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1699,7 +1699,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_hi16) = f_hi16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_seth", "hi16 0x%x", 'x', f_hi16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_seth", "hi16 0x%x", 'x', f_hi16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1724,7 +1724,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sll3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sll3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1749,7 +1749,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_dr) = & CPU (h_gr)[f_r1];
FLD (f_uimm5) = f_uimm5;
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_slli", "dr 0x%x", 'x', f_r1, "uimm5 0x%x", 'x', f_uimm5, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_slli", "dr 0x%x", 'x', f_r1, "uimm5 0x%x", 'x', f_uimm5, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1774,7 +1774,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1800,7 +1800,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1825,7 +1825,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_stb", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_stb", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1851,7 +1851,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_stb_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_stb_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1876,7 +1876,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sth", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sth", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1902,7 +1902,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sth_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sth_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1927,7 +1927,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st_plus", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st_plus", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1953,7 +1953,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_uimm4) = f_uimm4;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_trap", "uimm4 0x%x", 'x', f_uimm4, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_trap", "uimm4 0x%x", 'x', f_uimm4, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1976,7 +1976,7 @@ m32rbf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_unlock", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_unlock", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
diff --git a/sim/m32r/decodex.c b/sim/m32r/decodex.c
index b251360..bfac9d7 100644
--- a/sim/m32r/decodex.c
+++ b/sim/m32r/decodex.c
@@ -858,7 +858,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_dr) = & CPU (h_gr)[f_r1];
FLD (i_sr) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_add", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_add", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -885,7 +885,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_add3", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_add3", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -911,7 +911,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_uimm16) = f_uimm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_and3", "sr 0x%x", 'x', f_r2, "uimm16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_and3", "sr 0x%x", 'x', f_r2, "uimm16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -937,7 +937,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_uimm16) = f_uimm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_or3", "sr 0x%x", 'x', f_r2, "ulo16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_or3", "sr 0x%x", 'x', f_r2, "ulo16 0x%x", 'x', f_uimm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -962,7 +962,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_dr) = & CPU (h_gr)[f_r1];
FLD (f_simm8) = f_simm8;
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addi", "dr 0x%x", 'x', f_r1, "simm8 0x%x", 'x', f_simm8, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addi", "dr 0x%x", 'x', f_r1, "simm8 0x%x", 'x', f_simm8, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -987,7 +987,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_dr) = & CPU (h_gr)[f_r1];
FLD (i_sr) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addv", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addv", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1014,7 +1014,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addv3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addv3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1039,7 +1039,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_dr) = & CPU (h_gr)[f_r1];
FLD (i_sr) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_addx", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_addx", "dr 0x%x", 'x', f_r1, "sr 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1065,7 +1065,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp8) = f_disp8;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1088,7 +1088,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp24) = f_disp24;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1113,7 +1113,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_disp16) = f_disp16;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_beq", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_beq", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1139,7 +1139,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_disp16) = f_disp16;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_beqz", "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_beqz", "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1163,7 +1163,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp8) = f_disp8;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1187,7 +1187,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp24) = f_disp24;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1211,7 +1211,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp8) = f_disp8;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bcl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bcl8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1235,7 +1235,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp24) = f_disp24;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bcl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bcl24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1259,7 +1259,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp8) = f_disp8;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1282,7 +1282,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_disp24) = f_disp24;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1305,7 +1305,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src1) = & CPU (h_gr)[f_r1];
FLD (i_src2) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_cmp", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_cmp", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1330,7 +1330,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_cmpi", "src2 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_cmpi", "src2 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1353,7 +1353,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_cmpz", "src2 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_cmpz", "src2 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1377,7 +1377,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_div", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_div", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1403,7 +1403,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_jc", "sr 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_jc", "sr 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1427,7 +1427,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_jl", "sr 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_jl", "sr 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1452,7 +1452,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_jmp", "sr 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_jmp", "sr 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1476,7 +1476,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1502,7 +1502,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1527,7 +1527,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1553,7 +1553,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldb_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldb_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1578,7 +1578,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldh", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldh", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1604,7 +1604,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldh_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldh_d", "sr 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1629,7 +1629,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld_plus", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld_plus", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1655,7 +1655,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_uimm24) = f_uimm24;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ld24", "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ld24", "uimm24 0x%x", 'x', f_uimm24, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1679,7 +1679,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_simm8) = f_simm8;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldi8", "simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldi8", "simm8 0x%x", 'x', f_simm8, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1703,7 +1703,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_ldi16", "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_ldi16", "slo16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1727,7 +1727,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_lock", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_lock", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1753,7 +1753,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (f_acc) = f_acc;
FLD (i_src1) = & CPU (h_gr)[f_r1];
FLD (i_src2) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_machi_a", "acc 0x%x", 'x', f_acc, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_machi_a", "acc 0x%x", 'x', f_acc, "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1779,7 +1779,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_src1) = & CPU (h_gr)[f_r1];
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_acc) = f_acc;
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mulhi_a", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "acc 0x%x", 'x', f_acc, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mulhi_a", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "acc 0x%x", 'x', f_acc, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1804,7 +1804,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mv", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mv", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1829,7 +1829,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_accs) = f_accs;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvfachi_a", "accs 0x%x", 'x', f_accs, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvfachi_a", "accs 0x%x", 'x', f_accs, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1853,7 +1853,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_r2) = f_r2;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvfc", "scr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvfc", "scr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1877,7 +1877,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_accs) = f_accs;
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvtachi_a", "accs 0x%x", 'x', f_accs, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvtachi_a", "accs 0x%x", 'x', f_accs, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1901,7 +1901,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_r1) = f_r1;
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mvtc", "sr 0x%x", 'x', f_r2, "dcr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mvtc", "sr 0x%x", 'x', f_r2, "dcr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1923,7 +1923,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
EXTRACT_FMT_NOP_CODE
/* Record the fields for the semantic handler. */
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_nop", (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_nop", (char *) 0));
#undef FLD
BREAK (ex);
@@ -1941,7 +1941,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (f_accs) = f_accs;
FLD (f_imm1) = f_imm1;
FLD (f_accd) = f_accd;
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_rac_dsi", "accs 0x%x", 'x', f_accs, "imm1 0x%x", 'x', f_imm1, "accd 0x%x", 'x', f_accd, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_rac_dsi", "accs 0x%x", 'x', f_accs, "imm1 0x%x", 'x', f_imm1, "accd 0x%x", 'x', f_accd, (char *) 0));
#undef FLD
BREAK (ex);
@@ -1957,7 +1957,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_rte", (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_rte", (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -1980,7 +1980,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_hi16) = f_hi16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_seth", "hi16 0x%x", 'x', f_hi16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_seth", "hi16 0x%x", 'x', f_hi16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2005,7 +2005,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sll3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sll3", "sr 0x%x", 'x', f_r2, "simm16 0x%x", 'x', f_simm16, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2030,7 +2030,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_dr) = & CPU (h_gr)[f_r1];
FLD (f_uimm5) = f_uimm5;
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_slli", "dr 0x%x", 'x', f_r1, "uimm5 0x%x", 'x', f_uimm5, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_slli", "dr 0x%x", 'x', f_r1, "uimm5 0x%x", 'x', f_uimm5, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2055,7 +2055,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2081,7 +2081,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2106,7 +2106,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_stb", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_stb", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2132,7 +2132,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_stb_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_stb_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2157,7 +2157,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sth", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sth", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2183,7 +2183,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (f_simm16) = f_simm16;
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sth_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sth_d", "src2 0x%x", 'x', f_r2, "slo16 0x%x", 'x', f_simm16, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2208,7 +2208,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_st_plus", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_st_plus", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2234,7 +2234,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (f_uimm4) = f_uimm4;
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_trap", "uimm4 0x%x", 'x', f_uimm4, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_trap", "uimm4 0x%x", 'x', f_uimm4, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2257,7 +2257,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src2) = & CPU (h_gr)[f_r2];
FLD (i_src1) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_unlock", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_unlock", "src2 0x%x", 'x', f_r2, "src1 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2282,7 +2282,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_satb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_satb", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2307,7 +2307,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_sr) = & CPU (h_gr)[f_r2];
FLD (i_dr) = & CPU (h_gr)[f_r1];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sat", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sat", "sr 0x%x", 'x', f_r2, "dr 0x%x", 'x', f_r1, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2330,7 +2330,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
EXTRACT_FMT_SADD_CODE
/* Record the fields for the semantic handler. */
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sadd", (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sadd", (char *) 0));
#undef FLD
BREAK (ex);
@@ -2347,7 +2347,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src1) = & CPU (h_gr)[f_r1];
FLD (i_src2) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_macwu1", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_macwu1", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2372,7 +2372,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src1) = & CPU (h_gr)[f_r1];
FLD (i_src2) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_msblo", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_msblo", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2397,7 +2397,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
FLD (i_src1) = & CPU (h_gr)[f_r1];
FLD (i_src2) = & CPU (h_gr)[f_r2];
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_mulwu1", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_mulwu1", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, (char *) 0));
#if WITH_PROFILE_MODEL_P
/* Record the fields for profiling. */
@@ -2421,7 +2421,7 @@ m32rxf_decode (SIM_CPU *current_cpu, PCADDR pc,
/* Record the fields for the semantic handler. */
SEM_BRANCH_INIT_EXTRACT (abuf);
- TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_sc", (char *) 0));
+ TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, "fmt_sc", (char *) 0));
#undef FLD
BREAK (ex);
diff --git a/sim/m32r/sem-switch.c b/sim/m32r/sem-switch.c
index 3cb0f7e..dce64a6 100644
--- a/sim/m32r/sem-switch.c
+++ b/sim/m32r/sem-switch.c
@@ -161,7 +161,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#if FAST_P
#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, name, type, val)
+#define TRACE_RESULT(cpu, abuf, name, type, val)
#endif
#undef GET_ATTR
@@ -340,7 +340,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -359,7 +359,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ADDSI (* FLD (i_sr), FLD (f_simm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -378,7 +378,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -397,7 +397,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ANDSI (* FLD (i_sr), FLD (f_uimm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -416,7 +416,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ORSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -435,7 +435,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ORSI (* FLD (i_sr), FLD (f_uimm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -454,7 +454,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = XORSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -473,7 +473,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = XORSI (* FLD (i_sr), FLD (f_uimm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -492,7 +492,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -515,12 +515,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -544,12 +544,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -573,12 +573,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -601,7 +601,7 @@ if (CPU (h_cond)) {
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -626,7 +626,7 @@ if (CPU (h_cond)) {
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -651,7 +651,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -676,7 +676,7 @@ if (EQSI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -701,7 +701,7 @@ if (GESI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -726,7 +726,7 @@ if (GTSI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -751,7 +751,7 @@ if (LESI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -776,7 +776,7 @@ if (LTSI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -801,7 +801,7 @@ if (NESI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -825,12 +825,12 @@ do {
{
SI opval = ADDSI (ANDSI (pc, -4), 4);
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -853,12 +853,12 @@ do {
{
SI opval = ADDSI (pc, 4);
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -882,7 +882,7 @@ if (NOTBI (CPU (h_cond))) {
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -907,7 +907,7 @@ if (NOTBI (CPU (h_cond))) {
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -932,7 +932,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -955,7 +955,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
{
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
@@ -976,7 +976,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
{
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
@@ -996,7 +996,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
{
BI opval = LTSI (* FLD (i_src1), * FLD (i_src2));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef FLD
@@ -1015,7 +1015,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
{
BI opval = LTSI (* FLD (i_src2), FLD (f_simm16));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef FLD
@@ -1034,7 +1034,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
{
BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef FLD
@@ -1053,7 +1053,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
{
BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef FLD
@@ -1074,7 +1074,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = DIVSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1097,7 +1097,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = UDIVSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1120,7 +1120,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = MODSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1143,7 +1143,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = UMODSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1169,12 +1169,12 @@ do {
{
SI opval = temp0;
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = temp1;
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -1196,7 +1196,7 @@ do {
{
USI opval = ANDSI (* FLD (i_sr), -4);
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
@@ -1216,7 +1216,7 @@ do {
{
SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1235,7 +1235,7 @@ do {
{
SI opval = GETMEMSI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1254,7 +1254,7 @@ do {
{
SI opval = EXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1273,7 +1273,7 @@ do {
{
SI opval = EXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1292,7 +1292,7 @@ do {
{
SI opval = EXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1311,7 +1311,7 @@ do {
{
SI opval = EXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1330,7 +1330,7 @@ do {
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1349,7 +1349,7 @@ do {
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1368,7 +1368,7 @@ do {
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1387,7 +1387,7 @@ do {
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1410,12 +1410,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
SI opval = temp1;
* FLD (i_sr) = opval;
- TRACE_RESULT (current_cpu, "sr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
}
} while (0);
@@ -1435,7 +1435,7 @@ do {
{
SI opval = FLD (f_uimm24);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1454,7 +1454,7 @@ do {
{
SI opval = FLD (f_simm8);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1473,7 +1473,7 @@ do {
{
SI opval = FLD (f_simm16);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1493,12 +1493,12 @@ do {
{
BI opval = 1;
CPU (h_lock) = opval;
- TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
}
{
SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
} while (0);
@@ -1518,7 +1518,7 @@ do {
{
DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef FLD
@@ -1537,7 +1537,7 @@ do {
{
DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef FLD
@@ -1556,7 +1556,7 @@ do {
{
DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef FLD
@@ -1575,7 +1575,7 @@ do {
{
DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef FLD
@@ -1594,7 +1594,7 @@ do {
{
SI opval = MULSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1613,7 +1613,7 @@ do {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef FLD
@@ -1632,7 +1632,7 @@ do {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef FLD
@@ -1651,7 +1651,7 @@ do {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef FLD
@@ -1670,7 +1670,7 @@ do {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef FLD
@@ -1689,7 +1689,7 @@ do {
{
SI opval = * FLD (i_sr);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1708,7 +1708,7 @@ do {
{
SI opval = TRUNCDISI (SRADI (m32rbf_h_accum_get (current_cpu), 32));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1727,7 +1727,7 @@ do {
{
SI opval = TRUNCDISI (m32rbf_h_accum_get (current_cpu));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1746,7 +1746,7 @@ do {
{
SI opval = TRUNCDISI (SRADI (m32rbf_h_accum_get (current_cpu), 16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1765,7 +1765,7 @@ do {
{
SI opval = m32rbf_h_cr_get (current_cpu, FLD (f_r2));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1784,7 +1784,7 @@ do {
{
DI opval = ORDI (ANDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32));
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef FLD
@@ -1803,7 +1803,7 @@ do {
{
DI opval = ORDI (ANDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1)));
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef FLD
@@ -1822,7 +1822,7 @@ do {
{
USI opval = * FLD (i_sr);
m32rbf_h_cr_set (current_cpu, FLD (f_r1), opval);
- TRACE_RESULT (current_cpu, "dcr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval);
}
#undef FLD
@@ -1841,7 +1841,7 @@ do {
{
SI opval = NEGSI (* FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1875,7 +1875,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = INVSI (* FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1898,7 +1898,7 @@ do {
{
DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0xffff0000))) ? (MAKEDI (32767, 0xffff0000)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0xffff0000)));
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
} while (0);
@@ -1931,7 +1931,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083
{
DI opval = SRADI (SLLDI (tmp_tmp1, 7), 7);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
} while (0);
@@ -1953,22 +1953,22 @@ do {
{
USI opval = ANDSI (m32rbf_h_cr_get (current_cpu, ((UINT) 6)), -4);
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
{
USI opval = m32rbf_h_cr_get (current_cpu, ((UINT) 14));
m32rbf_h_cr_set (current_cpu, ((UINT) 6), opval);
- TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
m32rbf_h_psw_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
}
{
UQI opval = CPU (h_bbpsw);
CPU (h_bpsw) = opval;
- TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
}
} while (0);
@@ -1989,7 +1989,7 @@ do {
{
SI opval = SLLSI (FLD (f_hi16), 16);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2008,7 +2008,7 @@ do {
{
SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2027,7 +2027,7 @@ do {
{
SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2046,7 +2046,7 @@ do {
{
SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2065,7 +2065,7 @@ do {
{
SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2084,7 +2084,7 @@ do {
{
SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2103,7 +2103,7 @@ do {
{
SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2122,7 +2122,7 @@ do {
{
SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2141,7 +2141,7 @@ do {
{
SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2160,7 +2160,7 @@ do {
{
SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2179,7 +2179,7 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, * FLD (i_src2), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2198,7 +2198,7 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2217,7 +2217,7 @@ do {
{
QI opval = * FLD (i_src1);
SETMEMQI (current_cpu, * FLD (i_src2), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2236,7 +2236,7 @@ do {
{
QI opval = * FLD (i_src1);
SETMEMQI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2255,7 +2255,7 @@ do {
{
HI opval = * FLD (i_src1);
SETMEMHI (current_cpu, * FLD (i_src2), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2274,7 +2274,7 @@ do {
{
HI opval = * FLD (i_src1);
SETMEMHI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2296,12 +2296,12 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, tmp_new_src2, opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
SI opval = tmp_new_src2;
* FLD (i_src2) = opval;
- TRACE_RESULT (current_cpu, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
}
} while (0);
@@ -2324,12 +2324,12 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, tmp_new_src2, opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
SI opval = tmp_new_src2;
* FLD (i_src2) = opval;
- TRACE_RESULT (current_cpu, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
}
} while (0);
@@ -2349,7 +2349,7 @@ do {
{
SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2372,12 +2372,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -2401,12 +2401,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -2428,32 +2428,32 @@ do {
{
USI opval = m32rbf_h_cr_get (current_cpu, ((UINT) 6));
m32rbf_h_cr_set (current_cpu, ((UINT) 14), opval);
- TRACE_RESULT (current_cpu, "cr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval);
}
{
USI opval = ADDSI (pc, 4);
m32rbf_h_cr_set (current_cpu, ((UINT) 6), opval);
- TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
CPU (h_bbpsw) = opval;
- TRACE_RESULT (current_cpu, "bbpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bbpsw-0", 'x', opval);
}
{
UQI opval = m32rbf_h_psw_get (current_cpu);
CPU (h_bpsw) = opval;
- TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
}
{
UQI opval = ANDQI (m32rbf_h_psw_get (current_cpu), 128);
m32rbf_h_psw_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
}
{
SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4));
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -2477,13 +2477,13 @@ if (CPU (h_lock)) {
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, * FLD (i_src2), opval);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
}
{
BI opval = 0;
CPU (h_lock) = opval;
- TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
}
} while (0);
diff --git a/sim/m32r/sem.c b/sim/m32r/sem.c
index a08c88e..3ccb4db 100644
--- a/sim/m32r/sem.c
+++ b/sim/m32r/sem.c
@@ -194,7 +194,7 @@ SEM_FN_NAME (m32rbf,add) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -215,7 +215,7 @@ SEM_FN_NAME (m32rbf,add3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ADDSI (* FLD (i_sr), FLD (f_simm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -236,7 +236,7 @@ SEM_FN_NAME (m32rbf,and) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -257,7 +257,7 @@ SEM_FN_NAME (m32rbf,and3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ANDSI (* FLD (i_sr), FLD (f_uimm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -278,7 +278,7 @@ SEM_FN_NAME (m32rbf,or) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ORSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -299,7 +299,7 @@ SEM_FN_NAME (m32rbf,or3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ORSI (* FLD (i_sr), FLD (f_uimm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -320,7 +320,7 @@ SEM_FN_NAME (m32rbf,xor) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = XORSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -341,7 +341,7 @@ SEM_FN_NAME (m32rbf,xor3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = XORSI (* FLD (i_sr), FLD (f_uimm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -362,7 +362,7 @@ SEM_FN_NAME (m32rbf,addi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -387,12 +387,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -418,12 +418,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -449,12 +449,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -479,7 +479,7 @@ if (CPU (h_cond)) {
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -506,7 +506,7 @@ if (CPU (h_cond)) {
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -533,7 +533,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -560,7 +560,7 @@ if (EQSI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -587,7 +587,7 @@ if (GESI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -614,7 +614,7 @@ if (GTSI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -641,7 +641,7 @@ if (LESI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -668,7 +668,7 @@ if (LTSI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -695,7 +695,7 @@ if (NESI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -721,12 +721,12 @@ do {
{
SI opval = ADDSI (ANDSI (pc, -4), 4);
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -751,12 +751,12 @@ do {
{
SI opval = ADDSI (pc, 4);
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -782,7 +782,7 @@ if (NOTBI (CPU (h_cond))) {
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -809,7 +809,7 @@ if (NOTBI (CPU (h_cond))) {
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -836,7 +836,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -861,7 +861,7 @@ SEM_FN_NAME (m32rbf,bra8) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
@@ -884,7 +884,7 @@ SEM_FN_NAME (m32rbf,bra24) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
@@ -906,7 +906,7 @@ SEM_FN_NAME (m32rbf,cmp) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
BI opval = LTSI (* FLD (i_src1), * FLD (i_src2));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
return vpc;
@@ -927,7 +927,7 @@ SEM_FN_NAME (m32rbf,cmpi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
BI opval = LTSI (* FLD (i_src2), FLD (f_simm16));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
return vpc;
@@ -948,7 +948,7 @@ SEM_FN_NAME (m32rbf,cmpu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
return vpc;
@@ -969,7 +969,7 @@ SEM_FN_NAME (m32rbf,cmpui) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
return vpc;
@@ -992,7 +992,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = DIVSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1017,7 +1017,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = UDIVSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1042,7 +1042,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = MODSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1067,7 +1067,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = UMODSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1095,12 +1095,12 @@ do {
{
SI opval = temp0;
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = temp1;
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -1124,7 +1124,7 @@ SEM_FN_NAME (m32rbf,jmp) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
USI opval = ANDSI (* FLD (i_sr), -4);
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
@@ -1146,7 +1146,7 @@ SEM_FN_NAME (m32rbf,ld) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1167,7 +1167,7 @@ SEM_FN_NAME (m32rbf,ld_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = GETMEMSI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1188,7 +1188,7 @@ SEM_FN_NAME (m32rbf,ldb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = EXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1209,7 +1209,7 @@ SEM_FN_NAME (m32rbf,ldb_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = EXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1230,7 +1230,7 @@ SEM_FN_NAME (m32rbf,ldh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = EXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1251,7 +1251,7 @@ SEM_FN_NAME (m32rbf,ldh_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = EXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1272,7 +1272,7 @@ SEM_FN_NAME (m32rbf,ldub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1293,7 +1293,7 @@ SEM_FN_NAME (m32rbf,ldub_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1314,7 +1314,7 @@ SEM_FN_NAME (m32rbf,lduh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1335,7 +1335,7 @@ SEM_FN_NAME (m32rbf,lduh_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1360,12 +1360,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
SI opval = temp1;
* FLD (i_sr) = opval;
- TRACE_RESULT (current_cpu, "sr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
}
} while (0);
@@ -1387,7 +1387,7 @@ SEM_FN_NAME (m32rbf,ld24) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = FLD (f_uimm24);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1408,7 +1408,7 @@ SEM_FN_NAME (m32rbf,ldi8) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = FLD (f_simm8);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1429,7 +1429,7 @@ SEM_FN_NAME (m32rbf,ldi16) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = FLD (f_simm16);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1451,12 +1451,12 @@ do {
{
BI opval = 1;
CPU (h_lock) = opval;
- TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
}
{
SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
} while (0);
@@ -1478,7 +1478,7 @@ SEM_FN_NAME (m32rbf,machi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
return vpc;
@@ -1499,7 +1499,7 @@ SEM_FN_NAME (m32rbf,maclo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
return vpc;
@@ -1520,7 +1520,7 @@ SEM_FN_NAME (m32rbf,macwhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
return vpc;
@@ -1541,7 +1541,7 @@ SEM_FN_NAME (m32rbf,macwlo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
DI opval = SRADI (SLLDI (ADDDI (m32rbf_h_accum_get (current_cpu), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
return vpc;
@@ -1562,7 +1562,7 @@ SEM_FN_NAME (m32rbf,mul) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = MULSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1583,7 +1583,7 @@ SEM_FN_NAME (m32rbf,mulhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
return vpc;
@@ -1604,7 +1604,7 @@ SEM_FN_NAME (m32rbf,mullo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
return vpc;
@@ -1625,7 +1625,7 @@ SEM_FN_NAME (m32rbf,mulwhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
return vpc;
@@ -1646,7 +1646,7 @@ SEM_FN_NAME (m32rbf,mulwlo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 8), 8);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
return vpc;
@@ -1667,7 +1667,7 @@ SEM_FN_NAME (m32rbf,mv) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = * FLD (i_sr);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1688,7 +1688,7 @@ SEM_FN_NAME (m32rbf,mvfachi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = TRUNCDISI (SRADI (m32rbf_h_accum_get (current_cpu), 32));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1709,7 +1709,7 @@ SEM_FN_NAME (m32rbf,mvfaclo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = TRUNCDISI (m32rbf_h_accum_get (current_cpu));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1730,7 +1730,7 @@ SEM_FN_NAME (m32rbf,mvfacmi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = TRUNCDISI (SRADI (m32rbf_h_accum_get (current_cpu), 16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1751,7 +1751,7 @@ SEM_FN_NAME (m32rbf,mvfc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = m32rbf_h_cr_get (current_cpu, FLD (f_r2));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1772,7 +1772,7 @@ SEM_FN_NAME (m32rbf,mvtachi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
DI opval = ORDI (ANDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32));
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
return vpc;
@@ -1793,7 +1793,7 @@ SEM_FN_NAME (m32rbf,mvtaclo) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
DI opval = ORDI (ANDDI (m32rbf_h_accum_get (current_cpu), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1)));
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
return vpc;
@@ -1814,7 +1814,7 @@ SEM_FN_NAME (m32rbf,mvtc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
USI opval = * FLD (i_sr);
m32rbf_h_cr_set (current_cpu, FLD (f_r1), opval);
- TRACE_RESULT (current_cpu, "dcr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval);
}
return vpc;
@@ -1835,7 +1835,7 @@ SEM_FN_NAME (m32rbf,neg) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = NEGSI (* FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1873,7 +1873,7 @@ SEM_FN_NAME (m32rbf,not) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = INVSI (* FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -1898,7 +1898,7 @@ do {
{
DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0xffff0000))) ? (MAKEDI (32767, 0xffff0000)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0xffff0000)));
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
} while (0);
@@ -1933,7 +1933,7 @@ if (ANDIF (GEDI (tmp_tmp1, MAKEDI (8388608, 0)), LEDI (tmp_tmp1, MAKEDI (1676083
{
DI opval = SRADI (SLLDI (tmp_tmp1, 7), 7);
m32rbf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
} while (0);
@@ -1957,22 +1957,22 @@ do {
{
USI opval = ANDSI (m32rbf_h_cr_get (current_cpu, ((UINT) 6)), -4);
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
{
USI opval = m32rbf_h_cr_get (current_cpu, ((UINT) 14));
m32rbf_h_cr_set (current_cpu, ((UINT) 6), opval);
- TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
m32rbf_h_psw_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
}
{
UQI opval = CPU (h_bbpsw);
CPU (h_bpsw) = opval;
- TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
}
} while (0);
@@ -1995,7 +1995,7 @@ SEM_FN_NAME (m32rbf,seth) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SLLSI (FLD (f_hi16), 16);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -2016,7 +2016,7 @@ SEM_FN_NAME (m32rbf,sll) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -2037,7 +2037,7 @@ SEM_FN_NAME (m32rbf,sll3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -2058,7 +2058,7 @@ SEM_FN_NAME (m32rbf,slli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -2079,7 +2079,7 @@ SEM_FN_NAME (m32rbf,sra) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -2100,7 +2100,7 @@ SEM_FN_NAME (m32rbf,sra3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -2121,7 +2121,7 @@ SEM_FN_NAME (m32rbf,srai) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -2142,7 +2142,7 @@ SEM_FN_NAME (m32rbf,srl) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -2163,7 +2163,7 @@ SEM_FN_NAME (m32rbf,srl3) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -2184,7 +2184,7 @@ SEM_FN_NAME (m32rbf,srli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -2205,7 +2205,7 @@ SEM_FN_NAME (m32rbf,st) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, * FLD (i_src2), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
return vpc;
@@ -2226,7 +2226,7 @@ SEM_FN_NAME (m32rbf,st_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
return vpc;
@@ -2247,7 +2247,7 @@ SEM_FN_NAME (m32rbf,stb) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
QI opval = * FLD (i_src1);
SETMEMQI (current_cpu, * FLD (i_src2), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
return vpc;
@@ -2268,7 +2268,7 @@ SEM_FN_NAME (m32rbf,stb_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
QI opval = * FLD (i_src1);
SETMEMQI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
return vpc;
@@ -2289,7 +2289,7 @@ SEM_FN_NAME (m32rbf,sth) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
HI opval = * FLD (i_src1);
SETMEMHI (current_cpu, * FLD (i_src2), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
return vpc;
@@ -2310,7 +2310,7 @@ SEM_FN_NAME (m32rbf,sth_d) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
HI opval = * FLD (i_src1);
SETMEMHI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
return vpc;
@@ -2334,12 +2334,12 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, tmp_new_src2, opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
SI opval = tmp_new_src2;
* FLD (i_src2) = opval;
- TRACE_RESULT (current_cpu, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
}
} while (0);
@@ -2364,12 +2364,12 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, tmp_new_src2, opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
SI opval = tmp_new_src2;
* FLD (i_src2) = opval;
- TRACE_RESULT (current_cpu, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
}
} while (0);
@@ -2391,7 +2391,7 @@ SEM_FN_NAME (m32rbf,sub) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
{
SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
return vpc;
@@ -2416,12 +2416,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -2447,12 +2447,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -2476,32 +2476,32 @@ do {
{
USI opval = m32rbf_h_cr_get (current_cpu, ((UINT) 6));
m32rbf_h_cr_set (current_cpu, ((UINT) 14), opval);
- TRACE_RESULT (current_cpu, "cr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval);
}
{
USI opval = ADDSI (pc, 4);
m32rbf_h_cr_set (current_cpu, ((UINT) 6), opval);
- TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
CPU (h_bbpsw) = opval;
- TRACE_RESULT (current_cpu, "bbpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bbpsw-0", 'x', opval);
}
{
UQI opval = m32rbf_h_psw_get (current_cpu);
CPU (h_bpsw) = opval;
- TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
}
{
UQI opval = ANDQI (m32rbf_h_psw_get (current_cpu), 128);
m32rbf_h_psw_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
}
{
SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4));
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -2527,13 +2527,13 @@ if (CPU (h_lock)) {
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, * FLD (i_src2), opval);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
}
{
BI opval = 0;
CPU (h_lock) = opval;
- TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
}
} while (0);
diff --git a/sim/m32r/semx-switch.c b/sim/m32r/semx-switch.c
index 6ee1808..013abf1 100644
--- a/sim/m32r/semx-switch.c
+++ b/sim/m32r/semx-switch.c
@@ -333,7 +333,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#if FAST_P
#undef TRACE_RESULT
-#define TRACE_RESULT(cpu, name, type, val)
+#define TRACE_RESULT(cpu, abuf, name, type, val)
#endif
#undef GET_ATTR
@@ -512,7 +512,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -531,7 +531,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ADDSI (* FLD (i_sr), FLD (f_simm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -550,7 +550,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -569,7 +569,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ANDSI (* FLD (i_sr), FLD (f_uimm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -588,7 +588,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ORSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -607,7 +607,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ORSI (* FLD (i_sr), FLD (f_uimm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -626,7 +626,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = XORSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -645,7 +645,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = XORSI (* FLD (i_sr), FLD (f_uimm16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -664,7 +664,7 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -687,12 +687,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -716,12 +716,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -745,12 +745,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -773,7 +773,7 @@ if (CPU (h_cond)) {
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -798,7 +798,7 @@ if (CPU (h_cond)) {
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -823,7 +823,7 @@ if (EQSI (* FLD (i_src1), * FLD (i_src2))) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -848,7 +848,7 @@ if (EQSI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -873,7 +873,7 @@ if (GESI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -898,7 +898,7 @@ if (GTSI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -923,7 +923,7 @@ if (LESI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -948,7 +948,7 @@ if (LTSI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -973,7 +973,7 @@ if (NESI (* FLD (i_src2), 0)) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -997,12 +997,12 @@ do {
{
SI opval = ADDSI (ANDSI (pc, -4), 4);
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -1025,12 +1025,12 @@ do {
{
SI opval = ADDSI (pc, 4);
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -1055,13 +1055,13 @@ do {
SI opval = ADDSI (ANDSI (pc, -4), 4);
CPU (h_gr[((UINT) 14)]) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 4);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
}
@@ -1088,13 +1088,13 @@ do {
SI opval = ADDSI (pc, 4);
CPU (h_gr[((UINT) 14)]) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 4);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
}
@@ -1120,7 +1120,7 @@ if (NOTBI (CPU (h_cond))) {
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -1145,7 +1145,7 @@ if (NOTBI (CPU (h_cond))) {
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -1170,7 +1170,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
USI opval = FLD (f_disp16);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -1193,7 +1193,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
{
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
@@ -1214,7 +1214,7 @@ if (NESI (* FLD (i_src1), * FLD (i_src2))) {
{
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
@@ -1238,13 +1238,13 @@ do {
SI opval = ADDSI (ANDSI (pc, -4), 4);
CPU (h_gr[((UINT) 14)]) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp8);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 4);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
}
@@ -1271,13 +1271,13 @@ do {
SI opval = ADDSI (pc, 4);
CPU (h_gr[((UINT) 14)]) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp24);
SEM_BRANCH_VIA_CACHE (current_cpu, sem_arg, opval, vpc, SEM_BRANCH_ADDR_CACHE (sem_arg));
written |= (1 << 4);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
}
@@ -1300,7 +1300,7 @@ do {
{
BI opval = LTSI (* FLD (i_src1), * FLD (i_src2));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef FLD
@@ -1319,7 +1319,7 @@ do {
{
BI opval = LTSI (* FLD (i_src2), FLD (f_simm16));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef FLD
@@ -1338,7 +1338,7 @@ do {
{
BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef FLD
@@ -1357,7 +1357,7 @@ do {
{
BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef FLD
@@ -1376,7 +1376,7 @@ do {
{
BI opval = EQSI (* FLD (i_src1), * FLD (i_src2));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef FLD
@@ -1395,7 +1395,7 @@ do {
{
BI opval = EQSI (* FLD (i_src2), 0);
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef FLD
@@ -1416,7 +1416,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = DIVSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1439,7 +1439,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = UDIVSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1462,7 +1462,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = MODSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1485,7 +1485,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = UMODSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1508,7 +1508,7 @@ if (NESI (* FLD (i_sr), 0)) {
SI opval = DIVSI (EXTHISI (TRUNCSIHI (* FLD (i_dr))), * FLD (i_sr));
* FLD (i_dr) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
}
@@ -1532,7 +1532,7 @@ if (CPU (h_cond)) {
USI opval = ANDSI (* FLD (i_sr), -4);
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -1557,7 +1557,7 @@ if (NOTBI (CPU (h_cond))) {
USI opval = ANDSI (* FLD (i_sr), -4);
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -1584,12 +1584,12 @@ do {
{
SI opval = temp0;
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = temp1;
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -1611,7 +1611,7 @@ do {
{
USI opval = ANDSI (* FLD (i_sr), -4);
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
SEM_BRANCH_FINI
@@ -1631,7 +1631,7 @@ do {
{
SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1650,7 +1650,7 @@ do {
{
SI opval = GETMEMSI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1669,7 +1669,7 @@ do {
{
SI opval = EXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1688,7 +1688,7 @@ do {
{
SI opval = EXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1707,7 +1707,7 @@ do {
{
SI opval = EXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1726,7 +1726,7 @@ do {
{
SI opval = EXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1745,7 +1745,7 @@ do {
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1764,7 +1764,7 @@ do {
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1783,7 +1783,7 @@ do {
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1802,7 +1802,7 @@ do {
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1825,12 +1825,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
SI opval = temp1;
* FLD (i_sr) = opval;
- TRACE_RESULT (current_cpu, "sr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
}
} while (0);
@@ -1850,7 +1850,7 @@ do {
{
SI opval = FLD (f_uimm24);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1869,7 +1869,7 @@ do {
{
SI opval = FLD (f_simm8);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1888,7 +1888,7 @@ do {
{
SI opval = FLD (f_simm16);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -1908,12 +1908,12 @@ do {
{
BI opval = 1;
CPU (h_lock) = opval;
- TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
}
{
SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
} while (0);
@@ -1933,7 +1933,7 @@ do {
{
DI opval = SRADI (SLLDI (ADDDI (m32rxf_h_accums_get (current_cpu, FLD (f_acc)), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
m32rxf_h_accums_set (current_cpu, FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef FLD
@@ -1952,7 +1952,7 @@ do {
{
DI opval = SRADI (SLLDI (ADDDI (m32rxf_h_accums_get (current_cpu, FLD (f_acc)), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
m32rxf_h_accums_set (current_cpu, FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef FLD
@@ -1971,7 +1971,7 @@ do {
{
DI opval = ADDDI (m32rxf_h_accums_get (current_cpu, FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))));
m32rxf_h_accums_set (current_cpu, FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef FLD
@@ -1990,7 +1990,7 @@ do {
{
DI opval = ADDDI (m32rxf_h_accums_get (current_cpu, FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))));
m32rxf_h_accums_set (current_cpu, FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef FLD
@@ -2009,7 +2009,7 @@ do {
{
SI opval = MULSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2028,7 +2028,7 @@ do {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16);
m32rxf_h_accums_set (current_cpu, FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef FLD
@@ -2047,7 +2047,7 @@ do {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16);
m32rxf_h_accums_set (current_cpu, FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef FLD
@@ -2066,7 +2066,7 @@ do {
{
DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))));
m32rxf_h_accums_set (current_cpu, FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef FLD
@@ -2085,7 +2085,7 @@ do {
{
DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))));
m32rxf_h_accums_set (current_cpu, FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef FLD
@@ -2104,7 +2104,7 @@ do {
{
SI opval = * FLD (i_sr);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2123,7 +2123,7 @@ do {
{
SI opval = TRUNCDISI (SRADI (m32rxf_h_accums_get (current_cpu, FLD (f_accs)), 32));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2142,7 +2142,7 @@ do {
{
SI opval = TRUNCDISI (m32rxf_h_accums_get (current_cpu, FLD (f_accs)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2161,7 +2161,7 @@ do {
{
SI opval = TRUNCDISI (SRADI (m32rxf_h_accums_get (current_cpu, FLD (f_accs)), 16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2180,7 +2180,7 @@ do {
{
SI opval = m32rxf_h_cr_get (current_cpu, FLD (f_r2));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2199,7 +2199,7 @@ do {
{
DI opval = ORDI (ANDDI (m32rxf_h_accums_get (current_cpu, FLD (f_accs)), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32));
m32rxf_h_accums_set (current_cpu, FLD (f_accs), opval);
- TRACE_RESULT (current_cpu, "accs", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval);
}
#undef FLD
@@ -2218,7 +2218,7 @@ do {
{
DI opval = ORDI (ANDDI (m32rxf_h_accums_get (current_cpu, FLD (f_accs)), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1)));
m32rxf_h_accums_set (current_cpu, FLD (f_accs), opval);
- TRACE_RESULT (current_cpu, "accs", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval);
}
#undef FLD
@@ -2237,7 +2237,7 @@ do {
{
USI opval = * FLD (i_sr);
m32rxf_h_cr_set (current_cpu, FLD (f_r1), opval);
- TRACE_RESULT (current_cpu, "dcr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval);
}
#undef FLD
@@ -2256,7 +2256,7 @@ do {
{
SI opval = NEGSI (* FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2290,7 +2290,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = INVSI (* FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2313,7 +2313,7 @@ do {
{
DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0xffff0000))) ? (MAKEDI (32767, 0xffff0000)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0xffff0000)));
m32rxf_h_accums_set (current_cpu, FLD (f_accd), opval);
- TRACE_RESULT (current_cpu, "accd", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval);
}
} while (0);
@@ -2337,7 +2337,7 @@ do {
{
DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0))) ? (MAKEDI (32767, 0)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0)));
m32rxf_h_accums_set (current_cpu, FLD (f_accd), opval);
- TRACE_RESULT (current_cpu, "accd", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval);
}
} while (0);
@@ -2359,22 +2359,22 @@ do {
{
USI opval = ANDSI (m32rxf_h_cr_get (current_cpu, ((UINT) 6)), -4);
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
{
USI opval = m32rxf_h_cr_get (current_cpu, ((UINT) 14));
m32rxf_h_cr_set (current_cpu, ((UINT) 6), opval);
- TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
m32rxf_h_psw_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
}
{
UQI opval = CPU (h_bbpsw);
CPU (h_bpsw) = opval;
- TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
}
} while (0);
@@ -2395,7 +2395,7 @@ do {
{
SI opval = SLLSI (FLD (f_hi16), 16);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2414,7 +2414,7 @@ do {
{
SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2433,7 +2433,7 @@ do {
{
SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2452,7 +2452,7 @@ do {
{
SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2471,7 +2471,7 @@ do {
{
SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2490,7 +2490,7 @@ do {
{
SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2509,7 +2509,7 @@ do {
{
SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2528,7 +2528,7 @@ do {
{
SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2547,7 +2547,7 @@ do {
{
SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2566,7 +2566,7 @@ do {
{
SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2585,7 +2585,7 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, * FLD (i_src2), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2604,7 +2604,7 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2623,7 +2623,7 @@ do {
{
QI opval = * FLD (i_src1);
SETMEMQI (current_cpu, * FLD (i_src2), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2642,7 +2642,7 @@ do {
{
QI opval = * FLD (i_src1);
SETMEMQI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2661,7 +2661,7 @@ do {
{
HI opval = * FLD (i_src1);
SETMEMHI (current_cpu, * FLD (i_src2), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2680,7 +2680,7 @@ do {
{
HI opval = * FLD (i_src1);
SETMEMHI (current_cpu, ADDSI (* FLD (i_src2), FLD (f_simm16)), opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef FLD
@@ -2702,12 +2702,12 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, tmp_new_src2, opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
SI opval = tmp_new_src2;
* FLD (i_src2) = opval;
- TRACE_RESULT (current_cpu, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
}
} while (0);
@@ -2730,12 +2730,12 @@ do {
{
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, tmp_new_src2, opval);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
SI opval = tmp_new_src2;
* FLD (i_src2) = opval;
- TRACE_RESULT (current_cpu, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
}
} while (0);
@@ -2755,7 +2755,7 @@ do {
{
SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2778,12 +2778,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -2807,12 +2807,12 @@ do {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -2834,32 +2834,32 @@ do {
{
USI opval = m32rxf_h_cr_get (current_cpu, ((UINT) 6));
m32rxf_h_cr_set (current_cpu, ((UINT) 14), opval);
- TRACE_RESULT (current_cpu, "cr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval);
}
{
USI opval = ADDSI (pc, 4);
m32rxf_h_cr_set (current_cpu, ((UINT) 6), opval);
- TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
CPU (h_bbpsw) = opval;
- TRACE_RESULT (current_cpu, "bbpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bbpsw-0", 'x', opval);
}
{
UQI opval = m32rxf_h_psw_get (current_cpu);
CPU (h_bpsw) = opval;
- TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
}
{
UQI opval = ANDQI (m32rxf_h_psw_get (current_cpu), 128);
m32rxf_h_psw_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
}
{
SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4));
SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, opval, vpc);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -2883,13 +2883,13 @@ if (CPU (h_lock)) {
SI opval = * FLD (i_src1);
SETMEMSI (current_cpu, * FLD (i_src2), opval);
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
}
{
BI opval = 0;
CPU (h_lock) = opval;
- TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
}
} while (0);
@@ -2910,7 +2910,7 @@ if (CPU (h_lock)) {
{
SI opval = (GESI (* FLD (i_sr), 127)) ? (127) : (LESI (* FLD (i_sr), -128)) ? (-128) : (* FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2929,7 +2929,7 @@ if (CPU (h_lock)) {
{
SI opval = (GESI (* FLD (i_sr), 32767)) ? (32767) : (LESI (* FLD (i_sr), -32768)) ? (-32768) : (* FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2948,7 +2948,7 @@ if (CPU (h_lock)) {
{
SI opval = ((CPU (h_cond)) ? (((LTSI (* FLD (i_sr), 0)) ? (2147483647) : (0x80000000))) : (* FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef FLD
@@ -2967,7 +2967,7 @@ if (CPU (h_lock)) {
{
BI opval = (EQSI (ANDSI (* FLD (i_src2), 255), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 65280), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 16711680), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 0xff000000), 0)) ? (1) : (0);
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef FLD
@@ -2986,7 +2986,7 @@ if (CPU (h_lock)) {
{
DI opval = ADDDI (SRADI (m32rxf_h_accums_get (current_cpu, ((UINT) 1)), 16), m32rxf_h_accums_get (current_cpu, ((UINT) 0)));
m32rxf_h_accums_set (current_cpu, ((UINT) 0), opval);
- TRACE_RESULT (current_cpu, "accums-0", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums-0", 'D', opval);
}
#undef FLD
@@ -3005,7 +3005,7 @@ if (CPU (h_lock)) {
{
DI opval = SRADI (SLLDI (ADDDI (m32rxf_h_accums_get (current_cpu, ((UINT) 1)), MULDI (EXTSIDI (* FLD (i_src1)), EXTSIDI (ANDSI (* FLD (i_src2), 65535)))), 8), 8);
m32rxf_h_accums_set (current_cpu, ((UINT) 1), opval);
- TRACE_RESULT (current_cpu, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval);
}
#undef FLD
@@ -3024,7 +3024,7 @@ if (CPU (h_lock)) {
{
DI opval = SRADI (SLLDI (SUBDI (m32rxf_h_accum_get (current_cpu), SRADI (SLLDI (MULDI (EXTHIDI (TRUNCSIHI (* FLD (i_src1))), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 32), 16)), 8), 8);
m32rxf_h_accum_set (current_cpu, opval);
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef FLD
@@ -3043,7 +3043,7 @@ if (CPU (h_lock)) {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTSIDI (ANDSI (* FLD (i_src2), 65535))), 16), 16);
m32rxf_h_accums_set (current_cpu, ((UINT) 1), opval);
- TRACE_RESULT (current_cpu, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval);
}
#undef FLD
@@ -3062,7 +3062,7 @@ if (CPU (h_lock)) {
{
DI opval = SRADI (SLLDI (ADDDI (m32rxf_h_accums_get (current_cpu, ((UINT) 1)), SLLDI (EXTSIDI (MULSI (EXTHISI (TRUNCSIHI (* FLD (i_src1))), SRASI (* FLD (i_src2), 16))), 16)), 8), 8);
m32rxf_h_accums_set (current_cpu, ((UINT) 1), opval);
- TRACE_RESULT (current_cpu, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval);
}
#undef FLD
@@ -3120,7 +3120,7 @@ SEM_SKIP_INSN (current_cpu, 1);
{
SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -3158,7 +3158,7 @@ SEM_SKIP_INSN (current_cpu, 1);
{
SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -3196,7 +3196,7 @@ SEM_SKIP_INSN (current_cpu, 1);
{
SI opval = ORSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -3234,7 +3234,7 @@ SEM_SKIP_INSN (current_cpu, 1);
{
SI opval = XORSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -3272,7 +3272,7 @@ SEM_SKIP_INSN (current_cpu, 1);
{
SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -3314,12 +3314,12 @@ do {
{
SI opval = temp0;
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -3363,12 +3363,12 @@ do {
{
SI opval = temp0;
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -3410,7 +3410,7 @@ if (CPU (h_cond)) {
USI opval = FLD (f_disp8);
OPRND (pc) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -3456,12 +3456,12 @@ do {
{
SI opval = ADDSI (ANDSI (pc, -4), 4);
OPRND (h_gr_14) = opval;
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp8);
OPRND (pc) = opval;
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -3506,13 +3506,13 @@ do {
SI opval = ADDSI (ANDSI (pc, -4), 4);
OPRND (h_gr_14) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp8);
OPRND (pc) = opval;
written |= (1 << 4);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
}
@@ -3564,7 +3564,7 @@ if (NOTBI (CPU (h_cond))) {
USI opval = FLD (f_disp8);
OPRND (pc) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -3609,7 +3609,7 @@ if (NOTBI (CPU (h_cond))) {
{
USI opval = FLD (f_disp8);
OPRND (pc) = opval;
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
#undef OPRND
@@ -3652,13 +3652,13 @@ do {
SI opval = ADDSI (ANDSI (pc, -4), 4);
OPRND (h_gr_14) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = FLD (f_disp8);
OPRND (pc) = opval;
written |= (1 << 4);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
}
@@ -3708,7 +3708,7 @@ do {
{
BI opval = LTSI (* FLD (i_src1), * FLD (i_src2));
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef OPRND
@@ -3746,7 +3746,7 @@ do {
{
BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2));
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef OPRND
@@ -3784,7 +3784,7 @@ do {
{
BI opval = EQSI (* FLD (i_src1), * FLD (i_src2));
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef OPRND
@@ -3822,7 +3822,7 @@ do {
{
BI opval = EQSI (* FLD (i_src2), 0);
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef OPRND
@@ -3862,7 +3862,7 @@ if (CPU (h_cond)) {
USI opval = ANDSI (* FLD (i_sr), -4);
OPRND (pc) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -3909,7 +3909,7 @@ if (NOTBI (CPU (h_cond))) {
USI opval = ANDSI (* FLD (i_sr), -4);
OPRND (pc) = opval;
written |= (1 << 2);
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
}
@@ -3958,12 +3958,12 @@ do {
{
SI opval = temp0;
OPRND (h_gr_14) = opval;
- TRACE_RESULT (current_cpu, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
}
{
USI opval = temp1;
OPRND (pc) = opval;
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -4005,7 +4005,7 @@ do {
{
USI opval = ANDSI (* FLD (i_sr), -4);
OPRND (pc) = opval;
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
#undef OPRND
@@ -4045,7 +4045,7 @@ do {
{
SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4083,7 +4083,7 @@ do {
{
SI opval = EXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4121,7 +4121,7 @@ do {
{
SI opval = EXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4159,7 +4159,7 @@ do {
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, * FLD (i_sr)));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4197,7 +4197,7 @@ do {
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, * FLD (i_sr)));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4239,12 +4239,12 @@ do {
{
SI opval = temp0;
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
SI opval = temp1;
OPRND (sr) = opval;
- TRACE_RESULT (current_cpu, "sr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
}
} while (0);
@@ -4284,7 +4284,7 @@ do {
{
SI opval = FLD (f_simm8);
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4323,12 +4323,12 @@ do {
{
BI opval = 1;
OPRND (h_lock_0) = opval;
- TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
}
{
SI opval = GETMEMSI (current_cpu, * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
} while (0);
@@ -4368,7 +4368,7 @@ do {
{
DI opval = SRADI (SLLDI (ADDDI (m32rxf_h_accums_get (current_cpu, FLD (f_acc)), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef OPRND
@@ -4406,7 +4406,7 @@ do {
{
DI opval = SRADI (SLLDI (ADDDI (m32rxf_h_accums_get (current_cpu, FLD (f_acc)), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef OPRND
@@ -4444,7 +4444,7 @@ do {
{
DI opval = ADDDI (m32rxf_h_accums_get (current_cpu, FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))));
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef OPRND
@@ -4482,7 +4482,7 @@ do {
{
DI opval = ADDDI (m32rxf_h_accums_get (current_cpu, FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))));
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef OPRND
@@ -4520,7 +4520,7 @@ do {
{
SI opval = MULSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4558,7 +4558,7 @@ do {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16);
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef OPRND
@@ -4596,7 +4596,7 @@ do {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16);
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef OPRND
@@ -4634,7 +4634,7 @@ do {
{
DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))));
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef OPRND
@@ -4672,7 +4672,7 @@ do {
{
DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))));
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
}
#undef OPRND
@@ -4710,7 +4710,7 @@ do {
{
SI opval = * FLD (i_sr);
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4748,7 +4748,7 @@ do {
{
SI opval = TRUNCDISI (SRADI (m32rxf_h_accums_get (current_cpu, FLD (f_accs)), 32));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4786,7 +4786,7 @@ do {
{
SI opval = TRUNCDISI (m32rxf_h_accums_get (current_cpu, FLD (f_accs)));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4824,7 +4824,7 @@ do {
{
SI opval = TRUNCDISI (SRADI (m32rxf_h_accums_get (current_cpu, FLD (f_accs)), 16));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4862,7 +4862,7 @@ do {
{
SI opval = m32rxf_h_cr_get (current_cpu, FLD (f_r2));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -4900,7 +4900,7 @@ do {
{
DI opval = ORDI (ANDDI (m32rxf_h_accums_get (current_cpu, FLD (f_accs)), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32));
OPRND (accs) = opval;
- TRACE_RESULT (current_cpu, "accs", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval);
}
#undef OPRND
@@ -4938,7 +4938,7 @@ do {
{
DI opval = ORDI (ANDDI (m32rxf_h_accums_get (current_cpu, FLD (f_accs)), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1)));
OPRND (accs) = opval;
- TRACE_RESULT (current_cpu, "accs", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval);
}
#undef OPRND
@@ -4976,7 +4976,7 @@ do {
{
USI opval = * FLD (i_sr);
OPRND (dcr) = opval;
- TRACE_RESULT (current_cpu, "dcr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval);
}
#undef OPRND
@@ -5014,7 +5014,7 @@ do {
{
SI opval = NEGSI (* FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -5085,7 +5085,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = INVSI (* FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -5127,7 +5127,7 @@ do {
{
DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0xffff0000))) ? (MAKEDI (32767, 0xffff0000)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0xffff0000)));
OPRND (accd) = opval;
- TRACE_RESULT (current_cpu, "accd", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval);
}
} while (0);
@@ -5170,7 +5170,7 @@ do {
{
DI opval = (GTDI (tmp_tmp1, MAKEDI (32767, 0))) ? (MAKEDI (32767, 0)) : (LTDI (tmp_tmp1, MAKEDI (0xffff8000, 0))) ? (MAKEDI (0xffff8000, 0)) : (ANDDI (tmp_tmp1, MAKEDI (0xffffffff, 0)));
OPRND (accd) = opval;
- TRACE_RESULT (current_cpu, "accd", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval);
}
} while (0);
@@ -5210,22 +5210,22 @@ do {
{
USI opval = ANDSI (m32rxf_h_cr_get (current_cpu, ((UINT) 6)), -4);
OPRND (pc) = opval;
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
{
USI opval = m32rxf_h_cr_get (current_cpu, ((UINT) 14));
OPRND (h_cr_6) = opval;
- TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
OPRND (h_psw_0) = opval;
- TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
}
{
UQI opval = CPU (h_bbpsw);
OPRND (h_bpsw_0) = opval;
- TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
}
} while (0);
@@ -5269,7 +5269,7 @@ do {
{
SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -5307,7 +5307,7 @@ do {
{
SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -5345,7 +5345,7 @@ do {
{
SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -5383,7 +5383,7 @@ do {
{
SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -5421,7 +5421,7 @@ do {
{
SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -5459,7 +5459,7 @@ do {
{
SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -5498,7 +5498,7 @@ do {
SI opval = * FLD (i_src1);
OPRND (h_memory_src2_idx) = * FLD (i_src2);
OPRND (h_memory_src2) = opval;
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef OPRND
@@ -5537,7 +5537,7 @@ do {
QI opval = * FLD (i_src1);
OPRND (h_memory_src2_idx) = * FLD (i_src2);
OPRND (h_memory_src2) = opval;
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef OPRND
@@ -5576,7 +5576,7 @@ do {
HI opval = * FLD (i_src1);
OPRND (h_memory_src2_idx) = * FLD (i_src2);
OPRND (h_memory_src2) = opval;
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
#undef OPRND
@@ -5618,12 +5618,12 @@ do {
SI opval = * FLD (i_src1);
OPRND (h_memory_new_src2_idx) = tmp_new_src2;
OPRND (h_memory_new_src2) = opval;
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
SI opval = tmp_new_src2;
OPRND (src2) = opval;
- TRACE_RESULT (current_cpu, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
}
} while (0);
@@ -5667,12 +5667,12 @@ do {
SI opval = * FLD (i_src1);
OPRND (h_memory_new_src2_idx) = tmp_new_src2;
OPRND (h_memory_new_src2) = opval;
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
{
SI opval = tmp_new_src2;
OPRND (src2) = opval;
- TRACE_RESULT (current_cpu, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
}
} while (0);
@@ -5712,7 +5712,7 @@ do {
{
SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
#undef OPRND
@@ -5754,12 +5754,12 @@ do {
{
SI opval = temp0;
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -5803,12 +5803,12 @@ do {
{
SI opval = temp0;
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
}
{
BI opval = temp1;
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
} while (0);
@@ -5849,32 +5849,32 @@ do {
{
USI opval = m32rxf_h_cr_get (current_cpu, ((UINT) 6));
OPRND (h_cr_14) = opval;
- TRACE_RESULT (current_cpu, "cr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval);
}
{
USI opval = ADDSI (pc, 4);
OPRND (h_cr_6) = opval;
- TRACE_RESULT (current_cpu, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
OPRND (h_bbpsw_0) = opval;
- TRACE_RESULT (current_cpu, "bbpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bbpsw-0", 'x', opval);
}
{
UQI opval = m32rxf_h_psw_get (current_cpu);
OPRND (h_bpsw_0) = opval;
- TRACE_RESULT (current_cpu, "bpsw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "bpsw-0", 'x', opval);
}
{
UQI opval = ANDQI (m32rxf_h_psw_get (current_cpu), 128);
OPRND (h_psw_0) = opval;
- TRACE_RESULT (current_cpu, "psw-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "psw-0", 'x', opval);
}
{
SI opval = m32r_trap (current_cpu, pc, FLD (f_uimm4));
OPRND (pc) = opval;
- TRACE_RESULT (current_cpu, "pc", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "pc", 'x', opval);
}
} while (0);
@@ -5924,13 +5924,13 @@ if (CPU (h_lock)) {
OPRND (h_memory_src2_idx) = * FLD (i_src2);
OPRND (h_memory_src2) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, "memory", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval);
}
}
{
BI opval = 0;
OPRND (h_lock_0) = opval;
- TRACE_RESULT (current_cpu, "lock-0", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "lock-0", 'x', opval);
}
} while (0);
@@ -5974,7 +5974,7 @@ if (CPU (h_lock)) {
{
BI opval = (EQSI (ANDSI (* FLD (i_src2), 255), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 65280), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 16711680), 0)) ? (1) : (EQSI (ANDSI (* FLD (i_src2), 0xff000000), 0)) ? (1) : (0);
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
}
#undef OPRND
@@ -6012,7 +6012,7 @@ if (CPU (h_lock)) {
{
DI opval = ADDDI (SRADI (m32rxf_h_accums_get (current_cpu, ((UINT) 1)), 16), m32rxf_h_accums_get (current_cpu, ((UINT) 0)));
OPRND (h_accums_0) = opval;
- TRACE_RESULT (current_cpu, "accums-0", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums-0", 'D', opval);
}
#undef OPRND
@@ -6050,7 +6050,7 @@ if (CPU (h_lock)) {
{
DI opval = SRADI (SLLDI (ADDDI (m32rxf_h_accums_get (current_cpu, ((UINT) 1)), MULDI (EXTSIDI (* FLD (i_src1)), EXTSIDI (ANDSI (* FLD (i_src2), 65535)))), 8), 8);
OPRND (h_accums_1) = opval;
- TRACE_RESULT (current_cpu, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval);
}
#undef OPRND
@@ -6088,7 +6088,7 @@ if (CPU (h_lock)) {
{
DI opval = SRADI (SLLDI (SUBDI (m32rxf_h_accum_get (current_cpu), SRADI (SLLDI (MULDI (EXTHIDI (TRUNCSIHI (* FLD (i_src1))), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 32), 16)), 8), 8);
OPRND (accum) = opval;
- TRACE_RESULT (current_cpu, "accum", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accum", 'D', opval);
}
#undef OPRND
@@ -6126,7 +6126,7 @@ if (CPU (h_lock)) {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTSIDI (ANDSI (* FLD (i_src2), 65535))), 16), 16);
OPRND (h_accums_1) = opval;
- TRACE_RESULT (current_cpu, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval);
}
#undef OPRND
@@ -6164,7 +6164,7 @@ if (CPU (h_lock)) {
{
DI opval = SRADI (SLLDI (ADDDI (m32rxf_h_accums_get (current_cpu, ((UINT) 1)), SLLDI (EXTSIDI (MULSI (EXTHISI (TRUNCSIHI (* FLD (i_src1))), SRASI (* FLD (i_src2), 16))), 16)), 8), 8);
OPRND (h_accums_1) = opval;
- TRACE_RESULT (current_cpu, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval);
}
#undef OPRND
diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index 923465f..03f06b9 100644
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@@ -1,19 +1,19 @@
/* Main header for the m32r. */
+#ifndef SIM_MAIN_H
+#define SIM_MAIN_H
+
#define USING_SIM_BASE_H /* FIXME: quick hack */
struct _sim_cpu; /* FIXME: should be in sim-basics.h */
typedef struct _sim_cpu SIM_CPU;
-/* sim-basics.h includes config.h but cgen-types.h must be included before
- sim-basics.h and cgen-types.h needs config.h. */
-#include "config.h"
-
#include "ansidecl.h"
#include "symcat.h"
+#include "sim-basics.h"
#include "cgen-types.h"
+#include "cpu-opc.h"
#include "arch.h"
-#include "sim-basics.h"
/* These must be defined before sim-base.h. */
typedef USI sim_cia;
@@ -23,11 +23,7 @@ typedef USI sim_cia;
#include "sim-base.h"
#include "cgen-sim.h"
-#include "cgen-scache.h"
-#include "cgen-cpu.h"
-#include "cgen-trace.h"
#include "cpu-sim.h"
-#include "cpuall.h"
/* The _sim_cpu struct. */
@@ -78,3 +74,5 @@ m32r_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), \
/* Default memory size. */
#define M32R_DEFAULT_MEM_SIZE 0x800000 /* 8M */
+
+#endif /* SIM_MAIN_H */
generated by cgit v1.1 at 2024-12-16 23:52:31 +0000