* cpu.h: Regenerate.

	* decode.c: Regenerate.

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 58c91398b1c035fe5588f9a33f574415e52e51fa..e275528a02dd20224b1fd590515ce02652002baf 100755 (executable)
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-05  Doug Evans  <dje@sebabeach.org>
+
+       * cpu.h: Regenerate.
+       * decode.c: Regenerate.
+
 2010-01-02  Doug Evans  <dje@sebabeach.org>
 
        * arch.c, * arch.h, * cpu.c, * cpu.h, * cpuall.h, * decode.c,

diff --git a/sim/lm32/cpu.h b/sim/lm32/cpu.h
index b77b34f6fb162ee3aa8bd8081a608f110caba819..40ed1cd94837309cfdb52f5af28500b9a9c4854e 100644 (file)
--- a/sim/lm32/cpu.h
+++ b/sim/lm32/cpu.h
@@ -248,7 +248,7 @@ struct scache {
 #define EXTRACT_IFMT_BI_CODE \
   length = 4; \
   f_opcode = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
-  f_call = ((pc) + (((int) (((EXTRACT_LSB0_SINT (insn, 32, 25, 26)) << (6))) >> (4)))); \
+  f_call = ((pc) + (((SI) (((EXTRACT_LSB0_SINT (insn, 32, 25, 26)) << (6))) >> (4)))); \
 
 #define EXTRACT_IFMT_BE_VARS \
   UINT f_opcode; \
@@ -261,7 +261,7 @@ struct scache {
   f_opcode = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \
   f_r0 = EXTRACT_LSB0_UINT (insn, 32, 25, 5); \
   f_r1 = EXTRACT_LSB0_UINT (insn, 32, 20, 5); \
-  f_branch = ((pc) + (((int) (((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (16))) >> (14)))); \
+  f_branch = ((pc) + (((SI) (((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (16))) >> (14)))); \
 
 #define EXTRACT_IFMT_ORI_VARS \
   UINT f_opcode; \

diff --git a/sim/lm32/decode.c b/sim/lm32/decode.c
index 68acdebef0a5dee1e88cc8d0d18f00839c9860ac..cdc41955b558cd8fe0ed974d46da215861c27761 100644 (file)
--- a/sim/lm32/decode.c
+++ b/sim/lm32/decode.c
@@ -474,7 +474,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc,
 #define FLD(f) abuf->fields.sfmt_bi.f
     SI f_call;
 
-    f_call = ((pc) + (((int) (((EXTRACT_LSB0_SINT (insn, 32, 25, 26)) << (6))) >> (4))));
+    f_call = ((pc) + (((SI) (((EXTRACT_LSB0_SINT (insn, 32, 25, 26)) << (6))) >> (4))));
 
   /* Record the fields for the semantic handler.  */
   FLD (i_call) = f_call;
@@ -495,7 +495,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc,
 
     f_r0 = EXTRACT_LSB0_UINT (insn, 32, 25, 5);
     f_r1 = EXTRACT_LSB0_UINT (insn, 32, 20, 5);
-    f_branch = ((pc) + (((int) (((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (16))) >> (14))));
+    f_branch = ((pc) + (((SI) (((EXTRACT_LSB0_SINT (insn, 32, 15, 16)) << (16))) >> (14))));
 
   /* Record the fields for the semantic handler.  */
   FLD (f_r0) = f_r0;
@@ -531,7 +531,7 @@ lm32bf_decode (SIM_CPU *current_cpu, IADDR pc,
 #define FLD(f) abuf->fields.sfmt_bi.f
     SI f_call;
 
-    f_call = ((pc) + (((int) (((EXTRACT_LSB0_SINT (insn, 32, 25, 26)) << (6))) >> (4))));
+    f_call = ((pc) + (((SI) (((EXTRACT_LSB0_SINT (insn, 32, 25, 26)) << (6))) >> (4))));
 
   /* Record the fields for the semantic handler.  */
   FLD (i_call) = f_call;