* arch.c: Regenerate.

	* arch.h: Regenerate.
	* cpu.c: Regenerate.
	* cpu.h: Regenerate.
	* cpuall.h: Regenerate.
	* decode.c: Regenerate.
	* decode.h: Regenerate.
	* model.c: Regenerate.
	* sem.c: Regenerate.

10 files changed, 2066 insertions, 3293 deletions

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 6f00b3a..d8e1647 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-03  Doug Evans  <dje@sebabeach.org>
+
+	* arch.c: Regenerate.
+	* arch.h: Regenerate.
+	* cpu.c: Regenerate.
+	* cpu.h: Regenerate.
+	* cpuall.h: Regenerate.
+	* decode.c: Regenerate.
+	* decode.h: Regenerate.
+	* model.c: Regenerate.
+	* sem.c: Regenerate.
+
 2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* config.in: Regenerate.
diff --git a/sim/frv/arch.c b/sim/frv/arch.c
index 92ae87b..468a0b9 100644
--- a/sim/frv/arch.c
+++ b/sim/frv/arch.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/frv/arch.h b/sim/frv/arch.h
index 1187a8d..2260c58 100644
--- a/sim/frv/arch.h
+++ b/sim/frv/arch.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/frv/cpu.c b/sim/frv/cpu.c
index 6305136..9703bd5 100644
--- a/sim/frv/cpu.c
+++ b/sim/frv/cpu.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/frv/cpu.h b/sim/frv/cpu.h
index 97d55d8..d54a996 100644
--- a/sim/frv/cpu.h
+++ b/sim/frv/cpu.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -197,7 +197,7 @@ SET_H_FR_INT ((index), ORSI (ANDSI (GET_H_FR_INT ((index)), 0xffff0000), ANDHI (
 #define SET_H_FR_0(index, x) \
 do { \
 {\
-if (GTSI ((x), 255)) {\
+if (GTUSI ((x), 255)) {\
   (x) = 255;\
 }\
 SET_H_FR_INT ((index), ORSI (ANDSI (GET_H_FR_INT ((index)), 0xffffff00), (x)));\
@@ -207,7 +207,7 @@ SET_H_FR_INT ((index), ORSI (ANDSI (GET_H_FR_INT ((index)), 0xffffff00), (x)));\
 #define SET_H_FR_1(index, x) \
 do { \
 {\
-if (GTSI ((x), 255)) {\
+if (GTUSI ((x), 255)) {\
   (x) = 255;\
 }\
 SET_H_FR_INT ((index), ORSI (ANDSI (GET_H_FR_INT ((index)), 0xffff00ff), SLLHI ((x), 8)));\
@@ -217,7 +217,7 @@ SET_H_FR_INT ((index), ORSI (ANDSI (GET_H_FR_INT ((index)), 0xffff00ff), SLLHI (
 #define SET_H_FR_2(index, x) \
 do { \
 {\
-if (GTSI ((x), 255)) {\
+if (GTUSI ((x), 255)) {\
   (x) = 255;\
 }\
 SET_H_FR_INT ((index), ORSI (ANDSI (GET_H_FR_INT ((index)), 0xff00ffff), SLLHI ((x), 16)));\
@@ -227,7 +227,7 @@ SET_H_FR_INT ((index), ORSI (ANDSI (GET_H_FR_INT ((index)), 0xff00ffff), SLLHI (
 #define SET_H_FR_3(index, x) \
 do { \
 {\
-if (GTSI ((x), 255)) {\
+if (GTUSI ((x), 255)) {\
   (x) = 255;\
 }\
 SET_H_FR_INT ((index), ORSI (ANDSI (GET_H_FR_INT ((index)), 16777215), SLLHI ((x), 24)));\
@@ -610,7 +610,7 @@ union sem_fields {
     UINT f_FRk;
     UINT f_u6;
     unsigned char in_FRinti;
-    unsigned char in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRinti_1;
+    unsigned char in_h_fr_int_USI_add__INT_index_of__INT_FRinti_1;
     unsigned char out_FRintk;
   } sfmt_mwcuti;
   struct { /*  */
@@ -618,8 +618,8 @@ union sem_fields {
     UINT f_FRk;
     unsigned char in_FRintk;
     unsigned char out_FRintk;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0;
   } sfmt_mhdsets;
   struct { /*  */
     UINT f_FCCi_2;
@@ -633,17 +633,17 @@ union sem_fields {
     UINT f_FRj;
     UINT f_FRk;
     unsigned char in_FRj;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRj_1;
     unsigned char out_FRintk;
-    unsigned char out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1;
+    unsigned char out_h_fr_int_USI_add__INT_index_of__INT_FRintk_1;
   } sfmt_fdstoi;
   struct { /*  */
     UINT f_FRj;
     UINT f_FRk;
     unsigned char in_FRintj;
-    unsigned char in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintj_1;
+    unsigned char in_h_fr_int_USI_add__INT_index_of__INT_FRintj_1;
     unsigned char out_FRk;
-    unsigned char out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1;
+    unsigned char out_h_fr_SF_add__INT_index_of__INT_FRk_1;
   } sfmt_fditos;
   struct { /*  */
     UINT f_CRi;
@@ -674,18 +674,18 @@ union sem_fields {
     UINT f_FRi;
     UINT f_FRk;
     unsigned char in_FRintieven;
-    unsigned char in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintieven_1;
+    unsigned char in_h_fr_int_USI_add__INT_index_of__INT_FRintieven_1;
     unsigned char out_FRintkeven;
-    unsigned char out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintkeven_1;
+    unsigned char out_h_fr_int_USI_add__INT_index_of__INT_FRintkeven_1;
   } sfmt_mdrotli;
   struct { /*  */
     INT f_s6;
     UINT f_ACC40Si;
     UINT f_FRk;
     unsigned char in_ACC40Si;
-    unsigned char in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1;
+    unsigned char in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1;
     unsigned char out_FRintkeven;
-    unsigned char out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintkeven_1;
+    unsigned char out_h_fr_int_USI_add__INT_index_of__INT_FRintkeven_1;
   } sfmt_mdcutssi;
   struct { /*  */
     UINT f_FRi;
@@ -693,7 +693,7 @@ union sem_fields {
     UINT f_FRk;
     unsigned char in_FRinti;
     unsigned char in_FRintj;
-    unsigned char in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRinti_1;
+    unsigned char in_h_fr_int_USI_add__INT_index_of__INT_FRinti_1;
     unsigned char out_FRintk;
   } sfmt_mwcut;
   struct { /*  */
@@ -799,11 +799,11 @@ union sem_fields {
     INT f_s5;
     UINT f_FRk;
     unsigned char in_FRintk;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0;
     unsigned char out_FRintk;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0;
   } sfmt_mhdseth;
   struct { /*  */
     UINT f_CCi;
@@ -864,9 +864,9 @@ union sem_fields {
     UINT f_cond;
     unsigned char in_CCi;
     unsigned char in_FRintk;
-    unsigned char in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1;
+    unsigned char in_h_fr_int_USI_add__INT_index_of__INT_FRintk_1;
     unsigned char out_GRj;
-    unsigned char out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1;
+    unsigned char out_h_gr_USI_add__INT_index_of__INT_GRj_1;
   } sfmt_cmovfgd;
   struct { /*  */
     UINT f_CCi;
@@ -875,9 +875,9 @@ union sem_fields {
     UINT f_cond;
     unsigned char in_CCi;
     unsigned char in_GRj;
-    unsigned char in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1;
+    unsigned char in_h_gr_USI_add__INT_index_of__INT_GRj_1;
     unsigned char out_FRintk;
-    unsigned char out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1;
+    unsigned char out_h_fr_int_USI_add__INT_index_of__INT_FRintk_1;
   } sfmt_cmovgfd;
   struct { /*  */
     UINT f_GRi;
@@ -908,34 +908,34 @@ union sem_fields {
     UINT f_cond;
     UINT f_u6;
     unsigned char in_CCi;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0;
   } sfmt_cmexpdhw;
   struct { /*  */
     UINT f_ACC40Si;
     UINT f_ACC40Sk;
     unsigned char in_ACC40Si;
-    unsigned char in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1;
-    unsigned char in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_2;
-    unsigned char in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_3;
+    unsigned char in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1;
+    unsigned char in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_2;
+    unsigned char in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_3;
     unsigned char out_ACC40Sk;
-    unsigned char out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1;
-    unsigned char out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2;
-    unsigned char out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3;
+    unsigned char out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1;
+    unsigned char out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2;
+    unsigned char out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3;
   } sfmt_mdasaccs;
   struct { /*  */
     UINT f_FRj;
     UINT f_FRk;
     unsigned char in_FRintj;
     unsigned char in_FRintk;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0;
     unsigned char out_FRintj;
     unsigned char out_FRintk;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0;
   } sfmt_mabshs;
   struct { /*  */
     UINT f_FRi;
@@ -943,11 +943,11 @@ union sem_fields {
     UINT f_u6;
     unsigned char in_FRinti;
     unsigned char in_FRintk;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_1;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_1;
     unsigned char out_FRinti;
     unsigned char out_FRintk;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0;
   } sfmt_mcplhi;
   struct { /*  */
     UINT f_FCCi_2;
@@ -956,10 +956,10 @@ union sem_fields {
     UINT f_FRk;
     unsigned char in_FRi;
     unsigned char in_FRj;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRi_1;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRj_1;
     unsigned char out_FCCi_2;
-    unsigned char out_h_fccr_UQI_add__DFLT_index_of__DFLT_FCCi_2_1;
+    unsigned char out_h_fccr_UQI_add__INT_index_of__INT_FCCi_2_1;
   } sfmt_nfdcmps;
   struct { /*  */
     UINT f_CCi;
@@ -1001,25 +1001,25 @@ union sem_fields {
     UINT f_FRk;
     UINT f_GRj;
     unsigned char in_FRintk;
-    unsigned char in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1;
-    unsigned char in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_2;
-    unsigned char in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_3;
+    unsigned char in_h_fr_int_USI_add__INT_index_of__INT_FRintk_1;
+    unsigned char in_h_fr_int_USI_add__INT_index_of__INT_FRintk_2;
+    unsigned char in_h_fr_int_USI_add__INT_index_of__INT_FRintk_3;
     unsigned char out_GRj;
-    unsigned char out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1;
-    unsigned char out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_2;
-    unsigned char out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_3;
+    unsigned char out_h_gr_USI_add__INT_index_of__INT_GRj_1;
+    unsigned char out_h_gr_USI_add__INT_index_of__INT_GRj_2;
+    unsigned char out_h_gr_USI_add__INT_index_of__INT_GRj_3;
   } sfmt_movfgq;
   struct { /*  */
     UINT f_FRk;
     UINT f_GRj;
     unsigned char in_GRj;
-    unsigned char in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1;
-    unsigned char in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_2;
-    unsigned char in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_3;
+    unsigned char in_h_gr_USI_add__INT_index_of__INT_GRj_1;
+    unsigned char in_h_gr_USI_add__INT_index_of__INT_GRj_2;
+    unsigned char in_h_gr_USI_add__INT_index_of__INT_GRj_3;
     unsigned char out_FRintk;
-    unsigned char out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1;
-    unsigned char out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_2;
-    unsigned char out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_3;
+    unsigned char out_h_fr_int_USI_add__INT_index_of__INT_FRintk_1;
+    unsigned char out_h_fr_int_USI_add__INT_index_of__INT_FRintk_2;
+    unsigned char out_h_fr_int_USI_add__INT_index_of__INT_FRintk_3;
   } sfmt_movgfq;
   struct { /*  */
     UINT f_CCi;
@@ -1135,12 +1135,12 @@ union sem_fields {
     UINT f_FRj;
     unsigned char in_FRinti;
     unsigned char in_FRintj;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0;
     unsigned char out_FCCk;
-    unsigned char out_h_fccr_UQI_add__DFLT_index_of__DFLT_FCCk_1;
+    unsigned char out_h_fccr_UQI_add__INT_index_of__INT_FCCk_1;
   } sfmt_mcmpsh;
   struct { /*  */
     UINT f_FRi;
@@ -1148,12 +1148,12 @@ union sem_fields {
     UINT f_u6;
     unsigned char in_FRinti;
     unsigned char in_FRintk;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0;
     unsigned char out_FRinti;
     unsigned char out_FRintk;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0;
   } sfmt_msllhi;
   struct { /*  */
     UINT f_FRi;
@@ -1162,11 +1162,11 @@ union sem_fields {
     unsigned char in_FRi;
     unsigned char in_FRj;
     unsigned char in_FRk;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRi_1;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRj_1;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRk_1;
     unsigned char out_FRk;
-    unsigned char out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1;
+    unsigned char out_h_fr_SF_add__INT_index_of__INT_FRk_1;
   } sfmt_fdmadds;
   struct { /*  */
     UINT f_FCCi_2;
@@ -1203,9 +1203,9 @@ union sem_fields {
     unsigned char in_CCi;
     unsigned char in_GRi;
     unsigned char in_GRj;
-    unsigned char in_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3;
+    unsigned char in_h_iccr_UQI_and__INT_index_of__INT_CCi_3;
     unsigned char out_GRdoublek;
-    unsigned char out_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3;
+    unsigned char out_h_iccr_UQI_and__INT_index_of__INT_CCi_3;
   } sfmt_csmulcc;
   struct { /*  */
     UINT f_CCi;
@@ -1216,23 +1216,23 @@ union sem_fields {
     unsigned char in_CCi;
     unsigned char in_GRi;
     unsigned char in_GRj;
-    unsigned char in_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3;
+    unsigned char in_h_iccr_UQI_and__INT_index_of__INT_CCi_3;
     unsigned char out_GRk;
-    unsigned char out_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3;
+    unsigned char out_h_iccr_UQI_and__INT_index_of__INT_CCi_3;
   } sfmt_caddcc;
   struct { /*  */
     UINT f_FRi;
     UINT f_FRk;
     unsigned char in_FRinti;
     unsigned char in_FRintkeven;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0;
     unsigned char out_FRinti;
     unsigned char out_FRintkeven;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_add__DFLT_0_1;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_add__DFLT_0_1;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_add__INT_0_1;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_add__INT_0_1;
   } sfmt_munpackh;
   struct { /*  */
     UINT f_CCi;
@@ -1243,10 +1243,10 @@ union sem_fields {
     unsigned char in_CCi;
     unsigned char in_FRi;
     unsigned char in_FRj;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRi_1;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRj_1;
     unsigned char out_FRk;
-    unsigned char out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1;
+    unsigned char out_h_fr_SF_add__INT_index_of__INT_FRk_1;
   } sfmt_cfmas;
   struct { /*  */
     UINT f_CCi;
@@ -1256,13 +1256,13 @@ union sem_fields {
     UINT f_u6;
     unsigned char in_CCi;
     unsigned char in_FRintkeven;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0;
     unsigned char out_FRintkeven;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1;
   } sfmt_cmexpdhd;
   struct { /*  */
     UINT f_CCi;
@@ -1273,12 +1273,12 @@ union sem_fields {
     unsigned char in_CCi;
     unsigned char in_FRinti;
     unsigned char in_FRintj;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0;
   } sfmt_cmaddhss;
   struct { /*  */
     UINT f_FRi;
@@ -1286,16 +1286,16 @@ union sem_fields {
     UINT f_u6;
     unsigned char in_FRintieven;
     unsigned char in_FRintkeven;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1;
     unsigned char out_FRintieven;
     unsigned char out_FRintkeven;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1;
   } sfmt_mqsllhi;
   struct { /*  */
     UINT f_FRi;
@@ -1303,16 +1303,16 @@ union sem_fields {
     UINT f_FRk;
     unsigned char in_FRi;
     unsigned char in_FRj;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_2;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_3;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_2;
-    unsigned char in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_3;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRi_1;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRi_2;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRi_3;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRj_1;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRj_2;
+    unsigned char in_h_fr_SF_add__INT_index_of__INT_FRj_3;
     unsigned char out_FRk;
-    unsigned char out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1;
-    unsigned char out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_2;
-    unsigned char out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_3;
+    unsigned char out_h_fr_SF_add__INT_index_of__INT_FRk_1;
+    unsigned char out_h_fr_SF_add__INT_index_of__INT_FRk_2;
+    unsigned char out_h_fr_SF_add__INT_index_of__INT_FRk_3;
   } sfmt_fdmas;
   struct { /*  */
     UINT f_ACC40Uk;
@@ -1324,13 +1324,13 @@ union sem_fields {
     unsigned char in_CCi;
     unsigned char in_FRinti;
     unsigned char in_FRintj;
-    unsigned char in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0;
+    unsigned char in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0;
     unsigned char out_ACC40Uk;
-    unsigned char out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1;
+    unsigned char out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1;
   } sfmt_cmmachu;
   struct { /*  */
     UINT f_ACC40Sk;
@@ -1342,13 +1342,13 @@ union sem_fields {
     unsigned char in_CCi;
     unsigned char in_FRinti;
     unsigned char in_FRintj;
-    unsigned char in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0;
+    unsigned char in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0;
     unsigned char out_ACC40Sk;
-    unsigned char out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1;
+    unsigned char out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1;
   } sfmt_cmmachs;
   struct { /*  */
     UINT f_CCi;
@@ -1358,16 +1358,16 @@ union sem_fields {
     unsigned char in_CCi;
     unsigned char in_FRintjeven;
     unsigned char in_FRintk;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1;
     unsigned char out_FRintjeven;
     unsigned char out_FRintk;
-    unsigned char out_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintk_0;
+    unsigned char out_h_fr_0_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_1_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_2_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_3_UHI_add__INT_index_of__INT_FRintk_0;
   } sfmt_cmhtob;
   struct { /*  */
     UINT f_CCi;
@@ -1377,16 +1377,16 @@ union sem_fields {
     unsigned char in_CCi;
     unsigned char in_FRintj;
     unsigned char in_FRintkeven;
-    unsigned char in_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char in_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char in_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char in_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintj_0;
+    unsigned char in_h_fr_0_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char in_h_fr_1_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char in_h_fr_2_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char in_h_fr_3_UHI_add__INT_index_of__INT_FRintj_0;
     unsigned char out_FRintj;
     unsigned char out_FRintkeven;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1;
   } sfmt_cmbtoh;
   struct { /*  */
     UINT f_FRi;
@@ -1395,37 +1395,37 @@ union sem_fields {
     unsigned char in_FRintieven;
     unsigned char in_FRintjeven;
     unsigned char in_FRintkeven;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1;
     unsigned char out_FRintieven;
     unsigned char out_FRintjeven;
     unsigned char out_FRintkeven;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1;
   } sfmt_mdpackh;
   struct { /*  */
     UINT f_FRi;
     UINT f_FRk;
     unsigned char in_FRintieven;
     unsigned char in_FRintk;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1;
     unsigned char out_FRintieven;
     unsigned char out_FRintk;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_2;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_0_1;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_2_1;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_2;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_0_1;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_2_1;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_2;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_add__INT_0_1;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_add__INT_2_1;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_2;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_add__INT_0_1;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_add__INT_2_1;
   } sfmt_mdunpackh;
   struct { /*  */
     UINT f_CCi;
@@ -1435,20 +1435,20 @@ union sem_fields {
     unsigned char in_CCi;
     unsigned char in_FRintj;
     unsigned char in_FRintk;
-    unsigned char in_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char in_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char in_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintj_0;
-    unsigned char in_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintj_0;
+    unsigned char in_h_fr_0_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char in_h_fr_1_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char in_h_fr_2_UHI_add__INT_index_of__INT_FRintj_0;
+    unsigned char in_h_fr_3_UHI_add__INT_index_of__INT_FRintj_0;
     unsigned char out_FRintj;
     unsigned char out_FRintk;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_1;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_2;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_3;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_1;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_2;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_3;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_1;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_2;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_3;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_1;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_2;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_3;
   } sfmt_cmbtohe;
   struct { /*  */
     UINT f_CCi;
@@ -1460,19 +1460,19 @@ union sem_fields {
     unsigned char in_FRintieven;
     unsigned char in_FRintjeven;
     unsigned char in_FRintkeven;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1;
     unsigned char out_FRintkeven;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0;
-    unsigned char out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0;
+    unsigned char out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1;
   } sfmt_cmqaddhss;
   struct { /*  */
     UINT f_ACC40Uk;
@@ -1484,21 +1484,21 @@ union sem_fields {
     unsigned char in_CCi;
     unsigned char in_FRintieven;
     unsigned char in_FRintjeven;
-    unsigned char in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1;
-    unsigned char in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_2;
-    unsigned char in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_3;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1;
+    unsigned char in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1;
+    unsigned char in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_2;
+    unsigned char in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_3;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1;
     unsigned char out_ACC40Uk;
-    unsigned char out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1;
-    unsigned char out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_2;
-    unsigned char out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_3;
+    unsigned char out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1;
+    unsigned char out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_2;
+    unsigned char out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_3;
   } sfmt_cmqmachu;
   struct { /*  */
     UINT f_ACC40Sk;
@@ -1510,21 +1510,21 @@ union sem_fields {
     unsigned char in_CCi;
     unsigned char in_FRintieven;
     unsigned char in_FRintjeven;
-    unsigned char in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1;
-    unsigned char in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2;
-    unsigned char in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0;
-    unsigned char in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0;
-    unsigned char in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1;
+    unsigned char in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1;
+    unsigned char in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2;
+    unsigned char in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0;
+    unsigned char in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0;
+    unsigned char in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1;
     unsigned char out_ACC40Sk;
-    unsigned char out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1;
-    unsigned char out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2;
-    unsigned char out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3;
+    unsigned char out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1;
+    unsigned char out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2;
+    unsigned char out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3;
   } sfmt_cmqmachs;
 #if WITH_SCACHE_PBB
   /* Writeback handler.  */
diff --git a/sim/frv/cpuall.h b/sim/frv/cpuall.h
index 0490a44..b1b9ba6 100644
--- a/sim/frv/cpuall.h
+++ b/sim/frv/cpuall.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/frv/decode.c b/sim/frv/decode.c
index db49c92..e75218d 100644
--- a/sim/frv/decode.c
+++ b/sim/frv/decode.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -877,50 +877,26 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x1fc0fc0) == 0x0)
               { itype = FRVBF_INSN_ADD; goto extract_sfmt_add; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc03c0) == 0x40)
-              { itype = FRVBF_INSN_ADDCC; goto extract_sfmt_addcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc03c0) == 0x80)
-              { itype = FRVBF_INSN_ADDX; goto extract_sfmt_addx; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc03c0) == 0xc0)
-              { itype = FRVBF_INSN_ADDXCC; goto extract_sfmt_addcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 1 : itype = FRVBF_INSN_ADDCC; goto extract_sfmt_addcc;
+          case 2 : itype = FRVBF_INSN_ADDX; goto extract_sfmt_addx;
+          case 3 : itype = FRVBF_INSN_ADDXCC; goto extract_sfmt_addcc;
           case 4 :
             if ((entire_insn & 0x1fc0fc0) == 0x100)
               { itype = FRVBF_INSN_SUB; goto extract_sfmt_add; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 5 :
-            if ((entire_insn & 0x1fc03c0) == 0x140)
-              { itype = FRVBF_INSN_SUBCC; goto extract_sfmt_addcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 6 :
-            if ((entire_insn & 0x1fc03c0) == 0x180)
-              { itype = FRVBF_INSN_SUBX; goto extract_sfmt_addx; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 7 :
-            if ((entire_insn & 0x1fc03c0) == 0x1c0)
-              { itype = FRVBF_INSN_SUBXCC; goto extract_sfmt_addcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 5 : itype = FRVBF_INSN_SUBCC; goto extract_sfmt_addcc;
+          case 6 : itype = FRVBF_INSN_SUBX; goto extract_sfmt_addx;
+          case 7 : itype = FRVBF_INSN_SUBXCC; goto extract_sfmt_addcc;
           case 8 :
             if ((entire_insn & 0x1fc0fc0) == 0x200)
               { itype = FRVBF_INSN_SMUL; goto extract_sfmt_smul; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 9 :
-            if ((entire_insn & 0x1fc03c0) == 0x240)
-              { itype = FRVBF_INSN_SMULCC; goto extract_sfmt_smulcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 9 : itype = FRVBF_INSN_SMULCC; goto extract_sfmt_smulcc;
           case 10 :
             if ((entire_insn & 0x1fc0fc0) == 0x280)
               { itype = FRVBF_INSN_UMUL; goto extract_sfmt_smul; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 11 :
-            if ((entire_insn & 0x1fc03c0) == 0x2c0)
-              { itype = FRVBF_INSN_UMULCC; goto extract_sfmt_smulcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 11 : itype = FRVBF_INSN_UMULCC; goto extract_sfmt_smulcc;
           case 12 :
             if ((entire_insn & 0x7ffc03c0) == 0x300)
               { itype = FRVBF_INSN_CMPB; goto extract_sfmt_cmpb; }
@@ -949,26 +925,17 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x1fc0fc0) == 0x40000)
               { itype = FRVBF_INSN_AND; goto extract_sfmt_add; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc03c0) == 0x40040)
-              { itype = FRVBF_INSN_ANDCC; goto extract_sfmt_andcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 1 : itype = FRVBF_INSN_ANDCC; goto extract_sfmt_andcc;
           case 2 :
             if ((entire_insn & 0x1fc0fc0) == 0x40080)
               { itype = FRVBF_INSN_OR; goto extract_sfmt_add; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc03c0) == 0x400c0)
-              { itype = FRVBF_INSN_ORCC; goto extract_sfmt_andcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 3 : itype = FRVBF_INSN_ORCC; goto extract_sfmt_andcc;
           case 4 :
             if ((entire_insn & 0x1fc0fc0) == 0x40100)
               { itype = FRVBF_INSN_XOR; goto extract_sfmt_add; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 5 :
-            if ((entire_insn & 0x1fc03c0) == 0x40140)
-              { itype = FRVBF_INSN_XORCC; goto extract_sfmt_andcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 5 : itype = FRVBF_INSN_XORCC; goto extract_sfmt_andcc;
           case 6 :
             if ((entire_insn & 0x1ffffc0) == 0x40180)
               { itype = FRVBF_INSN_NOT; goto extract_sfmt_not; }
@@ -977,26 +944,17 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x1fc0fc0) == 0x40200)
               { itype = FRVBF_INSN_SLL; goto extract_sfmt_add; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 9 :
-            if ((entire_insn & 0x1fc03c0) == 0x40240)
-              { itype = FRVBF_INSN_SLLCC; goto extract_sfmt_addcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 9 : itype = FRVBF_INSN_SLLCC; goto extract_sfmt_addcc;
           case 10 :
             if ((entire_insn & 0x1fc0fc0) == 0x40280)
               { itype = FRVBF_INSN_SRL; goto extract_sfmt_add; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 11 :
-            if ((entire_insn & 0x1fc03c0) == 0x402c0)
-              { itype = FRVBF_INSN_SRLCC; goto extract_sfmt_addcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 11 : itype = FRVBF_INSN_SRLCC; goto extract_sfmt_addcc;
           case 12 :
             if ((entire_insn & 0x1fc0fc0) == 0x40300)
               { itype = FRVBF_INSN_SRA; goto extract_sfmt_add; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 13 :
-            if ((entire_insn & 0x1fc03c0) == 0x40340)
-              { itype = FRVBF_INSN_SRACC; goto extract_sfmt_addcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 13 : itype = FRVBF_INSN_SRACC; goto extract_sfmt_addcc;
           case 14 :
             if ((entire_insn & 0x1fc0fc0) == 0x40380)
               { itype = FRVBF_INSN_NSDIV; goto extract_sfmt_sdiv; }
@@ -1013,222 +971,60 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (63 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80000)
-              { itype = FRVBF_INSN_LDSB; goto extract_sfmt_ldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80040)
-              { itype = FRVBF_INSN_LDUB; goto extract_sfmt_ldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80080)
-              { itype = FRVBF_INSN_LDSH; goto extract_sfmt_ldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc0fc0) == 0x800c0)
-              { itype = FRVBF_INSN_LDUH; goto extract_sfmt_ldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 4 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80100)
-              { itype = FRVBF_INSN_LD; goto extract_sfmt_ldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 5 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80140)
-              { itype = FRVBF_INSN_LDD; goto extract_sfmt_ldd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 6 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80180)
-              { itype = FRVBF_INSN_LDQ; goto extract_sfmt_ldq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 8 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80200)
-              { itype = FRVBF_INSN_LDBF; goto extract_sfmt_ldbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 9 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80240)
-              { itype = FRVBF_INSN_LDHF; goto extract_sfmt_ldbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 10 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80280)
-              { itype = FRVBF_INSN_LDF; goto extract_sfmt_ldbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 11 :
-            if ((entire_insn & 0x1fc0fc0) == 0x802c0)
-              { itype = FRVBF_INSN_LDDF; goto extract_sfmt_lddf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 12 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80300)
-              { itype = FRVBF_INSN_LDQF; goto extract_sfmt_ldqf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 13 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80340)
-              { itype = FRVBF_INSN_LDC; goto extract_sfmt_ldc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 14 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80380)
-              { itype = FRVBF_INSN_LDDC; goto extract_sfmt_lddc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((entire_insn & 0x1fc0fc0) == 0x803c0)
-              { itype = FRVBF_INSN_LDQC; goto extract_sfmt_ldqc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 16 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80400)
-              { itype = FRVBF_INSN_LDSBU; goto extract_sfmt_ldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 17 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80440)
-              { itype = FRVBF_INSN_LDUBU; goto extract_sfmt_ldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 18 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80480)
-              { itype = FRVBF_INSN_LDSHU; goto extract_sfmt_ldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 19 :
-            if ((entire_insn & 0x1fc0fc0) == 0x804c0)
-              { itype = FRVBF_INSN_LDUHU; goto extract_sfmt_ldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 20 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80500)
-              { itype = FRVBF_INSN_LDU; goto extract_sfmt_ldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 21 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80540)
-              { itype = FRVBF_INSN_LDDU; goto extract_sfmt_lddu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 22 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80580)
-              { itype = FRVBF_INSN_LDQU; goto extract_sfmt_ldqu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 24 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80600)
-              { itype = FRVBF_INSN_LDBFU; goto extract_sfmt_ldbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 25 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80640)
-              { itype = FRVBF_INSN_LDHFU; goto extract_sfmt_ldbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 26 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80680)
-              { itype = FRVBF_INSN_LDFU; goto extract_sfmt_ldbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 27 :
-            if ((entire_insn & 0x1fc0fc0) == 0x806c0)
-              { itype = FRVBF_INSN_LDDFU; goto extract_sfmt_lddfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 28 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80700)
-              { itype = FRVBF_INSN_LDQFU; goto extract_sfmt_ldqfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 29 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80740)
-              { itype = FRVBF_INSN_LDCU; goto extract_sfmt_ldcu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 30 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80780)
-              { itype = FRVBF_INSN_LDDCU; goto extract_sfmt_lddcu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 31 :
-            if ((entire_insn & 0x1fc0fc0) == 0x807c0)
-              { itype = FRVBF_INSN_LDQCU; goto extract_sfmt_ldqcu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 32 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80800)
-              { itype = FRVBF_INSN_NLDSB; goto extract_sfmt_nldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 33 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80840)
-              { itype = FRVBF_INSN_NLDUB; goto extract_sfmt_nldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 34 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80880)
-              { itype = FRVBF_INSN_NLDSH; goto extract_sfmt_nldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 35 :
-            if ((entire_insn & 0x1fc0fc0) == 0x808c0)
-              { itype = FRVBF_INSN_NLDUH; goto extract_sfmt_nldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 36 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80900)
-              { itype = FRVBF_INSN_NLD; goto extract_sfmt_nldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 37 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80940)
-              { itype = FRVBF_INSN_NLDD; goto extract_sfmt_nldd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 38 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80980)
-              { itype = FRVBF_INSN_NLDQ; goto extract_sfmt_nldq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 40 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80a00)
-              { itype = FRVBF_INSN_NLDBF; goto extract_sfmt_nldbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 41 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80a40)
-              { itype = FRVBF_INSN_NLDHF; goto extract_sfmt_nldbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 42 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80a80)
-              { itype = FRVBF_INSN_NLDF; goto extract_sfmt_nldbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 43 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80ac0)
-              { itype = FRVBF_INSN_NLDDF; goto extract_sfmt_nlddf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 44 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80b00)
-              { itype = FRVBF_INSN_NLDQF; goto extract_sfmt_nldqf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 48 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80c00)
-              { itype = FRVBF_INSN_NLDSBU; goto extract_sfmt_nldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 49 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80c40)
-              { itype = FRVBF_INSN_NLDUBU; goto extract_sfmt_nldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 50 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80c80)
-              { itype = FRVBF_INSN_NLDSHU; goto extract_sfmt_nldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 51 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80cc0)
-              { itype = FRVBF_INSN_NLDUHU; goto extract_sfmt_nldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 52 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80d00)
-              { itype = FRVBF_INSN_NLDU; goto extract_sfmt_nldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 53 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80d40)
-              { itype = FRVBF_INSN_NLDDU; goto extract_sfmt_nlddu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 54 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80d80)
-              { itype = FRVBF_INSN_NLDQU; goto extract_sfmt_nldqu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 56 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80e00)
-              { itype = FRVBF_INSN_NLDBFU; goto extract_sfmt_nldbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 57 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80e40)
-              { itype = FRVBF_INSN_NLDHFU; goto extract_sfmt_nldbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 58 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80e80)
-              { itype = FRVBF_INSN_NLDFU; goto extract_sfmt_nldbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 59 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80ec0)
-              { itype = FRVBF_INSN_NLDDFU; goto extract_sfmt_nlddfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 60 :
-            if ((entire_insn & 0x1fc0fc0) == 0x80f00)
-              { itype = FRVBF_INSN_NLDQFU; goto extract_sfmt_nldqfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_LDSB; goto extract_sfmt_ldsb;
+          case 1 : itype = FRVBF_INSN_LDUB; goto extract_sfmt_ldsb;
+          case 2 : itype = FRVBF_INSN_LDSH; goto extract_sfmt_ldsb;
+          case 3 : itype = FRVBF_INSN_LDUH; goto extract_sfmt_ldsb;
+          case 4 : itype = FRVBF_INSN_LD; goto extract_sfmt_ldsb;
+          case 5 : itype = FRVBF_INSN_LDD; goto extract_sfmt_ldd;
+          case 6 : itype = FRVBF_INSN_LDQ; goto extract_sfmt_ldq;
+          case 8 : itype = FRVBF_INSN_LDBF; goto extract_sfmt_ldbf;
+          case 9 : itype = FRVBF_INSN_LDHF; goto extract_sfmt_ldbf;
+          case 10 : itype = FRVBF_INSN_LDF; goto extract_sfmt_ldbf;
+          case 11 : itype = FRVBF_INSN_LDDF; goto extract_sfmt_lddf;
+          case 12 : itype = FRVBF_INSN_LDQF; goto extract_sfmt_ldqf;
+          case 13 : itype = FRVBF_INSN_LDC; goto extract_sfmt_ldc;
+          case 14 : itype = FRVBF_INSN_LDDC; goto extract_sfmt_lddc;
+          case 15 : itype = FRVBF_INSN_LDQC; goto extract_sfmt_ldqc;
+          case 16 : itype = FRVBF_INSN_LDSBU; goto extract_sfmt_ldsbu;
+          case 17 : itype = FRVBF_INSN_LDUBU; goto extract_sfmt_ldsbu;
+          case 18 : itype = FRVBF_INSN_LDSHU; goto extract_sfmt_ldsbu;
+          case 19 : itype = FRVBF_INSN_LDUHU; goto extract_sfmt_ldsbu;
+          case 20 : itype = FRVBF_INSN_LDU; goto extract_sfmt_ldsbu;
+          case 21 : itype = FRVBF_INSN_LDDU; goto extract_sfmt_lddu;
+          case 22 : itype = FRVBF_INSN_LDQU; goto extract_sfmt_ldqu;
+          case 24 : itype = FRVBF_INSN_LDBFU; goto extract_sfmt_ldbfu;
+          case 25 : itype = FRVBF_INSN_LDHFU; goto extract_sfmt_ldbfu;
+          case 26 : itype = FRVBF_INSN_LDFU; goto extract_sfmt_ldbfu;
+          case 27 : itype = FRVBF_INSN_LDDFU; goto extract_sfmt_lddfu;
+          case 28 : itype = FRVBF_INSN_LDQFU; goto extract_sfmt_ldqfu;
+          case 29 : itype = FRVBF_INSN_LDCU; goto extract_sfmt_ldcu;
+          case 30 : itype = FRVBF_INSN_LDDCU; goto extract_sfmt_lddcu;
+          case 31 : itype = FRVBF_INSN_LDQCU; goto extract_sfmt_ldqcu;
+          case 32 : itype = FRVBF_INSN_NLDSB; goto extract_sfmt_nldsb;
+          case 33 : itype = FRVBF_INSN_NLDUB; goto extract_sfmt_nldsb;
+          case 34 : itype = FRVBF_INSN_NLDSH; goto extract_sfmt_nldsb;
+          case 35 : itype = FRVBF_INSN_NLDUH; goto extract_sfmt_nldsb;
+          case 36 : itype = FRVBF_INSN_NLD; goto extract_sfmt_nldsb;
+          case 37 : itype = FRVBF_INSN_NLDD; goto extract_sfmt_nldd;
+          case 38 : itype = FRVBF_INSN_NLDQ; goto extract_sfmt_nldq;
+          case 40 : itype = FRVBF_INSN_NLDBF; goto extract_sfmt_nldbf;
+          case 41 : itype = FRVBF_INSN_NLDHF; goto extract_sfmt_nldbf;
+          case 42 : itype = FRVBF_INSN_NLDF; goto extract_sfmt_nldbf;
+          case 43 : itype = FRVBF_INSN_NLDDF; goto extract_sfmt_nlddf;
+          case 44 : itype = FRVBF_INSN_NLDQF; goto extract_sfmt_nldqf;
+          case 48 : itype = FRVBF_INSN_NLDSBU; goto extract_sfmt_nldsbu;
+          case 49 : itype = FRVBF_INSN_NLDUBU; goto extract_sfmt_nldsbu;
+          case 50 : itype = FRVBF_INSN_NLDSHU; goto extract_sfmt_nldsbu;
+          case 51 : itype = FRVBF_INSN_NLDUHU; goto extract_sfmt_nldsbu;
+          case 52 : itype = FRVBF_INSN_NLDU; goto extract_sfmt_nldsbu;
+          case 53 : itype = FRVBF_INSN_NLDDU; goto extract_sfmt_nlddu;
+          case 54 : itype = FRVBF_INSN_NLDQU; goto extract_sfmt_nldqu;
+          case 56 : itype = FRVBF_INSN_NLDBFU; goto extract_sfmt_nldbfu;
+          case 57 : itype = FRVBF_INSN_NLDHFU; goto extract_sfmt_nldbfu;
+          case 58 : itype = FRVBF_INSN_NLDFU; goto extract_sfmt_nldbfu;
+          case 59 : itype = FRVBF_INSN_NLDDFU; goto extract_sfmt_nlddfu;
+          case 60 : itype = FRVBF_INSN_NLDQFU; goto extract_sfmt_nldqfu;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1237,58 +1033,19 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (63 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0000)
-              { itype = FRVBF_INSN_STB; goto extract_sfmt_stb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0040)
-              { itype = FRVBF_INSN_STH; goto extract_sfmt_stb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0080)
-              { itype = FRVBF_INSN_ST; goto extract_sfmt_stb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc00c0)
-              { itype = FRVBF_INSN_STD; goto extract_sfmt_std; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 4 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0100)
-              { itype = FRVBF_INSN_STQ; goto extract_sfmt_ldq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 5 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0140)
-              { itype = FRVBF_INSN_SWAP; goto extract_sfmt_swap; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 6 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0180)
-              { itype = FRVBF_INSN_MOVGS; goto extract_sfmt_movgs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 7 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc01c0)
-              { itype = FRVBF_INSN_MOVSG; goto extract_sfmt_movsg; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 8 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0200)
-              { itype = FRVBF_INSN_STBF; goto extract_sfmt_stbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 9 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0240)
-              { itype = FRVBF_INSN_STHF; goto extract_sfmt_stbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 10 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0280)
-              { itype = FRVBF_INSN_STF; goto extract_sfmt_stbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 11 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc02c0)
-              { itype = FRVBF_INSN_STDF; goto extract_sfmt_stdf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 12 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0300)
-              { itype = FRVBF_INSN_STQF; goto extract_sfmt_ldqf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_STB; goto extract_sfmt_stb;
+          case 1 : itype = FRVBF_INSN_STH; goto extract_sfmt_stb;
+          case 2 : itype = FRVBF_INSN_ST; goto extract_sfmt_stb;
+          case 3 : itype = FRVBF_INSN_STD; goto extract_sfmt_std;
+          case 4 : itype = FRVBF_INSN_STQ; goto extract_sfmt_ldq;
+          case 5 : itype = FRVBF_INSN_SWAP; goto extract_sfmt_swap;
+          case 6 : itype = FRVBF_INSN_MOVGS; goto extract_sfmt_movgs;
+          case 7 : itype = FRVBF_INSN_MOVSG; goto extract_sfmt_movsg;
+          case 8 : itype = FRVBF_INSN_STBF; goto extract_sfmt_stbf;
+          case 9 : itype = FRVBF_INSN_STHF; goto extract_sfmt_stbf;
+          case 10 : itype = FRVBF_INSN_STF; goto extract_sfmt_stbf;
+          case 11 : itype = FRVBF_INSN_STDF; goto extract_sfmt_stdf;
+          case 12 : itype = FRVBF_INSN_STQF; goto extract_sfmt_ldqf;
           case 13 :
             if ((entire_insn & 0x1ffffc0) == 0xc0340)
               { itype = FRVBF_INSN_MOVFG; goto extract_sfmt_movfg; }
@@ -1301,26 +1058,11 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x1ffffc0) == 0xc03c0)
               { itype = FRVBF_INSN_MOVFGQ; goto extract_sfmt_movfgq; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 16 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0400)
-              { itype = FRVBF_INSN_STBU; goto extract_sfmt_stbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 17 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0440)
-              { itype = FRVBF_INSN_STHU; goto extract_sfmt_stbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 18 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0480)
-              { itype = FRVBF_INSN_STU; goto extract_sfmt_stbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 19 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc04c0)
-              { itype = FRVBF_INSN_STDU; goto extract_sfmt_stdu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 20 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0500)
-              { itype = FRVBF_INSN_STQU; goto extract_sfmt_stqu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 16 : itype = FRVBF_INSN_STBU; goto extract_sfmt_stbu;
+          case 17 : itype = FRVBF_INSN_STHU; goto extract_sfmt_stbu;
+          case 18 : itype = FRVBF_INSN_STU; goto extract_sfmt_stbu;
+          case 19 : itype = FRVBF_INSN_STDU; goto extract_sfmt_stdu;
+          case 20 : itype = FRVBF_INSN_STQU; goto extract_sfmt_stqu;
           case 21 :
             if ((entire_insn & 0x1ffffc0) == 0xc0540)
               { itype = FRVBF_INSN_MOVGF; goto extract_sfmt_movgf; }
@@ -1333,26 +1075,11 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x1ffffc0) == 0xc05c0)
               { itype = FRVBF_INSN_MOVGFQ; goto extract_sfmt_movgfq; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 24 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0600)
-              { itype = FRVBF_INSN_STBFU; goto extract_sfmt_stbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 25 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0640)
-              { itype = FRVBF_INSN_STHFU; goto extract_sfmt_stbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 26 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0680)
-              { itype = FRVBF_INSN_STFU; goto extract_sfmt_stbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 27 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc06c0)
-              { itype = FRVBF_INSN_STDFU; goto extract_sfmt_stdfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 28 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0700)
-              { itype = FRVBF_INSN_STQFU; goto extract_sfmt_ldqfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 24 : itype = FRVBF_INSN_STBFU; goto extract_sfmt_stbfu;
+          case 25 : itype = FRVBF_INSN_STHFU; goto extract_sfmt_stbfu;
+          case 26 : itype = FRVBF_INSN_STFU; goto extract_sfmt_stbfu;
+          case 27 : itype = FRVBF_INSN_STDFU; goto extract_sfmt_stdfu;
+          case 28 : itype = FRVBF_INSN_STQFU; goto extract_sfmt_ldqfu;
           case 32 :
             if ((entire_insn & 0x1fc0fc7) == 0xc0800)
               { itype = FRVBF_INSN_LRAI; goto extract_sfmt_rei; }
@@ -1365,30 +1092,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x61fc0fc0) == 0xc0900)
               { itype = FRVBF_INSN_TLBPR; goto extract_sfmt_rei; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 37 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0940)
-              { itype = FRVBF_INSN_STC; goto extract_sfmt_stc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 38 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0980)
-              { itype = FRVBF_INSN_STDC; goto extract_sfmt_stdc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 39 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc09c0)
-              { itype = FRVBF_INSN_STQC; goto extract_sfmt_ldqc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 45 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0b40)
-              { itype = FRVBF_INSN_STCU; goto extract_sfmt_stcu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 46 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0b80)
-              { itype = FRVBF_INSN_STDCU; goto extract_sfmt_stdcu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 47 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0bc0)
-              { itype = FRVBF_INSN_STQCU; goto extract_sfmt_ldqcu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 37 : itype = FRVBF_INSN_STC; goto extract_sfmt_stc;
+          case 38 : itype = FRVBF_INSN_STDC; goto extract_sfmt_stdc;
+          case 39 : itype = FRVBF_INSN_STQC; goto extract_sfmt_ldqc;
+          case 45 : itype = FRVBF_INSN_STCU; goto extract_sfmt_stcu;
+          case 46 : itype = FRVBF_INSN_STDCU; goto extract_sfmt_stdcu;
+          case 47 : itype = FRVBF_INSN_STQCU; goto extract_sfmt_ldqcu;
           case 48 :
             if ((entire_insn & 0x7dfc0fc0) == 0xc0c00)
               { itype = FRVBF_INSN_ICPL; goto extract_sfmt_icpl; }
@@ -1397,10 +1106,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x7ffc0fff) == 0xc0c40)
               { itype = FRVBF_INSN_ICUL; goto extract_sfmt_icul; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 50 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0c80)
-              { itype = FRVBF_INSN_WITLB; goto extract_sfmt_rei; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 50 : itype = FRVBF_INSN_WITLB; goto extract_sfmt_rei;
           case 51 :
             if ((entire_insn & 0x7ffc0fc0) == 0xc0cc0)
               { itype = FRVBF_INSN_ITLBI; goto extract_sfmt_rei; }
@@ -1413,10 +1119,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x7ffc0fff) == 0xc0d40)
               { itype = FRVBF_INSN_DCUL; goto extract_sfmt_icul; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 54 :
-            if ((entire_insn & 0x1fc0fc0) == 0xc0d80)
-              { itype = FRVBF_INSN_WDTLB; goto extract_sfmt_rei; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 54 : itype = FRVBF_INSN_WDTLB; goto extract_sfmt_rei;
           case 55 :
             if ((entire_insn & 0x7ffc0fc0) == 0xc0dc0)
               { itype = FRVBF_INSN_DTLBI; goto extract_sfmt_rei; }
@@ -1613,66 +1316,24 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x7ffcffff) == 0x180000)
               { itype = FRVBF_INSN_BNO; goto extract_sfmt_bno; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x79fc0000) == 0x8180000)
-              { itype = FRVBF_INSN_BC; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x79fc0000) == 0x10180000)
-              { itype = FRVBF_INSN_BV; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x79fc0000) == 0x18180000)
-              { itype = FRVBF_INSN_BLT; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 4 :
-            if ((entire_insn & 0x79fc0000) == 0x20180000)
-              { itype = FRVBF_INSN_BEQ; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 5 :
-            if ((entire_insn & 0x79fc0000) == 0x28180000)
-              { itype = FRVBF_INSN_BLS; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 6 :
-            if ((entire_insn & 0x79fc0000) == 0x30180000)
-              { itype = FRVBF_INSN_BN; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 7 :
-            if ((entire_insn & 0x79fc0000) == 0x38180000)
-              { itype = FRVBF_INSN_BLE; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 1 : itype = FRVBF_INSN_BC; goto extract_sfmt_beq;
+          case 2 : itype = FRVBF_INSN_BV; goto extract_sfmt_beq;
+          case 3 : itype = FRVBF_INSN_BLT; goto extract_sfmt_beq;
+          case 4 : itype = FRVBF_INSN_BEQ; goto extract_sfmt_beq;
+          case 5 : itype = FRVBF_INSN_BLS; goto extract_sfmt_beq;
+          case 6 : itype = FRVBF_INSN_BN; goto extract_sfmt_beq;
+          case 7 : itype = FRVBF_INSN_BLE; goto extract_sfmt_beq;
           case 8 :
             if ((entire_insn & 0x7ffc0000) == 0x40180000)
               { itype = FRVBF_INSN_BRA; goto extract_sfmt_bra; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 9 :
-            if ((entire_insn & 0x79fc0000) == 0x48180000)
-              { itype = FRVBF_INSN_BNC; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 10 :
-            if ((entire_insn & 0x79fc0000) == 0x50180000)
-              { itype = FRVBF_INSN_BNV; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 11 :
-            if ((entire_insn & 0x79fc0000) == 0x58180000)
-              { itype = FRVBF_INSN_BGE; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 12 :
-            if ((entire_insn & 0x79fc0000) == 0x60180000)
-              { itype = FRVBF_INSN_BNE; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 13 :
-            if ((entire_insn & 0x79fc0000) == 0x68180000)
-              { itype = FRVBF_INSN_BHI; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 14 :
-            if ((entire_insn & 0x79fc0000) == 0x70180000)
-              { itype = FRVBF_INSN_BP; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((entire_insn & 0x79fc0000) == 0x78180000)
-              { itype = FRVBF_INSN_BGT; goto extract_sfmt_beq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 9 : itype = FRVBF_INSN_BNC; goto extract_sfmt_beq;
+          case 10 : itype = FRVBF_INSN_BNV; goto extract_sfmt_beq;
+          case 11 : itype = FRVBF_INSN_BGE; goto extract_sfmt_beq;
+          case 12 : itype = FRVBF_INSN_BNE; goto extract_sfmt_beq;
+          case 13 : itype = FRVBF_INSN_BHI; goto extract_sfmt_beq;
+          case 14 : itype = FRVBF_INSN_BP; goto extract_sfmt_beq;
+          case 15 : itype = FRVBF_INSN_BGT; goto extract_sfmt_beq;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -1685,62 +1346,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x7ffcffff) == 0x1c0000)
               { itype = FRVBF_INSN_FBNO; goto extract_sfmt_bno; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x79fc0000) == 0x81c0000)
-              { itype = FRVBF_INSN_FBU; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x79fc0000) == 0x101c0000)
-              { itype = FRVBF_INSN_FBGT; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x79fc0000) == 0x181c0000)
-              { itype = FRVBF_INSN_FBUG; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 4 :
-            if ((entire_insn & 0x79fc0000) == 0x201c0000)
-              { itype = FRVBF_INSN_FBLT; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 5 :
-            if ((entire_insn & 0x79fc0000) == 0x281c0000)
-              { itype = FRVBF_INSN_FBUL; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 6 :
-            if ((entire_insn & 0x79fc0000) == 0x301c0000)
-              { itype = FRVBF_INSN_FBLG; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 7 :
-            if ((entire_insn & 0x79fc0000) == 0x381c0000)
-              { itype = FRVBF_INSN_FBNE; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 8 :
-            if ((entire_insn & 0x79fc0000) == 0x401c0000)
-              { itype = FRVBF_INSN_FBEQ; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 9 :
-            if ((entire_insn & 0x79fc0000) == 0x481c0000)
-              { itype = FRVBF_INSN_FBUE; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 10 :
-            if ((entire_insn & 0x79fc0000) == 0x501c0000)
-              { itype = FRVBF_INSN_FBGE; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 11 :
-            if ((entire_insn & 0x79fc0000) == 0x581c0000)
-              { itype = FRVBF_INSN_FBUGE; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 12 :
-            if ((entire_insn & 0x79fc0000) == 0x601c0000)
-              { itype = FRVBF_INSN_FBLE; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 13 :
-            if ((entire_insn & 0x79fc0000) == 0x681c0000)
-              { itype = FRVBF_INSN_FBULE; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 14 :
-            if ((entire_insn & 0x79fc0000) == 0x701c0000)
-              { itype = FRVBF_INSN_FBO; goto extract_sfmt_fbne; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 1 : itype = FRVBF_INSN_FBU; goto extract_sfmt_fbne;
+          case 2 : itype = FRVBF_INSN_FBGT; goto extract_sfmt_fbne;
+          case 3 : itype = FRVBF_INSN_FBUG; goto extract_sfmt_fbne;
+          case 4 : itype = FRVBF_INSN_FBLT; goto extract_sfmt_fbne;
+          case 5 : itype = FRVBF_INSN_FBUL; goto extract_sfmt_fbne;
+          case 6 : itype = FRVBF_INSN_FBLG; goto extract_sfmt_fbne;
+          case 7 : itype = FRVBF_INSN_FBNE; goto extract_sfmt_fbne;
+          case 8 : itype = FRVBF_INSN_FBEQ; goto extract_sfmt_fbne;
+          case 9 : itype = FRVBF_INSN_FBUE; goto extract_sfmt_fbne;
+          case 10 : itype = FRVBF_INSN_FBGE; goto extract_sfmt_fbne;
+          case 11 : itype = FRVBF_INSN_FBUGE; goto extract_sfmt_fbne;
+          case 12 : itype = FRVBF_INSN_FBLE; goto extract_sfmt_fbne;
+          case 13 : itype = FRVBF_INSN_FBULE; goto extract_sfmt_fbne;
+          case 14 : itype = FRVBF_INSN_FBO; goto extract_sfmt_fbne;
           case 15 :
             if ((entire_insn & 0x7ffc0000) == 0x781c0000)
               { itype = FRVBF_INSN_FBRA; goto extract_sfmt_bra; }
@@ -2284,58 +1903,19 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 15 :
-        if ((entire_insn & 0x1fc0000) == 0x3c0000)
-          { itype = FRVBF_INSN_CALL; goto extract_sfmt_call; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 16 :
-        if ((entire_insn & 0x1fc0000) == 0x400000)
-          { itype = FRVBF_INSN_ADDI; goto extract_sfmt_addi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 17 :
-        if ((entire_insn & 0x1fc0000) == 0x440000)
-          { itype = FRVBF_INSN_ADDICC; goto extract_sfmt_addicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 18 :
-        if ((entire_insn & 0x1fc0000) == 0x480000)
-          { itype = FRVBF_INSN_ADDXI; goto extract_sfmt_addxi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 19 :
-        if ((entire_insn & 0x1fc0000) == 0x4c0000)
-          { itype = FRVBF_INSN_ADDXICC; goto extract_sfmt_addicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 20 :
-        if ((entire_insn & 0x1fc0000) == 0x500000)
-          { itype = FRVBF_INSN_SUBI; goto extract_sfmt_addi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 21 :
-        if ((entire_insn & 0x1fc0000) == 0x540000)
-          { itype = FRVBF_INSN_SUBICC; goto extract_sfmt_addicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 22 :
-        if ((entire_insn & 0x1fc0000) == 0x580000)
-          { itype = FRVBF_INSN_SUBXI; goto extract_sfmt_addxi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 23 :
-        if ((entire_insn & 0x1fc0000) == 0x5c0000)
-          { itype = FRVBF_INSN_SUBXICC; goto extract_sfmt_addicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 24 :
-        if ((entire_insn & 0x1fc0000) == 0x600000)
-          { itype = FRVBF_INSN_SMULI; goto extract_sfmt_smuli; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 25 :
-        if ((entire_insn & 0x1fc0000) == 0x640000)
-          { itype = FRVBF_INSN_SMULICC; goto extract_sfmt_smulicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 26 :
-        if ((entire_insn & 0x1fc0000) == 0x680000)
-          { itype = FRVBF_INSN_UMULI; goto extract_sfmt_smuli; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 27 :
-        if ((entire_insn & 0x1fc0000) == 0x6c0000)
-          { itype = FRVBF_INSN_UMULICC; goto extract_sfmt_smulicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 15 : itype = FRVBF_INSN_CALL; goto extract_sfmt_call;
+      case 16 : itype = FRVBF_INSN_ADDI; goto extract_sfmt_addi;
+      case 17 : itype = FRVBF_INSN_ADDICC; goto extract_sfmt_addicc;
+      case 18 : itype = FRVBF_INSN_ADDXI; goto extract_sfmt_addxi;
+      case 19 : itype = FRVBF_INSN_ADDXICC; goto extract_sfmt_addicc;
+      case 20 : itype = FRVBF_INSN_SUBI; goto extract_sfmt_addi;
+      case 21 : itype = FRVBF_INSN_SUBICC; goto extract_sfmt_addicc;
+      case 22 : itype = FRVBF_INSN_SUBXI; goto extract_sfmt_addxi;
+      case 23 : itype = FRVBF_INSN_SUBXICC; goto extract_sfmt_addicc;
+      case 24 : itype = FRVBF_INSN_SMULI; goto extract_sfmt_smuli;
+      case 25 : itype = FRVBF_INSN_SMULICC; goto extract_sfmt_smulicc;
+      case 26 : itype = FRVBF_INSN_UMULI; goto extract_sfmt_smuli;
+      case 27 : itype = FRVBF_INSN_UMULICC; goto extract_sfmt_smulicc;
       case 28 :
         {
           unsigned int val = (((insn >> 27) & (15 << 0)));
@@ -2345,66 +1925,24 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x7fffffff) == 0x700000)
               { itype = FRVBF_INSN_TINO; goto extract_sfmt_rei; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x79fc0000) == 0x8700000)
-              { itype = FRVBF_INSN_TIC; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x79fc0000) == 0x10700000)
-              { itype = FRVBF_INSN_TIV; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x79fc0000) == 0x18700000)
-              { itype = FRVBF_INSN_TILT; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 4 :
-            if ((entire_insn & 0x79fc0000) == 0x20700000)
-              { itype = FRVBF_INSN_TIEQ; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 5 :
-            if ((entire_insn & 0x79fc0000) == 0x28700000)
-              { itype = FRVBF_INSN_TILS; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 6 :
-            if ((entire_insn & 0x79fc0000) == 0x30700000)
-              { itype = FRVBF_INSN_TIN; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 7 :
-            if ((entire_insn & 0x79fc0000) == 0x38700000)
-              { itype = FRVBF_INSN_TILE; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 1 : itype = FRVBF_INSN_TIC; goto extract_sfmt_tieq;
+          case 2 : itype = FRVBF_INSN_TIV; goto extract_sfmt_tieq;
+          case 3 : itype = FRVBF_INSN_TILT; goto extract_sfmt_tieq;
+          case 4 : itype = FRVBF_INSN_TIEQ; goto extract_sfmt_tieq;
+          case 5 : itype = FRVBF_INSN_TILS; goto extract_sfmt_tieq;
+          case 6 : itype = FRVBF_INSN_TIN; goto extract_sfmt_tieq;
+          case 7 : itype = FRVBF_INSN_TILE; goto extract_sfmt_tieq;
           case 8 :
             if ((entire_insn & 0x7ffc0000) == 0x40700000)
               { itype = FRVBF_INSN_TIRA; goto extract_sfmt_tira; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 9 :
-            if ((entire_insn & 0x79fc0000) == 0x48700000)
-              { itype = FRVBF_INSN_TINC; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 10 :
-            if ((entire_insn & 0x79fc0000) == 0x50700000)
-              { itype = FRVBF_INSN_TINV; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 11 :
-            if ((entire_insn & 0x79fc0000) == 0x58700000)
-              { itype = FRVBF_INSN_TIGE; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 12 :
-            if ((entire_insn & 0x79fc0000) == 0x60700000)
-              { itype = FRVBF_INSN_TINE; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 13 :
-            if ((entire_insn & 0x79fc0000) == 0x68700000)
-              { itype = FRVBF_INSN_TIHI; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 14 :
-            if ((entire_insn & 0x79fc0000) == 0x70700000)
-              { itype = FRVBF_INSN_TIP; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((entire_insn & 0x79fc0000) == 0x78700000)
-              { itype = FRVBF_INSN_TIGT; goto extract_sfmt_tieq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 9 : itype = FRVBF_INSN_TINC; goto extract_sfmt_tieq;
+          case 10 : itype = FRVBF_INSN_TINV; goto extract_sfmt_tieq;
+          case 11 : itype = FRVBF_INSN_TIGE; goto extract_sfmt_tieq;
+          case 12 : itype = FRVBF_INSN_TINE; goto extract_sfmt_tieq;
+          case 13 : itype = FRVBF_INSN_TIHI; goto extract_sfmt_tieq;
+          case 14 : itype = FRVBF_INSN_TIP; goto extract_sfmt_tieq;
+          case 15 : itype = FRVBF_INSN_TIGT; goto extract_sfmt_tieq;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2417,62 +1955,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x7fffffff) == 0x740000)
               { itype = FRVBF_INSN_FTINO; goto extract_sfmt_rei; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x79fc0000) == 0x8740000)
-              { itype = FRVBF_INSN_FTIU; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x79fc0000) == 0x10740000)
-              { itype = FRVBF_INSN_FTIGT; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x79fc0000) == 0x18740000)
-              { itype = FRVBF_INSN_FTIUG; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 4 :
-            if ((entire_insn & 0x79fc0000) == 0x20740000)
-              { itype = FRVBF_INSN_FTILT; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 5 :
-            if ((entire_insn & 0x79fc0000) == 0x28740000)
-              { itype = FRVBF_INSN_FTIUL; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 6 :
-            if ((entire_insn & 0x79fc0000) == 0x30740000)
-              { itype = FRVBF_INSN_FTILG; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 7 :
-            if ((entire_insn & 0x79fc0000) == 0x38740000)
-              { itype = FRVBF_INSN_FTINE; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 8 :
-            if ((entire_insn & 0x79fc0000) == 0x40740000)
-              { itype = FRVBF_INSN_FTIEQ; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 9 :
-            if ((entire_insn & 0x79fc0000) == 0x48740000)
-              { itype = FRVBF_INSN_FTIUE; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 10 :
-            if ((entire_insn & 0x79fc0000) == 0x50740000)
-              { itype = FRVBF_INSN_FTIGE; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 11 :
-            if ((entire_insn & 0x79fc0000) == 0x58740000)
-              { itype = FRVBF_INSN_FTIUGE; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 12 :
-            if ((entire_insn & 0x79fc0000) == 0x60740000)
-              { itype = FRVBF_INSN_FTILE; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 13 :
-            if ((entire_insn & 0x79fc0000) == 0x68740000)
-              { itype = FRVBF_INSN_FTIULE; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 14 :
-            if ((entire_insn & 0x79fc0000) == 0x70740000)
-              { itype = FRVBF_INSN_FTIO; goto extract_sfmt_ftine; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 1 : itype = FRVBF_INSN_FTIU; goto extract_sfmt_ftine;
+          case 2 : itype = FRVBF_INSN_FTIGT; goto extract_sfmt_ftine;
+          case 3 : itype = FRVBF_INSN_FTIUG; goto extract_sfmt_ftine;
+          case 4 : itype = FRVBF_INSN_FTILT; goto extract_sfmt_ftine;
+          case 5 : itype = FRVBF_INSN_FTIUL; goto extract_sfmt_ftine;
+          case 6 : itype = FRVBF_INSN_FTILG; goto extract_sfmt_ftine;
+          case 7 : itype = FRVBF_INSN_FTINE; goto extract_sfmt_ftine;
+          case 8 : itype = FRVBF_INSN_FTIEQ; goto extract_sfmt_ftine;
+          case 9 : itype = FRVBF_INSN_FTIUE; goto extract_sfmt_ftine;
+          case 10 : itype = FRVBF_INSN_FTIGE; goto extract_sfmt_ftine;
+          case 11 : itype = FRVBF_INSN_FTIUGE; goto extract_sfmt_ftine;
+          case 12 : itype = FRVBF_INSN_FTILE; goto extract_sfmt_ftine;
+          case 13 : itype = FRVBF_INSN_FTIULE; goto extract_sfmt_ftine;
+          case 14 : itype = FRVBF_INSN_FTIO; goto extract_sfmt_ftine;
           case 15 :
             if ((entire_insn & 0x7ffc0000) == 0x78740000)
               { itype = FRVBF_INSN_FTIRA; goto extract_sfmt_tira; }
@@ -2480,122 +1976,38 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 30 :
-        if ((entire_insn & 0x1fc0000) == 0x780000)
-          { itype = FRVBF_INSN_SDIVI; goto extract_sfmt_sdivi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 31 :
-        if ((entire_insn & 0x1fc0000) == 0x7c0000)
-          { itype = FRVBF_INSN_UDIVI; goto extract_sfmt_sdivi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 32 :
-        if ((entire_insn & 0x1fc0000) == 0x800000)
-          { itype = FRVBF_INSN_ANDI; goto extract_sfmt_addi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 33 :
-        if ((entire_insn & 0x1fc0000) == 0x840000)
-          { itype = FRVBF_INSN_ANDICC; goto extract_sfmt_andicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 34 :
-        if ((entire_insn & 0x1fc0000) == 0x880000)
-          { itype = FRVBF_INSN_ORI; goto extract_sfmt_addi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 35 :
-        if ((entire_insn & 0x1fc0000) == 0x8c0000)
-          { itype = FRVBF_INSN_ORICC; goto extract_sfmt_andicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 36 :
-        if ((entire_insn & 0x1fc0000) == 0x900000)
-          { itype = FRVBF_INSN_XORI; goto extract_sfmt_addi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 37 :
-        if ((entire_insn & 0x1fc0000) == 0x940000)
-          { itype = FRVBF_INSN_XORICC; goto extract_sfmt_andicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 40 :
-        if ((entire_insn & 0x1fc0000) == 0xa00000)
-          { itype = FRVBF_INSN_SLLI; goto extract_sfmt_addi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 41 :
-        if ((entire_insn & 0x1fc0000) == 0xa40000)
-          { itype = FRVBF_INSN_SLLICC; goto extract_sfmt_addicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 42 :
-        if ((entire_insn & 0x1fc0000) == 0xa80000)
-          { itype = FRVBF_INSN_SRLI; goto extract_sfmt_addi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 43 :
-        if ((entire_insn & 0x1fc0000) == 0xac0000)
-          { itype = FRVBF_INSN_SRLICC; goto extract_sfmt_addicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 44 :
-        if ((entire_insn & 0x1fc0000) == 0xb00000)
-          { itype = FRVBF_INSN_SRAI; goto extract_sfmt_addi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 45 :
-        if ((entire_insn & 0x1fc0000) == 0xb40000)
-          { itype = FRVBF_INSN_SRAICC; goto extract_sfmt_addicc; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 46 :
-        if ((entire_insn & 0x1fc0000) == 0xb80000)
-          { itype = FRVBF_INSN_NSDIVI; goto extract_sfmt_sdivi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 47 :
-        if ((entire_insn & 0x1fc0000) == 0xbc0000)
-          { itype = FRVBF_INSN_NUDIVI; goto extract_sfmt_sdivi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 48 :
-        if ((entire_insn & 0x1fc0000) == 0xc00000)
-          { itype = FRVBF_INSN_LDSBI; goto extract_sfmt_ldsbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 49 :
-        if ((entire_insn & 0x1fc0000) == 0xc40000)
-          { itype = FRVBF_INSN_LDSHI; goto extract_sfmt_ldsbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 50 :
-        if ((entire_insn & 0x1fc0000) == 0xc80000)
-          { itype = FRVBF_INSN_LDI; goto extract_sfmt_ldsbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 51 :
-        if ((entire_insn & 0x1fc0000) == 0xcc0000)
-          { itype = FRVBF_INSN_LDDI; goto extract_sfmt_lddi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 52 :
-        if ((entire_insn & 0x1fc0000) == 0xd00000)
-          { itype = FRVBF_INSN_LDQI; goto extract_sfmt_ldqi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 53 :
-        if ((entire_insn & 0x1fc0000) == 0xd40000)
-          { itype = FRVBF_INSN_LDUBI; goto extract_sfmt_ldsbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 54 :
-        if ((entire_insn & 0x1fc0000) == 0xd80000)
-          { itype = FRVBF_INSN_LDUHI; goto extract_sfmt_ldsbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 30 : itype = FRVBF_INSN_SDIVI; goto extract_sfmt_sdivi;
+      case 31 : itype = FRVBF_INSN_UDIVI; goto extract_sfmt_sdivi;
+      case 32 : itype = FRVBF_INSN_ANDI; goto extract_sfmt_addi;
+      case 33 : itype = FRVBF_INSN_ANDICC; goto extract_sfmt_andicc;
+      case 34 : itype = FRVBF_INSN_ORI; goto extract_sfmt_addi;
+      case 35 : itype = FRVBF_INSN_ORICC; goto extract_sfmt_andicc;
+      case 36 : itype = FRVBF_INSN_XORI; goto extract_sfmt_addi;
+      case 37 : itype = FRVBF_INSN_XORICC; goto extract_sfmt_andicc;
+      case 40 : itype = FRVBF_INSN_SLLI; goto extract_sfmt_addi;
+      case 41 : itype = FRVBF_INSN_SLLICC; goto extract_sfmt_addicc;
+      case 42 : itype = FRVBF_INSN_SRLI; goto extract_sfmt_addi;
+      case 43 : itype = FRVBF_INSN_SRLICC; goto extract_sfmt_addicc;
+      case 44 : itype = FRVBF_INSN_SRAI; goto extract_sfmt_addi;
+      case 45 : itype = FRVBF_INSN_SRAICC; goto extract_sfmt_addicc;
+      case 46 : itype = FRVBF_INSN_NSDIVI; goto extract_sfmt_sdivi;
+      case 47 : itype = FRVBF_INSN_NUDIVI; goto extract_sfmt_sdivi;
+      case 48 : itype = FRVBF_INSN_LDSBI; goto extract_sfmt_ldsbi;
+      case 49 : itype = FRVBF_INSN_LDSHI; goto extract_sfmt_ldsbi;
+      case 50 : itype = FRVBF_INSN_LDI; goto extract_sfmt_ldsbi;
+      case 51 : itype = FRVBF_INSN_LDDI; goto extract_sfmt_lddi;
+      case 52 : itype = FRVBF_INSN_LDQI; goto extract_sfmt_ldqi;
+      case 53 : itype = FRVBF_INSN_LDUBI; goto extract_sfmt_ldsbi;
+      case 54 : itype = FRVBF_INSN_LDUHI; goto extract_sfmt_ldsbi;
       case 55 :
         if ((entire_insn & 0x7ffc0fff) == 0xdc0000)
           { itype = FRVBF_INSN_REI; goto extract_sfmt_rei; }
         itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 56 :
-        if ((entire_insn & 0x1fc0000) == 0xe00000)
-          { itype = FRVBF_INSN_LDBFI; goto extract_sfmt_ldbfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 57 :
-        if ((entire_insn & 0x1fc0000) == 0xe40000)
-          { itype = FRVBF_INSN_LDHFI; goto extract_sfmt_ldbfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 58 :
-        if ((entire_insn & 0x1fc0000) == 0xe80000)
-          { itype = FRVBF_INSN_LDFI; goto extract_sfmt_ldbfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 59 :
-        if ((entire_insn & 0x1fc0000) == 0xec0000)
-          { itype = FRVBF_INSN_LDDFI; goto extract_sfmt_lddfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 60 :
-        if ((entire_insn & 0x1fc0000) == 0xf00000)
-          { itype = FRVBF_INSN_LDQFI; goto extract_sfmt_ldqfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 56 : itype = FRVBF_INSN_LDBFI; goto extract_sfmt_ldbfi;
+      case 57 : itype = FRVBF_INSN_LDHFI; goto extract_sfmt_ldbfi;
+      case 58 : itype = FRVBF_INSN_LDFI; goto extract_sfmt_ldbfi;
+      case 59 : itype = FRVBF_INSN_LDDFI; goto extract_sfmt_lddfi;
+      case 60 : itype = FRVBF_INSN_LDQFI; goto extract_sfmt_ldqfi;
       case 61 :
         if ((entire_insn & 0x1ff0000) == 0xf40000)
           { itype = FRVBF_INSN_SETLO; goto extract_sfmt_setlo; }
@@ -2608,30 +2020,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
         if ((entire_insn & 0x1ff0000) == 0xfc0000)
           { itype = FRVBF_INSN_SETLOS; goto extract_sfmt_setlos; }
         itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 64 :
-        if ((entire_insn & 0x1fc0000) == 0x1000000)
-          { itype = FRVBF_INSN_NLDSBI; goto extract_sfmt_nldsbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 65 :
-        if ((entire_insn & 0x1fc0000) == 0x1040000)
-          { itype = FRVBF_INSN_NLDUBI; goto extract_sfmt_nldsbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 66 :
-        if ((entire_insn & 0x1fc0000) == 0x1080000)
-          { itype = FRVBF_INSN_NLDSHI; goto extract_sfmt_nldsbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 67 :
-        if ((entire_insn & 0x1fc0000) == 0x10c0000)
-          { itype = FRVBF_INSN_NLDUHI; goto extract_sfmt_nldsbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 68 :
-        if ((entire_insn & 0x1fc0000) == 0x1100000)
-          { itype = FRVBF_INSN_NLDI; goto extract_sfmt_nldsbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 69 :
-        if ((entire_insn & 0x1fc0000) == 0x1140000)
-          { itype = FRVBF_INSN_NLDDI; goto extract_sfmt_nlddi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 64 : itype = FRVBF_INSN_NLDSBI; goto extract_sfmt_nldsbi;
+      case 65 : itype = FRVBF_INSN_NLDUBI; goto extract_sfmt_nldsbi;
+      case 66 : itype = FRVBF_INSN_NLDSHI; goto extract_sfmt_nldsbi;
+      case 67 : itype = FRVBF_INSN_NLDUHI; goto extract_sfmt_nldsbi;
+      case 68 : itype = FRVBF_INSN_NLDI; goto extract_sfmt_nldsbi;
+      case 69 : itype = FRVBF_INSN_NLDDI; goto extract_sfmt_nlddi;
       case 70 :
         {
           unsigned int val = (((insn >> 6) & (7 << 0)));
@@ -2668,95 +2062,32 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
-      case 71 :
-        if ((entire_insn & 0x1fc0000) == 0x11c0000)
-          { itype = FRVBF_INSN_SCANI; goto extract_sfmt_addi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 72 :
-        if ((entire_insn & 0x1fc0000) == 0x1200000)
-          { itype = FRVBF_INSN_NLDBFI; goto extract_sfmt_nldbfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 73 :
-        if ((entire_insn & 0x1fc0000) == 0x1240000)
-          { itype = FRVBF_INSN_NLDHFI; goto extract_sfmt_nldbfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 74 :
-        if ((entire_insn & 0x1fc0000) == 0x1280000)
-          { itype = FRVBF_INSN_NLDFI; goto extract_sfmt_nldbfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 75 :
-        if ((entire_insn & 0x1fc0000) == 0x12c0000)
-          { itype = FRVBF_INSN_NLDDFI; goto extract_sfmt_nlddfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 76 :
-        if ((entire_insn & 0x1fc0000) == 0x1300000)
-          { itype = FRVBF_INSN_NLDQFI; goto extract_sfmt_nldqfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 77 :
-        if ((entire_insn & 0x1fc0000) == 0x1340000)
-          { itype = FRVBF_INSN_SWAPI; goto extract_sfmt_swapi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 78 :
-        if ((entire_insn & 0x1fc0000) == 0x1380000)
-          { itype = FRVBF_INSN_STBFI; goto extract_sfmt_stbfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 79 :
-        if ((entire_insn & 0x1fc0000) == 0x13c0000)
-          { itype = FRVBF_INSN_STHFI; goto extract_sfmt_stbfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 80 :
-        if ((entire_insn & 0x1fc0000) == 0x1400000)
-          { itype = FRVBF_INSN_STBI; goto extract_sfmt_stbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 81 :
-        if ((entire_insn & 0x1fc0000) == 0x1440000)
-          { itype = FRVBF_INSN_STHI; goto extract_sfmt_stbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 82 :
-        if ((entire_insn & 0x1fc0000) == 0x1480000)
-          { itype = FRVBF_INSN_STI; goto extract_sfmt_stbi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 83 :
-        if ((entire_insn & 0x1fc0000) == 0x14c0000)
-          { itype = FRVBF_INSN_STDI; goto extract_sfmt_stdi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 84 :
-        if ((entire_insn & 0x1fc0000) == 0x1500000)
-          { itype = FRVBF_INSN_STQI; goto extract_sfmt_ldqi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 85 :
-        if ((entire_insn & 0x1fc0000) == 0x1540000)
-          { itype = FRVBF_INSN_STFI; goto extract_sfmt_stbfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 86 :
-        if ((entire_insn & 0x1fc0000) == 0x1580000)
-          { itype = FRVBF_INSN_STDFI; goto extract_sfmt_stdfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 87 :
-        if ((entire_insn & 0x1fc0000) == 0x15c0000)
-          { itype = FRVBF_INSN_STQFI; goto extract_sfmt_ldqfi; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 71 : itype = FRVBF_INSN_SCANI; goto extract_sfmt_addi;
+      case 72 : itype = FRVBF_INSN_NLDBFI; goto extract_sfmt_nldbfi;
+      case 73 : itype = FRVBF_INSN_NLDHFI; goto extract_sfmt_nldbfi;
+      case 74 : itype = FRVBF_INSN_NLDFI; goto extract_sfmt_nldbfi;
+      case 75 : itype = FRVBF_INSN_NLDDFI; goto extract_sfmt_nlddfi;
+      case 76 : itype = FRVBF_INSN_NLDQFI; goto extract_sfmt_nldqfi;
+      case 77 : itype = FRVBF_INSN_SWAPI; goto extract_sfmt_swapi;
+      case 78 : itype = FRVBF_INSN_STBFI; goto extract_sfmt_stbfi;
+      case 79 : itype = FRVBF_INSN_STHFI; goto extract_sfmt_stbfi;
+      case 80 : itype = FRVBF_INSN_STBI; goto extract_sfmt_stbi;
+      case 81 : itype = FRVBF_INSN_STHI; goto extract_sfmt_stbi;
+      case 82 : itype = FRVBF_INSN_STI; goto extract_sfmt_stbi;
+      case 83 : itype = FRVBF_INSN_STDI; goto extract_sfmt_stdi;
+      case 84 : itype = FRVBF_INSN_STQI; goto extract_sfmt_ldqi;
+      case 85 : itype = FRVBF_INSN_STFI; goto extract_sfmt_stbfi;
+      case 86 : itype = FRVBF_INSN_STDFI; goto extract_sfmt_stdfi;
+      case 87 : itype = FRVBF_INSN_STQFI; goto extract_sfmt_ldqfi;
       case 88 :
         {
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1600000)
-              { itype = FRVBF_INSN_CADD; goto extract_sfmt_cadd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1600040)
-              { itype = FRVBF_INSN_CSUB; goto extract_sfmt_cadd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1600080)
-              { itype = FRVBF_INSN_CSMUL; goto extract_sfmt_csmul; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x16000c0)
-              { itype = FRVBF_INSN_CSDIV; goto extract_sfmt_csdiv; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CADD; goto extract_sfmt_cadd;
+          case 1 : itype = FRVBF_INSN_CSUB; goto extract_sfmt_cadd;
+          case 2 : itype = FRVBF_INSN_CSMUL; goto extract_sfmt_csmul;
+          case 3 : itype = FRVBF_INSN_CSDIV; goto extract_sfmt_csdiv;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2765,22 +2096,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1640000)
-              { itype = FRVBF_INSN_CADDCC; goto extract_sfmt_caddcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1640040)
-              { itype = FRVBF_INSN_CSUBCC; goto extract_sfmt_caddcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1640080)
-              { itype = FRVBF_INSN_CSMULCC; goto extract_sfmt_csmulcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x16400c0)
-              { itype = FRVBF_INSN_CUDIV; goto extract_sfmt_csdiv; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CADDCC; goto extract_sfmt_caddcc;
+          case 1 : itype = FRVBF_INSN_CSUBCC; goto extract_sfmt_caddcc;
+          case 2 : itype = FRVBF_INSN_CSMULCC; goto extract_sfmt_csmulcc;
+          case 3 : itype = FRVBF_INSN_CUDIV; goto extract_sfmt_csdiv;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2789,18 +2108,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1680000)
-              { itype = FRVBF_INSN_CAND; goto extract_sfmt_cadd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1680040)
-              { itype = FRVBF_INSN_COR; goto extract_sfmt_cadd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1680080)
-              { itype = FRVBF_INSN_CXOR; goto extract_sfmt_cadd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CAND; goto extract_sfmt_cadd;
+          case 1 : itype = FRVBF_INSN_COR; goto extract_sfmt_cadd;
+          case 2 : itype = FRVBF_INSN_CXOR; goto extract_sfmt_cadd;
           case 3 :
             if ((entire_insn & 0x1fff0c0) == 0x16800c0)
               { itype = FRVBF_INSN_CNOT; goto extract_sfmt_cnot; }
@@ -2813,18 +2123,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x16c0000)
-              { itype = FRVBF_INSN_CANDCC; goto extract_sfmt_caddcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x16c0040)
-              { itype = FRVBF_INSN_CORCC; goto extract_sfmt_caddcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x16c0080)
-              { itype = FRVBF_INSN_CXORCC; goto extract_sfmt_caddcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CANDCC; goto extract_sfmt_caddcc;
+          case 1 : itype = FRVBF_INSN_CORCC; goto extract_sfmt_caddcc;
+          case 2 : itype = FRVBF_INSN_CXORCC; goto extract_sfmt_caddcc;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2833,18 +2134,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1700000)
-              { itype = FRVBF_INSN_CSLL; goto extract_sfmt_cadd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1700040)
-              { itype = FRVBF_INSN_CSRL; goto extract_sfmt_cadd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1700080)
-              { itype = FRVBF_INSN_CSRA; goto extract_sfmt_cadd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CSLL; goto extract_sfmt_cadd;
+          case 1 : itype = FRVBF_INSN_CSRL; goto extract_sfmt_cadd;
+          case 2 : itype = FRVBF_INSN_CSRA; goto extract_sfmt_cadd;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2853,18 +2145,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1740000)
-              { itype = FRVBF_INSN_CSLLCC; goto extract_sfmt_caddcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1740040)
-              { itype = FRVBF_INSN_CSRLCC; goto extract_sfmt_caddcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1740080)
-              { itype = FRVBF_INSN_CSRACC; goto extract_sfmt_caddcc; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CSLLCC; goto extract_sfmt_caddcc;
+          case 1 : itype = FRVBF_INSN_CSRLCC; goto extract_sfmt_caddcc;
+          case 2 : itype = FRVBF_INSN_CSRACC; goto extract_sfmt_caddcc;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2873,22 +2156,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1780000)
-              { itype = FRVBF_INSN_CLDSB; goto extract_sfmt_cldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1780040)
-              { itype = FRVBF_INSN_CLDUB; goto extract_sfmt_cldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1780080)
-              { itype = FRVBF_INSN_CLDSH; goto extract_sfmt_cldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x17800c0)
-              { itype = FRVBF_INSN_CLDUH; goto extract_sfmt_cldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CLDSB; goto extract_sfmt_cldsb;
+          case 1 : itype = FRVBF_INSN_CLDUB; goto extract_sfmt_cldsb;
+          case 2 : itype = FRVBF_INSN_CLDSH; goto extract_sfmt_cldsb;
+          case 3 : itype = FRVBF_INSN_CLDUH; goto extract_sfmt_cldsb;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2897,18 +2168,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x17c0000)
-              { itype = FRVBF_INSN_CLD; goto extract_sfmt_cldsb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x17c0040)
-              { itype = FRVBF_INSN_CLDD; goto extract_sfmt_cldd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x17c0080)
-              { itype = FRVBF_INSN_CLDQ; goto extract_sfmt_cldq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CLD; goto extract_sfmt_cldsb;
+          case 1 : itype = FRVBF_INSN_CLDD; goto extract_sfmt_cldd;
+          case 2 : itype = FRVBF_INSN_CLDQ; goto extract_sfmt_cldq;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2917,22 +2179,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1800000)
-              { itype = FRVBF_INSN_CLDBF; goto extract_sfmt_cldbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1800040)
-              { itype = FRVBF_INSN_CLDHF; goto extract_sfmt_cldbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1800080)
-              { itype = FRVBF_INSN_CLDF; goto extract_sfmt_cldbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x18000c0)
-              { itype = FRVBF_INSN_CLDDF; goto extract_sfmt_clddf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CLDBF; goto extract_sfmt_cldbf;
+          case 1 : itype = FRVBF_INSN_CLDHF; goto extract_sfmt_cldbf;
+          case 2 : itype = FRVBF_INSN_CLDF; goto extract_sfmt_cldbf;
+          case 3 : itype = FRVBF_INSN_CLDDF; goto extract_sfmt_clddf;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2941,22 +2191,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1840000)
-              { itype = FRVBF_INSN_CLDSBU; goto extract_sfmt_cldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1840040)
-              { itype = FRVBF_INSN_CLDUBU; goto extract_sfmt_cldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1840080)
-              { itype = FRVBF_INSN_CLDSHU; goto extract_sfmt_cldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x18400c0)
-              { itype = FRVBF_INSN_CLDUHU; goto extract_sfmt_cldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CLDSBU; goto extract_sfmt_cldsbu;
+          case 1 : itype = FRVBF_INSN_CLDUBU; goto extract_sfmt_cldsbu;
+          case 2 : itype = FRVBF_INSN_CLDSHU; goto extract_sfmt_cldsbu;
+          case 3 : itype = FRVBF_INSN_CLDUHU; goto extract_sfmt_cldsbu;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2965,18 +2203,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1880000)
-              { itype = FRVBF_INSN_CLDU; goto extract_sfmt_cldsbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1880040)
-              { itype = FRVBF_INSN_CLDDU; goto extract_sfmt_clddu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1880080)
-              { itype = FRVBF_INSN_CLDQU; goto extract_sfmt_cldqu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CLDU; goto extract_sfmt_cldsbu;
+          case 1 : itype = FRVBF_INSN_CLDDU; goto extract_sfmt_clddu;
+          case 2 : itype = FRVBF_INSN_CLDQU; goto extract_sfmt_cldqu;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -2985,22 +2214,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x18c0000)
-              { itype = FRVBF_INSN_CLDBFU; goto extract_sfmt_cldbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x18c0040)
-              { itype = FRVBF_INSN_CLDHFU; goto extract_sfmt_cldbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x18c0080)
-              { itype = FRVBF_INSN_CLDFU; goto extract_sfmt_cldbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x18c00c0)
-              { itype = FRVBF_INSN_CLDDFU; goto extract_sfmt_clddfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CLDBFU; goto extract_sfmt_cldbfu;
+          case 1 : itype = FRVBF_INSN_CLDHFU; goto extract_sfmt_cldbfu;
+          case 2 : itype = FRVBF_INSN_CLDFU; goto extract_sfmt_cldbfu;
+          case 3 : itype = FRVBF_INSN_CLDDFU; goto extract_sfmt_clddfu;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3009,22 +2226,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1900000)
-              { itype = FRVBF_INSN_CSTB; goto extract_sfmt_cstb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1900040)
-              { itype = FRVBF_INSN_CSTH; goto extract_sfmt_cstb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1900080)
-              { itype = FRVBF_INSN_CST; goto extract_sfmt_cstb; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x19000c0)
-              { itype = FRVBF_INSN_CSTD; goto extract_sfmt_cstd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CSTB; goto extract_sfmt_cstb;
+          case 1 : itype = FRVBF_INSN_CSTH; goto extract_sfmt_cstb;
+          case 2 : itype = FRVBF_INSN_CST; goto extract_sfmt_cstb;
+          case 3 : itype = FRVBF_INSN_CSTD; goto extract_sfmt_cstd;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3033,18 +2238,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1940000)
-              { itype = FRVBF_INSN_CSTQ; goto extract_sfmt_cldq; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1940080)
-              { itype = FRVBF_INSN_CSWAP; goto extract_sfmt_cswap; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x19400c0)
-              { itype = FRVBF_INSN_CSCAN; goto extract_sfmt_cadd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CSTQ; goto extract_sfmt_cldq;
+          case 2 : itype = FRVBF_INSN_CSWAP; goto extract_sfmt_cswap;
+          case 3 : itype = FRVBF_INSN_CSCAN; goto extract_sfmt_cadd;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3053,22 +2249,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1980000)
-              { itype = FRVBF_INSN_CSTBF; goto extract_sfmt_cstbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1980040)
-              { itype = FRVBF_INSN_CSTHF; goto extract_sfmt_cstbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1980080)
-              { itype = FRVBF_INSN_CSTF; goto extract_sfmt_cstbf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x19800c0)
-              { itype = FRVBF_INSN_CSTDF; goto extract_sfmt_cstdf; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CSTBF; goto extract_sfmt_cstbf;
+          case 1 : itype = FRVBF_INSN_CSTHF; goto extract_sfmt_cstbf;
+          case 2 : itype = FRVBF_INSN_CSTF; goto extract_sfmt_cstbf;
+          case 3 : itype = FRVBF_INSN_CSTDF; goto extract_sfmt_cstdf;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3077,22 +2261,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x19c0000)
-              { itype = FRVBF_INSN_CSTBU; goto extract_sfmt_cstbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x19c0040)
-              { itype = FRVBF_INSN_CSTHU; goto extract_sfmt_cstbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x19c0080)
-              { itype = FRVBF_INSN_CSTU; goto extract_sfmt_cstbu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x19c00c0)
-              { itype = FRVBF_INSN_CSTDU; goto extract_sfmt_cstdu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CSTBU; goto extract_sfmt_cstbu;
+          case 1 : itype = FRVBF_INSN_CSTHU; goto extract_sfmt_cstbu;
+          case 2 : itype = FRVBF_INSN_CSTU; goto extract_sfmt_cstbu;
+          case 3 : itype = FRVBF_INSN_CSTDU; goto extract_sfmt_cstdu;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3101,22 +2273,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1a00000)
-              { itype = FRVBF_INSN_CSTBFU; goto extract_sfmt_cstbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1a00040)
-              { itype = FRVBF_INSN_CSTHFU; goto extract_sfmt_cstbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1a00080)
-              { itype = FRVBF_INSN_CSTFU; goto extract_sfmt_cstbfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x1a000c0)
-              { itype = FRVBF_INSN_CSTDFU; goto extract_sfmt_cstdfu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CSTBFU; goto extract_sfmt_cstbfu;
+          case 1 : itype = FRVBF_INSN_CSTHFU; goto extract_sfmt_cstbfu;
+          case 2 : itype = FRVBF_INSN_CSTFU; goto extract_sfmt_cstbfu;
+          case 3 : itype = FRVBF_INSN_CSTDFU; goto extract_sfmt_cstdfu;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3338,14 +2498,8 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1b40000)
-              { itype = FRVBF_INSN_CFADDS; goto extract_sfmt_cfadds; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1b40040)
-              { itype = FRVBF_INSN_CFSUBS; goto extract_sfmt_cfadds; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CFADDS; goto extract_sfmt_cfadds;
+          case 1 : itype = FRVBF_INSN_CFSUBS; goto extract_sfmt_cfadds;
           case 2 :
             if ((entire_insn & 0x79fc00c0) == 0x1b40080)
               { itype = FRVBF_INSN_CFCMPS; goto extract_sfmt_cfcmps; }
@@ -3358,14 +2512,8 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1b80000)
-              { itype = FRVBF_INSN_CFMULS; goto extract_sfmt_cfadds; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1b80040)
-              { itype = FRVBF_INSN_CFDIVS; goto extract_sfmt_cfadds; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CFMULS; goto extract_sfmt_cfadds;
+          case 1 : itype = FRVBF_INSN_CFDIVS; goto extract_sfmt_cfadds;
           case 2 :
             if ((entire_insn & 0x1fff0c0) == 0x1b80080)
               { itype = FRVBF_INSN_CFSQRTS; goto extract_sfmt_cfmovs; }
@@ -3378,22 +2526,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1bc0000)
-              { itype = FRVBF_INSN_CFMADDS; goto extract_sfmt_cfmadds; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1bc0040)
-              { itype = FRVBF_INSN_CFMSUBS; goto extract_sfmt_cfmadds; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1bc0080)
-              { itype = FRVBF_INSN_CFMAS; goto extract_sfmt_cfmas; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x1bc00c0)
-              { itype = FRVBF_INSN_CFMSS; goto extract_sfmt_cfmas; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CFMADDS; goto extract_sfmt_cfmadds;
+          case 1 : itype = FRVBF_INSN_CFMSUBS; goto extract_sfmt_cfmadds;
+          case 2 : itype = FRVBF_INSN_CFMAS; goto extract_sfmt_cfmas;
+          case 3 : itype = FRVBF_INSN_CFMSS; goto extract_sfmt_cfmas;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3402,18 +2538,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1c00000)
-              { itype = FRVBF_INSN_CMAND; goto extract_sfmt_cmand; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1c00040)
-              { itype = FRVBF_INSN_CMOR; goto extract_sfmt_cmand; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1c00080)
-              { itype = FRVBF_INSN_CMXOR; goto extract_sfmt_cmand; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CMAND; goto extract_sfmt_cmand;
+          case 1 : itype = FRVBF_INSN_CMOR; goto extract_sfmt_cmand;
+          case 2 : itype = FRVBF_INSN_CMXOR; goto extract_sfmt_cmand;
           case 3 :
             if ((entire_insn & 0x1fff0c0) == 0x1c000c0)
               { itype = FRVBF_INSN_CMNOT; goto extract_sfmt_cmnot; }
@@ -3426,22 +2553,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1c40000)
-              { itype = FRVBF_INSN_CMADDHSS; goto extract_sfmt_cmaddhss; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1c40040)
-              { itype = FRVBF_INSN_CMADDHUS; goto extract_sfmt_cmaddhss; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1c40080)
-              { itype = FRVBF_INSN_CMSUBHSS; goto extract_sfmt_cmaddhss; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x1c400c0)
-              { itype = FRVBF_INSN_CMSUBHUS; goto extract_sfmt_cmaddhss; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CMADDHSS; goto extract_sfmt_cmaddhss;
+          case 1 : itype = FRVBF_INSN_CMADDHUS; goto extract_sfmt_cmaddhss;
+          case 2 : itype = FRVBF_INSN_CMSUBHSS; goto extract_sfmt_cmaddhss;
+          case 3 : itype = FRVBF_INSN_CMSUBHUS; goto extract_sfmt_cmaddhss;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3450,22 +2565,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1c80000)
-              { itype = FRVBF_INSN_CMMULHS; goto extract_sfmt_cmmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1c80040)
-              { itype = FRVBF_INSN_CMMULHU; goto extract_sfmt_cmmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1c80080)
-              { itype = FRVBF_INSN_CMMACHS; goto extract_sfmt_cmmachs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x1c800c0)
-              { itype = FRVBF_INSN_CMMACHU; goto extract_sfmt_cmmachu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CMMULHS; goto extract_sfmt_cmmulhs;
+          case 1 : itype = FRVBF_INSN_CMMULHU; goto extract_sfmt_cmmulhs;
+          case 2 : itype = FRVBF_INSN_CMMACHS; goto extract_sfmt_cmmachs;
+          case 3 : itype = FRVBF_INSN_CMMACHU; goto extract_sfmt_cmmachu;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3474,22 +2577,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1cc0000)
-              { itype = FRVBF_INSN_CMQADDHSS; goto extract_sfmt_cmqaddhss; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1cc0040)
-              { itype = FRVBF_INSN_CMQADDHUS; goto extract_sfmt_cmqaddhss; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1cc0080)
-              { itype = FRVBF_INSN_CMQSUBHSS; goto extract_sfmt_cmqaddhss; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x1cc00c0)
-              { itype = FRVBF_INSN_CMQSUBHUS; goto extract_sfmt_cmqaddhss; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CMQADDHSS; goto extract_sfmt_cmqaddhss;
+          case 1 : itype = FRVBF_INSN_CMQADDHUS; goto extract_sfmt_cmqaddhss;
+          case 2 : itype = FRVBF_INSN_CMQSUBHSS; goto extract_sfmt_cmqaddhss;
+          case 3 : itype = FRVBF_INSN_CMQSUBHUS; goto extract_sfmt_cmqaddhss;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3498,22 +2589,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1d00000)
-              { itype = FRVBF_INSN_CMQMULHS; goto extract_sfmt_cmqmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1d00040)
-              { itype = FRVBF_INSN_CMQMULHU; goto extract_sfmt_cmqmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1d00080)
-              { itype = FRVBF_INSN_CMQMACHS; goto extract_sfmt_cmqmachs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x1d000c0)
-              { itype = FRVBF_INSN_CMQMACHU; goto extract_sfmt_cmqmachu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CMQMULHS; goto extract_sfmt_cmqmulhs;
+          case 1 : itype = FRVBF_INSN_CMQMULHU; goto extract_sfmt_cmqmulhs;
+          case 2 : itype = FRVBF_INSN_CMQMACHS; goto extract_sfmt_cmqmachs;
+          case 3 : itype = FRVBF_INSN_CMQMACHU; goto extract_sfmt_cmqmachu;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3522,22 +2601,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (3 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc00c0) == 0x1d40000)
-              { itype = FRVBF_INSN_CMCPXRS; goto extract_sfmt_cmcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc00c0) == 0x1d40040)
-              { itype = FRVBF_INSN_CMCPXRU; goto extract_sfmt_cmcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc00c0) == 0x1d40080)
-              { itype = FRVBF_INSN_CMCPXIS; goto extract_sfmt_cmcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 3 :
-            if ((entire_insn & 0x1fc00c0) == 0x1d400c0)
-              { itype = FRVBF_INSN_CMCPXIU; goto extract_sfmt_cmcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_CMCPXRS; goto extract_sfmt_cmcpxrs;
+          case 1 : itype = FRVBF_INSN_CMCPXRU; goto extract_sfmt_cmcpxrs;
+          case 2 : itype = FRVBF_INSN_CMCPXIS; goto extract_sfmt_cmcpxrs;
+          case 3 : itype = FRVBF_INSN_CMCPXIU; goto extract_sfmt_cmcpxrs;
           default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
           }
         }
@@ -3582,18 +2649,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (63 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00000)
-              { itype = FRVBF_INSN_MQXMACHS; goto extract_sfmt_mqmachs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00040)
-              { itype = FRVBF_INSN_MQXMACXHS; goto extract_sfmt_mqmachs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00080)
-              { itype = FRVBF_INSN_MQMACXHS; goto extract_sfmt_mqmachs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_MQXMACHS; goto extract_sfmt_mqmachs;
+          case 1 : itype = FRVBF_INSN_MQXMACXHS; goto extract_sfmt_mqmachs;
+          case 2 : itype = FRVBF_INSN_MQMACXHS; goto extract_sfmt_mqmachs;
           case 4 :
             if ((entire_insn & 0x1fc0fff) == 0x1e00100)
               { itype = FRVBF_INSN_MADDACCS; goto extract_sfmt_maddaccs; }
@@ -3622,62 +2680,26 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x1ffffc0) == 0x1e00280)
               { itype = FRVBF_INSN_MABSHS; goto extract_sfmt_mabshs; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 11 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e002c0)
-              { itype = FRVBF_INSN_MDROTLI; goto extract_sfmt_mdrotli; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 12 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00300)
-              { itype = FRVBF_INSN_MCPLHI; goto extract_sfmt_mcplhi; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 13 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00340)
-              { itype = FRVBF_INSN_MCPLI; goto extract_sfmt_mcpli; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 14 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00380)
-              { itype = FRVBF_INSN_MDCUTSSI; goto extract_sfmt_mdcutssi; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 15 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e003c0)
-              { itype = FRVBF_INSN_MQSATHS; goto extract_sfmt_mqsaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 16 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00400)
-              { itype = FRVBF_INSN_MQLCLRHS; goto extract_sfmt_mqsaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 17 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00440)
-              { itype = FRVBF_INSN_MQSLLHI; goto extract_sfmt_mqsllhi; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 19 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e004c0)
-              { itype = FRVBF_INSN_MQSRAHI; goto extract_sfmt_mqsllhi; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 20 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00500)
-              { itype = FRVBF_INSN_MQLMTHS; goto extract_sfmt_mqsaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 32 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00800)
-              { itype = FRVBF_INSN_MHSETLOS; goto extract_sfmt_mhsetlos; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 11 : itype = FRVBF_INSN_MDROTLI; goto extract_sfmt_mdrotli;
+          case 12 : itype = FRVBF_INSN_MCPLHI; goto extract_sfmt_mcplhi;
+          case 13 : itype = FRVBF_INSN_MCPLI; goto extract_sfmt_mcpli;
+          case 14 : itype = FRVBF_INSN_MDCUTSSI; goto extract_sfmt_mdcutssi;
+          case 15 : itype = FRVBF_INSN_MQSATHS; goto extract_sfmt_mqsaths;
+          case 16 : itype = FRVBF_INSN_MQLCLRHS; goto extract_sfmt_mqsaths;
+          case 17 : itype = FRVBF_INSN_MQSLLHI; goto extract_sfmt_mqsllhi;
+          case 19 : itype = FRVBF_INSN_MQSRAHI; goto extract_sfmt_mqsllhi;
+          case 20 : itype = FRVBF_INSN_MQLMTHS; goto extract_sfmt_mqsaths;
+          case 32 : itype = FRVBF_INSN_MHSETLOS; goto extract_sfmt_mhsetlos;
           case 33 :
             if ((entire_insn & 0x1ffffe0) == 0x1e00840)
               { itype = FRVBF_INSN_MHSETLOH; goto extract_sfmt_mhsetloh; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 34 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00880)
-              { itype = FRVBF_INSN_MHSETHIS; goto extract_sfmt_mhsethis; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 34 : itype = FRVBF_INSN_MHSETHIS; goto extract_sfmt_mhsethis;
           case 35 :
             if ((entire_insn & 0x1ffffe0) == 0x1e008c0)
               { itype = FRVBF_INSN_MHSETHIH; goto extract_sfmt_mhsethih; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 36 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1e00900)
-              { itype = FRVBF_INSN_MHDSETS; goto extract_sfmt_mhdsets; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 36 : itype = FRVBF_INSN_MHDSETS; goto extract_sfmt_mhdsets;
           case 37 :
             if ((entire_insn & 0x1ffffe0) == 0x1e00940)
               { itype = FRVBF_INSN_MHDSETH; goto extract_sfmt_mhdseth; }
@@ -3699,18 +2721,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
                 if ((entire_insn & 0x1ffffc0) == 0x1e40000)
                   { itype = FRVBF_INSN_FITOS; goto extract_sfmt_fitos; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40200)
-                  { itype = FRVBF_INSN_FMULS; goto extract_sfmt_fadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 1 : itype = FRVBF_INSN_FMULS; goto extract_sfmt_fadds;
               case 2 :
                 if ((entire_insn & 0x1ffffc0) == 0x1e40800)
                   { itype = FRVBF_INSN_NFITOS; goto extract_sfmt_nfitos; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40a00)
-                  { itype = FRVBF_INSN_NFMULS; goto extract_sfmt_nfadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 3 : itype = FRVBF_INSN_NFMULS; goto extract_sfmt_nfadds;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -3723,18 +2739,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
                 if ((entire_insn & 0x1ffffc0) == 0x1e40040)
                   { itype = FRVBF_INSN_FSTOI; goto extract_sfmt_fstoi; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40240)
-                  { itype = FRVBF_INSN_FDIVS; goto extract_sfmt_fadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 1 : itype = FRVBF_INSN_FDIVS; goto extract_sfmt_fadds;
               case 2 :
                 if ((entire_insn & 0x1ffffc0) == 0x1e40840)
                   { itype = FRVBF_INSN_NFSTOI; goto extract_sfmt_nfstoi; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40a40)
-                  { itype = FRVBF_INSN_NFDIVS; goto extract_sfmt_nfadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 3 : itype = FRVBF_INSN_NFDIVS; goto extract_sfmt_nfadds;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -3763,14 +2773,8 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
                 if ((entire_insn & 0x1ffffc0) == 0x1e400c0)
                   { itype = FRVBF_INSN_FNEGS; goto extract_sfmt_fmovs; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e402c0)
-                  { itype = FRVBF_INSN_FMADDS; goto extract_sfmt_fmadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40ac0)
-                  { itype = FRVBF_INSN_NFMADDS; goto extract_sfmt_nfmadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 1 : itype = FRVBF_INSN_FMADDS; goto extract_sfmt_fmadds;
+              case 3 : itype = FRVBF_INSN_NFMADDS; goto extract_sfmt_nfmadds;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -3783,14 +2787,8 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
                 if ((entire_insn & 0x1ffffc0) == 0x1e40100)
                   { itype = FRVBF_INSN_FABSS; goto extract_sfmt_fmovs; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40300)
-                  { itype = FRVBF_INSN_FMSUBS; goto extract_sfmt_fmadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40b00)
-                  { itype = FRVBF_INSN_NFMSUBS; goto extract_sfmt_nfmadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 1 : itype = FRVBF_INSN_FMSUBS; goto extract_sfmt_fmadds;
+              case 3 : itype = FRVBF_INSN_NFMSUBS; goto extract_sfmt_nfmadds;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -3819,22 +2817,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
               unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0)));
               switch (val)
               {
-              case 0 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40180)
-                  { itype = FRVBF_INSN_FADDS; goto extract_sfmt_fadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40380)
-                  { itype = FRVBF_INSN_FMAS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 2 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40980)
-                  { itype = FRVBF_INSN_NFADDS; goto extract_sfmt_nfadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40b80)
-                  { itype = FRVBF_INSN_NFMAS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 0 : itype = FRVBF_INSN_FADDS; goto extract_sfmt_fadds;
+              case 1 : itype = FRVBF_INSN_FMAS; goto extract_sfmt_fmas;
+              case 2 : itype = FRVBF_INSN_NFADDS; goto extract_sfmt_nfadds;
+              case 3 : itype = FRVBF_INSN_NFMAS; goto extract_sfmt_fmas;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -3843,22 +2829,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
               unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0)));
               switch (val)
               {
-              case 0 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e401c0)
-                  { itype = FRVBF_INSN_FSUBS; goto extract_sfmt_fadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e403c0)
-                  { itype = FRVBF_INSN_FMSS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 2 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e409c0)
-                  { itype = FRVBF_INSN_NFSUBS; goto extract_sfmt_nfadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40bc0)
-                  { itype = FRVBF_INSN_NFMSS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 0 : itype = FRVBF_INSN_FSUBS; goto extract_sfmt_fadds;
+              case 1 : itype = FRVBF_INSN_FMSS; goto extract_sfmt_fmas;
+              case 2 : itype = FRVBF_INSN_NFSUBS; goto extract_sfmt_nfadds;
+              case 3 : itype = FRVBF_INSN_NFMSS; goto extract_sfmt_fmas;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -3871,18 +2845,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
                 if ((entire_insn & 0x1ffffc0) == 0x1e40400)
                   { itype = FRVBF_INSN_FDITOS; goto extract_sfmt_fditos; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40600)
-                  { itype = FRVBF_INSN_FDMULS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 1 : itype = FRVBF_INSN_FDMULS; goto extract_sfmt_fmas;
               case 2 :
                 if ((entire_insn & 0x1ffffc0) == 0x1e40c00)
                   { itype = FRVBF_INSN_NFDITOS; goto extract_sfmt_fditos; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40e00)
-                  { itype = FRVBF_INSN_NFDMULS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 3 : itype = FRVBF_INSN_NFDMULS; goto extract_sfmt_fmas;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -3895,18 +2863,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
                 if ((entire_insn & 0x1ffffc0) == 0x1e40440)
                   { itype = FRVBF_INSN_FDSTOI; goto extract_sfmt_fdstoi; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40640)
-                  { itype = FRVBF_INSN_FDDIVS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 1 : itype = FRVBF_INSN_FDDIVS; goto extract_sfmt_fmas;
               case 2 :
                 if ((entire_insn & 0x1ffffc0) == 0x1e40c40)
                   { itype = FRVBF_INSN_NFDSTOI; goto extract_sfmt_fdstoi; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40e40)
-                  { itype = FRVBF_INSN_NFDDIVS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 3 : itype = FRVBF_INSN_NFDDIVS; goto extract_sfmt_fmas;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -3939,14 +2901,8 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
                 if ((entire_insn & 0x1ffffc0) == 0x1e404c0)
                   { itype = FRVBF_INSN_FDNEGS; goto extract_sfmt_fdmovs; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e406c0)
-                  { itype = FRVBF_INSN_FDMADDS; goto extract_sfmt_fdmadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40ec0)
-                  { itype = FRVBF_INSN_NFDMADDS; goto extract_sfmt_fdmadds; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 1 : itype = FRVBF_INSN_FDMADDS; goto extract_sfmt_fdmadds;
+              case 3 : itype = FRVBF_INSN_NFDMADDS; goto extract_sfmt_fdmadds;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -3959,14 +2915,8 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
                 if ((entire_insn & 0x1ffffc0) == 0x1e40500)
                   { itype = FRVBF_INSN_FDABSS; goto extract_sfmt_fdmovs; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40700)
-                  { itype = FRVBF_INSN_FDMAS; goto extract_sfmt_fdmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40f00)
-                  { itype = FRVBF_INSN_NFDMAS; goto extract_sfmt_fdmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 1 : itype = FRVBF_INSN_FDMAS; goto extract_sfmt_fdmas;
+              case 3 : itype = FRVBF_INSN_NFDMAS; goto extract_sfmt_fdmas;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -3979,18 +2929,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
                 if ((entire_insn & 0x1ffffc0) == 0x1e40540)
                   { itype = FRVBF_INSN_FDSQRTS; goto extract_sfmt_fdmovs; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40740)
-                  { itype = FRVBF_INSN_FDMSS; goto extract_sfmt_fdmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 1 : itype = FRVBF_INSN_FDMSS; goto extract_sfmt_fdmas;
               case 2 :
                 if ((entire_insn & 0x1ffffc0) == 0x1e40d40)
                   { itype = FRVBF_INSN_NFDSQRTS; goto extract_sfmt_fdmovs; }
                 itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40f40)
-                  { itype = FRVBF_INSN_NFDMSS; goto extract_sfmt_fdmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 3 : itype = FRVBF_INSN_NFDMSS; goto extract_sfmt_fdmas;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -3999,22 +2943,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
               unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0)));
               switch (val)
               {
-              case 0 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40580)
-                  { itype = FRVBF_INSN_FDADDS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40780)
-                  { itype = FRVBF_INSN_FDSADS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 2 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40d80)
-                  { itype = FRVBF_INSN_NFDADDS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40f80)
-                  { itype = FRVBF_INSN_NFDSADS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 0 : itype = FRVBF_INSN_FDADDS; goto extract_sfmt_fmas;
+              case 1 : itype = FRVBF_INSN_FDSADS; goto extract_sfmt_fmas;
+              case 2 : itype = FRVBF_INSN_NFDADDS; goto extract_sfmt_fmas;
+              case 3 : itype = FRVBF_INSN_NFDSADS; goto extract_sfmt_fmas;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -4023,22 +2955,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
               unsigned int val = (((insn >> 10) & (1 << 1)) | ((insn >> 9) & (1 << 0)));
               switch (val)
               {
-              case 0 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e405c0)
-                  { itype = FRVBF_INSN_FDSUBS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 1 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e407c0)
-                  { itype = FRVBF_INSN_FDMULCS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 2 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40dc0)
-                  { itype = FRVBF_INSN_NFDSUBS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-              case 3 :
-                if ((entire_insn & 0x1fc0fc0) == 0x1e40fc0)
-                  { itype = FRVBF_INSN_NFDMULCS; goto extract_sfmt_fmas; }
-                itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+              case 0 : itype = FRVBF_INSN_FDSUBS; goto extract_sfmt_fmas;
+              case 1 : itype = FRVBF_INSN_FDMULCS; goto extract_sfmt_fmas;
+              case 2 : itype = FRVBF_INSN_NFDSUBS; goto extract_sfmt_fmas;
+              case 3 : itype = FRVBF_INSN_NFDMULCS; goto extract_sfmt_fmas;
               default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
               }
             }
@@ -4118,62 +3038,23 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
           unsigned int val = (((insn >> 6) & (63 << 0)));
           switch (val)
           {
-          case 0 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0000)
-              { itype = FRVBF_INSN_MAND; goto extract_sfmt_mand; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 1 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0040)
-              { itype = FRVBF_INSN_MOR; goto extract_sfmt_mand; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 2 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0080)
-              { itype = FRVBF_INSN_MXOR; goto extract_sfmt_mand; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 0 : itype = FRVBF_INSN_MAND; goto extract_sfmt_mand;
+          case 1 : itype = FRVBF_INSN_MOR; goto extract_sfmt_mand;
+          case 2 : itype = FRVBF_INSN_MXOR; goto extract_sfmt_mand;
           case 3 :
             if ((entire_insn & 0x1ffffc0) == 0x1ec00c0)
               { itype = FRVBF_INSN_MNOT; goto extract_sfmt_mnot; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 4 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0100)
-              { itype = FRVBF_INSN_MROTLI; goto extract_sfmt_mrotli; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 5 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0140)
-              { itype = FRVBF_INSN_MROTRI; goto extract_sfmt_mrotli; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 6 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0180)
-              { itype = FRVBF_INSN_MWCUT; goto extract_sfmt_mwcut; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 7 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec01c0)
-              { itype = FRVBF_INSN_MWCUTI; goto extract_sfmt_mwcuti; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 8 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0200)
-              { itype = FRVBF_INSN_MAVEH; goto extract_sfmt_mand; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 9 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0240)
-              { itype = FRVBF_INSN_MSLLHI; goto extract_sfmt_msllhi; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 10 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0280)
-              { itype = FRVBF_INSN_MSRLHI; goto extract_sfmt_msllhi; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 11 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec02c0)
-              { itype = FRVBF_INSN_MSRAHI; goto extract_sfmt_msllhi; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 12 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0300)
-              { itype = FRVBF_INSN_MSATHS; goto extract_sfmt_msaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 13 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0340)
-              { itype = FRVBF_INSN_MSATHU; goto extract_sfmt_msaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 4 : itype = FRVBF_INSN_MROTLI; goto extract_sfmt_mrotli;
+          case 5 : itype = FRVBF_INSN_MROTRI; goto extract_sfmt_mrotli;
+          case 6 : itype = FRVBF_INSN_MWCUT; goto extract_sfmt_mwcut;
+          case 7 : itype = FRVBF_INSN_MWCUTI; goto extract_sfmt_mwcuti;
+          case 8 : itype = FRVBF_INSN_MAVEH; goto extract_sfmt_mand;
+          case 9 : itype = FRVBF_INSN_MSLLHI; goto extract_sfmt_msllhi;
+          case 10 : itype = FRVBF_INSN_MSRLHI; goto extract_sfmt_msllhi;
+          case 11 : itype = FRVBF_INSN_MSRAHI; goto extract_sfmt_msllhi;
+          case 12 : itype = FRVBF_INSN_MSATHS; goto extract_sfmt_msaths;
+          case 13 : itype = FRVBF_INSN_MSATHU; goto extract_sfmt_msaths;
           case 14 :
             if ((entire_insn & 0x79fc0fc0) == 0x1ec0380)
               { itype = FRVBF_INSN_MCMPSH; goto extract_sfmt_mcmpsh; }
@@ -4182,162 +3063,48 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
             if ((entire_insn & 0x79fc0fc0) == 0x1ec03c0)
               { itype = FRVBF_INSN_MCMPUH; goto extract_sfmt_mcmpsh; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 16 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0400)
-              { itype = FRVBF_INSN_MADDHSS; goto extract_sfmt_msaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 17 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0440)
-              { itype = FRVBF_INSN_MADDHUS; goto extract_sfmt_msaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 18 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0480)
-              { itype = FRVBF_INSN_MSUBHSS; goto extract_sfmt_msaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 19 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec04c0)
-              { itype = FRVBF_INSN_MSUBHUS; goto extract_sfmt_msaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 20 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0500)
-              { itype = FRVBF_INSN_MMULHS; goto extract_sfmt_mmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 21 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0540)
-              { itype = FRVBF_INSN_MMULHU; goto extract_sfmt_mmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 22 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0580)
-              { itype = FRVBF_INSN_MMACHS; goto extract_sfmt_mmachs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 23 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec05c0)
-              { itype = FRVBF_INSN_MMACHU; goto extract_sfmt_mmachu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 24 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0600)
-              { itype = FRVBF_INSN_MQADDHSS; goto extract_sfmt_mqsaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 25 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0640)
-              { itype = FRVBF_INSN_MQADDHUS; goto extract_sfmt_mqsaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 26 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0680)
-              { itype = FRVBF_INSN_MQSUBHSS; goto extract_sfmt_mqsaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 27 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec06c0)
-              { itype = FRVBF_INSN_MQSUBHUS; goto extract_sfmt_mqsaths; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 28 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0700)
-              { itype = FRVBF_INSN_MQMULHS; goto extract_sfmt_mqmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 29 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0740)
-              { itype = FRVBF_INSN_MQMULHU; goto extract_sfmt_mqmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 30 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0780)
-              { itype = FRVBF_INSN_MQMACHS; goto extract_sfmt_mqmachs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 31 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec07c0)
-              { itype = FRVBF_INSN_MQMACHU; goto extract_sfmt_mqmachu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 32 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0800)
-              { itype = FRVBF_INSN_MCPXRS; goto extract_sfmt_mcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 33 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0840)
-              { itype = FRVBF_INSN_MCPXRU; goto extract_sfmt_mcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 34 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0880)
-              { itype = FRVBF_INSN_MCPXIS; goto extract_sfmt_mcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 35 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec08c0)
-              { itype = FRVBF_INSN_MCPXIU; goto extract_sfmt_mcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 36 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0900)
-              { itype = FRVBF_INSN_MQCPXRS; goto extract_sfmt_mqcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 37 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0940)
-              { itype = FRVBF_INSN_MQCPXRU; goto extract_sfmt_mqcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 38 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0980)
-              { itype = FRVBF_INSN_MQCPXIS; goto extract_sfmt_mqcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 39 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec09c0)
-              { itype = FRVBF_INSN_MQCPXIU; goto extract_sfmt_mqcpxrs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 40 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0a00)
-              { itype = FRVBF_INSN_MMULXHS; goto extract_sfmt_mmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 41 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0a40)
-              { itype = FRVBF_INSN_MMULXHU; goto extract_sfmt_mmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 42 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0a80)
-              { itype = FRVBF_INSN_MQMULXHS; goto extract_sfmt_mqmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 43 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0ac0)
-              { itype = FRVBF_INSN_MQMULXHU; goto extract_sfmt_mqmulhs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 44 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0b00)
-              { itype = FRVBF_INSN_MCUT; goto extract_sfmt_mcut; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 45 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0b40)
-              { itype = FRVBF_INSN_MCUTSS; goto extract_sfmt_mcut; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 46 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0b80)
-              { itype = FRVBF_INSN_MCUTI; goto extract_sfmt_mcuti; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 47 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0bc0)
-              { itype = FRVBF_INSN_MCUTSSI; goto extract_sfmt_mcuti; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 48 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0c00)
-              { itype = FRVBF_INSN_MMRDHS; goto extract_sfmt_mmachs; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 49 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0c40)
-              { itype = FRVBF_INSN_MMRDHU; goto extract_sfmt_mmachu; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 50 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0c80)
-              { itype = FRVBF_INSN_MEXPDHW; goto extract_sfmt_mexpdhw; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 51 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0cc0)
-              { itype = FRVBF_INSN_MEXPDHD; goto extract_sfmt_mexpdhd; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 52 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0d00)
-              { itype = FRVBF_INSN_MPACKH; goto extract_sfmt_mpackh; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 16 : itype = FRVBF_INSN_MADDHSS; goto extract_sfmt_msaths;
+          case 17 : itype = FRVBF_INSN_MADDHUS; goto extract_sfmt_msaths;
+          case 18 : itype = FRVBF_INSN_MSUBHSS; goto extract_sfmt_msaths;
+          case 19 : itype = FRVBF_INSN_MSUBHUS; goto extract_sfmt_msaths;
+          case 20 : itype = FRVBF_INSN_MMULHS; goto extract_sfmt_mmulhs;
+          case 21 : itype = FRVBF_INSN_MMULHU; goto extract_sfmt_mmulhs;
+          case 22 : itype = FRVBF_INSN_MMACHS; goto extract_sfmt_mmachs;
+          case 23 : itype = FRVBF_INSN_MMACHU; goto extract_sfmt_mmachu;
+          case 24 : itype = FRVBF_INSN_MQADDHSS; goto extract_sfmt_mqsaths;
+          case 25 : itype = FRVBF_INSN_MQADDHUS; goto extract_sfmt_mqsaths;
+          case 26 : itype = FRVBF_INSN_MQSUBHSS; goto extract_sfmt_mqsaths;
+          case 27 : itype = FRVBF_INSN_MQSUBHUS; goto extract_sfmt_mqsaths;
+          case 28 : itype = FRVBF_INSN_MQMULHS; goto extract_sfmt_mqmulhs;
+          case 29 : itype = FRVBF_INSN_MQMULHU; goto extract_sfmt_mqmulhs;
+          case 30 : itype = FRVBF_INSN_MQMACHS; goto extract_sfmt_mqmachs;
+          case 31 : itype = FRVBF_INSN_MQMACHU; goto extract_sfmt_mqmachu;
+          case 32 : itype = FRVBF_INSN_MCPXRS; goto extract_sfmt_mcpxrs;
+          case 33 : itype = FRVBF_INSN_MCPXRU; goto extract_sfmt_mcpxrs;
+          case 34 : itype = FRVBF_INSN_MCPXIS; goto extract_sfmt_mcpxrs;
+          case 35 : itype = FRVBF_INSN_MCPXIU; goto extract_sfmt_mcpxrs;
+          case 36 : itype = FRVBF_INSN_MQCPXRS; goto extract_sfmt_mqcpxrs;
+          case 37 : itype = FRVBF_INSN_MQCPXRU; goto extract_sfmt_mqcpxrs;
+          case 38 : itype = FRVBF_INSN_MQCPXIS; goto extract_sfmt_mqcpxrs;
+          case 39 : itype = FRVBF_INSN_MQCPXIU; goto extract_sfmt_mqcpxrs;
+          case 40 : itype = FRVBF_INSN_MMULXHS; goto extract_sfmt_mmulhs;
+          case 41 : itype = FRVBF_INSN_MMULXHU; goto extract_sfmt_mmulhs;
+          case 42 : itype = FRVBF_INSN_MQMULXHS; goto extract_sfmt_mqmulhs;
+          case 43 : itype = FRVBF_INSN_MQMULXHU; goto extract_sfmt_mqmulhs;
+          case 44 : itype = FRVBF_INSN_MCUT; goto extract_sfmt_mcut;
+          case 45 : itype = FRVBF_INSN_MCUTSS; goto extract_sfmt_mcut;
+          case 46 : itype = FRVBF_INSN_MCUTI; goto extract_sfmt_mcuti;
+          case 47 : itype = FRVBF_INSN_MCUTSSI; goto extract_sfmt_mcuti;
+          case 48 : itype = FRVBF_INSN_MMRDHS; goto extract_sfmt_mmachs;
+          case 49 : itype = FRVBF_INSN_MMRDHU; goto extract_sfmt_mmachu;
+          case 50 : itype = FRVBF_INSN_MEXPDHW; goto extract_sfmt_mexpdhw;
+          case 51 : itype = FRVBF_INSN_MEXPDHD; goto extract_sfmt_mexpdhd;
+          case 52 : itype = FRVBF_INSN_MPACKH; goto extract_sfmt_mpackh;
           case 53 :
             if ((entire_insn & 0x1fc0fff) == 0x1ec0d40)
               { itype = FRVBF_INSN_MUNPACKH; goto extract_sfmt_munpackh; }
             itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-          case 54 :
-            if ((entire_insn & 0x1fc0fc0) == 0x1ec0d80)
-              { itype = FRVBF_INSN_MDPACKH; goto extract_sfmt_mdpackh; }
-            itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+          case 54 : itype = FRVBF_INSN_MDPACKH; goto extract_sfmt_mdpackh;
           case 55 :
             if ((entire_insn & 0x1fc0fff) == 0x1ec0dc0)
               { itype = FRVBF_INSN_MDUNPACKH; goto extract_sfmt_mdunpackh; }
@@ -4471,14 +3238,8 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
         if ((entire_insn & 0x1fc0fc0) == 0x1f40000)
           { itype = FRVBF_INSN_MCOP2; goto extract_sfmt_rei; }
         itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 126 :
-        if ((entire_insn & 0x1fc0000) == 0x1f80000)
-          { itype = FRVBF_INSN_COP1; goto extract_sfmt_rei; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
-      case 127 :
-        if ((entire_insn & 0x1fc0000) == 0x1fc0000)
-          { itype = FRVBF_INSN_COP2; goto extract_sfmt_rei; }
-        itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
+      case 126 : itype = FRVBF_INSN_COP1; goto extract_sfmt_rei;
+      case 127 : itype = FRVBF_INSN_COP2; goto extract_sfmt_rei;
       default : itype = FRVBF_INSN_X_INVALID; goto extract_sfmt_empty;
       }
     }
@@ -5006,9 +3767,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_GRi) = f_GRi;
       FLD (in_GRj) = f_GRj;
-      FLD (in_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3) = ((FLD (f_CCi)) & (3));
+      FLD (in_h_iccr_UQI_and__INT_index_of__INT_CCi_3) = ((FLD (f_CCi)) & (3));
       FLD (out_GRk) = f_GRk;
-      FLD (out_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3) = ((FLD (f_CCi)) & (3));
+      FLD (out_h_iccr_UQI_and__INT_index_of__INT_CCi_3) = ((FLD (f_CCi)) & (3));
     }
 #endif
 #undef FLD
@@ -5047,9 +3808,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_GRi) = f_GRi;
       FLD (in_GRj) = f_GRj;
-      FLD (in_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3) = ((FLD (f_CCi)) & (3));
+      FLD (in_h_iccr_UQI_and__INT_index_of__INT_CCi_3) = ((FLD (f_CCi)) & (3));
       FLD (out_GRdoublek) = f_GRk;
-      FLD (out_h_iccr_UQI_and__DFLT_index_of__DFLT_CCi_3) = ((FLD (f_CCi)) & (3));
+      FLD (out_h_iccr_UQI_and__INT_index_of__INT_CCi_3) = ((FLD (f_CCi)) & (3));
     }
 #endif
 #undef FLD
@@ -8181,9 +6942,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_GRj) = f_GRj;
-      FLD (in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1));
+      FLD (in_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1));
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -8211,9 +6972,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1));
+      FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1));
       FLD (out_GRj) = f_GRj;
-      FLD (out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1));
+      FLD (out_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1));
     }
 #endif
 #undef FLD
@@ -8241,13 +7002,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_GRj) = f_GRj;
-      FLD (in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1));
-      FLD (in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_2) = ((FLD (f_GRj)) + (2));
-      FLD (in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_3) = ((FLD (f_GRj)) + (3));
+      FLD (in_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1));
+      FLD (in_h_gr_USI_add__INT_index_of__INT_GRj_2) = ((FLD (f_GRj)) + (2));
+      FLD (in_h_gr_USI_add__INT_index_of__INT_GRj_3) = ((FLD (f_GRj)) + (3));
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2));
-      FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3));
+      FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2));
+      FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3));
     }
 #endif
 #undef FLD
@@ -8275,13 +7036,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1));
-      FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2));
-      FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3));
+      FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1));
+      FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2));
+      FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3));
       FLD (out_GRj) = f_GRj;
-      FLD (out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1));
-      FLD (out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_2) = ((FLD (f_GRj)) + (2));
-      FLD (out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_3) = ((FLD (f_GRj)) + (3));
+      FLD (out_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1));
+      FLD (out_h_gr_USI_add__INT_index_of__INT_GRj_2) = ((FLD (f_GRj)) + (2));
+      FLD (out_h_gr_USI_add__INT_index_of__INT_GRj_3) = ((FLD (f_GRj)) + (3));
     }
 #endif
 #undef FLD
@@ -8386,9 +7147,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_CCi) = f_CCi;
       FLD (in_GRj) = f_GRj;
-      FLD (in_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1));
+      FLD (in_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1));
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -8423,9 +7184,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_CCi) = f_CCi;
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1));
+      FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1));
       FLD (out_GRj) = f_GRj;
-      FLD (out_h_gr_USI_add__DFLT_index_of__DFLT_GRj_1) = ((FLD (f_GRj)) + (1));
+      FLD (out_h_gr_USI_add__INT_index_of__INT_GRj_1) = ((FLD (f_GRj)) + (1));
     }
 #endif
 #undef FLD
@@ -9880,9 +8641,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintj_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintj_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FRk) = f_FRk;
-      FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -9910,9 +8671,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_FRj) = f_FRj;
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -10122,9 +8883,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_FRj) = f_FRj;
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FRk) = f_FRk;
-      FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -10457,10 +9218,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRi) = f_FRi;
       FLD (in_FRj) = f_FRj;
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FCCi_2) = f_FCCi_2;
-      FLD (out_h_fccr_UQI_add__DFLT_index_of__DFLT_FCCi_2_1) = ((FLD (f_FCCi_2)) + (1));
+      FLD (out_h_fccr_UQI_add__INT_index_of__INT_FCCi_2_1) = ((FLD (f_FCCi_2)) + (1));
     }
 #endif
 #undef FLD
@@ -10559,11 +9320,11 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_FRi) = f_FRi;
       FLD (in_FRj) = f_FRj;
       FLD (in_FRk) = f_FRk;
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1));
       FLD (out_FRk) = f_FRk;
-      FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -10668,10 +9429,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRi) = f_FRi;
       FLD (in_FRj) = f_FRj;
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FRk) = f_FRk;
-      FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -10703,16 +9464,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRi) = f_FRi;
       FLD (in_FRj) = f_FRj;
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_2) = ((FLD (f_FRi)) + (2));
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_3) = ((FLD (f_FRi)) + (3));
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_2) = ((FLD (f_FRj)) + (2));
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_3) = ((FLD (f_FRj)) + (3));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_2) = ((FLD (f_FRi)) + (2));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_3) = ((FLD (f_FRi)) + (3));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_2) = ((FLD (f_FRj)) + (2));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_3) = ((FLD (f_FRj)) + (3));
       FLD (out_FRk) = f_FRk;
-      FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_2) = ((FLD (f_FRk)) + (2));
-      FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_3) = ((FLD (f_FRk)) + (3));
+      FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_2) = ((FLD (f_FRk)) + (2));
+      FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_3) = ((FLD (f_FRk)) + (3));
     }
 #endif
 #undef FLD
@@ -10751,10 +9512,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRi) = f_FRi;
       FLD (in_FRj) = f_FRj;
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FRk) = f_FRk;
-      FLD (out_h_fr_SF_add__DFLT_index_of__DFLT_FRk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_SF_add__INT_index_of__INT_FRk_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -10789,10 +9550,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRi) = f_FRi;
       FLD (in_FRj) = f_FRj;
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRi_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_SF_add__DFLT_index_of__DFLT_FRj_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRi_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_SF_add__INT_index_of__INT_FRj_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FCCi_2) = f_FCCi_2;
-      FLD (out_h_fccr_UQI_add__DFLT_index_of__DFLT_FCCi_2_1) = ((FLD (f_FCCi_2)) + (1));
+      FLD (out_h_fccr_UQI_add__INT_index_of__INT_FCCi_2_1) = ((FLD (f_FCCi_2)) + (1));
     }
 #endif
 #undef FLD
@@ -10893,8 +9654,8 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRintk) = f_FRk;
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -10978,11 +9739,11 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -11179,7 +9940,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRinti_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRinti_1) = ((FLD (f_FRi)) + (1));
       FLD (out_FRintk) = f_FRk;
     }
 #endif
@@ -11211,7 +9972,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_FRinti) = f_FRi;
-      FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRinti_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRinti_1) = ((FLD (f_FRi)) + (1));
       FLD (out_FRintk) = f_FRk;
     }
 #endif
@@ -11306,9 +10067,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_ACC40Si) = f_ACC40Si;
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1));
       FLD (out_FRintkeven) = f_FRk;
-      FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -11340,12 +10101,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
       FLD (out_FRinti) = f_FRi;
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -11376,9 +10137,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_FRintieven) = f_FRi;
-      FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
       FLD (out_FRintkeven) = f_FRk;
-      FLD (out_h_fr_int_USI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_int_USI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -11410,11 +10171,11 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_1) = ((FLD (f_FRi)) + (1));
       FLD (out_FRinti) = f_FRi;
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -11445,7 +10206,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_FRinti) = f_FRi;
-      FLD (in_h_fr_int_USI_add__DFLT_index_of__DFLT_FRinti_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_int_USI_add__INT_index_of__INT_FRinti_1) = ((FLD (f_FRi)) + (1));
       FLD (out_FRintk) = f_FRk;
     }
 #endif
@@ -11478,12 +10239,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -11516,19 +10277,19 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintjeven) = f_FRj;
       FLD (in_FRintkeven) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FRintkeven) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -11560,12 +10321,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_FCCk) = f_FCCk;
-      FLD (out_h_fccr_UQI_add__DFLT_index_of__DFLT_FCCk_1) = ((FLD (f_FCCk)) + (1));
+      FLD (out_h_fccr_UQI_add__INT_index_of__INT_FCCk_1) = ((FLD (f_FCCk)) + (1));
     }
 #endif
 #undef FLD
@@ -11594,12 +10355,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRintj) = f_FRj;
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_FRintj) = f_FRj;
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -11638,12 +10399,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -11683,19 +10444,19 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintjeven) = f_FRj;
       FLD (in_FRintkeven) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FRintkeven) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -11727,16 +10488,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintkeven) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
       FLD (out_FRintieven) = f_FRi;
       FLD (out_FRintkeven) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -11764,7 +10525,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_ACC40Si) = f_ACC40Si;
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1));
       FLD (out_ACC40Sk) = f_ACC40Sk;
     }
 #endif
@@ -11793,11 +10554,11 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_ACC40Si) = f_ACC40Si;
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1));
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_2) = ((FLD (f_ACC40Si)) + (2));
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_3) = ((FLD (f_ACC40Si)) + (3));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_2) = ((FLD (f_ACC40Si)) + (2));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_3) = ((FLD (f_ACC40Si)) + (3));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
     }
 #endif
 #undef FLD
@@ -11825,9 +10586,9 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_ACC40Si) = f_ACC40Si;
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
     }
 #endif
 #undef FLD
@@ -11855,13 +10616,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_ACC40Si) = f_ACC40Si;
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1));
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_2) = ((FLD (f_ACC40Si)) + (2));
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Si_3) = ((FLD (f_ACC40Si)) + (3));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_1) = ((FLD (f_ACC40Si)) + (1));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_2) = ((FLD (f_ACC40Si)) + (2));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Si_3) = ((FLD (f_ACC40Si)) + (3));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
     }
 #endif
 #undef FLD
@@ -11893,12 +10654,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
     }
 #endif
 #undef FLD
@@ -11937,12 +10698,12 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
     }
 #endif
 #undef FLD
@@ -11974,18 +10735,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintjeven) = f_FRj;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
     }
 #endif
 #undef FLD
@@ -12024,18 +10785,18 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintjeven) = f_FRj;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
     }
 #endif
 #undef FLD
@@ -12068,13 +10829,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_ACC40Sk) = f_ACC40Sk;
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
     }
 #endif
 #undef FLD
@@ -12107,13 +10868,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_ACC40Uk) = f_ACC40Uk;
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_ACC40Uk) = f_ACC40Uk;
-      FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
+      FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
     }
 #endif
 #undef FLD
@@ -12153,13 +10914,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
     }
 #endif
 #undef FLD
@@ -12199,13 +10960,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_ACC40Uk) = f_ACC40Uk;
-      FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
+      FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
     }
 #endif
 #undef FLD
@@ -12238,21 +10999,21 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_ACC40Sk) = f_ACC40Sk;
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintjeven) = f_FRj;
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
     }
 #endif
 #undef FLD
@@ -12285,21 +11046,21 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_ACC40Uk) = f_ACC40Uk;
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintjeven) = f_FRj;
-      FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
-      FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2));
-      FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
+      FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2));
+      FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_ACC40Uk) = f_ACC40Uk;
-      FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
-      FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2));
-      FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3));
+      FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
+      FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2));
+      FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3));
     }
 #endif
 #undef FLD
@@ -12339,21 +11100,21 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintjeven) = f_FRj;
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
-      FLD (in_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
+      FLD (in_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_2) = ((FLD (f_ACC40Sk)) + (2));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_3) = ((FLD (f_ACC40Sk)) + (3));
     }
 #endif
 #undef FLD
@@ -12393,21 +11154,21 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintjeven) = f_FRj;
-      FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
-      FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2));
-      FLD (in_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
+      FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2));
+      FLD (in_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_ACC40Uk) = f_ACC40Uk;
-      FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
-      FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2));
-      FLD (out_h_acc40U_UDI_add__DFLT_index_of__DFLT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3));
+      FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_1) = ((FLD (f_ACC40Uk)) + (1));
+      FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_2) = ((FLD (f_ACC40Uk)) + (2));
+      FLD (out_h_acc40U_UDI_add__INT_index_of__INT_ACC40Uk_3) = ((FLD (f_ACC40Uk)) + (3));
     }
 #endif
 #undef FLD
