d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some minor modifications

Browse source
This commit is contained in:
ceriel 1993-11-19 09:50:20 +00:00
parent 6b1a0c486f
commit 618041f3ff
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
mach/z8000/as/mach5.c
View file

@ -9,21 +9,21 @@ int type;
{ oprtype[ operand ] = type; } { oprtype[ operand ] = type; }
short twolog( s ) int twolog( s )
short s; int s;
{ short twopower = 0; { int twopower = 0;
while ( (s>>=1) != 0 ) twopower++; while ( (s>>=1) != 0 ) twopower++;
return( twopower ); return( twopower );
} }
setmode( opr ) setmode( opr )
short opr; int opr;
{ mode = modetbl[ twolog( oprtype[opr] ) ] << 12; } { mode = modetbl[ twolog( oprtype[opr] ) ] << 12; }
chtype( opr, typerange ) chtype( opr, typerange )
short opr, int opr,
typerange; typerange;
/* Check type of 'opr' with given 'typerange' and /* Check type of 'opr' with given 'typerange' and
** set the global var 'mode'. ** set the global var 'mode'.
@ -34,7 +34,7 @@ short opr,
chreg( opc, reg ) chreg( opc, reg )
short opc, reg; int opc, reg;
{ switch( opc ) { { switch( opc ) {
case 0xB10A: case 0x1B00: case 0x1900: case 0xB10A: case 0x1B00: case 0x1900:
/* R32 expected */ if (reg & 1) regerr(); break; /* R32 expected */ if (reg & 1) regerr(); break;
@ -62,8 +62,7 @@ expr_t ad_inf;
/* When the type of an operand is 'da' or 'x' this function /* When the type of an operand is 'da' or 'x' this function
** emits the address. ** emits the address.
*/ */
{ short sm; { ATYPE addr;
ATYPE addr;
addr = checkaddr( ad_inf.val ); addr = checkaddr( ad_inf.val );
/* Always the long format is emitted, because the binary /* Always the long format is emitted, because the binary
@ -95,14 +94,14 @@ valu_t absval;
branch( opc, exp ) branch( opc, exp )
short opc; int opc;
expr_t exp; expr_t exp;
/* This routine determines for the F3 format instructions whether the /* This routine determines for the F3 format instructions whether the
** relative address is small enough to fit in normal code; If this is ** relative address is small enough to fit in normal code; If this is
** so normal code is emitted otherwise 'long' code is emitted contai- ** so normal code is emitted otherwise 'long' code is emitted contai-
** ning the direct address. ** ning the direct address.
*/ */
{ short longopc = 0, reladdr = 0, sm2, sm4; { int longopc = 0, reladdr = 0, sm2, sm4;
valu_t val; valu_t val;
ATYPE addr; ATYPE addr;
@ -122,7 +121,7 @@ expr_t exp;
longopc = 0x5F00; longopc = 0x5F00;
break; break;
} }
sm4 = sm2 || fit8( (short)exp.val ); sm4 = sm2 || fit8( (int)exp.val );
} }
switch ( opc & 0xF000 ) switch ( opc & 0xF000 )
{ case DJNZ_: fit( sm2 ); /* djnz must be short */ { case DJNZ_: fit( sm2 ); /* djnz must be short */
@ -147,7 +146,7 @@ expr_t exp;
ldrel( opc, exp ) ldrel( opc, exp )
short opc; int opc;
expr_t exp; expr_t exp;
/* This routine determines for the F4 format instructions whether the /* This routine determines for the F4 format instructions whether the
** address is within the same segment (meaning a relative address of ** address is within the same segment (meaning a relative address of
@ -157,7 +156,7 @@ expr_t exp;
{ if ( pass >= PASS_2 && (exp.typ & ~S_DOT) != DOTTYP ) { if ( pass >= PASS_2 && (exp.typ & ~S_DOT) != DOTTYP )
serror( "relative too far" ); serror( "relative too far" );
emit2( opc ); emit2( opc );
emit2( (short)adjust(exp.val) ); emit2( (int)adjust(exp.val) );
} }