diff --git a/mach/m68020/as/mach1.c b/mach/m68020/as/mach1.c index 5113a843d..0e71ea6d8 100644 --- a/mach/m68020/as/mach1.c +++ b/mach/m68020/as/mach1.c @@ -34,11 +34,11 @@ extern valu_t bd_rel1,bd_rel2,od_rel1,od_rel2; #ifdef RELOCATION #ifdef ASLD -#define T_EMIT2(a,b,c,d) t_emit2(a,b,c,0) -#define T_EMIT4(a,b,c,d) t_emit4(a,b,c,0) +#define T_EMIT2(a,b,c,d) t_emit2(a,b,c,(valu_t)0) +#define T_EMIT4(a,b,c,d) t_emit4(a,b,c,(valu_t)0) #else ALSD -#define T_EMIT2(a,b,c,d) t_emit2(a,b,c,d) -#define T_EMIT4(a,b,c,d) t_emit4(a,b,c,d) +#define T_EMIT2(a,b,c,d) t_emit2(a,b,c,(valu_t)d) +#define T_EMIT4(a,b,c,d) t_emit4(a,b,c,(valu_t)d) #endif ASLD #else #define T_EMIT2(a,b,c,d) t_emit2(a) diff --git a/mach/m68020/as/mach4.c b/mach/m68020/as/mach4.c index 112b21fb1..0479d9059 100644 --- a/mach/m68020/as/mach4.c +++ b/mach/m68020/as/mach4.c @@ -170,7 +170,7 @@ instruction ea_2(SIZE_W, 0); } | LINK sizenon AREG ',' imm - { link($2, $3);} + { link_instr($2, $3);} | UNLK AREG { T_EMIT2(047130 | $2,0,0,0);} | TRAP '#' absexp @@ -188,7 +188,7 @@ instruction | CALLM '#' absexp ',' ea { fit(fitb($3)); T_EMIT2(03300 | mrg_2,0,0,0); - T_EMIT2($3,0,0,0); + T_EMIT2((short) $3,0,0,0); ea_2(SIZE_L, CTR); } | RTM reg diff --git a/mach/m68020/as/mach5.c b/mach/m68020/as/mach5.c index a6746242d..3973eec90 100644 --- a/mach/m68020/as/mach5.c +++ b/mach/m68020/as/mach5.c @@ -386,7 +386,7 @@ cmp(sz) badoperand(); } -link(sz, areg) +link_instr(sz, areg) { if (sz == SIZE_NON) { if (bd_2.typ == S_ABS && fitw(bd_2.val)) diff --git a/mach/proto/as/comm7.c b/mach/proto/as/comm7.c index 812967368..87dfd725b 100644 --- a/mach/proto/as/comm7.c +++ b/mach/proto/as/comm7.c @@ -356,6 +356,7 @@ char *path, *tail; /* ---------- Error handling ---------- */ +/*VARARGS*/ yyerror(){} /* we will do our own error printing */ nosect()