@@ -12439,10 +11200,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_ACC40Sk) = f_ACC40Sk;
     }
 #endif
@@ -12482,10 +11243,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintj) = f_FRj;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_ACC40Sk) = f_ACC40Sk;
     }
 #endif
@@ -12518,16 +11279,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintjeven) = f_FRj;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_ACC40Sk) = f_ACC40Sk;
-      FLD (out_h_acc40S_DI_add__DFLT_index_of__DFLT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
+      FLD (out_h_acc40S_DI_add__INT_index_of__INT_ACC40Sk_1) = ((FLD (f_ACC40Sk)) + (1));
     }
 #endif
 #undef FLD
@@ -12557,10 +11318,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   /* Record the fields for profiling.  */
   if (PROFILE_MODEL_P (current_cpu))
     {
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -12597,10 +11358,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_CCi) = f_CCi;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -12631,13 +11392,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   if (PROFILE_MODEL_P (current_cpu))
     {
       FLD (in_FRintkeven) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
       FLD (out_FRintkeven) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -12675,13 +11436,13 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_CCi) = f_CCi;
       FLD (in_FRintkeven) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
       FLD (out_FRintkeven) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -12711,10 +11472,10 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
   /* Record the fields for profiling.  */
   if (PROFILE_MODEL_P (current_cpu))
     {
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -12747,17 +11508,17 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintjeven) = f_FRj;
       FLD (in_FRintkeven) = f_FRk;
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FRintieven) = f_FRi;
       FLD (out_FRintjeven) = f_FRj;
       FLD (out_FRintkeven) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -12786,14 +11547,14 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRinti) = f_FRi;
       FLD (in_FRintkeven) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRinti_0) = ((FLD (f_FRi)) + (0));
       FLD (out_FRinti) = f_FRi;
       FLD (out_FRintkeven) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_add__DFLT_0_1) = ((FLD (f_FRk)) + (((0) + (1))));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_add__DFLT_0_1) = ((FLD (f_FRk)) + (((0) + (1))));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_add__INT_0_1) = ((FLD (f_FRk)) + (((0) + (1))));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_add__INT_0_1) = ((FLD (f_FRk)) + (((0) + (1))));
     }
 #endif
 #undef FLD
