X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=eagen0.c;h=7fe382a115c5c692a04aed6e19c321cdb6e3e5a4;hp=bf4ba3da6ab64fdb093df39ac9944b82d8f109d5;hb=03dd34951a331e0b8971195ccef1600fffaea2e6;hpb=0fd4b86c9899d254d9aea0660e5046c4234cfd42 diff --git a/eagen0.c b/eagen0.c index bf4ba3d..7fe382a 100644 --- a/eagen0.c +++ b/eagen0.c @@ -1,21 +1,20 @@ // -// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System +// RMAC - Reboot's Macro Assembler for all Atari computers // EAGEN0.C - Effective Address Code Generation // Generated Code for eaN (Included twice by "eagen.c") -// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // int eaNgen(WORD siz) { - WORD w; - VALUE v; - WORD tdb; - - v = aNexval; - w = (WORD)(aNexattr & DEFINED); - tdb = (WORD)(aNexattr & TDB); + VALUE vbd, v = aNexval; + WORD wbd, w = (WORD)(aNexattr & DEFINED); + WORD tdbbd, tdb = (WORD)(aNexattr & TDB); + vbd = aNbdexval; + wbd = (WORD)(aNbdexattr & DEFINED); + tdbbd = (WORD)(aNbdexattr & TDB); switch (amN) { @@ -35,18 +34,16 @@ int eaNgen(WORD siz) // expr(An) if (w) { - // Just deposit it + // Just deposit it if (tdb) - rmark(cursect, sloc, tdb, MWORD, NULL); + MarkRelocatable(cursect, sloc, tdb, MWORD, NULL); - if ((v == 0) && optim_flags[OPT_INDIRECT_DISP]) + if ((v == 0) && optim_flags[OPT_INDIRECT_DISP] && !movep) { - // If expr is 0, size optimise the opcode. - // Generally the lower 6 bits of the opcode - // for expr(ax) are 101rrr where rrr=the - // number of the register, then followed by - // a word containing 'expr'. We need to change - // that to 010rrr. + // If expr is 0, size optimise the opcode. Generally the lower + // 6 bits of the opcode for expr(ax) are 101rrr where rrr=the + // number of the register, then followed by a word containing + // 'expr'. We need to change that to 010rrr. if ((siz & 0x8000) == 0) { chptr_opcode[0] &= ((0xFFC7 >> 8) & 255); // mask off bits @@ -56,9 +53,8 @@ int eaNgen(WORD siz) } else { - // Special case for move ea,ea: - // there are two ea fields there and - // we get a signal if it's the second ea field + // Special case for move ea,ea: there are two ea fields + // there and we get a signal if it's the second ea field // from m_ea - siz's 16th bit is set chptr_opcode[0] &= ((0xFE3F >> 8) & 255); // mask off bits chptr_opcode[1] &= 0xFE3F & 255; // mask off bits @@ -72,15 +68,15 @@ int eaNgen(WORD siz) return OK; } - if (v + 0x8000 >= 0x18000) + if ((v + 0x8000) >= 0x18000) return error(range_error); D_word(v); } else { - // Arrange for fixup later on - AddFixup(FU_WORD|FU_SEXT, sloc, aNexpr); + // Arrange for fixup later on + AddFixup(FU_WORD | FU_SEXT, sloc, aNexpr); D_word(0); } @@ -88,7 +84,7 @@ int eaNgen(WORD siz) case PCDISP: if (w) { - // Just deposit it + // Just deposit it if ((aNexattr & TDB) == cursect) v -= (VALUE)sloc; else if ((aNexattr & TDB) != ABS) @@ -101,8 +97,8 @@ int eaNgen(WORD siz) } else { - // Arrange for fixup later on - AddFixup(FU_WORD|FU_SEXT|FU_PCREL, sloc, aNexpr); + // Arrange for fixup later on + AddFixup(FU_WORD | FU_SEXT | FU_PCREL, sloc, aNexpr); D_word(0); } @@ -113,21 +109,21 @@ int eaNgen(WORD siz) if (aNexattr & DEFINED) { - // Deposit a byte... + // Deposit a byte... if (tdb) - // Can't mark bytes + // Can't mark bytes return error(abs_error); if (v + 0x80 >= 0x180) return error(range_error); - w |= v & 0xff; + w |= v & 0xFF; D_word(w); } else { // Fixup the byte later - AddFixup(FU_BYTE|FU_SEXT, sloc+1, aNexpr); + AddFixup(FU_BYTE | FU_SEXT, sloc + 1, aNexpr); D_word(w); } @@ -138,8 +134,8 @@ int eaNgen(WORD siz) if (aNexattr & DEFINED) { - // Deposit a byte... - if ((aNexattr & TDB) == cursect) + // Deposit a byte... + if ((aNexattr & TDB) == cursect) v -= (VALUE)sloc; else if ((aNexattr & TDB) != ABS) error(rel_error); @@ -152,8 +148,8 @@ int eaNgen(WORD siz) } else { - // Fixup the byte later - AddFixup(FU_WBYTE|FU_SEXT|FU_PCREL, sloc, aNexpr); + // Fixup the byte later + AddFixup(FU_WBYTE | FU_SEXT | FU_PCREL, sloc, aNexpr); D_word(w); } @@ -174,7 +170,7 @@ int eaNgen(WORD siz) } else { - AddFixup(FU_BYTE|FU_SEXT, sloc+1, aNexpr); + AddFixup(FU_BYTE | FU_SEXT, sloc + 1, aNexpr); D_word(0); } @@ -183,17 +179,17 @@ int eaNgen(WORD siz) case SIZN: if (w) { - if (tdb) - rmark(cursect, sloc, tdb, MWORD, NULL); - if (v + 0x10000 >= 0x20000) return error(range_error); + if (tdb) + MarkRelocatable(cursect, sloc, tdb, MWORD, NULL); + D_word(v); } else { - AddFixup(FU_WORD|FU_SEXT, sloc, aNexpr); + AddFixup(FU_WORD | FU_SEXT, sloc, aNexpr); D_word(0); } @@ -202,7 +198,7 @@ int eaNgen(WORD siz) if (w) { if (tdb) - rmark(cursect, sloc, tdb, MLONG, NULL); + MarkRelocatable(cursect, sloc, tdb, MLONG, NULL); D_long(v); } @@ -218,12 +214,16 @@ int eaNgen(WORD siz) interror(1); } + break; + case SIZP: + // 68881/68882/68040 only + return error("Sorry, .p constant format is not implemented yet!"); break; case ABSW: - if (w) + if (w) // Defined { if (tdb) - rmark(cursect, sloc, tdb, MWORD, NULL); + MarkRelocatable(cursect, sloc, tdb, MWORD, NULL); if (v + 0x8000 >= 0x10000) return error(range_error); @@ -232,16 +232,16 @@ int eaNgen(WORD siz) } else { - AddFixup(FU_WORD|FU_SEXT, sloc, aNexpr); + AddFixup(FU_WORD | FU_SEXT, sloc, aNexpr); D_word(0); } break; case ABSL: - if (w) + if (w) // Defined { if (tdb) - rmark(cursect, sloc, tdb, MLONG, NULL); + MarkRelocatable(cursect, sloc, tdb, MLONG, NULL); D_long(v); } @@ -258,9 +258,102 @@ int eaNgen(WORD siz) case PCBASE: case PCMPOST: case PCMPRE: - return error("unsupported 68020 addressing mode"); + D_word(aNexten); + // Deposit bd (if not suppressed) + if ((aNexten&0x0030)==EXT_BDSIZE0) + { + // Don't deposit anything (suppressed) + } + else if ((aNexten&0x0030)==EXT_BDSIZEW) + { + // Deposit word bd + if (wbd) + { + // Just deposit it + if (tdb) + MarkRelocatable(cursect, sloc, tdbbd, MWORD, NULL); + + if (vbd + 0x8000 >= 0x10000) + return error(range_error); + + D_word(vbd); + } + else + { + // Arrange for fixup later on + AddFixup(FU_WORD|FU_SEXT, sloc, aNexpr); + D_word(0); + } + } + else + { + // Deposit long bd + if (wbd) + { + // Just deposit it + if (tdbbd) + MarkRelocatable(cursect, sloc, tdbbd, MLONG, NULL); + + D_long(vbd); + } + else + { + // Arrange for fixup later on + AddFixup(FU_LONG|FU_SEXT, sloc, aNexpr); + D_long(0); + } + } + // Deposit od (if not suppressed) + if ((aNexten&7)==EXT_IISPRE0 || (aNexten&7)==EXT_IISPREN + || (aNexten&7)==EXT_IISNOIN || (aNexten&7)==EXT_IISPOSN) + { + // Don't deposit anything (suppressed) + } + else if ((aNexten&7)==EXT_IISPREW + || (aNexten&7)==EXT_IISPOSW || (aNexten&7)==EXT_IISNOIW) + { + // Deposit word od + if (w) + { + // Just deposit it + if (tdb) + MarkRelocatable(cursect, sloc, tdb, MWORD, NULL); + + if (v + 0x8000 >= 0x10000) + return error(range_error); + + D_word(v); + } + else + { + // Arrange for fixup later on + AddFixup(FU_WORD|FU_SEXT, sloc, aNexpr); + D_word(0); + } + } + else + { + // Deposit long od + if (w) + { + // Just deposit it + if (tdb) + MarkRelocatable(cursect, sloc, tdb, MLONG, NULL); + + D_long(v); + } + else + { + // Arrange for fixup later on + AddFixup(FU_LONG|FU_SEXT, sloc, aNexpr); + D_long(0); + } + } + + break; + //return error("unsupported 68020 addressing mode"); default: - // Bad addressing mode in ea gen + // Bad addressing mode in ea gen interror(3); } @@ -275,4 +368,8 @@ int eaNgen(WORD siz) #undef aNexpr #undef aNixreg #undef aNixsiz +#undef aNexten +#undef aNbdexval +#undef aNbdexattr +#undef AnESYM