* cgen-engine.h (EXTRACT_MSB0_SINT): Renamed from EXTRACT_MSB0_INT.

	(EXTRACT_LSB0_SINT): Renamed from EXTRACT_LSB0_INT.
plus regenerate cgen files

2 files changed, 72 insertions, 72 deletions

diff --git a/sim/frv/cpu.h b/sim/frv/cpu.h
index 17552d1..d5d7afb 100644
--- a/sim/frv/cpu.h
+++ b/sim/frv/cpu.h
@@ -1816,7 +1816,7 @@ struct scache {
   f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_SMULI_VARS \
   UINT f_pack; \
@@ -1831,7 +1831,7 @@ struct scache {
   f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_ADDICC_VARS \
   UINT f_pack; \
@@ -1848,7 +1848,7 @@ struct scache {
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
   f_ICCi_1 = EXTRACT_LSB0_UINT (insn, 32, 11, 2); \
-  f_s10 = EXTRACT_LSB0_INT (insn, 32, 9, 10); \
+  f_s10 = EXTRACT_LSB0_SINT (insn, 32, 9, 10); \
 
 #define EXTRACT_IFMT_SMULICC_VARS \
   UINT f_pack; \
@@ -1865,7 +1865,7 @@ struct scache {
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
   f_ICCi_1 = EXTRACT_LSB0_UINT (insn, 32, 11, 2); \
-  f_s10 = EXTRACT_LSB0_INT (insn, 32, 9, 10); \
+  f_s10 = EXTRACT_LSB0_SINT (insn, 32, 9, 10); \
 
 #define EXTRACT_IFMT_CMPB_VARS \
   UINT f_pack; \
@@ -1929,7 +1929,7 @@ struct scache {
   f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_misc_null_4 = EXTRACT_LSB0_UINT (insn, 32, 17, 2); \
-  f_s16 = EXTRACT_LSB0_INT (insn, 32, 15, 16); \
+  f_s16 = EXTRACT_LSB0_SINT (insn, 32, 15, 16); \
 
 #define EXTRACT_IFMT_LDBF_VARS \
   UINT f_pack; \
@@ -2029,7 +2029,7 @@ struct scache {
   f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_LDBFI_VARS \
   UINT f_pack; \
@@ -2044,7 +2044,7 @@ struct scache {
   f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_LDDI_VARS \
   UINT f_pack; \
@@ -2059,7 +2059,7 @@ struct scache {
   f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_LDDFI_VARS \
   UINT f_pack; \
@@ -2074,7 +2074,7 @@ struct scache {
   f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_CLDBF_VARS \
   UINT f_pack; \
@@ -2192,7 +2192,7 @@ struct scache {
   f_ICCi_2_null = EXTRACT_LSB0_UINT (insn, 32, 26, 2); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); \
-  f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc)); \
+  f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc)); \
 
 #define EXTRACT_IFMT_BNO_VARS \
   UINT f_pack; \
@@ -2226,7 +2226,7 @@ struct scache {
   f_ICCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); \
-  f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc)); \
+  f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc)); \
 
 #define EXTRACT_IFMT_FBRA_VARS \
   UINT f_pack; \
@@ -2243,7 +2243,7 @@ struct scache {
   f_FCCi_2_null = EXTRACT_LSB0_UINT (insn, 32, 26, 2); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); \
-  f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc)); \
+  f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc)); \
 
 #define EXTRACT_IFMT_FBNO_VARS \
   UINT f_pack; \
@@ -2277,7 +2277,7 @@ struct scache {
   f_FCCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2); \
-  f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc)); \
+  f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc)); \
 
 #define EXTRACT_IFMT_BCTRLR_VARS \
   UINT f_pack; \