@@ -12822,20 +11583,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRintieven) = f_FRi;
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_0) = ((FLD (f_FRi)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_0) = ((FLD (f_FRi)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintieven_1) = ((FLD (f_FRi)) + (1));
       FLD (out_FRintieven) = f_FRi;
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_0_1) = ((FLD (f_FRk)) + (((0) + (1))));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_2_1) = ((FLD (f_FRk)) + (((2) + (1))));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_0_1) = ((FLD (f_FRk)) + (((0) + (1))));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_add__DFLT_2_1) = ((FLD (f_FRk)) + (((2) + (1))));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_add__INT_0_1) = ((FLD (f_FRk)) + (((0) + (1))));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_add__INT_2_1) = ((FLD (f_FRk)) + (((2) + (1))));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_add__INT_0_1) = ((FLD (f_FRk)) + (((0) + (1))));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_add__INT_2_1) = ((FLD (f_FRk)) + (((2) + (1))));
     }
 #endif
 #undef FLD
@@ -12864,16 +11625,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRintj) = f_FRj;
       FLD (in_FRintkeven) = f_FRk;
-      FLD (in_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_0_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_1_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_2_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_3_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_FRintj) = f_FRj;
       FLD (out_FRintkeven) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -12909,16 +11670,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRintj) = f_FRj;
       FLD (in_FRintkeven) = f_FRk;
