summaryrefslogtreecommitdiff
path: root/sim/m32r/semx-switch.c
diff options
context:
space:
mode:
Diffstat (limited to 'sim/m32r/semx-switch.c')
-rw-r--r--sim/m32r/semx-switch.c338
1 files changed, 171 insertions, 167 deletions
diff --git a/sim/m32r/semx-switch.c b/sim/m32r/semx-switch.c
index 5f184c8a361..dff0aed1686 100644
--- a/sim/m32r/semx-switch.c
+++ b/sim/m32r/semx-switch.c
@@ -2,7 +2,7 @@
THIS FILE IS MACHINE GENERATED WITH CGEN.
-Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU Simulators.
@@ -339,7 +339,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#endif
#undef GET_ATTR
+#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_##attr)
+#else
+#define GET_ATTR(cpu, num, attr) CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_/**/attr)
+#endif
{
@@ -520,7 +524,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -539,7 +543,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -558,7 +562,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -577,7 +581,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -596,7 +600,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -615,7 +619,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -634,7 +638,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -653,7 +657,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -672,7 +676,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -695,12 +699,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
}
@@ -724,12 +728,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
}
@@ -753,12 +757,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case)
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
}
@@ -1005,7 +1009,7 @@ if (NESI (* FLD (i_src2), 0)) {
{
SI opval = ADDSI (ANDSI (pc, -4), 4);
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = FLD (i_disp8);
@@ -1033,7 +1037,7 @@ if (NESI (* FLD (i_src2), 0)) {
{
SI opval = ADDSI (pc, 4);
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = FLD (i_disp24);
@@ -1063,7 +1067,7 @@ if (CPU (h_cond)) {
SI opval = ADDSI (ANDSI (pc, -4), 4);
CPU (h_gr[((UINT) 14)]) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = FLD (i_disp8);
@@ -1096,7 +1100,7 @@ if (CPU (h_cond)) {
SI opval = ADDSI (pc, 4);
CPU (h_gr[((UINT) 14)]) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = FLD (i_disp24);
@@ -1246,7 +1250,7 @@ if (NOTBI (CPU (h_cond))) {
SI opval = ADDSI (ANDSI (pc, -4), 4);
CPU (h_gr[((UINT) 14)]) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = FLD (i_disp8);
@@ -1279,7 +1283,7 @@ if (NOTBI (CPU (h_cond))) {
SI opval = ADDSI (pc, 4);
CPU (h_gr[((UINT) 14)]) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = FLD (i_disp24);
@@ -1308,7 +1312,7 @@ if (NOTBI (CPU (h_cond))) {
{
BI opval = LTSI (* FLD (i_src1), * FLD (i_src2));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef FLD
@@ -1327,7 +1331,7 @@ if (NOTBI (CPU (h_cond))) {
{
BI opval = LTSI (* FLD (i_src2), FLD (f_simm16));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef FLD
@@ -1346,7 +1350,7 @@ if (NOTBI (CPU (h_cond))) {
{
BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef FLD
@@ -1365,7 +1369,7 @@ if (NOTBI (CPU (h_cond))) {
{
BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef FLD
@@ -1384,7 +1388,7 @@ if (NOTBI (CPU (h_cond))) {
{
BI opval = EQSI (* FLD (i_src1), * FLD (i_src2));
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef FLD
@@ -1403,7 +1407,7 @@ if (NOTBI (CPU (h_cond))) {
{
BI opval = EQSI (* FLD (i_src2), 0);
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef FLD
@@ -1424,7 +1428,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -1447,7 +1451,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -1470,7 +1474,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -1493,7 +1497,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -1516,7 +1520,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -1592,7 +1596,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = temp0;
CPU (h_gr[((UINT) 14)]) = opval;
- TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = temp1;
@@ -1639,7 +1643,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1658,7 +1662,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = GETMEMSI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1677,7 +1681,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = EXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1696,7 +1700,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = EXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1715,7 +1719,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = EXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1734,7 +1738,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = EXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1753,7 +1757,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1772,7 +1776,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1791,7 +1795,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1810,7 +1814,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1833,12 +1837,12 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
SI opval = temp1;
* FLD (i_sr) = opval;
- TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -1858,7 +1862,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = FLD (i_uimm24);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1877,7 +1881,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = FLD (f_simm8);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1896,7 +1900,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = FLD (f_simm16);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -1921,7 +1925,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -1941,7 +1945,7 @@ if (NOTBI (CPU (h_cond))) {
{
DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))))), 8), 8);
SET_H_ACCUMS (FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -1960,7 +1964,7 @@ if (NOTBI (CPU (h_cond))) {
{
DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
SET_H_ACCUMS (FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -1979,7 +1983,7 @@ if (NOTBI (CPU (h_cond))) {
{
DI opval = ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))));
SET_H_ACCUMS (FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -1998,7 +2002,7 @@ if (NOTBI (CPU (h_cond))) {
{
DI opval = ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))));
SET_H_ACCUMS (FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -2017,7 +2021,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = MULSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2036,7 +2040,7 @@ if (NOTBI (CPU (h_cond))) {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (ANDSI (* FLD (i_src1), 0xffff0000)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))), 16), 16);
SET_H_ACCUMS (FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -2055,7 +2059,7 @@ if (NOTBI (CPU (h_cond))) {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))), 16), 16);
SET_H_ACCUMS (FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -2074,7 +2078,7 @@ if (NOTBI (CPU (h_cond))) {
{
DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))));
SET_H_ACCUMS (FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -2093,7 +2097,7 @@ if (NOTBI (CPU (h_cond))) {
{
DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))));
SET_H_ACCUMS (FLD (f_acc), opval);
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -2112,7 +2116,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = * FLD (i_sr);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2131,7 +2135,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = TRUNCDISI (SRADI (GET_H_ACCUMS (FLD (f_accs)), 32));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2150,7 +2154,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = TRUNCDISI (GET_H_ACCUMS (FLD (f_accs)));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2169,7 +2173,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = TRUNCDISI (SRADI (GET_H_ACCUMS (FLD (f_accs)), 16));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2188,7 +2192,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = GET_H_CR (FLD (f_r2));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2207,7 +2211,7 @@ if (NOTBI (CPU (h_cond))) {
{
DI opval = ORDI (ANDDI (GET_H_ACCUMS (FLD (f_accs)), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32));
SET_H_ACCUMS (FLD (f_accs), opval);
- TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -2226,7 +2230,7 @@ if (NOTBI (CPU (h_cond))) {
{
DI opval = ORDI (ANDDI (GET_H_ACCUMS (FLD (f_accs)), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1)));
SET_H_ACCUMS (FLD (f_accs), opval);
- TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -2245,7 +2249,7 @@ if (NOTBI (CPU (h_cond))) {
{
USI opval = * FLD (i_sr);
SET_H_CR (FLD (f_r1), opval);
- TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval);
}
#undef FLD
@@ -2264,7 +2268,7 @@ if (NOTBI (CPU (h_cond))) {
{
SI opval = NEGSI (* FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2298,7 +2302,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = INVSI (* FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2321,7 +2325,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
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)));
SET_H_ACCUMS (FLD (f_accd), opval);
- TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
}
@@ -2345,7 +2349,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
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)));
SET_H_ACCUMS (FLD (f_accd), opval);
- TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
}
@@ -2372,7 +2376,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
USI opval = GET_H_CR (((UINT) 14));
SET_H_CR (((UINT) 6), opval);
- TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
@@ -2403,7 +2407,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = SLLSI (FLD (f_hi16), 16);
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2422,7 +2426,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2441,7 +2445,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = SLLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2460,7 +2464,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2479,7 +2483,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2498,7 +2502,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = SRASI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2517,7 +2521,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2536,7 +2540,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2555,7 +2559,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = SRLSI (* FLD (i_sr), ANDSI (FLD (f_simm16), 31));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2574,7 +2578,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2715,7 +2719,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = tmp_new_src2;
* FLD (i_src2) = opval;
- TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -2743,7 +2747,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = tmp_new_src2;
* FLD (i_src2) = opval;
- TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -2763,7 +2767,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr));
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2786,12 +2790,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
}
@@ -2815,12 +2819,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
SI opval = temp0;
* FLD (i_dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
BI opval = temp1;
CPU (h_cond) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
}
@@ -2842,12 +2846,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr);
{
USI opval = GET_H_CR (((UINT) 6));
SET_H_CR (((UINT) 14), opval);
- TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval);
}
{
USI opval = ADDSI (pc, 4);
SET_H_CR (((UINT) 6), opval);
- TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
@@ -2918,7 +2922,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2937,7 +2941,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2956,7 +2960,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, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef FLD
@@ -2975,7 +2979,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, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef FLD
@@ -2994,7 +2998,7 @@ if (CPU (h_lock)) {
{
DI opval = ADDDI (SRADI (GET_H_ACCUMS (((UINT) 1)), 16), GET_H_ACCUMS (((UINT) 0)));
SET_H_ACCUMS (((UINT) 0), opval);
- TRACE_RESULT (current_cpu, abuf, "accums-0", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -3013,7 +3017,7 @@ if (CPU (h_lock)) {
{
DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (((UINT) 1)), MULDI (EXTSIDI (* FLD (i_src1)), EXTSIDI (ANDSI (* FLD (i_src2), 65535)))), 8), 8);
SET_H_ACCUMS (((UINT) 1), opval);
- TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -3051,7 +3055,7 @@ if (CPU (h_lock)) {
{
DI opval = SRADI (SLLDI (MULDI (EXTSIDI (* FLD (i_src1)), EXTSIDI (ANDSI (* FLD (i_src2), 65535))), 16), 16);
SET_H_ACCUMS (((UINT) 1), opval);
- TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -3070,7 +3074,7 @@ if (CPU (h_lock)) {
{
DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (((UINT) 1)), SLLDI (EXTSIDI (MULSI (EXTHISI (TRUNCSIHI (* FLD (i_src1))), SRASI (* FLD (i_src2), 16))), 16)), 8), 8);
SET_H_ACCUMS (((UINT) 1), opval);
- TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef FLD
@@ -3122,7 +3126,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond))))
{
SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -3160,7 +3164,7 @@ CASE (sem, INSN_WRITE_ADD) : /* add $dr,$sr */
{
SI opval = ANDSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -3198,7 +3202,7 @@ CASE (sem, INSN_WRITE_AND) : /* and $dr,$sr */
{
SI opval = ORSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -3236,7 +3240,7 @@ CASE (sem, INSN_WRITE_OR) : /* or $dr,$sr */
{
SI opval = XORSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -3274,7 +3278,7 @@ CASE (sem, INSN_WRITE_XOR) : /* xor $dr,$sr */
{
SI opval = ADDSI (* FLD (i_dr), FLD (f_simm8));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -3316,12 +3320,12 @@ CASE (sem, INSN_WRITE_ADDI) : /* addi $dr,$simm8 */
{
SI opval = temp0;
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
BI opval = temp1;
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
}
@@ -3365,12 +3369,12 @@ CASE (sem, INSN_WRITE_ADDV) : /* addv $dr,$sr */
{
SI opval = temp0;
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
BI opval = temp1;
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
}
@@ -3458,7 +3462,7 @@ CASE (sem, INSN_WRITE_BC8) : /* bc.s $disp8 */
{
SI opval = ADDSI (ANDSI (pc, -4), 4);
OPRND (h_gr_14) = opval;
- TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = FLD (i_disp8);
@@ -3508,7 +3512,7 @@ if (CPU (h_cond)) {
SI opval = ADDSI (ANDSI (pc, -4), 4);
OPRND (h_gr_14) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = FLD (i_disp8);
@@ -3654,7 +3658,7 @@ if (NOTBI (CPU (h_cond))) {
SI opval = ADDSI (ANDSI (pc, -4), 4);
OPRND (h_gr_14) = opval;
written |= (1 << 3);
- TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = FLD (i_disp8);
@@ -3710,7 +3714,7 @@ CASE (sem, INSN_WRITE_BNCL8) : /* bncl.s $disp8 */
{
BI opval = LTSI (* FLD (i_src1), * FLD (i_src2));
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef OPRND
@@ -3748,7 +3752,7 @@ CASE (sem, INSN_WRITE_CMP) : /* cmp $src1,$src2 */
{
BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2));
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef OPRND
@@ -3786,7 +3790,7 @@ CASE (sem, INSN_WRITE_CMPU) : /* cmpu $src1,$src2 */
{
BI opval = EQSI (* FLD (i_src1), * FLD (i_src2));
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef OPRND
@@ -3824,7 +3828,7 @@ CASE (sem, INSN_WRITE_CMPEQ) : /* cmpeq $src1,$src2 */
{
BI opval = EQSI (* FLD (i_src2), 0);
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef OPRND
@@ -3960,7 +3964,7 @@ CASE (sem, INSN_WRITE_JNC) : /* jnc $sr */
{
SI opval = temp0;
OPRND (h_gr_14) = opval;
- TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
USI opval = temp1;
@@ -4047,7 +4051,7 @@ CASE (sem, INSN_WRITE_JMP) : /* jmp $sr */
{
SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4085,7 +4089,7 @@ CASE (sem, INSN_WRITE_LD) : /* ld $dr,@$sr */
{
SI opval = EXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr)));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4123,7 +4127,7 @@ CASE (sem, INSN_WRITE_LDB) : /* ldb $dr,@$sr */
{
SI opval = EXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr)));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4161,7 +4165,7 @@ CASE (sem, INSN_WRITE_LDH) : /* ldh $dr,@$sr */
{
SI opval = ZEXTQISI (GETMEMQI (current_cpu, pc, * FLD (i_sr)));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4199,7 +4203,7 @@ CASE (sem, INSN_WRITE_LDUB) : /* ldub $dr,@$sr */
{
SI opval = ZEXTHISI (GETMEMHI (current_cpu, pc, * FLD (i_sr)));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4241,12 +4245,12 @@ CASE (sem, INSN_WRITE_LDUH) : /* lduh $dr,@$sr */
{
SI opval = temp0;
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
SI opval = temp1;
OPRND (sr) = opval;
- TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -4286,7 +4290,7 @@ CASE (sem, INSN_WRITE_LD_PLUS) : /* ld $dr,@$sr+ */
{
SI opval = FLD (f_simm8);
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4330,7 +4334,7 @@ CASE (sem, INSN_WRITE_LDI8) : /* ldi8 $dr,$simm8 */
{
SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -4370,7 +4374,7 @@ CASE (sem, INSN_WRITE_LOCK) : /* lock $dr,@$sr */
{
DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (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, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -4408,7 +4412,7 @@ CASE (sem, INSN_WRITE_MACHI_A) : /* machi $src1,$src2,$acc */
{
DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (SLLSI (* FLD (i_src1), 16)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))))), 8), 8);
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -4446,7 +4450,7 @@ CASE (sem, INSN_WRITE_MACLO_A) : /* maclo $src1,$src2,$acc */
{
DI opval = ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16)))));
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -4484,7 +4488,7 @@ CASE (sem, INSN_WRITE_MACWHI_A) : /* macwhi $src1,$src2,$acc */
{
DI opval = ADDDI (GET_H_ACCUMS (FLD (f_acc)), MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2)))));
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -4522,7 +4526,7 @@ CASE (sem, INSN_WRITE_MACWLO_A) : /* macwlo $src1,$src2,$acc */
{
SI opval = MULSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4560,7 +4564,7 @@ CASE (sem, INSN_WRITE_MUL) : /* mul $dr,$sr */
{
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, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -4598,7 +4602,7 @@ CASE (sem, INSN_WRITE_MULHI_A) : /* mulhi $src1,$src2,$acc */
{
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, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -4636,7 +4640,7 @@ CASE (sem, INSN_WRITE_MULLO_A) : /* mullo $src1,$src2,$acc */
{
DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (SRASI (* FLD (i_src2), 16))));
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -4674,7 +4678,7 @@ CASE (sem, INSN_WRITE_MULWHI_A) : /* mulwhi $src1,$src2,$acc */
{
DI opval = MULDI (EXTSIDI (* FLD (i_src1)), EXTHIDI (TRUNCSIHI (* FLD (i_src2))));
OPRND (acc) = opval;
- TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -4712,7 +4716,7 @@ CASE (sem, INSN_WRITE_MULWLO_A) : /* mulwlo $src1,$src2,$acc */
{
SI opval = * FLD (i_sr);
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4750,7 +4754,7 @@ CASE (sem, INSN_WRITE_MV) : /* mv $dr,$sr */
{
SI opval = TRUNCDISI (SRADI (GET_H_ACCUMS (FLD (f_accs)), 32));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4788,7 +4792,7 @@ CASE (sem, INSN_WRITE_MVFACHI_A) : /* mvfachi $dr,$accs */
{
SI opval = TRUNCDISI (GET_H_ACCUMS (FLD (f_accs)));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4826,7 +4830,7 @@ CASE (sem, INSN_WRITE_MVFACLO_A) : /* mvfaclo $dr,$accs */
{
SI opval = TRUNCDISI (SRADI (GET_H_ACCUMS (FLD (f_accs)), 16));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4864,7 +4868,7 @@ CASE (sem, INSN_WRITE_MVFACMI_A) : /* mvfacmi $dr,$accs */
{
SI opval = GET_H_CR (FLD (f_r2));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -4902,7 +4906,7 @@ CASE (sem, INSN_WRITE_MVFC) : /* mvfc $dr,$scr */
{
DI opval = ORDI (ANDDI (GET_H_ACCUMS (FLD (f_accs)), MAKEDI (0, 0xffffffff)), SLLDI (EXTSIDI (* FLD (i_src1)), 32));
OPRND (accs) = opval;
- TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -4940,7 +4944,7 @@ CASE (sem, INSN_WRITE_MVTACHI_A) : /* mvtachi $src1,$accs */
{
DI opval = ORDI (ANDDI (GET_H_ACCUMS (FLD (f_accs)), MAKEDI (0xffffffff, 0)), ZEXTSIDI (* FLD (i_src1)));
OPRND (accs) = opval;
- TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -4978,7 +4982,7 @@ CASE (sem, INSN_WRITE_MVTACLO_A) : /* mvtaclo $src1,$accs */
{
USI opval = * FLD (i_sr);
OPRND (dcr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval);
}
#undef OPRND
@@ -5016,7 +5020,7 @@ CASE (sem, INSN_WRITE_MVTC) : /* mvtc $sr,$dcr */
{
SI opval = NEGSI (* FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -5087,7 +5091,7 @@ CASE (sem, INSN_WRITE_NOP) : /* nop */
{
SI opval = INVSI (* FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -5129,7 +5133,7 @@ CASE (sem, INSN_WRITE_NOT) : /* not $dr,$sr */
{
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, abuf, "accd", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
}
@@ -5172,7 +5176,7 @@ CASE (sem, INSN_WRITE_RAC_DSI) : /* rac $accd,$accs,$imm1 */
{
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, abuf, "accd", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
}
@@ -5217,7 +5221,7 @@ CASE (sem, INSN_WRITE_RACH_DSI) : /* rach $accd,$accs,$imm1 */
{
USI opval = GET_H_CR (((UINT) 14));
OPRND (h_cr_6) = opval;
- TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
@@ -5271,7 +5275,7 @@ CASE (sem, INSN_WRITE_RTE) : /* rte */
{
SI opval = SLLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -5309,7 +5313,7 @@ CASE (sem, INSN_WRITE_SLL) : /* sll $dr,$sr */
{
SI opval = SLLSI (* FLD (i_dr), FLD (f_uimm5));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -5347,7 +5351,7 @@ CASE (sem, INSN_WRITE_SLLI) : /* slli $dr,$uimm5 */
{
SI opval = SRASI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -5385,7 +5389,7 @@ CASE (sem, INSN_WRITE_SRA) : /* sra $dr,$sr */
{
SI opval = SRASI (* FLD (i_dr), FLD (f_uimm5));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -5423,7 +5427,7 @@ CASE (sem, INSN_WRITE_SRAI) : /* srai $dr,$uimm5 */
{
SI opval = SRLSI (* FLD (i_dr), ANDSI (* FLD (i_sr), 31));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -5461,7 +5465,7 @@ CASE (sem, INSN_WRITE_SRL) : /* srl $dr,$sr */
{
SI opval = SRLSI (* FLD (i_dr), FLD (f_uimm5));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -5625,7 +5629,7 @@ CASE (sem, INSN_WRITE_STH) : /* sth $src1,@$src2 */
{
SI opval = tmp_new_src2;
OPRND (src2) = opval;
- TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -5674,7 +5678,7 @@ CASE (sem, INSN_WRITE_ST_PLUS) : /* st $src1,@+$src2 */
{
SI opval = tmp_new_src2;
OPRND (src2) = opval;
- TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
}
@@ -5714,7 +5718,7 @@ CASE (sem, INSN_WRITE_ST_MINUS) : /* st $src1,@-$src2 */
{
SI opval = SUBSI (* FLD (i_dr), * FLD (i_sr));
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
#undef OPRND
@@ -5756,12 +5760,12 @@ CASE (sem, INSN_WRITE_SUB) : /* sub $dr,$sr */
{
SI opval = temp0;
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
BI opval = temp1;
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
}
@@ -5805,12 +5809,12 @@ CASE (sem, INSN_WRITE_SUBV) : /* subv $dr,$sr */
{
SI opval = temp0;
OPRND (dr) = opval;
- TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
}
{
BI opval = temp1;
OPRND (condbit) = opval;
- TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
}
@@ -5851,12 +5855,12 @@ CASE (sem, INSN_WRITE_SUBX) : /* subx $dr,$sr */
{
USI opval = GET_H_CR (((UINT) 6));
OPRND (h_cr_14) = opval;
- TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval);
}
{
USI opval = ADDSI (pc, 4);
OPRND (h_cr_6) = opval;
- TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval);
}
{
UQI opval = CPU (h_bpsw);
@@ -5976,7 +5980,7 @@ CASE (sem, INSN_WRITE_UNLOCK) : /* unlock $src1,@$src2 */
{
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, abuf, "condbit", 'x', opval);
+ TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval);
}
#undef OPRND
@@ -6014,7 +6018,7 @@ CASE (sem, INSN_WRITE_PCMPBZ) : /* pcmpbz $src2 */
{
DI opval = ADDDI (SRADI (GET_H_ACCUMS (((UINT) 1)), 16), GET_H_ACCUMS (((UINT) 0)));
OPRND (h_accums_0) = opval;
- TRACE_RESULT (current_cpu, abuf, "accums-0", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -6052,7 +6056,7 @@ CASE (sem, INSN_WRITE_SADD) : /* sadd */
{
DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (((UINT) 1)), MULDI (EXTSIDI (* FLD (i_src1)), EXTSIDI (ANDSI (* FLD (i_src2), 65535)))), 8), 8);
OPRND (h_accums_1) = opval;
- TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -6128,7 +6132,7 @@ CASE (sem, INSN_WRITE_MSBLO) : /* msblo $src1,$src2 */
{
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, abuf, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND
@@ -6166,7 +6170,7 @@ CASE (sem, INSN_WRITE_MULWU1) : /* mulwu1 $src1,$src2 */
{
DI opval = SRADI (SLLDI (ADDDI (GET_H_ACCUMS (((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, abuf, "accums-1", 'D', opval);
+ TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval);
}
#undef OPRND