diff --git a/jit/aarch64-cpu.c b/jit/aarch64-cpu.c
index db97b83ee..665f2d731 100644
--- a/jit/aarch64-cpu.c
+++ b/jit/aarch64-cpu.c
@@ -472,36 +472,36 @@ typedef union {
 #  define NOP()				ii(0xd503201f)
 static int32_t logical_immediate(jit_word_t);
 #  define oxxx(Op,Rd,Rn,Rm)		_oxxx(_jit,Op,Rd,Rn,Rm)
-static void _oxxx(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _oxxx(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define oxxi(Op,Rd,Rn,Imm12)		_oxxi(_jit,Op,Rd,Rn,Imm12)
-static void _oxxi(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _oxxi(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define oxx9(Op,Rd,Rn,Imm9)		_oxx9(_jit,Op,Rd,Rn,Imm9)
-static void _oxx9(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _oxx9(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define ox19(Op,Rd,Simm19)		_ox19(_jit,Op,Rd,Simm19)
-static void _ox19(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ox19(jit_state_t*,int32_t,int32_t,int32_t);
 #  define oc19(Op,Cc,Simm19)		_oc19(_jit,Op,Cc,Simm19)
-static void _oc19(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _oc19(jit_state_t*,int32_t,int32_t,int32_t);
 #  define o26(Op,Simm26)		_o26(_jit,Op,Simm26)
 static void _oc26(jit_state_t*,int32_t,int32_t);
 #  define ox_x(Op,Rd,Rn)		_ox_x(_jit,Op,Rd,Rn)
-static void _ox_x(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ox_x(jit_state_t*,int32_t,int32_t,int32_t);
 #  define o_xx(Op,Rd,Rn)		_o_xx(_jit,Op,Rd,Rn)
-static void _o_xx(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _o_xx(jit_state_t*,int32_t,int32_t,int32_t);
 #  define oxx_(Op,Rn,Rm)		_oxx_(_jit,Op,Rn,Rm)
-static void _oxx_(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _oxx_(jit_state_t*,int32_t,int32_t,int32_t);
 #  define o_x_(Op,Rn)			_o_x_(_jit,Op,Rn)
 static void _o_x_(jit_state_t*,int32_t,int32_t);
 #  define ox_h(Op,Rd,Imm16)		_ox_h(_jit,Op,Rd,Imm16)
-static void _ox_h(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ox_h(jit_state_t*,int32_t,int32_t,int32_t);
 #  define oxxrs(Op,Rd,Rn,R,S)		_oxxrs(_jit,Op,Rd,Rn,R,S)
 static void _oxxrs(jit_state_t*,int32_t,int32_t,
-		   int32_t,int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t);
 #  define oxxxc(Op,Rd,Rn,Rm,Cc)		_oxxxc(_jit,Op,Rd,Rn,Rm,Cc)
 static void _oxxxc(jit_state_t*,int32_t,int32_t,
-		   int32_t,int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t);
 #  define oxxx7(Op,Rt,Rt2,Rn,Simm7)	_oxxx7(_jit,Op,Rt,Rt2,Rn,Simm7)
 static void _oxxx7(jit_state_t*,int32_t,
-		   int32_t,int32_t,jit_int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t,int32_t);
 #  define nop(i0)			_nop(_jit,i0)
 static void _nop(jit_state_t*,int32_t);
 #  define addr(r0,r1,r2)		ADD(r0,r1,r2)
@@ -529,13 +529,13 @@ static void _rsbi(jit_state_t*,int32_t,int32_t,jit_word_t);
 static void _muli(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define qmulr(r0,r1,r2,r3)		_qmulr(_jit,r0,r1,r2,r3)
 static void _qmulr(jit_state_t*,int32_t,
-		   int32_t,int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t);
 #  define qmuli(r0,r1,r2,i0)		_qmuli(_jit,r0,r1,r2,i0)
 static void _qmuli(jit_state_t*,int32_t,
 		   int32_t,int32_t,jit_word_t);
 #  define qmulr_u(r0,r1,r2,r3)		_qmulr_u(_jit,r0,r1,r2,r3)
 static void _qmulr_u(jit_state_t*,int32_t,
-		     int32_t,int32_t,jit_int32_t);
+		     int32_t,int32_t,int32_t);
 #  define qmuli_u(r0,r1,r2,i0)		_qmuli_u(_jit,r0,r1,r2,i0)
 static void _qmuli_u(jit_state_t*,int32_t,
 		     int32_t,int32_t,jit_word_t);
@@ -548,7 +548,7 @@ static void _divi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define qdivr(r0,r1,r2,r3)		_iqdivr(_jit,1,r0,r1,r2,r3)
 #  define qdivr_u(r0,r1,r2,r3)		_iqdivr(_jit,0,r0,r1,r2,r3)
 static void _iqdivr(jit_state_t*,jit_bool_t,
-		    int32_t,int32_t,jit_int32_t,jit_int32_t);
+		    int32_t,int32_t,int32_t,int32_t);
 #  define qdivi(r0,r1,r2,i0)		_qdivi(_jit,r0,r1,r2,i0)
 static void _qdivi(jit_state_t*,int32_t,
 		   int32_t,int32_t,jit_word_t);
@@ -556,11 +556,11 @@ static void _qdivi(jit_state_t*,int32_t,
 static void _qdivi_u(jit_state_t*,int32_t,
 		     int32_t,int32_t,jit_word_t);
 #  define remr(r0,r1,r2)		_remr(_jit,r0,r1,r2)
-static void _remr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi(r0,r1,i0)		_remi(_jit,r0,r1,i0)
 static void _remi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define remr_u(r0,r1,r2)		_remr_u(_jit,r0,r1,r2)
-static void _remr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi_u(r0,r1,i0)		_remi_u(_jit,r0,r1,i0)
 static void _remi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define lshr(r0,r1,r2)		LSL(r0,r1,r2)
@@ -609,25 +609,25 @@ static void _ldr_l(jit_state_t*,int32_t,int32_t);
 #  define ldi_l(r0,i0)			_ldi_l(_jit,r0,i0)
 static void _ldi_l(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_c(r0,r1,r2)		_ldxr_c(_jit,r0,r1,r2)
-static void _ldxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_c(r0,r1,i0)		_ldxi_c(_jit,r0,r1,i0)
 static void _ldxi_c(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_uc(r0,r1,r2)		_ldxr_uc(_jit,r0,r1,r2)
-static void _ldxr_uc(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_uc(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_uc(r0,r1,i0)		_ldxi_uc(_jit,r0,r1,i0)
 static void _ldxi_uc(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_s(r0,r1,r2)		LDRSH(r0,r1,r2)
 #  define ldxi_s(r0,r1,i0)		_ldxi_s(_jit,r0,r1,i0)
 static void _ldxi_s(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_us(r0,r1,r2)		_ldxr_us(_jit,r0,r1,r2)
-static void _ldxr_us(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_us(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_us(r0,r1,i0)		_ldxi_us(_jit,r0,r1,i0)
 static void _ldxi_us(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_i(r0,r1,r2)		LDRSW(r0,r1,r2)
 #  define ldxi_i(r0,r1,i0)		_ldxi_i(_jit,r0,r1,i0)
 static void _ldxi_i(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_ui(r0,r1,r2)		_ldxr_ui(_jit,r0,r1,r2)
-static void _ldxr_ui(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_ui(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_ui(r0,r1,i0)		_ldxi_ui(_jit,r0,r1,i0)
 static void _ldxi_ui(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_l(r0,r1,r2)		LDR(r0,r1,r2)
@@ -681,9 +681,9 @@ static void _movi(jit_state_t*,int32_t,jit_word_t);
 #  define movi_p(r0,i0)			_movi_p(_jit,r0,i0)
 static jit_word_t _movi_p(jit_state_t*,int32_t,jit_word_t);
 #  define ccr(cc,r0,r1,r2)		_ccr(_jit,cc,r0,r1,r2)
-static void _ccr(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _ccr(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define cci(cc,r0,r1,i0)		_cci(_jit,cc,r0,r1,i0)
-static void _cci(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_word_t);
+static void _cci(jit_state_t*,int32_t,int32_t,int32_t,jit_word_t);
 #  define ltr(r0,r1,r2)			ccr(CC_LT,r0,r1,r2)
 #  define lti(r0,r1,i0)			cci(CC_LT,r0,r1,i0)
 #  define ltr_u(r0,r1,r2)		ccr(CC_CC,r0,r1,r2)
@@ -706,7 +706,7 @@ static void _cci(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_word_t);
 #  define nei(r0,r1,i0)			cci(CC_NE,r0,r1,i0)
 #  define bccr(cc,i0,r0,r1)		_bccr(_jit,cc,i0,r0,r1)
 static jit_word_t
-_bccr(jit_state_t*,int32_t,jit_word_t,int32_t,jit_int32_t);
+_bccr(jit_state_t*,int32_t,jit_word_t,int32_t,int32_t);
 #  define bcci(cc,i0,r0,i1)		_bcci(_jit,cc,i0,r0,i1)
 static jit_word_t
 _bcci(jit_state_t*,int32_t,jit_word_t,int32_t,jit_word_t);
@@ -734,7 +734,7 @@ static jit_word_t _beqi(jit_state_t*,jit_word_t,int32_t,jit_word_t);
 static jit_word_t _bnei(jit_state_t*,jit_word_t,int32_t,jit_word_t);
 #  define baddr(cc,i0,r0,r1)		_baddr(_jit,cc,i0,r0,r1)
 static jit_word_t
-_baddr(jit_state_t*,int32_t,jit_word_t,int32_t,jit_int32_t);
+_baddr(jit_state_t*,int32_t,jit_word_t,int32_t,int32_t);
 #  define baddi(cc,i0,r0,i1)		_baddi(_jit,cc,i0,r0,i1)
 static jit_word_t
 _baddi(jit_state_t*,int32_t,jit_word_t,int32_t,jit_word_t);
@@ -748,7 +748,7 @@ _baddi(jit_state_t*,int32_t,jit_word_t,int32_t,jit_word_t);
 #  define bxaddi_u(i0,r0,i1)		baddi(BCC_LO,i0,r0,i1)
 #  define bsubr(cc,i0,r0,r1)		_bsubr(_jit,cc,i0,r0,r1)
 static jit_word_t
-_bsubr(jit_state_t*,int32_t,jit_word_t,int32_t,jit_int32_t);
+_bsubr(jit_state_t*,int32_t,jit_word_t,int32_t,int32_t);
 #  define bsubi(cc,i0,r0,i1)		_bsubi(_jit,cc,i0,r0,i1)
 static jit_word_t
 _bsubi(jit_state_t*,int32_t,jit_word_t,int32_t,jit_word_t);
@@ -762,7 +762,7 @@ _bsubi(jit_state_t*,int32_t,jit_word_t,int32_t,jit_word_t);
 #  define bxsubi_u(i0,r0,i1)		bsubi(BCC_HS,i0,r0,i1)
 #  define bmxr(cc,i0,r0,r1)		_bmxr(_jit,cc,i0,r0,r1)
 static jit_word_t
-_bmxr(jit_state_t*,int32_t,jit_word_t,int32_t,jit_int32_t);
+_bmxr(jit_state_t*,int32_t,jit_word_t,int32_t,int32_t);
 #  define bmxi(cc,i0,r0,r1)		_bmxi(_jit,cc,i0,r0,r1)
 static jit_word_t
 _bmxi(jit_state_t*,int32_t,jit_word_t,int32_t,jit_word_t);
@@ -827,7 +827,7 @@ logical_immediate(jit_word_t imm)
 
 static void
 _oxxx(jit_state_t *_jit, int32_t Op,
-      int32_t Rd, int32_t Rn, jit_int32_t Rm)
+      int32_t Rd, int32_t Rn, int32_t Rm)
 {
     instr_t	i;
     assert(!(Rd &       ~0x1f));
@@ -843,7 +843,7 @@ _oxxx(jit_state_t *_jit, int32_t Op,
 
 static void
 _oxxi(jit_state_t *_jit, int32_t Op,
-      int32_t Rd, int32_t Rn, jit_int32_t Imm12)
+      int32_t Rd, int32_t Rn, int32_t Imm12)
 {
     instr_t	i;
     assert(!(Rd    &       ~0x1f));
@@ -859,7 +859,7 @@ _oxxi(jit_state_t *_jit, int32_t Op,
 
 static void
 _oxx9(jit_state_t *_jit, int32_t Op,
-      int32_t Rd, int32_t Rn, jit_int32_t Imm9)
+      int32_t Rd, int32_t Rn, int32_t Imm9)
 {
     instr_t	i;
     assert(!(Rd   &       ~0x1f));
@@ -874,7 +874,7 @@ _oxx9(jit_state_t *_jit, int32_t Op,
 }
 
 static void
-_ox19(jit_state_t *_jit, int32_t Op, int32_t Rd, jit_int32_t Simm19)
+_ox19(jit_state_t *_jit, int32_t Op, int32_t Rd, int32_t Simm19)
 {
     instr_t	i;
     assert(!(Rd &         ~0x1f));
@@ -887,7 +887,7 @@ _ox19(jit_state_t *_jit, int32_t Op, int32_t Rd, jit_int32_t Simm19)
 }
 
 static void
-_oc19(jit_state_t *_jit, int32_t Op, int32_t Cc, jit_int32_t Simm19)
+_oc19(jit_state_t *_jit, int32_t Op, int32_t Cc, int32_t Simm19)
 {
     instr_t	i;
     assert(!(Cc &          ~0xf));
@@ -911,7 +911,7 @@ _o26(jit_state_t *_jit, int32_t Op, int32_t Simm26)
 }
 
 static void
-_ox_x(jit_state_t *_jit, int32_t Op, int32_t Rd, jit_int32_t Rm)
+_ox_x(jit_state_t *_jit, int32_t Op, int32_t Rd, int32_t Rm)
 {
     instr_t	i;
     assert(!(Rd &       ~0x1f));
@@ -924,7 +924,7 @@ _ox_x(jit_state_t *_jit, int32_t Op, int32_t Rd, jit_int32_t Rm)
 }
 
 static void
-_o_xx(jit_state_t *_jit, int32_t Op, int32_t Rd, jit_int32_t Rn)
+_o_xx(jit_state_t *_jit, int32_t Op, int32_t Rd, int32_t Rn)
 {
     instr_t	i;
     assert(!(Rd &       ~0x1f));
@@ -937,7 +937,7 @@ _o_xx(jit_state_t *_jit, int32_t Op, int32_t Rd, jit_int32_t Rn)
 }
 
 static void
-_oxx_(jit_state_t *_jit, int32_t Op, int32_t Rn, jit_int32_t Rm)
+_oxx_(jit_state_t *_jit, int32_t Op, int32_t Rn, int32_t Rm)
 {
     instr_t	i;
     assert(!(Rn &       ~0x1f));
@@ -961,7 +961,7 @@ _o_x_(jit_state_t *_jit, int32_t Op, int32_t Rn)
 }
 
 static void
-_ox_h(jit_state_t *_jit, int32_t Op, int32_t Rd, jit_int32_t Imm16)
+_ox_h(jit_state_t *_jit, int32_t Op, int32_t Rd, int32_t Imm16)
 {
     instr_t	i;
     assert(!(Rd    &       ~0x1f));
@@ -975,7 +975,7 @@ _ox_h(jit_state_t *_jit, int32_t Op, int32_t Rd, jit_int32_t Imm16)
 
 static void
 _oxxrs(jit_state_t *_jit, int32_t Op,
-       int32_t Rd, int32_t Rn, jit_int32_t R, jit_int32_t S)
+       int32_t Rd, int32_t Rn, int32_t R, int32_t S)
 {
     instr_t	i;
     assert(!(Rd &       ~0x1f));
@@ -993,7 +993,7 @@ _oxxrs(jit_state_t *_jit, int32_t Op,
 
 static void
 _oxxxc(jit_state_t *_jit, int32_t Op,
-       int32_t Rd, int32_t Rn, jit_int32_t Rm, jit_int32_t Cc)
+       int32_t Rd, int32_t Rn, int32_t Rm, int32_t Cc)
 {
     instr_t	i;
     assert(!(Rd &       ~0x1f));
@@ -1011,7 +1011,7 @@ _oxxxc(jit_state_t *_jit, int32_t Op,
 
 static void
 _oxxx7(jit_state_t *_jit, int32_t Op,
-       int32_t Rt, int32_t Rt2, jit_int32_t Rn, jit_int32_t Simm7)
+       int32_t Rt, int32_t Rt2, int32_t Rn, int32_t Simm7)
 {
     instr_t	i;
     assert(!(Rt  &       ~0x1f));
@@ -1154,7 +1154,7 @@ _muli(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 static void
 _qmulr(jit_state_t *_jit, int32_t r0,
-       int32_t r1, int32_t r2, jit_int32_t r3)
+       int32_t r1, int32_t r2, int32_t r3)
 {
     int32_t		reg;
     if (r0 == r2 || r0 == r3) {
@@ -1183,7 +1183,7 @@ _qmuli(jit_state_t *_jit, int32_t r0,
 
 static void
 _qmulr_u(jit_state_t *_jit, int32_t r0,
-	 int32_t r1, int32_t r2, jit_int32_t r3)
+	 int32_t r1, int32_t r2, int32_t r3)
 {
     int32_t		reg;
     if (r0 == r2 || r0 == r3) {
@@ -1232,7 +1232,7 @@ _divi_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 static void
 _iqdivr(jit_state_t *_jit, jit_bool_t sign,
-	int32_t r0, int32_t r1, jit_int32_t r2, jit_int32_t r3)
+	int32_t r0, int32_t r1, int32_t r2, int32_t r3)
 {
     int32_t		sv0, rg0;
     int32_t		sv1, rg1;
@@ -1287,7 +1287,7 @@ _qdivi_u(jit_state_t *_jit, int32_t r0,
 }
 
 static void
-_remr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r1 || r0 == r2) {
@@ -1315,7 +1315,7 @@ _remi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r1 || r0 == r2) {
@@ -1555,7 +1555,7 @@ _ldi_l(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     LDRSB(r0, r1, r2);
     extr_c(r0, r0);
@@ -1579,7 +1579,7 @@ _ldxi_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     LDRB(r0, r1, r2);
 #if 0
@@ -1624,7 +1624,7 @@ _ldxi_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     LDRH(r0, r1, r2);
 #if 0
@@ -1670,7 +1670,7 @@ _ldxi_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     LDRW(r0, r1, r2);
 #if 0
@@ -1952,7 +1952,7 @@ _movi_p(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 
 static void
 _ccr(jit_state_t *_jit, int32_t cc,
-     int32_t r0, int32_t r1, jit_int32_t r2)
+     int32_t r0, int32_t r1, int32_t r2)
 {
     CMP(r1, r2);
     CSET(r0, cc);
diff --git a/jit/aarch64-fpu.c b/jit/aarch64-fpu.c
index b86eface2..e1ccde65c 100644
--- a/jit/aarch64-fpu.c
+++ b/jit/aarch64-fpu.c
@@ -67,13 +67,13 @@
 #  define FDIVD(Rd,Rn,Rm)		osvvv(A64_FDIV,1,Rd,Rn,Rm)
 #  define osvvv(Op,Sz,Rd,Rn,Rm)		_osvvv(_jit,Op,Sz,Rd,Rn,Rm)
 static void _osvvv(jit_state_t*,int32_t,int32_t,
-		   int32_t,int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t);
 #  define osvv_(Op,Sz,Rd,Rn)		_osvv_(_jit,Op,Sz,Rd,Rn)
 static void _osvv_(jit_state_t*,int32_t,
-		   int32_t,int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t);
 #  define os_vv(Op,Sz,Rn,Rm)		_os_vv(_jit,Op,Sz,Rn,Rm)
 static void _os_vv(jit_state_t*,int32_t,
-		   int32_t,int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t);
 #  define truncr_f_i(r0,r1)		_truncr_f_i(_jit,r0,r1)
 static void _truncr_f_i(jit_state_t*,int32_t,int32_t);
 #  define truncr_f_l(r0,r1)		FCVTSZ_XS(r0,r1)
@@ -104,7 +104,7 @@ static void _ldr_f(jit_state_t*,int32_t,int32_t);
 #  define ldi_f(r0,i0)			_ldi_f(_jit,r0,i0)
 static void _ldi_f(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_f(r0,r1,r2)		_ldxr_f(_jit,r0,r1,r2)
-static void _ldxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_f(r0,r1,i0)		_ldxi_f(_jit,r0,r1,i0)
 static void _ldxi_f(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define str_f(r0,r1)			_str_f(_jit,r0,r1)
@@ -112,7 +112,7 @@ static void _str_f(jit_state_t*,int32_t,int32_t);
 #  define sti_f(i0,r0)			_sti_f(_jit,i0,r0)
 static void _sti_f(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_f(r0,r1,r2)		_stxr_f(_jit,r0,r1,r2)
-static void _stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_f(i0,r0,r1)		_stxi_f(_jit,i0,r0,r1)
 static void _stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define movr_f(r0,r1)			_movr_f(_jit,r0,r1)
@@ -121,10 +121,10 @@ static void _movr_f(jit_state_t*,int32_t,int32_t);
 static void _movi_f(jit_state_t*,int32_t,jit_float32_t);
 #  define extr_d_f(r0,r1)		FCVT_SD(r0,r1)
 #  define fccr(cc,r0,r1,r2)		_fccr(_jit,cc,r0,r1,r2)
-static void _fccr(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _fccr(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define fcci(cc,r0,r1,i0)		_fcci(_jit,cc,r0,r1,i0)
 static void _fcci(jit_state_t*,
-		  int32_t,int32_t,jit_int32_t,jit_float32_t);
+		  int32_t,int32_t,int32_t,jit_float32_t);
 #  define ltr_f(r0,r1,r2)		fccr(CC_MI,r0,r1,r2)
 #  define lti_f(r0,r1,i0)		fcci(CC_MI,r0,r1,i0)
 #  define ler_f(r0,r1,r2)		fccr(CC_LS,r0,r1,r2)
@@ -142,7 +142,7 @@ static void _fcci(jit_state_t*,
 #  define unler_f(r0,r1,r2)		fccr(CC_LE,r0,r1,r2)
 #  define unlei_f(r0,r1,i0)		fcci(CC_LE,r0,r1,i0)
 #  define uneqr_f(r0,r1,r2)		_uneqr_f(_jit,r0,r1,r2)
-static void _uneqr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _uneqr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define uneqi_f(r0,r1,i0)		_uneqi_f(_jit,r0,r1,i0)
 static void _uneqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
 #  define unger_f(r0,r1,r2)		fccr(CC_PL,r0,r1,r2)
@@ -150,7 +150,7 @@ static void _uneqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
 #  define ungtr_f(r0,r1,r2)		fccr(CC_HI,r0,r1,r2)
 #  define ungti_f(r0,r1,i0)		fcci(CC_HI,r0,r1,i0)
 #  define ltgtr_f(r0,r1,r2)		_ltgtr_f(_jit,r0,r1,r2)
-static void _ltgtr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltgtr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ltgti_f(r0,r1,i0)		_ltgti_f(_jit,r0,r1,i0)
 static void _ltgti_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
 #  define ordr_f(r0,r1,r2)		fccr(CC_VC,r0,r1,r2)
@@ -159,7 +159,7 @@ static void _ltgti_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
 #  define unordi_f(r0,r1,i0)		fcci(CC_VS,r0,r1,i0)
 #define fbccr(cc,i0,r0,r1)		_fbccr(_jit,cc,i0,r0,r1)
 static jit_word_t
-_fbccr(jit_state_t*,int32_t,jit_word_t,int32_t,jit_int32_t);
+_fbccr(jit_state_t*,int32_t,jit_word_t,int32_t,int32_t);
 #define fbcci(cc,i0,r0,i1)		_fbcci(_jit,cc,i0,r0,i1)
 static jit_word_t
 _fbcci(jit_state_t*,int32_t,jit_word_t,int32_t,jit_float32_t);
@@ -219,7 +219,7 @@ static void _ldr_d(jit_state_t*,int32_t,int32_t);
 #  define ldi_d(r0,i0)			_ldi_d(_jit,r0,i0)
 static void _ldi_d(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_d(r0,r1,r2)		_ldxr_d(_jit,r0,r1,r2)
-static void _ldxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_d(r0,r1,i0)		_ldxi_d(_jit,r0,r1,i0)
 static void _ldxi_d(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define str_d(r0,r1)			_str_d(_jit,r0,r1)
@@ -227,7 +227,7 @@ static void _str_d(jit_state_t*,int32_t,int32_t);
 #  define sti_d(i0,r0)			_sti_d(_jit,i0,r0)
 static void _sti_d(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_d(r0,r1,r2)		_stxr_d(_jit,r0,r1,r2)
-static void _stxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_d(i0,r0,r1)		_stxi_d(_jit,i0,r0,r1)
 static void _stxi_d(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define movr_d(r0,r1)			_movr_d(_jit,r0,r1)
@@ -236,10 +236,10 @@ static void _movr_d(jit_state_t*,int32_t,int32_t);
 static void _movi_d(jit_state_t*,int32_t,jit_float64_t);
 #  define extr_f_d(r0,r1)		FCVT_DS(r0,r1)
 #  define dccr(cc,r0,r1,r2)		_dccr(_jit,cc,r0,r1,r2)
-static void _dccr(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _dccr(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define dcci(cc,r0,r1,i0)		_dcci(_jit,cc,r0,r1,i0)
 static void _dcci(jit_state_t*,
-		  int32_t,int32_t,jit_int32_t,jit_float64_t);
+		  int32_t,int32_t,int32_t,jit_float64_t);
 #  define ltr_d(r0,r1,r2)		dccr(CC_MI,r0,r1,r2)
 #  define lti_d(r0,r1,i0)		dcci(CC_MI,r0,r1,i0)
 #  define ler_d(r0,r1,r2)		dccr(CC_LS,r0,r1,r2)
@@ -257,7 +257,7 @@ static void _dcci(jit_state_t*,
 #  define unler_d(r0,r1,r2)		dccr(CC_LE,r0,r1,r2)
 #  define unlei_d(r0,r1,i0)		dcci(CC_LE,r0,r1,i0)
 #  define uneqr_d(r0,r1,r2)		_uneqr_d(_jit,r0,r1,r2)
-static void _uneqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _uneqr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define uneqi_d(r0,r1,i0)		_uneqi_d(_jit,r0,r1,i0)
 static void _uneqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define unger_d(r0,r1,r2)		dccr(CC_PL,r0,r1,r2)
@@ -265,7 +265,7 @@ static void _uneqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define ungtr_d(r0,r1,r2)		dccr(CC_HI,r0,r1,r2)
 #  define ungti_d(r0,r1,i0)		dcci(CC_HI,r0,r1,i0)
 #  define ltgtr_d(r0,r1,r2)		_ltgtr_d(_jit,r0,r1,r2)
-static void _ltgtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltgtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ltgti_d(r0,r1,i0)		_ltgti_d(_jit,r0,r1,i0)
 static void _ltgti_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define ordr_d(r0,r1,r2)		dccr(CC_VC,r0,r1,r2)
@@ -274,7 +274,7 @@ static void _ltgti_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define unordi_d(r0,r1,i0)		dcci(CC_VS,r0,r1,i0)
 #define dbccr(cc,i0,r0,r1)		_dbccr(_jit,cc,i0,r0,r1)
 static jit_word_t
-_dbccr(jit_state_t*,int32_t,jit_word_t,int32_t,jit_int32_t);
+_dbccr(jit_state_t*,int32_t,jit_word_t,int32_t,int32_t);
 #define dbcci(cc,i0,r0,i1)		_dbcci(_jit,cc,i0,r0,i1)
 static jit_word_t
 _dbcci(jit_state_t*,int32_t,jit_word_t,int32_t,jit_float64_t);
@@ -317,7 +317,7 @@ static void _vaarg_d(jit_state_t*, int32_t, int32_t);
 #if CODE
 static void
 _osvvv(jit_state_t *_jit, int32_t Op, int32_t Sz,
-       int32_t Rd, int32_t Rn, jit_int32_t Rm)
+       int32_t Rd, int32_t Rn, int32_t Rm)
 {
     instr_t	i;
     assert(!(Rd &       ~0x1f));
@@ -335,7 +335,7 @@ _osvvv(jit_state_t *_jit, int32_t Op, int32_t Sz,
 
 static void
 _osvv_(jit_state_t *_jit, int32_t Op,
-       int32_t Sz, int32_t Rd, jit_int32_t Rn)
+       int32_t Sz, int32_t Rd, int32_t Rn)
 {
     instr_t	i;
     assert(!(Rd &       ~0x1f));
@@ -351,7 +351,7 @@ _osvv_(jit_state_t *_jit, int32_t Op,
 
 static void
 _os_vv(jit_state_t *_jit, int32_t Op,
-       int32_t Sz, int32_t Rn, jit_int32_t Rm)
+       int32_t Sz, int32_t Rn, int32_t Rm)
 {
     instr_t	i;
     assert(!(Rn &       ~0x1f));
@@ -453,7 +453,7 @@ _ldi_f(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -493,7 +493,7 @@ _sti_f(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -541,7 +541,7 @@ _movi_f(jit_state_t *_jit, int32_t r0, jit_float32_t i0)
 
 static void
 _fccr(jit_state_t *_jit, int32_t cc,
-      int32_t r0, int32_t r1, jit_int32_t r2)
+      int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPES(r1, r2);
     CSET(r0, cc);
@@ -559,7 +559,7 @@ _fcci(jit_state_t *_jit, int32_t cc,
 }
 
 static void
-_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     FCMPES(r1, r2);
@@ -572,7 +572,7 @@ _uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(uneq)
 
 static void
-_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     FCMPES(r1, r2);
@@ -670,7 +670,7 @@ _ldi_d(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -710,7 +710,7 @@ _sti_d(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -757,7 +757,7 @@ _movi_d(jit_state_t *_jit, int32_t r0, jit_float64_t i0)
 
 static void
 _dccr(jit_state_t *_jit, int32_t cc,
-      int32_t r0, int32_t r1, jit_int32_t r2)
+      int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPED(r1, r2);
     CSET(r0, cc);
@@ -775,7 +775,7 @@ _dcci(jit_state_t *_jit, int32_t cc,
 }
 
 static void
-_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     FCMPED(r1, r2);
@@ -788,7 +788,7 @@ _uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(uneq)
 
 static void
-_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     FCMPED(r1, r2);
diff --git a/jit/alpha-cpu.c b/jit/alpha-cpu.c
index 73304db7d..e3854fd25 100644
--- a/jit/alpha-cpu.c
+++ b/jit/alpha-cpu.c
@@ -317,22 +317,22 @@ static jit_word_t _movi_p(jit_state_t*,int32_t,jit_word_t);
 #  define addi(r0,r1,i0)		_addi(_jit,r0,r1,i0)
 static void _addi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define addcr(r0,r1,i0)		_addcr(_jit,r0,r1,i0)
-static void _addcr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addcr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addci(r0,r1,i0)		_addci(_jit,r0,r1,i0)
 static void _addci(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define addxr(r0,r1,i0)		_addxr(_jit,r0,r1,i0)
-static void _addxr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addxr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addxi(r0,r1,i0)		_addxi(_jit,r0,r1,i0)
 static void _addxi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subr(r0,r1,r2)		SUBQ(r1,r2,r0)
 #  define subi(r0,r1,i0)		_subi(_jit,r0,r1,i0)
 static void _subi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subcr(r0,r1,i0)		_subcr(_jit,r0,r1,i0)
-static void _subcr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subcr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subci(r0,r1,i0)		_subci(_jit,r0,r1,i0)
 static void _subci(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subxr(r0,r1,i0)		_subxr(_jit,r0,r1,i0)
-static void _subxr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subxr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subxi(r0,r1,i0)		_subxi(_jit,r0,r1,i0)
 static void _subxi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define rsbi(r0, r1, i0)		_rsbi(_jit, r0, r1, i0)
@@ -342,50 +342,50 @@ static void _rsbi(jit_state_t*,int32_t,int32_t, jit_word_t);
 static void _muli(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define qmulr(r0,r1,r2,r3)		_qmulr(_jit,r0,r1,r2,r3)
 static void _qmulr(jit_state_t*,int32_t,
-		   int32_t,int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t);
 #  define qmuli(r0,r1,r2,i0)		_qmuli(_jit,r0,r1,r2,i0)
 static void _qmuli(jit_state_t*,int32_t,
 		   int32_t,int32_t,jit_word_t);
 #  define qmulr_u(r0,r1,r2,r3)		_qmulr_u(_jit,r0,r1,r2,r3)
 static void _qmulr_u(jit_state_t*,int32_t,
-		     int32_t,int32_t,jit_int32_t);
+		     int32_t,int32_t,int32_t);
 #  define qmuli_u(r0,r1,r2,i0)		_qmuli_u(_jit,r0,r1,r2,i0)
 static void _qmuli_u(jit_state_t*,int32_t,
 		     int32_t,int32_t,jit_word_t);
 static jit_word_t __idiv(jit_word_t, jit_word_t);
 #  define divr(r0,r1,r2)		_divr(_jit,r0,r1,r2)
-static void _divr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi(r0,r1,i0)		_divi(_jit,r0,r1,i0)
 static void _divi(jit_state_t*,int32_t,int32_t,jit_word_t);
 static jit_uword_t __udiv(jit_uword_t, jit_uword_t);
 #  define divr_u(r0,r1,r2)		_divr_u(_jit,r0,r1,r2)
-static void _divr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi_u(r0,r1,i0)		_divi_u(_jit,r0,r1,i0)
 static void _divi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 static jit_word_t __irem(jit_word_t, jit_word_t);
 #  define remr(r0,r1,r2)		_remr(_jit,r0,r1,r2)
-static void _remr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi(r0,r1,i0)		_remi(_jit,r0,r1,i0)
 static void _remi(jit_state_t*,int32_t,int32_t,jit_word_t);
 static jit_uword_t __urem(jit_uword_t, jit_uword_t);
 #  define remr_u(r0,r1,r2)		_remr_u(_jit,r0,r1,r2)
-static void _remr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi_u(r0,r1,i0)		_remi_u(_jit,r0,r1,i0)
 static void _remi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 static jit_word_t __idivrem(jit_word_t, jit_word_t, jit_word_t*);
 #  define qdivr(r0,r1,r2,r3)		_qdivr(_jit,r0,r1,r2,r3)
 static void _qdivr(jit_state_t*,
-		   int32_t,int32_t,jit_int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t,int32_t);
 #  define qdivi(r0,r1,r2,i0)		_qdivi(_jit,r0,r1,r2,i0)
 static void _qdivi(jit_state_t*,
-		   int32_t,int32_t,jit_int32_t,jit_word_t);
+		   int32_t,int32_t,int32_t,jit_word_t);
 static jit_word_t __udivrem(jit_uword_t, jit_uword_t, jit_uword_t*);
 #  define qdivr_u(r0,r1,r2,r3)		_qdivr_u(_jit,r0,r1,r2,r3)
 static void _qdivr_u(jit_state_t*,
-		     int32_t,int32_t,jit_int32_t,jit_int32_t);
+		     int32_t,int32_t,int32_t,int32_t);
 #  define qdivi_u(r0,r1,r2,i0)		_qdivi_u(_jit,r0,r1,r2,i0)
 static void _qdivi_u(jit_state_t*,
-		     int32_t,int32_t,jit_int32_t,jit_word_t);
+		     int32_t,int32_t,int32_t,jit_word_t);
 #  define lshr(r0,r1,r2)		SLL(r1,r2,r0)
 #  define lshi(r0,r1,i0)		_lshi(_jit,r0,r1,i0)
 static void _lshi(jit_state_t*,int32_t,int32_t,jit_word_t);
@@ -432,7 +432,7 @@ static void _gti(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define gti_u(r0,r1,i0)		_gti_u(_jit,r0,r1,i0)
 static void _gti_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ner(r0,r1,r2)			_ner(_jit,r0,r1,r2)
-static void _ner(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ner(jit_state_t*,int32_t,int32_t,int32_t);
 #  define nei(r0,r1,i0)			_nei(_jit,r0,r1,i0)
 static void _nei(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define bltr(i0,r0,r1)		_bltr(_jit,i0,r0,r1)
@@ -551,32 +551,32 @@ static void _ldi_ui(jit_state_t*,int32_t,jit_word_t);
 #  define ldi_l(r0,i0)			_ldi_l(_jit,r0,i0)
 static void _ldi_l(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_c(r0,r1,r2)		_ldxr_c(_jit,r0,r1,r2)
-static void _ldxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_c(r0,r1,i0)		_ldxi_c(_jit,r0,r1,i0)
 static void _ldxi_c(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_uc(r0,r1,r2)		_ldxr_uc(_jit,r0,r1,r2)
-static void _ldxr_uc(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_uc(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_uc(r0,r1,i0)		_ldxi_uc(_jit,r0,r1,i0)
 static void _ldxi_uc(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_s(r0,r1,r2)		_ldxr_s(_jit,r0,r1,r2)
-static void _ldxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_s(r0,r1,i0)		_ldxi_s(_jit,r0,r1,i0)
 static void _ldxi_s(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_us(r0,r1,r2)		_ldxr_us(_jit,r0,r1,r2)
-static void _ldxr_us(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_us(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_us(r0,r1,i0)		_ldxi_us(_jit,r0,r1,i0)
 static void _ldxi_us(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_i(r0,r1,r2)		_ldxr_i(_jit,r0,r1,r2)
-static void _ldxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_i(r0,r1,i0)		_ldxi_i(_jit,r0,r1,i0)
 static void _ldxi_i(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_ui(r0,r1,r2)		_ldxr_ui(_jit,r0,r1,r2)
-static void _ldxr_ui(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_ui(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_ui(r0,r1,i0)		_ldxi_ui(_jit,r0,r1,i0)
 static void _ldxi_ui(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr(r0,r1,r2)		ldxr_l(r0,r1,r2)
 #  define ldxr_l(r0,r1,r2)		_ldxr_l(_jit,r0,r1,r2)
-static void _ldxr_l(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_l(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi(r0,r1,i0)		ldxi_l(r0,r1,i0)
 #  define ldxi_l(r0,r1,i0)		_ldxi_l(_jit,r0,r1,i0)
 static void _ldxi_l(jit_state_t*,int32_t,int32_t,jit_word_t);
@@ -594,19 +594,19 @@ static void _sti_i(jit_state_t*,jit_word_t,int32_t);
 #  define sti_l(i0,r0)			_sti_l(_jit,i0,r0)
 static void _sti_l(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_c(r0,r1,r2)		_stxr_c(_jit,r0,r1,r2)
-static void _stxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_c(i0,r0,r1)		_stxi_c(_jit,i0,r0,r1)
 static void _stxi_c(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define stxr_s(r0,r1,r2)		_stxr_s(_jit,r0,r1,r2)
-static void _stxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_s(i0,r0,r1)		_stxi_s(_jit,i0,r0,r1)
 static void _stxi_s(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define stxr_i(r0,r1,r2)		_stxr_i(_jit,r0,r1,r2)
-static void _stxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_i(i0,r0,r1)		_stxi_i(_jit,i0,r0,r1)
 static void _stxi_i(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define stxr_l(r0,r1,r2)		_stxr_l(_jit,r0,r1,r2)
-static void _stxr_l(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_l(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi(i0,r0,r1)		stxi_l(i0,r0,r1)
 #  define stxi_l(i0,r0,r1)		_stxi_l(_jit,i0,r0,r1)
 static void _stxi_l(jit_state_t*,jit_word_t,int32_t,int32_t);
@@ -828,7 +828,7 @@ _addi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (jit_carry == _NOREG)
@@ -866,7 +866,7 @@ _addci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     assert(jit_carry != _NOREG);
@@ -906,7 +906,7 @@ _subi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (jit_carry == _NOREG)
@@ -944,7 +944,7 @@ _subci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     assert(jit_carry != _NOREG);
@@ -990,7 +990,7 @@ _muli(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 static void
 _qmulr(jit_state_t *_jit, int32_t r0,
-       int32_t r1, int32_t r2, jit_int32_t r3)
+       int32_t r1, int32_t r2, int32_t r3)
 {
     int32_t		reg;
     /* The only invalid condition is r0 == r1 */
@@ -1039,7 +1039,7 @@ _qmuli(jit_state_t *_jit, int32_t r0,
 
 static void
 _qmulr_u(jit_state_t *_jit, int32_t r0,
-	 int32_t r1, int32_t r2, jit_int32_t r3)
+	 int32_t r1, int32_t r2, int32_t r3)
 {
     int32_t		reg;
     if (r0 == r2 || r0 == r3) {
@@ -1088,7 +1088,7 @@ __idiv(jit_word_t u, jit_word_t v)
 }
 
 static void
-_divr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     movr(_A0_REGNO, r1);
     movr(_A1_REGNO, r2);
@@ -1112,7 +1112,7 @@ __udiv(jit_uword_t u, jit_uword_t v)
 }
 
 static void
-_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     movr(_A0_REGNO, r1);
     movr(_A1_REGNO, r2);
@@ -1136,7 +1136,7 @@ __irem(jit_word_t u, jit_word_t v)
 }
 
 static void
-_remr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     movr(_A0_REGNO, r1);
     movr(_A1_REGNO, r2);
@@ -1160,7 +1160,7 @@ __urem(jit_uword_t u, jit_uword_t v)
 }
 
 static void
-_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     movr(_A0_REGNO, r1);
     movr(_A1_REGNO, r2);
@@ -1186,7 +1186,7 @@ __idivrem(jit_word_t u, jit_word_t v, jit_word_t *rem)
 
 static void
 _qdivr(jit_state_t *_jit,
-       int32_t r0, int32_t r1, jit_int32_t r2, jit_int32_t r3)
+       int32_t r0, int32_t r1, int32_t r2, int32_t r3)
 {
     movr(_A0_REGNO, r2);
     movr(_A1_REGNO, r3);
@@ -1198,7 +1198,7 @@ _qdivr(jit_state_t *_jit,
 
 static void
 _qdivi(jit_state_t *_jit,
-       int32_t r0, int32_t r1, jit_int32_t r2, jit_word_t i0)
+       int32_t r0, int32_t r1, int32_t r2, jit_word_t i0)
 {
     movr(_A0_REGNO, r2);
     movi(_A1_REGNO, i0);
@@ -1217,7 +1217,7 @@ __udivrem(jit_uword_t u, jit_uword_t v, jit_uword_t *rem)
 
 static void
 _qdivr_u(jit_state_t *_jit,
-	 int32_t r0, int32_t r1, jit_int32_t r2, jit_int32_t r3)
+	 int32_t r0, int32_t r1, int32_t r2, int32_t r3)
 {
     movr(_A0_REGNO, r2);
     movr(_A1_REGNO, r3);
@@ -1229,7 +1229,7 @@ _qdivr_u(jit_state_t *_jit,
 
 static void
 _qdivi_u(jit_state_t *_jit,
-	 int32_t r0, int32_t r1, jit_int32_t r2, jit_word_t i0)
+	 int32_t r0, int32_t r1, int32_t r2, jit_word_t i0)
 {
     movr(_A0_REGNO, r2);
     movi(_A1_REGNO, i0);
@@ -1415,7 +1415,7 @@ _gti_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ner(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ner(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMPEQ(r1, r2, r0);
     CMPEQi(r0, 0, r0);
@@ -2085,7 +2085,7 @@ _ldi_l(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2111,7 +2111,7 @@ _ldxi_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2135,7 +2135,7 @@ _ldxi_uc(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2161,7 +2161,7 @@ _ldxi_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2185,7 +2185,7 @@ _ldxi_us(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2209,7 +2209,7 @@ _ldxi_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2235,7 +2235,7 @@ _ldxi_ui(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2315,7 +2315,7 @@ _sti_l(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2339,7 +2339,7 @@ _stxi_c(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2363,7 +2363,7 @@ _stxi_s(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2387,7 +2387,7 @@ _stxi_i(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
diff --git a/jit/alpha-fpu.c b/jit/alpha-fpu.c
index b8b2f7ff5..b3d65af85 100644
--- a/jit/alpha-fpu.c
+++ b/jit/alpha-fpu.c
@@ -325,19 +325,19 @@ static void _extr_f(jit_state_t*,int32_t,int32_t);
 #  define extr_d(r0,r1)			_extr_d(_jit,r0,r1)
 static void _extr_d(jit_state_t*,int32_t,int32_t);
 #  define addr_f(r0,r1,r2)		_addr_f(_jit,r0,r1,r2)
-static void _addr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addi_f(r0,r1,i0)		_addi_f(_jit,r0,r1,i0)
 static void _addi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define addr_d(r0,r1,r2)		_addr_d(_jit,r0,r1,r2)
-static void _addr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addi_d(r0,r1,i0)		_addi_d(_jit,r0,r1,i0)
 static void _addi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define subr_f(r0,r1,r2)		_subr_f(_jit,r0,r1,r2)
-static void _subr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subi_f(r0,r1,i0)		_subi_f(_jit,r0,r1,i0)
 static void _subi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define subr_d(r0,r1,r2)		_subr_d(_jit,r0,r1,r2)
-static void _subr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subi_d(r0,r1,i0)		_subi_d(_jit,r0,r1,i0)
 static void _subi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define rsbr_f(r0, r1, r2)		subr_f(r0, r2, r1)
@@ -347,115 +347,115 @@ static void _rsbi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define rsbi_d(r0, r1, i0)		_rsbi_d(_jit, r0, r1, i0)
 static void _rsbi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define mulr_f(r0,r1,r2)		_mulr_f(_jit,r0,r1,r2)
-static void _mulr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _mulr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define muli_f(r0,r1,i0)		_muli_f(_jit,r0,r1,i0)
 static void _muli_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define mulr_d(r0,r1,r2)		_mulr_d(_jit,r0,r1,r2)
-static void _mulr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _mulr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define muli_d(r0,r1,i0)		_muli_d(_jit,r0,r1,i0)
 static void _muli_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define divr_f(r0,r1,r2)		_divr_f(_jit,r0,r1,r2)
-static void _divr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi_f(r0,r1,i0)		_divi_f(_jit,r0,r1,i0)
 static void _divi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define divr_d(r0,r1,r2)		_divr_d(_jit,r0,r1,r2)
-static void _divr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi_d(r0,r1,i0)		_divi_d(_jit,r0,r1,i0)
 static void _divi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ltr_f(r0,r1,r2)		ltr_d(r0,r1,r2)
 #  define ltr_d(r0,r1,r2)		_ltr_d(_jit,r0,r1,r2)
-static void _ltr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lti_f(r0,r1,i0)		_lti_f(_jit,r0,r1,i0)
 static void _lti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define lti_d(r0,r1,i0)		_lti_d(_jit,r0,r1,i0)
 static void _lti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ler_f(r0,r1,r2)		ler_d(r0,r1,r2)
 #  define ler_d(r0,r1,r2)		_ler_d(_jit,r0,r1,r2)
-static void _ler_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ler_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lei_f(r0,r1,i0)		_lei_f(_jit,r0,r1,i0)
 static void _lei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define lei_d(r0,r1,i0)		_lei_d(_jit,r0,r1,i0)
 static void _lei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define eqr_f(r0,r1,r2)		eqr_d(r0,r1,r2)
 #  define eqr_d(r0,r1,r2)		_eqr_d(_jit,r0,r1,r2)
-static void _eqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _eqr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define eqi_f(r0,r1,i0)		_eqi_f(_jit,r0,r1,i0)
 static void _eqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define eqi_d(r0,r1,i0)		_eqi_d(_jit,r0,r1,i0)
 static void _eqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ger_f(r0,r1,r2)		ger_d(r0,r1,r2)
 #  define ger_d(r0,r1,r2)		_ger_d(_jit,r0,r1,r2)
-static void _ger_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ger_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gei_f(r0,r1,i0)		_gei_f(_jit,r0,r1,i0)
 static void _gei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define gei_d(r0,r1,i0)		_gei_d(_jit,r0,r1,i0)
 static void _gei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define gtr_f(r0,r1,r2)		gtr_d(r0,r1,r2)
 #  define gtr_d(r0,r1,r2)		_gtr_d(_jit,r0,r1,r2)
-static void _gtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _gtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gti_f(r0,r1,i0)		_gti_f(_jit,r0,r1,i0)
 static void _gti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define gti_d(r0,r1,i0)		_gti_d(_jit,r0,r1,i0)
 static void _gti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ner_f(r0,r1,r2)		ner_d(r0,r1,r2)
 #  define ner_d(r0,r1,r2)		_ner_d(_jit,r0,r1,r2)
-static void _ner_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ner_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define nei_f(r0,r1,i0)		_nei_f(_jit,r0,r1,i0)
 static void _nei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define nei_d(r0,r1,i0)		_nei_d(_jit,r0,r1,i0)
 static void _nei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unltr_f(r0,r1,r2)		unltr_d(r0,r1,r2)
 #  define unltr_d(r0,r1,r2)		_unltr_d(_jit,r0,r1,r2)
-static void _unltr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unltr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unlti_f(r0,r1,i0)		_unlti_f(_jit,r0,r1,i0)
 static void _unlti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define unlti_d(r0,r1,i0)		_unlti_d(_jit,r0,r1,i0)
 static void _unlti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unler_f(r0,r1,r2)		unler_d(r0,r1,r2)
 #  define unler_d(r0,r1,r2)		_unler_d(_jit,r0,r1,r2)
-static void _unler_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unler_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unlei_f(r0,r1,i0)		_unlei_f(_jit,r0,r1,i0)
 static void _unlei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define unlei_d(r0,r1,i0)		_unlei_d(_jit,r0,r1,i0)
 static void _unlei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define uneqr_f(r0,r1,r2)		uneqr_d(r0,r1,r2)
 #  define uneqr_d(r0,r1,r2)		_uneqr_d(_jit,r0,r1,r2)
-static void _uneqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _uneqr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define uneqi_f(r0,r1,i0)		_uneqi_f(_jit,r0,r1,i0)
 static void _uneqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define uneqi_d(r0,r1,i0)		_uneqi_d(_jit,r0,r1,i0)
 static void _uneqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unger_f(r0,r1,r2)		unger_d(r0,r1,r2)
 #  define unger_d(r0,r1,r2)		_unger_d(_jit,r0,r1,r2)
-static void _unger_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unger_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ungei_f(r0,r1,i0)		_ungei_f(_jit,r0,r1,i0)
 static void _ungei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ungei_d(r0,r1,i0)		_ungei_d(_jit,r0,r1,i0)
 static void _ungei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ungtr_f(r0,r1,r2)		ungtr_d(r0,r1,r2)
 #  define ungtr_d(r0,r1,r2)		_ungtr_d(_jit,r0,r1,r2)
-static void _ungtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ungtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ungti_f(r0,r1,i0)		_ungti_f(_jit,r0,r1,i0)
 static void _ungti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ungti_d(r0,r1,i0)		_ungti_d(_jit,r0,r1,i0)
 static void _ungti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ltgtr_f(r0,r1,r2)		ltgtr_d(r0,r1,r2)
 #  define ltgtr_d(r0,r1,r2)		_ltgtr_d(_jit,r0,r1,r2)
-static void _ltgtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltgtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ltgti_f(r0,r1,i0)		_ltgti_f(_jit,r0,r1,i0)
 static void _ltgti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ltgti_d(r0,r1,i0)		_ltgti_d(_jit,r0,r1,i0)
 static void _ltgti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ordr_f(r0,r1,r2)		ordr_d(r0,r1,r2)
 #  define ordr_d(r0,r1,r2)		_ordr_d(_jit,r0,r1,r2)
-static void _ordr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ordr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ordi_f(r0,r1,i0)		_ordi_f(_jit,r0,r1,i0)
 static void _ordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ordi_d(r0,r1,i0)		_ordi_d(_jit,r0,r1,i0)
 static void _ordi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unordr_f(r0,r1,r2)		unordr_d(r0,r1,r2)
 #  define unordr_d(r0,r1,r2)		_unordr_d(_jit,r0,r1,r2)
-static void _unordr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unordr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unordi_f(r0,r1,i0)		_unordi_f(_jit,r0,r1,i0)
 static void _unordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define unordi_d(r0,r1,i0)		_unordi_d(_jit,r0,r1,i0)
@@ -565,11 +565,11 @@ static void _ldi_f(jit_state_t*,int32_t,jit_word_t);
 #  define ldi_d(r0,i0)			_ldi_d(_jit,r0,i0)
 static void _ldi_d(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_f(r0,r1,r2)		_ldxr_f(_jit,r0,r1,r2)
-static void _ldxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_f(r0,r1,i0)		_ldxi_f(_jit,r0,r1,i0)
 static void _ldxi_f(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_d(r0,r1,r2)		_ldxr_d(_jit,r0,r1,r2)
-static void _ldxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_d(r0,r1,i0)		_ldxi_d(_jit,r0,r1,i0)
 static void _ldxi_d(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define str_f(r0,r1)			STS(r1,r0,0)
@@ -579,11 +579,11 @@ static void _sti_f(jit_state_t*,jit_word_t,int32_t);
 #  define sti_d(i0,r0)			_sti_d(_jit,i0,r0)
 static void _sti_d(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_f(r0,r1,r2)		_stxr_f(_jit,r0,r1,r2)
-static void _stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_f(i0,r0,r1)		_stxi_f(_jit,i0,r0,r1)
 static void _stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define stxr_d(r0,r1,r2)		_stxr_d(_jit,r0,r1,r2)
-static void _stxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_d(i0,r0,r1)		_stxi_d(_jit,i0,r0,r1)
 static void _stxi_d(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define vaarg_d(r0, r1)		_vaarg_d(_jit, r0, r1)
@@ -712,7 +712,7 @@ _extr_d(jit_state_t *_jit, int32_t r0, int32_t r1)
 }
 
 static void
-_addr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     ADDS_SU(r1, r2, r0);
     TRAPB();
@@ -720,7 +720,7 @@ _addr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(add)
 
 static void
-_addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     ADDT_SU(r1, r2, r0);
     TRAPB();
@@ -728,7 +728,7 @@ _addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(add)
 
 static void
-_subr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     SUBS_SU(r1, r2, r0);
     TRAPB();
@@ -737,7 +737,7 @@ fopi(sub)
 fopi(rsb)
 
 static void
-_subr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     SUBT_SU(r1, r2, r0);
     TRAPB();
@@ -746,7 +746,7 @@ dopi(sub)
 dopi(rsb)
 
 static void
-_mulr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_mulr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     MULS_SU(r1, r2, r0);
     TRAPB();
@@ -754,7 +754,7 @@ _mulr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(mul)
 
 static void
-_mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     MULT_SU(r1, r2, r0);
     TRAPB();
@@ -762,7 +762,7 @@ _mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(mul)
 
 static void
-_divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     DIVS_SU(r1, r2, r0);
     TRAPB();
@@ -770,7 +770,7 @@ _divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(div)
 
 static void
-_divr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     DIVT_SU(r1, r2, r0);
     TRAPB();
@@ -778,7 +778,7 @@ _divr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(div)
 
 static void
-_ltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -801,7 +801,7 @@ fopi(lt);
 dopi(lt);
 
 static void
-_ler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -824,7 +824,7 @@ fopi(le);
 dopi(le);
 
 static void
-_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -847,7 +847,7 @@ fopi(eq);
 dopi(eq);
 
 static void
-_ger_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -870,7 +870,7 @@ fopi(ge);
 dopi(ge);
 
 static void
-_gtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_gtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -893,7 +893,7 @@ fopi(gt);
 dopi(gt);
 
 static void
-_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -916,7 +916,7 @@ fopi(ne);
 dopi(ne);
 
 static void
-_unltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -939,7 +939,7 @@ fopi(unlt);
 dopi(unlt);
 
 static void
-_unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -962,7 +962,7 @@ fopi(unle);
 dopi(unle);
 
 static void
-_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -985,7 +985,7 @@ fopi(uneq);
 dopi(uneq);
 
 static void
-_unger_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unger_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -1008,7 +1008,7 @@ fopi(unge);
 dopi(unge);
 
 static void
-_ungtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ungtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -1031,7 +1031,7 @@ fopi(ungt);
 dopi(ungt);
 
 static void
-_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_word_t		v, w;
@@ -1054,7 +1054,7 @@ fopi(ltgt);
 dopi(ltgt);
 
 static void
-_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     int32_t		reg;
@@ -1072,7 +1072,7 @@ fopi(ord);
 dopi(ord);
 
 static void
-_unordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     int32_t		reg;
@@ -1423,7 +1423,7 @@ _ldi_d(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1447,7 +1447,7 @@ _ldxi_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1499,7 +1499,7 @@ _sti_d(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1523,7 +1523,7 @@ _stxi_f(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		reg;
     reg = jit_get_reg(jit_class_gpr);
diff --git a/jit/arm-cpu.c b/jit/arm-cpu.c
index cf3a2a695..74b653203 100644
--- a/jit/arm-cpu.c
+++ b/jit/arm-cpu.c
@@ -848,33 +848,33 @@ static void _comr(jit_state_t*,int32_t,int32_t);
 #  define negr(r0,r1)			_negr(_jit,r0,r1)
 static void _negr(jit_state_t*,int32_t,int32_t);
 #  define addr(r0,r1,r2)		_addr(_jit,r0,r1,r2)
-static void _addr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addi(r0,r1,i0)		_addi(_jit,r0,r1,i0)
 static void _addi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define addcr(r0,r1,r2)		_addcr(_jit,r0,r1,r2)
-static void _addcr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addcr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addci(r0,r1,i0)		_addci(_jit,r0,r1,i0)
 static void _addci(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define addxr(r0,r1,r2)		_addxr(_jit,r0,r1,r2)
-static void _addxr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addxr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addxi(r0,r1,i0)		_addxi(_jit,r0,r1,i0)
 static void _addxi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subr(r0,r1,r2)		_subr(_jit,r0,r1,r2)
-static void _subr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subi(r0,r1,i0)		_subi(_jit,r0,r1,i0)
 static void _subi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subcr(r0,r1,r2)		_subcr(_jit,r0,r1,r2)
-static void _subcr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subcr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subci(r0,r1,i0)		_subci(_jit,r0,r1,i0)
 static void _subci(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subxr(r0,r1,r2)		_subxr(_jit,r0,r1,r2)
-static void _subxr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subxr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subxi(r0,r1,i0)		_subxi(_jit,r0,r1,i0)
 static void _subxi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define rsbi(r0, r1, i0)		_rsbi(_jit, r0, r1, i0)
 static void _rsbi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define mulr(r0,r1,r2)		_mulr(_jit,r0,r1,r2)
-static void _mulr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _mulr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define muli(r0,r1,i0)		_muli(_jit,r0,r1,i0)
 static void _muli(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define qmulr(r0,r1,r2,r3)		iqmulr(r0,r1,r2,r3,1)
@@ -888,13 +888,13 @@ static void _iqmulr(jit_state_t*,int32_t,int32_t,
 static void _iqmuli(jit_state_t*,int32_t,int32_t,
 		    int32_t,jit_word_t,jit_bool_t);
 #  define divrem(d,s,r0,r1,r2)		_divrem(_jit,d,s,r0,r1,r2)
-static void _divrem(jit_state_t*,int,int,int32_t,int32_t,jit_int32_t);
+static void _divrem(jit_state_t*,int,int,int32_t,int32_t,int32_t);
 #  define divr(r0,r1,r2)		_divr(_jit,r0,r1,r2)
-static void _divr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi(r0,r1,i0)		_divi(_jit,r0,r1,i0)
 static void _divi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define divr_u(r0,r1,r2)		_divr_u(_jit,r0,r1,r2)
-static void _divr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi_u(r0,r1,i0)		_divi_u(_jit,r0,r1,i0)
 static void _divi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define qdivr(r0,r1,r2,r3)		iqdivr(r0,r1,r2,r3,1)
@@ -908,39 +908,39 @@ static void _iqdivr(jit_state_t*,int32_t,int32_t,
 static void _iqdivi(jit_state_t*,int32_t,int32_t,
 		    int32_t,jit_word_t,jit_bool_t);
 #  define remr(r0,r1,r2)		_remr(_jit,r0,r1,r2)
-static void _remr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi(r0,r1,i0)		_remi(_jit,r0,r1,i0)
 static void _remi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define remr_u(r0,r1,r2)		_remr_u(_jit,r0,r1,r2)
-static void _remr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi_u(r0,r1,i0)		_remi_u(_jit,r0,r1,i0)
 static void _remi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define andr(r0,r1,r2)		_andr(_jit,r0,r1,r2)
-static void _andr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _andr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define andi(r0,r1,i0)		_andi(_jit,r0,r1,i0)
 static void _andi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define orr(r0,r1,r2)			_orr(_jit,r0,r1,r2)
-static void _orr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _orr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ori(r0,r1,i0)			_ori(_jit,r0,r1,i0)
 static void _ori(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define xorr(r0,r1,r2)		_xorr(_jit,r0,r1,r2)
-static void _xorr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _xorr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define xori(r0,r1,i0)		_xori(_jit,r0,r1,i0)
 static void _xori(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define lshr(r0,r1,r2)		_lshr(_jit,r0,r1,r2)
-static void _lshr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _lshr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lshi(r0,r1,i0)		_lshi(_jit,r0,r1,i0)
 static void _lshi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define rshr(r0,r1,r2)		_rshr(_jit,r0,r1,r2)
-static void _rshr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _rshr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define rshi(r0,r1,i0)		_rshi(_jit,r0,r1,i0)
 static void _rshi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define rshr_u(r0,r1,r2)		_rshr_u(_jit,r0,r1,r2)
-static void _rshr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _rshr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define rshi_u(r0,r1,i0)		_rshi_u(_jit,r0,r1,i0)
 static void _rshi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ccr(ct,cf,r0,r1,r2)		_ccr(_jit,ct,cf,r0,r1,r2)
-static void _ccr(jit_state_t*,int,int,int32_t,int32_t,jit_int32_t);
+static void _ccr(jit_state_t*,int,int,int32_t,int32_t,int32_t);
 #  define cci(ct,cf,r0,r1,i0)		_cci(_jit,ct,cf,r0,r1,i0)
 static void _cci(jit_state_t*,int,int,int32_t,int32_t,jit_word_t);
 #  define ltr(r0, r1, r2)		ccr(ARM_CC_LT,ARM_CC_GE,r0,r1,r2)
@@ -962,7 +962,7 @@ static void _cci(jit_state_t*,int,int,int32_t,int32_t,jit_word_t);
 #  define gtr_u(r0, r1, r2)		ccr(ARM_CC_HI,ARM_CC_LS,r0,r1,r2)
 #  define gti_u(r0, r1, i0)		cci(ARM_CC_HI,ARM_CC_LS,r0,r1,i0)
 #  define ner(r0,r1,r2)			_ner(_jit,r0,r1,r2)
-static void _ner(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ner(jit_state_t*,int32_t,int32_t,int32_t);
 #  define nei(r0,r1,i0)			_nei(_jit,r0,r1,i0)
 static void _nei(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define jmpr(r0)			_jmpr(_jit,r0)
@@ -1032,7 +1032,7 @@ static void _ldr_c(jit_state_t*,int32_t,int32_t);
 #  define ldi_c(r0,i0)			_ldi_c(_jit,r0,i0)
 static void _ldi_c(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_c(r0,r1,r2)		_ldxr_c(_jit,r0,r1,r2)
-static void _ldxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_c(r0,r1,i0)		_ldxi_c(_jit,r0,r1,i0)
 static void _ldxi_c(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldr_uc(r0,r1)			_ldr_uc(_jit,r0,r1)
@@ -1040,7 +1040,7 @@ static void _ldr_uc(jit_state_t*,int32_t,int32_t);
 #  define ldi_uc(r0,i0)			_ldi_uc(_jit,r0,i0)
 static void _ldi_uc(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_uc(r0,r1,r2)		_ldxr_uc(_jit,r0,r1,r2)
-static void _ldxr_uc(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_uc(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_uc(r0,r1,i0)		_ldxi_uc(_jit,r0,r1,i0)
 static void _ldxi_uc(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldr_s(r0,r1)			_ldr_s(_jit,r0,r1)
@@ -1048,7 +1048,7 @@ static void _ldr_s(jit_state_t*,int32_t,int32_t);
 #  define ldi_s(r0,i0)			_ldi_s(_jit,r0,i0)
 static void _ldi_s(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_s(r0,r1,r2)		_ldxr_s(_jit,r0,r1,r2)
-static void _ldxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_s(r0,r1,i0)		_ldxi_s(_jit,r0,r1,i0)
 static void _ldxi_s(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldr_us(r0,r1)			_ldr_us(_jit,r0,r1)
@@ -1056,7 +1056,7 @@ static void _ldr_us(jit_state_t*,int32_t,int32_t);
 #  define ldi_us(r0,i0)			_ldi_us(_jit,r0,i0)
 static void _ldi_us(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_us(r0,r1,r2)		_ldxr_us(_jit,r0,r1,r2)
-static void _ldxr_us(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_us(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_us(r0,r1,i0)		_ldxi_us(_jit,r0,r1,i0)
 static void _ldxi_us(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldr_i(r0,r1)			_ldr_i(_jit,r0,r1)
@@ -1064,7 +1064,7 @@ static void _ldr_i(jit_state_t*,int32_t,int32_t);
 #  define ldi_i(r0,i0)			_ldi_i(_jit,r0,i0)
 static void _ldi_i(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_i(r0,r1,r2)		_ldxr_i(_jit,r0,r1,r2)
-static void _ldxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_i(r0,r1,i0)		_ldxi_i(_jit,r0,r1,i0)
 static void _ldxi_i(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define str_c(r0,r1)			_str_c(_jit,r0,r1)
@@ -1072,7 +1072,7 @@ static void _str_c(jit_state_t*,int32_t,int32_t);
 #  define sti_c(i0,r0)			_sti_c(_jit,i0,r0)
 static void _sti_c(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_c(r0,r1,r2)		_stxr_c(_jit,r0,r1,r2)
-static void _stxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_c(r0,r1,i0)		_stxi_c(_jit,r0,r1,i0)
 static void _stxi_c(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define str_s(r0,r1)			_str_s(_jit,r0,r1)
@@ -1080,7 +1080,7 @@ static void _str_s(jit_state_t*,int32_t,int32_t);
 #  define sti_s(i0,r0)			_sti_s(_jit,i0,r0)
 static void _sti_s(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_s(r0,r1,r2)		_stxr_s(_jit,r0,r1,r2)
-static void _stxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_s(r0,r1,i0)		_stxi_s(_jit,r0,r1,i0)
 static void _stxi_s(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define str_i(r0,r1)			_str_i(_jit,r0,r1)
@@ -1609,7 +1609,7 @@ _negr(jit_state_t *_jit, int32_t r0, int32_t r1)
 }
 
 static void
-_addr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if (!jit_no_set_flags() && (r0|r1|r2) < 8)
@@ -1671,7 +1671,7 @@ _addi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	/* thumb auto set carry if not inside IT block */
@@ -1728,7 +1728,7 @@ _addci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     /* keep setting carry because don't know last ADC */
     if (jit_thumb_p()) {
@@ -1786,7 +1786,7 @@ _addxi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if (!jit_no_set_flags() && (r0|r1|r2) < 8)
@@ -1846,7 +1846,7 @@ _subi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	/* thumb auto set carry if not inside IT block */
@@ -1903,7 +1903,7 @@ _subci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     /* keep setting carry because don't know last SBC */
     if (jit_thumb_p()) {
@@ -1968,7 +1968,7 @@ _rsbi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (jit_thumb_p()) {
@@ -2071,7 +2071,7 @@ _iqmuli(jit_state_t *_jit, int32_t r0, int32_t r1,
 
 static void
 _divrem(jit_state_t *_jit, int div, int sign,
-	int32_t r0, int32_t r1, jit_int32_t r2)
+	int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		d;
     jit_word_t		w;
@@ -2101,7 +2101,7 @@ _divrem(jit_state_t *_jit, int div, int sign,
 }
 
 static void
-_divr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_armv7r_p() && jit_thumb_p())
 	T2_SDIV(r0, r1, r2);
@@ -2120,7 +2120,7 @@ _divi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_armv7r_p() && jit_thumb_p())
 	T2_UDIV(r0, r1, r2);
@@ -2181,7 +2181,7 @@ _iqdivi(jit_state_t *_jit, int32_t r0, int32_t r1,
 }
 
 static void
-_remr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     divrem(0, 1, r0, r1, r2);
 }
@@ -2197,7 +2197,7 @@ _remi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     divrem(0, 0, r0, r1, r2);
 }
@@ -2213,7 +2213,7 @@ _remi_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_andr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_andr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if (!jit_no_set_flags() && (r0|r1|r2) < 8 && (r0 == r1 || r0 == r2))
@@ -2265,7 +2265,7 @@ _andi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_orr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_orr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if (!jit_no_set_flags() && (r0|r1|r2) < 8 && (r0 == r1 || r0 == r2))
@@ -2313,7 +2313,7 @@ _ori(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_xorr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_xorr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if (!jit_no_set_flags() && (r0|r1|r2) < 8 && (r0 == r1 || r0 == r2))
@@ -2361,7 +2361,7 @@ _xori(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_lshr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_lshr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if (!jit_no_set_flags() && (r0|r1|r2) < 8 && r0 == r1)
@@ -2390,7 +2390,7 @@ _lshi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_rshr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_rshr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if (!jit_no_set_flags() && (r0|r1|r2) < 8 && r0 == r1)
@@ -2419,7 +2419,7 @@ _rshi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_rshr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_rshr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if (!jit_no_set_flags() && (r0|r1|r2) < 8 && r0 == r1)
@@ -2449,7 +2449,7 @@ _rshi_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 static void
 _ccr(jit_state_t *_jit, int ct, int cf,
-     int32_t r0, int32_t r1, jit_int32_t r2)
+     int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	assert((ct ^ cf) >> 28 == 1);
@@ -2527,7 +2527,7 @@ _cci(jit_state_t *_jit, int ct, int cf,
 }
 
 static void
-_ner(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ner(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p())
 	ccr(ARM_CC_NE, ARM_CC_EQ, r0, r1, r2);
@@ -2966,7 +2966,7 @@ _ldi_c(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if ((r0|r1|r2) < 8)
@@ -3047,7 +3047,7 @@ _ldi_uc(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if ((r0|r1|r2) < 8)
@@ -3130,7 +3130,7 @@ _ldi_s(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if ((r0|r1|r2) < 8)
@@ -3211,7 +3211,7 @@ _ldi_us(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if ((r0|r1|r2) < 8)
@@ -3294,7 +3294,7 @@ _ldi_i(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if ((r0|r1|r2) < 8)
@@ -3380,7 +3380,7 @@ _sti_c(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if ((r0|r1|r2) < 8)
@@ -3452,7 +3452,7 @@ _sti_s(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if ((r0|r1|r2) < 8)
@@ -3524,7 +3524,7 @@ _sti_i(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (jit_thumb_p()) {
 	if ((r0|r1|r2) < 8)
diff --git a/jit/arm-swf.c b/jit/arm-swf.c
index 8ef75f5bd..2b8bfa139 100644
--- a/jit/arm-swf.c
+++ b/jit/arm-swf.c
@@ -56,10 +56,10 @@ static void
 _swf_dd(jit_state_t*,double(*)(double),int32_t,int32_t) maybe_unused;
 #  define swf_fff(i0,r0,r1,r2)		_swf_fff(_jit,i0,r0,r1,r2)
 static void _swf_fff(jit_state_t*,float(*)(float,float),
-		     int32_t,int32_t,jit_int32_t);
+		     int32_t,int32_t,int32_t);
 #  define swf_ddd(i0,r0,r1,r2)		_swf_ddd(_jit,i0,r0,r1,r2)
 static void _swf_ddd(jit_state_t*,double(*)(double,double),
-		     int32_t,int32_t,jit_int32_t);
+		     int32_t,int32_t,int32_t);
 #  define swf_fff_(i0,r0,r1,i1)		_swf_fff_(_jit,i0,r0,r1,i1)
 static void _swf_fff_(jit_state_t*,float(*)(float,float),
 		      int32_t,int32_t,jit_float32_t);
@@ -68,10 +68,10 @@ static void _swf_ddd_(jit_state_t*,double(*)(double,double),
 		      int32_t,int32_t,jit_float64_t);
 #  define swf_iff(i0,r0,r1,r2)		_swf_iff(_jit,i0,r0,r1,r2)
 static void _swf_iff(jit_state_t*,int(*)(float,float),
-		     int32_t,int32_t,jit_int32_t);
+		     int32_t,int32_t,int32_t);
 #  define swf_idd(i0,r0,r1,r2)		_swf_idd(_jit,i0,r0,r1,r2)
 static void _swf_idd(jit_state_t*,int(*)(double,double),
-		     int32_t,int32_t,jit_int32_t);
+		     int32_t,int32_t,int32_t);
 #  define swf_iff_(i0,r0,r1,r2)		_swf_iff_(_jit,i0,r0,r1,r2)
 static void _swf_iff_(jit_state_t*,int(*)(float,float),
 		      int32_t,int32_t,jit_float32_t);
@@ -80,10 +80,10 @@ static void _swf_idd_(jit_state_t*,int(*)(double,double),
 		      int32_t,int32_t,jit_float64_t);
 #  define swf_iunff(i0,r0,r1,r2)	_swf_iunff(_jit,i0,r0,r1,r2)
 static void _swf_iunff(jit_state_t*,int(*)(float,float),
-		       int32_t,int32_t,jit_int32_t);
+		       int32_t,int32_t,int32_t);
 #  define swf_iundd(i0,r0,r1,r2)	_swf_iundd(_jit,i0,r0,r1,r2)
 static void _swf_iundd(jit_state_t*,int(*)(double,double),
-		       int32_t,int32_t,jit_int32_t);
+		       int32_t,int32_t,int32_t);
 #  define swf_iunff_(i0,r0,r1,i1)	_swf_iunff_(_jit,i0,r0,r1,i1)
 static void _swf_iunff_(jit_state_t*,int(*)(float,float),
 			int32_t,int32_t,jit_float32_t);
@@ -187,11 +187,11 @@ static void _swf_rsbi_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define swf_gtr_d(r0,r1,r2)		swf_idd(__aeabi_dcmpgt,r0,r1,r2)
 #  define swf_gti_d(r0,r1,i0)		swf_idd_(__aeabi_dcmpgt,r0,r1,i0)
 #  define swf_ner_f(r0,r1,r2)		_swf_ner_f(_jit,r0,r1,r2)
-static void _swf_ner_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _swf_ner_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define swf_nei_f(r0,r1,i0)		_swf_nei_f(_jit,r0,r1,i0)
 static void _swf_nei_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
 #  define swf_ner_d(r0,r1,r2)		_swf_ner_d(_jit,r0,r1,r2)
-static void _swf_ner_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _swf_ner_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define swf_nei_d(r0,r1,i0)		_swf_nei_d(_jit,r0,r1,i0)
 static void _swf_nei_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define swf_unltr_f(r0,r1,r2)		swf_iunff(__aeabi_fcmplt,r0,r1,r2)
@@ -215,19 +215,19 @@ static void _swf_nei_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define swf_ungtr_d(r0,r1,r2)		swf_iundd(__aeabi_dcmpgt,r0,r1,r2)
 #  define swf_ungti_d(r0,r1,i0)		swf_iundd_(__aeabi_dcmpgt,r0,r1,i0)
 #  define swf_ltgtr_f(r0,r1,r2)		_swf_ltgtr_f(_jit,r0,r1,r2)
-static void _swf_ltgtr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _swf_ltgtr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define swf_ltgti_f(r0,r1,i0)		_swf_ltgti_f(_jit,r0,r1,i0)
 static void _swf_ltgti_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
 #  define swf_ltgtr_d(r0,r1,r2)		_swf_ltgtr_d(_jit,r0,r1,r2)
-static void _swf_ltgtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _swf_ltgtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define swf_ltgti_d(r0,r1,i0)		_swf_ltgti_d(_jit,r0,r1,i0)
 static void _swf_ltgti_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define swf_ordr_f(r0,r1,r2)		_swf_ordr_f(_jit,r0,r1,r2)
-static void _swf_ordr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _swf_ordr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define swf_ordi_f(r0,r1,i0)		_swf_ordi_f(_jit,r0,r1,i0)
 static void _swf_ordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
 #  define swf_ordr_d(r0,r1,r2)		_swf_ordr_d(_jit,r0,r1,r2)
-static void _swf_ordr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _swf_ordr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define swf_ordi_d(r0,r1,i0)		_swf_ordi_d(_jit,r0,r1,i0)
 static void _swf_ordi_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define swf_unordr_f(r0,r1,r2)	swf_iunff(__aeabi_fcmpun,r0,r1,r2)
@@ -299,9 +299,9 @@ static void _swf_ldi_f(jit_state_t*,int32_t,jit_word_t);
 #  define swf_ldi_d(r0,i0)		_swf_ldi_d(_jit,r0,i0)
 static void _swf_ldi_d(jit_state_t*,int32_t,jit_word_t);
 #  define swf_ldxr_f(r0,r1,r2)		_swf_ldxr_f(_jit,r0,r1,r2)
-static void _swf_ldxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _swf_ldxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define swf_ldxr_d(r0,r1,r2)		_swf_ldxr_d(_jit,r0,r1,r2)
-static void _swf_ldxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _swf_ldxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define swf_ldxi_f(r0,r1,i0)		_swf_ldxi_f(_jit,r0,r1,i0)
 static void _swf_ldxi_f(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define swf_ldxi_d(r0,r1,i0)		_swf_ldxi_d(_jit,r0,r1,i0)
@@ -315,9 +315,9 @@ static void _swf_sti_f(jit_state_t*,jit_word_t,int32_t);
 #  define swf_sti_d(r0,i0)		_swf_sti_d(_jit,r0,i0)
 static void _swf_sti_d(jit_state_t*,jit_word_t,int32_t);
 #  define swf_stxr_f(r0,r1,r2)		_swf_stxr_f(_jit,r0,r1,r2)
-static void _swf_stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _swf_stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define swf_stxr_d(r0,r1,r2)		_swf_stxr_d(_jit,r0,r1,r2)
-static void _swf_stxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _swf_stxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define swf_stxi_f(r0,r1,i0)		_swf_stxi_f(_jit,r0,r1,i0)
 static void _swf_stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define swf_stxi_d(r0,r1,i0)		_swf_stxi_d(_jit,r0,r1,i0)
@@ -611,7 +611,7 @@ _swf_dd(jit_state_t *_jit, double (*i0)(double),
 
 static void
 _swf_fff(jit_state_t *_jit, float (*i0)(float, float),
-	 int32_t r0, int32_t r1, jit_int32_t r2)
+	 int32_t r0, int32_t r1, int32_t r2)
 {
     jit_get_reg_args();
     if (jit_fpr_p(r1))
@@ -632,7 +632,7 @@ _swf_fff(jit_state_t *_jit, float (*i0)(float, float),
 
 static void
 _swf_ddd(jit_state_t *_jit, double (*i0)(double, double),
-	 int32_t r0, int32_t r1, jit_int32_t r2)
+	 int32_t r0, int32_t r1, int32_t r2)
 {
     jit_get_reg_args();
     if (jit_fpr_p(r1)) {
@@ -802,7 +802,7 @@ _swf_rsbi_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_float64_t i0)
 
 static void
 _swf_iff(jit_state_t *_jit, int (*i0)(float, float),
-	 int32_t r0, int32_t r1, jit_int32_t r2)
+	 int32_t r0, int32_t r1, int32_t r2)
 {
     jit_get_reg_args();
     if (jit_fpr_p(r1))
@@ -820,7 +820,7 @@ _swf_iff(jit_state_t *_jit, int (*i0)(float, float),
 
 static void
 _swf_idd(jit_state_t *_jit, int (*i0)(double, double),
-	 int32_t r0, int32_t r1, jit_int32_t r2)
+	 int32_t r0, int32_t r1, int32_t r2)
 {
     jit_get_reg_args();
     if (jit_fpr_p(r1)) {
@@ -903,7 +903,7 @@ _swf_idd_(jit_state_t *_jit, int (*i0)(double, double),
 
 static void
 _swf_iunff(jit_state_t *_jit, int (*i0)(float, float),
-	   int32_t r0, int32_t r1, jit_int32_t r2)
+	   int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		instr;
     jit_get_reg_args();
@@ -948,7 +948,7 @@ _swf_iunff(jit_state_t *_jit, int (*i0)(float, float),
 
 static void
 _swf_iundd(jit_state_t *_jit, int (*i0)(double, double),
-	   int32_t r0, int32_t r1, jit_int32_t r2)
+	   int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		instr;
     jit_get_reg_args();
@@ -2082,7 +2082,7 @@ _swf_negr_d(jit_state_t *_jit, int32_t r0, int32_t r1)
 }
 
 static void
-_swf_ner_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_swf_ner_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     swf_iff(__aeabi_fcmpeq, r0, r1, r2);
     xori(r0, r0, 1);
@@ -2096,7 +2096,7 @@ _swf_nei_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_float32_t i0)
 }
 
 static void
-_swf_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_swf_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     swf_idd(__aeabi_dcmpeq, r0, r1, r2);
     xori(r0, r0, 1);
@@ -2110,7 +2110,7 @@ _swf_nei_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_float64_t i0)
 }
 
 static void
-_swf_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_swf_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     swf_iunff(__aeabi_fcmpeq, r0, r1, r2);
     xori(r0, r0, 1);
@@ -2124,7 +2124,7 @@ _swf_ltgti_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_float32_t i0)
 }
 
 static void
-_swf_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_swf_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     swf_iundd(__aeabi_dcmpeq, r0, r1, r2);
     xori(r0, r0, 1);
@@ -2138,7 +2138,7 @@ _swf_ltgti_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_float64_t i0)
 }
 
 static void
-_swf_ordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_swf_ordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     swf_iff(__aeabi_fcmpun, r0, r1, r2);
     xori(r0, r0, 1);
@@ -2152,7 +2152,7 @@ _swf_ordi_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_float32_t i0)
 }
 
 static void
-_swf_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_swf_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     swf_idd(__aeabi_dcmpun, r0, r1, r2);
     xori(r0, r0, 1);
@@ -2254,7 +2254,7 @@ _swf_ldi_d(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_swf_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_swf_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (jit_fpr_p(r0)) {
@@ -2268,7 +2268,7 @@ _swf_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_swf_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_swf_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		rg0, rg1;
     if (jit_fpr_p(r0)) {
@@ -2484,7 +2484,7 @@ _swf_sti_d(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_swf_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_swf_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (jit_fpr_p(r2)) {
@@ -2498,7 +2498,7 @@ _swf_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_swf_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_swf_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		rg0, rg1;
     if (jit_fpr_p(r2)) {
diff --git a/jit/arm-vfp.c b/jit/arm-vfp.c
index c79eba877..d17a77844 100644
--- a/jit/arm-vfp.c
+++ b/jit/arm-vfp.c
@@ -529,9 +529,9 @@ static void _vfp_cmp_d(jit_state_t*,int32_t,int32_t);
 #  define vcmp01_x(c0,c1,r0)		_vcmp01_x(_jit,c0,c1,r0)
 static void _vcmp01_x(jit_state_t*,int,int,int32_t);
 #  define vcmp01_f(c0,c1,r0,r1,r2)	_vcmp01_f(_jit,c0,c1,r0,r1,r2)
-static void _vcmp01_f(jit_state_t*,int,int,int32_t,int32_t,jit_int32_t);
+static void _vcmp01_f(jit_state_t*,int,int,int32_t,int32_t,int32_t);
 #  define vcmp01_d(c0,c1,r0,r1,r2)	_vcmp01_d(_jit,c0,c1,r0,r1,r2)
-static void _vcmp01_d(jit_state_t*,int,int,int32_t,int32_t,jit_int32_t);
+static void _vcmp01_d(jit_state_t*,int,int,int32_t,int32_t,int32_t);
 #  define vfp_ltr_f(r0,r1,r2)		vcmp01_f(ARM_CC_PL,ARM_CC_MI,r0,r1,r2)
 #  define vfp_lti_f(r0,r1,i0)		_vfp_lti_f(_jit,r0,r1,i0)
 static void _vfp_lti_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
@@ -571,9 +571,9 @@ static void _vfp_nei_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define vcmp10_x(c0,r0)		_vcmp10_x(_jit,c0,r0)
 static void _vcmp10_x(jit_state_t*,int,int32_t);
 #  define vcmp_10_f(c0,r0,r1,r2)	_vcmp_10_f(_jit,c0,r0,r1,r2)
-static void _vcmp_10_f(jit_state_t*,int,int32_t,int32_t,jit_int32_t);
+static void _vcmp_10_f(jit_state_t*,int,int32_t,int32_t,int32_t);
 #  define vcmp_10_d(c0,r0,r1,r2)	_vcmp_10_d(_jit,c0,r0,r1,r2)
-static void _vcmp_10_d(jit_state_t*,int,int32_t,int32_t,jit_int32_t);
+static void _vcmp_10_d(jit_state_t*,int,int32_t,int32_t,int32_t);
 #  define vfp_unltr_f(r0,r1,r2)		vcmp_10_f(ARM_CC_GE,r0,r1,r2)
 #  define vfp_unlti_f(r0,r1,i0)		_vfp_unlti_f(_jit,r0,r1,i0)
 static void _vfp_unlti_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
@@ -589,19 +589,19 @@ static void _vfp_unlei_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define vfp_uneqr_x(r0)		_vfp_uneqr_x(_jit,r0)
 static void _vfp_uneqr_x(jit_state_t*,int32_t);
 #  define vfp_uneqr_f(r0,r1,r2)		_vfp_uneqr_f(_jit,r0,r1,r2)
-static void _vfp_uneqr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_uneqr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_uneqi_f(r0,r1,i0)		_vfp_uneqi_f(_jit,r0,r1,i0)
 static void _vfp_uneqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
 #  define vfp_uneqr_d(r0,r1,r2)		_vfp_uneqr_d(_jit,r0,r1,r2)
-static void _vfp_uneqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_uneqr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_uneqi_d(r0,r1,i0)		_vfp_uneqi_d(_jit,r0,r1,i0)
 static void _vfp_uneqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define vcmp_01_x(c0,r0)		_vcmp_01_x(_jit,c0,r0)
 static void _vcmp_01_x(jit_state_t*,int,int32_t);
 #  define vcmp_01_f(c0,r0,r1,r2)	_vcmp_01_f(_jit,c0,r0,r1,r2)
-static void _vcmp_01_f(jit_state_t*,int,int32_t,int32_t,jit_int32_t);
+static void _vcmp_01_f(jit_state_t*,int,int32_t,int32_t,int32_t);
 #  define vcmp_01_d(c0,r0,r1,r2)	_vcmp_01_d(_jit,c0,r0,r1,r2)
-static void _vcmp_01_d(jit_state_t*,int,int32_t,int32_t,jit_int32_t);
+static void _vcmp_01_d(jit_state_t*,int,int32_t,int32_t,int32_t);
 #  define vfp_unger_f(r0,r1,r2)		vcmp_01_f(ARM_CC_CS,r0,r1,r2)
 #  define vfp_ungei_f(r0,r1,i0)		_vfp_ungei_f(_jit,r0,r1,i0)
 static void _vfp_ungei_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
@@ -617,27 +617,27 @@ static void _vfp_ungti_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define vfp_ltgtr_x(r0)		_vfp_ltgtr_x(_jit,r0)
 static void _vfp_ltgtr_x(jit_state_t*,int32_t);
 #  define vfp_ltgtr_f(r0,r1,r2)		_vfp_ltgtr_f(_jit,r0,r1,r2)
-static void _vfp_ltgtr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_ltgtr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_ltgti_f(r0,r1,i0)		_vfp_ltgti_f(_jit,r0,r1,i0)
 static void _vfp_ltgti_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
 #  define vfp_ltgtr_d(r0,r1,r2)		_vfp_ltgtr_d(_jit,r0,r1,r2)
-static void _vfp_ltgtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_ltgtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_ltgti_d(r0,r1,i0)		_vfp_ltgti_d(_jit,r0,r1,i0)
 static void _vfp_ltgti_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define vfp_ordr_f(r0,r1,r2)		_vfp_ordr_f(_jit,r0,r1,r2)
-static void _vfp_ordr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_ordr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_ordi_f(r0,r1,i0)		_vfp_ordi_f(_jit,r0,r1,i0)
 static void _vfp_ordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
 #  define vfp_ordr_d(r0,r1,r2)		_vfp_ordr_d(_jit,r0,r1,r2)
-static void _vfp_ordr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_ordr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_ordi_d(r0,r1,i0)		_vfp_ordi_d(_jit,r0,r1,i0)
 static void _vfp_ordi_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define vfp_unordr_f(r0,r1,r2)	_vfp_unordr_f(_jit,r0,r1,r2)
-static void _vfp_unordr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_unordr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_unordi_f(r0,r1,i0)	_vfp_unordi_f(_jit,r0,r1,i0)
 static void _vfp_unordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t);
 #  define vfp_unordr_d(r0,r1,r2)	_vfp_unordr_d(_jit,r0,r1,r2)
-static void _vfp_unordr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_unordr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_unordi_d(r0,r1,i0)	_vfp_unordi_d(_jit,r0,r1,i0)
 static void _vfp_unordi_d(jit_state_t*,int32_t,int32_t,jit_float64_t);
 #  define vbcmp_x(cc,i0)		_vbcmp_x(_jit,cc,i0)
@@ -783,9 +783,9 @@ static void _vfp_ldi_f(jit_state_t*,int32_t,jit_word_t);
 #  define vfp_ldi_d(r0,i0)		_vfp_ldi_d(_jit,r0,i0)
 static void _vfp_ldi_d(jit_state_t*,int32_t,jit_word_t);
 #  define vfp_ldxr_f(r0,r1,r2)		_vfp_ldxr_f(_jit,r0,r1,r2)
-static void _vfp_ldxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_ldxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_ldxr_d(r0,r1,r2)		_vfp_ldxr_d(_jit,r0,r1,r2)
-static void _vfp_ldxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_ldxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_ldxi_f(r0,r1,i0)		_vfp_ldxi_f(_jit,r0,r1,i0)
 static void _vfp_ldxi_f(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define vfp_ldxi_d(r0,r1,i0)		_vfp_ldxi_d(_jit,r0,r1,i0)
@@ -797,9 +797,9 @@ static void _vfp_sti_f(jit_state_t*,jit_word_t,int32_t);
 #  define vfp_sti_d(i0,r0)		_vfp_sti_d(_jit,i0,r0)
 static void _vfp_sti_d(jit_state_t*,jit_word_t,int32_t);
 #  define vfp_stxr_f(r0,r1,r2)		_vfp_stxr_f(_jit,r0,r1,r2)
-static void _vfp_stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_stxr_d(r0,r1,r2)		_vfp_stxr_d(_jit,r0,r1,r2)
-static void _vfp_stxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _vfp_stxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define vfp_stxi_f(i0,r0,r1)		_vfp_stxi_f(_jit,i0,r0,r1)
 static void _vfp_stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define vfp_stxi_d(i0,r0,r1)		_vfp_stxi_d(_jit,i0,r0,r1)
@@ -1571,7 +1571,7 @@ _vcmp01_x(jit_state_t *_jit, int c0, int c1, int32_t r0)
 
 static void
 _vcmp01_f(jit_state_t *_jit, int c0, int c1,
-	  int32_t r0, int32_t r1, jit_int32_t r2)
+	  int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_f(r1, r2);
     vcmp01_x(c0, c1, r0);
@@ -1579,7 +1579,7 @@ _vcmp01_f(jit_state_t *_jit, int c0, int c1,
 
 static void
 _vcmp01_d(jit_state_t *_jit, int c0, int c1,
-	  int32_t r0, int32_t r1, jit_int32_t r2)
+	  int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_d(r1, r2);
     vcmp01_x(c0, c1, r0);
@@ -1610,7 +1610,7 @@ _vcmp10_x(jit_state_t *_jit, int cc, int32_t r0)
 }
 static void
 _vcmp_10_f(jit_state_t *_jit, int cc,
-	   int32_t r0, int32_t r1, jit_int32_t r2)
+	   int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_f(r1, r2);
     vcmp10_x(cc, r0);
@@ -1618,7 +1618,7 @@ _vcmp_10_f(jit_state_t *_jit, int cc,
 
 static void
 _vcmp_10_d(jit_state_t *_jit, int cc,
-	   int32_t r0, int32_t r1, jit_int32_t r2)
+	   int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_d(r1, r2);
     vcmp10_x(cc, r0);
@@ -1668,7 +1668,7 @@ _vfp_uneqr_x(jit_state_t *_jit, int32_t r0)
 }
 
 static void
-_vfp_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_f(r1, r2);
     vfp_uneqr_x(r0);
@@ -1677,7 +1677,7 @@ _vfp_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(uneq)
 
 static void
-_vfp_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_d(r1, r2);
     vfp_uneqr_x(r0);
@@ -1711,7 +1711,7 @@ _vcmp_01_x(jit_state_t *_jit, int cc, int32_t r0)
 
 static void
 _vcmp_01_f(jit_state_t *_jit, int cc,
-	   int32_t r0, int32_t r1, jit_int32_t r2)
+	   int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_f(r1, r2);
     vcmp_01_x(cc, r0);
@@ -1719,7 +1719,7 @@ _vcmp_01_f(jit_state_t *_jit, int cc,
 
 static void
 _vcmp_01_d(jit_state_t *_jit, int cc,
-	   int32_t r0, int32_t r1, jit_int32_t r2)
+	   int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_d(r1, r2);
     vcmp_01_x(cc, r0);
@@ -1757,7 +1757,7 @@ _vfp_ltgtr_x(jit_state_t *_jit, int32_t r0)
 }
 
 static void
-_vfp_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_f(r1, r2);
     vfp_ltgtr_x(r0);
@@ -1766,7 +1766,7 @@ _vfp_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(ltgt)
 
 static void
-_vfp_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_d(r1, r2);
     vfp_ltgtr_x(r0);
@@ -1775,7 +1775,7 @@ _vfp_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(ltgt)
 
 static void
-_vfp_ordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_ordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_f(r1, r2);
     vcmp10_x(ARM_CC_VS, r0);
@@ -1784,7 +1784,7 @@ _vfp_ordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(ord)
 
 static void
-_vfp_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_d(r1, r2);
     vcmp10_x(ARM_CC_VS, r0);
@@ -1793,7 +1793,7 @@ _vfp_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(ord)
 
 static void
-_vfp_unordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_unordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_f(r1, r2);
     vcmp_01_x(ARM_CC_VS, r0);
@@ -1802,7 +1802,7 @@ _vfp_unordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(unord)
 
 static void
-_vfp_unordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_unordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     vfp_cmp_d(r1, r2);
     vcmp_01_x(ARM_CC_VS, r0);
@@ -2076,7 +2076,7 @@ _vfp_ldi_d(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_vfp_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (jit_fpr_p(r0)) {
@@ -2090,7 +2090,7 @@ _vfp_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_vfp_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2205,7 +2205,7 @@ _vfp_sti_d(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_vfp_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (jit_fpr_p(r2)) {
@@ -2219,7 +2219,7 @@ _vfp_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_vfp_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_vfp_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
diff --git a/jit/hppa-cpu.c b/jit/hppa-cpu.c
index 9778caf67..43d2f7094 100644
--- a/jit/hppa-cpu.c
+++ b/jit/hppa-cpu.c
@@ -49,141 +49,141 @@ typedef struct udiv {
 #define ii(v)			*_jit->pc.ui++ = v
 #define f1(o,b,t,i)			_f1(_jit,o,b,t,i)
 static void _f1(jit_state_t*,int32_t,
-		int32_t,int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t);
 #define f2(o,b,r,i,j)			_f2(_jit,o,b,r,i,j)
 static void _f2(jit_state_t*,int32_t,int32_t,
-		int32_t,int32_t,jit_int32_t) maybe_unused;
+		int32_t,int32_t,int32_t) maybe_unused;
 #define f3(o,b,t,i,j)			_f3(_jit,o,b,t,i,j)
 static void _f3(jit_state_t*,int32_t,int32_t,
-		int32_t,int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t);
 #define f4(o,b,x,s,u,y,c,z,m,t)		_f4(_jit,o,b,x,s,u,y,c,z,m,t)
 static void _f4(jit_state_t*,int32_t,int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t,int32_t,
+		int32_t,int32_t,int32_t,int32_t);
 #define f5(o,b,i,s,a,y,c,z,m,t)		_f5(_jit,o,b,i,s,a,y,c,z,m,t)
 static void _f5(jit_state_t*,int32_t,int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t,int32_t,
+		int32_t,int32_t,int32_t,int32_t);
 #define f6(o,b,r,s,a,x,c,y,m,i)		_f6(_jit,o,b,r,s,a,x,c,y,m,i)
 static void _f6(jit_state_t*,int32_t,int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t,int32_t,
+		int32_t,int32_t,int32_t,int32_t);
 #define f7(o,r,i)			_f7(_jit,o,r,i)
-static void _f7(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _f7(jit_state_t*,int32_t,int32_t,int32_t);
 #define f8(o,r2,r1,cf,e1,x,e2,y,d,t)	_f8(_jit,o,r2,r1,cf,e1,x,e2,y,d,t)
 static void _f8(jit_state_t*,int32_t,
-		int32_t,int32_t,jit_int32_t,
-		int32_t,int32_t,jit_int32_t,
-		int32_t,int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t,
+		int32_t,int32_t,int32_t,
+		int32_t,int32_t,int32_t);
 #define f9(o,r,t,cf,e1,im)		_f9(_jit,o,r,t,cf,e1,im)
 static void _f9(jit_state_t*,
-		int32_t,int32_t,jit_int32_t,
-		int32_t,int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t,
+		int32_t,int32_t,int32_t);
 #define f10(o,r2,r1,u,v,w,x,sa,y,t)	_f10(_jit,o,r2,r1,u,v,w,x,sa,y,t)
 static void _f10(jit_state_t*,int32_t,int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+		int32_t,int32_t,int32_t,int32_t,
+		int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f11(o,r2,r1,c,x,y,z,u,t)	_f11(_jit,o,r2,r1,c,x,y,z,u,t)
 static void _f11(jit_state_t*,int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+		int32_t,int32_t,int32_t,int32_t,
+		int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f12(o,r,t,c,x,se,y,c1,z,clen)	_f12(_jit,o,r,t,c,x,se,y,c1,z,clen)
 static void _f12(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t);
 #define f13(o,t,r,c,x,nz,c1,clen)	_f13(_jit,o,t,r,c,x,nz,c1,clen)
 static void _f13(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t);
 #define f13x(o,t,i,c,x,nz,c1,clen)	_f13x(_jit,o,t,i,c,x,nz,c1,clen)
 static void _f13x(jit_state_t*,int32_t,int32_t,
-		  int32_t,int32_t,jit_int32_t,
-		  int32_t,int32_t,jit_int32_t) maybe_unused;
+		  int32_t,int32_t,int32_t,
+		  int32_t,int32_t,int32_t) maybe_unused;
 #define f14(o,r2,r1,c,x,cp,y,cpos,t)	_f14(_jit,o,r2,r1,c,x,cp,y,cpos,t)
 static void _f14(jit_state_t*,int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+		int32_t,int32_t,int32_t,int32_t,
+		int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f15(o,r,t,c,c1,p,se,pos,clen)	_f15(_jit,o,r,t,c,c1,p,se,pos,clen)
 static void _f15(jit_state_t*,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t);
 #define f16(o,t,r,c,c1,cp,nz,cpos,clen)	_f16(_jit,o,t,r,c,c1,cp,nz,cpos,clen)
 static void _f16(jit_state_t*,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t);
 #define f16x(o,t,i,c,c1,cp,nz,cpos,clen) _f16x(_jit,o,t,i,c,c1,cp,nz,cpos,clen)
 static void _f16x(jit_state_t*,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t);
 #define f17(o,r2,r1,c,i,n)		_f17(_jit,o,r2,r1,c,i,n)
 static void _f17(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t);
 #define f17x(o,r2,r1,c,i,n)		_f17x(_jit,o,r2,r1,c,i,n)
 static void _f17x(jit_state_t*,int32_t,int32_t,
-		  int32_t,int32_t,jit_int32_t,jit_int32_t);
+		  int32_t,int32_t,int32_t,int32_t);
 #define f18(o,p,r,c,i,n)		_f18(_jit,o,p,r,c,i,n)
 static void _f18(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t);
 #define f19(o,b,s,i,n)			_f19(_jit,o,b,s,i,n)
 static void _f19(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t) maybe_unused;
 #define f20(o,t,i,g,n)			_f20(_jit,o,t,i,g,n)
 static void _f20(jit_state_t*,int32_t,int32_t,
-		int32_t,int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t);
 #define f21(o,t,x,y,n)			_f21(_jit,o,t,x,y,n)
 static void _f21(jit_state_t*,int32_t,int32_t,
-		int32_t,int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t);
 #define f22(o,b,x,r,n,p)		_f22(_jit,o,b,x,r,n,p)
 static void _f22(jit_state_t*,int32_t,int32_t,
-		int32_t,int32_t,jit_int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t,int32_t);
 #define f23(o,a,b,c,d,e,f,g,h)		_f23(_jit,o,a,b,c,d,e,f,g,h)
 static void _f23(jit_state_t*,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f24(o,b,x,s,y,m,r)		_f24(_jit,o,b,x,s,y,m,r)
 static void _f24(jit_state_t*,int32_t,
-		 int32_t,int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t) maybe_unused;
 #define f25(o,b,i,s,y,m,r)		_f25(_jit,o,b,i,s,y,m,r)
 static void _f25(jit_state_t*,int32_t,
-		 int32_t,int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t) maybe_unused;
 #define f26(o,b,x,s,y,m,r)		_f26(_jit,o,b,x,s,y,m,r)
 static void _f26(jit_state_t*,int32_t,
-		 int32_t,int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t) maybe_unused;
 #define f27(o,i,j)			_f27(_jit,o,i,j)
-static void _f27(jit_state_t*,int32_t,int32_t,jit_int32_t) maybe_unused;
+static void _f27(jit_state_t*,int32_t,int32_t,int32_t) maybe_unused;
 #define f28(o,i)			_f28(_jit,o,i)
 static void _f28(jit_state_t*,int32_t,int32_t) maybe_unused;
 #define f29(o,r,x,s,y,t)		_f29(_jit,o,r,x,s,y,t)
 static void _f29(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f30(o,b,r,s,x,y,t)		_f30(_jit,o,b,r,s,x,y,t)
-static void _f30(jit_state_t*,int32_t,int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+static void _f30(jit_state_t*,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f31(o,t,r,v,x,y)		_f31(_jit,o,t,r,v,x,y)
 static void _f31(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t);
 #define f33(o,x,r,y,z,u)		_f33(_jit,o,x,r,y,z,u)
 static void _f33(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f34(o,o1,x,sf,n,o2)		_f34(_jit,o,o1,x,sf,n,o2)
 static void _f34(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f35(o,op,x,sf,n,t)		_f35(_jit,o,op,x,sf,n,t)
 static void _f35(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f36(o,r,o1,x,sf,n,o2)		_f36(_jit,o,r,o1,x,sf,n,o2)
-static void _f36(jit_state_t*,int32_t,int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+static void _f36(jit_state_t*,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f37(o,r2,r1,o1,x,sf,n,o2)	_f37(_jit,o,r2,r1,o1,x,sf,n,o2)
 static void _f37(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t) maybe_unused;
 #define f38(o,s,u,n)			_f38(_jit,o,s,u,n)
 static void _f38(jit_state_t*,int32_t,
-		 int32_t,int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t) maybe_unused;
 /* nulify next instruction if condition is met with addition */
 #define ADD_CF_NV		0	/* never */
 #define ADD_CF_EQ		2	/* O1 == -O2 (word) */
@@ -681,56 +681,56 @@ static void _subxi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define rsbi(r0, r1, i0)	_rsbi(_jit, r0, r1, i0)
 static void _rsbi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define mulr(r0,r1,r2)		_mulr(_jit,r0,r1,r2)
-static void _mulr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _mulr(jit_state_t*,int32_t,int32_t,int32_t);
 #define muli(r0,r1,i0)		_muli(_jit,r0,r1,i0)
 static void _muli(jit_state_t*,int32_t,int32_t,jit_word_t);
 static long long __llmul(int, int);
 #define qmulr(r0,r1,r2,r3)	_qmulr(_jit,r0,r1,r2,r3)
 static void _qmulr(jit_state_t*,
-		   int32_t,int32_t,jit_int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t,int32_t);
 #define qmuli(r0,r1,r2,i0)	_qmuli(_jit,r0,r1,r2,i0)
 static void _qmuli(jit_state_t*,
-		   int32_t,int32_t,jit_int32_t,jit_word_t);
+		   int32_t,int32_t,int32_t,jit_word_t);
 #define qmulr_u(r0,r1,r2,r3)	_qmulr_u(_jit,r0,r1,r2,r3)
 static void _qmulr_u(jit_state_t*,
-		     int32_t,int32_t,jit_int32_t,jit_int32_t);
+		     int32_t,int32_t,int32_t,int32_t);
 #define qmuli_u(r0,r1,r2,i0)	_qmuli_u(_jit,r0,r1,r2,i0)
 static void _qmuli_u(jit_state_t*,
-		     int32_t,int32_t,jit_int32_t,jit_word_t);
+		     int32_t,int32_t,int32_t,jit_word_t);
 static int __idiv(int, int);
 #define divr(r0,r1,r2)		_divr(_jit,r0,r1,r2)
-static void _divr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr(jit_state_t*,int32_t,int32_t,int32_t);
 #define divi(r0,r1,i0)		_divi(_jit,r0,r1,i0)
 static void _divi(jit_state_t*,int32_t,int32_t,jit_word_t);
 static unsigned int __udiv(unsigned int, unsigned int);
 #define divr_u(r0,r1,r2)	_divr_u(_jit,r0,r1,r2)
-static void _divr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #define divi_u(r0,r1,i0)	_divi_u(_jit,r0,r1,i0)
 static void _divi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 static int __irem(int, int);
 #define remr(r0,r1,r2)		_remr(_jit,r0,r1,r2)
-static void _remr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr(jit_state_t*,int32_t,int32_t,int32_t);
 #define remi(r0,r1,i0)		_remi(_jit,r0,r1,i0)
 static void _remi(jit_state_t*,int32_t,int32_t,jit_word_t);
 static unsigned int __urem(unsigned int, unsigned int);
 #define remr_u(r0,r1,r2)	_remr_u(_jit,r0,r1,r2)
-static void _remr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #define remi_u(r0,r1,i0)	_remi_u(_jit,r0,r1,i0)
 static void _remi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 static idiv_t __idivrem(int, int);
 #define qdivr(r0,r1,r2,r3)	_qdivr(_jit,r0,r1,r2,r3)
 static void _qdivr(jit_state_t*,
-		   int32_t,int32_t,jit_int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t,int32_t);
 #define qdivi(r0,r1,r2,i0)	_qdivi(_jit,r0,r1,r2,i0)
 static void _qdivi(jit_state_t*,
-		   int32_t,int32_t,jit_int32_t,jit_word_t);
+		   int32_t,int32_t,int32_t,jit_word_t);
 static udiv_t __udivrem(unsigned int, unsigned int);
 #define qdivr_u(r0,r1,r2,r3)	_qdivr_u(_jit,r0,r1,r2,r3)
 static void _qdivr_u(jit_state_t*,
-		     int32_t,int32_t,jit_int32_t,jit_int32_t);
+		     int32_t,int32_t,int32_t,int32_t);
 #define qdivi_u(r0,r1,r2,i0)	_qdivi_u(_jit,r0,r1,r2,i0)
 static void _qdivi_u(jit_state_t*,
-		     int32_t,int32_t,jit_int32_t,jit_word_t);
+		     int32_t,int32_t,int32_t,jit_word_t);
 #define andr(r0,r1,r2)		AND(r1,r2,r0)
 #define andi(r0,r1,i0)		_andi(_jit,r0,r1,i0)
 static void _andi(jit_state_t*,int32_t,int32_t,jit_word_t);
@@ -741,16 +741,16 @@ static void _ori(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define xori(r0,r1,i0)		_xori(_jit,r0,r1,i0)
 static void _xori(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define lshr(r0,r1,r2)		_lshr(_jit,r0,r1,r2)
-static void _lshr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _lshr(jit_state_t*,int32_t,int32_t,int32_t);
 #define lshi(r0,r1,i0)		SHLWI(r1,i0,r0)
 #define rshr(r0,r1,r2)		_rshr(_jit,r0,r1,r2)
-static void _rshr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _rshr(jit_state_t*,int32_t,int32_t,int32_t);
 #define rshi(r0,r1,i0)		SHRWI(r1,i0,r0)
 #define rshr_u(r0,r1,r2)	_rshr_u(_jit,r0,r1,r2)
-static void _rshr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _rshr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #define rshi_u(r0,r1,i0)	SHRWI_U(r1,i0,r0)
 #define cmpr(c,r0,r1,r2)	_cmpr(_jit,c,r0,r1,r2)
-static void _cmpr(jit_state_t*,jit_word_t,int32_t,int32_t,jit_int32_t);
+static void _cmpr(jit_state_t*,jit_word_t,int32_t,int32_t,int32_t);
 #define cmpi(c,ci,r0,r1,i0)	_cmpi(_jit,c,ci,r0,r1,i0)
 static void _cmpi(jit_state_t*,jit_word_t,jit_word_t,
 		  int32_t,int32_t,jit_word_t);
@@ -779,7 +779,7 @@ static void _ldr_c(jit_state_t*,int32_t,int32_t);
 #define ldi_c(r0,i0)		_ldi_c(_jit,r0,i0)
 static void _ldi_c(jit_state_t*,int32_t,jit_word_t);
 #define ldxr_c(r0,r1,r2)	_ldxr_c(_jit,r0,r1,r2)
-static void _ldxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #define ldxi_c(r0,r1,i0)	_ldxi_c(_jit,r0,r1,i0)
 static void _ldxi_c(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ldr_uc(r0,r1)		LDBI(_R0_REGNO,r1,r0)
@@ -793,7 +793,7 @@ static void _ldr_s(jit_state_t*,int32_t,int32_t);
 #define ldi_s(r0,i0)		_ldi_s(_jit,r0,i0)
 static void _ldi_s(jit_state_t*,int32_t,jit_word_t);
 #define ldxr_s(r0,r1,r2)	_ldxr_s(_jit,r0,r1,r2)
-static void _ldxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #define ldxi_s(r0,r1,i0)	_ldxi_s(_jit,r0,r1,i0)
 static void _ldxi_s(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ldr_us(r0,r1)		LDHI(_R0_REGNO,r1,r0)
@@ -818,21 +818,21 @@ static void _ldxi_ui(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define sti_c(i0,r0)		_sti_c(_jit,i0,r0)
 static void _sti_c(jit_state_t*,jit_word_t,int32_t);
 #define stxr_c(r0,r1,r2)	_stxr_c(_jit,r0,r1,r2)
-static void _stxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #define stxi_c(i0,r0,r1)	_stxi_c(_jit,i0,r0,r1)
 static void _stxi_c(jit_state_t*,jit_word_t,int32_t,int32_t);
 #define str_s(r0,r1)		STHI(r1,_R0_REGNO,r0)
 #define sti_s(i0,r0)		_sti_s(_jit,i0,r0)
 static void _sti_s(jit_state_t*,jit_word_t,int32_t);
 #define stxr_s(r0,r1,r2)	_stxr_s(_jit,r0,r1,r2)
-static void _stxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #define stxi_s(i0,r0,r1)	_stxi_s(_jit,i0,r0,r1)
 static void _stxi_s(jit_state_t*,jit_word_t,int32_t,int32_t);
 #define str_i(r0,r1)		STWI(r1,_R0_REGNO,r0)
 #define sti_i(i0,r0)		_sti_i(_jit,i0,r0)
 static void _sti_i(jit_state_t*,jit_word_t,int32_t);
 #define stxr_i(r0,r1,r2)	_stxr_i(_jit,r0,r1,r2)
-static void _stxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #define stxi(i0,r0,r1)		stxi_i(i0,r0,r1)
 #define stxi_i(i0,r0,r1)	_stxi_i(_jit,i0,r0,r1)
 static void _stxi_i(jit_state_t*,jit_word_t,int32_t,int32_t);
@@ -1018,7 +1018,7 @@ re_assemble_22 (int as22)
 
 static void
 _f1(jit_state_t *_jit, int32_t o,
-    int32_t b, int32_t t, jit_int32_t i)
+    int32_t b, int32_t t, int32_t i)
 {
     assert(!(o  & ~0x3f));
     assert(!(b  & ~0x1f));
@@ -1029,7 +1029,7 @@ _f1(jit_state_t *_jit, int32_t o,
 
 static void
 _f2(jit_state_t *_jit, int32_t o,
-    int32_t b, int32_t t, jit_int32_t i, jit_int32_t j)
+    int32_t b, int32_t t, int32_t i, int32_t j)
 {
     assert(!(o  & ~0x3f));
     assert(!(b  & ~0x1f));
@@ -1041,7 +1041,7 @@ _f2(jit_state_t *_jit, int32_t o,
 
 static void
 _f3(jit_state_t *_jit, int32_t o,
-    int32_t b, int32_t t, jit_int32_t i, jit_int32_t j)
+    int32_t b, int32_t t, int32_t i, int32_t j)
 {
     assert(!(o  & ~0x3f));
     assert(!(b  & ~0x1f));
@@ -1053,8 +1053,8 @@ _f3(jit_state_t *_jit, int32_t o,
 
 static void
 _f4(jit_state_t *_jit, int32_t o, int32_t b,
-    int32_t x, int32_t s, jit_int32_t u, jit_int32_t y,
-    int32_t c, int32_t z, jit_int32_t m, jit_int32_t t)
+    int32_t x, int32_t s, int32_t u, int32_t y,
+    int32_t c, int32_t z, int32_t m, int32_t t)
 {
     assert(!(o  & ~0x3f));
     assert(!(b  & ~0x1f));
@@ -1071,8 +1071,8 @@ _f4(jit_state_t *_jit, int32_t o, int32_t b,
 
 static void
 _f5(jit_state_t *_jit, int32_t o, int32_t b,
-    int32_t i, int32_t s, jit_int32_t a, jit_int32_t y,
-    int32_t c, int32_t z, jit_int32_t m, jit_int32_t t)
+    int32_t i, int32_t s, int32_t a, int32_t y,
+    int32_t c, int32_t z, int32_t m, int32_t t)
 {
     assert(!(o  & ~0x3f));
     assert(!(b  & ~0x1f));
@@ -1089,8 +1089,8 @@ _f5(jit_state_t *_jit, int32_t o, int32_t b,
 
 static void
 _f6(jit_state_t *_jit, int32_t o, int32_t b,
-    int32_t r, int32_t s, jit_int32_t a, jit_int32_t x,
-    int32_t c, int32_t y, jit_int32_t m, jit_int32_t i)
+    int32_t r, int32_t s, int32_t a, int32_t x,
+    int32_t c, int32_t y, int32_t m, int32_t i)
 {
     assert(!(o  & ~0x3f));
     assert(!(b  & ~0x1f));
@@ -1106,7 +1106,7 @@ _f6(jit_state_t *_jit, int32_t o, int32_t b,
 }
 
 static void
-_f7(jit_state_t *_jit, int32_t o, int32_t r, jit_int32_t i)
+_f7(jit_state_t *_jit, int32_t o, int32_t r, int32_t i)
 {
     assert(!(o  & ~0x3f));
     assert(!(r  & ~0x1f));
@@ -1116,9 +1116,9 @@ _f7(jit_state_t *_jit, int32_t o, int32_t r, jit_int32_t i)
 
 static void
 _f8(jit_state_t *_jit, int32_t o,
-    int32_t r2, int32_t r1, jit_int32_t cf,
-    int32_t e1, int32_t x, jit_int32_t e2,
-    int32_t e3, int32_t d, jit_int32_t t)
+    int32_t r2, int32_t r1, int32_t cf,
+    int32_t e1, int32_t x, int32_t e2,
+    int32_t e3, int32_t d, int32_t t)
 {
     assert(!(o  & ~0x3f));
     assert(!(r2 & ~0x1f));
@@ -1136,8 +1136,8 @@ _f8(jit_state_t *_jit, int32_t o,
 
 static void
 _f9(jit_state_t *_jit,
-    int32_t o, int32_t r, jit_int32_t t,
-    int32_t cf, int32_t e1, jit_int32_t i)
+    int32_t o, int32_t r, int32_t t,
+    int32_t cf, int32_t e1, int32_t i)
 {
     assert(!(o  & ~0x3f));
     assert(!(r  & ~0x1f));
@@ -1150,8 +1150,8 @@ _f9(jit_state_t *_jit,
 
 static void
 _f10(jit_state_t *_jit, int32_t o, int32_t r2,
-     int32_t r1, int32_t u, jit_int32_t v, jit_int32_t w,
-     int32_t x, int32_t sa, jit_int32_t y, jit_int32_t t)
+     int32_t r1, int32_t u, int32_t v, int32_t w,
+     int32_t x, int32_t sa, int32_t y, int32_t t)
 {
     assert(!(o  & ~0x3f));
     assert(!(r2 & ~0x1f));
@@ -1169,8 +1169,8 @@ _f10(jit_state_t *_jit, int32_t o, int32_t r2,
 
 static void
 _f11(jit_state_t *_jit, int32_t o,
-     int32_t r2, int32_t r1, jit_int32_t c, jit_int32_t x,
-     int32_t y, int32_t z, jit_int32_t u, jit_int32_t t)
+     int32_t r2, int32_t r1, int32_t c, int32_t x,
+     int32_t y, int32_t z, int32_t u, int32_t t)
 {
     assert(!(o  & ~0x3f));
     assert(!(r1 & ~0x1f));
@@ -1186,8 +1186,8 @@ _f11(jit_state_t *_jit, int32_t o,
 
 static void
 _f12(jit_state_t *_jit, int32_t o, int32_t r,
-     int32_t t, int32_t c, jit_int32_t x, jit_int32_t se,
-     int32_t y, int32_t c1, jit_int32_t z, jit_int32_t clen)
+     int32_t t, int32_t c, int32_t x, int32_t se,
+     int32_t y, int32_t c1, int32_t z, int32_t clen)
 {
     assert(!(o    & ~0x3f));
     assert(!(r    & ~0x1f));
@@ -1205,8 +1205,8 @@ _f12(jit_state_t *_jit, int32_t o, int32_t r,
 
 static void
 _f13(jit_state_t *_jit, int32_t o, int32_t t,
-     int32_t r, int32_t c, jit_int32_t x,
-     int32_t nz, int32_t c1, jit_int32_t clen)
+     int32_t r, int32_t c, int32_t x,
+     int32_t nz, int32_t c1, int32_t clen)
 {
     assert(!(o    & ~0x3f));
     assert(!(t    & ~0x1f));
@@ -1222,8 +1222,8 @@ _f13(jit_state_t *_jit, int32_t o, int32_t t,
 
 static void
 _f13x(jit_state_t *_jit, int32_t o, int32_t t,
-      int32_t i, int32_t c, jit_int32_t x,
-      int32_t nz, int32_t c1, jit_int32_t clen)
+      int32_t i, int32_t c, int32_t x,
+      int32_t nz, int32_t c1, int32_t clen)
 {
     assert(!(o    & ~0x3f));
     assert(!(t    & ~0x1f));
@@ -1238,8 +1238,8 @@ _f13x(jit_state_t *_jit, int32_t o, int32_t t,
 
 static void
 _f14(jit_state_t *_jit, int32_t o,
-     int32_t r2, int32_t r1, jit_int32_t c, jit_int32_t x,
-     int32_t cp, int32_t y, jit_int32_t cpos, jit_int32_t t)
+     int32_t r2, int32_t r1, int32_t c, int32_t x,
+     int32_t cp, int32_t y, int32_t cpos, int32_t t)
 {
     assert(!(o    & ~0x3f));
     assert(!(r1   & ~0x1f));
@@ -1255,8 +1255,8 @@ _f14(jit_state_t *_jit, int32_t o,
 
 static void
 _f15(jit_state_t *_jit, int32_t o,
-     int32_t r, int32_t t, jit_int32_t c, jit_int32_t c1,
-     int32_t p, int32_t se, jit_int32_t pos, jit_int32_t clen)
+     int32_t r, int32_t t, int32_t c, int32_t c1,
+     int32_t p, int32_t se, int32_t pos, int32_t clen)
 {
     assert(!(o    & ~0x3f));
     assert(!(r    & ~0x1f));
@@ -1273,8 +1273,8 @@ _f15(jit_state_t *_jit, int32_t o,
 
 static void
 _f16(jit_state_t *_jit, int32_t o,
-     int32_t t, int32_t r, jit_int32_t c, jit_int32_t c1,
-     int32_t cp, int32_t nz, jit_int32_t cpos, jit_int32_t clen)
+     int32_t t, int32_t r, int32_t c, int32_t c1,
+     int32_t cp, int32_t nz, int32_t cpos, int32_t clen)
 {
     assert(!(o    & ~0x3f));
     assert(!(t    & ~0x1f));
@@ -1291,8 +1291,8 @@ _f16(jit_state_t *_jit, int32_t o,
 
 static void
 _f16x(jit_state_t *_jit, int32_t o,
-      int32_t t, int32_t i, jit_int32_t c, jit_int32_t c1,
-      int32_t cp, int32_t nz, jit_int32_t cpos, jit_int32_t clen)
+      int32_t t, int32_t i, int32_t c, int32_t c1,
+      int32_t cp, int32_t nz, int32_t cpos, int32_t clen)
 {
     assert(!(o    & ~0x3f));
     assert(!(t    & ~0x1f));
@@ -1309,7 +1309,7 @@ _f16x(jit_state_t *_jit, int32_t o,
 
 static void
 _f17(jit_state_t *_jit, int32_t o, int32_t r2,
-     int32_t r1, int32_t c, jit_int32_t i, jit_int32_t n)
+     int32_t r1, int32_t c, int32_t i, int32_t n)
 {
     assert(!(o  & ~0x3f));
     assert(!(r2 & ~0x1f));
@@ -1322,7 +1322,7 @@ _f17(jit_state_t *_jit, int32_t o, int32_t r2,
 
 static void
 _f17x(jit_state_t *_jit, int32_t o, int32_t r,
-      int32_t i, int32_t c, jit_int32_t t, jit_int32_t n)
+      int32_t i, int32_t c, int32_t t, int32_t n)
 {
     assert(!(o & ~0x3f));
     assert(!(r & ~0x1f));
@@ -1336,7 +1336,7 @@ _f17x(jit_state_t *_jit, int32_t o, int32_t r,
 
 static void
 _f18(jit_state_t *_jit, int32_t o, int32_t p,
-     int32_t r, int32_t c, jit_int32_t i, jit_int32_t n)
+     int32_t r, int32_t c, int32_t i, int32_t n)
 {
     assert(!(o & ~0x3f));
     assert(!(p & ~0x1f));
@@ -1349,7 +1349,7 @@ _f18(jit_state_t *_jit, int32_t o, int32_t p,
 
 static void
 _f19(jit_state_t *_jit, int32_t o, int32_t b,
-     int32_t s, int32_t i, jit_int32_t n)
+     int32_t s, int32_t i, int32_t n)
 {
     assert(!(o & ~0x3f));
     assert(!(b & ~0x1f));
@@ -1361,7 +1361,7 @@ _f19(jit_state_t *_jit, int32_t o, int32_t b,
 
 static void
 _f20(jit_state_t *_jit, int32_t o, int32_t t,
-     int32_t i, int32_t g, jit_int32_t n)
+     int32_t i, int32_t g, int32_t n)
 {
     assert(!(o & ~0x3f));
     assert(!(t & ~0x1f));
@@ -1373,7 +1373,7 @@ _f20(jit_state_t *_jit, int32_t o, int32_t t,
 
 static void
 _f21(jit_state_t *_jit, int32_t o, int32_t t,
-     int32_t x, int32_t y, jit_int32_t n)
+     int32_t x, int32_t y, int32_t n)
 {
     assert(!(o & ~0x3f));
     assert(!(t & ~0x1f));
@@ -1385,7 +1385,7 @@ _f21(jit_state_t *_jit, int32_t o, int32_t t,
 
 static void
 _f22(jit_state_t *_jit, int32_t o, int32_t b,
-     int32_t x, int32_t r, jit_int32_t n, jit_int32_t p)
+     int32_t x, int32_t r, int32_t n, int32_t p)
 {
     assert(!(o & ~0x3f));
     assert(!(b & ~0x1f));
@@ -1398,8 +1398,8 @@ _f22(jit_state_t *_jit, int32_t o, int32_t b,
 
 static void
 _f23(jit_state_t *_jit, int32_t o,
-     int32_t a, int32_t b, jit_int32_t c, jit_int32_t d,
-     int32_t e, int32_t f, jit_int32_t g, jit_int32_t h)
+     int32_t a, int32_t b, int32_t c, int32_t d,
+     int32_t e, int32_t f, int32_t g, int32_t h)
 {
     assert(!(o &  ~0x3f));
     assert(!(a &  ~0x1f));
@@ -1415,8 +1415,8 @@ _f23(jit_state_t *_jit, int32_t o,
 
 static void
 _f24(jit_state_t *_jit, int32_t o,
-     int32_t b, int32_t x, jit_int32_t s,
-     int32_t y, int32_t m,jit_int32_t r)
+     int32_t b, int32_t x, int32_t s,
+     int32_t y, int32_t m,int32_t r)
 {
     assert(!(o &  ~0x3f));
     assert(!(b &  ~0x1f));
@@ -1430,8 +1430,8 @@ _f24(jit_state_t *_jit, int32_t o,
 
 static void
 _f25(jit_state_t *_jit, int32_t o,
-     int32_t b, int32_t i, jit_int32_t s,
-     int32_t y, int32_t m, jit_int32_t r)
+     int32_t b, int32_t i, int32_t s,
+     int32_t y, int32_t m, int32_t r)
 {
     assert(!(o &  ~0x3f));
     assert(!(b &  ~0x1f));
@@ -1445,8 +1445,8 @@ _f25(jit_state_t *_jit, int32_t o,
 
 static void
 _f26(jit_state_t *_jit, int32_t o,
-     int32_t b, int32_t x, jit_int32_t s,
-     int32_t y, int32_t m,jit_int32_t r)
+     int32_t b, int32_t x, int32_t s,
+     int32_t y, int32_t m,int32_t r)
 {
     assert(!(o &  ~0x3f));
     assert(!(b &  ~0x1f));
@@ -1459,7 +1459,7 @@ _f26(jit_state_t *_jit, int32_t o,
 }
 
 static void
-_f27(jit_state_t *_jit, int32_t o, int32_t i, jit_int32_t j)
+_f27(jit_state_t *_jit, int32_t o, int32_t i, int32_t j)
 {
     assert(!(o & ~0x3f));
     assert(i >= -4096 && i < 4095);
@@ -1477,7 +1477,7 @@ _f28(jit_state_t *_jit, int32_t o, int32_t i)
 
 static void
 _f29(jit_state_t *_jit, int32_t o, int32_t r,
-     int32_t x, int32_t s, jit_int32_t y, jit_int32_t t)
+     int32_t x, int32_t s, int32_t y, int32_t t)
 {
     assert(!(o & ~0x3f));
     assert(!(r & ~0x1f));
@@ -1489,8 +1489,8 @@ _f29(jit_state_t *_jit, int32_t o, int32_t r,
 }
 
 static void
-_f30(jit_state_t *_jit, int32_t o, int32_t b, jit_int32_t r,
-     int32_t s, int32_t x, jit_int32_t y, jit_int32_t t)
+_f30(jit_state_t *_jit, int32_t o, int32_t b, int32_t r,
+     int32_t s, int32_t x, int32_t y, int32_t t)
 {
     assert(!(o & ~0x3f));
     assert(!(b & ~0x1f));
@@ -1504,7 +1504,7 @@ _f30(jit_state_t *_jit, int32_t o, int32_t b, jit_int32_t r,
 
 static void
 _f31(jit_state_t *_jit, int32_t o, int32_t t,
-     int32_t r, int32_t v, jit_int32_t x, jit_int32_t y)
+     int32_t r, int32_t v, int32_t x, int32_t y)
 {
     assert(!(o & ~0x3f));
     assert(!(t & ~0x1f));
@@ -1517,7 +1517,7 @@ _f31(jit_state_t *_jit, int32_t o, int32_t t,
 
 static void
 _f33(jit_state_t *_jit, int32_t o, int32_t x,
-     int32_t r, int32_t y, jit_int32_t z, jit_int32_t u)
+     int32_t r, int32_t y, int32_t z, int32_t u)
 {
     assert(!(o & ~0x3f));
     assert(!(x & ~0x1f));
@@ -1530,7 +1530,7 @@ _f33(jit_state_t *_jit, int32_t o, int32_t x,
 
 static void
 _f34(jit_state_t *_jit, int32_t o, int32_t o1,
-     int32_t x, int32_t sf, jit_int32_t n, jit_int32_t o2)
+     int32_t x, int32_t sf, int32_t n, int32_t o2)
 {
     assert(!(o  &   ~0x3f));
     assert(!(o1 & ~0x7fff));
@@ -1543,7 +1543,7 @@ _f34(jit_state_t *_jit, int32_t o, int32_t o1,
 
 static void
 _f35(jit_state_t *_jit, int32_t o, int32_t op,
-     int32_t x, int32_t sf, jit_int32_t n, jit_int32_t t)
+     int32_t x, int32_t sf, int32_t n, int32_t t)
 {
     assert(!(o  &   ~0x3f));
     assert(!(op & ~0x7fff));
@@ -1555,8 +1555,8 @@ _f35(jit_state_t *_jit, int32_t o, int32_t op,
 }
 
 static void
-_f36(jit_state_t *_jit, int32_t o, int32_t r, jit_int32_t o1,
-     int32_t x, int32_t sf, jit_int32_t n, jit_int32_t o2)
+_f36(jit_state_t *_jit, int32_t o, int32_t r, int32_t o1,
+     int32_t x, int32_t sf, int32_t n, int32_t o2)
 {
     assert(!(o  &  ~0x3f));
     assert(!(r  &  ~0x1f));
@@ -1570,8 +1570,8 @@ _f36(jit_state_t *_jit, int32_t o, int32_t r, jit_int32_t o1,
 
 static void
 _f37(jit_state_t *_jit, int32_t o, int32_t r2,
-     int32_t r1, int32_t o1, jit_int32_t x,
-     int32_t sf, int32_t n, jit_int32_t o2)
+     int32_t r1, int32_t o1, int32_t x,
+     int32_t sf, int32_t n, int32_t o2)
 {
     assert(!(o  & ~0x3f));
     assert(!(r2 & ~0x1f));
@@ -1586,7 +1586,7 @@ _f37(jit_state_t *_jit, int32_t o, int32_t r2,
 
 static void
 _f38(jit_state_t *_jit, int32_t o,
-     int32_t s, int32_t u, jit_int32_t n)
+     int32_t s, int32_t u, int32_t n)
 {
     assert(!(o &     ~0x3f));
     assert(!(s & ~0x3fffff));
@@ -1716,7 +1716,7 @@ _rsbi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		t0, t1;
     t0 = jit_get_reg(jit_class_fpr);
@@ -1756,7 +1756,7 @@ __llmul(int u, int v)
 
 static void
 _qmulr(jit_state_t *_jit,
-       int32_t r0, int32_t r1, jit_int32_t r2, jit_int32_t r3)
+       int32_t r0, int32_t r1, int32_t r2, int32_t r3)
 {
     movr(_R26_REGNO, r2);
     movr(_R25_REGNO, r3);
@@ -1767,7 +1767,7 @@ _qmulr(jit_state_t *_jit,
 
 static void
 _qmuli(jit_state_t *_jit,
-       int32_t r0, int32_t r1, jit_int32_t r2, jit_word_t i0)
+       int32_t r0, int32_t r1, int32_t r2, jit_word_t i0)
 {
     movr(_R26_REGNO, r2);
     movi(_R25_REGNO, i0);
@@ -1778,7 +1778,7 @@ _qmuli(jit_state_t *_jit,
 
 static void
 _qmulr_u(jit_state_t *_jit,
-	 int32_t r0, int32_t r1, jit_int32_t r2, jit_int32_t r3)
+	 int32_t r0, int32_t r1, int32_t r2, int32_t r3)
 {
     int32_t		t0, t1;
     t0 = jit_get_reg(jit_class_fpr);
@@ -1797,7 +1797,7 @@ _qmulr_u(jit_state_t *_jit,
 
 static void
 _qmuli_u(jit_state_t *_jit,
-	 int32_t r0, int32_t r1, jit_int32_t r2, jit_word_t i0)
+	 int32_t r0, int32_t r1, int32_t r2, jit_word_t i0)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1813,7 +1813,7 @@ __idiv(int u, int v)
 }
 
 static void
-_divr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     movr(_R26_REGNO, r1);
     movr(_R25_REGNO, r2);
@@ -1837,7 +1837,7 @@ __udiv(unsigned int u, unsigned int v)
 }
 
 static void
-_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     movr(_R26_REGNO, r1);
     movr(_R25_REGNO, r2);
@@ -1861,7 +1861,7 @@ __irem(int u, int v)
 }
 
 static void
-_remr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     movr(_R26_REGNO, r1);
     movr(_R25_REGNO, r2);
@@ -1885,7 +1885,7 @@ __urem(unsigned int u, unsigned int v)
 }
 
 static void
-_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     movr(_R26_REGNO, r1);
     movr(_R25_REGNO, r2);
@@ -1913,7 +1913,7 @@ __idivrem(int u, int v)
 
 static void
 _qdivr(jit_state_t *_jit,
-       int32_t r0, int32_t r1, jit_int32_t r2, jit_int32_t r3)
+       int32_t r0, int32_t r1, int32_t r2, int32_t r3)
 {
     movr(_R26_REGNO, r2);
     movr(_R25_REGNO, r3);
@@ -1924,7 +1924,7 @@ _qdivr(jit_state_t *_jit,
 
 static void
 _qdivi(jit_state_t *_jit,
-       int32_t r0, int32_t r1, jit_int32_t r2, jit_word_t i0)
+       int32_t r0, int32_t r1, int32_t r2, jit_word_t i0)
 {
     movr(_R26_REGNO, r2);
     movi(_R25_REGNO, i0);
@@ -1944,7 +1944,7 @@ __udivrem(unsigned int u, unsigned int v)
 
 static void
 _qdivr_u(jit_state_t *_jit,
-	 int32_t r0, int32_t r1, jit_int32_t r2, jit_int32_t r3)
+	 int32_t r0, int32_t r1, int32_t r2, int32_t r3)
 {
     movr(_R26_REGNO, r2);
     movr(_R25_REGNO, r3);
@@ -1955,7 +1955,7 @@ _qdivr_u(jit_state_t *_jit,
 
 static void
 _qdivi_u(jit_state_t *_jit,
-	 int32_t r0, int32_t r1, jit_int32_t r2, jit_word_t i0)
+	 int32_t r0, int32_t r1, int32_t r2, jit_word_t i0)
 {
     movr(_R26_REGNO, r2);
     movi(_R25_REGNO, i0);
@@ -1995,7 +1995,7 @@ _xori(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_lshr(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_lshr(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     SUBI(0x1f, r2, _R1_REGNO);
     MTSAR(_R1_REGNO);
@@ -2003,7 +2003,7 @@ _lshr(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
 }
 
 static void
-_rshr(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_rshr(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     SUBI(0x1f, r2, _R1_REGNO);
     MTSAR(_R1_REGNO);
@@ -2011,7 +2011,7 @@ _rshr(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
 }
 
 static void
-_rshr_u(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_rshr_u(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     SUBI(0x1f, r2, _R1_REGNO);
     MTSAR(_R1_REGNO);
@@ -2020,7 +2020,7 @@ _rshr_u(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
 
 static void
 _cmpr(jit_state_t *_jit, jit_word_t c,
-      int32_t r0, int32_t r1, jit_int32_t r2)
+      int32_t r0, int32_t r1, int32_t r2)
 {
     CMPCLR_(c, r1, r2, r0);
     LDI(1, r0);
@@ -2057,7 +2057,7 @@ _ldi_c(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     ldxr_uc(r0, r1, r2);
     extr_c(r0, r0);
@@ -2115,7 +2115,7 @@ _ldi_s(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     ldxr_us(r0, r1, r2);
     extr_s(r0, r0);
@@ -2203,7 +2203,7 @@ _sti_c(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2243,7 +2243,7 @@ _sti_s(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2283,7 +2283,7 @@ _sti_i(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
diff --git a/jit/hppa-fpu.c b/jit/hppa-fpu.c
index a0ecd2e3b..98c39ce5c 100644
--- a/jit/hppa-fpu.c
+++ b/jit/hppa-fpu.c
@@ -28,44 +28,44 @@
 #endif
 
 #define f39(o,b,x,t)			_f39(_jit,o,b,x,t)
-static void _f39(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _f39(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #define f40(o,b,x,r)			_f40(_jit,o,b,x,r)
-static void _f40(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t)
+static void _f40(jit_state_t*,int32_t,int32_t,int32_t,int32_t)
     maybe_unused;
 #define f41(o,b,x,t)			_f41(_jit,o,b,x,t)
-static void _f41(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _f41(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #define f42(o,b,i,r)			_f42(_jit,o,b,i,r)
-static void _f42(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _f42(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #define f43(o,b,t,i)			f1(o,b,t,i)
 #define f45(o,r,a,b,fmt,c,d,e,t)	_f45(_jit,o,r,a,b,fmt,c,d,e,t)
 static void _f45(jit_state_t*,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+		 int32_t,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f46(o,r,a,s,df,sf,b,c,d,t)	_f46(_jit,o,r,a,s,df,sf,b,c,d,t)
 static void _f46(jit_state_t*,int32_t,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t);
 #define f47(o,r1,r2,a,fmt,b,c,d,t)	f47_48(o,r1,r2,a,fmt,b,c,d,t)
 #define f48(o,r1,r2,a,fmt,b,c,d,t)	f47_48(o,r1,r2,a,fmt,b,c,d,t)
 #define f47_48(o,r1,r2,y,fmt,b,c,d,t)	_f47_48(_jit,o,r1,r2,y,fmt,b,c,d,t)
 static void _f47_48(jit_state_t*,int32_t,
-		    int32_t,int32_t,jit_int32_t,jit_int32_t,
-		    int32_t,int32_t,jit_int32_t,jit_int32_t);
+		    int32_t,int32_t,int32_t,int32_t,
+		    int32_t,int32_t,int32_t,int32_t);
 #define f49(o,r,a,b,c,f,d,e,g,h,i,t)	f49_52(o,r,a,b,c,f,d,e,g,h,i,t)
 #define f51(o,r1,r2,y,a,f,b,d,e,g,h,c)	f49_52(o,r1,r2,y,a,f,b,d,e,g,h,c)
 #define f52(o,r1,r2,a,b,f,c,d,e,g,h,t)	f49_52(o,r1,r2,a,b,f,c,d,e,g,h,t)
 #define f49_52(o,r1,r2,y,v,f,a,b,u,c,d,t) _f49_52(_jit,o,r1,r2,y,v,f,a,b,u,c,d,t)
 static void _f49_52(jit_state_t*,int32_t,
-		    int32_t,int32_t,jit_int32_t,
-		    int32_t,int32_t,jit_int32_t,jit_int32_t,
-		    int32_t,int32_t,jit_int32_t,jit_int32_t);
+		    int32_t,int32_t,int32_t,
+		    int32_t,int32_t,int32_t,int32_t,
+		    int32_t,int32_t,int32_t,int32_t);
 #define f53(o,r1,r2,ta,ra,f,tm)		_f53(_jit,o,r1,r2,ta,ra,f,tm)
-static void _f53(jit_state_t*,int32_t,int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+static void _f53(jit_state_t*,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define f54(o,r1,r2,a,b,f,c,d,e,g,t)	_f54(_jit,o,r1,r2,a,b,f,c,d,e,g,t)
-static void _f54(jit_state_t*,int32_t,int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t) maybe_unused;
+static void _f54(jit_state_t*,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t,
+		 int32_t,int32_t,int32_t,int32_t) maybe_unused;
 #define FABS_(f,r,t)			f49(0xe,r,0,3,0,f,0,0,0,0,0,t)
 #define FABS_S(r,t)			FABS_(0,r,t)
 #define FABS_D(r,t)			FABS_(1,r,t)
@@ -322,13 +322,13 @@ static void _divi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 static void _divi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define cmpr_f(c,r0,r1,r2)		_cmpr_f(_jit,c,r0,r1,r2)
 static void _cmpr_f(jit_state_t*,jit_word_t,
-		    int32_t,int32_t,jit_int32_t);
+		    int32_t,int32_t,int32_t);
 #define cmpi_f(c,r0,r1,i0)		_cmpi_f(_jit,c,r0,r1,i0)
 static void _cmpi_f(jit_state_t*,jit_word_t,
 		    int32_t,int32_t,jit_float32_t*);
 #define cmpr_d(c,r0,r1,r2)		_cmpr_d(_jit,c,r0,r1,r2)
 static void _cmpr_d(jit_state_t*,jit_word_t,
-		    int32_t,int32_t,jit_int32_t);
+		    int32_t,int32_t,int32_t);
 #define cmpi_d(c,r0,r1,i0)		_cmpi_d(_jit,c,r0,r1,i0)
 static void _cmpi_d(jit_state_t*,jit_word_t,
 		    int32_t,int32_t,jit_float64_t*);
@@ -408,9 +408,9 @@ static void _sti_f(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_d(r0,r1,r2)		FSTD(r2,r1,r0)
 #else
 #  define stxr_f(r0,r1,r2)		_stxr_f(_jit,r0,r1,r2)
-static void _stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxr_d(r0,r1,r2)		_stxr_d(_jit,r0,r1,r2)
-static void _stxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #endif
 #define stxi_f(i0,r0,r1)		_stxi_f(_jit,i0,r0,r1)
 static void _stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
@@ -494,7 +494,7 @@ static void _vaarg_d(jit_state_t*, int32_t, int32_t);
 #if CODE
 static void
 _f39(jit_state_t *_jit, int32_t o,
-     int32_t b, int32_t x, jit_int32_t t)
+     int32_t b, int32_t x, int32_t t)
 {
     assert(!(o & ~0x3f));
     assert(!(b & ~0x1f));
@@ -505,7 +505,7 @@ _f39(jit_state_t *_jit, int32_t o,
 
 static void
 _f40(jit_state_t *_jit, int32_t o,
-     int32_t b, int32_t x, jit_int32_t r)
+     int32_t b, int32_t x, int32_t r)
 {
     assert(!(o & ~0x3f));
     assert(!(b & ~0x1f));
@@ -516,7 +516,7 @@ _f40(jit_state_t *_jit, int32_t o,
 
 static void
 _f41(jit_state_t *_jit, int32_t o,
-     int32_t b, int32_t x, jit_int32_t t)
+     int32_t b, int32_t x, int32_t t)
 {
     assert(!(o & ~0x3f));
     assert(!(b & ~0x1f));
@@ -527,7 +527,7 @@ _f41(jit_state_t *_jit, int32_t o,
 
 static void
 _f42(jit_state_t *_jit, int32_t o,
-     int32_t b, int32_t i, jit_int32_t r)
+     int32_t b, int32_t i, int32_t r)
 {
     assert(!(o & ~0x3f));
     assert(!(b & ~0x1f));
@@ -538,8 +538,8 @@ _f42(jit_state_t *_jit, int32_t o,
 
 static void
 _f45(jit_state_t *_jit, int32_t o,
-     int32_t r, int32_t a, jit_int32_t b, jit_int32_t fmt,
-     int32_t c, int32_t d, jit_int32_t e, jit_int32_t t)
+     int32_t r, int32_t a, int32_t b, int32_t fmt,
+     int32_t c, int32_t d, int32_t e, int32_t t)
 {
     assert(!(o   & ~0x3f));
     assert(!(r   & ~0x1f));
@@ -555,8 +555,8 @@ _f45(jit_state_t *_jit, int32_t o,
 
 static void
 _f46(jit_state_t *_jit, int32_t o, int32_t r,
-     int32_t a, int32_t s, jit_int32_t df, jit_int32_t sf,
-     int32_t b, int32_t c, jit_int32_t d, jit_int32_t t)
+     int32_t a, int32_t s, int32_t df, int32_t sf,
+     int32_t b, int32_t c, int32_t d, int32_t t)
 {
     assert(!(o  & ~0x3f));
     assert(!(r  & ~0x1f));
@@ -574,8 +574,8 @@ _f46(jit_state_t *_jit, int32_t o, int32_t r,
 
 static void
 _f47_48(jit_state_t *_jit, int32_t o,
-	int32_t r2, int32_t r1, jit_int32_t y, jit_int32_t fmt,
-	int32_t a, int32_t b, jit_int32_t c, jit_int32_t t)
+	int32_t r2, int32_t r1, int32_t y, int32_t fmt,
+	int32_t a, int32_t b, int32_t c, int32_t t)
 {
     assert(!(o   & ~0x3f));
     assert(!(r2  & ~0x1f));
@@ -591,9 +591,9 @@ _f47_48(jit_state_t *_jit, int32_t o,
 
 static void
 _f49_52(jit_state_t *_jit, int32_t o,
-	int32_t r1, int32_t r2, jit_int32_t y,
-	int32_t v, int32_t f, jit_int32_t a, jit_int32_t b,
-	int32_t u, int32_t c, jit_int32_t d, jit_int32_t t)
+	int32_t r1, int32_t r2, int32_t y,
+	int32_t v, int32_t f, int32_t a, int32_t b,
+	int32_t u, int32_t c, int32_t d, int32_t t)
 {
     assert(!(o  & ~0x3f));
     assert(!(r1 & ~0x1f));
@@ -612,8 +612,8 @@ _f49_52(jit_state_t *_jit, int32_t o,
 }
 
 static void
-_f53(jit_state_t *_jit, int32_t o, int32_t r1, jit_int32_t r2,
-     int32_t ta, int32_t ra, jit_int32_t f, jit_int32_t tm)
+_f53(jit_state_t *_jit, int32_t o, int32_t r1, int32_t r2,
+     int32_t ta, int32_t ra, int32_t f, int32_t tm)
 {
     assert(!(o  & ~0x3f));
     assert(!(r1 & ~0x1f));
@@ -629,9 +629,9 @@ _f53(jit_state_t *_jit, int32_t o, int32_t r1, jit_int32_t r2,
 }
 
 static void
-_f54(jit_state_t *_jit, int32_t o, int32_t r1, jit_int32_t r2,
-     int32_t a, int32_t b, jit_int32_t f, jit_int32_t c,
-     int32_t d, int32_t e, jit_int32_t g, jit_int32_t t)
+_f54(jit_state_t *_jit, int32_t o, int32_t r1, int32_t r2,
+     int32_t a, int32_t b, int32_t f, int32_t c,
+     int32_t d, int32_t e, int32_t g, int32_t t)
 {
     assert(!(o  & ~0x3f));
     assert(!(r1 & ~0x1f));
@@ -759,7 +759,7 @@ dopi(div)
 
 static void
 _cmpr_f(jit_state_t *_jit, jit_word_t c,
-	int32_t r0, int32_t r1, jit_int32_t r2)
+	int32_t r0, int32_t r1, int32_t r2)
 {
     LDI(0, r0);
     FCMP_S_(r1, r2, c);
@@ -779,7 +779,7 @@ _cmpi_f(jit_state_t *_jit, jit_word_t c,
 
 static void
 _cmpr_d(jit_state_t *_jit, jit_word_t c,
-	int32_t r0, int32_t r1, jit_int32_t r2)
+	int32_t r0, int32_t r1, int32_t r2)
 {
     LDI(0, r0);
     FCMP_D_(r1, r2, c);
@@ -878,7 +878,7 @@ _sti_f(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 
 #if !FSTXR
 static void
-_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -888,7 +888,7 @@ _stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
diff --git a/jit/ia64-cpu.c b/jit/ia64-cpu.c
index ba210cc54..3b397747a 100644
--- a/jit/ia64-cpu.c
+++ b/jit/ia64-cpu.c
@@ -1179,48 +1179,48 @@ static void _X5(jit_state_t*,jit_word_t,
 #define addi(r0,r1,i0)			_addi(_jit,r0,r1,i0)
 static void _addi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define addcr(r0, r1, r2)		_addcr(_jit, r0, r1, r2)
-static void _addcr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _addcr(jit_state_t*, int32_t, int32_t, int32_t);
 #define addci(r0, r1, i0)		_addci(_jit, r0, r1, i0)
 static void _addci(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define addxr(r0, r1, r2)		_addxr(_jit, r0, r1, r2)
-static void _addxr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _addxr(jit_state_t*, int32_t, int32_t, int32_t);
 #  define addxi(r0, r1, i0)		_addxi(_jit, r0, r1, i0)
 static void _addxi(jit_state_t*, int32_t, int32_t, jit_word_t);
 #define subr(r0,r1,r2)			SUB(r0,r1,r2)
 #define subi(r0,r1,i0)			_subi(_jit,r0,r1,i0)
 static void _subi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subcr(r0, r1, r2)		_subcr(_jit, r0, r1, r2)
-static void _subcr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subcr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subci(r0, r1, i0)		_subci(_jit, r0, r1, i0)
 static void _subci(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subxr(r0, r1, r2)		_subxr(_jit, r0, r1, r2)
-static void _subxr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subxr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subxi(r0, r1, i0)		_subxi(_jit, r0, r1, i0)
 static void _subxi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define rsbi(r0, r1, i0)		_rsbi(_jit, r0, r1, i0)
 static void _rsbi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define mulr(r0,r1,r2)			_mulr(_jit,r0,r1,r2)
-static void _mulr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _mulr(jit_state_t*,int32_t,int32_t,int32_t);
 #define muli(r0,r1,i0)			_muli(_jit,r0,r1,i0)
 static void _muli(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define divr(r0,r1,r2)			_divr(_jit,r0,r1,r2)
-static void _divr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr(jit_state_t*,int32_t,int32_t,int32_t);
 #define divi(r0,r1,i0)			_divi(_jit,r0,r1,i0)
 static void _divi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define divr_u(r0,r1,r2)		_divr_u(_jit,r0,r1,r2)
-static void _divr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #define divi_u(r0,r1,i0)		_divi_u(_jit,r0,r1,i0)
 static void _divi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define remr(r0,r1,r2)			_remr(_jit,r0,r1,r2)
-static void _remr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr(jit_state_t*,int32_t,int32_t,int32_t);
 #define remi(r0,r1,i0)			_remi(_jit,r0,r1,i0)
 static void _remi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define remr_u(r0,r1,r2)		_remr_u(_jit,r0,r1,r2)
-static void _remr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #define remi_u(r0,r1,i0)		_remi_u(_jit,r0,r1,i0)
 static void _remi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define mulh(r0,r1,r2,sign)		_mulh(_jit,r0,r1,r2,sign)
-static void _mulh(jit_state_t*,jit_bool_t,int32_t,int32_t,jit_int32_t);
+static void _mulh(jit_state_t*,jit_bool_t,int32_t,int32_t,int32_t);
 #define qmulr(r0,r1,r2,r3)		iqmulr(r0,r1,r2,r3,1)
 #define qmulr_u(r0,r1,r2,r3)		iqmulr(r0,r1,r2,r3,0)
 #define iqmulr(r0,r1,r2,r3,sign)	_iqmulr(_jit,r0,r1,r2,r3,sign)
@@ -1260,43 +1260,43 @@ static void _rshi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define rshi_u(r0,r1,i0)		_rshi_u(_jit,r0,r1,i0)
 static void _rshi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ltr(r0,r1,r2)			_ltr(_jit,r0,r1,r2)
-static void _ltr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltr(jit_state_t*,int32_t,int32_t,int32_t);
 #define lti(r0,r1,i0)			_lti(_jit,r0,r1,i0)
 static void _lti(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ltr_u(r0,r1,r2)			_ltr_u(_jit,r0,r1,r2)
-static void _ltr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #define lti_u(r0,r1,i0)			_lti_u(_jit,r0,r1,i0)
 static void _lti_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ler(r0,r1,r2)			_ler(_jit,r0,r1,r2)
-static void _ler(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ler(jit_state_t*,int32_t,int32_t,int32_t);
 #define lei(r0,r1,i0)			_lei(_jit,r0,r1,i0)
 static void _lei(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ler_u(r0,r1,r2)			_ler_u(_jit,r0,r1,r2)
-static void _ler_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ler_u(jit_state_t*,int32_t,int32_t,int32_t);
 #define lei_u(r0,r1,i0)			_lei_u(_jit,r0,r1,i0)
 static void _lei_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define eqr(r0,r1,r2)			_eqr(_jit,r0,r1,r2)
-static void _eqr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _eqr(jit_state_t*,int32_t,int32_t,int32_t);
 #define eqi(r0,r1,i0)			_eqi(_jit,r0,r1,i0)
 static void _eqi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ger(r0,r1,r2)			_ger(_jit,r0,r1,r2)
-static void _ger(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ger(jit_state_t*,int32_t,int32_t,int32_t);
 #define gei(r0,r1,i0)			_gei(_jit,r0,r1,i0)
 static void _gei(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ger_u(r0,r1,r2)			_ger_u(_jit,r0,r1,r2)
-static void _ger_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ger_u(jit_state_t*,int32_t,int32_t,int32_t);
 #define gei_u(r0,r1,i0)			_gei_u(_jit,r0,r1,i0)
 static void _gei_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define gtr(r0,r1,r2)			_gtr(_jit,r0,r1,r2)
-static void _gtr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _gtr(jit_state_t*,int32_t,int32_t,int32_t);
 #define gti(r0,r1,i0)			_gti(_jit,r0,r1,i0)
 static void _gti(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define gtr_u(r0,r1,r2)			_gtr_u(_jit,r0,r1,r2)
-static void _gtr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _gtr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #define gti_u(r0,r1,i0)			_gti_u(_jit,r0,r1,i0)
 static void _gti_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ner(r0,r1,r2)			_ner(_jit,r0,r1,r2)
-static void _ner(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ner(jit_state_t*,int32_t,int32_t,int32_t);
 #define nei(r0,r1,i0)			_nei(_jit,r0,r1,i0)
 static void _nei(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define negr(r0,r1)			subr(r0,0,r1)
@@ -1437,31 +1437,31 @@ static void _ldi_ui(jit_state_t*,int32_t,jit_word_t);
 #define ldi_l(r0,i0)			_ldi_l(_jit,r0,i0)
 static void _ldi_l(jit_state_t*,int32_t,jit_word_t);
 #define ldxr_c(r0,r1,r2)		_ldxr_c(_jit,r0,r1,r2)
-static void _ldxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #define ldxi_c(r0,r1,i0)		_ldxi_c(_jit,r0,r1,i0)
 static void _ldxi_c(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ldxr_uc(r0,r1,r2)		_ldxr_uc(_jit,r0,r1,r2)
-static void _ldxr_uc(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_uc(jit_state_t*,int32_t,int32_t,int32_t);
 #define ldxi_uc(r0,r1,i0)		_ldxi_uc(_jit,r0,r1,i0)
 static void _ldxi_uc(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ldxr_s(r0,r1,r2)		_ldxr_s(_jit,r0,r1,r2)
-static void _ldxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #define ldxi_s(r0,r1,i0)		_ldxi_s(_jit,r0,r1,i0)
 static void _ldxi_s(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ldxr_us(r0,r1,r2)		_ldxr_us(_jit,r0,r1,r2)
-static void _ldxr_us(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_us(jit_state_t*,int32_t,int32_t,int32_t);
 #define ldxi_us(r0,r1,i0)		_ldxi_us(_jit,r0,r1,i0)
 static void _ldxi_us(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ldxr_i(r0,r1,r2)		_ldxr_i(_jit,r0,r1,r2)
-static void _ldxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #define ldxi_i(r0,r1,i0)		_ldxi_i(_jit,r0,r1,i0)
 static void _ldxi_i(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ldxr_ui(r0,r1,r2)		_ldxr_ui(_jit,r0,r1,r2)
-static void _ldxr_ui(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_ui(jit_state_t*,int32_t,int32_t,int32_t);
 #define ldxi_ui(r0,r1,i0)		_ldxi_ui(_jit,r0,r1,i0)
 static void _ldxi_ui(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ldxr_l(r0,r1,r2)		_ldxr_l(_jit,r0,r1,r2)
-static void _ldxr_l(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_l(jit_state_t*,int32_t,int32_t,int32_t);
 #define ldxi_l(r0,r1,i0)		_ldxi_l(_jit,r0,r1,i0)
 static void _ldxi_l(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define str_c(r0,r1)			ST1(r0,r1)
@@ -1477,19 +1477,19 @@ static void _sti_i(jit_state_t*,jit_word_t,int32_t);
 #define sti_l(i0,r0)			_sti_l(_jit,i0,r0)
 static void _sti_l(jit_state_t*,jit_word_t,int32_t);
 #define stxr_c(r0,r1,r2)		_stxr_c(_jit,r0,r1,r2)
-static void _stxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #define stxi_c(i0,r0,r1)		_stxi_c(_jit,i0,r0,r1)
 static void _stxi_c(jit_state_t*,jit_word_t,int32_t,int32_t);
 #define stxr_s(r0,r1,r2)		_stxr_s(_jit,r0,r1,r2)
-static void _stxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #define stxi_s(i0,r0,r1)		_stxi_s(_jit,i0,r0,r1)
 static void _stxi_s(jit_state_t*,jit_word_t,int32_t,int32_t);
 #define stxr_i(r0,r1,r2)		_stxr_i(_jit,r0,r1,r2)
-static void _stxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #define stxi_i(i0,r0,r1)		_stxi_i(_jit,i0,r0,r1)
 static void _stxi_i(jit_state_t*,jit_word_t,int32_t,int32_t);
 #define stxr_l(r0,r1,r2)		_stxr_l(_jit,r0,r1,r2)
-static void _stxr_l(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_l(jit_state_t*,int32_t,int32_t,int32_t);
 #define stxi_l(i0,r0,r1)		_stxi_l(_jit,i0,r0,r1)
 static void _stxi_l(jit_state_t*,jit_word_t,int32_t,int32_t);
 #define jmpr(r0)			_jmpr(_jit,r0)
@@ -3500,7 +3500,7 @@ _addi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (jit_carry == _NOREG)
@@ -3538,7 +3538,7 @@ _addci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     assert(jit_carry != _NOREG);
@@ -3572,7 +3572,7 @@ _subi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (jit_carry == _NOREG)
@@ -3610,7 +3610,7 @@ _subci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     assert(jit_carry != _NOREG);
@@ -3650,7 +3650,7 @@ _rsbi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		f0, f1;
     f0 = jit_get_reg(jit_class_fpr);
@@ -3700,7 +3700,7 @@ __umoddi3(unsigned long u, unsigned long v)
 #endif
 
 static void
-_divr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     MOV(_jitc->rout, r1);
     MOV(_jitc->rout + 1, r2);
@@ -3734,7 +3734,7 @@ _divi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     MOV(_jitc->rout, r1);
     MOV(_jitc->rout + 1, r2);
@@ -3762,7 +3762,7 @@ _divi_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_remr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     MOV(_jitc->rout, r1);
     MOV(_jitc->rout + 1, r2);
@@ -3785,7 +3785,7 @@ _remi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     MOV(_jitc->rout, r1);
     MOV(_jitc->rout + 1, r2);
@@ -3813,7 +3813,7 @@ _remi_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 static void
 _mulh(jit_state_t *_jit,
-      int32_t r0, int32_t r1, jit_int32_t r2, jit_bool_t sign)
+      int32_t r0, int32_t r1, int32_t r2, jit_bool_t sign)
 {
     int32_t		f0, f1;
     f0 = jit_get_reg(jit_class_fpr);
@@ -4022,7 +4022,7 @@ _rshi_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ltr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMP_LT(PR_6, PR_7, r1, r2);
     MOVI_p(r0, 1, PR_6);
@@ -4046,7 +4046,7 @@ _lti(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ltr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMP_LTU(PR_6, PR_7, r1, r2);
     MOVI_p(r0, 1, PR_6);
@@ -4070,7 +4070,7 @@ _lti_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ler(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMP_LT(PR_6, PR_7, r2, r1);
     MOV_p(r0, GR_0, PR_6);
@@ -4088,7 +4088,7 @@ _lei(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ler_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMP_LTU(PR_6, PR_7, r2, r1);
     MOV_p(r0, GR_0, PR_6);
@@ -4106,7 +4106,7 @@ _lei_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_eqr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_eqr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMP_EQ(PR_6, PR_7, r1, r2);
     MOVI_p(r0, 1, PR_6);
@@ -4130,7 +4130,7 @@ _eqi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ger(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMP_LT(PR_6, PR_7, r1, r2);
     MOV_p(r0, GR_0, PR_6);
@@ -4154,7 +4154,7 @@ _gei(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ger_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMP_LTU(PR_6, PR_7, r1, r2);
     MOV_p(r0, GR_0, PR_6);
@@ -4178,7 +4178,7 @@ _gei_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_gtr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_gtr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMP_LT(PR_6, PR_7, r2, r1);
     MOVI_p(r0, 1, PR_6);
@@ -4196,7 +4196,7 @@ _gti(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_gtr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_gtr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMP_LTU(PR_6, PR_7, r2, r1);
     MOVI_p(r0, 1, PR_6);
@@ -4214,7 +4214,7 @@ _gti_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ner(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ner(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMP_EQ(PR_6, PR_7, r1, r2);
     MOV_p(r0, GR_0, PR_6);
@@ -4329,7 +4329,7 @@ _ldi_l(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -4353,7 +4353,7 @@ _ldxi_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -4377,7 +4377,7 @@ _ldxi_uc(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -4401,7 +4401,7 @@ _ldxi_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -4425,7 +4425,7 @@ _ldxi_us(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -4449,7 +4449,7 @@ _ldxi_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -4473,7 +4473,7 @@ _ldxi_ui(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -4537,7 +4537,7 @@ _sti_l(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -4561,7 +4561,7 @@ _stxi_c(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -4585,7 +4585,7 @@ _stxi_s(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -4609,7 +4609,7 @@ _stxi_i(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
diff --git a/jit/ia64-fpu.c b/jit/ia64-fpu.c
index 2e1db62f7..9c3146ffe 100644
--- a/jit/ia64-fpu.c
+++ b/jit/ia64-fpu.c
@@ -491,107 +491,107 @@ static void _muli_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define muli_d(r0,r1,i0)		_muli_d(_jit,r0,r1,i0)
 static void _muli_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define divr_f(r0,r1,r2)		_divr_f(_jit,r0,r1,r2)
-static void _divr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #define divi_f(r0,r1,i0)		_divi_f(_jit,r0,r1,i0)
 static void _divi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define divr_d(r0,r1,r2)		_divr_d(_jit,r0,r1,r2)
-static void _divr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define divi_d(r0,r1,i0)		_divi_d(_jit,r0,r1,i0)
 static void _divi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define ltr_f(r0,r1,r2)			ltr_d(r0,r1,r2)
 #define ltr_d(r0,r1,r2)			_ltr_d(_jit,r0,r1,r2)
-static void _ltr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define lti_f(r0,r1,i0)			_lti_f(_jit,r0,r1,i0)
 static void _lti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define lti_d(r0,r1,i0)			_lti_d(_jit,r0,r1,i0)
 static void _lti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define ler_f(r0,r1,r2)			ler_d(r0,r1,r2)
 #define ler_d(r0,r1,r2)			_ler_d(_jit,r0,r1,r2)
-static void _ler_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ler_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define lei_f(r0,r1,i0)			_lei_f(_jit,r0,r1,i0)
 static void _lei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define lei_d(r0,r1,i0)			_lei_d(_jit,r0,r1,i0)
 static void _lei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define eqr_f(r0,r1,r2)			eqr_d(r0,r1,r2)
 #define eqr_d(r0,r1,r2)			_eqr_d(_jit,r0,r1,r2)
-static void _eqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _eqr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define eqi_f(r0,r1,i0)			_eqi_f(_jit,r0,r1,i0)
 static void _eqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define eqi_d(r0,r1,i0)			_eqi_d(_jit,r0,r1,i0)
 static void _eqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define ger_f(r0,r1,r2)			ger_d(r0,r1,r2)
 #define ger_d(r0,r1,r2)			_ger_d(_jit,r0,r1,r2)
-static void _ger_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ger_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define gei_f(r0,r1,i0)			_gei_f(_jit,r0,r1,i0)
 static void _gei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define gei_d(r0,r1,i0)			_gei_d(_jit,r0,r1,i0)
 static void _gei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define gtr_f(r0,r1,r2)			gtr_d(r0,r1,r2)
 #define gtr_d(r0,r1,r2)			_gtr_d(_jit,r0,r1,r2)
-static void _gtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _gtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define gti_f(r0,r1,i0)			_gti_f(_jit,r0,r1,i0)
 static void _gti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define gti_d(r0,r1,i0)			_gti_d(_jit,r0,r1,i0)
 static void _gti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define ner_f(r0,r1,r2)			ner_d(r0,r1,r2)
 #define ner_d(r0,r1,r2)			_ner_d(_jit,r0,r1,r2)
-static void _ner_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ner_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define nei_f(r0,r1,i0)			_nei_f(_jit,r0,r1,i0)
 static void _nei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define nei_d(r0,r1,i0)			_nei_d(_jit,r0,r1,i0)
 static void _nei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define unltr_f(r0,r1,r2)		unltr_d(r0,r1,r2)
 #define unltr_d(r0,r1,r2)		_unltr_d(_jit,r0,r1,r2)
-static void _unltr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unltr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define unlti_f(r0,r1,i0)		_unlti_f(_jit,r0,r1,i0)
 static void _unlti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define unlti_d(r0,r1,i0)		_unlti_d(_jit,r0,r1,i0)
 static void _unlti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define unler_f(r0,r1,r2)		unler_d(r0,r1,r2)
 #define unler_d(r0,r1,r2)		_unler_d(_jit,r0,r1,r2)
-static void _unler_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unler_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define unlei_f(r0,r1,i0)		_unlei_f(_jit,r0,r1,i0)
 static void _unlei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define unlei_d(r0,r1,i0)		_unlei_d(_jit,r0,r1,i0)
 static void _unlei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define uneqr_f(r0,r1,r2)		uneqr_d(r0,r1,r2)
 #define uneqr_d(r0,r1,r2)		_uneqr_d(_jit,r0,r1,r2)
-static void _uneqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _uneqr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define uneqi_f(r0,r1,i0)		_uneqi_f(_jit,r0,r1,i0)
 static void _uneqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define uneqi_d(r0,r1,i0)		_uneqi_d(_jit,r0,r1,i0)
 static void _uneqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define unger_f(r0,r1,r2)		unger_d(r0,r1,r2)
 #define unger_d(r0,r1,r2)		_unger_d(_jit,r0,r1,r2)
-static void _unger_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unger_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define ungei_f(r0,r1,i0)		_ungei_f(_jit,r0,r1,i0)
 static void _ungei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define ungei_d(r0,r1,i0)		_ungei_d(_jit,r0,r1,i0)
 static void _ungei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define ungtr_f(r0,r1,r2)		ungtr_d(r0,r1,r2)
 #define ungtr_d(r0,r1,r2)		_ungtr_d(_jit,r0,r1,r2)
-static void _ungtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ungtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define ungti_f(r0,r1,i0)		_ungti_f(_jit,r0,r1,i0)
 static void _ungti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define ungti_d(r0,r1,i0)		_ungti_d(_jit,r0,r1,i0)
 static void _ungti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define ltgtr_f(r0,r1,r2)		ltgtr_d(r0,r1,r2)
 #define ltgtr_d(r0,r1,r2)		_ltgtr_d(_jit,r0,r1,r2)
-static void _ltgtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltgtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define ltgti_f(r0,r1,i0)		_ltgti_f(_jit,r0,r1,i0)
 static void _ltgti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define ltgti_d(r0,r1,i0)		_ltgti_d(_jit,r0,r1,i0)
 static void _ltgti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define ordr_f(r0,r1,r2)		ordr_d(r0,r1,r2)
 #define ordr_d(r0,r1,r2)		_ordr_d(_jit,r0,r1,r2)
-static void _ordr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ordr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define ordi_f(r0,r1,i0)		_ordi_f(_jit,r0,r1,i0)
 static void _ordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define ordi_d(r0,r1,i0)		_ordi_d(_jit,r0,r1,i0)
 static void _ordi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define unordr_f(r0,r1,r2)		unordr_d(r0,r1,r2)
 #define unordr_d(r0,r1,r2)		_unordr_d(_jit,r0,r1,r2)
-static void _unordr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unordr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define unordi_f(r0,r1,i0)		_unordi_f(_jit,r0,r1,i0)
 static void _unordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #define unordi_d(r0,r1,i0)		_unordi_d(_jit,r0,r1,i0)
@@ -600,28 +600,28 @@ static void _unordi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #define ldi_f(r0,i0)			_ldi_f(_jit,r0,i0)
 static void _ldi_f(jit_state_t*,int32_t,jit_word_t);
 #define ldxr_f(r0,r1,r2)		_ldxr_f(_jit,r0,r1,r2)
-static void _ldxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #define ldxi_f(r0,r1,i0)		_ldxi_f(_jit,r0,r1,i0)
 static void _ldxi_f(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ldr_d(r0,r1)			LDFD(r0,r1)
 #define ldi_d(r0,i0)			_ldi_d(_jit,r0,i0)
 static void _ldi_d(jit_state_t*,int32_t,jit_word_t);
 #define ldxr_d(r0,r1,r2)		_ldxr_d(_jit,r0,r1,r2)
-static void _ldxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define ldxi_d(r0,r1,i0)		_ldxi_d(_jit,r0,r1,i0)
 static void _ldxi_d(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define str_f(r0,r1)			STFS(r0,r1)
 #define sti_f(i0,r0)			_sti_f(_jit,i0,r0)
 static void _sti_f(jit_state_t*,jit_word_t,int32_t);
 #define stxr_f(r0,r1,r2)		_stxr_f(_jit,r0,r1,r2)
-static void _stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #define stxi_f(i0,r0,r1)		_stxi_f(_jit,i0,r0,r1)
 static void _stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
 #define str_d(r0,r1)			STFD(r0,r1)
 #define sti_d(i0,r0)			_sti_d(_jit,i0,r0)
 static void _sti_d(jit_state_t*,jit_word_t,int32_t);
 #define stxr_d(r0,r1,r2)		_stxr_d(_jit,r0,r1,r2)
-static void _stxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #define stxi_d(i0,r0,r1)		_stxi_d(_jit,i0,r0,r1)
 static void _stxi_d(jit_state_t*,jit_word_t,int32_t,int32_t);
 #define bltr_f(i0,r0,r1)		bltr_d(i0,r0,r1)
@@ -1167,7 +1167,7 @@ dopi(div)
 
 /* translation from gcc -O0 */
 static void
-_divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		t0, t1, t2;
     t0 = jit_get_reg(jit_class_fpr);
@@ -1189,7 +1189,7 @@ _divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_divr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		t0, t1, t2;
     t0 = jit_get_reg(jit_class_fpr);
@@ -1244,7 +1244,7 @@ _truncr_d_l(jit_state_t *_jit, int32_t r0, int32_t r1)
 }
 
 static void
-_ltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_LT(PR_6, PR_7, r1, r2);
     MOVI_p(r0, 1, PR_6);
@@ -1254,7 +1254,7 @@ fopi(lt)
 dopi(lt)
 
 static void
-_ler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_LE(PR_6, PR_7, r1, r2);
     MOVI_p(r0, 1, PR_6);
@@ -1264,7 +1264,7 @@ fopi(le)
 dopi(le)
 
 static void
-_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_EQ(PR_6, PR_7, r1, r2);
     MOVI_p(r0, 1, PR_6);
@@ -1274,7 +1274,7 @@ fopi(eq)
 dopi(eq)
 
 static void
-_ger_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_LE(PR_6, PR_7, r2, r1);
     MOVI_p(r0, 1, PR_6);
@@ -1284,7 +1284,7 @@ fopi(ge)
 dopi(ge)
 
 static void
-_gtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_gtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_LT(PR_6, PR_7, r2, r1);
     MOVI_p(r0, 1, PR_6);
@@ -1294,7 +1294,7 @@ fopi(gt)
 dopi(gt)
 
 static void
-_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_EQ(PR_6, PR_7, r1, r2);
     MOV_p(r0, GR_0, PR_6);
@@ -1304,7 +1304,7 @@ fopi(ne)
 dopi(ne)
 
 static void
-_unltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_LE(PR_6, PR_7, r2, r1);
     MOV_p(r0, GR_0, PR_6);
@@ -1314,7 +1314,7 @@ fopi(unlt)
 dopi(unlt)
 
 static void
-_unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_LT(PR_6, PR_7, r2, r1);
     MOV_p(r0, GR_0, PR_6);
@@ -1324,7 +1324,7 @@ fopi(unle)
 dopi(unle)
 
 static void
-_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     MOVI(r0, 1);
     FCMP_LT(PR_8, PR_9, r1, r2);
@@ -1336,7 +1336,7 @@ fopi(uneq)
 dopi(uneq)
 
 static void
-_unger_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unger_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_LT(PR_6, PR_7, r1, r2);
     MOV_p(r0, GR_0, PR_6);
@@ -1346,7 +1346,7 @@ fopi(unge)
 dopi(unge)
 
 static void
-_ungtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ungtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_LE(PR_6, PR_7, r1, r2);
     MOV_p(r0, GR_0, PR_6);
@@ -1356,7 +1356,7 @@ fopi(ungt)
 dopi(ungt)
 
 static void
-_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     MOVI(r0, 1);
     FCMP_EQ(PR_8, PR_9, r1, r2);
@@ -1368,7 +1368,7 @@ fopi(ltgt)
 dopi(ltgt)
 
 static void
-_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_UNORD(PR_6, PR_7, r1, r2);
     MOV_p(r0, GR_0, PR_6);
@@ -1378,7 +1378,7 @@ fopi(ord)
 dopi(ord)
 
 static void
-_unordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMP_UNORD(PR_6, PR_7, r1, r2);
     MOVI_p(r0, 1, PR_6);
@@ -1398,7 +1398,7 @@ _ldi_f(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1432,7 +1432,7 @@ _ldi_d(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1466,7 +1466,7 @@ _sti_f(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1500,7 +1500,7 @@ _sti_d(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
diff --git a/jit/mips-cpu.c b/jit/mips-cpu.c
index 33b9e88f6..c8c6ce3ab 100644
--- a/jit/mips-cpu.c
+++ b/jit/mips-cpu.c
@@ -296,13 +296,13 @@ typedef union {
 #  define MIPS_SDBPP			0x3f
 #  define ii(i)				*_jit->pc.ui++ = i
 static void
-_hrrrit(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t,
+_hrrrit(jit_state_t*,int32_t,int32_t,int32_t,int32_t,
 	int32_t,int32_t);
 #  define hrrrit(hc,rs,rt,rd,im,tc)	_hrrrit(_jit,hc,rs,rt,rd,im,tc)
 #  define hrrr_t(hc,rs,rt,rd,tc)	hrrrit(hc,rs,rt,rd,0,tc)
 #  define rrr_t(rs,rt,rd,tc)		hrrr_t(0,rs,rt,rd,tc)
 #  define hrri(hc,rs,rt,im)		_hrri(_jit,hc,rs,rt,im)
-static void _hrri(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _hrri(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define hi(hc,im)			_hi(_jit,hc,im)
 static void _hi(jit_state_t*,int32_t,int32_t);
 #  define NOP(i0)			ii(0)
@@ -404,27 +404,27 @@ static void _nop(jit_state_t*,int32_t);
 #  define addi(r0,r1,i0)		_addi(_jit,r0,r1,i0)
 static void _addi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define addcr(r0,r1,r2)			_addcr(_jit,r0,r1,r2)
-static void _addcr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addcr(jit_state_t*,int32_t,int32_t,int32_t);
 #define addci(r0,r1,i0)			_addci(_jit,r0,r1,i0)
 static void _addci(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define addxr(r0,r1,r2)		_addxr(_jit,r0,r1,r2)
-static void _addxr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addxr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addxi(r0,r1,i0)		_addxi(_jit,r0,r1,i0)
 static void _addxi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subi(r0,r1,i0)		_subi(_jit,r0,r1,i0)
 static void _subi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subcr(r0,r1,r2)		_subcr(_jit,r0,r1,r2)
-static void _subcr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subcr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subci(r0,r1,i0)		_subci(_jit,r0,r1,i0)
 static void _subci(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subxr(r0,r1,r2)		_subxr(_jit,r0,r1,r2)
-static void _subxr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subxr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subxi(r0,r1,i0)		_subxi(_jit,r0,r1,i0)
 static void _subxi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define rsbi(r0, r1, i0)		_rsbi(_jit, r0, r1, i0)
 static void _rsbi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define mulr(r0,r1,r2)		_mulr(_jit,r0,r1,r2)
-static void _mulr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _mulr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define muli(r0,r1,i0)		_muli(_jit,r0,r1,i0)
 static void _muli(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define qmulr(r0,r1,r2,r3)		iqmulr(r0,r1,r2,r3,1)
@@ -438,11 +438,11 @@ static void _iqmulr(jit_state_t*,int32_t,int32_t,
 static void _iqmuli(jit_state_t*,int32_t,int32_t,
 		    int32_t,jit_word_t,jit_bool_t);
 #  define divr(r0,r1,r2)		_divr(_jit,r0,r1,r2)
-static void _divr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi(r0,r1,i0)		_divi(_jit,r0,r1,i0)
 static void _divi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define divr_u(r0,r1,r2)		_divr_u(_jit,r0,r1,r2)
-static void _divr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi_u(r0,r1,i0)		_divi_u(_jit,r0,r1,i0)
 static void _divi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define qdivr(r0,r1,r2,r3)		iqdivr(r0,r1,r2,r3,1)
@@ -456,11 +456,11 @@ static void _iqdivr(jit_state_t*,int32_t,int32_t,
 static void _iqdivi(jit_state_t*,int32_t,int32_t,
 		    int32_t,jit_word_t,jit_bool_t);
 #  define remr(r0,r1,r2)		_remr(_jit,r0,r1,r2)
-static void _remr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi(r0,r1,i0)		_remi(_jit,r0,r1,i0)
 static void _remi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define remr_u(r0,r1,r2)		_remr_u(_jit,r0,r1,r2)
-static void _remr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi_u(r0,r1,i0)		_remi_u(_jit,r0,r1,i0)
 static void _remi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  if __WORDSIZE == 32
@@ -519,32 +519,32 @@ static void _ldi_ui(jit_state_t*,int32_t,jit_word_t);
 static void _ldi_l(jit_state_t*,int32_t,jit_word_t);
 #  endif
 #  define ldxr_c(r0,r1,r2)		_ldxr_c(_jit,r0,r1,r2)
-static void _ldxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_c(r0,r1,i0)		_ldxi_c(_jit,r0,r1,i0)
 static void _ldxi_c(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_uc(r0,r1,r2)		_ldxr_uc(_jit,r0,r1,r2)
-static void _ldxr_uc(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_uc(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_uc(r0,r1,i0)		_ldxi_uc(_jit,r0,r1,i0)
 static void _ldxi_uc(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_s(r0,r1,r2)		_ldxr_s(_jit,r0,r1,r2)
-static void _ldxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_s(r0,r1,i0)		_ldxi_s(_jit,r0,r1,i0)
 static void _ldxi_s(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_us(r0,r1,r2)		_ldxr_us(_jit,r0,r1,r2)
-static void _ldxr_us(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_us(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_us(r0,r1,i0)		_ldxi_us(_jit,r0,r1,i0)
 static void _ldxi_us(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxr_i(r0,r1,r2)		_ldxr_i(_jit,r0,r1,r2)
-static void _ldxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_i(r0,r1,i0)		_ldxi_i(_jit,r0,r1,i0)
 static void _ldxi_i(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  if __WORDSIZE == 64
 #    define ldxr_ui(r0,r1,r2)		_ldxr_ui(_jit,r0,r1,r2)
-static void _ldxr_ui(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_ui(jit_state_t*,int32_t,int32_t,int32_t);
 #    define ldxi_ui(r0,r1,i0)		_ldxi_ui(_jit,r0,r1,i0)
 static void _ldxi_ui(jit_state_t*,int32_t,int32_t,jit_word_t);
 #    define ldxr_l(r0,r1,r2)		_ldxr_l(_jit,r0,r1,r2)
-static void _ldxr_l(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_l(jit_state_t*,int32_t,int32_t,int32_t);
 #    define ldxi_l(r0,r1,i0)		_ldxi_l(_jit,r0,r1,i0)
 static void _ldxi_l(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  endif
@@ -563,20 +563,20 @@ static void _sti_i(jit_state_t*,jit_word_t,int32_t);
 static void _sti_l(jit_state_t*,jit_word_t,int32_t);
 #  endif
 #  define stxr_c(r0,r1,r2)		_stxr_c(_jit,r0,r1,r2)
-static void _stxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_c(i0,r0,r1)		_stxi_c(_jit,i0,r0,r1)
 static void _stxi_c(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define stxr_s(r0,r1,r2)		_stxr_s(_jit,r0,r1,r2)
-static void _stxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_s(i0,r0,r1)		_stxi_s(_jit,i0,r0,r1)
 static void _stxi_s(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define stxr_i(r0,r1,r2)		_stxr_i(_jit,r0,r1,r2)
-static void _stxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_i(i0,r0,r1)		_stxi_i(_jit,i0,r0,r1)
 static void _stxi_i(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  if __WORDSIZE == 64
 #    define stxr_l(r0,r1,r2)		_stxr_l(_jit,r0,r1,r2)
-static void _stxr_l(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_l(jit_state_t*,int32_t,int32_t,int32_t);
 #    define stxi_l(i0,r0,r1)		_stxi_l(_jit,i0,r0,r1)
 static void _stxi_l(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  endif
@@ -616,23 +616,23 @@ static void _lti(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define lti_u(r0,r1,i0)		_lti_u(_jit,r0,r1,i0)
 static void _lti_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ler(r0,r1,r2)			_ler(_jit,r0,r1,r2)
-static void _ler(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ler(jit_state_t*,int32_t,int32_t,int32_t);
 #define lei(r0,r1,i0)			_lei(_jit,r0,r1,i0)
 static void _lei(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ler_u(r0,r1,r2)			_ler_u(_jit,r0,r1,r2)
-static void _ler_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ler_u(jit_state_t*,int32_t,int32_t,int32_t);
 #define lei_u(r0,r1,i0)			_lei_u(_jit,r0,r1,i0)
 static void _lei_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define eqr(r0,r1,r2)			_eqr(_jit,r0,r1,r2)
-static void _eqr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _eqr(jit_state_t*,int32_t,int32_t,int32_t);
 #define eqi(r0,r1,i0)			_eqi(_jit,r0,r1,i0)
 static void _eqi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ger(r0,r1,r2)			_ger(_jit,r0,r1,r2)
-static void _ger(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ger(jit_state_t*,int32_t,int32_t,int32_t);
 #define gei(r0,r1,i0)			_gei(_jit,r0,r1,i0)
 static void _gei(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ger_u(r0,r1,i0)			_ger_u(_jit,r0,r1,i0)
-static void _ger_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ger_u(jit_state_t*,int32_t,int32_t,int32_t);
 #define gei_u(r0,r1,i0)			_gei_u(_jit,r0,r1,i0)
 static void _gei_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define gtr(r0,r1,r2)			SLT(r0,r2,r1)
@@ -642,7 +642,7 @@ static void _gti(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define gti_u(r0,r1,i0)		_gti_u(_jit,r0,r1,i0)
 static void _gti_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define ner(r0,r1,r2)			_ner(_jit,r0,r1,r2)
-static void _ner(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ner(jit_state_t*,int32_t,int32_t,int32_t);
 #define nei(r0,r1,i0)			_nei(_jit,r0,r1,i0)
 static void _nei(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define bltr(i0,r0,r1)			_bltr(_jit,i0,r0,r1)
@@ -752,7 +752,7 @@ static void _patch_at(jit_state_t*,jit_word_t,jit_word_t);
 #if CODE
 static void
 _hrrrit(jit_state_t *_jit,int32_t hc,
-	int32_t rs, int32_t rt, jit_int32_t rd,
+	int32_t rs, int32_t rt, int32_t rd,
 	int32_t ic, int32_t tc)
 {
     jit_instr_t		i;
@@ -767,7 +767,7 @@ _hrrrit(jit_state_t *_jit,int32_t hc,
 
 static void
 _hrri(jit_state_t *_jit, int32_t hc,
-      int32_t rs, int32_t rt, jit_int32_t im)
+      int32_t rs, int32_t rt, int32_t im)
 {
     jit_instr_t		i;
     i.op = 0;
@@ -812,7 +812,7 @@ _addi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		t0;
 
@@ -862,7 +862,7 @@ _addci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		t0;
 
@@ -904,7 +904,7 @@ _subi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		t0;
 
@@ -954,7 +954,7 @@ _subci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		t0;
 
@@ -987,7 +987,7 @@ _rsbi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     multu(r1, r2);
     MFLO(r0);
@@ -1028,7 +1028,7 @@ _iqmuli(jit_state_t *_jit, int32_t r0, int32_t r1,
 }
 
 static void
-_divr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     div(r1, r2);
     MFLO(r0);
@@ -1045,7 +1045,7 @@ _divi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     divu(r1, r2);
     MFLO(r0);
@@ -1085,7 +1085,7 @@ _iqdivi(jit_state_t *_jit, int32_t r0, int32_t r1,
 }
 
 static void
-_remr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     div(r1, r2);
     MFHI(r0);
@@ -1102,7 +1102,7 @@ _remi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     divu(r1, r2);
     MFHI(r0);
@@ -1349,7 +1349,7 @@ _ldi_l(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 #endif
 
 static void
-_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1373,7 +1373,7 @@ _ldxi_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1397,7 +1397,7 @@ _ldxi_uc(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1421,7 +1421,7 @@ _ldxi_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1445,7 +1445,7 @@ _ldxi_us(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1470,7 +1470,7 @@ _ldxi_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 #if __WORDSIZE == 64
 static void
-_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1494,7 +1494,7 @@ _ldxi_ui(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1577,7 +1577,7 @@ _sti_l(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 #endif
 
 static void
-_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1601,7 +1601,7 @@ _stxi_c(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1625,7 +1625,7 @@ _stxi_s(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1650,7 +1650,7 @@ _stxi_i(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 
 #if __WORDSIZE == 64
 static void
-_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1 ,jit_int32_t r2)
+_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1 ,int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1791,7 +1791,7 @@ _lti_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ler(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     SLT(r0, r2, r1);
     XORI(r0, r0, 1);
@@ -1815,7 +1815,7 @@ _lei(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ler_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     SLTU(r0, r2, r1);
     XORI(r0, r0, 1);
@@ -1839,7 +1839,7 @@ _lei_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_eqr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_eqr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     subr(r0, r1, r2);
     SLTU(r0, _ZERO_REGNO, r0);
@@ -1859,7 +1859,7 @@ _eqi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ger(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     SLT(r0, r1, r2);
     XORI(r0, r0, 1);
@@ -1877,7 +1877,7 @@ _gei(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ger_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     SLTU(r0, r1, r2);
     XORI(r0, r0, 1);
@@ -1925,7 +1925,7 @@ _gti_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ner(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ner(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     subr(r0, r1, r2);
     SLTU(r0, _ZERO_REGNO, r0);
diff --git a/jit/mips-fpu.c b/jit/mips-fpu.c
index 2b55f043b..cc9be6c66 100644
--- a/jit/mips-fpu.c
+++ b/jit/mips-fpu.c
@@ -182,7 +182,7 @@
 #  define c_cond_fmt(fm,ft,fs,cc)	_c_cond_fmt(_jit,fm,ft,fs,cc)
 static void
 _c_cond_fmt(jit_state_t *_jit, int32_t fm,
-	    int32_t ft, int32_t fs, jit_int32_t cc);
+	    int32_t ft, int32_t fs, int32_t cc);
 #  define addr_f(r0,r1,r2)		ADD_S(r0,r1,r2)
 #  define addi_f(r0,r1,i0)		_addi_f(_jit,r0,r1,i0)
 static void _addi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
@@ -236,14 +236,14 @@ static void _truncr_f_l(jit_state_t*,int32_t,int32_t);
 #  define ldi_f(r0, i0)			_ldi_f(_jit, r0, i0)
 static void _ldi_f(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_f(r0, r1, r2)		_ldxr_f(_jit, r0, r1, r2)
-static void _ldxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_f(r0, r1, i0)		_ldxi_f(_jit, r0, r1, i0)
 static void _ldxi_f(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define str_f(r0, r1)			SWC1(r1, 0, r0)
 #  define sti_f(i0, r0)			_sti_f(_jit, i0, r0)
 static void _sti_f(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_f(r0, r1, r2)		_stxr_f(_jit, r0, r1, r2)
-static void _stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_f(i0, r0, r1)		_stxi_f(_jit, i0, r0, r1)
 static void _stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define movr_f(r0, r1)		_movr_f(_jit, r0, r1)
@@ -263,9 +263,9 @@ static void _movi64(jit_state_t*,int32_t,int64_t);
 static void _movi_d_w(jit_state_t*,int32_t,jit_float64_t*);
 #  else
 #    define movr_ww_d(r0, r1, r2)	_movr_ww_d(_jit, r0, r1, r2)
-static void _movr_ww_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _movr_ww_d(jit_state_t*,int32_t,int32_t,int32_t);
 #    define movr_d_ww(r0, r1, r2)	_movr_d_ww(_jit, r0, r1, r2)
-static void _movr_d_ww(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _movr_d_ww(jit_state_t*,int32_t,int32_t,int32_t);
 #    define movi_d_ww(r0, r1, i0)	_movi_d_ww(_jit, r0, r1, i0)
 static void _movi_d_ww(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  endif
@@ -282,7 +282,7 @@ static void _ldr_d(jit_state_t*,int32_t,int32_t);
 #  define ldi_d(r0, i0)			_ldi_d(_jit, r0, i0)
 static void _ldi_d(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_d(r0, r1, r2)		_ldxr_d(_jit, r0, r1, r2)
-static void _ldxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_d(r0, r1, i0)		_ldxi_d(_jit, r0, r1, i0)
 static void _ldxi_d(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define str_d(r0, r1)			_str_d(_jit, r0, r1)
@@ -290,7 +290,7 @@ static void _str_d(jit_state_t*,int32_t,int32_t);
 #  define sti_d(i0, r0)			_sti_d(_jit, i0, r0)
 static void _sti_d(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_d(r0, r1, r2)		_stxr_d(_jit, r0, r1, r2)
-static void _stxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_d(i0, r0, r1)		_stxi_d(_jit, i0, r0, r1)
 static void _stxi_d(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define movr_d(r0, r1)		_movr_d(_jit, r0, r1)
@@ -298,59 +298,59 @@ static void _movr_d(jit_state_t*,int32_t,int32_t);
 #  define movi_d(r0, i0)		_movi_d(_jit, r0, i0)
 static void _movi_d(jit_state_t*,int32_t,jit_float64_t*);
 #  define ltr_f(r0, r1, r2)		_ltr_f(_jit, r0, r1, r2)
-static void _ltr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lti_f(r0, r1, i2)		_lti_f(_jit, r0, r1, i2)
 static void _lti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ler_f(r0, r1, r2)		_ler_f(_jit, r0, r1, r2)
-static void _ler_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ler_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lei_f(r0, r1, i2)		_lei_f(_jit, r0, r1, i2)
 static void _lei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define eqr_f(r0, r1, r2)		_eqr_f(_jit, r0, r1, r2)
-static void _eqr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _eqr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define eqi_f(r0, r1, i2)		_eqi_f(_jit, r0, r1, i2)
 static void _eqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ger_f(r0, r1, r2)		_ger_f(_jit, r0, r1, r2)
-static void _ger_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ger_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gei_f(r0, r1, i2)		_gei_f(_jit, r0, r1, i2)
 static void _gei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define gtr_f(r0, r1, r2)		_gtr_f(_jit, r0, r1, r2)
-static void _gtr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _gtr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gti_f(r0, r1, i2)		_gti_f(_jit, r0, r1, i2)
 static void _gti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ner_f(r0, r1, r2)		_ner_f(_jit, r0, r1, r2)
-static void _ner_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ner_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define nei_f(r0, r1, i2)		_nei_f(_jit, r0, r1, i2)
 static void _nei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define unltr_f(r0, r1, r2)		_unltr_f(_jit, r0, r1, r2)
-static void _unltr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unltr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unlti_f(r0, r1, i2)		_unlti_f(_jit, r0, r1, i2)
 static void _unlti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define unler_f(r0, r1, r2)		_unler_f(_jit, r0, r1, r2)
-static void _unler_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unler_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unlei_f(r0, r1, i2)		_unlei_f(_jit, r0, r1, i2)
 static void _unlei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define uneqr_f(r0, r1, r2)		_uneqr_f(_jit, r0, r1, r2)
-static void _uneqr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _uneqr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define uneqi_f(r0, r1, i2)		_uneqi_f(_jit, r0, r1, i2)
 static void _uneqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define unger_f(r0, r1, r2)		_unger_f(_jit, r0, r1, r2)
-static void _unger_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unger_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ungei_f(r0, r1, i2)		_ungei_f(_jit, r0, r1, i2)
 static void _ungei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ungtr_f(r0, r1, r2)		_ungtr_f(_jit, r0, r1, r2)
-static void _ungtr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ungtr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ungti_f(r0, r1, i2)		_ungti_f(_jit, r0, r1, i2)
 static void _ungti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ltgtr_f(r0, r1, r2)		_ltgtr_f(_jit, r0, r1, r2)
-static void _ltgtr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltgtr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ltgti_f(r0, r1, i2)		_ltgti_f(_jit, r0, r1, i2)
 static void _ltgti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ordr_f(r0, r1, r2)		_ordr_f(_jit, r0, r1, r2)
-static void _ordr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ordr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ordi_f(r0, r1, i2)		_ordi_f(_jit, r0, r1, i2)
 static void _ordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define unordr_f(r0, r1, r2)		_unordr_f(_jit, r0, r1, r2)
-static void _unordr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unordr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unordi_f(r0, r1, i2)		_unordi_f(_jit, r0, r1, i2)
 static void _unordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define bltr_f(i0, r0, r1)		_bltr_f(_jit, i0, r0, r1)
@@ -425,59 +425,59 @@ static jit_word_t
 _bunordi_f(jit_state_t*, jit_word_t, int32_t, jit_float32_t*);
 #  define extr_f_d(r0, r1)		CVT_D_S(r0, r1)
 #  define ltr_d(r0, r1, r2)		_ltr_d(_jit, r0, r1, r2)
-static void _ltr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lti_d(r0, r1, i2)		_lti_d(_jit, r0, r1, i2)
 static void _lti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ler_d(r0, r1, r2)		_ler_d(_jit, r0, r1, r2)
-static void _ler_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ler_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lei_d(r0, r1, i2)		_lei_d(_jit, r0, r1, i2)
 static void _lei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define eqr_d(r0, r1, r2)		_eqr_d(_jit, r0, r1, r2)
-static void _eqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _eqr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define eqi_d(r0, r1, i2)		_eqi_d(_jit, r0, r1, i2)
 static void _eqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ger_d(r0, r1, r2)		_ger_d(_jit, r0, r1, r2)
-static void _ger_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ger_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gei_d(r0, r1, i2)		_gei_d(_jit, r0, r1, i2)
 static void _gei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define gtr_d(r0, r1, r2)		_gtr_d(_jit, r0, r1, r2)
-static void _gtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _gtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gti_d(r0, r1, i2)		_gti_d(_jit, r0, r1, i2)
 static void _gti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ner_d(r0, r1, r2)		_ner_d(_jit, r0, r1, r2)
-static void _ner_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ner_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define nei_d(r0, r1, i2)		_nei_d(_jit, r0, r1, i2)
 static void _nei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unltr_d(r0, r1, r2)		_unltr_d(_jit, r0, r1, r2)
-static void _unltr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unltr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unlti_d(r0, r1, i2)		_unlti_d(_jit, r0, r1, i2)
 static void _unlti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unler_d(r0, r1, r2)		_unler_d(_jit, r0, r1, r2)
-static void _unler_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unler_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unlei_d(r0, r1, i2)		_unlei_d(_jit, r0, r1, i2)
 static void _unlei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define uneqr_d(r0, r1, r2)		_uneqr_d(_jit, r0, r1, r2)
-static void _uneqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _uneqr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define uneqi_d(r0, r1, i2)		_uneqi_d(_jit, r0, r1, i2)
 static void _uneqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unger_d(r0, r1, r2)		_unger_d(_jit, r0, r1, r2)
-static void _unger_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unger_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ungei_d(r0, r1, i2)		_ungei_d(_jit, r0, r1, i2)
 static void _ungei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ungtr_d(r0, r1, r2)		_ungtr_d(_jit, r0, r1, r2)
-static void _ungtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ungtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ungti_d(r0, r1, i2)		_ungti_d(_jit, r0, r1, i2)
 static void _ungti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ltgtr_d(r0, r1, r2)		_ltgtr_d(_jit, r0, r1, r2)
-static void _ltgtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltgtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ltgti_d(r0, r1, i2)		_ltgti_d(_jit, r0, r1, i2)
 static void _ltgti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ordr_d(r0, r1, r2)		_ordr_d(_jit, r0, r1, r2)
-static void _ordr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ordr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ordi_d(r0, r1, i2)		_ordi_d(_jit, r0, r1, i2)
 static void _ordi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unordr_d(r0, r1, r2)		_unordr_d(_jit, r0, r1, r2)
-static void _unordr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unordr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unordi_d(r0, r1, i2)		_unordi_d(_jit, r0, r1, i2)
 static void _unordi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define bltr_d(i0, r0, r1)		_bltr_d(_jit, i0, r0, r1)
@@ -557,7 +557,7 @@ static void _vaarg_d(jit_state_t*, int32_t, int32_t);
 #if CODE
 static void
 _c_cond_fmt(jit_state_t *_jit, int32_t fm,
-	    int32_t ft, int32_t fs, jit_int32_t cc)
+	    int32_t ft, int32_t fs, int32_t cc)
 {
     jit_instr_t		i;
     i.cc.b = cc;
@@ -668,7 +668,7 @@ _ldi_f(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -706,7 +706,7 @@ _sti_f(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -826,7 +826,7 @@ _movi_d_w(jit_state_t *_jit, int32_t r0, jit_float64_t *i0)
 
 #else
 static void
-_movr_ww_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_movr_ww_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     assert(r1 == r2 - 1);
     MTC1(r1, r0 + BE_P);
@@ -834,7 +834,7 @@ _movr_ww_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_movr_d_ww(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_movr_d_ww(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     assert(r0 == r1 - 1);
     MFC1(r0, r2 + BE_P);
@@ -933,7 +933,7 @@ _ldi_d(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -996,7 +996,7 @@ _sti_d(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -1086,7 +1086,7 @@ _movi_d(jit_state_t *_jit, int32_t r0, jit_float64_t *i0)
 }
 
 static void
-_ltr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_OLT_S(r1, r2);
@@ -1100,7 +1100,7 @@ _ltr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(lt)
 
 static void
-_ler_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_OLE_S(r1, r2);
@@ -1114,7 +1114,7 @@ _ler_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(le)
 
 static void
-_eqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_eqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_EQ_S(r1, r2);
@@ -1128,7 +1128,7 @@ _eqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(eq)
 
 static void
-_ger_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_ULT_S(r1, r2);
@@ -1142,7 +1142,7 @@ _ger_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(ge)
 
 static void
-_gtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_gtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_ULE_S(r1, r2);
@@ -1156,7 +1156,7 @@ _gtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(gt)
 
 static void
-_ner_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ner_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_EQ_S(r1, r2);
@@ -1170,7 +1170,7 @@ _ner_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(ne)
 
 static void
-_unltr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unltr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_ULT_S(r1, r2);
@@ -1184,7 +1184,7 @@ _unltr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(unlt)
 
 static void
-_unler_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unler_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_ULE_S(r1, r2);
@@ -1198,7 +1198,7 @@ _unler_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(unle)
 
 static void
-_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_UEQ_S(r1, r2);
@@ -1212,7 +1212,7 @@ _uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(uneq)
 
 static void
-_unger_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unger_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_OLT_S(r1, r2);
@@ -1226,7 +1226,7 @@ _unger_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(unge)
 
 static void
-_ungtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ungtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_OLE_S(r1, r2);
@@ -1240,7 +1240,7 @@ _ungtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(ungt)
 
 static void
-_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_UEQ_S(r1, r2);
@@ -1254,7 +1254,7 @@ _ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(ltgt)
 
 static void
-_ordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_UN_S(r1, r2);
@@ -1268,7 +1268,7 @@ _ordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(ord)
 
 static void
-_unordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unordr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_UN_S(r1, r2);
@@ -1450,7 +1450,7 @@ _bunordr_f(jit_state_t *_jit, jit_word_t i0, int32_t r1, int32_t r2)
 fbopi(unord)
 
 static void
-_ltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_OLT_D(r1, r2);
@@ -1464,7 +1464,7 @@ _ltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(lt)
 
 static void
-_ler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_OLE_D(r1, r2);
@@ -1478,7 +1478,7 @@ _ler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(le)
 
 static void
-_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_EQ_D(r1, r2);
@@ -1492,7 +1492,7 @@ _eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(eq)
 
 static void
-_ger_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_ULT_D(r1, r2);
@@ -1506,7 +1506,7 @@ _ger_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(ge)
 
 static void
-_gtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_gtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_ULE_D(r1, r2);
@@ -1520,7 +1520,7 @@ _gtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(gt)
 
 static void
-_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_EQ_D(r1, r2);
@@ -1534,7 +1534,7 @@ _ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(ne)
 
 static void
-_unltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_ULT_D(r1, r2);
@@ -1548,7 +1548,7 @@ _unltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(unlt)
 
 static void
-_unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_ULE_D(r1, r2);
@@ -1562,7 +1562,7 @@ _unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(unle)
 
 static void
-_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_UEQ_D(r1, r2);
@@ -1576,7 +1576,7 @@ _uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(uneq)
 
 static void
-_unger_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unger_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_OLT_D(r1, r2);
@@ -1590,7 +1590,7 @@ _unger_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(unge)
 
 static void
-_ungtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ungtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_OLE_D(r1, r2);
@@ -1604,7 +1604,7 @@ _ungtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(ungt)
 
 static void
-_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_UEQ_D(r1, r2);
@@ -1618,7 +1618,7 @@ _ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(ltgt)
 
 static void
-_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_UN_D(r1, r2);
@@ -1632,7 +1632,7 @@ _ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(ord)
 
 static void
-_unordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     C_UN_D(r1, r2);
diff --git a/jit/ppc-cpu.c b/jit/ppc-cpu.c
index d4d6b91c1..e8c4ce335 100644
--- a/jit/ppc-cpu.c
+++ b/jit/ppc-cpu.c
@@ -595,11 +595,11 @@ static void _iqdivr(jit_state_t*,int32_t,int32_t,
 static void _iqdivi(jit_state_t*,int32_t,int32_t,
 		    int32_t,jit_word_t,jit_bool_t);
 #  define remr(r0,r1,r2)		_remr(_jit,r0,r1,r2)
-static void _remr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi(r0,r1,i0)		_remi(_jit,r0,r1,i0)
 static void _remi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define remr_u(r0,r1,r2)		_remr_u(_jit,r0,r1,r2)
-static void _remr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi_u(r0,r1,i0)		_remi_u(_jit,r0,r1,i0)
 static void _remi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define andr(r0,r1,r2)		AND(r0,r1,r2)
@@ -633,43 +633,43 @@ static void _rshi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define rshi_u(r0,r1,i0)		_rshi_u(_jit,r0,r1,i0)
 static void _rshi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ltr(r0,r1,r2)			_ltr(_jit,r0,r1,r2)
-static void _ltr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lti(r0,r1,i0)			_lti(_jit,r0,r1,i0)
 static void _lti(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ltr_u(r0,r1,r2)		_ltr_u(_jit,r0,r1,r2)
-static void _ltr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lti_u(r0,r1,i0)		_lti_u(_jit,r0,r1,i0)
 static void _lti_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ler(r0,r1,r2)			_ler(_jit,r0,r1,r2)
-static void _ler(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ler(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lei(r0,r1,i0)			_lei(_jit,r0,r1,i0)
 static void _lei(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ler_u(r0,r1,r2)		_ler_u(_jit,r0,r1,r2)
-static void _ler_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ler_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lei_u(r0,r1,i0)		_lei_u(_jit,r0,r1,i0)
 static void _lei_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define eqr(r0,r1,r2)			_eqr(_jit,r0,r1,r2)
-static void _eqr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _eqr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define eqi(r0,r1,i0)			_eqi(_jit,r0,r1,i0)
 static void _eqi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ger(r0,r1,r2)			_ger(_jit,r0,r1,r2)
-static void _ger(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ger(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gei(r0,r1,i0)			_gei(_jit,r0,r1,i0)
 static void _gei(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ger_u(r0,r1,r2)		_ger_u(_jit,r0,r1,r2)
-static void _ger_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ger_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gei_u(r0,r1,i0)		_gei_u(_jit,r0,r1,i0)
 static void _gei_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define gtr(r0,r1,r2)			_gtr(_jit,r0,r1,r2)
-static void _gtr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _gtr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gti(r0,r1,i0)			_gti(_jit,r0,r1,i0)
 static void _gti(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define gtr_u(r0,r1,r2)		_gtr_u(_jit,r0,r1,r2)
-static void _gtr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _gtr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gti_u(r0,r1,i0)		_gti_u(_jit,r0,r1,i0)
 static void _gti_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ner(r0,r1,r2)			_ner(_jit,r0,r1,r2)
-static void _ner(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ner(jit_state_t*,int32_t,int32_t,int32_t);
 #  define nei(r0,r1,i0)			_nei(_jit,r0,r1,i0)
 static void _nei(jit_state_t*,int32_t,int32_t,jit_word_t);
 #define bltr(i0,r0,r1)			_bltr(_jit,i0,r0,r1)
@@ -757,28 +757,28 @@ static void _ldr_c(jit_state_t*,int32_t,int32_t);
 #  define ldi_c(r0,i0)			_ldi_c(_jit,r0,i0)
 static void _ldi_c(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_c(r0,r1,i0)		_ldxr_c(_jit,r0,r1,i0)
-static void _ldxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_c(r0,r1,i0)		_ldxi_c(_jit,r0,r1,i0)
 static void _ldxi_c(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldr_uc(r0,r1)			LBZX(r0, _R0_REGNO, r1)
 #  define ldi_uc(r0,i0)			_ldi_uc(_jit,r0,i0)
 static void _ldi_uc(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_uc(r0,r1,r2)		_ldxr_uc(_jit,r0,r1,r2)
-static void _ldxr_uc(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_uc(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_uc(r0,r1,i0)		_ldxi_uc(_jit,r0,r1,i0)
 static void _ldxi_uc(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldr_s(r0,r1)			LHAX(r0, _R0_REGNO, r1)
 #  define ldi_s(r0,i0)			_ldi_s(_jit,r0,i0)
 static void _ldi_s(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_s(r0,r1,i0)		_ldxr_s(_jit,r0,r1,i0)
-static void _ldxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_s(r0,r1,i0)		_ldxi_s(_jit,r0,r1,i0)
 static void _ldxi_s(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldr_us(r0,r1)			LHZX(r0, _R0_REGNO, r1)
 #  define ldi_us(r0,i0)			_ldi_us(_jit,r0,i0)
 static void _ldi_us(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_us(r0,r1,i0)		_ldxr_us(_jit,r0,r1,i0)
-static void _ldxr_us(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_us(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_us(r0,r1,i0)		_ldxi_us(_jit,r0,r1,i0)
 static void _ldxi_us(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  if __WORDSIZE == 32
@@ -789,7 +789,7 @@ static void _ldxi_us(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldi_i(r0,i0)			_ldi_i(_jit,r0,i0)
 static void _ldi_i(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_i(r0,r1,i0)		_ldxr_i(_jit,r0,r1,i0)
-static void _ldxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_i(r0,r1,i0)		_ldxi_i(_jit,r0,r1,i0)
 static void _ldxi_i(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  if __WORDSIZE == 64
@@ -797,14 +797,14 @@ static void _ldxi_i(jit_state_t*,int32_t,int32_t,jit_word_t);
 #    define ldi_ui(r0,i0)		_ldi_ui(_jit,r0,i0)
 static void _ldi_ui(jit_state_t*,int32_t,jit_word_t);
 #    define ldxr_ui(r0,r1,i0)		_ldxr_ui(_jit,r0,r1,i0)
-static void _ldxr_ui(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_ui(jit_state_t*,int32_t,int32_t,int32_t);
 #    define ldxi_ui(r0,r1,i0)		_ldxi_ui(_jit,r0,r1,i0)
 static void _ldxi_ui(jit_state_t*,int32_t,int32_t,jit_word_t);
 #    define ldr_l(r0,r1)		LDX(r0, _R0_REGNO, r1)
 #    define ldi_l(r0,i0)		_ldi_l(_jit,r0,i0)
 static void _ldi_l(jit_state_t*,int32_t,jit_word_t);
 #    define ldxr_l(r0,r1,i0)		_ldxr_l(_jit,r0,r1,i0)
-static void _ldxr_l(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_l(jit_state_t*,int32_t,int32_t,int32_t);
 #    define ldxi_l(r0,r1,i0)		_ldxi_l(_jit,r0,r1,i0)
 static void _ldxi_l(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  endif
@@ -812,21 +812,21 @@ static void _ldxi_l(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define sti_c(i0,r0)			_sti_c(_jit,i0,r0)
 static void _sti_c(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_c(r0,r1,r2)		_stxr_c(_jit,r0,r1,r2)
-static void _stxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_c(i0,r0,r1)		_stxi_c(_jit,i0,r0,r1)
 static void _stxi_c(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define str_s(r0,r1)			STHX(r1, _R0_REGNO, r0)
 #  define sti_s(i0,r0)			_sti_s(_jit,i0,r0)
 static void _sti_s(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_s(r0,r1,r2)		_stxr_s(_jit,r0,r1,r2)
-static void _stxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_s(i0,r0,r1)		_stxi_s(_jit,i0,r0,r1)
 static void _stxi_s(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define str_i(r0,r1)			STWX(r1, _R0_REGNO, r0)
 #  define sti_i(i0,r0)			_sti_i(_jit,i0,r0)
 static void _sti_i(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_i(r0,r1,r2)		_stxr_i(_jit,r0,r1,r2)
-static void _stxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_i(i0,r0,r1)		_stxi_i(_jit,i0,r0,r1)
 static void _stxi_i(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  if __WORDSIZE == 64
@@ -834,7 +834,7 @@ static void _stxi_i(jit_state_t*,jit_word_t,int32_t,int32_t);
 #    define sti_l(i0,r0)		_sti_l(_jit,i0,r0)
 static void _sti_l(jit_state_t*,jit_word_t,int32_t);
 #    define stxr_l(r0,r1,r2)		_stxr_l(_jit,r0,r1,r2)
-static void _stxr_l(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_l(jit_state_t*,int32_t,int32_t,int32_t);
 #    define stxi_l(i0,r0,r1)		_stxi_l(_jit,i0,r0,r1)
 static void _stxi_l(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  endif
@@ -1359,7 +1359,7 @@ _iqdivi(jit_state_t *_jit, int32_t r0, int32_t r1,
 }
 
 static void
-_remr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r1 || r0 == r2) {
@@ -1387,7 +1387,7 @@ _remi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r1 || r0 == r2) {
@@ -1505,7 +1505,7 @@ _rshi_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ltr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMPW(r1, r2);
     MFCR(r0);
@@ -1529,7 +1529,7 @@ _lti(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ltr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMPLW(r1, r2);
     MFCR(r0);
@@ -1553,7 +1553,7 @@ _lti_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ler(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMPW(r1, r2);
     CRNOT(CR_GT, CR_GT);
@@ -1579,7 +1579,7 @@ _lei(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ler_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMPLW(r1, r2);
     CRNOT(CR_GT, CR_GT);
@@ -1605,7 +1605,7 @@ _lei_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_eqr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_eqr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMPW(r1, r2);
     MFCR(r0);
@@ -1631,7 +1631,7 @@ _eqi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ger(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMPW(r1, r2);
     CRNOT(CR_LT, CR_LT);
@@ -1657,7 +1657,7 @@ _gei(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ger_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMPLW(r1, r2);
     CRNOT(CR_LT, CR_LT);
@@ -1683,7 +1683,7 @@ _gei_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_gtr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_gtr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMPW(r1, r2);
     MFCR(r0);
@@ -1707,7 +1707,7 @@ _gti(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_gtr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_gtr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMPLW(r1, r2);
     MFCR(r0);
@@ -1731,7 +1731,7 @@ _gti_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ner(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ner(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     CMPW(r1, r2);
     CRNOT(CR_EQ, CR_EQ);
@@ -2333,7 +2333,7 @@ _ldi_c(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     ldxr_uc(r0, r1, r2);
     extr_c(r0, r0);
@@ -2373,7 +2373,7 @@ _ldi_uc(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r1 == _R0_REGNO) {
@@ -2441,7 +2441,7 @@ _ldi_s(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r1 == _R0_REGNO) {
@@ -2509,7 +2509,7 @@ _ldi_us(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r1 == _R0_REGNO) {
@@ -2578,7 +2578,7 @@ _ldi_i(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r1 == _R0_REGNO) {
@@ -2647,7 +2647,7 @@ _ldi_i(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r1 == _R0_REGNO) {
@@ -2715,7 +2715,7 @@ _ldi_ui(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r1 == _R0_REGNO) {
@@ -2783,7 +2783,7 @@ _ldi_l(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r1 == _R0_REGNO) {
@@ -2852,7 +2852,7 @@ _sti_c(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == _R0_REGNO) {
@@ -2920,7 +2920,7 @@ _sti_s(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == _R0_REGNO) {
@@ -2988,7 +2988,7 @@ _sti_i(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == _R0_REGNO) {
@@ -3057,7 +3057,7 @@ _sti_l(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == _R0_REGNO) {
diff --git a/jit/ppc-fpu.c b/jit/ppc-fpu.c
index b4932cd69..da7ac0cbe 100644
--- a/jit/ppc-fpu.c
+++ b/jit/ppc-fpu.c
@@ -177,98 +177,98 @@ static void _divi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 static void _divi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ltr_f(r0,r1,r2)		ltr_d(r0,r1,r2)
 #  define ltr_d(r0,r1,r2)		_ltr_d(_jit,r0,r1,r2)
-static void _ltr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lti_f(r0,r1,i0)		_lti_f(_jit,r0,r1,i0)
 static void _lti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define lti_d(r0,r1,i0)		_lti_d(_jit,r0,r1,i0)
 static void _lti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ler_f(r0,r1,r2)		ler_d(r0,r1,r2)
 #  define ler_d(r0,r1,r2)		_ler_d(_jit,r0,r1,r2)
-static void _ler_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ler_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define lei_f(r0,r1,i0)		_lei_f(_jit,r0,r1,i0)
 static void _lei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define lei_d(r0,r1,i0)		_lei_d(_jit,r0,r1,i0)
 static void _lei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define eqr_f(r0,r1,r2)		eqr_d(r0,r1,r2)
 #  define eqr_d(r0,r1,r2)		_eqr_d(_jit,r0,r1,r2)
-static void _eqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _eqr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define eqi_f(r0,r1,i0)		_eqi_f(_jit,r0,r1,i0)
 static void _eqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define eqi_d(r0,r1,i0)		_eqi_d(_jit,r0,r1,i0)
 static void _eqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ger_f(r0,r1,r2)		ger_d(r0,r1,r2)
 #  define ger_d(r0,r1,r2)		_ger_d(_jit,r0,r1,r2)
-static void _ger_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ger_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gei_f(r0,r1,i0)		_gei_f(_jit,r0,r1,i0)
 static void _gei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define gei_d(r0,r1,i0)		_gei_d(_jit,r0,r1,i0)
 static void _gei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define gtr_f(r0,r1,r2)		gtr_d(r0,r1,r2)
 #  define gtr_d(r0,r1,r2)		_gtr_d(_jit,r0,r1,r2)
-static void _gtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _gtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define gti_f(r0,r1,i0)		_gti_f(_jit,r0,r1,i0)
 static void _gti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define gti_d(r0,r1,i0)		_gti_d(_jit,r0,r1,i0)
 static void _gti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ner_f(r0,r1,r2)		ner_d(r0,r1,r2)
 #  define ner_d(r0,r1,r2)		_ner_d(_jit,r0,r1,r2)
-static void _ner_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ner_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define nei_f(r0,r1,i0)		_nei_f(_jit,r0,r1,i0)
 static void _nei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define nei_d(r0,r1,i0)		_nei_d(_jit,r0,r1,i0)
 static void _nei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unltr_f(r0,r1,r2)		unltr_d(r0,r1,r2)
 #  define unltr_d(r0,r1,r2)		_unltr_d(_jit,r0,r1,r2)
-static void _unltr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unltr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unlti_f(r0,r1,i0)		_unlti_f(_jit,r0,r1,i0)
 static void _unlti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define unlti_d(r0,r1,i0)		_unlti_d(_jit,r0,r1,i0)
 static void _unlti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unler_f(r0,r1,r2)		unler_d(r0,r1,r2)
 #  define unler_d(r0,r1,r2)		_unler_d(_jit,r0,r1,r2)
-static void _unler_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unler_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unlei_f(r0,r1,i0)		_unlei_f(_jit,r0,r1,i0)
 static void _unlei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define unlei_d(r0,r1,i0)		_unlei_d(_jit,r0,r1,i0)
 static void _unlei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define uneqr_f(r0,r1,r2)		uneqr_d(r0,r1,r2)
 #  define uneqr_d(r0,r1,r2)		_uneqr_d(_jit,r0,r1,r2)
-static void _uneqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _uneqr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define uneqi_f(r0,r1,i0)		_uneqi_f(_jit,r0,r1,i0)
 static void _uneqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define uneqi_d(r0,r1,i0)		_uneqi_d(_jit,r0,r1,i0)
 static void _uneqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unger_f(r0,r1,r2)		unger_d(r0,r1,r2)
 #  define unger_d(r0,r1,r2)		_unger_d(_jit,r0,r1,r2)
-static void _unger_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unger_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ungei_f(r0,r1,i0)		_ungei_f(_jit,r0,r1,i0)
 static void _ungei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ungei_d(r0,r1,i0)		_ungei_d(_jit,r0,r1,i0)
 static void _ungei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ungtr_f(r0,r1,r2)		ungtr_d(r0,r1,r2)
 #  define ungtr_d(r0,r1,r2)		_ungtr_d(_jit,r0,r1,r2)
-static void _ungtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ungtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ungti_f(r0,r1,i0)		_ungti_f(_jit,r0,r1,i0)
 static void _ungti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ungti_d(r0,r1,i0)		_ungti_d(_jit,r0,r1,i0)
 static void _ungti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ltgtr_f(r0,r1,r2)		ltgtr_d(r0,r1,r2)
 #  define ltgtr_d(r0,r1,r2)		_ltgtr_d(_jit,r0,r1,r2)
-static void _ltgtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltgtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ltgti_f(r0,r1,i0)		_ltgti_f(_jit,r0,r1,i0)
 static void _ltgti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ltgti_d(r0,r1,i0)		_ltgti_d(_jit,r0,r1,i0)
 static void _ltgti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define ordr_f(r0,r1,r2)		ordr_d(r0,r1,r2)
 #  define ordr_d(r0,r1,r2)		_ordr_d(_jit,r0,r1,r2)
-static void _ordr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ordr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ordi_f(r0,r1,i0)		_ordi_f(_jit,r0,r1,i0)
 static void _ordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define ordi_d(r0,r1,i0)		_ordi_d(_jit,r0,r1,i0)
 static void _ordi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define unordr_f(r0,r1,r2)		unordr_d(r0,r1,r2)
 #  define unordr_d(r0,r1,r2)		_unordr_d(_jit,r0,r1,r2)
-static void _unordr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _unordr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define unordi_f(r0,r1,i0)		_unordi_f(_jit,r0,r1,i0)
 static void _unordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define unordi_d(r0,r1,i0)		_unordi_d(_jit,r0,r1,i0)
@@ -375,28 +375,28 @@ static jit_word_t _bunordi_d(jit_state_t*,jit_word_t,int32_t,jit_float64_t*);
 #  define ldi_f(r0,i0)			_ldi_f(_jit,r0,i0)
 static void _ldi_f(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_f(r0,r1,r2)		_ldxr_f(_jit,r0,r1,r2)
-static void _ldxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_f(r0,r1,i0)		_ldxi_f(_jit,r0,r1,i0)
 static void _ldxi_f(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define str_f(r0,r1)			STFSX(r1, _R0_REGNO, r0)
 #  define sti_f(i0,r0)			_sti_f(_jit,i0,r0)
 static void _sti_f(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_f(r0,r1,r2)		_stxr_f(_jit,r0,r1,r2)
-static void _stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_f(i0,r0,r1)		_stxi_f(_jit,i0,r0,r1)
 static void _stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define ldr_d(r0,r1)			LFDX(r0, _R0_REGNO, r1)
 #  define ldi_d(r0,i0)			_ldi_d(_jit,r0,i0)
 static void _ldi_d(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_d(r0,r1,r2)		_ldxr_d(_jit,r0,r1,r2)
-static void _ldxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_d(r0,r1,i0)		_ldxi_d(_jit,r0,r1,i0)
 static void _ldxi_d(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define str_d(r0,r1)			STFDX(r1, _R0_REGNO, r0)
 #  define sti_d(i0,r0)			_sti_d(_jit,i0,r0)
 static void _sti_d(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_d(r0,r1,r2)		_stxr_d(_jit,r0,r1,r2)
-static void _stxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_d(i0,r0,r1)		_stxi_d(_jit,i0,r0,r1)
 static void _stxi_d(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define vaarg_d(r0, r1)		_vaarg_d(_jit, r0, r1)
@@ -573,7 +573,7 @@ fopi(div)
 dopi(div)
 
 static void
-_ltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPO(CR_0, r1, r2);
     MFCR(r0);
@@ -583,7 +583,7 @@ fopi(lt)
 dopi(lt)
 
 static void
-_ler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPO(CR_0, r1, r2);
     CREQV(CR_GT, CR_GT, CR_UN);
@@ -594,7 +594,7 @@ fopi(le)
 dopi(le)
 
 static void
-_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPO(CR_0, r1, r2);
     MFCR(r0);
@@ -604,7 +604,7 @@ fopi(eq)
 dopi(eq)
 
 static void
-_ger_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPO(CR_0, r1, r2);
     CREQV(CR_LT, CR_LT, CR_UN);
@@ -615,7 +615,7 @@ fopi(ge)
 dopi(ge)
 
 static void
-_gtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_gtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPO(CR_0, r1, r2);
     MFCR(r0);
@@ -625,7 +625,7 @@ fopi(gt)
 dopi(gt)
 
 static void
-_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPO(CR_0, r1, r2);
     CRNOT(CR_EQ, CR_EQ);
@@ -636,7 +636,7 @@ fopi(ne)
 dopi(ne)
 
 static void
-_unltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unltr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPU(CR_0, r1, r2);
     CROR(CR_LT, CR_LT, CR_UN);
@@ -647,7 +647,7 @@ fopi(unlt)
 dopi(unlt)
 
 static void
-_unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPU(CR_0, r1, r2);
     CRNOT(CR_GT, CR_GT);
@@ -658,7 +658,7 @@ fopi(unle)
 dopi(unle)
 
 static void
-_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPU(CR_0, r1, r2);
     CROR(CR_EQ, CR_EQ, CR_UN);
@@ -669,7 +669,7 @@ fopi(uneq)
 dopi(uneq)
 
 static void
-_unger_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unger_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPU(CR_0, r1, r2);
     CRNOT(CR_LT, CR_LT);
@@ -680,7 +680,7 @@ fopi(unge)
 dopi(unge)
 
 static void
-_ungtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ungtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPU(CR_0, r1, r2);
     CROR(CR_GT, CR_GT, CR_UN);
@@ -691,7 +691,7 @@ fopi(ungt)
 dopi(ungt)
 
 static void
-_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPU(CR_0, r1, r2);
     CROR(CR_GT, CR_GT, CR_LT);
@@ -702,7 +702,7 @@ fopi(ltgt)
 dopi(ltgt)
 
 static void
-_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPU(CR_0, r1, r2);
     CRNOT(CR_UN, CR_UN);
@@ -713,7 +713,7 @@ fopi(ord)
 dopi(ord)
 
 static void
-_unordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_unordr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPU(CR_0, r1, r2);
     MFCR(r0);
@@ -963,7 +963,7 @@ _ldi_d(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r1 == _R0_REGNO) {
@@ -981,7 +981,7 @@ _ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r1 == _R0_REGNO) {
@@ -1099,7 +1099,7 @@ _sti_d(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == _R0_REGNO) {
@@ -1117,7 +1117,7 @@ _stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == _R0_REGNO) {
diff --git a/jit/s390-cpu.c b/jit/s390-cpu.c
index 7394ac08b..b8b9df6af 100644
--- a/jit/s390-cpu.c
+++ b/jit/s390-cpu.c
@@ -881,25 +881,25 @@ static void _nop(jit_state_t*,int32_t);
 /* TEST SUBCHANNEL */
 #  define TSCH(D2,B2)			S_(0xB235,B2,D2)
 #  define xdivr(r0,r1)			_xdivr(_jit,r0,r1)
-static int32_t _xdivr(jit_state_t*,int32_t,jit_int32_t);
+static int32_t _xdivr(jit_state_t*,int32_t,int32_t);
 #  define xdivr_u(r0,r1)		_xdivr_u(_jit,r0,r1)
-static int32_t _xdivr_u(jit_state_t*,int32_t,jit_int32_t);
+static int32_t _xdivr_u(jit_state_t*,int32_t,int32_t);
 #  define xdivi(r0,i0)			_xdivi(_jit,r0,i0)
 static int32_t _xdivi(jit_state_t*,int32_t,jit_word_t);
 #  define xdivi_u(r0,i0)		_xdivi_u(_jit,r0,i0)
 static int32_t _xdivi_u(jit_state_t*,int32_t,jit_word_t);
 #  define crr(cc,r0,r1,r2)		_crr(_jit,cc,r0,r1,r2)
 static void _crr(jit_state_t*,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t);
 #  define cri(cc,r0,r1,i0)		_cri(_jit,cc,r0,r1,i0)
 static void _cri(jit_state_t*,
-		 int32_t,int32_t,jit_int32_t,jit_word_t);
+		 int32_t,int32_t,int32_t,jit_word_t);
 #  define crr_u(cc,r0,r1,r2)		_crr_u(_jit,cc,r0,r1,r2)
 static void _crr_u(jit_state_t*,
-		   int32_t,int32_t,jit_int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t,int32_t);
 #  define cri_u(cc,r0,r1,i0)		_cri_u(_jit,cc,r0,r1,i0)
 static void _cri_u(jit_state_t*,
-		   int32_t,int32_t,jit_int32_t,jit_word_t);
+		   int32_t,int32_t,int32_t,jit_word_t);
 #  define brr(cc,i0,r0,r1)		_brr(_jit,cc,i0,r0,r1)
 static void _brr(jit_state_t*,int32_t,
 		 jit_word_t,int32_t,int32_t);
@@ -967,78 +967,78 @@ static void _movi(jit_state_t*,int32_t,jit_word_t);
 #  define movi_p(r0,i0)			_movi_p(_jit,r0,i0)
 static jit_word_t _movi_p(jit_state_t*,int32_t,jit_word_t);
 #  define addr(r0,r1,r2)		_addr(_jit,r0,r1,r2)
-static void _addr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addi(r0,r1,i0)		_addi(_jit,r0,r1,i0)
 static void _addi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define addcr(r0,r1,r2)		_addcr(_jit,r0,r1,r2)
-static void _addcr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addcr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addci(r0,r1,i0)		_addci(_jit,r0,r1,i0)
 static void _addci(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define addxr(r0,r1,r2)		_addxr(_jit,r0,r1,r2)
-static void _addxr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addxr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addxi(r0,r1,i0)		_addxi(_jit,r0,r1,i0)
 static void _addxi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subr(r0,r1,r2)		_subr(_jit,r0,r1,r2)
-static void _subr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subi(r0,r1,i0)		_subi(_jit,r0,r1,i0)
 static void _subi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subcr(r0,r1,r2)		_subcr(_jit,r0,r1,r2)
-static void _subcr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subcr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subci(r0,r1,i0)		_subci(_jit,r0,r1,i0)
 static void _subci(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define subxr(r0,r1,r2)		_subxr(_jit,r0,r1,r2)
-static void _subxr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subxr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subxi(r0,r1,i0)		_subxi(_jit,r0,r1,i0)
 static void _subxi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define rsbi(r0, r1, i0)		_rsbi(_jit, r0, r1, i0)
 static void _rsbi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define mulr(r0,r1,r2)		_mulr(_jit,r0,r1,r2)
-static void _mulr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _mulr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define muli(r0,r1,i0)		_muli(_jit,r0,r1,i0)
 static void _muli(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define qmulr(r0,r1,r2,r3)		_qmulr(_jit,r0,r1,r2,r3)
 static void _qmulr(jit_state_t*,int32_t,
-		   int32_t,int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t);
 #  define qmuli(r0,r1,r2,i0)		_qmuli(_jit,r0,r1,r2,i0)
 static void _qmuli(jit_state_t*,int32_t,
 		   int32_t,int32_t,jit_word_t);
 #  define qmulr_u(r0,r1,r2,r3)		_qmulr_u(_jit,r0,r1,r2,r3)
 static void _qmulr_u(jit_state_t*,int32_t,
-		     int32_t,int32_t,jit_int32_t);
+		     int32_t,int32_t,int32_t);
 #  define qmuli_u(r0,r1,r2,i0)		_qmuli_u(_jit,r0,r1,r2,i0)
 static void _qmuli_u(jit_state_t*,int32_t,
 		     int32_t,int32_t,jit_word_t);
 #  define divr(r0,r1,r2)		_divr(_jit,r0,r1,r2)
-static void _divr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi(r0,r1,i0)		_divi(_jit,r0,r1,i0)
 static void _divi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define divr_u(r0,r1,r2)		_divr_u(_jit,r0,r1,r2)
-static void _divr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi_u(r0,r1,i0)		_divi_u(_jit,r0,r1,i0)
 static void _divi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define remr(r0,r1,r2)		_remr(_jit,r0,r1,r2)
-static void _remr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi(r0,r1,i0)		_remi(_jit,r0,r1,i0)
 static void _remi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define remr_u(r0,r1,r2)		_remr_u(_jit,r0,r1,r2)
-static void _remr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _remr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  define remi_u(r0,r1,i0)		_remi_u(_jit,r0,r1,i0)
 static void _remi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define qdivr(r0,r1,r2,r3)		_qdivr(_jit,r0,r1,r2,r3)
 static void _qdivr(jit_state_t*,int32_t,
-		   int32_t,int32_t,jit_int32_t);
+		   int32_t,int32_t,int32_t);
 #  define qdivi(r0,r1,r2,i0)		_qdivi(_jit,r0,r1,r2,i0)
 static void _qdivi(jit_state_t*,int32_t,
 		   int32_t,int32_t,jit_word_t);
 #  define qdivr_u(r0,r1,r2,r3)		_qdivr_u(_jit,r0,r1,r2,r3)
 static void _qdivr_u(jit_state_t*,int32_t,
-		     int32_t,int32_t,jit_int32_t);
+		     int32_t,int32_t,int32_t);
 #  define qdivi_u(r0,r1,r2,i0)		_qdivi_u(_jit,r0,r1,r2,i0)
 static void _qdivi_u(jit_state_t*,int32_t,
 		     int32_t,int32_t,jit_word_t);
 #  if __WORDSIZE == 32
 #    define lshr(r0,r1,r2)		_lshr(_jit,r0,r1,r2)
-static void _lshr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _lshr(jit_state_t*,int32_t,int32_t,int32_t);
 #  else
 #    define lshr(r0,r1,r2)		SLLG(r0,r1,0,r2)
 #  endif
@@ -1046,7 +1046,7 @@ static void _lshr(jit_state_t*,int32_t,int32_t,jit_int32_t);
 static void _lshi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  if __WORDSIZE == 32
 #    define rshr(r0,r1,r2)		_rshr(_jit,r0,r1,r2)
-static void _rshr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _rshr(jit_state_t*,int32_t,int32_t,int32_t);
 #  else
 #    define rshr(r0,r1,r2)		SRAG(r0,r1,0,r2)
 #  endif
@@ -1054,7 +1054,7 @@ static void _rshr(jit_state_t*,int32_t,int32_t,jit_int32_t);
 static void _rshi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  if __WORDSIZE == 32
 #    define rshr_u(r0,r1,r2)		_rshr_u(_jit,r0,r1,r2)
-static void _rshr_u(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _rshr_u(jit_state_t*,int32_t,int32_t,int32_t);
 #  else
 #    define rshr_u(r0,r1,r2)		SRLG(r0,r1,0,r2)
 #  endif
@@ -1068,15 +1068,15 @@ static void _rshi_u(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define comr(r0,r1)			_comr(_jit,r0,r1)
 static void _comr(jit_state_t*,int32_t,int32_t);
 #  define andr(r0,r1,r2)		_andr(_jit,r0,r1,r2)
-static void _andr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _andr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define andi(r0,r1,i0)		_andi(_jit,r0,r1,i0)
 static void _andi(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define orr(r0,r1,r2)			_orr(_jit,r0,r1,r2)
-static void _orr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _orr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ori(r0,r1,i0)			_ori(_jit,r0,r1,i0)
 static void _ori(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define xorr(r0,r1,r2)		_xorr(_jit,r0,r1,r2)
-static void _xorr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _xorr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define xori(r0,r1,i0)		_xori(_jit,r0,r1,i0)
 static void _xori(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define htonr_us(r0,r1)		extr_us(r0,r1)
@@ -1098,14 +1098,14 @@ static void _xori(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldi_c(r0,i0)			_ldi_c(_jit,r0,i0)
 static void _ldi_c(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_c(r0,r1,r2)		_ldxr_c(_jit,r0,r1,r2)
-static void _ldxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_c(r0,r1,i0)		_ldxi_c(_jit,r0,r1,i0)
 static void _ldxi_c(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldr_uc(r0,r1)			LLGC(r0,0,0,r1)
 #  define ldi_uc(r0,i0)			_ldi_uc(_jit,r0,i0)
 static void _ldi_uc(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_uc(r0,r1,r2)		_ldxr_uc(_jit,r0,r1,r2)
-static void _ldxr_uc(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_uc(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_uc(r0,r1,i0)		_ldxi_uc(_jit,r0,r1,i0)
 static void _ldxi_uc(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  if __WORDSIZE == 32
@@ -1116,14 +1116,14 @@ static void _ldxi_uc(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldi_s(r0,i0)			_ldi_s(_jit,r0,i0)
 static void _ldi_s(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_s(r0,r1,r2)		_ldxr_s(_jit,r0,r1,r2)
-static void _ldxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_s(r0,r1,i0)		_ldxi_s(_jit,r0,r1,i0)
 static void _ldxi_s(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldr_us(r0,r1)			LLGH(r0,0,0,r1)
 #  define ldi_us(r0,i0)			_ldi_us(_jit,r0,i0)
 static void _ldi_us(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_us(r0,r1,r2)		_ldxr_us(_jit,r0,r1,r2)
-static void _ldxr_us(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_us(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_us(r0,r1,i0)		_ldxi_us(_jit,r0,r1,i0)
 static void _ldxi_us(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  if __WORDSIZE == 32
@@ -1134,7 +1134,7 @@ static void _ldxi_us(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldi_i(r0,i0)			_ldi_i(_jit,r0,i0)
 static void _ldi_i(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_i(r0,r1,r2)		_ldxr_i(_jit,r0,r1,r2)
-static void _ldxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_i(r0,r1,i0)		_ldxi_i(_jit,r0,r1,i0)
 static void _ldxi_i(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  if __WORDSIZE == 64
@@ -1142,14 +1142,14 @@ static void _ldxi_i(jit_state_t*,int32_t,int32_t,jit_word_t);
 #    define ldi_ui(r0,i0)		_ldi_ui(_jit,r0,i0)
 static void _ldi_ui(jit_state_t*,int32_t,jit_word_t);
 #    define ldxr_ui(r0,r1,r2)		_ldxr_ui(_jit,r0,r1,r2)
-static void _ldxr_ui(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_ui(jit_state_t*,int32_t,int32_t,int32_t);
 #    define ldxi_ui(r0,r1,i0)		_ldxi_ui(_jit,r0,r1,i0)
 static void _ldxi_ui(jit_state_t*,int32_t,int32_t,jit_word_t);
 #    define ldr_l(r0,r1)		LG(r0,0,0,r1)
 #    define ldi_l(r0,i0)		_ldi_l(_jit,r0,i0)
 static void _ldi_l(jit_state_t*,int32_t,jit_word_t);
 #    define ldxr_l(r0,r1,r2)		_ldxr_l(_jit,r0,r1,r2)
-static void _ldxr_l(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_l(jit_state_t*,int32_t,int32_t,int32_t);
 #    define ldxi_l(r0,r1,i0)		_ldxi_l(_jit,r0,r1,i0)
 static void _ldxi_l(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  endif
@@ -1157,21 +1157,21 @@ static void _ldxi_l(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define sti_c(i0,r0)			_sti_c(_jit,i0,r0)
 static void _sti_c(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_c(r0,r1,r2)		_stxr_c(_jit,r0,r1,r2)
-static void _stxr_c(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_c(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_c(i0,r0,r1)		_stxi_c(_jit,i0,r0,r1)
 static void _stxi_c(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define str_s(r0,r1)			STH(r1,0,0,r0)
 #  define sti_s(i0,r0)			_sti_s(_jit,i0,r0)
 static void _sti_s(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_s(r0,r1,r2)		_stxr_s(_jit,r0,r1,r2)
-static void _stxr_s(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_s(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_s(i0,r0,r1)		_stxi_s(_jit,i0,r0,r1)
 static void _stxi_s(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define str_i(r0,r1)			ST(r1,0,0,r0)
 #  define sti_i(i0,r0)			_sti_i(_jit,i0,r0)
 static void _sti_i(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_i(r0,r1,r2)		_stxr_i(_jit,r0,r1,r2)
-static void _stxr_i(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_i(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_i(i0,r0,r1)		_stxi_i(_jit,i0,r0,r1)
 static void _stxi_i(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  if __WORDSIZE == 64
@@ -1179,7 +1179,7 @@ static void _stxi_i(jit_state_t*,jit_word_t,int32_t,int32_t);
 #    define sti_l(i0,r0)		_sti_l(_jit,i0,r0)
 static void _sti_l(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_l(r0,r1,r2)		_stxr_l(_jit,r0,r1,r2)
-static void _stxr_l(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_l(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_l(i0,r0,r1)		_stxi_l(_jit,i0,r0,r1)
 static void _stxi_l(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  endif
@@ -2022,7 +2022,7 @@ _xdivi_u(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 
 static void
 _crr(jit_state_t *_jit, int32_t cc,
-     int32_t r0, int32_t r1, jit_int32_t r2)
+     int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     int32_t		reg, rg;
@@ -2057,7 +2057,7 @@ _cri(jit_state_t *_jit, int32_t cc,
 
 static void
 _crr_u(jit_state_t *_jit, int32_t cc,
-       int32_t r0, int32_t r1, jit_int32_t r2)
+       int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     int32_t		reg, rg;
@@ -2443,7 +2443,7 @@ _movi_p(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_addr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	ADD_(r0, r1);
@@ -2472,7 +2472,7 @@ _addi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	ADDC_(r0, r1);
@@ -2493,7 +2493,7 @@ _addci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	ADDX_(r0, r1);
@@ -2514,7 +2514,7 @@ _addxi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2) {
@@ -2549,7 +2549,7 @@ _subi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2) {
@@ -2576,7 +2576,7 @@ _subci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2) {
@@ -2610,7 +2610,7 @@ _rsbi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	MUL_(r0, r1);
@@ -2638,7 +2638,7 @@ _muli(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 static void
 _qmulr(jit_state_t *_jit,
-       int32_t r0, int32_t r1, jit_int32_t r2, jit_int32_t r3)
+       int32_t r0, int32_t r1, int32_t r2, int32_t r3)
 {
     int32_t		reg;
     /* The only invalid condition is r0 == r1 */
@@ -2676,7 +2676,7 @@ _qmulr(jit_state_t *_jit,
 
 static void
 _qmuli(jit_state_t *_jit,
-       int32_t r0, int32_t r1, jit_int32_t r2, jit_word_t i0)
+       int32_t r0, int32_t r1, int32_t r2, jit_word_t i0)
 {
     int32_t		reg;
     reg = jit_get_reg(jit_class_gpr);
@@ -2687,7 +2687,7 @@ _qmuli(jit_state_t *_jit,
 
 static void
 _qmulr_u(jit_state_t *_jit,
-	 int32_t r0, int32_t r1, jit_int32_t r2, jit_int32_t r3)
+	 int32_t r0, int32_t r1, int32_t r2, int32_t r3)
 {
     int32_t		regno;
     regno = jit_get_reg_pair();
@@ -2700,7 +2700,7 @@ _qmulr_u(jit_state_t *_jit,
 
 static void
 _qmuli_u(jit_state_t *_jit,
-	 int32_t r0, int32_t r1, jit_int32_t r2, jit_word_t i0)
+	 int32_t r0, int32_t r1, int32_t r2, jit_word_t i0)
 {
     int32_t		regno;
     regno = jit_get_reg_pair();
@@ -2713,7 +2713,7 @@ _qmuli_u(jit_state_t *_jit,
 }
 
 static void
-_divr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		regno;
     regno = xdivr(r1, r2);
@@ -2729,7 +2729,7 @@ _divi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		regno;
     regno = xdivr_u(r1, r2);
@@ -2745,7 +2745,7 @@ _divi_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_remr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		regno;
     regno = xdivr(r1, r2);
@@ -2761,7 +2761,7 @@ _remi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		regno;
     regno = xdivr_u(r1, r2);
@@ -2778,7 +2778,7 @@ _remi_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 static void
 _qdivr(jit_state_t *_jit,
-       int32_t r0, int32_t r1, jit_int32_t r2, jit_int32_t r3)
+       int32_t r0, int32_t r1, int32_t r2, int32_t r3)
 {
     int32_t		regno;
     regno = xdivr(r2, r3);
@@ -2788,7 +2788,7 @@ _qdivr(jit_state_t *_jit,
 
 static void
 _qdivi(jit_state_t *_jit,
-       int32_t r0, int32_t r1, jit_int32_t r2, jit_word_t i0)
+       int32_t r0, int32_t r1, int32_t r2, jit_word_t i0)
 {
     int32_t		regno;
     regno = xdivi(r2, i0);
@@ -2798,7 +2798,7 @@ _qdivi(jit_state_t *_jit,
 
 static void
 _qdivr_u(jit_state_t *_jit,
-	 int32_t r0, int32_t r1, jit_int32_t r2, jit_int32_t r3)
+	 int32_t r0, int32_t r1, int32_t r2, int32_t r3)
 {
     int32_t		regno;
     regno = xdivr_u(r2, r3);
@@ -2808,7 +2808,7 @@ _qdivr_u(jit_state_t *_jit,
 
 static void
 _qdivi_u(jit_state_t *_jit,
-	 int32_t r0, int32_t r1, jit_int32_t r2, jit_word_t i0)
+	 int32_t r0, int32_t r1, int32_t r2, jit_word_t i0)
 {
     int32_t		regno;
     regno = xdivi_u(r2, i0);
@@ -2818,7 +2818,7 @@ _qdivi_u(jit_state_t *_jit,
 
 #  if __WORDSIZE == 32
 static void
-_lshr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_lshr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2) {
@@ -2847,7 +2847,7 @@ _lshi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 #  if __WORDSIZE == 32
 static void
-_rshr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_rshr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2) {
@@ -2876,7 +2876,7 @@ _rshi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 #  if __WORDSIZE == 32
 static void
-_rshr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_rshr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2) {
@@ -2915,7 +2915,7 @@ _comr(jit_state_t *_jit, int32_t r0, int32_t r1)
 }
 
 static void
-_andr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_andr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	AND_(r0, r1);
@@ -2938,7 +2938,7 @@ _andi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_orr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_orr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	OR_(r0, r1);
@@ -2961,7 +2961,7 @@ _ori(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_xorr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_xorr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	XOR_(r0, r1);
@@ -2989,7 +2989,7 @@ _ldi_c(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2) {
 	addr(r0, r0, r1);
@@ -3035,7 +3035,7 @@ _ldi_uc(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2) {
 	addr(r0, r0, r1);
@@ -3076,7 +3076,7 @@ _ldi_s(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2) {
 	addr(r0, r0, r1);
@@ -3127,7 +3127,7 @@ _ldi_us(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2) {
 	addr(r0, r0, r1);
@@ -3168,7 +3168,7 @@ _ldi_i(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2) {
 	addr(r0, r0, r1);
@@ -3210,7 +3210,7 @@ _ldi_ui(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2) {
 	addr(r0, r0, r1);
@@ -3251,7 +3251,7 @@ _ldi_l(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2) {
 	addr(r0, r0, r1);
@@ -3296,7 +3296,7 @@ _sti_c(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg_but_zero(0);
@@ -3333,7 +3333,7 @@ _sti_s(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg_but_zero(0);
@@ -3370,7 +3370,7 @@ _sti_i(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg_but_zero(0);
@@ -3408,7 +3408,7 @@ _sti_l(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg_but_zero(0);
diff --git a/jit/s390-fpu.c b/jit/s390-fpu.c
index c7c0aef9e..386664369 100644
--- a/jit/s390-fpu.c
+++ b/jit/s390-fpu.c
@@ -292,10 +292,10 @@ static void _dp(jit_state_t*,jit_code_t,
 		int32_t,int32_t,jit_float64_t*);
 #  define fr(cc,r0,r1,r2)		_fr(_jit,cc,r0,r1,r2)
 static void _fr(jit_state_t*,int32_t,
-		int32_t,int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t);
 #  define dr(cc,r0,r1,r2)		_dr(_jit,cc,r0,r1,r2)
 static void _dr(jit_state_t*,int32_t,
-		int32_t,int32_t,jit_int32_t);
+		int32_t,int32_t,int32_t);
 #  define fi(cc,r0,r1,i0)		_fi(_jit,cc,r0,r1,i0)
 static void _fi(jit_state_t*,int32_t,
 		int32_t,int32_t,jit_float32_t*);
@@ -368,32 +368,32 @@ static void _movi_d(jit_state_t*,int32_t,jit_float64_t*);
 #  define extr_d_f(r0,r1)		LEDBR(r0,r1)
 #  define extr_f_d(r0,r1)		LDEBR(r0,r1)
 #  define addr_f(r0,r1,r2)		_addr_f(_jit,r0,r1,r2)
-static void _addr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addi_f(r0,r1,i0)		fp(add,r0,r1,i0)
 #  define addr_d(r0,r1,r2)		_addr_d(_jit,r0,r1,r2)
-static void _addr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _addr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define addi_d(r0,r1,i0)		dp(add,r0,r1,i0)
 #  define subr_f(r0,r1,r2)		_subr_f(_jit,r0,r1,r2)
-static void _subr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subi_f(r0,r1,i0)		fp(sub,r0,r1,i0)
 #  define subr_d(r0,r1,r2)		_subr_d(_jit,r0,r1,r2)
-static void _subr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subi_d(r0,r1,i0)		dp(sub,r0,r1,i0)
 #  define rsbr_f(r0,r1,r2)		subr_f(r0,r2,r1)
 #  define rsbi_f(r0,r1,i0)		fp(rsb,r0,r1,i0)
 #  define rsbr_d(r0,r1,r2)		subr_d(r0,r2,r1)
 #  define rsbi_d(r0,r1,i0)		dp(rsb,r0,r1,i0)
 #  define mulr_f(r0,r1,r2)		_mulr_f(_jit,r0,r1,r2)
-static void _mulr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _mulr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define muli_f(r0,r1,i0)		fp(mul,r0,r1,i0)
 #  define mulr_d(r0,r1,r2)		_mulr_d(_jit,r0,r1,r2)
-static void _mulr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _mulr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define muli_d(r0,r1,i0)		dp(mul,r0,r1,i0)
 #  define divr_f(r0,r1,r2)		_divr_f(_jit,r0,r1,r2)
-static void _divr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi_f(r0,r1,i0)		fp(div,r0,r1,i0)
 #  define divr_d(r0,r1,r2)		_divr_d(_jit,r0,r1,r2)
-static void _divr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _divr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define divi_d(r0,r1,i0)		dp(div,r0,r1,i0)
 #  define ldr_f(r0,r1)			LE(r0,0,0,r1)
 #  define ldr_d(r0,r1)			LD(r0,0,0,r1)
@@ -402,9 +402,9 @@ static void _ldi_f(jit_state_t*,int32_t,jit_word_t);
 #  define ldi_d(r0,i0)			_ldi_d(_jit,r0,i0)
 static void _ldi_d(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_f(r0,r1,r2)		_ldxr_f(_jit,r0,r1,r2)
-static void _ldxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxr_d(r0,r1,r2)		_ldxr_d(_jit,r0,r1,r2)
-static void _ldxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ldxi_f(r0,r1,i0)		_ldxi_f(_jit,r0,r1,i0)
 static void _ldxi_f(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define ldxi_d(r0,r1,i0)		_ldxi_d(_jit,r0,r1,i0)
@@ -416,9 +416,9 @@ static void _sti_f(jit_state_t*,jit_word_t,int32_t);
 #  define sti_d(i0,r0)			_sti_d(_jit,i0,r0)
 static void _sti_d(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_f(r0,r1,r2)		_stxr_f(_jit,r0,r1,r2)
-static void _stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxr_d(r0,r1,r2)		_stxr_d(_jit,r0,r1,r2)
-static void _stxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define stxi_f(i0,r0,r1)		_stxi_f(_jit,i0,r0,r1)
 static void _stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define stxi_d(i0,r0,r1)		_stxi_d(_jit,i0,r0,r1)
@@ -456,9 +456,9 @@ static void _stxi_d(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define unlei_f(r0,r1,i0)		fi(CC_NH,r0,r1,i0)
 #  define unlei_d(r0,r1,i0)		di(CC_NH,r0,r1,i0)
 #  define uneqr_f(r0,r1,r2)		_uneqr_f(_jit,r0,r1,r2)
-static void _uneqr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _uneqr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define uneqr_d(r0,r1,r2)		_uneqr_d(_jit,r0,r1,r2)
-static void _uneqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _uneqr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define uneqi_f(r0,r1,i0)		fp(uneq,r0,r1,i0)
 #  define uneqi_d(r0,r1,i0)		dp(uneq,r0,r1,i0)
 #  define unger_f(r0,r1,r2)		fr(CC_NL,r0,r1,r2)
@@ -470,9 +470,9 @@ static void _uneqr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
 #  define ungti_f(r0,r1,i0)		fi(CC_NLE,r0,r1,i0)
 #  define ungti_d(r0,r1,i0)		di(CC_NLE,r0,r1,i0)
 #  define ltgtr_f(r0,r1,r2)		_ltgtr_f(_jit,r0,r1,r2)
-static void _ltgtr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltgtr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ltgtr_d(r0,r1,r2)		_ltgtr_d(_jit,r0,r1,r2)
-static void _ltgtr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ltgtr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ltgti_f(r0,r1,i0)		fp(ltgt,r0,r1,i0)
 #  define ltgti_d(r0,r1,i0)		dp(ltgt,r0,r1,i0)
 #  define ordr_f(r0,r1,r2)		fr(CC_NO,r0,r1,r2)
@@ -642,7 +642,7 @@ _dp(jit_state_t *_jit, jit_code_t code,
 
 static void
 _fr(jit_state_t *_jit, int32_t cc,
-     int32_t r0, int32_t r1, jit_int32_t r2)
+     int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     LGHI(r0, 1);
@@ -655,7 +655,7 @@ _fr(jit_state_t *_jit, int32_t cc,
 
 static void
 _dr(jit_state_t *_jit, int32_t cc,
-     int32_t r0, int32_t r1, jit_int32_t r2)
+     int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		w;
     LGHI(r0, 1);
@@ -929,7 +929,7 @@ _movi_d(jit_state_t *_jit, int32_t r0, jit_float64_t *i0)
 }
 
 static void
-_addr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	AEBR(r0, r1);
@@ -940,7 +940,7 @@ _addr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	ADBR(r0, r1);
@@ -951,7 +951,7 @@ _addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_subr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2) {
@@ -968,7 +968,7 @@ _subr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_subr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2) {
@@ -985,7 +985,7 @@ _subr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_mulr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_mulr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	MEEBR(r0, r1);
@@ -996,7 +996,7 @@ _mulr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	MDBR(r0, r1);
@@ -1007,7 +1007,7 @@ _mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2) {
@@ -1024,7 +1024,7 @@ _divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_divr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2) {
@@ -1061,7 +1061,7 @@ _ldi_d(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg_but_zero(0);
@@ -1072,7 +1072,7 @@ _ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg_but_zero(0);
@@ -1137,7 +1137,7 @@ _sti_d(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg_but_zero(0);
@@ -1148,7 +1148,7 @@ _stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     reg = jit_get_reg_but_zero(0);
@@ -1193,7 +1193,7 @@ _stxi_d(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		unord, eq;
     movi(r0, 1);			/* set to one */
@@ -1208,7 +1208,7 @@ _uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		unord, eq;
     movi(r0, 1);			/* set to one */
@@ -1223,7 +1223,7 @@ _uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		unord, eq;
     movi(r0, 0);			/* set to zero */
@@ -1238,7 +1238,7 @@ _ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_word_t		unord, eq;
     movi(r0, 0);			/* set to zero */
diff --git a/jit/sparc-cpu.c b/jit/sparc-cpu.c
index 11fcf7cc5..21e78ada2 100644
--- a/jit/sparc-cpu.c
+++ b/jit/sparc-cpu.c
@@ -85,37 +85,37 @@ typedef union {
 #  define f1(op, disp30)		_f1(_jit, op, disp30)
 static void _f1(jit_state_t*,int32_t,int32_t);
 #  define f2r(op, rd, op2, imm22)	_f2r(_jit, op, rd, op2, imm22)
-static void _f2r(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _f2r(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define f2b(op, a, cond, op2, disp22)	_f2b(_jit, op, a, cond, op2, disp22)
 static void
-_f2b(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t,jit_int32_t);
+_f2b(jit_state_t*,int32_t,int32_t,int32_t,int32_t,int32_t);
 #  if __WORDSIZE == 64
 #    define f2bp(op,a,cond,op2,cc1,cc0,p,disp19)				\
 	_f2bp(_jit,op,a,cond,op2,cc1,cc0,p,disp19)
 static void
-_f2bp(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t,jit_int32_t,
-      int32_t,int32_t,jit_int32_t);
+_f2bp(jit_state_t*,int32_t,int32_t,int32_t,int32_t,int32_t,
+      int32_t,int32_t,int32_t);
 #  endif
 #  define f3r(op, rd, op3, rs1, rs2)	_f3r(_jit, op, rd, op3, rs1, rs2)
 static void _f3r(jit_state_t*,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t,int32_t);
 #  if __WORDSIZE == 64
 #  define f3rx(op, rd, op3, rs1, rs2)	_f3rx(_jit, op, rd, op3, rs1, rs2)
 static void _f3rx(jit_state_t*,
-		  int32_t,int32_t,jit_int32_t,jit_int32_t,jit_int32_t);
+		  int32_t,int32_t,int32_t,int32_t,int32_t);
 #  endif
 #  define f3i(op, rd, op3, rs1, simm13)	_f3i(_jit, op, rd, op3, rs1, simm13)
 static void _f3i(jit_state_t*,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t,int32_t);
 #  define f3s(op, rd, op3, rs1, simm13)	_f3s(_jit, op, rd, op3, rs1, simm13)
 static void _f3s(jit_state_t*,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,jit_int32_t);
+		 int32_t,int32_t,int32_t,int32_t,int32_t);
 #  define f3t(cond, rs1, i, ri)		_f3t(_jit, cond, rs1, i, ri)
-static void _f3t(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t)
+static void _f3t(jit_state_t*,int32_t,int32_t,int32_t,int32_t)
     maybe_unused;
 #  define f3a(op, rd, op3, rs1, rs2)	_f3a(_jit, op, rd, op3, rs1, asi, rs2)
 static void _f3a(jit_state_t*,int32_t,
-		 int32_t,int32_t,jit_int32_t,jit_int32_t,jit_int32_t)
+		 int32_t,int32_t,int32_t,int32_t,int32_t)
     maybe_unused;
 #  define LDSB(rs1, rs2, rd)		f3r(3, rd, 9, rs1, rs2)
 #  define LDSBI(rs1, imm, rd)		f3i(3, rd, 9, rs1, imm)
@@ -554,7 +554,7 @@ static void _addi(jit_state_t*, int32_t, int32_t, jit_word_t);
 #    define addcr(r0, r1, r2)		ADDcc(r1, r2, r0)
 #  else
 #    define addcr(r0, r1, r2)		_addcr(_jit, r0, r1, r2)
-static void _addcr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _addcr(jit_state_t*, int32_t, int32_t, int32_t);
 #  endif
 #  define addci(r0, r1, i0)		_addci(_jit, r0, r1, i0)
 static void _addci(jit_state_t*, int32_t, int32_t, jit_word_t);
@@ -562,7 +562,7 @@ static void _addci(jit_state_t*, int32_t, int32_t, jit_word_t);
 #    define addxr(r0, r1, r2)		ADDXcc(r1, r2, r0)
 #  else
 #    define addxr(r0, r1, r2)		_addxr(_jit, r0, r1, r2)
-static void _addxr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _addxr(jit_state_t*, int32_t, int32_t, int32_t);
 #  endif
 #  define addxi(r0, r1, i0)		_addxi(_jit, r0, r1, i0)
 static void _addxi(jit_state_t*, int32_t, int32_t, jit_word_t);
@@ -573,7 +573,7 @@ static void _subi(jit_state_t*, int32_t, int32_t, jit_word_t);
 #    define subcr(r0, r1, r2)		SUBcc(r1, r2, r0)
 #  else
 #    define subcr(r0, r1, r2)		_subcr(_jit, r0, r1, r2)
-static void _subcr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _subcr(jit_state_t*, int32_t, int32_t, int32_t);
 #  endif
 #  define subci(r0, r1, i0)		_subci(_jit, r0, r1, i0)
 static void _subci(jit_state_t*, int32_t, int32_t, jit_word_t);
@@ -581,7 +581,7 @@ static void _subci(jit_state_t*, int32_t, int32_t, jit_word_t);
 #    define subxr(r0, r1, r2)		SUBXcc(r1, r2, r0)
 #  else
 #    define subxr(r0, r1, r2)		_subxr(_jit, r0, r1, r2)
-static void _subxr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _subxr(jit_state_t*, int32_t, int32_t, int32_t);
 #  endif
 #  define subxi(r0, r1, i0)		_subxi(_jit, r0, r1, i0)
 static void _subxi(jit_state_t*, int32_t, int32_t, jit_word_t);
@@ -620,11 +620,11 @@ static void _qmuli_u(jit_state_t*,int32_t,int32_t,
 		     int32_t,jit_word_t);
 #  endif
 #  define divr(r0, r1, r2)		_divr(_jit, r0, r1, r2)
-static void _divr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _divr(jit_state_t*, int32_t, int32_t, int32_t);
 #  define divi(r0, r1, i0)		_divi(_jit, r0, r1, i0)
 static void _divi(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define divr_u(r0, r1, r2)		_divr_u(_jit, r0, r1, r2)
-static void _divr_u(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _divr_u(jit_state_t*, int32_t, int32_t, int32_t);
 #  define divi_u(r0, r1, i0)		_divi_u(_jit, r0, r1, i0)
 static void _divi_u(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define qdivr(r0,r1,r2,r3)		iqdivr(r0,r1,r2,r3,1)
@@ -638,11 +638,11 @@ static void _iqdivr(jit_state_t*,int32_t,int32_t,
 static void _iqdivi(jit_state_t*,int32_t,int32_t,
 		    int32_t,jit_word_t,jit_bool_t);
 #  define remr(r0, r1, r2)		_remr(_jit, r0, r1, r2)
-static void _remr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _remr(jit_state_t*, int32_t, int32_t, int32_t);
 #  define remi(r0, r1, i0)		_remi(_jit, r0, r1, i0)
 static void _remi(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define remr_u(r0, r1, r2)		_remr_u(_jit, r0, r1, r2)
-static void _remr_u(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _remr_u(jit_state_t*, int32_t, int32_t, int32_t);
 #  define remi_u(r0, r1, i0)		_remi_u(_jit, r0, r1, i0)
 static void _remi_u(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define andr(r0, r1, r2)		AND(r1, r2, r0)
@@ -688,9 +688,9 @@ static void _extr_i(jit_state_t*,int32_t,int32_t);
 static void _extr_ui(jit_state_t*,int32_t,int32_t);
 #  endif
 #  define cr(cc, r0, r1, r2)		_cr(_jit, cc, r0, r1, r2)
-static void _cr(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _cr(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define cw(cc, r0, r1, i0)		_cw(_jit, cc, r0, r1, i0)
-static void _cw(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_word_t);
+static void _cw(jit_state_t*,int32_t,int32_t,int32_t,jit_word_t);
 #  if __WORDSIZE == 32
 #    define ltr(r0, r1, r2)		cr(SPARC_BL, r0, r1, r2)
 #    define lti(r0, r1, i0)		cw(SPARC_BL, r0, r1, i0)
@@ -842,7 +842,7 @@ static void _stxi_l(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  endif
 #  define br(cc, i0, r0, r1)		_br(_jit, cc, i0, r0, r1)
 static jit_word_t
-_br(jit_state_t*,int32_t,jit_word_t,int32_t,jit_int32_t);
+_br(jit_state_t*,int32_t,jit_word_t,int32_t,int32_t);
 #  define bw(cc, i0, r0, i1)		_bw(_jit, cc, i0, r0, i1)
 static jit_word_t
 _bw(jit_state_t*,int32_t,jit_word_t,int32_t,jit_word_t);
@@ -950,7 +950,7 @@ static void _patch_at(jit_state_t*,jit_word_t,jit_word_t);
 #if CODE
 static void
 _f2r(jit_state_t *_jit,
-     int32_t op, int32_t rd, jit_int32_t op2, jit_int32_t imm22)
+     int32_t op, int32_t rd, int32_t op2, int32_t imm22)
 {
     jit_instr_t		v;
     assert(!(op  & 0xfffffffc));
@@ -966,7 +966,7 @@ _f2r(jit_state_t *_jit,
 
 static void
 _f2b(jit_state_t *_jit,
-     int32_t op, int32_t a, jit_int32_t cond, jit_int32_t op2,
+     int32_t op, int32_t a, int32_t cond, int32_t op2,
      int32_t disp22)
 {
     jit_instr_t		v;
@@ -986,8 +986,8 @@ _f2b(jit_state_t *_jit,
 #  if __WORDSIZE == 64
 static void
 _f2bp(jit_state_t *_jit,
-      int32_t op, int32_t a, jit_int32_t cond, jit_int32_t op2,
-      int32_t cc1, int32_t cc0, jit_int32_t p, jit_int32_t disp19)
+      int32_t op, int32_t a, int32_t cond, int32_t op2,
+      int32_t cc1, int32_t cc0, int32_t p, int32_t disp19)
 {
     jit_instr_t		v;
     assert(!(op   & 0xfffffffc));
@@ -1009,7 +1009,7 @@ _f2bp(jit_state_t *_jit,
 
 static void
 _f3r(jit_state_t *_jit, int32_t op, int32_t rd,
-     int32_t op3, int32_t rs1, jit_int32_t rs2)
+     int32_t op3, int32_t rs1, int32_t rs2)
 {
     jit_instr_t		v;
     assert(!(op  & 0xfffffffc));
@@ -1030,7 +1030,7 @@ _f3r(jit_state_t *_jit, int32_t op, int32_t rd,
 #  if __WORDSIZE == 64
 static void
 _f3rx(jit_state_t *_jit, int32_t op, int32_t rd,
-      int32_t op3, int32_t rs1, jit_int32_t rs2)
+      int32_t op3, int32_t rs1, int32_t rs2)
 {
     jit_instr_t		v;
     assert(!(op  & 0xfffffffc));
@@ -1051,7 +1051,7 @@ _f3rx(jit_state_t *_jit, int32_t op, int32_t rd,
 
 static void
 _f3s(jit_state_t *_jit, int32_t op, int32_t rd,
-      int32_t op3, int32_t rs1, jit_int32_t shim)
+      int32_t op3, int32_t rs1, int32_t shim)
 {
     jit_instr_t		v;
     assert(!(op   & 0xfffffffc));
@@ -1073,7 +1073,7 @@ _f3s(jit_state_t *_jit, int32_t op, int32_t rd,
 
 static void
 _f3i(jit_state_t *_jit, int32_t op, int32_t rd,
-     int32_t op3, int32_t rs1, jit_int32_t simm13)
+     int32_t op3, int32_t rs1, int32_t simm13)
 {
     jit_instr_t		v;
     assert(!(op  & 0xfffffffc));
@@ -1092,7 +1092,7 @@ _f3i(jit_state_t *_jit, int32_t op, int32_t rd,
 
 static void
 _f3t(jit_state_t *_jit, int32_t cond,
-     int32_t rs1, int32_t i, jit_int32_t rs2_imm7)
+     int32_t rs1, int32_t i, int32_t rs2_imm7)
 {
     jit_instr_t		v;
     assert(!(cond & 0xfffffff0));
@@ -1117,7 +1117,7 @@ _f3t(jit_state_t *_jit, int32_t cond,
 
 static void
 _f3a(jit_state_t *_jit, int32_t op, int32_t rd,
-     int32_t op3, int32_t rs1, jit_int32_t asi, jit_int32_t rs2)
+     int32_t op3, int32_t rs1, int32_t asi, int32_t rs2)
 {
     jit_instr_t		v;
     assert(!(op  & 0xfffffffc));
@@ -1229,7 +1229,7 @@ _addi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 #  if __WORDSIZE == 64
 static void
-_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (jit_carry == _NOREG)
@@ -1281,7 +1281,7 @@ _addci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 #  if __WORDSIZE == 64
 static void
-_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     assert(jit_carry != _NOREG);
@@ -1333,7 +1333,7 @@ _subi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 #  if __WORDSIZE == 64
 static void
-_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (jit_carry == _NOREG)
@@ -1385,7 +1385,7 @@ _subci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 #  if __WORDSIZE == 64
 static void
-_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     assert(jit_carry != _NOREG);
@@ -1568,7 +1568,7 @@ _qmuli_u(jit_state_t *_jit, int32_t r0, int32_t r1,
 #  endif
 
 static void
-_divr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #  if __WORDSIZE == 32
     int32_t		reg;
@@ -1614,7 +1614,7 @@ _divi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_divr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #  if __WORDSIZE == 32
     WRYI(0, 0);
@@ -1692,7 +1692,7 @@ _iqdivi(jit_state_t *_jit, int32_t r0, int32_t r1,
 }
 
 static void
-_remr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r1 || r0 == r2) {
@@ -1720,7 +1720,7 @@ _remi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_remr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r1 || r0 == r2) {
@@ -1828,7 +1828,7 @@ _extr_ui(jit_state_t *_jit, int32_t r0, int32_t r1)
 
 static void
 _cr(jit_state_t *_jit, int32_t cc,
-    int32_t r0, int32_t r1, jit_int32_t r2)
+    int32_t r0, int32_t r1, int32_t r2)
 {
     CMP(r1, r2);
 #  if __WORDSIZE == 32
diff --git a/jit/sparc-fpu.c b/jit/sparc-fpu.c
index 4a95083d8..3305b4deb 100644
--- a/jit/sparc-fpu.c
+++ b/jit/sparc-fpu.c
@@ -92,7 +92,7 @@
 #  define FPop2(rd, rs1, opf, rs2)	f3f(rd, 53, rs1, opf, rs2)
 #  define f3f(rd, op3, rs1, opf, rs2)	_f3f(_jit, rd, op3, rs1, opf, rs2)
 static void
-_f3f(jit_state_t*,int32_t,int32_t,jit_int32_t, jit_int32_t,jit_int32_t);
+_f3f(jit_state_t*,int32_t,int32_t,int32_t, int32_t,int32_t);
 #  define FITOS(rs2, rd)		FPop1(rd, 0, 196, rs2)
 #  define FITOD(rs2, rd)		FPop1(rd, 0, 200, rs2)
 #  define FITOQ(rs2, rd)		FPop1(rd, 0, 204, rs2)
@@ -257,7 +257,7 @@ static void _rfop1d(jit_state_t*,int32_t,
 #  else
 #    define fop2f(op, r0, r1, r2)	_fop2f(_jit, op, r0, r1, r2)
 static void _fop2f(jit_state_t*, int32_t,
-		   int32_t, int32_t, jit_int32_t);
+		   int32_t, int32_t, int32_t);
 #    define addr_f(r0, r1, r2)		fop2f(SPARC_FADDS, r0, r1, r2)
 #    define subr_f(r0, r1, r2)		fop2f(SPARC_FSUBS, r0, r1, r2)
 #    define mulr_f(r0, r1, r2)		fop2f(SPARC_FMULS, r0, r1, r2)
@@ -282,10 +282,10 @@ static void _fop2f(jit_state_t*, int32_t,
 #  define divr_d(r0, r1, r2)		FDIVD(r1, r2, r0)
 #  define divi_d(r0, r1, i0)		fop1d(SPARC_FDIVD, r0, r1, i0)
 #define fcr(cc, r0, r1, r2)		_fcr(_jit, cc, r0, r1, r2)
-static void _fcr(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _fcr(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #define fcw(cc, r0, r1, i0)		_fcw(_jit, cc, r0, r1, i0)
 static void
-_fcw(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_float32_t*);
+_fcw(jit_state_t*,int32_t,int32_t,int32_t,jit_float32_t*);
 #  define ltr_f(r0, r1, r2)		fcr(SPARC_FBL, r0, r1, r2)
 #  define lti_f(r0, r1, i0)		fcw(SPARC_FBL, r0, r1, i0)
 #  define ler_f(r0, r1, r2)		fcr(SPARC_FBLE, r0, r1, r2)
@@ -315,10 +315,10 @@ _fcw(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_float32_t*);
 #  define unordr_f(r0, r1, r2)		fcr(SPARC_FBU, r0, r1, r2)
 #  define unordi_f(r0, r1, i0)		fcw(SPARC_FBU, r0, r1, i0)
 #define dcr(cc, r0, r1, r2)		_dcr(_jit, cc, r0, r1, r2)
-static void _dcr(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _dcr(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #define dcw(cc, r0, r1, i0)		_dcw(_jit, cc, r0, r1, i0)
 static void
-_dcw(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_float64_t*);
+_dcw(jit_state_t*,int32_t,int32_t,int32_t,jit_float64_t*);
 #  define ltr_d(r0, r1, r2)		dcr(SPARC_FBL, r0, r1, r2)
 #  define lti_d(r0, r1, i0)		dcw(SPARC_FBL, r0, r1, i0)
 #  define ler_d(r0, r1, r2)		dcr(SPARC_FBLE, r0, r1, r2)
@@ -359,7 +359,7 @@ static void _ldi_f(jit_state_t*,int32_t,jit_word_t);
 #    define ldxr_f(r0, r1, r2)		LDF(r1, r2, r0)
 #  else
 #  define ldxr_f(r0, r1, r2)		_ldxr_f(_jit, r0, r1, r2)
-static void _ldxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  endif
 #  define ldxi_f(r0, r1, i0)		_ldxi_f(_jit, r0, r1, i0)
 static void _ldxi_f(jit_state_t*,int32_t,int32_t,jit_word_t);
@@ -375,7 +375,7 @@ static void _sti_f(jit_state_t*,jit_word_t,int32_t);
 #    define stxr_f(r0, r1, r2)		STF(r2, r1, r0)
 #  else
 #  define stxr_f(r0, r1, r2)		_stxr_f(_jit, r0, r1, r2)
-static void _stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  endif
 #  define stxi_f(r0, r1, i0)		_stxi_f(_jit, r0, r1, i0)
 static void _stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
@@ -384,16 +384,16 @@ static void _stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
 static void _ldi_d(jit_state_t*,int32_t,jit_word_t);
 #  define ldxr_d(r0, r1, r2)		LDDF(r1, r2, r0)
 #  define ldxi_d(r0, r1, i0)		_ldxi_d(_jit, r0, r1, i0)
-static void _ldxi_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _ldxi_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define str_d(r0, r1)			STDF(r1, r0, 0)
 #  define sti_d(r0, i0)			_sti_d(_jit, r0, i0)
 static void _sti_d(jit_state_t*,jit_word_t,int32_t);
 #  define stxr_d(r0, r1, r2)		STDF(r2, r1, r0)
 #  define stxi_d(r0, r1, i0)		_stxi_d(_jit, r0, r1, i0)
-static void _stxi_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _stxi_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define fbr(cc, i0, r0, r1)		_fbr(_jit, cc, i0, r0, r1)
 static jit_word_t
-_fbr(jit_state_t*,int32_t,jit_word_t,int32_t,jit_int32_t);
+_fbr(jit_state_t*,int32_t,jit_word_t,int32_t,int32_t);
 #  define fbw(cc, i0, r0, i1)		_fbw(_jit, cc, i0, r0, i1)
 static jit_word_t
 _fbw(jit_state_t*,int32_t,jit_word_t,int32_t,jit_float32_t*);
@@ -427,7 +427,7 @@ _fbw(jit_state_t*,int32_t,jit_word_t,int32_t,jit_float32_t*);
 #  define bunordi_f(i0, r0, i1)		fbw(SPARC_FBU, i0, r0, i1)
 #  define dbr(cc, i0, r0, r1)		_dbr(_jit, cc, i0, r0, r1)
 static jit_word_t
-_dbr(jit_state_t*,int32_t,jit_word_t,int32_t,jit_int32_t);
+_dbr(jit_state_t*,int32_t,jit_word_t,int32_t,int32_t);
 #  define dbw(cc, i0, r0, i1)		_dbw(_jit, cc, i0, r0, i1)
 static jit_word_t
 _dbw(jit_state_t*,int32_t,jit_word_t,int32_t,jit_float64_t*);
@@ -466,7 +466,7 @@ static void _vaarg_d(jit_state_t*, int32_t, int32_t);
 #if CODE
 static void
 _f3f(jit_state_t *_jit, int32_t rd,
-     int32_t op3, int32_t rs1, jit_int32_t opf, jit_int32_t rs2)
+     int32_t op3, int32_t rs1, int32_t opf, int32_t rs2)
 {
     jit_instr_t		v;
 #  if __WORDSIZE == 64
@@ -748,7 +748,7 @@ _absr_d(jit_state_t *_jit, int32_t r0, int32_t r1)
 #  if __WORDSIZE == 64
 #    define single_rrr(NAME, CODE)					\
 static void								\
-NAME(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)	\
+NAME(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)	\
 {									\
     int32_t		x0, t0, x1, t1, x2, t2, mask = 0;		\
     if (!single_precision_p(r0)) {					\
@@ -803,7 +803,7 @@ NAME(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)	\
 
 static void
 _fop2f(jit_state_t *_jit, int32_t op,
-       int32_t r0, int32_t r1, jit_int32_t r2)
+       int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		x0, t0, x1, t1, x2, t2, mask = 0;
     if (!single_precision_p(r0)) {
@@ -1031,7 +1031,7 @@ _truncr_f_l(jit_state_t *_jit, int32_t r0, int32_t r1)
 
 static void
 _fcr(jit_state_t *_jit, int32_t cc,
-     int32_t r0, int32_t r1, jit_int32_t r2)
+     int32_t r0, int32_t r1, int32_t r2)
 {
 #  if __WORDSIZE == 64
     int32_t		x0, t0, x1, t1, mask = 0;
@@ -1099,7 +1099,7 @@ _fcw(jit_state_t *_jit, int32_t cc,
 
 static void
 _dcr(jit_state_t *_jit, int32_t cc,
-     int32_t r0, int32_t r1, jit_int32_t r2)
+     int32_t r0, int32_t r1, int32_t r2)
 {
     FCMPD(r1, r2);
     FBa(cc, 3);
@@ -1163,7 +1163,7 @@ _ldi_f(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 
 #  if __WORDSIZE == 64
 static void
-_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (!single_precision_p(r0)) {
@@ -1243,7 +1243,7 @@ _sti_f(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 
 #  if __WORDSIZE == 64
 static void
-_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (!single_precision_p(r2)) {
@@ -1342,7 +1342,7 @@ _ldi_d(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_ldxi_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t i0)
+_ldxi_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t i0)
 {
     int32_t		reg;
     if (s13_p(i0))
@@ -1370,7 +1370,7 @@ _sti_d(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_stxi_d(jit_state_t *_jit, int32_t i0, int32_t r0, jit_int32_t r1)
+_stxi_d(jit_state_t *_jit, int32_t i0, int32_t r0, int32_t r1)
 {
     int32_t		reg;
     if (s13_p(i0))
diff --git a/jit/x86-cpu.c b/jit/x86-cpu.c
index 9d2caf49c..31b773dfe 100644
--- a/jit/x86-cpu.c
+++ b/jit/x86-cpu.c
@@ -144,16 +144,16 @@
 	*(int8_t *)(instr - 1) = label - instr
 #  define rex(l, w, r, x, b)		_rex(_jit, l, w, r, x, b)
 static void
-_rex(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t,jit_int32_t);
+_rex(jit_state_t*,int32_t,int32_t,int32_t,int32_t,int32_t);
 #  define rx(rd, md, rb, ri, ms)	_rx(_jit, rd, md, rb, ri, ms)
 static void
-_rx(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t,jit_int32_t);
+_rx(jit_state_t*,int32_t,int32_t,int32_t,int32_t,int32_t);
 #  define nop(n)			_nop(_jit, n)
 static void _nop(jit_state_t*, int32_t);
 #  define emms()			is(0x770f)
 #  define lea(md, rb, ri, ms, rd)	_lea(_jit, md, rb, ri, ms, rd)
 static void
-_lea(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t,jit_int32_t);
+_lea(jit_state_t*,int32_t,int32_t,int32_t,int32_t,int32_t);
 #  define pushr(r0)			_pushr(_jit, r0)
 static void _pushr(jit_state_t*, int32_t) maybe_unused;
 #  define popr(r0)			_popr(_jit, r0)
@@ -168,7 +168,7 @@ static void _testi(jit_state_t*, int32_t, jit_word_t);
 static void _cc(jit_state_t*, int32_t, int32_t);
 #  define icmpr(r0, r1)			alur(X86_CMP, r0, r1)
 #  define alur(code, r0, r1)		_alur(_jit, code, r0, r1)
-static void _alur(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _alur(jit_state_t*, int32_t, int32_t, int32_t);
 #  define icmpi(r0, i0)			alui(X86_CMP, r0, i0)
 #  define alui(code, r0, i0)		_alui(_jit, code, r0, i0)
 static void _alui(jit_state_t*, int32_t, int32_t, jit_word_t);
@@ -178,33 +178,33 @@ static void _save(jit_state_t*, int32_t);
 #  define load(r0)			_load(_jit, r0)
 static void _load(jit_state_t*, int32_t);
 #  define addr(r0, r1, r2)		_addr(_jit, r0, r1, r2)
-static void _addr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _addr(jit_state_t*, int32_t, int32_t, int32_t);
 #  define iaddi(r0, i0)			alui(X86_ADD, r0, i0)
 #  define addi(r0, r1, i0)		_addi(_jit, r0, r1, i0)
 static void _addi(jit_state_t*, int32_t, int32_t, jit_word_t);
 #define addcr(r0, r1, r2)		_addcr(_jit, r0, r1, r2)
-static void _addcr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _addcr(jit_state_t*, int32_t, int32_t, int32_t);
 #define addci(r0, r1, i0)		_addci(_jit, r0, r1, i0)
 static void _addci(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define iaddxr(r0, r1)		alur(X86_ADC, r0, r1)
 #  define addxr(r0, r1, r2)		_addxr(_jit, r0, r1, r2)
-static void _addxr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _addxr(jit_state_t*, int32_t, int32_t, int32_t);
 #  define iaddxi(r0, i0)		alui(X86_ADC, r0, i0)
 #  define addxi(r0, r1, i0)		_addxi(_jit, r0, r1, i0)
 static void _addxi(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define isubr(r0, r1)			alur(X86_SUB, r0, r1)
 #  define subr(r0, r1, r2)		_subr(_jit, r0, r1, r2)
-static void _subr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _subr(jit_state_t*, int32_t, int32_t, int32_t);
 #  define isubi(r0, i0)			alui(X86_SUB, r0, i0)
 #  define subi(r0, r1, i0)		_subi(_jit, r0, r1, i0)
 static void _subi(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define subcr(r0, r1, r2)		_subcr(_jit, r0, r1, r2)
-static void _subcr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subcr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define subci(r0, r1, i0)		_subci(_jit, r0, r1, i0)
 static void _subci(jit_state_t*,int32_t,int32_t,jit_word_t);
 #  define isubxr(r0, r1)		alur(X86_SBB, r0, r1)
 #  define subxr(r0, r1, r2)		_subxr(_jit, r0, r1, r2)
-static void _subxr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _subxr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define isubxi(r0, i0)		alui(X86_SBB, r0, i0)
 #  define subxi(r0, r1, i0)		_subxi(_jit, r0, r1, i0)
 static void _subxi(jit_state_t*,int32_t,int32_t,jit_word_t);
@@ -215,7 +215,7 @@ static void _imulr(jit_state_t*, int32_t, int32_t);
 #  define imuli(r0, r1, i0)		_imuli(_jit, r0, r1, i0)
 static void _imuli(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define mulr(r0, r1, r2)		_mulr(_jit, r0, r1, r2)
-static void _mulr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _mulr(jit_state_t*, int32_t, int32_t, int32_t);
 #  define muli(r0, r1, i0)		_muli(_jit, r0, r1, i0)
 static void _muli(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define umulr(r0)			unr(X86_IMUL, r0)
@@ -236,7 +236,7 @@ static void _sign_extend_rdx_rax(jit_state_t*);
 #  define idivr_u(r0)			unr(X86_DIV, r0)
 #  define divremr(r0, r1, r2, i0, i1)	_divremr(_jit, r0, r1, r2, i0, i1)
 static void
-_divremr(jit_state_t*,int32_t,int32_t,jit_int32_t,
+_divremr(jit_state_t*,int32_t,int32_t,int32_t,
 	 jit_bool_t,jit_bool_t);
 #  define divremi(r0, r1, i0, i1, i2)	_divremi(_jit, r0, r1, i0, i1, i2)
 static void
@@ -261,19 +261,19 @@ static void _iqdivi(jit_state_t*, int32_t, int32_t,
 #  define remi_u(r0, r1, i0)		divremi(r0, r1, i0, 0, 0)
 #  define iandr(r0, r1)			alur(X86_AND, r0, r1)
 #  define andr(r0, r1, r2)		_andr(_jit, r0, r1, r2)
-static void _andr(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _andr(jit_state_t*,int32_t,int32_t,int32_t);
 #  define iandi(r0, i0)			alui(X86_AND, r0, i0)
 #  define andi(r0, r1, i0)		_andi(_jit, r0, r1, i0)
 static void _andi(jit_state_t*, int32_t,int32_t,jit_word_t);
 #  define iorr(r0, r1)			alur(X86_OR, r0, r1)
 #  define orr(r0, r1, r2)		_orr(_jit, r0, r1, r2)
-static void _orr(jit_state_t*, int32_t,int32_t,jit_int32_t);
+static void _orr(jit_state_t*, int32_t,int32_t,int32_t);
 #  define iori(r0, i0)			alui(X86_OR, r0, i0)
 #  define ori(r0, r1, i0)		_ori(_jit, r0, r1, i0)
 static void _ori(jit_state_t*, int32_t,int32_t,jit_word_t);
 #  define ixorr(r0, r1)			alur(X86_XOR, r0, r1)
 #  define xorr(r0, r1, r2)		_xorr(_jit, r0, r1, r2)
-static void _xorr(jit_state_t*, int32_t,int32_t,jit_int32_t);
+static void _xorr(jit_state_t*, int32_t,int32_t,int32_t);
 #  define ixori(r0, i0)			alui(X86_XOR, r0, i0)
 #  define xori(r0, r1, i0)		_xori(_jit, r0, r1, i0)
 static void _xori(jit_state_t*, int32_t,int32_t,jit_word_t);
@@ -281,12 +281,12 @@ static void _xori(jit_state_t*, int32_t,int32_t,jit_word_t);
 static void _irotshr(jit_state_t*, int32_t, int32_t);
 #  define rotshr(code, r0, r1, r2)	_rotshr(_jit, code, r0, r1, r2)
 static void
-_rotshr(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+_rotshr(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define irotshi(code, r0, i0)		_irotshi(_jit, code, r0, i0)
 static void _irotshi(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define rotshi(code, r0, r1, i0)	_rotshi(_jit, code, r0, r1, i0)
 static void
-_rotshi(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_word_t);
+_rotshi(jit_state_t*,int32_t,int32_t,int32_t,jit_word_t);
 #  define lshr(r0, r1, r2)		rotshr(X86_SHL, r0, r1, r2)
 #  define lshi(r0, r1, i0)		_lshi(_jit, r0, r1, i0)
 static void _lshi(jit_state_t*, int32_t, int32_t, jit_word_t);
@@ -310,47 +310,47 @@ static void _decr(jit_state_t*, int32_t, int32_t);
 #  endif
 #  define cr(code, r0, r1, r2)		_cr(_jit, code, r0, r1, r2)
 static void
-_cr(jit_state_t*, int32_t, int32_t, jit_int32_t, jit_int32_t);
+_cr(jit_state_t*, int32_t, int32_t, int32_t, int32_t);
 #  define ci(code, r0, r1, i0)		_ci(_jit, code, r0, r1, i0)
 static void
-_ci(jit_state_t *_jit, int32_t, int32_t, jit_int32_t, jit_word_t);
+_ci(jit_state_t *_jit, int32_t, int32_t, int32_t, jit_word_t);
 #  define ci0(code, r0, r1)		_ci0(_jit, code, r0, r1)
-static void _ci0(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ci0(jit_state_t*, int32_t, int32_t, int32_t);
 #  define ltr(r0, r1, r2)		_ltr(_jit, r0, r1, r2)
-static void _ltr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ltr(jit_state_t*, int32_t, int32_t, int32_t);
 #  define lti(r0, r1, i0)			_lti(_jit, r0, r1, i0)
 static void _lti(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define ltr_u(r0, r1, r2)		_ltr_u(_jit, r0, r1, r2)
-static void _ltr_u(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ltr_u(jit_state_t*, int32_t, int32_t, int32_t);
 #  define lti_u(r0, r1, i0)		ci(X86_CC_B, r0, r1, i0)
 #  define ler(r0, r1, r2)		_ler(_jit, r0, r1, r2)
-static void _ler(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ler(jit_state_t*, int32_t, int32_t, int32_t);
 #  define lei(r0, r1, i0)		ci(X86_CC_LE, r0, r1, i0)
 #  define ler_u(r0, r1, r2)		_ler_u(_jit, r0, r1, r2)
-static void _ler_u(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ler_u(jit_state_t*, int32_t, int32_t, int32_t);
 #  define lei_u(r0, r1, i0)		_lei_u(_jit, r0, r1, i0)
 static void _lei_u(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define eqr(r0, r1, r2)		_eqr(_jit, r0, r1, r2)
-static void _eqr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _eqr(jit_state_t*, int32_t, int32_t, int32_t);
 #  define eqi(r0, r1, i0)		_eqi(_jit, r0, r1, i0)
 static void _eqi(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define ger(r0, r1, r2)		_ger(_jit, r0, r1, r2)
-static void _ger(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ger(jit_state_t*, int32_t, int32_t, int32_t);
 #  define gei(r0, r1, i0)		_gei(_jit, r0, r1, i0)
 static void _gei(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define ger_u(r0, r1, r2)		_ger_u(_jit, r0, r1, r2)
-static void _ger_u(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ger_u(jit_state_t*, int32_t, int32_t, int32_t);
 #  define gei_u(r0, r1, i0)		_gei_u(_jit, r0, r1, i0)
 static void _gei_u(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define gtr(r0, r1, r2)		_gtr(_jit, r0, r1, r2)
-static void _gtr(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _gtr(jit_state_t*, int32_t, int32_t, int32_t);
 #  define gti(r0, r1, i0)		_ci(_jit, X86_CC_G, r0, r1, i0)
 #  define gtr_u(r0, r1, r2)		_gtr_u(_jit, r0, r1, r2)
-static void _gtr_u(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _gtr_u(jit_state_t*, int32_t, int32_t, int32_t);
 #  define gti_u(r0, r1, i0)		_gti_u(_jit, r0, r1, i0)
 static void _gti_u(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define ner(r0, r1, r2)		_ner(_jit, r0, r1, r2)
-static void _ner(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ner(jit_state_t*, int32_t, int32_t, int32_t);
 #  define nei(r0, r1, i0)		_nei(_jit, r0, r1, i0)
 static void _nei(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define movr(r0, r1)			_movr(_jit, r0, r1)
@@ -433,24 +433,24 @@ static void _ldi_l(jit_state_t*, int32_t, jit_word_t);
 #    endif
 #  endif
 #  define ldxr_c(r0, r1, r2)		_ldxr_c(_jit, r0, r1, r2)
-static void _ldxr_c(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ldxr_c(jit_state_t*, int32_t, int32_t, int32_t);
 #  define ldxi_c(r0, r1, i0)		_ldxi_c(_jit, r0, r1, i0)
 static void _ldxi_c(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define ldxr_uc(r0, r1, r2)		_ldxr_uc(_jit, r0, r1, r2)
-static void _ldxr_uc(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ldxr_uc(jit_state_t*, int32_t, int32_t, int32_t);
 #  define ldxi_uc(r0, r1, i0)		_ldxi_uc(_jit, r0, r1, i0)
 static void _ldxi_uc(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define ldxr_s(r0, r1, r2)		_ldxr_s(_jit, r0, r1, r2)
-static void _ldxr_s(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ldxr_s(jit_state_t*, int32_t, int32_t, int32_t);
 #  define ldxi_s(r0, r1, i0)		_ldxi_s(_jit, r0, r1, i0)
 static void _ldxi_s(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define ldxr_us(r0, r1, r2)		_ldxr_us(_jit, r0, r1, r2)
-static void _ldxr_us(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ldxr_us(jit_state_t*, int32_t, int32_t, int32_t);
 #  define ldxi_us(r0, r1, i0)		_ldxi_us(_jit, r0, r1, i0)
 static void _ldxi_us(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  if __X32 || !__X64_32
 #    define ldxr_i(r0, r1, r2)		_ldxr_i(_jit, r0, r1, r2)
-static void _ldxr_i(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ldxr_i(jit_state_t*, int32_t, int32_t, int32_t);
 #    define ldxi_i(r0, r1, i0)		_ldxi_i(_jit, r0, r1, i0)
 static void _ldxi_i(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  endif
@@ -462,11 +462,11 @@ static void _ldxi_i(jit_state_t*, int32_t, int32_t, jit_word_t);
 #      define ldxr_ui(r0, r1, r2)	_ldxr_ui(_jit, r0, r1, r2)
 #      define ldxi_ui(r0, r1, i0)	_ldxi_ui(_jit, r0, r1, i0)
 #    endif
-static void _ldxr_ui(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ldxr_ui(jit_state_t*, int32_t, int32_t, int32_t);
 static void _ldxi_ui(jit_state_t*, int32_t, int32_t, jit_word_t);
 #    if !__X64_32
 #      define ldxr_l(r0, r1, r2)	_ldxr_l(_jit, r0, r1, r2)
-static void _ldxr_l(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _ldxr_l(jit_state_t*, int32_t, int32_t, int32_t);
 #      define ldxi_l(r0, r1, i0)	_ldxi_l(_jit, r0, r1, i0)
 static void _ldxi_l(jit_state_t*, int32_t, int32_t, jit_word_t);
 #    endif
@@ -490,20 +490,20 @@ static void _str_l(jit_state_t*, int32_t, int32_t);
 static void _sti_l(jit_state_t*, jit_word_t, int32_t);
 #  endif
 #  define stxr_c(r0, r1, r2)		_stxr_c(_jit, r0, r1, r2)
-static void _stxr_c(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _stxr_c(jit_state_t*, int32_t, int32_t, int32_t);
 #  define stxi_c(i0, r0, r1)		_stxi_c(_jit, i0, r0, r1)
 static void _stxi_c(jit_state_t*, jit_word_t, int32_t, int32_t);
 #  define stxr_s(r0, r1, r2)		_stxr_s(_jit, r0, r1, r2)
-static void _stxr_s(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _stxr_s(jit_state_t*, int32_t, int32_t, int32_t);
 #  define stxi_s(i0, r0, r1)		_stxi_s(_jit, i0, r0, r1)
 static void _stxi_s(jit_state_t*, jit_word_t, int32_t, int32_t);
 #  define stxr_i(r0, r1, r2)		_stxr_i(_jit, r0, r1, r2)
-static void _stxr_i(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _stxr_i(jit_state_t*, int32_t, int32_t, int32_t);
 #  define stxi_i(i0, r0, r1)		_stxi_i(_jit, i0, r0, r1)
 static void _stxi_i(jit_state_t*, jit_word_t, int32_t, int32_t);
 #  if __X64 && !__X64_32
 #    define stxr_l(r0, r1, r2)		_stxr_l(_jit, r0, r1, r2)
-static void _stxr_l(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _stxr_l(jit_state_t*, int32_t, int32_t, int32_t);
 #    define stxi_l(i0, r0, r1)		_stxi_l(_jit, i0, r0, r1)
 static void _stxi_l(jit_state_t*, jit_word_t, int32_t, int32_t);
 #  endif
@@ -572,7 +572,7 @@ static void _jcc(jit_state_t*, int32_t, jit_word_t);
 #  define jnles(i0)			jccs(X86_CC_NLE, i0)
 static void _jccs(jit_state_t*, int32_t, jit_word_t);
 #  define jcr(code, i0, r0, r1)		_jcr(_jit, code, i0, r0, r1)
-static void _jcr(jit_state_t*,int32_t,jit_word_t,int32_t,jit_int32_t);
+static void _jcr(jit_state_t*,int32_t,jit_word_t,int32_t,int32_t);
 #  define jci(code, i0, r0, i1)		_jci(_jit, code, i0, r0, i1)
 static void _jci(jit_state_t*,int32_t,jit_word_t,int32_t,jit_word_t);
 #  define jci0(code, i0, r0)		_jci0(_jit, code, i0, r0)
@@ -691,7 +691,7 @@ static int ffsl(long);
 #if CODE
 static void
 _rex(jit_state_t *_jit, int32_t l, int32_t w,
-     int32_t r, int32_t x, jit_int32_t b)
+     int32_t r, int32_t x, int32_t b)
 {
 #if __X64
     int32_t	v = 0x40 | (w << 3);
@@ -709,7 +709,7 @@ _rex(jit_state_t *_jit, int32_t l, int32_t w,
 
 static void
 _rx(jit_state_t *_jit, int32_t rd, int32_t md,
-    int32_t rb, int32_t ri, jit_int32_t ms)
+    int32_t rb, int32_t ri, int32_t ms)
 {
     if (ri == _NOREG) {
 	if (rb == _NOREG) {
@@ -820,7 +820,7 @@ _nop(jit_state_t *_jit, int32_t count)
 
 static void
 _lea(jit_state_t *_jit, int32_t md, int32_t rb,
-     int32_t ri, int32_t ms, jit_int32_t rd)
+     int32_t ri, int32_t ms, int32_t rd)
 {
     rex(0, WIDE, rd, ri, rb);
     ic(0x8d);
@@ -880,7 +880,7 @@ _cc(jit_state_t *_jit, int32_t code, int32_t r0)
 }
 
 static void
-_alur(jit_state_t *_jit, int32_t code, int32_t r0, jit_int32_t r1)
+_alur(jit_state_t *_jit, int32_t code, int32_t r0, int32_t r1)
 {
     rex(0, WIDE, r1, _NOREG, r0);
     ic(code | 0x01);
@@ -938,7 +938,7 @@ _load(jit_state_t *_jit, int32_t r0)
 }
 
 static void
-_addr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r1)
 	iaddr(r0, r2);
@@ -979,7 +979,7 @@ _addi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	iaddr(r0, r1);
@@ -1010,7 +1010,7 @@ _addci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_addxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r2)
 	iaddxr(r0, r1);
@@ -1041,7 +1041,7 @@ _addxi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	ixorr(r0, r0);
@@ -1086,7 +1086,7 @@ _subi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subcr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2 && r0 != r1) {
@@ -1118,7 +1118,7 @@ _subci(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_subxr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r2 && r0 != r1) {
@@ -1191,7 +1191,7 @@ _imuli(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_mulr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r1)
 	imulr(r0, r2);
@@ -1341,7 +1341,7 @@ _sign_extend_rdx_rax(jit_state_t *_jit)
 }
 
 static void
-_divremr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2,
+_divremr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2,
 	 jit_bool_t sign, jit_bool_t divide)
 {
     int32_t		div;
@@ -1624,7 +1624,7 @@ _iqdivi(jit_state_t *_jit, int32_t r0, int32_t r1,
 #undef savset
 
 static void
-_andr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_andr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movr(r0, r1);
@@ -1664,7 +1664,7 @@ _andi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_orr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_orr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movr(r0, r1);
@@ -1703,7 +1703,7 @@ _ori(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_xorr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_xorr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	ixorr(r0, r0);
@@ -1751,7 +1751,7 @@ _irotshr(jit_state_t *_jit, int32_t code, int32_t r0)
 
 static void
 _rotshr(jit_state_t *_jit, int32_t code,
-	int32_t r0, int32_t r1, jit_int32_t r2)
+	int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     int32_t		use;
@@ -1888,7 +1888,7 @@ _decr(jit_state_t *_jit, int32_t r0, int32_t r1)
 
 static void
 _cr(jit_state_t *_jit,
-    int32_t code, int32_t r0, jit_int32_t r1, jit_int32_t r2)
+    int32_t code, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     jit_bool_t		same;
@@ -1913,7 +1913,7 @@ _cr(jit_state_t *_jit,
 
 static void
 _ci(jit_state_t *_jit,
-    int32_t code, int32_t r0, jit_int32_t r1, jit_word_t i0)
+    int32_t code, int32_t r0, int32_t r1, jit_word_t i0)
 {
     int32_t		reg;
     jit_bool_t		same;
@@ -1937,7 +1937,7 @@ _ci(jit_state_t *_jit,
 }
 
 static void
-_ci0(jit_state_t *_jit, int32_t code, int32_t r0, jit_int32_t r1)
+_ci0(jit_state_t *_jit, int32_t code, int32_t r0, int32_t r1)
 {
     int32_t		reg;
     jit_bool_t		same;
@@ -1961,7 +1961,7 @@ _ci0(jit_state_t *_jit, int32_t code, int32_t r0, jit_int32_t r1)
 }
 
 static void
-_ltr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 0);
@@ -1979,7 +1979,7 @@ _lti(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ltr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ltr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 0);
@@ -1988,7 +1988,7 @@ _ltr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_ler(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -1997,7 +1997,7 @@ _ler(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_ler_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ler_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -2015,7 +2015,7 @@ _lei_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_eqr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_eqr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -2033,7 +2033,7 @@ _eqi(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ger(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -2051,7 +2051,7 @@ _gei(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ger_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ger_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -2069,7 +2069,7 @@ _gei_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_gtr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_gtr(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 0);
@@ -2078,7 +2078,7 @@ _gtr(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 }
 
 static void
-_gtr_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_gtr_u(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 0);
@@ -2096,7 +2096,7 @@ _gti_u(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ner(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ner(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 0);
@@ -2476,7 +2476,7 @@ _ldi_l(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 #endif
 
 static void
-_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     addr(r0, r1, r2);
@@ -2508,7 +2508,7 @@ _ldxi_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_uc(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     addr(r0, r1, r2);
@@ -2540,7 +2540,7 @@ _ldxi_uc(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     addr(r0, r1, r2);
@@ -2572,7 +2572,7 @@ _ldxi_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 }
 
 static void
-_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_us(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     addr(r0, r1, r2);
@@ -2605,7 +2605,7 @@ _ldxi_us(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 #if __X64 || !__X64_32
 static void
-_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64
     rex(0, WIDE, r0, r1, r2);
@@ -2640,7 +2640,7 @@ _ldxi_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 #if __X64
 static void
-_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_ui(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     addr(r0, r1, r2);
@@ -2672,7 +2672,7 @@ _ldxi_ui(jit_state_t *_jit, int32_t r0, int32_t r1, jit_word_t i0)
 
 #  if !__X64_32
 static void
-_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_ldxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     rex(0, 1, r0, r1, r2);
     ic(0x8b);
@@ -2824,7 +2824,7 @@ _sti_l(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 #endif
 
 static void
-_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_c(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
 #if __X64_32
@@ -2877,7 +2877,7 @@ _stxi_c(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_s(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     int32_t		reg;
@@ -2912,7 +2912,7 @@ _stxi_s(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 }
 
 static void
-_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_i(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     int32_t		reg;
@@ -2946,7 +2946,7 @@ _stxi_i(jit_state_t *_jit, jit_word_t i0, int32_t r0, int32_t r1)
 
 #if __X64 && !__X64_32
 static void
-_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_stxr_l(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     rex(0, 1, r2, r1, r0);
     ic(0x89);
@@ -2992,7 +2992,7 @@ _jcc(jit_state_t *_jit, int32_t code, jit_word_t i0)
 
 static void
 _jcr(jit_state_t *_jit,
-     int32_t code, jit_word_t i0, int32_t r0, jit_int32_t r1)
+     int32_t code, jit_word_t i0, int32_t r0, int32_t r1)
 {
     alur(X86_CMP, r0, r1);
     jcc(code, i0);
diff --git a/jit/x86-sse.c b/jit/x86-sse.c
index f1c38443b..db5f63ecd 100644
--- a/jit/x86-sse.c
+++ b/jit/x86-sse.c
@@ -70,11 +70,11 @@
 #define X86_SSE_G2X			0x7e
 #define X86_SSE_MOV2			0xd6
 #  define sser(c,r0,r1)			_sser(_jit,c,r0,r1)
-static void _sser(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _sser(jit_state_t*,int32_t,int32_t,int32_t);
 #  define ssexr(p,c,r0,r1)		_ssexr(_jit,p,c,r0,r1)
-static void _ssexr(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _ssexr(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define ssexi(c,r0,m,i)		_ssexi(_jit,c,r0,m,i)
-static void _ssexi(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
+static void _ssexi(jit_state_t*,int32_t,int32_t,int32_t,int32_t);
 #  define addssr(r0, r1)		ssexr(0xf3, X86_SSE_ADD, r0, r1)
 #  define addsdr(r0, r1)		ssexr(0xf2, X86_SSE_ADD, r0, r1)
 #  define subssr(r0, r1)		ssexr(0xf3, X86_SSE_SUB, r0, r1)
@@ -112,7 +112,7 @@ static void _ssexi(jit_state_t*,int32_t,int32_t,jit_int32_t,jit_int32_t);
 #  if __X64 && !__X64_32
 #    define sselxr(p,c,r0,r1)		_sselxr(_jit,p,c,r0,r1)
 static void
-_sselxr(jit_state_t*, int32_t, int32_t, jit_int32_t, jit_int32_t);
+_sselxr(jit_state_t*, int32_t, int32_t, int32_t, int32_t);
 #  else
 #    define sselxr(p,c,r0,r1)		ssexr(p,c,r0,r1)
 #  endif
@@ -122,22 +122,22 @@ _sselxr(jit_state_t*, int32_t, int32_t, jit_int32_t, jit_int32_t);
 #  define movssrm(rs,md,mb,mi,ms)	ssexrx(0xf3,X86_SSE_MOV1,md,mb,mi,ms,rs)
 #  define movsdrm(rs,md,mb,mi,ms)	ssexrx(0xf2,X86_SSE_MOV1,md,mb,mi,ms,rs)
 static void
-_ssexrx(jit_state_t*, int32_t, int32_t, jit_int32_t,
-	int32_t, int32_t, jit_int32_t, jit_int32_t);
+_ssexrx(jit_state_t*, int32_t, int32_t, int32_t,
+	int32_t, int32_t, int32_t, int32_t);
 #  define sse_addr_f(r0, r1, r2)	_sse_addr_f(_jit, r0, r1, r2)
-static void _sse_addr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _sse_addr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define sse_addi_f(r0, r1, i0)	_sse_addi_f(_jit, r0, r1, i0)
 static void _sse_addi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_addr_d(r0, r1, r2)	_sse_addr_d(_jit, r0, r1, r2)
-static void _sse_addr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _sse_addr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define sse_addi_d(r0, r1, i0)	_sse_addi_d(_jit, r0, r1, i0)
 static void _sse_addi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_subr_f(r0, r1, r2)	_sse_subr_f(_jit, r0, r1, r2)
-static void _sse_subr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _sse_subr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define sse_subi_f(r0, r1, i0)	_sse_subi_f(_jit, r0, r1, i0)
 static void _sse_subi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_subr_d(r0, r1, r2)	_sse_subr_d(_jit, r0, r1, r2)
-static void _sse_subr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _sse_subr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define sse_subi_d(r0, r1, i0)	_sse_subi_d(_jit, r0, r1, i0)
 static void _sse_subi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_rsbr_f(r0, r1, r2)	sse_subr_f(r0, r2, r1)
@@ -147,19 +147,19 @@ static void _sse_rsbi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_rsbi_d(r0, r1, i0)	_sse_rsbi_d(_jit, r0, r1, i0)
 static void _sse_rsbi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_mulr_f(r0, r1, r2)	_sse_mulr_f(_jit, r0, r1, r2)
-static void _sse_mulr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _sse_mulr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define sse_muli_f(r0, r1, i0)	_sse_muli_f(_jit, r0, r1, i0)
 static void _sse_muli_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_mulr_d(r0, r1, r2)	_sse_mulr_d(_jit, r0, r1, r2)
-static void _sse_mulr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _sse_mulr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define sse_muli_d(r0, r1, i0)	_sse_muli_d(_jit, r0, r1, i0)
 static void _sse_muli_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_divr_f(r0, r1, r2)	_sse_divr_f(_jit, r0, r1, r2)
-static void _sse_divr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _sse_divr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define sse_divi_f(r0, r1, i0)	_sse_divi_f(_jit, r0, r1, i0)
 static void _sse_divi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_divr_d(r0, r1, r2)	_sse_divr_d(_jit, r0, r1, r2)
-static void _sse_divr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _sse_divr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define sse_divi_d(r0, r1, i0)	_sse_divi_d(_jit, r0, r1, i0)
 static void _sse_divi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_absr_f(r0, r1)		_sse_absr_f(_jit, r0, r1)
@@ -176,7 +176,7 @@ static void _sse_negr_d(jit_state_t*,int32_t,int32_t);
 #  define ssecmpd(code, r0, r1, r2)	_ssecmp(_jit, 1, code, r0, r1, r2)
 static void
 _ssecmp(jit_state_t*, jit_bool_t, int32_t,
-	int32_t, int32_t, jit_int32_t);
+	int32_t, int32_t, int32_t);
 #define sse_movr_f(r0,r1)		_sse_movr_f(_jit,r0,r1)
 static void _sse_movr_f(jit_state_t*, int32_t, int32_t);
 #define sse_movi_f(r0,i0)		_sse_movi_f(_jit,r0,i0)
@@ -190,7 +190,7 @@ static void _sse_lei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_eqi_f(r0, r1, i0)		_sse_eqi_f(_jit, r0, r1, i0)
 static void _sse_eqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_eqr_f(r0, r1, r2)		_sse_eqr_f(_jit, r0, r1, r2)
-static void _sse_eqr_f(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_eqr_f(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_gei_f(r0, r1, i0)		_sse_gei_f(_jit, r0, r1, i0)
 static void _sse_gei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_ger_f(r0, r1, r2)		ssecmpf(X86_CC_AE, r0, r2, r1)
@@ -200,7 +200,7 @@ static void _sse_gti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_nei_f(r0, r1, i0)		_sse_nei_f(_jit, r0, r1, i0)
 static void _sse_nei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_ner_f(r0, r1, r2)		_sse_ner_f(_jit, r0, r1, r2)
-static void _sse_ner_f(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_ner_f(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_unlti_f(r0, r1, i0)	_sse_unlti_f(_jit, r0, r1, i0)
 static void _sse_unlti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_unltr_f(r0, r1, r2)	ssecmpf(X86_CC_NAE, r0, r2, r1)
@@ -209,20 +209,20 @@ static void _sse_unlei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_unler_f(r0, r1, r2)	_sse_unler_f(_jit, r0, r1, r2)
 #  define sse_uneqi_f(r0, r1, i0)	_sse_uneqi_f(_jit, r0, r1, i0)
 static void _sse_uneqi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
-static void _sse_unler_f(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_unler_f(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_uneqr_f(r0, r1, r2)	_sse_uneqr_f(_jit, r0, r1, r2)
-static void _sse_uneqr_f(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_uneqr_f(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_ungei_f(r0, r1, i0)	_sse_ungei_f(_jit, r0, r1, i0)
 static void _sse_ungei_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_unger_f(r0, r1, r2)	_sse_unger_f(_jit, r0, r1, r2)
-static void _sse_unger_f(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_unger_f(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_ungti_f(r0, r1, i0)	_sse_ungti_f(_jit, r0, r1, i0)
 static void _sse_ungti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_ungtr_f(r0, r1, r2)	ssecmpf(X86_CC_NAE, r0, r1, r2)
 #  define sse_ltgti_f(r0, r1, i0)	_sse_ltgti_f(_jit, r0, r1, i0)
 static void _sse_ltgti_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_ltgtr_f(r0, r1, r2)	_sse_ltgtr_f(_jit, r0, r1, r2)
-static void _sse_ltgtr_f(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_ltgtr_f(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_ordi_f(r0, r1, i0)	_sse_ordi_f(_jit, r0, r1, i0)
 static void _sse_ordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_ordr_f(r0, r1, r2)	ssecmpf(X86_CC_NP, r0, r2, r1)
@@ -233,14 +233,14 @@ static void _sse_unordi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define sse_ldi_f(r0, i0)		_sse_ldi_f(_jit, r0, i0)
 static void _sse_ldi_f(jit_state_t*, int32_t, jit_word_t);
 #  define sse_ldxr_f(r0, r1, r2)	_sse_ldxr_f(_jit, r0, r1, r2)
-static void _sse_ldxr_f(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_ldxr_f(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_ldxi_f(r0, r1, i0)	_sse_ldxi_f(_jit, r0, r1, i0)
 static void _sse_ldxi_f(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define sse_str_f(r0, r1)		movssrm(r1, 0, r0, _NOREG, _SCL1)
 #  define sse_sti_f(i0, r0)		_sse_sti_f(_jit, i0, r0)
 static void _sse_sti_f(jit_state_t*, jit_word_t,int32_t);
 #  define sse_stxr_f(r0, r1, r2)	_sse_stxr_f(_jit, r0, r1, r2)
-static void _sse_stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _sse_stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define sse_stxi_f(i0, r0, r1)	_sse_stxi_f(_jit, i0, r0, r1)
 static void _sse_stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define sse_bltr_f(i0, r0, r1)	_sse_bltr_f(_jit, i0, r0, r1)
@@ -324,7 +324,7 @@ static void _sse_lti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_lei_d(r0, r1, i0)		_sse_lei_d(_jit, r0, r1, i0)
 static void _sse_lei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_eqr_d(r0, r1, r2)		_sse_eqr_d(_jit, r0, r1, r2)
-static void _sse_eqr_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_eqr_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_eqi_d(r0, r1, i0)		_sse_eqi_d(_jit, r0, r1, i0)
 static void _sse_eqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_ger_d(r0, r1, r2)		ssecmpd(X86_CC_AE, r0, r2, r1)
@@ -334,29 +334,29 @@ static void _sse_gei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_gti_d(r0, r1, i0)		_sse_gti_d(_jit, r0, r1, i0)
 static void _sse_gti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_ner_d(r0, r1, r2)		_sse_ner_d(_jit, r0, r1, r2)
-static void _sse_ner_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_ner_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_nei_d(r0, r1, i0)		_sse_nei_d(_jit, r0, r1, i0)
 static void _sse_nei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_unltr_d(r0, r1, r2)	ssecmpd(X86_CC_NAE, r0, r2, r1)
 #  define sse_unlti_d(r0, r1, i0)	_sse_unlti_d(_jit, r0, r1, i0)
 static void _sse_unlti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_unler_d(r0, r1, r2)	_sse_unler_d(_jit, r0, r1, r2)
-static void _sse_unler_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_unler_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_unlei_d(r0, r1, i0)	_sse_unlei_d(_jit, r0, r1, i0)
 static void _sse_unlei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_uneqr_d(r0, r1, r2)	_sse_uneqr_d(_jit, r0, r1, r2)
-static void _sse_uneqr_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_uneqr_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_uneqi_d(r0, r1, i0)	_sse_uneqi_d(_jit, r0, r1, i0)
 static void _sse_uneqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_unger_d(r0, r1, r2)	_sse_unger_d(_jit, r0, r1, r2)
-static void _sse_unger_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_unger_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_ungei_d(r0, r1, i0)	_sse_ungei_d(_jit, r0, r1, i0)
 static void _sse_ungei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_ungtr_d(r0, r1, r2)	ssecmpd(X86_CC_NAE, r0, r1, r2)
 #  define sse_ungti_d(r0, r1, i0)	_sse_ungti_d(_jit, r0, r1, i0)
 static void _sse_ungti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_ltgtr_d(r0, r1, r2)	_sse_ltgtr_d(_jit, r0, r1, r2)
-static void _sse_ltgtr_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_ltgtr_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_ltgti_d(r0, r1, i0)	_sse_ltgti_d(_jit, r0, r1, i0)
 static void _sse_ltgti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_ordr_d(r0, r1, r2)	ssecmpd(X86_CC_NP, r0, r2, r1)
@@ -369,7 +369,7 @@ static void _sse_unordi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define sse_ldi_d(r0, i0)		_sse_ldi_d(_jit, r0, i0)
 static void _sse_ldi_d(jit_state_t*, int32_t, jit_word_t);
 #  define sse_ldxr_d(r0, r1, r2)	_sse_ldxr_d(_jit, r0, r1, r2)
-static void _sse_ldxr_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _sse_ldxr_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define sse_ldxi_d(r0, r1, i0)	_sse_ldxi_d(_jit, r0, r1, i0)
 static void _sse_ldxi_d(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define sse_bltr_d(i0, r0, r1)	_sse_bltr_d(_jit, i0, r0, r1)
@@ -377,7 +377,7 @@ static void _sse_ldxi_d(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define sse_sti_d(i0, r0)		_sse_sti_d(_jit, i0, r0)
 static void _sse_sti_d(jit_state_t*, jit_word_t,int32_t);
 #  define sse_stxr_d(r0, r1, r2)	_sse_stxr_d(_jit, r0, r1, r2)
-static void _sse_stxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _sse_stxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define sse_stxi_d(i0, r0, r1)	_sse_stxi_d(_jit, i0, r0, r1)
 static void _sse_stxi_d(jit_state_t*,jit_word_t,int32_t,int32_t);
 static jit_word_t _sse_bltr_d(jit_state_t*,jit_word_t,int32_t,int32_t);
@@ -484,7 +484,7 @@ _sse_b##name##i_##type(jit_state_t *_jit,				\
 #  define dopi(name)			fpr_opi(name, d, 64)
 #  define dbopi(name)			fpr_bopi(name, d, 64)
 static void
-_sser(jit_state_t *_jit, int32_t c, int32_t r0, jit_int32_t r1)
+_sser(jit_state_t *_jit, int32_t c, int32_t r0, int32_t r1)
 {
     rex(0, 0, r0, 0, r1);
     ic(0x0f);
@@ -529,8 +529,8 @@ _sselxr(jit_state_t *_jit, int32_t p, int32_t c,
 #endif
 
 static void
-_ssexrx(jit_state_t *_jit, int32_t px, int32_t code, jit_int32_t md,
-       int32_t rb, int32_t ri, jit_int32_t ms, jit_int32_t rd)
+_ssexrx(jit_state_t *_jit, int32_t px, int32_t code, int32_t md,
+       int32_t rb, int32_t ri, int32_t ms, int32_t rd)
 {
     ic(px);
     rex(0, 0, rd, ri, rb);
@@ -540,7 +540,7 @@ _ssexrx(jit_state_t *_jit, int32_t px, int32_t code, jit_int32_t md,
 }
 
 static void
-_sse_addr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_addr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r1)
 	addssr(r0, r2);
@@ -555,7 +555,7 @@ _sse_addr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(add)
 
 static void
-_sse_addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r1)
 	addsdr(r0, r2);
@@ -570,7 +570,7 @@ _sse_addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(add)
 
 static void
-_sse_subr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_subr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r1)
@@ -591,7 +591,7 @@ _sse_subr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(sub)
 
 static void
-_sse_subr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_subr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r1)
@@ -616,7 +616,7 @@ fopi(rsb)
 dopi(rsb)
 
 static void
-_sse_mulr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_mulr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r1)
 	mulssr(r0, r2);
@@ -631,7 +631,7 @@ _sse_mulr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(mul)
 
 static void
-_sse_mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r1)
 	mulsdr(r0, r2);
@@ -646,7 +646,7 @@ _sse_mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(mul)
 
 static void
-_sse_divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r1)
@@ -667,7 +667,7 @@ _sse_divr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(div)
 
 static void
-_sse_divr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_divr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     int32_t		reg;
     if (r0 == r1)
@@ -765,7 +765,7 @@ _sse_negr_d(jit_state_t *_jit, int32_t r0, int32_t r1)
 
 static void
 _ssecmp(jit_state_t *_jit, jit_bool_t d, int32_t code,
-	int32_t r0, int32_t r1, jit_int32_t r2)
+	int32_t r0, int32_t r1, int32_t r2)
 {
     jit_bool_t		rc;
     int32_t		reg;
@@ -827,7 +827,7 @@ fopi(lt)
 fopi(le)
 
 static void
-_sse_eqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_eqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_bool_t		rc;
     int32_t		reg;
@@ -853,7 +853,7 @@ fopi(ge)
 fopi(gt)
 
 static void
-_sse_ner_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_ner_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_bool_t		rc;
     int32_t		reg;
@@ -878,7 +878,7 @@ fopi(ne)
 fopi(unlt)
 
 static void
-_sse_unler_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_unler_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -889,7 +889,7 @@ _sse_unler_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(unle)
 
 static void
-_sse_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -900,7 +900,7 @@ _sse_uneqr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 fopi(uneq)
 
 static void
-_sse_unger_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_unger_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -912,7 +912,7 @@ fopi(unge)
 fopi(ungt)
 
 static void
-_sse_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_ltgtr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	ixorr(r0, r0);
@@ -939,7 +939,7 @@ _sse_ldi_f(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_sse_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     int32_t		reg;
@@ -986,7 +986,7 @@ _sse_sti_f(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_sse_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     int32_t		reg;
@@ -1172,7 +1172,7 @@ dopi(lt)
 dopi(le)
 
 static void
-_sse_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_bool_t		rc;
     int32_t		reg;
@@ -1198,7 +1198,7 @@ dopi(ge)
 dopi(gt)
 
 static void
-_sse_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_bool_t		rc;
     int32_t		reg;
@@ -1223,7 +1223,7 @@ dopi(ne)
 dopi(unlt)
 
 static void
-_sse_unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -1234,7 +1234,7 @@ _sse_unler_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(unle)
 
 static void
-_sse_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -1245,7 +1245,7 @@ _sse_uneqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(uneq)
 
 static void
-_sse_unger_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_unger_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -1257,7 +1257,7 @@ dopi(unge)
 dopi(ungt)
 
 static void
-_sse_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	ixorr(r0, r0);
@@ -1332,7 +1332,7 @@ _sse_ldi_d(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_sse_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     int32_t		reg;
@@ -1379,7 +1379,7 @@ _sse_sti_d(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_sse_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_sse_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     int32_t		reg;
diff --git a/jit/x86-x87.c b/jit/x86-x87.c
index 94944cf8b..e6f8be5f4 100644
--- a/jit/x86-x87.c
+++ b/jit/x86-x87.c
@@ -38,7 +38,7 @@
 #  define fldcwm(md, rb, ri, ms)	x87rx(015, md, rb, ri, ms)
 #  define fstcwm(md, rb, ri, ms)	_fstcwm(_jit, md, rb, ri, ms)
 static void
-_fstcwm(jit_state_t*, int32_t, int32_t, jit_int32_t, jit_int32_t);
+_fstcwm(jit_state_t*, int32_t, int32_t, int32_t, int32_t);
 #  define fldsm(md, rb, ri, ms)		x87rx(010, md, rb, ri, ms)
 #  define fstsm(md, rb, ri, ms)		x87rx(012, md, rb, ri, ms)
 #  define fldlm(md, rb, ri, ms)		x87rx(050, md, rb, ri, ms)
@@ -50,7 +50,7 @@ _fstcwm(jit_state_t*, int32_t, int32_t, jit_int32_t, jit_int32_t);
 #  define fildqm(md, rb, ri, ms)	x87rx(075, md, rb,ri, ms)
 static void
 _x87rx(jit_state_t*, int32_t, int32_t,
-       int32_t, int32_t, jit_int32_t);
+       int32_t, int32_t, int32_t);
 #  define x87ri(cc,r0)			_x87ri(_jit,cc,r0)
 #  define fchs_()			x87ri(014, 0)
 #  define fabs_()			x87ri(014, 1)
@@ -76,19 +76,19 @@ static void _x87ri(jit_state_t*, int32_t, int32_t);
 #  define fdivr(r0, r1)			x87rri(006, r0, r1)
 #  define fdivrr(r0, r1)		x87rri(007, r0, r1)
 #  define x87rri(cc, r0, r1)		_x87rri(_jit, cc, r0, r1)
-static void _x87rri(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _x87rri(jit_state_t*, int32_t, int32_t, int32_t);
 #  define x87_addr_f(r0, r1, r2)	_x87_addr_d(_jit, r0, r1, r2)
 #  define x87_addi_f(r0, r1, i0)	_x87_addi_f(_jit, r0, r1, i0)
 static void _x87_addi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define x87_addr_d(r0, r1, r2)	_x87_addr_d(_jit, r0, r1, r2)
-static void _x87_addr_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _x87_addr_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define x87_addi_d(r0, r1, i0)	_x87_addi_d(_jit, r0, r1, i0)
 static void _x87_addi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_subr_f(r0, r1, r2)	_x87_subr_d(_jit, r0, r1, r2)
 #  define x87_subi_f(r0, r1, i0)	_x87_subi_f(_jit, r0, r1, i0)
 static void _x87_subi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define x87_subr_d(r0, r1, r2)	_x87_subr_d(_jit, r0, r1, r2)
-static void _x87_subr_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _x87_subr_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define x87_subi_d(r0, r1, i0)	_x87_subi_d(_jit, r0, r1, i0)
 static void _x87_subi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_rsbr_f(r0, r1, r2)	x87_subr_f(r0, r2, r1)
@@ -101,14 +101,14 @@ static void _x87_rsbi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_muli_f(r0, r1, i0)	_x87_muli_f(_jit, r0, r1, i0)
 static void _x87_muli_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define x87_mulr_d(r0, r1, r2)	_x87_mulr_d(_jit, r0, r1, r2)
-static void _x87_mulr_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _x87_mulr_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define x87_muli_d(r0, r1, i0)	_x87_muli_d(_jit, r0, r1, i0)
 static void _x87_muli_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_divr_f(r0, r1, r2)	_x87_divr_d(_jit, r0, r1, r2)
 #  define x87_divi_f(r0, r1, i0)	_x87_divi_f(_jit, r0, r1, i0)
 static void _x87_divi_f(jit_state_t*,int32_t,int32_t,jit_float32_t*);
 #  define x87_divr_d(r0, r1, r2)	_x87_divr_d(_jit, r0, r1, r2)
-static void _x87_divr_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _x87_divr_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define x87_divi_d(r0, r1, i0)	_x87_divi_d(_jit, r0, r1, i0)
 static void _x87_divi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_absr_f(r0, r1)		_x87_absr_d(_jit, r0, r1)
@@ -135,16 +135,16 @@ static void _x87_truncr_d_l(jit_state_t*, int32_t, int32_t);
 static void _x87_extr_d(jit_state_t*, int32_t, int32_t);
 #  define x87cmp(code, r0, r1, r2)	_x87cmp(_jit, code, r0, r1, r2)
 static void
-_x87cmp(jit_state_t*, int32_t, int32_t, jit_int32_t, jit_int32_t);
+_x87cmp(jit_state_t*, int32_t, int32_t, int32_t, int32_t);
 #  define x87cmp2(code, r0, r1, r2)	_x87cmp2(_jit, code, r0, r1, r2)
 static void
-_x87cmp2(jit_state_t*, int32_t, int32_t, jit_int32_t, jit_int32_t);
+_x87cmp2(jit_state_t*, int32_t, int32_t, int32_t, int32_t);
 #  define x87jcc(code, i0, r0, r1)	_x87jcc(_jit, code, i0, r0, r1)
 static jit_word_t
-_x87jcc(jit_state_t*, int32_t, jit_word_t, int32_t, jit_int32_t);
+_x87jcc(jit_state_t*, int32_t, jit_word_t, int32_t, int32_t);
 #  define x87jcc2(code, i0, r0, r1)	_x87jcc2(_jit, code, i0, r0, r1)
 static jit_word_t
-_x87jcc2(jit_state_t*, int32_t, jit_word_t, int32_t, jit_int32_t);
+_x87jcc2(jit_state_t*, int32_t, jit_word_t, int32_t, int32_t);
 #define x87_movi_f(r0,i0)		_x87_movi_f(_jit,r0,i0)
 static void _x87_movi_f(jit_state_t*, int32_t, jit_float32_t*);
 #  define x87_ldr_f(r0, r1)		_x87_ldr_f(_jit, r0, r1)
@@ -152,7 +152,7 @@ static void _x87_ldr_f(jit_state_t*, int32_t, int32_t);
 #  define x87_ldi_f(r0, i0)		_x87_ldi_f(_jit, r0, i0)
 static void _x87_ldi_f(jit_state_t*, int32_t, jit_word_t);
 #  define x87_ldxr_f(r0, r1, r2)	_x87_ldxr_f(_jit, r0, r1, r2)
-static void _x87_ldxr_f(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _x87_ldxr_f(jit_state_t*, int32_t, int32_t, int32_t);
 #  define x87_ldxi_f(r0, r1, i0)	_x87_ldxi_f(_jit, r0, r1, i0)
 static void _x87_ldxi_f(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define x87_str_f(r0, r1)		_x87_str_f(_jit, r0, r1)
@@ -160,7 +160,7 @@ static void _x87_str_f(jit_state_t*,int32_t,int32_t);
 #  define x87_sti_f(i0, r0)		_x87_sti_f(_jit, i0, r0)
 static void _x87_sti_f(jit_state_t*,jit_word_t, int32_t);
 #  define x87_stxr_f(r0, r1, r2)	_x87_stxr_f(_jit, r0, r1, r2)
-static void _x87_stxr_f(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _x87_stxr_f(jit_state_t*,int32_t,int32_t,int32_t);
 #  define x87_stxi_f(i0, r0, r1)	_x87_stxi_f(_jit, i0, r0, r1)
 static void _x87_stxi_f(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define x87_ltr_f(r0, r1, r2)		x87cmp(X86_CC_A, r0, r2, r1)
@@ -212,7 +212,7 @@ static void _x87_lti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_lei_d(r0, r1, i0)		_x87_lei_d(_jit, r0, r1, i0)
 static void _x87_lei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_eqr_d(r0, r1, r2)		_x87_eqr_d(_jit, r0, r2, r1)
-static void _x87_eqr_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _x87_eqr_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define x87_eqi_d(r0, r1, i0)		_x87_eqi_d(_jit, r0, r1, i0)
 static void _x87_eqi_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_ger_d(r0, r1, r2)		x87cmp(X86_CC_AE, r0, r1, r2)
@@ -222,7 +222,7 @@ static void _x87_gei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_gti_d(r0, r1, i0)		_x87_gti_d(_jit, r0, r1, i0)
 static void _x87_gti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_ner_d(r0, r1, r2)		_x87_ner_d(_jit, r0, r2, r1)
-static void _x87_ner_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _x87_ner_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define x87_nei_d(r0, r1, i0)		_x87_nei_d(_jit, r0, r1, i0)
 static void _x87_nei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_unltr_d(r0, r1, r2)	x87cmp(X86_CC_NAE, r0, r1, r2)
@@ -241,7 +241,7 @@ static void _x87_ungei_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_ungti_d(r0, r1, i0)	_x87_ungti_d(_jit, r0, r1, i0)
 static void _x87_ungti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_ltgtr_d(r0, r1, r2)	_x87_ltgtr_d(_jit, r0, r1, r2)
-static void _x87_ltgtr_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _x87_ltgtr_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define x87_ltgti_d(r0, r1, i0)	_x87_ltgti_d(_jit, r0, r1, i0)
 static void _x87_ltgti_d(jit_state_t*,int32_t,int32_t,jit_float64_t*);
 #  define x87_ordr_d(r0, r1, r2)	x87cmp2(X86_CC_NP, r0, r2, r1)
@@ -260,7 +260,7 @@ static void _x87_ldr_d(jit_state_t*, int32_t, int32_t);
 #  define x87_ldi_d(r0, i0)		_x87_ldi_d(_jit, r0, i0)
 static void _x87_ldi_d(jit_state_t*, int32_t, jit_word_t);
 #  define x87_ldxr_d(r0, r1, r2)	_x87_ldxr_d(_jit, r0, r1, r2)
-static void _x87_ldxr_d(jit_state_t*, int32_t, int32_t, jit_int32_t);
+static void _x87_ldxr_d(jit_state_t*, int32_t, int32_t, int32_t);
 #  define x87_ldxi_d(r0, r1, i0)	_x87_ldxi_d(_jit, r0, r1, i0)
 static void _x87_ldxi_d(jit_state_t*, int32_t, int32_t, jit_word_t);
 #  define x87_str_d(r0, r1)		_x87_str_d(_jit, r0, r1)
@@ -268,7 +268,7 @@ static void _x87_str_d(jit_state_t*,int32_t,int32_t);
 #  define x87_sti_d(i0, r0)		_x87_sti_d(_jit, i0, r0)
 static void _x87_sti_d(jit_state_t*,jit_word_t,int32_t);
 #  define x87_stxr_d(r0, r1, r2)	_x87_stxr_d(_jit, r0, r1, r2)
-static void _x87_stxr_d(jit_state_t*,int32_t,int32_t,jit_int32_t);
+static void _x87_stxr_d(jit_state_t*,int32_t,int32_t,int32_t);
 #  define x87_stxi_d(i0, r0, r1)	_x87_stxi_d(_jit, i0, r0, r1)
 static void _x87_stxi_d(jit_state_t*,jit_word_t,int32_t,int32_t);
 #  define x87_bltr_f(i0, r0, r1)	x87jcc(X86_CC_A, i0, r1, r0)
@@ -424,7 +424,7 @@ _x87_b##name##i_##type(jit_state_t *_jit,				\
 
 static void
 _fstcwm(jit_state_t *_jit, int32_t md,
-	int32_t rb,	int32_t ri, jit_int32_t ms)
+	int32_t rb,	int32_t ri, int32_t ms)
 {
     ic(0x9b);
     rex(0, 1, rb, ri, _NOREG);
@@ -433,7 +433,7 @@ _fstcwm(jit_state_t *_jit, int32_t md,
 
 static void
 _x87rx(jit_state_t *_jit, int32_t code, int32_t md,
-       int32_t rb, int32_t ri, jit_int32_t ms)
+       int32_t rb, int32_t ri, int32_t ms)
 {
     rex(0, 1, rb, ri, _NOREG);
     ic(0xd8 | (code >> 3));
@@ -448,7 +448,7 @@ _x87ri(jit_state_t *_jit, int32_t code, int32_t r0)
 }
 
 static void
-_x87rri(jit_state_t *_jit, int32_t code, int32_t r0, jit_int32_t r1)
+_x87rri(jit_state_t *_jit, int32_t code, int32_t r0, int32_t r1)
 {
     if (r1 == _ST0_REGNO)
 	x87ri(code | 040, r0);
@@ -465,7 +465,7 @@ fopi(mul)
 fopi(div)
 
 static void
-_x87_addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_x87_addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r1) {
 	if (r2 == _ST0_REGNO)
@@ -499,7 +499,7 @@ _x87_addr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(add)
 
 static void
-_x87_subr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_x87_subr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r1) {
 	if (r2 == _ST0_REGNO)
@@ -535,7 +535,7 @@ dopi(sub)
 dopi(rsb)
 
 static void
-_x87_mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_x87_mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r1) {
 	if (r2 == _ST0_REGNO)
@@ -569,7 +569,7 @@ _x87_mulr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
 dopi(mul)
 
 static void
-_x87_divr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_x87_divr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r0 == r1) {
 	if (r2 == _ST0_REGNO)
@@ -712,7 +712,7 @@ _x87_extr_d(jit_state_t *_jit, int32_t r0, int32_t r1)
 
 static void
 _x87cmp(jit_state_t *_jit, int32_t code,
-	int32_t r0, int32_t r1, jit_int32_t r2)
+	int32_t r0, int32_t r1, int32_t r2)
 {
     jit_bool_t		rc;
     int32_t		reg;
@@ -736,7 +736,7 @@ _x87cmp(jit_state_t *_jit, int32_t code,
 
 static void
 _x87cmp2(jit_state_t *_jit, int32_t code,
-	 int32_t r0, int32_t r1, jit_int32_t r2)
+	 int32_t r0, int32_t r1, int32_t r2)
 {
     jit_bool_t			rc;
     int32_t			reg;
@@ -884,7 +884,7 @@ _x87_ldi_f(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_x87_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_x87_ldxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     int32_t		reg;
@@ -951,7 +951,7 @@ _x87_sti_f(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_x87_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_x87_stxr_f(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     int32_t		reg;
@@ -1062,7 +1062,7 @@ dopi(lt)
 dopi(le)
 
 static void
-_x87_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_x87_eqr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_bool_t			rc;
     jit_word_t			jp_code;
@@ -1095,7 +1095,7 @@ dopi(ge)
 dopi(gt)
 
 static void
-_x87_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_x87_ner_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     jit_bool_t			rc;
     jit_word_t			jp_code;
@@ -1131,7 +1131,7 @@ dopi(unge)
 dopi(ungt)
 
 static void
-_x87_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_x87_ltgtr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
     if (r1 == r2)
 	movi(r0, 1);
@@ -1167,7 +1167,7 @@ _x87_ldi_d(jit_state_t *_jit, int32_t r0, jit_word_t i0)
 }
 
 static void
-_x87_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_x87_ldxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     int32_t		reg;
@@ -1234,7 +1234,7 @@ _x87_sti_d(jit_state_t *_jit, jit_word_t i0, int32_t r0)
 }
 
 static void
-_x87_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, jit_int32_t r2)
+_x87_stxr_d(jit_state_t *_jit, int32_t r0, int32_t r1, int32_t r2)
 {
 #if __X64_32
     int32_t		reg;