-      FLD (in_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_0_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_1_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_2_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_3_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_FRintj) = f_FRj;
       FLD (out_FRintkeven) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintkeven_1) = ((FLD (f_FRk)) + (1));
     }
 #endif
 #undef FLD
@@ -12947,16 +11708,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRintjeven) = f_FRj;
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FRintjeven) = f_FRj;
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_0_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_1_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_2_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_3_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -12992,16 +11753,16 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRintjeven) = f_FRj;
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_hi_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_lo_UHI_add__INT_index_of__INT_FRintjeven_1) = ((FLD (f_FRj)) + (1));
       FLD (out_FRintjeven) = f_FRj;
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_0_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_1_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_2_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_3_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
     }
 #endif
 #undef FLD
@@ -13030,20 +11791,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     {
       FLD (in_FRintj) = f_FRj;
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_0_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_1_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_2_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_3_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_FRintj) = f_FRj;
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3));
     }
 #endif
 #undef FLD
@@ -13079,20 +11840,20 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
       FLD (in_CCi) = f_CCi;
       FLD (in_FRintj) = f_FRj;
       FLD (in_FRintk) = f_FRk;
-      FLD (in_h_fr_0_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_1_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_2_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
-      FLD (in_h_fr_3_UHI_add__DFLT_index_of__DFLT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_0_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_1_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_2_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
+      FLD (in_h_fr_3_UHI_add__INT_index_of__INT_FRintj_0) = ((FLD (f_FRj)) + (0));
       FLD (out_FRintj) = f_FRj;
       FLD (out_FRintk) = f_FRk;
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2));
-      FLD (out_h_fr_hi_UHI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_0) = ((FLD (f_FRk)) + (0));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_1) = ((FLD (f_FRk)) + (1));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_2) = ((FLD (f_FRk)) + (2));
-      FLD (out_h_fr_lo_UHI_add__DFLT_index_of__DFLT_FRintk_3) = ((FLD (f_FRk)) + (3));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2));
+      FLD (out_h_fr_hi_UHI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_0) = ((FLD (f_FRk)) + (0));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_1) = ((FLD (f_FRk)) + (1));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_2) = ((FLD (f_FRk)) + (2));
+      FLD (out_h_fr_lo_UHI_add__INT_index_of__INT_FRintk_3) = ((FLD (f_FRk)) + (3));
     }
 #endif
 #undef FLD