@@ -2563,7 +2563,7 @@ struct scache {
   f_LI_off = EXTRACT_LSB0_UINT (insn, 32, 25, 1); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_CALLIL_VARS \
   UINT f_pack; \
@@ -2580,7 +2580,7 @@ struct scache {
   f_LI_on = EXTRACT_LSB0_UINT (insn, 32, 25, 1); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_CALL_VARS \
   UINT f_pack; \
@@ -2593,7 +2593,7 @@ struct scache {
   length = 4; \
   f_pack = EXTRACT_LSB0_UINT (insn, 32, 31, 1); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
-  f_labelH6 = EXTRACT_LSB0_INT (insn, 32, 30, 6); \
+  f_labelH6 = EXTRACT_LSB0_SINT (insn, 32, 30, 6); \
   f_labelL18 = EXTRACT_LSB0_UINT (insn, 32, 17, 18); \
 {\
   f_label24 = ((((((((f_labelH6) << (18))) | (f_labelL18))) << (2))) + (pc));\
@@ -2772,7 +2772,7 @@ struct scache {
   f_ICCi_2_null = EXTRACT_LSB0_UINT (insn, 32, 26, 2); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_TINO_VARS \
   UINT f_pack; \
@@ -2806,7 +2806,7 @@ struct scache {
   f_ICCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_FTIRA_VARS \
   UINT f_pack; \
@@ -2823,7 +2823,7 @@ struct scache {
   f_ICCi_2_null = EXTRACT_LSB0_UINT (insn, 32, 26, 2); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_FTINO_VARS \
   UINT f_pack; \
@@ -2857,7 +2857,7 @@ struct scache {
   f_FCCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12); \
+  f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12); \
 
 #define EXTRACT_IFMT_BREAK_VARS \
   UINT f_pack; \
@@ -3249,7 +3249,7 @@ struct scache {
   f_CPRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_CPRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
-  f_s6_1 = EXTRACT_LSB0_INT (insn, 32, 11, 6); \
+  f_s6_1 = EXTRACT_LSB0_SINT (insn, 32, 11, 6); \
   f_CPRj = EXTRACT_LSB0_UINT (insn, 32, 5, 6); \
 
 #define EXTRACT_IFMT_CLRGR_VARS \
@@ -3582,7 +3582,7 @@ struct scache {
   f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_ope1 = EXTRACT_LSB0_UINT (insn, 32, 11, 6); \
-  f_u12_h = EXTRACT_LSB0_INT (insn, 32, 17, 6); \
+  f_u12_h = EXTRACT_LSB0_SINT (insn, 32, 17, 6); \
   f_u12_l = EXTRACT_LSB0_UINT (insn, 32, 5, 6); \
 {\
   f_u12 = ((((f_u12_h) << (6))) | (f_u12_l));\
@@ -3603,7 +3603,7 @@ struct scache {
   f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_ope1 = EXTRACT_LSB0_UINT (insn, 32, 11, 6); \
-  f_u12_h = EXTRACT_LSB0_INT (insn, 32, 17, 6); \
+  f_u12_h = EXTRACT_LSB0_SINT (insn, 32, 17, 6); \
   f_u12_l = EXTRACT_LSB0_UINT (insn, 32, 5, 6); \
 {\
   f_u12 = ((((f_u12_h) << (6))) | (f_u12_l));\
@@ -3624,7 +3624,7 @@ struct scache {
   f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6); \
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_ope1 = EXTRACT_LSB0_UINT (insn, 32, 11, 6); \
-  f_u12_h = EXTRACT_LSB0_INT (insn, 32, 17, 6); \
+  f_u12_h = EXTRACT_LSB0_SINT (insn, 32, 17, 6); \
   f_u12_l = EXTRACT_LSB0_UINT (insn, 32, 5, 6); \
 {\
   f_u12 = ((((f_u12_h) << (6))) | (f_u12_l));\
@@ -3647,7 +3647,7 @@ struct scache {
   f_FRi_null = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
   f_ope1 = EXTRACT_LSB0_UINT (insn, 32, 11, 6); \
   f_misc_null_11 = EXTRACT_LSB0_UINT (insn, 32, 5, 1); \
-  f_s5 = EXTRACT_LSB0_INT (insn, 32, 4, 5); \
+  f_s5 = EXTRACT_LSB0_SINT (insn, 32, 4, 5); \
 
 #define EXTRACT_IFMT_MHSETHIH_VARS \
   UINT f_pack; \
@@ -3666,7 +3666,7 @@ struct scache {
   f_FRi_null = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
   f_ope1 = EXTRACT_LSB0_UINT (insn, 32, 11, 6); \
   f_misc_null_11 = EXTRACT_LSB0_UINT (insn, 32, 5, 1); \
-  f_s5 = EXTRACT_LSB0_INT (insn, 32, 4, 5); \
+  f_s5 = EXTRACT_LSB0_SINT (insn, 32, 4, 5); \
 
 #define EXTRACT_IFMT_MHDSETH_VARS \
   UINT f_pack; \
@@ -3685,7 +3685,7 @@ struct scache {
   f_FRi_null = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
   f_ope1 = EXTRACT_LSB0_UINT (insn, 32, 11, 6); \
   f_misc_null_11 = EXTRACT_LSB0_UINT (insn, 32, 5, 1); \
-  f_s5 = EXTRACT_LSB0_INT (insn, 32, 4, 5); \
+  f_s5 = EXTRACT_LSB0_SINT (insn, 32, 4, 5); \
 
 #define EXTRACT_IFMT_MAND_VARS \
   UINT f_pack; \
@@ -3812,7 +3812,7 @@ struct scache {
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_ACC40Si = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
   f_ope1 = EXTRACT_LSB0_UINT (insn, 32, 11, 6); \
-  f_s6 = EXTRACT_LSB0_INT (insn, 32, 5, 6); \
+  f_s6 = EXTRACT_LSB0_SINT (insn, 32, 5, 6); \
 
 #define EXTRACT_IFMT_MDCUTSSI_VARS \
   UINT f_pack; \
@@ -3829,7 +3829,7 @@ struct scache {
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_ACC40Si = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
   f_ope1 = EXTRACT_LSB0_UINT (insn, 32, 11, 6); \
-  f_s6 = EXTRACT_LSB0_INT (insn, 32, 5, 6); \
+  f_s6 = EXTRACT_LSB0_SINT (insn, 32, 5, 6); \
 
 #define EXTRACT_IFMT_MDROTLI_VARS \
   UINT f_pack; \
@@ -3846,7 +3846,7 @@ struct scache {
   f_op = EXTRACT_LSB0_UINT (insn, 32, 24, 7); \
   f_FRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6); \
   f_ope1 = EXTRACT_LSB0_UINT (insn, 32, 11, 6); \
-  f_s6 = EXTRACT_LSB0_INT (insn, 32, 5, 6); \
+  f_s6 = EXTRACT_LSB0_SINT (insn, 32, 5, 6); \
 
 #define EXTRACT_IFMT_MQSATHS_VARS \
   UINT f_pack; \
diff --git a/sim/frv/decode.c b/sim/frv/decode.c
index 271ee2a..bd77389 100644
--- a/sim/frv/decode.c
+++ b/sim/frv/decode.c
@@ -3864,7 +3864,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -3895,7 +3895,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -3926,7 +3926,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -3959,7 +3959,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
     f_ICCi_1 = EXTRACT_LSB0_UINT (insn, 32, 11, 2);
-    f_s10 = EXTRACT_LSB0_INT (insn, 32, 9, 10);
+    f_s10 = EXTRACT_LSB0_SINT (insn, 32, 9, 10);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -3995,7 +3995,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
     f_ICCi_1 = EXTRACT_LSB0_UINT (insn, 32, 11, 2);
-    f_s10 = EXTRACT_LSB0_INT (insn, 32, 9, 10);
+    f_s10 = EXTRACT_LSB0_SINT (insn, 32, 9, 10);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -4031,7 +4031,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
     f_ICCi_1 = EXTRACT_LSB0_UINT (insn, 32, 11, 2);
-    f_s10 = EXTRACT_LSB0_INT (insn, 32, 9, 10);
+    f_s10 = EXTRACT_LSB0_SINT (insn, 32, 9, 10);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -4067,7 +4067,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
     f_ICCi_1 = EXTRACT_LSB0_UINT (insn, 32, 11, 2);
-    f_s10 = EXTRACT_LSB0_INT (insn, 32, 9, 10);
+    f_s10 = EXTRACT_LSB0_SINT (insn, 32, 9, 10);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -4184,7 +4184,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     INT f_s16;
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
-    f_s16 = EXTRACT_LSB0_INT (insn, 32, 15, 16);
+    f_s16 = EXTRACT_LSB0_SINT (insn, 32, 15, 16);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_s16) = f_s16;
@@ -5178,7 +5178,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -5209,7 +5209,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -5240,7 +5240,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -5271,7 +5271,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -5302,7 +5302,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -5333,7 +5333,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -5364,7 +5364,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -5395,7 +5395,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -5426,7 +5426,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -5456,7 +5456,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -5486,7 +5486,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -6647,7 +6647,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -6678,7 +6678,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_FRk) = f_FRk;
@@ -6709,7 +6709,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRk) = f_GRk;
@@ -6740,7 +6740,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_FRk) = f_FRk;
@@ -6804,7 +6804,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_GRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -7270,7 +7270,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     SI f_label16;
 
     f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2);
-    f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc));
+    f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc));
 
   /* Record the fields for the semantic handler.  */
   FLD (f_hint) = f_hint;
@@ -7296,7 +7296,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     SI f_label16;
 
     f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2);
-    f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc));
+    f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc));
 
   /* Record the fields for the semantic handler.  */
   FLD (f_hint) = f_hint;
@@ -7318,7 +7318,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_ICCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2);
     f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2);
-    f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc));
+    f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc));
 
   /* Record the fields for the semantic handler.  */
   FLD (f_ICCi_2) = f_ICCi_2;
