diff options
Diffstat (limited to 'sim/m32r/semx-switch.c')
| -rw-r--r-- | sim/m32r/semx-switch.c | 889 |
1 files changed, 251 insertions, 638 deletions
diff --git a/sim/m32r/semx-switch.c b/sim/m32r/semx-switch.c index fa95074c8e1..a68d18bbf6d 100644 --- a/sim/m32r/semx-switch.c +++ b/sim/m32r/semx-switch.c @@ -2,22 +2,23 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. -This file is part of the GNU simulators. +This file is part of the GNU Simulators. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3 of the License, or -(at your option) any later version. +the Free Software Foundation; either version 2, or (at your option) +any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -139,8 +140,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. { M32RXF_INSN_STH, && case_sem_INSN_STH }, { M32RXF_INSN_STH_D, && case_sem_INSN_STH_D }, { M32RXF_INSN_ST_PLUS, && case_sem_INSN_ST_PLUS }, - { M32RXF_INSN_STH_PLUS, && case_sem_INSN_STH_PLUS }, - { M32RXF_INSN_STB_PLUS, && case_sem_INSN_STB_PLUS }, { M32RXF_INSN_ST_MINUS, && case_sem_INSN_ST_MINUS }, { M32RXF_INSN_SUB, && case_sem_INSN_SUB }, { M32RXF_INSN_SUBV, && case_sem_INSN_SUBV }, @@ -158,11 +157,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. { M32RXF_INSN_MACLH1, && case_sem_INSN_MACLH1 }, { M32RXF_INSN_SC, && case_sem_INSN_SC }, { M32RXF_INSN_SNC, && case_sem_INSN_SNC }, - { M32RXF_INSN_CLRPSW, && case_sem_INSN_CLRPSW }, - { M32RXF_INSN_SETPSW, && case_sem_INSN_SETPSW }, - { M32RXF_INSN_BSET, && case_sem_INSN_BSET }, - { M32RXF_INSN_BCLR, && case_sem_INSN_BCLR }, - { M32RXF_INSN_BTST, && case_sem_INSN_BTST }, { M32RXF_INSN_PAR_ADD, && case_sem_INSN_PAR_ADD }, { M32RXF_INSN_WRITE_ADD, && case_sem_INSN_WRITE_ADD }, { M32RXF_INSN_PAR_AND, && case_sem_INSN_PAR_AND }, @@ -287,10 +281,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. { M32RXF_INSN_WRITE_STH, && case_sem_INSN_WRITE_STH }, { M32RXF_INSN_PAR_ST_PLUS, && case_sem_INSN_PAR_ST_PLUS }, { M32RXF_INSN_WRITE_ST_PLUS, && case_sem_INSN_WRITE_ST_PLUS }, - { M32RXF_INSN_PAR_STH_PLUS, && case_sem_INSN_PAR_STH_PLUS }, - { M32RXF_INSN_WRITE_STH_PLUS, && case_sem_INSN_WRITE_STH_PLUS }, - { M32RXF_INSN_PAR_STB_PLUS, && case_sem_INSN_PAR_STB_PLUS }, - { M32RXF_INSN_WRITE_STB_PLUS, && case_sem_INSN_WRITE_STB_PLUS }, { M32RXF_INSN_PAR_ST_MINUS, && case_sem_INSN_PAR_ST_MINUS }, { M32RXF_INSN_WRITE_ST_MINUS, && case_sem_INSN_WRITE_ST_MINUS }, { M32RXF_INSN_PAR_SUB, && case_sem_INSN_PAR_SUB }, @@ -319,12 +309,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. { M32RXF_INSN_WRITE_SC, && case_sem_INSN_WRITE_SC }, { M32RXF_INSN_PAR_SNC, && case_sem_INSN_PAR_SNC }, { M32RXF_INSN_WRITE_SNC, && case_sem_INSN_WRITE_SNC }, - { M32RXF_INSN_PAR_CLRPSW, && case_sem_INSN_PAR_CLRPSW }, - { M32RXF_INSN_WRITE_CLRPSW, && case_sem_INSN_WRITE_CLRPSW }, - { M32RXF_INSN_PAR_SETPSW, && case_sem_INSN_PAR_SETPSW }, - { M32RXF_INSN_WRITE_SETPSW, && case_sem_INSN_WRITE_SETPSW }, - { M32RXF_INSN_PAR_BTST, && case_sem_INSN_PAR_BTST }, - { M32RXF_INSN_WRITE_BTST, && case_sem_INSN_WRITE_BTST }, { 0, 0 } }; int i; @@ -355,11 +339,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 { @@ -510,16 +490,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { #if WITH_SCACHE_PBB_M32RXF -#if defined DEFINE_SWITCH || defined FAST_P +#ifdef DEFINE_SWITCH /* In the switch case FAST_P is a constant, allowing several optimizations in any called inline functions. */ vpc = m32rxf_pbb_begin (current_cpu, FAST_P); #else -#if 0 /* cgen engine can't handle dynamic fast/full switching yet. */ vpc = m32rxf_pbb_begin (current_cpu, STATE_RUN_FAST_P (CPU_STATE (current_cpu))); -#else - vpc = m32rxf_pbb_begin (current_cpu, 0); -#endif #endif #endif } @@ -540,7 +516,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -559,7 +535,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -578,7 +554,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -597,7 +573,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -616,7 +592,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -635,7 +611,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -654,7 +630,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -673,7 +649,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -692,7 +668,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -715,12 +691,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } } @@ -744,12 +720,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } } @@ -773,12 +749,12 @@ SWITCH (sem, SEM_ARGBUF (vpc) -> semantic.sem_case) { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } } @@ -1025,7 +1001,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", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { USI opval = FLD (i_disp8); @@ -1053,7 +1029,7 @@ if (NESI (* FLD (i_src2), 0)) { { SI opval = ADDSI (pc, 4); CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { USI opval = FLD (i_disp24); @@ -1083,7 +1059,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", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { USI opval = FLD (i_disp8); @@ -1116,7 +1092,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", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { USI opval = FLD (i_disp24); @@ -1266,7 +1242,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", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { USI opval = FLD (i_disp8); @@ -1299,7 +1275,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", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { USI opval = FLD (i_disp24); @@ -1328,7 +1304,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef FLD @@ -1347,7 +1323,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef FLD @@ -1366,7 +1342,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTUSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef FLD @@ -1385,7 +1361,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = LTUSI (* FLD (i_src2), FLD (f_simm16)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef FLD @@ -1404,7 +1380,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = EQSI (* FLD (i_src1), * FLD (i_src2)); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef FLD @@ -1423,7 +1399,7 @@ if (NOTBI (CPU (h_cond))) { { BI opval = EQSI (* FLD (i_src2), 0); CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef FLD @@ -1444,7 +1420,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } @@ -1467,7 +1443,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } @@ -1490,7 +1466,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } @@ -1513,7 +1489,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } @@ -1536,7 +1512,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } @@ -1549,7 +1525,7 @@ if (NESI (* FLD (i_sr), 0)) { { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_jl.f +#define FLD(f) abuf->fields.sfmt_mvtc.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; SEM_BRANCH_INIT @@ -1574,7 +1550,7 @@ if (CPU (h_cond)) { { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_jl.f +#define FLD(f) abuf->fields.sfmt_mvtc.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; SEM_BRANCH_INIT @@ -1612,7 +1588,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = temp0; CPU (h_gr[((UINT) 14)]) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { USI opval = temp1; @@ -1630,7 +1606,7 @@ if (NOTBI (CPU (h_cond))) { { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_jl.f +#define FLD(f) abuf->fields.sfmt_mvtc.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; SEM_BRANCH_INIT @@ -1659,7 +1635,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1678,7 +1654,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1697,7 +1673,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1716,7 +1692,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1735,7 +1711,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1754,7 +1730,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1773,7 +1749,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1792,7 +1768,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1811,7 +1787,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1830,7 +1806,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1853,12 +1829,12 @@ if (NOTBI (CPU (h_cond))) { { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { SI opval = temp1; * FLD (i_sr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } } @@ -1878,7 +1854,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (i_uimm24); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1897,7 +1873,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (f_simm8); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1916,7 +1892,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = FLD (f_simm16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -1941,7 +1917,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } @@ -1961,7 +1937,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef FLD @@ -1980,7 +1956,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef FLD @@ -1999,7 +1975,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef FLD @@ -2018,7 +1994,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef FLD @@ -2037,7 +2013,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = MULSI (* FLD (i_dr), * FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2056,7 +2032,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef FLD @@ -2075,7 +2051,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef FLD @@ -2094,7 +2070,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef FLD @@ -2113,7 +2089,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef FLD @@ -2132,7 +2108,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = * FLD (i_sr); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2151,7 +2127,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2170,7 +2146,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = TRUNCDISI (GET_H_ACCUMS (FLD (f_accs))); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2189,7 +2165,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2200,7 +2176,7 @@ if (NOTBI (CPU (h_cond))) { { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_ld_plus.f +#define FLD(f) abuf->fields.sfmt_mvfc.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 2); @@ -2208,7 +2184,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = GET_H_CR (FLD (f_r2)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2227,7 +2203,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval); } #undef FLD @@ -2246,7 +2222,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval); } #undef FLD @@ -2257,7 +2233,7 @@ if (NOTBI (CPU (h_cond))) { { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_ld_plus.f +#define FLD(f) abuf->fields.sfmt_mvtc.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 2); @@ -2265,7 +2241,7 @@ if (NOTBI (CPU (h_cond))) { { USI opval = * FLD (i_sr); SET_H_CR (FLD (f_r1), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval); } #undef FLD @@ -2284,7 +2260,7 @@ if (NOTBI (CPU (h_cond))) { { SI opval = NEGSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2318,7 +2294,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = INVSI (* FLD (i_sr)); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2341,7 +2317,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval); } } @@ -2365,7 +2341,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval); } } @@ -2392,7 +2368,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", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); } { UQI opval = CPU (h_bpsw); @@ -2423,7 +2399,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = SLLSI (FLD (f_hi16), 16); * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2442,7 +2418,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2461,7 +2437,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2480,7 +2456,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2499,7 +2475,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2518,7 +2494,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2537,7 +2513,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2556,7 +2532,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2575,7 +2551,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2594,7 +2570,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2735,63 +2711,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); - } -} - -#undef FLD -} - NEXT (vpc); - - CASE (sem, INSN_STH_PLUS) : /* sth $src1,@$src2+ */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_st_plus.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 2); - -{ - HI tmp_new_src2; - { - HI opval = * FLD (i_src1); - SETMEMHI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); - } - tmp_new_src2 = ADDSI (* FLD (i_src2), 2); - { - SI opval = tmp_new_src2; - * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); - } -} - -#undef FLD -} - NEXT (vpc); - - CASE (sem, INSN_STB_PLUS) : /* stb $src1,@$src2+ */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_st_plus.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 2); - -{ - QI tmp_new_src2; - { - QI opval = * FLD (i_src1); - SETMEMQI (current_cpu, pc, tmp_new_src2, opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); - } - tmp_new_src2 = ADDSI (* FLD (i_src2), 1); - { - SI opval = tmp_new_src2; - * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); } } @@ -2819,7 +2739,7 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = tmp_new_src2; * FLD (i_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); } } @@ -2839,7 +2759,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -2862,12 +2782,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } } @@ -2891,12 +2811,12 @@ PROFILE_COUNT_FILLNOPS (current_cpu, abuf->addr); { SI opval = temp0; * FLD (i_dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = temp1; CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } } @@ -2918,12 +2838,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", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval); } { USI opval = ADDSI (pc, 4); SET_H_CR (((UINT) 6), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); } { UQI opval = CPU (h_bpsw); @@ -2994,7 +2914,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -3013,7 +2933,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -3032,7 +2952,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef FLD @@ -3051,7 +2971,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, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef FLD @@ -3070,7 +2990,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", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums-0", 'D', opval); } #undef FLD @@ -3089,7 +3009,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", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); } #undef FLD @@ -3127,7 +3047,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", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); } #undef FLD @@ -3146,7 +3066,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", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); } #undef FLD @@ -3185,101 +3105,6 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) } NEXT (vpc); - CASE (sem, INSN_CLRPSW) : /* clrpsw $uimm8 */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_clrpsw.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 2); - - { - SI opval = ANDSI (GET_H_CR (((UINT) 0)), ORSI (INVBI (FLD (f_uimm8)), 65280)); - SET_H_CR (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); - } - -#undef FLD -} - NEXT (vpc); - - CASE (sem, INSN_SETPSW) : /* setpsw $uimm8 */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_clrpsw.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 2); - - { - SI opval = FLD (f_uimm8); - SET_H_CR (((UINT) 0), opval); - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); - } - -#undef FLD -} - NEXT (vpc); - - CASE (sem, INSN_BSET) : /* bset $uimm3,@($slo16,$sr) */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_bset.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 4); - - { - QI opval = ORQI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))), SLLSI (1, SUBSI (7, FLD (f_uimm3)))); - SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); - } - -#undef FLD -} - NEXT (vpc); - - CASE (sem, INSN_BCLR) : /* bclr $uimm3,@($slo16,$sr) */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_bset.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 4); - - { - QI opval = ANDQI (GETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16))), INVQI (SLLSI (1, SUBSI (7, FLD (f_uimm3))))); - SETMEMQI (current_cpu, pc, ADDSI (* FLD (i_sr), FLD (f_simm16)), opval); - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); - } - -#undef FLD -} - NEXT (vpc); - - CASE (sem, INSN_BTST) : /* btst $uimm3,$sr */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_bset.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 2); - - { - BI opval = ANDQI (SRLSI (* FLD (i_sr), SUBSI (7, FLD (f_uimm3))), 1); - CPU (h_cond) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); - } - -#undef FLD -} - NEXT (vpc); - CASE (sem, INSN_PAR_ADD) : /* add $dr,$sr */ { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); @@ -3293,7 +3118,7 @@ if (ZEXTBISI (NOTBI (CPU (h_cond)))) { SI opval = ADDSI (* FLD (i_dr), * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -3331,7 +3156,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -3369,7 +3194,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -3407,7 +3232,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -3445,7 +3270,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -3487,12 +3312,12 @@ CASE (sem, INSN_WRITE_ADDI) : /* addi $dr,$simm8 */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } } @@ -3536,12 +3361,12 @@ CASE (sem, INSN_WRITE_ADDV) : /* addv $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } } @@ -3628,8 +3453,8 @@ CASE (sem, INSN_WRITE_BC8) : /* bc.s $disp8 */ { { SI opval = ADDSI (ANDSI (pc, -4), 4); - OPRND (h_gr_SI_14) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + OPRND (h_gr_14) = opval; + TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { USI opval = FLD (i_disp8); @@ -3654,7 +3479,7 @@ CASE (sem, INSN_WRITE_BL8) : /* bl.s $disp8 */ SEM_BRANCH_INIT vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - CPU (h_gr[((UINT) 14)]) = OPRND (h_gr_SI_14); + CPU (h_gr[((UINT) 14)]) = OPRND (h_gr_14); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, OPRND (pc), vpc); SEM_BRANCH_FINI (vpc); @@ -3677,9 +3502,9 @@ if (CPU (h_cond)) { { { SI opval = ADDSI (ANDSI (pc, -4), 4); - OPRND (h_gr_SI_14) = opval; + OPRND (h_gr_14) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { USI opval = FLD (i_disp8); @@ -3709,7 +3534,7 @@ CASE (sem, INSN_WRITE_BCL8) : /* bcl.s $disp8 */ if (written & (1 << 3)) { - CPU (h_gr[((UINT) 14)]) = OPRND (h_gr_SI_14); + CPU (h_gr[((UINT) 14)]) = OPRND (h_gr_14); } if (written & (1 << 4)) { @@ -3823,9 +3648,9 @@ if (NOTBI (CPU (h_cond))) { { { SI opval = ADDSI (ANDSI (pc, -4), 4); - OPRND (h_gr_SI_14) = opval; + OPRND (h_gr_14) = opval; written |= (1 << 3); - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { USI opval = FLD (i_disp8); @@ -3855,7 +3680,7 @@ CASE (sem, INSN_WRITE_BNCL8) : /* bncl.s $disp8 */ if (written & (1 << 3)) { - CPU (h_gr[((UINT) 14)]) = OPRND (h_gr_SI_14); + CPU (h_gr[((UINT) 14)]) = OPRND (h_gr_14); } if (written & (1 << 4)) { @@ -3881,7 +3706,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, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef OPRND @@ -3919,7 +3744,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, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef OPRND @@ -3957,7 +3782,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, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef OPRND @@ -3995,7 +3820,7 @@ CASE (sem, INSN_WRITE_CMPEQ) : /* cmpeq $src1,$src2 */ { BI opval = EQSI (* FLD (i_src2), 0); OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef OPRND @@ -4024,7 +3849,7 @@ CASE (sem, INSN_WRITE_CMPZ) : /* cmpz $src2 */ { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_jl.f +#define FLD(f) abuf->fields.sfmt_mvtc.f #define OPRND(f) par_exec->operands.sfmt_jc.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; @@ -4049,7 +3874,7 @@ CASE (sem, INSN_WRITE_JC) : /* jc $sr */ { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; -#define FLD(f) abuf->fields.sfmt_jl.f +#define FLD(f) abuf->fields.sfmt_mvtc.f #define OPRND(f) par_exec->operands.sfmt_jc.f int UNUSED written = abuf->written; IADDR UNUSED pc = abuf->addr; @@ -4071,7 +3896,7 @@ CASE (sem, INSN_WRITE_JC) : /* jc $sr */ { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_jl.f +#define FLD(f) abuf->fields.sfmt_mvtc.f #define OPRND(f) par_exec->operands.sfmt_jc.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; @@ -4096,7 +3921,7 @@ CASE (sem, INSN_WRITE_JNC) : /* jnc $sr */ { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; -#define FLD(f) abuf->fields.sfmt_jl.f +#define FLD(f) abuf->fields.sfmt_mvtc.f #define OPRND(f) par_exec->operands.sfmt_jc.f int UNUSED written = abuf->written; IADDR UNUSED pc = abuf->addr; @@ -4130,8 +3955,8 @@ CASE (sem, INSN_WRITE_JNC) : /* jnc $sr */ temp1 = ANDSI (* FLD (i_sr), -4); { SI opval = temp0; - OPRND (h_gr_SI_14) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + OPRND (h_gr_14) = opval; + TRACE_RESULT (current_cpu, abuf, "gr-14", 'x', opval); } { USI opval = temp1; @@ -4156,7 +3981,7 @@ CASE (sem, INSN_WRITE_JL) : /* jl $sr */ SEM_BRANCH_INIT vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - CPU (h_gr[((UINT) 14)]) = OPRND (h_gr_SI_14); + CPU (h_gr[((UINT) 14)]) = OPRND (h_gr_14); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, OPRND (pc), vpc); SEM_BRANCH_FINI (vpc); @@ -4169,7 +3994,7 @@ CASE (sem, INSN_WRITE_JL) : /* jl $sr */ { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_jl.f +#define FLD(f) abuf->fields.sfmt_mvtc.f #define OPRND(f) par_exec->operands.sfmt_jmp.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; @@ -4190,7 +4015,7 @@ CASE (sem, INSN_WRITE_JMP) : /* jmp $sr */ { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; -#define FLD(f) abuf->fields.sfmt_jl.f +#define FLD(f) abuf->fields.sfmt_mvtc.f #define OPRND(f) par_exec->operands.sfmt_jmp.f int UNUSED written = abuf->written; IADDR UNUSED pc = abuf->addr; @@ -4218,7 +4043,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -4248,7 +4073,7 @@ CASE (sem, INSN_WRITE_LD) : /* ld $dr,@$sr */ SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); #define FLD(f) abuf->fields.sfmt_ld_plus.f -#define OPRND(f) par_exec->operands.sfmt_ldb.f +#define OPRND(f) par_exec->operands.sfmt_ld.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 2); @@ -4256,7 +4081,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -4269,7 +4094,7 @@ CASE (sem, INSN_WRITE_LDB) : /* ldb $dr,@$sr */ SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; #define FLD(f) abuf->fields.sfmt_ld_plus.f -#define OPRND(f) par_exec->operands.sfmt_ldb.f +#define OPRND(f) par_exec->operands.sfmt_ld.f int UNUSED written = abuf->written; IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); @@ -4286,7 +4111,7 @@ CASE (sem, INSN_WRITE_LDB) : /* ldb $dr,@$sr */ SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); #define FLD(f) abuf->fields.sfmt_ld_plus.f -#define OPRND(f) par_exec->operands.sfmt_ldh.f +#define OPRND(f) par_exec->operands.sfmt_ld.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 2); @@ -4294,7 +4119,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -4307,7 +4132,7 @@ CASE (sem, INSN_WRITE_LDH) : /* ldh $dr,@$sr */ SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; #define FLD(f) abuf->fields.sfmt_ld_plus.f -#define OPRND(f) par_exec->operands.sfmt_ldh.f +#define OPRND(f) par_exec->operands.sfmt_ld.f int UNUSED written = abuf->written; IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); @@ -4324,7 +4149,7 @@ CASE (sem, INSN_WRITE_LDH) : /* ldh $dr,@$sr */ SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); #define FLD(f) abuf->fields.sfmt_ld_plus.f -#define OPRND(f) par_exec->operands.sfmt_ldb.f +#define OPRND(f) par_exec->operands.sfmt_ld.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 2); @@ -4332,7 +4157,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -4345,7 +4170,7 @@ CASE (sem, INSN_WRITE_LDUB) : /* ldub $dr,@$sr */ SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; #define FLD(f) abuf->fields.sfmt_ld_plus.f -#define OPRND(f) par_exec->operands.sfmt_ldb.f +#define OPRND(f) par_exec->operands.sfmt_ld.f int UNUSED written = abuf->written; IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); @@ -4362,7 +4187,7 @@ CASE (sem, INSN_WRITE_LDUB) : /* ldub $dr,@$sr */ SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); #define FLD(f) abuf->fields.sfmt_ld_plus.f -#define OPRND(f) par_exec->operands.sfmt_ldh.f +#define OPRND(f) par_exec->operands.sfmt_ld.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 2); @@ -4370,7 +4195,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -4383,7 +4208,7 @@ CASE (sem, INSN_WRITE_LDUH) : /* lduh $dr,@$sr */ SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; #define FLD(f) abuf->fields.sfmt_ld_plus.f -#define OPRND(f) par_exec->operands.sfmt_ldh.f +#define OPRND(f) par_exec->operands.sfmt_ld.f int UNUSED written = abuf->written; IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); @@ -4412,12 +4237,12 @@ CASE (sem, INSN_WRITE_LDUH) : /* lduh $dr,@$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { SI opval = temp1; OPRND (sr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "sr", 'x', opval); } } @@ -4457,7 +4282,7 @@ CASE (sem, INSN_WRITE_LD_PLUS) : /* ld $dr,@$sr+ */ { SI opval = FLD (f_simm8); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -4495,13 +4320,13 @@ CASE (sem, INSN_WRITE_LDI8) : /* ldi8 $dr,$simm8 */ { { BI opval = 1; - OPRND (h_lock_BI) = opval; + OPRND (h_lock) = opval; TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } { SI opval = GETMEMSI (current_cpu, pc, * FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } } @@ -4521,7 +4346,7 @@ CASE (sem, INSN_WRITE_LOCK) : /* lock $dr,@$sr */ vpc = SEM_NEXT_VPC (sem_arg, pc, 0); * FLD (i_dr) = OPRND (dr); - CPU (h_lock) = OPRND (h_lock_BI); + CPU (h_lock) = OPRND (h_lock); #undef OPRND #undef FLD @@ -4541,7 +4366,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef OPRND @@ -4579,7 +4404,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef OPRND @@ -4617,7 +4442,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef OPRND @@ -4655,7 +4480,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef OPRND @@ -4693,7 +4518,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -4731,7 +4556,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef OPRND @@ -4769,7 +4594,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef OPRND @@ -4807,7 +4632,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef OPRND @@ -4845,7 +4670,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "acc", 'D', opval); } #undef OPRND @@ -4883,7 +4708,7 @@ CASE (sem, INSN_WRITE_MULWLO_A) : /* mulwlo $src1,$src2,$acc */ { SI opval = * FLD (i_sr); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -4921,7 +4746,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -4959,7 +4784,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -4997,7 +4822,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -5026,7 +4851,7 @@ CASE (sem, INSN_WRITE_MVFACMI_A) : /* mvfacmi $dr,$accs */ { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_ld_plus.f +#define FLD(f) abuf->fields.sfmt_mvfc.f #define OPRND(f) par_exec->operands.sfmt_mvfc.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; @@ -5035,7 +4860,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -5047,7 +4872,7 @@ CASE (sem, INSN_WRITE_MVFC) : /* mvfc $dr,$scr */ { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; -#define FLD(f) abuf->fields.sfmt_ld_plus.f +#define FLD(f) abuf->fields.sfmt_mvfc.f #define OPRND(f) par_exec->operands.sfmt_mvfc.f int UNUSED written = abuf->written; IADDR UNUSED pc = abuf->addr; @@ -5073,7 +4898,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval); } #undef OPRND @@ -5111,7 +4936,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accs", 'D', opval); } #undef OPRND @@ -5140,7 +4965,7 @@ CASE (sem, INSN_WRITE_MVTACLO_A) : /* mvtaclo $src1,$accs */ { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_ld_plus.f +#define FLD(f) abuf->fields.sfmt_mvtc.f #define OPRND(f) par_exec->operands.sfmt_mvtc.f int UNUSED written = 0; IADDR UNUSED pc = abuf->addr; @@ -5149,7 +4974,7 @@ CASE (sem, INSN_WRITE_MVTACLO_A) : /* mvtaclo $src1,$accs */ { USI opval = * FLD (i_sr); OPRND (dcr) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dcr", 'x', opval); } #undef OPRND @@ -5161,7 +4986,7 @@ CASE (sem, INSN_WRITE_MVTC) : /* mvtc $sr,$dcr */ { SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; -#define FLD(f) abuf->fields.sfmt_ld_plus.f +#define FLD(f) abuf->fields.sfmt_mvtc.f #define OPRND(f) par_exec->operands.sfmt_mvtc.f int UNUSED written = abuf->written; IADDR UNUSED pc = abuf->addr; @@ -5187,7 +5012,7 @@ CASE (sem, INSN_WRITE_MVTC) : /* mvtc $sr,$dcr */ { SI opval = NEGSI (* FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -5258,7 +5083,7 @@ CASE (sem, INSN_WRITE_NOP) : /* nop */ { SI opval = INVSI (* FLD (i_sr)); OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -5300,7 +5125,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval); } } @@ -5343,7 +5168,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, "accums", 'D', opval); + TRACE_RESULT (current_cpu, abuf, "accd", 'D', opval); } } @@ -5387,17 +5212,17 @@ CASE (sem, INSN_WRITE_RACH_DSI) : /* rach $accd,$accs,$imm1 */ } { USI opval = GET_H_CR (((UINT) 14)); - OPRND (h_cr_USI_6) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + OPRND (h_cr_6) = opval; + TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); } { UQI opval = CPU (h_bpsw); - OPRND (h_psw_UQI) = opval; + OPRND (h_psw) = opval; TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { UQI opval = CPU (h_bbpsw); - OPRND (h_bpsw_UQI) = opval; + OPRND (h_bpsw) = opval; TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } } @@ -5418,9 +5243,9 @@ CASE (sem, INSN_WRITE_RTE) : /* rte */ SEM_BRANCH_INIT vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - CPU (h_bpsw) = OPRND (h_bpsw_UQI); - SET_H_CR (((UINT) 6), OPRND (h_cr_USI_6)); - SET_H_PSW (OPRND (h_psw_UQI)); + CPU (h_bpsw) = OPRND (h_bpsw); + SET_H_CR (((UINT) 6), OPRND (h_cr_6)); + SET_H_PSW (OPRND (h_psw)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, OPRND (pc), vpc); SEM_BRANCH_FINI (vpc); @@ -5442,7 +5267,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -5480,7 +5305,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -5518,7 +5343,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -5556,7 +5381,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -5594,7 +5419,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -5632,7 +5457,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -5669,8 +5494,8 @@ CASE (sem, INSN_WRITE_SRLI) : /* srli $dr,$uimm5 */ { SI opval = * FLD (i_src1); - OPRND (h_memory_SI_src2_idx) = * FLD (i_src2); - OPRND (h_memory_SI_src2) = opval; + OPRND (h_memory_src2_idx) = * FLD (i_src2); + OPRND (h_memory_src2) = opval; TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } @@ -5689,7 +5514,7 @@ CASE (sem, INSN_WRITE_ST) : /* st $src1,@$src2 */ IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - SETMEMSI (current_cpu, pc, OPRND (h_memory_SI_src2_idx), OPRND (h_memory_SI_src2)); + SETMEMSI (current_cpu, pc, OPRND (h_memory_src2_idx), OPRND (h_memory_src2)); #undef OPRND #undef FLD @@ -5708,8 +5533,8 @@ CASE (sem, INSN_WRITE_ST) : /* st $src1,@$src2 */ { QI opval = * FLD (i_src1); - OPRND (h_memory_QI_src2_idx) = * FLD (i_src2); - OPRND (h_memory_QI_src2) = opval; + OPRND (h_memory_src2_idx) = * FLD (i_src2); + OPRND (h_memory_src2) = opval; TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } @@ -5728,7 +5553,7 @@ CASE (sem, INSN_WRITE_STB) : /* stb $src1,@$src2 */ IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - SETMEMQI (current_cpu, pc, OPRND (h_memory_QI_src2_idx), OPRND (h_memory_QI_src2)); + SETMEMQI (current_cpu, pc, OPRND (h_memory_src2_idx), OPRND (h_memory_src2)); #undef OPRND #undef FLD @@ -5747,8 +5572,8 @@ CASE (sem, INSN_WRITE_STB) : /* stb $src1,@$src2 */ { HI opval = * FLD (i_src1); - OPRND (h_memory_HI_src2_idx) = * FLD (i_src2); - OPRND (h_memory_HI_src2) = opval; + OPRND (h_memory_src2_idx) = * FLD (i_src2); + OPRND (h_memory_src2) = opval; TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } @@ -5767,7 +5592,7 @@ CASE (sem, INSN_WRITE_STH) : /* sth $src1,@$src2 */ IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - SETMEMHI (current_cpu, pc, OPRND (h_memory_HI_src2_idx), OPRND (h_memory_HI_src2)); + SETMEMHI (current_cpu, pc, OPRND (h_memory_src2_idx), OPRND (h_memory_src2)); #undef OPRND #undef FLD @@ -5789,14 +5614,14 @@ CASE (sem, INSN_WRITE_STH) : /* sth $src1,@$src2 */ tmp_new_src2 = ADDSI (* FLD (i_src2), 4); { SI opval = * FLD (i_src1); - OPRND (h_memory_SI_new_src2_idx) = tmp_new_src2; - OPRND (h_memory_SI_new_src2) = opval; + OPRND (h_memory_new_src2_idx) = tmp_new_src2; + OPRND (h_memory_new_src2) = opval; TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); } } @@ -5815,105 +5640,7 @@ CASE (sem, INSN_WRITE_ST_PLUS) : /* st $src1,@+$src2 */ IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - SETMEMSI (current_cpu, pc, OPRND (h_memory_SI_new_src2_idx), OPRND (h_memory_SI_new_src2)); - * FLD (i_src2) = OPRND (src2); - -#undef OPRND -#undef FLD - } - NEXT (vpc); - - CASE (sem, INSN_PAR_STH_PLUS) : /* sth $src1,@$src2+ */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_st_plus.f -#define OPRND(f) par_exec->operands.sfmt_sth_plus.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 2); - -{ - HI tmp_new_src2; - { - HI opval = * FLD (i_src1); - OPRND (h_memory_HI_new_src2_idx) = tmp_new_src2; - OPRND (h_memory_HI_new_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); - } - tmp_new_src2 = ADDSI (* FLD (i_src2), 2); - { - SI opval = tmp_new_src2; - OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); - } -} - -#undef OPRND -#undef FLD -} - NEXT (vpc); - -CASE (sem, INSN_WRITE_STH_PLUS) : /* sth $src1,@$src2+ */ - { - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; -#define FLD(f) abuf->fields.sfmt_st_plus.f -#define OPRND(f) par_exec->operands.sfmt_sth_plus.f - int UNUSED written = abuf->written; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - - SETMEMHI (current_cpu, pc, OPRND (h_memory_HI_new_src2_idx), OPRND (h_memory_HI_new_src2)); - * FLD (i_src2) = OPRND (src2); - -#undef OPRND -#undef FLD - } - NEXT (vpc); - - CASE (sem, INSN_PAR_STB_PLUS) : /* stb $src1,@$src2+ */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_st_plus.f -#define OPRND(f) par_exec->operands.sfmt_stb_plus.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 2); - -{ - QI tmp_new_src2; - { - QI opval = * FLD (i_src1); - OPRND (h_memory_QI_new_src2_idx) = tmp_new_src2; - OPRND (h_memory_QI_new_src2) = opval; - TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); - } - tmp_new_src2 = ADDSI (* FLD (i_src2), 1); - { - SI opval = tmp_new_src2; - OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); - } -} - -#undef OPRND -#undef FLD -} - NEXT (vpc); - -CASE (sem, INSN_WRITE_STB_PLUS) : /* stb $src1,@$src2+ */ - { - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; -#define FLD(f) abuf->fields.sfmt_st_plus.f -#define OPRND(f) par_exec->operands.sfmt_stb_plus.f - int UNUSED written = abuf->written; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - - SETMEMQI (current_cpu, pc, OPRND (h_memory_QI_new_src2_idx), OPRND (h_memory_QI_new_src2)); + SETMEMSI (current_cpu, pc, OPRND (h_memory_new_src2_idx), OPRND (h_memory_new_src2)); * FLD (i_src2) = OPRND (src2); #undef OPRND @@ -5936,14 +5663,14 @@ CASE (sem, INSN_WRITE_STB_PLUS) : /* stb $src1,@$src2+ */ tmp_new_src2 = SUBSI (* FLD (i_src2), 4); { SI opval = * FLD (i_src1); - OPRND (h_memory_SI_new_src2_idx) = tmp_new_src2; - OPRND (h_memory_SI_new_src2) = opval; + OPRND (h_memory_new_src2_idx) = tmp_new_src2; + OPRND (h_memory_new_src2) = opval; TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } { SI opval = tmp_new_src2; OPRND (src2) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "src2", 'x', opval); } } @@ -5962,7 +5689,7 @@ CASE (sem, INSN_WRITE_ST_MINUS) : /* st $src1,@-$src2 */ IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - SETMEMSI (current_cpu, pc, OPRND (h_memory_SI_new_src2_idx), OPRND (h_memory_SI_new_src2)); + SETMEMSI (current_cpu, pc, OPRND (h_memory_new_src2_idx), OPRND (h_memory_new_src2)); * FLD (i_src2) = OPRND (src2); #undef OPRND @@ -5983,7 +5710,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, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } #undef OPRND @@ -6025,12 +5752,12 @@ CASE (sem, INSN_WRITE_SUB) : /* sub $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } } @@ -6074,12 +5801,12 @@ CASE (sem, INSN_WRITE_SUBV) : /* subv $dr,$sr */ { SI opval = temp0; OPRND (dr) = opval; - TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "dr", 'x', opval); } { BI opval = temp1; OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } } @@ -6119,27 +5846,27 @@ CASE (sem, INSN_WRITE_SUBX) : /* subx $dr,$sr */ { { USI opval = GET_H_CR (((UINT) 6)); - OPRND (h_cr_USI_14) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + OPRND (h_cr_14) = opval; + TRACE_RESULT (current_cpu, abuf, "cr-14", 'x', opval); } { USI opval = ADDSI (pc, 4); - OPRND (h_cr_USI_6) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); + OPRND (h_cr_6) = opval; + TRACE_RESULT (current_cpu, abuf, "cr-6", 'x', opval); } { UQI opval = CPU (h_bpsw); - OPRND (h_bbpsw_UQI) = opval; + OPRND (h_bbpsw) = opval; TRACE_RESULT (current_cpu, abuf, "bbpsw", 'x', opval); } { UQI opval = GET_H_PSW (); - OPRND (h_bpsw_UQI) = opval; + OPRND (h_bpsw) = opval; TRACE_RESULT (current_cpu, abuf, "bpsw", 'x', opval); } { UQI opval = ANDQI (GET_H_PSW (), 128); - OPRND (h_psw_UQI) = opval; + OPRND (h_psw) = opval; TRACE_RESULT (current_cpu, abuf, "psw", 'x', opval); } { @@ -6165,11 +5892,11 @@ CASE (sem, INSN_WRITE_TRAP) : /* trap $uimm4 */ SEM_BRANCH_INIT vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - CPU (h_bbpsw) = OPRND (h_bbpsw_UQI); - CPU (h_bpsw) = OPRND (h_bpsw_UQI); - SET_H_CR (((UINT) 14), OPRND (h_cr_USI_14)); - SET_H_CR (((UINT) 6), OPRND (h_cr_USI_6)); - SET_H_PSW (OPRND (h_psw_UQI)); + CPU (h_bbpsw) = OPRND (h_bbpsw); + CPU (h_bpsw) = OPRND (h_bpsw); + SET_H_CR (((UINT) 14), OPRND (h_cr_14)); + SET_H_CR (((UINT) 6), OPRND (h_cr_6)); + SET_H_PSW (OPRND (h_psw)); SEM_BRANCH_VIA_ADDR (current_cpu, sem_arg, OPRND (pc), vpc); SEM_BRANCH_FINI (vpc); @@ -6192,15 +5919,15 @@ CASE (sem, INSN_WRITE_TRAP) : /* trap $uimm4 */ if (CPU (h_lock)) { { SI opval = * FLD (i_src1); - OPRND (h_memory_SI_src2_idx) = * FLD (i_src2); - OPRND (h_memory_SI_src2) = opval; + OPRND (h_memory_src2_idx) = * FLD (i_src2); + OPRND (h_memory_src2) = opval; written |= (1 << 4); TRACE_RESULT (current_cpu, abuf, "memory", 'x', opval); } } { BI opval = 0; - OPRND (h_lock_BI) = opval; + OPRND (h_lock) = opval; TRACE_RESULT (current_cpu, abuf, "lock", 'x', opval); } } @@ -6221,10 +5948,10 @@ CASE (sem, INSN_WRITE_UNLOCK) : /* unlock $src1,@$src2 */ IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - CPU (h_lock) = OPRND (h_lock_BI); + CPU (h_lock) = OPRND (h_lock); if (written & (1 << 4)) { - SETMEMSI (current_cpu, pc, OPRND (h_memory_SI_src2_idx), OPRND (h_memory_SI_src2)); + SETMEMSI (current_cpu, pc, OPRND (h_memory_src2_idx), OPRND (h_memory_src2)); } #undef OPRND @@ -6245,7 +5972,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, "cond", 'x', opval); + TRACE_RESULT (current_cpu, abuf, "condbit", 'x', opval); } #undef OPRND @@ -6282,8 +6009,8 @@ 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_DI_0) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + OPRND (h_accums_0) = opval; + TRACE_RESULT (current_cpu, abuf, "accums-0", 'D', opval); } #undef OPRND @@ -6301,7 +6028,7 @@ CASE (sem, INSN_WRITE_SADD) : /* sadd */ IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - SET_H_ACCUMS (((UINT) 0), OPRND (h_accums_DI_0)); + SET_H_ACCUMS (((UINT) 0), OPRND (h_accums_0)); #undef OPRND #undef FLD @@ -6320,8 +6047,8 @@ 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_DI_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + OPRND (h_accums_1) = opval; + TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); } #undef OPRND @@ -6339,7 +6066,7 @@ CASE (sem, INSN_WRITE_MACWU1) : /* macwu1 $src1,$src2 */ IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - SET_H_ACCUMS (((UINT) 1), OPRND (h_accums_DI_1)); + SET_H_ACCUMS (((UINT) 1), OPRND (h_accums_1)); #undef OPRND #undef FLD @@ -6396,8 +6123,8 @@ 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_DI_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + OPRND (h_accums_1) = opval; + TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); } #undef OPRND @@ -6415,7 +6142,7 @@ CASE (sem, INSN_WRITE_MULWU1) : /* mulwu1 $src1,$src2 */ IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - SET_H_ACCUMS (((UINT) 1), OPRND (h_accums_DI_1)); + SET_H_ACCUMS (((UINT) 1), OPRND (h_accums_1)); #undef OPRND #undef FLD @@ -6434,8 +6161,8 @@ 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_DI_1) = opval; - TRACE_RESULT (current_cpu, abuf, "accums", 'D', opval); + OPRND (h_accums_1) = opval; + TRACE_RESULT (current_cpu, abuf, "accums-1", 'D', opval); } #undef OPRND @@ -6453,7 +6180,7 @@ CASE (sem, INSN_WRITE_MACLH1) : /* maclh1 $src1,$src2 */ IADDR UNUSED pc = abuf->addr; vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - SET_H_ACCUMS (((UINT) 1), OPRND (h_accums_DI_1)); + SET_H_ACCUMS (((UINT) 1), OPRND (h_accums_1)); #undef OPRND #undef FLD @@ -6528,120 +6255,6 @@ CASE (sem, INSN_WRITE_SNC) : /* snc */ } NEXT (vpc); - CASE (sem, INSN_PAR_CLRPSW) : /* clrpsw $uimm8 */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_clrpsw.f -#define OPRND(f) par_exec->operands.sfmt_clrpsw.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 2); - - { - SI opval = ANDSI (GET_H_CR (((UINT) 0)), ORSI (INVBI (FLD (f_uimm8)), 65280)); - OPRND (h_cr_USI_0) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); - } - -#undef OPRND -#undef FLD -} - NEXT (vpc); - -CASE (sem, INSN_WRITE_CLRPSW) : /* clrpsw $uimm8 */ - { - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; -#define FLD(f) abuf->fields.sfmt_clrpsw.f -#define OPRND(f) par_exec->operands.sfmt_clrpsw.f - int UNUSED written = abuf->written; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - - SET_H_CR (((UINT) 0), OPRND (h_cr_USI_0)); - -#undef OPRND -#undef FLD - } - NEXT (vpc); - - CASE (sem, INSN_PAR_SETPSW) : /* setpsw $uimm8 */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_clrpsw.f -#define OPRND(f) par_exec->operands.sfmt_setpsw.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 2); - - { - SI opval = FLD (f_uimm8); - OPRND (h_cr_USI_0) = opval; - TRACE_RESULT (current_cpu, abuf, "cr", 'x', opval); - } - -#undef OPRND -#undef FLD -} - NEXT (vpc); - -CASE (sem, INSN_WRITE_SETPSW) : /* setpsw $uimm8 */ - { - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; -#define FLD(f) abuf->fields.sfmt_clrpsw.f -#define OPRND(f) par_exec->operands.sfmt_setpsw.f - int UNUSED written = abuf->written; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - - SET_H_CR (((UINT) 0), OPRND (h_cr_USI_0)); - -#undef OPRND -#undef FLD - } - NEXT (vpc); - - CASE (sem, INSN_PAR_BTST) : /* btst $uimm3,$sr */ -{ - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - ARGBUF *abuf = SEM_ARGBUF (sem_arg); -#define FLD(f) abuf->fields.sfmt_bset.f -#define OPRND(f) par_exec->operands.sfmt_btst.f - int UNUSED written = 0; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 2); - - { - BI opval = ANDQI (SRLSI (* FLD (i_sr), SUBSI (7, FLD (f_uimm3))), 1); - OPRND (condbit) = opval; - TRACE_RESULT (current_cpu, abuf, "cond", 'x', opval); - } - -#undef OPRND -#undef FLD -} - NEXT (vpc); - -CASE (sem, INSN_WRITE_BTST) : /* btst $uimm3,$sr */ - { - SEM_ARG sem_arg = SEM_SEM_ARG (vpc, sc); - const ARGBUF *abuf = SEM_ARGBUF (sem_arg)->fields.write.abuf; -#define FLD(f) abuf->fields.sfmt_bset.f -#define OPRND(f) par_exec->operands.sfmt_btst.f - int UNUSED written = abuf->written; - IADDR UNUSED pc = abuf->addr; - vpc = SEM_NEXT_VPC (sem_arg, pc, 0); - - CPU (h_cond) = OPRND (condbit); - -#undef OPRND -#undef FLD - } - NEXT (vpc); - } ENDSWITCH (sem) /* End of semantic switch. */ |