diff --git a/sim/frv/decode.h b/sim/frv/decode.h
index cd2bbd6..b004a2d 100644
--- a/sim/frv/decode.h
+++ b/sim/frv/decode.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/frv/model.c b/sim/frv/model.c
index e2ead60..144fea3 100644
--- a/sim/frv/model.c
+++ b/sim/frv/model.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
diff --git a/sim/frv/sem.c b/sim/frv/sem.c
index 63e3724..e1f9a96 100644
--- a/sim/frv/sem.c
+++ b/sim/frv/sem.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2007 Free Software Foundation, Inc.
+Copyright 1996-2009 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -1458,7 +1458,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   BI tmp_tmp;
   QI tmp_cc;
   SI tmp_result;
-  tmp_cc = CPU (h_iccr[((FLD (f_CCi)) & (3))]);
+  tmp_cc = CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]);
   tmp_tmp = ADDOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), 0);
 if (EQBI (tmp_tmp, 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
@@ -1489,7 +1489,7 @@ if (LTSI (tmp_result, 0)) {
   }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
@@ -1517,7 +1517,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   BI tmp_tmp;
   QI tmp_cc;
   SI tmp_result;
-  tmp_cc = CPU (h_iccr[((FLD (f_CCi)) & (3))]);
+  tmp_cc = CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]);
   tmp_tmp = SUBOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), 0);
 if (EQBI (tmp_tmp, 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
@@ -1548,7 +1548,7 @@ if (LTSI (tmp_result, 0)) {
   }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
@@ -1575,7 +1575,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
 {
   DI tmp_tmp;
   QI tmp_cc;
-  tmp_cc = CPU (h_iccr[((FLD (f_CCi)) & (3))]);
+  tmp_cc = CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]);
   tmp_tmp = MULDI (EXTSIDI (GET_H_GR (FLD (f_GRi))), EXTSIDI (GET_H_GR (FLD (f_GRj))));
 if (EQDI (SRLDI (tmp_tmp, 63), 0)) {
   tmp_cc = ANDQI (tmp_cc, 7);
@@ -1595,7 +1595,7 @@ if (EQBI (EQDI (tmp_tmp, 0), 0)) {
   }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
@@ -1630,23 +1630,23 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   }
 if (EQSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 7), 4);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 7), 4);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 11), 8);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 11), 8);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