@@ -7348,7 +7348,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FCCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2);
     f_hint = EXTRACT_LSB0_UINT (insn, 32, 17, 2);
-    f_label16 = ((((EXTRACT_LSB0_INT (insn, 32, 15, 16)) << (2))) + (pc));
+    f_label16 = ((((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (2))) + (pc));
 
   /* Record the fields for the semantic handler.  */
   FLD (f_FCCi_2) = f_FCCi_2;
@@ -7663,7 +7663,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_LI = EXTRACT_LSB0_UINT (insn, 32, 25, 1);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -7691,7 +7691,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     UINT f_labelL18;
     INT f_label24;
 
-    f_labelH6 = EXTRACT_LSB0_INT (insn, 32, 30, 6);
+    f_labelH6 = EXTRACT_LSB0_SINT (insn, 32, 30, 6);
     f_labelL18 = EXTRACT_LSB0_UINT (insn, 32, 17, 18);
 {
   f_label24 = ((((((((f_labelH6) << (18))) | (f_labelL18))) << (2))) + (pc));
@@ -7863,7 +7863,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     INT f_d12;
 
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -7897,7 +7897,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_ICCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_GRi) = f_GRi;
@@ -7933,7 +7933,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FCCi_2 = EXTRACT_LSB0_UINT (insn, 32, 26, 2);
     f_GRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_d12 = EXTRACT_LSB0_INT (insn, 32, 11, 12);
+    f_d12 = EXTRACT_LSB0_SINT (insn, 32, 11, 12);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_FCCi_2) = f_FCCi_2;
@@ -9571,7 +9571,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     INT f_u12;
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
-    f_u12_h = EXTRACT_LSB0_INT (insn, 32, 17, 6);
+    f_u12_h = EXTRACT_LSB0_SINT (insn, 32, 17, 6);
     f_u12_l = EXTRACT_LSB0_UINT (insn, 32, 5, 6);
 {
   f_u12 = ((((f_u12_h) << (6))) | (f_u12_l));
@@ -9604,7 +9604,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     INT f_u12;
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
-    f_u12_h = EXTRACT_LSB0_INT (insn, 32, 17, 6);
+    f_u12_h = EXTRACT_LSB0_SINT (insn, 32, 17, 6);
     f_u12_l = EXTRACT_LSB0_UINT (insn, 32, 5, 6);
 {
   f_u12 = ((((f_u12_h) << (6))) | (f_u12_l));
@@ -9637,7 +9637,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     INT f_u12;
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
-    f_u12_h = EXTRACT_LSB0_INT (insn, 32, 17, 6);
+    f_u12_h = EXTRACT_LSB0_SINT (insn, 32, 17, 6);
     f_u12_l = EXTRACT_LSB0_UINT (insn, 32, 5, 6);
 {
   f_u12 = ((((f_u12_h) << (6))) | (f_u12_l));
@@ -9671,7 +9671,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     INT f_s5;
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
-    f_s5 = EXTRACT_LSB0_INT (insn, 32, 4, 5);
+    f_s5 = EXTRACT_LSB0_SINT (insn, 32, 4, 5);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_FRk) = f_FRk;
@@ -9699,7 +9699,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     INT f_s5;
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
-    f_s5 = EXTRACT_LSB0_INT (insn, 32, 4, 5);
+    f_s5 = EXTRACT_LSB0_SINT (insn, 32, 4, 5);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_FRk) = f_FRk;
@@ -9727,7 +9727,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
     INT f_s5;
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
-    f_s5 = EXTRACT_LSB0_INT (insn, 32, 4, 5);
+    f_s5 = EXTRACT_LSB0_SINT (insn, 32, 4, 5);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_FRk) = f_FRk;
@@ -10023,7 +10023,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_ACC40Si = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_s6 = EXTRACT_LSB0_INT (insn, 32, 5, 6);
+    f_s6 = EXTRACT_LSB0_SINT (insn, 32, 5, 6);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_ACC40Si) = f_ACC40Si;
@@ -10054,7 +10054,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_ACC40Si = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_s6 = EXTRACT_LSB0_INT (insn, 32, 5, 6);
+    f_s6 = EXTRACT_LSB0_SINT (insn, 32, 5, 6);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_ACC40Si) = f_ACC40Si;
@@ -10124,7 +10124,7 @@ frvbf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_FRk = EXTRACT_LSB0_UINT (insn, 32, 30, 6);
     f_FRi = EXTRACT_LSB0_UINT (insn, 32, 17, 6);
-    f_s6 = EXTRACT_LSB0_INT (insn, 32, 5, 6);
+    f_s6 = EXTRACT_LSB0_SINT (insn, 32, 5, 6);
 
   /* Record the fields for the semantic handler.  */
   FLD (f_FRi) = f_FRi;