-    UQI opval = ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 3);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 3);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
@@ -1683,23 +1683,23 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   }
 if (EQSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 7), 4);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 7), 4);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 11), 8);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 11), 8);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
-    UQI opval = ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 3);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 3);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
@@ -1736,23 +1736,23 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   }
 if (EQSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 7), 4);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 7), 4);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
 if (LTSI (tmp_tmp, 0)) {
   {
-    UQI opval = ORQI (ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 11), 8);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ORQI (ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 11), 8);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
 } else {
   {
-    UQI opval = ANDQI (CPU (h_iccr[((FLD (f_CCi)) & (3))]), 3);
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    UQI opval = ANDQI (CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), 3);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
@@ -1783,7 +1783,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   SI tmp_tmp;
   QI tmp_cc;
   tmp_shift = ANDSI (GET_H_GR (FLD (f_GRj)), 31);
-  tmp_cc = frvbf_set_icc_for_shift_left (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[((FLD (f_CCi)) & (3))]));
+  tmp_cc = frvbf_set_icc_for_shift_left (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]));
   tmp_tmp = SLLSI (GET_H_GR (FLD (f_GRi)), tmp_shift);
   {
     SI opval = tmp_tmp;
@@ -1802,7 +1802,7 @@ if (LTSI (tmp_tmp, 0)) {
 }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
@@ -1831,7 +1831,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   SI tmp_tmp;
   QI tmp_cc;
   tmp_shift = ANDSI (GET_H_GR (FLD (f_GRj)), 31);
-  tmp_cc = frvbf_set_icc_for_shift_right (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[((FLD (f_CCi)) & (3))]));
+  tmp_cc = frvbf_set_icc_for_shift_right (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]));
   tmp_tmp = SRLSI (GET_H_GR (FLD (f_GRi)), tmp_shift);
   {
     SI opval = tmp_tmp;
@@ -1850,7 +1850,7 @@ if (LTSI (tmp_tmp, 0)) {
 }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
@@ -1879,7 +1879,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   SI tmp_tmp;
   QI tmp_cc;
   tmp_shift = ANDSI (GET_H_GR (FLD (f_GRj)), 31);
-  tmp_cc = frvbf_set_icc_for_shift_right (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[((FLD (f_CCi)) & (3))]));
+  tmp_cc = frvbf_set_icc_for_shift_right (current_cpu, GET_H_GR (FLD (f_GRi)), tmp_shift, CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]));
   tmp_tmp = SRASI (GET_H_GR (FLD (f_GRi)), tmp_shift);
   {
     SI opval = tmp_tmp;
@@ -1898,7 +1898,7 @@ if (LTSI (tmp_tmp, 0)) {
 }
   {
     UQI opval = tmp_cc;
-    sim_queue_qi_write (current_cpu, & CPU (h_iccr[((FLD (f_CCi)) & (3))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_iccr[ANDSI (FLD (f_CCi), 3)]), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "iccr", 'x', opval);
   }
@@ -1968,12 +1968,12 @@ SEM_FN_NAME (frvbf,addxcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   QI tmp_cc;
   tmp_cc = CPU (h_iccr[FLD (f_ICCi_1)]);
   tmp_tmp = ADDCSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1)));
-if (EQSI (ADDOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (ADDOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
 } else {
   tmp_cc = ORQI (tmp_cc, 2);
 }
-if (EQSI (ADDCFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (ADDCFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 14);
 } else {
   tmp_cc = ORQI (tmp_cc, 1);
@@ -2019,12 +2019,12 @@ SEM_FN_NAME (frvbf,subxcc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   QI tmp_cc;
   tmp_cc = CPU (h_iccr[FLD (f_ICCi_1)]);
   tmp_tmp = SUBCSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1)));
-if (EQSI (SUBOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (SUBOFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
 } else {
   tmp_cc = ORQI (tmp_cc, 2);
 }
-if (EQSI (SUBCFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (SUBCFSI (GET_H_GR (FLD (f_GRi)), GET_H_GR (FLD (f_GRj)), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 14);
 } else {
   tmp_cc = ORQI (tmp_cc, 1);
@@ -2960,12 +2960,12 @@ SEM_FN_NAME (frvbf,addxicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   QI tmp_cc;
   tmp_cc = CPU (h_iccr[FLD (f_ICCi_1)]);
   tmp_tmp = ADDCSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1)));
-if (EQSI (ADDOFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (ADDOFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
 } else {
   tmp_cc = ORQI (tmp_cc, 2);
 }
-if (EQSI (ADDCFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (ADDCFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 14);
 } else {
   tmp_cc = ORQI (tmp_cc, 1);
@@ -3011,12 +3011,12 @@ SEM_FN_NAME (frvbf,subxicc) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   QI tmp_cc;
   tmp_cc = CPU (h_iccr[FLD (f_ICCi_1)]);
   tmp_tmp = SUBCSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1)));
-if (EQSI (SUBOFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (SUBOFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 13);
 } else {
   tmp_cc = ORQI (tmp_cc, 2);
 }
-if (EQSI (SUBCFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
+if (EQBI (SUBCFSI (GET_H_GR (FLD (f_GRi)), FLD (f_s10), TRUNCQIBI (ANDQI (tmp_cc, 1))), 0)) {
   tmp_cc = ANDQI (tmp_cc, 14);
 } else {
   tmp_cc = ORQI (tmp_cc, 1);
@@ -7590,7 +7590,7 @@ if (EQSI (FLD (f_GRj), 0)) {
   }
   {
     USI opval = 0;
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 5);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
@@ -7604,8 +7604,8 @@ if (EQSI (FLD (f_GRj), 0)) {
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = GET_H_GR (((FLD (f_GRj)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 5);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
@@ -7637,8 +7637,8 @@ if (NESI (FLD (f_GRj), 0)) {
     TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
-    USI opval = GET_H_FR_INT (((FLD (f_FRk)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ((FLD (f_GRj)) + (1)), opval);
+    USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 1), opval);
     written |= (1 << 5);
     TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
@@ -7671,19 +7671,19 @@ if (EQSI (FLD (f_GRj), 0)) {
   }
   {
     USI opval = 0;
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     USI opval = 0;
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (2)), opval);
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
     USI opval = 0;
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (3)), opval);
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
@@ -7697,20 +7697,20 @@ if (EQSI (FLD (f_GRj), 0)) {
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = GET_H_GR (((FLD (f_GRj)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = GET_H_GR (((FLD (f_GRj)) + (2)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (2)), opval);
+    USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 2));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = GET_H_GR (((FLD (f_GRj)) + (3)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (3)), opval);
+    USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 3));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
@@ -7742,20 +7742,20 @@ if (NESI (FLD (f_GRj), 0)) {
     TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
-    USI opval = GET_H_FR_INT (((FLD (f_FRk)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ((FLD (f_GRj)) + (1)), opval);
+    USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
-    USI opval = GET_H_FR_INT (((FLD (f_FRk)) + (2)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ((FLD (f_GRj)) + (2)), opval);
+    USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 2));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 2), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
-    USI opval = GET_H_FR_INT (((FLD (f_FRk)) + (3)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ((FLD (f_GRj)) + (3)), opval);
+    USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 3));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 3), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
@@ -7839,7 +7839,7 @@ if (EQSI (FLD (f_GRj), 0)) {
   }
   {
     USI opval = 0;
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
@@ -7853,8 +7853,8 @@ if (EQSI (FLD (f_GRj), 0)) {
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = GET_H_GR (((FLD (f_GRj)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = GET_H_GR (ADDSI (FLD (f_GRj), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
@@ -7887,8 +7887,8 @@ if (ANDIF (NESI (FLD (f_GRj), 0), EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_
     TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
   {
-    USI opval = GET_H_FR_INT (((FLD (f_FRk)) + (1)));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ((FLD (f_GRj)) + (1)), opval);
+    USI opval = GET_H_FR_INT (ADDSI (FLD (f_FRk), 1));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_gr_set, ADDSI (FLD (f_GRj), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "gr", 'x', opval);
   }
@@ -16733,8 +16733,8 @@ SEM_FN_NAME (frvbf,fditos) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -16761,8 +16761,8 @@ SEM_FN_NAME (frvbf,fdstoi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
@@ -16791,8 +16791,8 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->floatsisf (CGEN_CPU_FPU (current_cpu), GET_H_FR_INT (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -16821,8 +16821,8 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    USI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = CGEN_CPU_FPU (current_cpu)->ops->fixsfsi (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 }
@@ -16989,8 +16989,8 @@ SEM_FN_NAME (frvbf,fdmovs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = GET_H_FR (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = GET_H_FR (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -17084,8 +17084,8 @@ SEM_FN_NAME (frvbf,fdnegs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->negsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->negsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -17179,8 +17179,8 @@ SEM_FN_NAME (frvbf,fdabss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->abssf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->abssf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -17253,8 +17253,8 @@ SEM_FN_NAME (frvbf,fdsqrts) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -17283,8 +17283,8 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->sqrtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -17924,33 +17924,33 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
 }
 }
 }
-if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 2;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
-if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 8;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
-if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 4;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
@@ -18066,8 +18066,8 @@ SEM_FN_NAME (frvbf,fdmadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1)))), GET_H_FR (((FLD (f_FRk)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))), GET_H_FR (ADDSI (FLD (f_FRk), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18096,8 +18096,8 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1)))), GET_H_FR (((FLD (f_FRk)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1))), GET_H_FR (ADDSI (FLD (f_FRk), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18222,8 +18222,8 @@ SEM_FN_NAME (frvbf,fmas) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18250,8 +18250,8 @@ SEM_FN_NAME (frvbf,fmss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18278,18 +18278,18 @@ SEM_FN_NAME (frvbf,fdmas) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (2))), GET_H_FR (((FLD (f_FRj)) + (2))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (2)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (3))), GET_H_FR (((FLD (f_FRj)) + (3))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (3)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18316,18 +18316,18 @@ SEM_FN_NAME (frvbf,fdmss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (2))), GET_H_FR (((FLD (f_FRj)) + (2))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (2)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (3))), GET_H_FR (((FLD (f_FRj)) + (3))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (3)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18358,18 +18358,18 @@ frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 3));
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (2))), GET_H_FR (((FLD (f_FRj)) + (2))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (2)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (3))), GET_H_FR (((FLD (f_FRj)) + (3))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (3)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18400,18 +18400,18 @@ frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 3));
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (2))), GET_H_FR (((FLD (f_FRj)) + (2))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (2)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 2)), GET_H_FR (ADDSI (FLD (f_FRj), 2)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 2), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (3))), GET_H_FR (((FLD (f_FRj)) + (3))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (3)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 3)), GET_H_FR (ADDSI (FLD (f_FRj), 3)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 3), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18440,8 +18440,8 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
@@ -18473,8 +18473,8 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
@@ -18504,8 +18504,8 @@ SEM_FN_NAME (frvbf,fmad) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1)))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)))));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18532,8 +18532,8 @@ SEM_FN_NAME (frvbf,fmsd) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->subdf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1)))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRj)) + (1))))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->ftruncdfsf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->subdf (CGEN_CPU_FPU (current_cpu), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1))), CGEN_CPU_FPU (current_cpu)->ops->fextsfdf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRj), 1)))));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18562,8 +18562,8 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18592,8 +18592,8 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18620,8 +18620,8 @@ SEM_FN_NAME (frvbf,fdadds) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18648,8 +18648,8 @@ SEM_FN_NAME (frvbf,fdsubs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18676,8 +18676,8 @@ SEM_FN_NAME (frvbf,fdmuls) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18704,8 +18704,8 @@ SEM_FN_NAME (frvbf,fddivs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18732,8 +18732,8 @@ SEM_FN_NAME (frvbf,fdsads) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18755,13 +18755,13 @@ SEM_FN_NAME (frvbf,fdmulcs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (((FLD (f_FRj)) + (1))));
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (FLD (f_FRj)));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (FLD (f_FRj)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18784,14 +18784,14 @@ SEM_FN_NAME (frvbf,nfdmulcs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
 frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (((FLD (f_FRj)) + (1))));
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (FLD (f_FRi)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
     sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, FLD (f_FRk), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (FLD (f_FRj)));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (FLD (f_FRj)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18820,8 +18820,8 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->addsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18850,8 +18850,8 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18880,8 +18880,8 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->mulsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18910,8 +18910,8 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->divsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18940,8 +18940,8 @@ frvbf_set_ne_index (current_cpu, FLD (f_FRk));
   }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
   {
-    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))));
-    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ((FLD (f_FRk)) + (1)), opval);
+    SF opval = CGEN_CPU_FPU (current_cpu)->ops->subsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)));
+    sim_queue_fn_sf_write (current_cpu, frvbf_h_fr_set, ADDSI (FLD (f_FRk), 1), opval);
     TRACE_RESULT (current_cpu, abuf, "fr", 'f', opval);
   }
 }
@@ -18997,33 +18997,33 @@ if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR
 }
 }
 frvbf_set_ne_index (current_cpu, ADDSI (FLD (f_FRk), 1));
-if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->gtsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 2;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
-if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->eqsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 8;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
-if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (((FLD (f_FRi)) + (1))), GET_H_FR (((FLD (f_FRj)) + (1))))) {
+if (CGEN_CPU_FPU (current_cpu)->ops->ltsf (CGEN_CPU_FPU (current_cpu), GET_H_FR (ADDSI (FLD (f_FRi), 1)), GET_H_FR (ADDSI (FLD (f_FRj), 1)))) {
   {
     UQI opval = 4;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCi_2)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCi_2), 1)]), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
@@ -19098,12 +19098,12 @@ SEM_FN_NAME (frvbf,mhdsets) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   }
   {
     UHI opval = FLD (f_u12);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = FLD (f_u12);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
@@ -19185,23 +19185,23 @@ SEM_FN_NAME (frvbf,mhdseth) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   }
 {
   HI tmp_tmp;
-  tmp_tmp = GET_H_FR_HI (((FLD (f_FRk)) + (0)));
+  tmp_tmp = GET_H_FR_HI (ADDSI (FLD (f_FRk), 0));
   tmp_tmp = ANDHI (tmp_tmp, 2047);
   tmp_tmp = ORHI (tmp_tmp, SLLSI (ANDSI (FLD (f_s5), 31), 11));
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
 {
   HI tmp_tmp;
-  tmp_tmp = GET_H_FR_LO (((FLD (f_FRk)) + (0)));
+  tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRk), 0));
   tmp_tmp = ANDHI (tmp_tmp, 2047);
   tmp_tmp = ORHI (tmp_tmp, SLLSI (ANDSI (FLD (f_s5), 31), 11));
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
@@ -19449,7 +19449,7 @@ SEM_FN_NAME (frvbf,mwcut) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = frvbf_cut (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (((FLD (f_FRi)) + (1))), GET_H_FR_INT (FLD (f_FRj)));
+    SI opval = frvbf_cut (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (ADDSI (FLD (f_FRi), 1)), GET_H_FR_INT (FLD (f_FRj)));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
@@ -19470,7 +19470,7 @@ SEM_FN_NAME (frvbf,mwcuti) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 4);
 
   {
-    SI opval = frvbf_cut (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (((FLD (f_FRi)) + (1))), FLD (f_u6));
+    SI opval = frvbf_cut (current_cpu, GET_H_FR_INT (FLD (f_FRi)), GET_H_FR_INT (ADDSI (FLD (f_FRi), 1)), FLD (f_u6));
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
@@ -19588,8 +19588,8 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = frvbf_media_cut_ss (current_cpu, GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))), FLD (f_s6));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = frvbf_media_cut_ss (current_cpu, GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)), FLD (f_s6));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 6);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
@@ -19646,13 +19646,13 @@ SEM_FN_NAME (frvbf,msllhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SLLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
@@ -19684,13 +19684,13 @@ SEM_FN_NAME (frvbf,msrlhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    UHI opval = SRLHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SRLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SRLHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SRLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
@@ -19722,13 +19722,13 @@ SEM_FN_NAME (frvbf,msrahi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SRAHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SRAHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
@@ -19759,8 +19759,8 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    USI opval = ROLSI (GET_H_FR_INT (((FLD (f_FRi)) + (1))), ANDSI (FLD (f_s6), 31));
-    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ((FLD (f_FRk)) + (1)), opval);
+    USI opval = ROLSI (GET_H_FR_INT (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_s6), 31));
+    sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 6);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
@@ -19798,17 +19798,17 @@ SEM_FN_NAME (frvbf,mcplhi) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   tmp_shift = ANDSI (FLD (f_u6), 15);
-  tmp_arg1 = SLLHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), tmp_shift);
+  tmp_arg1 = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), tmp_shift);
 if (NEHI (tmp_shift, 0)) {
 {
-  tmp_arg2 = GET_H_FR_HI (((FLD (f_FRi)) + (1)));
+  tmp_arg2 = GET_H_FR_HI (ADDSI (FLD (f_FRi), 1));
   tmp_arg2 = SRLHI (SLLHI (tmp_arg2, SUBSI (15, tmp_shift)), SUBSI (15, tmp_shift));
   tmp_arg1 = ORHI (tmp_arg1, tmp_arg2);
 }
 }
   {
     UHI opval = tmp_arg1;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 }
@@ -19836,7 +19836,7 @@ SEM_FN_NAME (frvbf,mcpli) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 if (NESI (tmp_shift, 0)) {
 {
   SI tmp_tmp1;
-  tmp_tmp1 = SRLSI (SLLSI (GET_H_FR_INT (((FLD (f_FRi)) + (1))), SUBSI (31, tmp_shift)), SUBSI (31, tmp_shift));
+  tmp_tmp1 = SRLSI (SLLSI (GET_H_FR_INT (ADDSI (FLD (f_FRi), 1)), SUBSI (31, tmp_shift)), SUBSI (31, tmp_shift));
   tmp_tmp = ORSI (tmp_tmp, tmp_tmp1);
 }
 }
@@ -19868,15 +19868,15 @@ SEM_FN_NAME (frvbf,msaths) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTHI (tmp_argihi, tmp_argjhi)) {
   {
     UHI opval = tmp_argjhi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -19884,14 +19884,14 @@ if (GTHI (tmp_argihi, tmp_argjhi)) {
 if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) {
   {
     UHI opval = INVHI (tmp_argjhi);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argihi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -19900,7 +19900,7 @@ if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) {
 if (GTHI (tmp_argilo, tmp_argjlo)) {
   {
     UHI opval = tmp_argjlo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -19908,14 +19908,14 @@ if (GTHI (tmp_argilo, tmp_argjlo)) {
 if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) {
   {
     UHI opval = INVHI (tmp_argjlo);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argilo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -19954,15 +19954,15 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTHI (tmp_argihi, tmp_argjhi)) {
   {
     UHI opval = tmp_argjhi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -19970,14 +19970,14 @@ if (GTHI (tmp_argihi, tmp_argjhi)) {
 if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) {
   {
     UHI opval = INVHI (tmp_argjhi);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argihi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -19986,7 +19986,7 @@ if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) {
 if (GTHI (tmp_argilo, tmp_argjlo)) {
   {
     UHI opval = tmp_argjlo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -19994,29 +19994,29 @@ if (GTHI (tmp_argilo, tmp_argjlo)) {
 if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) {
   {
     UHI opval = INVHI (tmp_argjlo);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argilo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTHI (tmp_argihi, tmp_argjhi)) {
   {
     UHI opval = tmp_argjhi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20024,14 +20024,14 @@ if (GTHI (tmp_argihi, tmp_argjhi)) {
 if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) {
   {
     UHI opval = INVHI (tmp_argjhi);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argihi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20040,7 +20040,7 @@ if (LTHI (tmp_argihi, INVHI (tmp_argjhi))) {
 if (GTHI (tmp_argilo, tmp_argjlo)) {
   {
     UHI opval = tmp_argjlo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20048,14 +20048,14 @@ if (GTHI (tmp_argilo, tmp_argjlo)) {
 if (LTHI (tmp_argilo, INVHI (tmp_argjlo))) {
   {
     UHI opval = INVHI (tmp_argjlo);
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argilo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20086,22 +20086,22 @@ SEM_FN_NAME (frvbf,msathu) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTUHI (tmp_argihi, tmp_argjhi)) {
   {
     UHI opval = tmp_argjhi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argihi;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20109,14 +20109,14 @@ if (GTUHI (tmp_argihi, tmp_argjhi)) {
 if (GTUHI (tmp_argilo, tmp_argjlo)) {
   {
     UHI opval = tmp_argjlo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 } else {
   {
     UHI opval = tmp_argilo;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20148,10 +20148,10 @@ frvbf_media_cr_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTHI (tmp_argihi, tmp_argjhi)) {
   {
@@ -20189,7 +20189,7 @@ if (LTHI (tmp_argihi, tmp_argjhi)) {
 if (GTHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 2;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
@@ -20197,7 +20197,7 @@ if (GTHI (tmp_argilo, tmp_argjlo)) {
 if (EQHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 8;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
@@ -20205,14 +20205,14 @@ if (EQHI (tmp_argilo, tmp_argjlo)) {
 if (LTHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 4;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
@@ -20247,10 +20247,10 @@ frvbf_media_cr_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 if (GTUHI (tmp_argihi, tmp_argjhi)) {
   {
@@ -20288,7 +20288,7 @@ if (LTUHI (tmp_argihi, tmp_argjhi)) {
 if (GTUHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 2;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
@@ -20296,7 +20296,7 @@ if (GTUHI (tmp_argilo, tmp_argjlo)) {
 if (EQHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 8;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
@@ -20304,14 +20304,14 @@ if (EQHI (tmp_argilo, tmp_argjlo)) {
 if (LTUHI (tmp_argilo, tmp_argjlo)) {
   {
     UQI opval = 4;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
 } else {
   {
     UQI opval = 1;
-    sim_queue_qi_write (current_cpu, & CPU (h_fccr[((FLD (f_FCCk)) + (1))]), opval);
+    sim_queue_qi_write (current_cpu, & CPU (h_fccr[ADDSI (FLD (f_FCCk), 1)]), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fccr", 'x', opval);
   }
@@ -20350,13 +20350,13 @@ SEM_FN_NAME (frvbf,mabshs) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
     sim_queue_fn_si_write (current_cpu, frvbf_h_fr_int_set, FLD (f_FRk), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
-  tmp_arghi = GET_H_FR_HI (((FLD (f_FRj)) + (0)));
-  tmp_arglo = GET_H_FR_LO (((FLD (f_FRj)) + (0)));
+  tmp_arghi = GET_H_FR_HI (ADDSI (FLD (f_FRj), 0));
+  tmp_arglo = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0));
 if (GTDI (ABSDI (EXTHIDI (tmp_arghi)), 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20367,7 +20367,7 @@ if (LTDI (ABSDI (EXTHIDI (tmp_arghi)), -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20376,7 +20376,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = ABSDI (EXTHIDI (tmp_arghi));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20386,7 +20386,7 @@ if (GTDI (ABSDI (EXTHIDI (tmp_arglo)), 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20397,7 +20397,7 @@ if (LTDI (ABSDI (EXTHIDI (tmp_arglo)), -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20406,7 +20406,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = ABSDI (EXTHIDI (tmp_arglo));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20436,10 +20436,10 @@ SEM_FN_NAME (frvbf,maddhss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -20448,7 +20448,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20459,7 +20459,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20468,7 +20468,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20482,7 +20482,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20493,7 +20493,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20502,7 +20502,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20533,10 +20533,10 @@ SEM_FN_NAME (frvbf,maddhus) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -20545,7 +20545,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20556,7 +20556,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20565,7 +20565,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20579,7 +20579,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20590,7 +20590,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20599,7 +20599,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20630,10 +20630,10 @@ SEM_FN_NAME (frvbf,msubhss) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -20642,7 +20642,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20653,7 +20653,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20662,7 +20662,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20676,7 +20676,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20687,7 +20687,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20696,7 +20696,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20727,10 +20727,10 @@ SEM_FN_NAME (frvbf,msubhus) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -20739,7 +20739,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20750,7 +20750,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20759,7 +20759,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20773,7 +20773,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20784,7 +20784,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20793,7 +20793,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20825,10 +20825,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -20837,7 +20837,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20848,7 +20848,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20857,7 +20857,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20871,7 +20871,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20882,7 +20882,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20891,7 +20891,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20924,10 +20924,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -20936,7 +20936,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20947,7 +20947,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20956,7 +20956,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -20970,7 +20970,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20981,7 +20981,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -20990,7 +20990,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21023,10 +21023,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -21035,7 +21035,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21046,7 +21046,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21055,7 +21055,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21069,7 +21069,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21080,7 +21080,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21089,7 +21089,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21122,10 +21122,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -21134,7 +21134,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21145,7 +21145,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21154,7 +21154,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21168,7 +21168,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21179,7 +21179,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21188,7 +21188,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21229,10 +21229,10 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -21241,7 +21241,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21252,7 +21252,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21261,7 +21261,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21275,7 +21275,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21286,7 +21286,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21295,7 +21295,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21303,10 +21303,10 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -21315,7 +21315,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21326,7 +21326,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21335,7 +21335,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21349,7 +21349,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21360,7 +21360,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21369,7 +21369,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21410,10 +21410,10 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -21422,7 +21422,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21433,7 +21433,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21442,7 +21442,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21456,7 +21456,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21467,7 +21467,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21476,7 +21476,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21484,10 +21484,10 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -21496,7 +21496,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21507,7 +21507,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21516,7 +21516,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21530,7 +21530,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21541,7 +21541,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21550,7 +21550,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21591,10 +21591,10 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -21603,7 +21603,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21614,7 +21614,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21623,7 +21623,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21637,7 +21637,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21648,7 +21648,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21657,7 +21657,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21665,10 +21665,10 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -21677,7 +21677,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21688,7 +21688,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21697,7 +21697,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21711,7 +21711,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21722,7 +21722,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21731,7 +21731,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21772,10 +21772,10 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -21784,7 +21784,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21795,7 +21795,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21804,7 +21804,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21818,7 +21818,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21829,7 +21829,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21838,7 +21838,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21846,10 +21846,10 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -21858,7 +21858,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21869,7 +21869,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21878,7 +21878,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21892,7 +21892,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21903,7 +21903,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21912,7 +21912,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -21954,10 +21954,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -21966,7 +21966,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21977,7 +21977,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -21986,7 +21986,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22000,7 +22000,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22011,7 +22011,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22020,7 +22020,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22028,10 +22028,10 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -22040,7 +22040,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22051,7 +22051,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22060,7 +22060,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22074,7 +22074,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22085,7 +22085,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22094,7 +22094,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22137,10 +22137,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -22149,7 +22149,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22160,7 +22160,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22169,7 +22169,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22183,7 +22183,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22194,7 +22194,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22203,7 +22203,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22211,10 +22211,10 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -22223,7 +22223,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22234,7 +22234,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22243,7 +22243,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22257,7 +22257,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22268,7 +22268,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22277,7 +22277,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22320,10 +22320,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -22332,7 +22332,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22343,7 +22343,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22352,7 +22352,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22366,7 +22366,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22377,7 +22377,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22386,7 +22386,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22394,10 +22394,10 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -22406,7 +22406,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22417,7 +22417,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22426,7 +22426,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22440,7 +22440,7 @@ if (GTDI (tmp_tmp, 32767)) {
 {
   {
     UHI opval = 32767;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22451,7 +22451,7 @@ if (LTDI (tmp_tmp, -32768)) {
 {
   {
     UHI opval = -32768;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22460,7 +22460,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22503,10 +22503,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -22515,7 +22515,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22526,7 +22526,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22535,7 +22535,7 @@ frvbf_media_overflow (current_cpu, 8);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22549,7 +22549,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22560,7 +22560,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22569,7 +22569,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22577,10 +22577,10 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -22589,7 +22589,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22600,7 +22600,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22609,7 +22609,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
@@ -22623,7 +22623,7 @@ if (GTDI (tmp_tmp, 65535)) {
 {
   {
     UHI opval = 65535;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22634,7 +22634,7 @@ if (LTDI (tmp_tmp, 0)) {
 {
   {
     UHI opval = 0;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22643,7 +22643,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22689,38 +22689,38 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_a1 = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_a2 = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_b1 = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_b2 = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_a1 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_a2 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_b1 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_b2 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
-  tmp_a3 = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_a4 = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_b3 = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_b4 = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_a3 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_a4 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_b3 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_b4 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     UHI opval = (LEUHI (ABSHI (tmp_a1), ABSHI (tmp_b1))) ? (0) : (LEHI (0, tmp_b1)) ? (tmp_a1) : (EQHI (tmp_a1, -32768)) ? (32767) : (NEGHI (tmp_a1));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = (LEUHI (ABSHI (tmp_a2), ABSHI (tmp_b2))) ? (0) : (LEHI (0, tmp_b2)) ? (tmp_a2) : (EQHI (tmp_a2, -32768)) ? (32767) : (NEGHI (tmp_a2));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
     UHI opval = (LEUHI (ABSHI (tmp_a3), ABSHI (tmp_b3))) ? (0) : (LEHI (0, tmp_b3)) ? (tmp_a3) : (EQHI (tmp_a3, -32768)) ? (32767) : (NEGHI (tmp_a3));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = (LEUHI (ABSHI (tmp_a4), ABSHI (tmp_b4))) ? (0) : (LEHI (0, tmp_b4)) ? (tmp_a4) : (EQHI (tmp_a4, -32768)) ? (32767) : (NEGHI (tmp_a4));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22762,38 +22762,38 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 {
-  tmp_a1 = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_a2 = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_b1 = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_b2 = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_a1 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_a2 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_b1 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_b2 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
-  tmp_a3 = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_a4 = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_b3 = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_b4 = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_a3 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_a4 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_b3 = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_b4 = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     UHI opval = (ANDIF (GTHI (tmp_b1, -32768), GEHI (tmp_a1, ABSHI (tmp_b1)))) ? (tmp_b1) : (GTHI (tmp_a1, NEGHI (ABSHI (tmp_b1)))) ? (tmp_a1) : (EQHI (tmp_b1, -32768)) ? (32767) : (NEGHI (tmp_b1));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = (ANDIF (GTHI (tmp_b2, -32768), GEHI (tmp_a2, ABSHI (tmp_b2)))) ? (tmp_b2) : (GTHI (tmp_a2, NEGHI (ABSHI (tmp_b2)))) ? (tmp_a2) : (EQHI (tmp_b2, -32768)) ? (32767) : (NEGHI (tmp_b2));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
     UHI opval = (ANDIF (GTHI (tmp_b3, -32768), GEHI (tmp_a3, ABSHI (tmp_b3)))) ? (tmp_b3) : (GTHI (tmp_a3, NEGHI (ABSHI (tmp_b3)))) ? (tmp_a3) : (EQHI (tmp_b3, -32768)) ? (32767) : (NEGHI (tmp_b3));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = (ANDIF (GTHI (tmp_b4, -32768), GEHI (tmp_a4, ABSHI (tmp_b4)))) ? (tmp_b4) : (GTHI (tmp_a4, NEGHI (ABSHI (tmp_b4)))) ? (tmp_a4) : (EQHI (tmp_b4, -32768)) ? (32767) : (NEGHI (tmp_b4));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22833,26 +22833,26 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SLLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 13);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = SLLHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SLLHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = SLLHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22892,26 +22892,26 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SRAHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = SRAHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 13);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = SRAHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = SRAHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), ANDSI (FLD (f_u6), 15));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = SRAHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), ANDSI (FLD (f_u6), 15));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -22941,7 +22941,7 @@ frvbf_media_acc_not_aligned (current_cpu);
 } else {
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
+  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
@@ -23000,7 +23000,7 @@ frvbf_media_acc_not_aligned (current_cpu);
 } else {
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
+  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
@@ -23063,7 +23063,7 @@ frvbf_media_acc_not_aligned (current_cpu);
 {
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
+  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
@@ -23097,12 +23097,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Si)) + (2))), GET_H_ACC40S (((FLD (f_ACC40Si)) + (3))));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 2)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 3)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23113,7 +23113,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
     DI opval = INVDI (MAKEDI (127, 0xffffffff));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23122,7 +23122,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23162,7 +23162,7 @@ frvbf_media_acc_not_aligned (current_cpu);
 {
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
+  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
@@ -23196,12 +23196,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (((FLD (f_ACC40Si)) + (2))), GET_H_ACC40S (((FLD (f_ACC40Si)) + (3))));
+  tmp_tmp = SUBDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 2)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 3)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23212,7 +23212,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
     DI opval = INVDI (MAKEDI (127, 0xffffffff));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23221,7 +23221,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23261,7 +23261,7 @@ frvbf_media_acc_not_aligned (current_cpu);
 {
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
+  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
@@ -23295,12 +23295,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
+  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 5);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23311,7 +23311,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
     DI opval = INVDI (MAKEDI (127, 0xffffffff));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 5);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23320,7 +23320,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 5);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23360,7 +23360,7 @@ frvbf_media_acc_not_aligned (current_cpu);
 {
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
+  tmp_tmp = ADDDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
@@ -23394,12 +23394,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (((FLD (f_ACC40Si)) + (1))));
+  tmp_tmp = SUBDI (GET_H_ACC40S (FLD (f_ACC40Si)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 1)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23410,7 +23410,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
     DI opval = INVDI (MAKEDI (127, 0xffffffff));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23419,7 +23419,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23428,12 +23428,12 @@ frvbf_media_overflow (current_cpu, 4);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Si)) + (2))), GET_H_ACC40S (((FLD (f_ACC40Si)) + (3))));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 2)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 3)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23444,7 +23444,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
     DI opval = INVDI (MAKEDI (127, 0xffffffff));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23453,7 +23453,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23462,12 +23462,12 @@ frvbf_media_overflow (current_cpu, 2);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (((FLD (f_ACC40Si)) + (2))), GET_H_ACC40S (((FLD (f_ACC40Si)) + (3))));
+  tmp_tmp = SUBDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 2)), GET_H_ACC40S (ADDSI (FLD (f_ACC40Si), 3)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23478,7 +23478,7 @@ if (LTDI (tmp_tmp, INVDI (MAKEDI (127, 0xffffffff)))) {
 {
   {
     DI opval = INVDI (MAKEDI (127, 0xffffffff));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23487,7 +23487,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23526,10 +23526,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
@@ -23539,7 +23539,7 @@ frvbf_media_acc_not_aligned (current_cpu);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23573,10 +23573,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
@@ -23586,7 +23586,7 @@ frvbf_media_acc_not_aligned (current_cpu);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23620,10 +23620,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo));
@@ -23633,7 +23633,7 @@ frvbf_media_acc_not_aligned (current_cpu);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23667,10 +23667,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjlo));
@@ -23680,7 +23680,7 @@ frvbf_media_acc_not_aligned (current_cpu);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23715,10 +23715,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
@@ -23728,7 +23728,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23764,10 +23764,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
@@ -23777,7 +23777,7 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23815,10 +23815,10 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
@@ -23828,25 +23828,25 @@ frvbf_media_register_not_aligned (current_cpu);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23884,10 +23884,10 @@ frvbf_media_register_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
@@ -23897,25 +23897,25 @@ frvbf_media_register_not_aligned (current_cpu);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -23953,10 +23953,10 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo));
@@ -23966,25 +23966,25 @@ frvbf_media_register_not_aligned (current_cpu);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24022,10 +24022,10 @@ frvbf_media_register_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjlo));
@@ -24035,25 +24035,25 @@ frvbf_media_register_not_aligned (current_cpu);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24092,10 +24092,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
@@ -24105,25 +24105,25 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24163,10 +24163,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
@@ -24176,25 +24176,25 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
   {
     DI opval = MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo));
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24230,10 +24230,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24271,12 +24271,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24287,7 +24287,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24296,7 +24296,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24333,10 +24333,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24374,12 +24374,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (1))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 1)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -24390,7 +24390,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -24399,7 +24399,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -24436,10 +24436,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24477,12 +24477,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = SUBDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24493,7 +24493,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24502,7 +24502,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24539,10 +24539,10 @@ frvbf_media_acc_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24580,12 +24580,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = SUBDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (1))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = SUBDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 1)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -24596,7 +24596,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -24605,7 +24605,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -24643,10 +24643,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24684,12 +24684,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24700,7 +24700,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24709,7 +24709,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24748,10 +24748,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24789,12 +24789,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (1))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 1)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -24805,7 +24805,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -24814,7 +24814,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -24855,10 +24855,10 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -24896,12 +24896,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24912,7 +24912,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24921,7 +24921,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24929,19 +24929,19 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (2))), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 2)), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24952,7 +24952,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24961,7 +24961,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24970,12 +24970,12 @@ frvbf_media_overflow (current_cpu, 2);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (3))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 3)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24986,7 +24986,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -24995,7 +24995,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25036,10 +25036,10 @@ frvbf_media_register_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25077,12 +25077,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (1))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 1)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25093,7 +25093,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25102,7 +25102,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25110,19 +25110,19 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (2))), MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 2)), MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25133,7 +25133,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25142,7 +25142,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25151,12 +25151,12 @@ frvbf_media_overflow (current_cpu, 2);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (3))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 3)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25167,7 +25167,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25176,7 +25176,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25218,10 +25218,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25259,12 +25259,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25275,7 +25275,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25284,7 +25284,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25292,19 +25292,19 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (2))), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 2)), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 21);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25315,7 +25315,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 21);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25324,7 +25324,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 21);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25333,12 +25333,12 @@ frvbf_media_overflow (current_cpu, 2);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (3))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 3)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 22);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25349,7 +25349,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 22);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25358,7 +25358,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 22);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25401,10 +25401,10 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25442,12 +25442,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (1))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 1)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25458,7 +25458,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25467,7 +25467,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 1), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25475,19 +25475,19 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (2))), MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 2)), MULDI (ZEXTHIDI (tmp_argihi), ZEXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 21);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25498,7 +25498,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 21);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25507,7 +25507,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 2), opval);
     written |= (1 << 21);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25516,12 +25516,12 @@ frvbf_media_overflow (current_cpu, 2);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40U (((FLD (f_ACC40Uk)) + (3))), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40U (ADDSI (FLD (f_ACC40Uk), 3)), MULDI (ZEXTHIDI (tmp_argilo), ZEXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (255, 0xffffffff))) {
 {
   {
     UDI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 22);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25532,7 +25532,7 @@ if (LTDI (tmp_tmp, MAKEDI (0, 0))) {
 {
   {
     UDI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 22);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25541,7 +25541,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     UDI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ((FLD (f_ACC40Uk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40U_set, ADDSI (FLD (f_ACC40Uk), 3), opval);
     written |= (1 << 22);
     TRACE_RESULT (current_cpu, abuf, "acc40U", 'D', opval);
   }
@@ -25583,19 +25583,19 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (2))), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 2)), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25606,7 +25606,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25615,7 +25615,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25624,12 +25624,12 @@ frvbf_media_overflow (current_cpu, 2);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (3))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 3)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25640,7 +25640,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25649,7 +25649,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25657,10 +25657,10 @@ frvbf_media_overflow (current_cpu, 1);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25698,12 +25698,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25714,7 +25714,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25723,7 +25723,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25764,19 +25764,19 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (2))), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 2)), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25787,7 +25787,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25796,7 +25796,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25805,12 +25805,12 @@ frvbf_media_overflow (current_cpu, 2);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (3))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 3)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25821,7 +25821,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25830,7 +25830,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25838,10 +25838,10 @@ frvbf_media_overflow (current_cpu, 1);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25879,12 +25879,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25895,7 +25895,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25904,7 +25904,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -25945,10 +25945,10 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
@@ -25986,12 +25986,12 @@ frvbf_media_overflow (current_cpu, 8);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (1))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 1)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26002,7 +26002,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26011,7 +26011,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26019,19 +26019,19 @@ frvbf_media_overflow (current_cpu, 4);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (2))), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 2)), MULDI (EXTHIDI (tmp_argihi), EXTHIDI (tmp_argjlo)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26042,7 +26042,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26051,7 +26051,7 @@ frvbf_media_overflow (current_cpu, 2);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (2)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 2), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26060,12 +26060,12 @@ frvbf_media_overflow (current_cpu, 2);
 }
 {
   DI tmp_tmp;
-  tmp_tmp = ADDDI (GET_H_ACC40S (((FLD (f_ACC40Sk)) + (3))), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
+  tmp_tmp = ADDDI (GET_H_ACC40S (ADDSI (FLD (f_ACC40Sk), 3)), MULDI (EXTHIDI (tmp_argilo), EXTHIDI (tmp_argjhi)));
 if (GTDI (tmp_tmp, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26076,7 +26076,7 @@ if (LTDI (tmp_tmp, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26085,7 +26085,7 @@ frvbf_media_overflow (current_cpu, 1);
 } else {
   {
     DI opval = tmp_tmp;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (3)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 3), opval);
     written |= (1 << 20);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26120,10 +26120,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26188,10 +26188,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26256,10 +26256,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26324,10 +26324,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26393,10 +26393,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26463,10 +26463,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26533,10 +26533,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26603,10 +26603,10 @@ if (frvbf_check_acc_range (current_cpu, FLD (f_ACC40Sk))) {
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26678,10 +26678,10 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26721,10 +26721,10 @@ frvbf_media_overflow (current_cpu, 8);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26736,7 +26736,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26747,7 +26747,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26756,7 +26756,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp1;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26797,10 +26797,10 @@ frvbf_media_register_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26840,10 +26840,10 @@ frvbf_media_overflow (current_cpu, 8);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26855,7 +26855,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26866,7 +26866,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) {
 {
   {
     DI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26875,7 +26875,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp1;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26916,10 +26916,10 @@ frvbf_media_register_not_aligned (current_cpu);
   HI tmp_argjhi;
   HI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26959,10 +26959,10 @@ frvbf_media_overflow (current_cpu, 8);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -26974,7 +26974,7 @@ if (GTDI (tmp_tmp1, MAKEDI (127, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (127, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26985,7 +26985,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0xffffff80, 0))) {
 {
   {
     DI opval = MAKEDI (0xffffff80, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -26994,7 +26994,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp1;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -27035,10 +27035,10 @@ frvbf_media_register_not_aligned (current_cpu);
   UHI tmp_argjhi;
   UHI tmp_argjlo;
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (0))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 0)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 0)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -27078,10 +27078,10 @@ frvbf_media_overflow (current_cpu, 8);
 }
 }
 {
-  tmp_argihi = ADDHI (GET_H_FR_HI (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argilo = ADDHI (GET_H_FR_LO (((FLD (f_FRi)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
-  tmp_argjhi = ADDHI (GET_H_FR_HI (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
-  tmp_argjlo = ADDHI (GET_H_FR_LO (((FLD (f_FRj)) + (1))), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argihi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argilo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRi), 1)), MULSI (GET_H_FR_INT (FLD (f_FRi)), 0));
+  tmp_argjhi = ADDHI (GET_H_FR_HI (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
+  tmp_argjlo = ADDHI (GET_H_FR_LO (ADDSI (FLD (f_FRj), 1)), MULSI (GET_H_FR_INT (FLD (f_FRj)), 0));
 }
 {
   DI tmp_tmp1;
@@ -27093,7 +27093,7 @@ if (GTDI (tmp_tmp1, MAKEDI (255, 0xffffffff))) {
 {
   {
     DI opval = MAKEDI (255, 0xffffffff);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -27104,7 +27104,7 @@ if (LTDI (tmp_tmp1, MAKEDI (0, 0))) {
 {
   {
     DI opval = MAKEDI (0, 0);
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -27113,7 +27113,7 @@ frvbf_media_overflow (current_cpu, 4);
 } else {
   {
     DI opval = tmp_tmp1;
-    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ((FLD (f_ACC40Sk)) + (1)), opval);
+    sim_queue_fn_di_write (current_cpu, frvbf_h_acc40S_set, ADDSI (FLD (f_ACC40Sk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "acc40S", 'D', opval);
   }
@@ -27144,18 +27144,18 @@ SEM_FN_NAME (frvbf,mexpdhw) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 {
   UHI tmp_tmp;
 if (ANDSI (FLD (f_u6), 1)) {
-  tmp_tmp = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
 } else {
-  tmp_tmp = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
 }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
@@ -27179,19 +27179,19 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
 {
   UHI tmp_tmp;
 if (ANDSI (FLD (f_u6), 1)) {
-  tmp_tmp = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
 } else {
-  tmp_tmp = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
 }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -27226,31 +27226,31 @@ frvbf_media_register_not_aligned (current_cpu);
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 if (ANDSI (FLD (f_u6), 1)) {
-  tmp_tmp = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
 } else {
-  tmp_tmp = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
 }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 7);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -27286,31 +27286,31 @@ if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
     TRACE_RESULT (current_cpu, abuf, "fr_int", 'x', opval);
   }
 if (ANDSI (FLD (f_u6), 1)) {
-  tmp_tmp = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
 } else {
-  tmp_tmp = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
+  tmp_tmp = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
 }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
     UHI opval = tmp_tmp;
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -27336,13 +27336,13 @@ SEM_FN_NAME (frvbf,mpackh) (SIM_CPU *current_cpu, SEM_ARG sem_arg)
 
 {
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
@@ -27386,28 +27386,28 @@ frvbf_media_register_not_aligned (current_cpu);
   }
 {
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 13);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 {
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -27449,26 +27449,26 @@ frvbf_media_register_not_aligned (current_cpu);
   }
 {
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 8);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (ADDSI (0, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval);
     written |= (1 << 9);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (ADDSI (0, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -27510,52 +27510,52 @@ frvbf_media_register_not_aligned (current_cpu);
   }
 {
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (ADDSI (0, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (ADDSI (0, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), ADDSI (0, 1)), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
 }
 {
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRi)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRi), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (ADDSI (2, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), ADDSI (2, 1)), opval);
     written |= (1 << 13);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRi)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (ADDSI (2, 1))), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRi), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), ADDSI (2, 1)), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -27595,26 +27595,26 @@ frvbf_media_register_not_aligned (current_cpu);
 } else {
 {
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 13);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -27655,26 +27655,26 @@ frvbf_media_register_not_aligned (current_cpu);
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
 {
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 13);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -27715,26 +27715,26 @@ frvbf_media_register_not_aligned (current_cpu);
 } else {
 {
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_3_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_3_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 13);
     TRACE_RESULT (current_cpu, abuf, "fr_3", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_2_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_2_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_2", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_1_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_1_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_1", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_0_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_0_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_0", 'x', opval);
   }
@@ -27775,26 +27775,26 @@ frvbf_media_register_not_aligned (current_cpu);
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
 {
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_3_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_3_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_3", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_2_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_2_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "fr_2", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_HI (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_1_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_HI (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_1_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 13);
     TRACE_RESULT (current_cpu, abuf, "fr_1", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_LO (((FLD (f_FRj)) + (1)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_0_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_LO (ADDSI (FLD (f_FRj), 1));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_0_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_0", 'x', opval);
   }
@@ -27835,50 +27835,50 @@ frvbf_media_register_not_aligned (current_cpu);
 } else {
 {
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 10);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 11);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (3)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 13);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (3)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
@@ -27919,50 +27919,50 @@ frvbf_media_register_not_aligned (current_cpu);
 if (EQQI (CPU (h_cccr[FLD (f_CCi)]), ORSI (FLD (f_cond), 2))) {
 {
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 12);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_3 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (0)), opval);
+    UHI opval = GET_H_FR_3 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 0), opval);
     written |= (1 << 16);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 13);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_2 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (1)), opval);
+    UHI opval = GET_H_FR_2 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 1), opval);
     written |= (1 << 17);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 14);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_1 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (2)), opval);
+    UHI opval = GET_H_FR_1 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 2), opval);
     written |= (1 << 18);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ((FLD (f_FRk)) + (3)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_hi_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 15);
     TRACE_RESULT (current_cpu, abuf, "fr_hi", 'x', opval);
   }
   {
-    UHI opval = GET_H_FR_0 (((FLD (f_FRj)) + (0)));
-    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ((FLD (f_FRk)) + (3)), opval);
+    UHI opval = GET_H_FR_0 (ADDSI (FLD (f_FRj), 0));
+    sim_queue_fn_hi_write (current_cpu, frvbf_h_fr_lo_set, ADDSI (FLD (f_FRk), 3), opval);
     written |= (1 << 19);
     TRACE_RESULT (current_cpu, abuf, "fr_lo", 'x', opval);
   }