X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=155fa3fb360821bc945bb0e8e3a79ffd6fe973a9;hp=b7dfb853791d4e236d8803c2ec4ca576b20312d0;hb=eace4e1b294ccec54a5c476619f616f5da0bf8a9;hpb=2161b198b7b333147c89ef0346d8e9bb6ab9ffd9 diff --git a/direct.c b/direct.c index b7dfb85..155fa3f 100644 --- a/direct.c +++ b/direct.c @@ -1,13 +1,14 @@ // -// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System +// RMAC - Reboot's Macro Assembler for all Atari computers // DIRECT.C - Directive Handling -// Copyright (C) 199x Landon Dyer, 2017 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 // #include "direct.h" #include "6502.h" +#include "amode.h" #include "error.h" #include "expr.h" #include "listing.h" @@ -19,19 +20,31 @@ #include "sect.h" #include "symbol.h" #include "token.h" +#include "math.h" +#include "sect.h" #define DEF_KW #include "kwtab.h" + TOKEN exprbuf[128]; // Expression buffer SYM * symbolPtr[1000000]; // Symbol pointers table static long unused; // For supressing 'write' warnings char buffer[256]; // Scratch buffer for messages -int stringtype; // Non-zero if we need any special string conversions +int largestAlign[3] = { 2, 2, 2 }; // Largest alignment value seen per section // Function prototypes int d_unimpl(void); int d_68000(void); +int d_68000(void); +int d_68020(void); +int d_68030(void); +int d_68040(void); +int d_68060(void); +int d_68881(void); +int d_68882(void); +int d_56001(void); +int d_nofpu(void); int d_bss(void); int d_data(void); int d_text(void); @@ -67,6 +80,8 @@ int d_fail(void); int d_cstruct(void); int d_prgflags(void); int d_opt(void); +int d_dsp(void); +void SetLargestAlignment(int); // Directive handler table int (*dirtab[])() = { @@ -128,10 +143,32 @@ int (*dirtab[])() = { d_nojpad, // 55 .nojpad (deprecated) d_gpumain, // 56 .gpumain (deprecated) d_prgflags, // 57 .prgflags + d_68020, // 58 .68020 + d_68030, // 59 .68030 + d_68040, // 60 .68040 + d_68060, // 61 .68060 + d_68881, // 62 .68881 + d_68882, // 63 .68882 + d_56001, // 64 .56001 + d_nofpu, // 65 nofpu d_opt, // 58 .opt }; +// +// Set the largest alignment seen in the current section +// +void SetLargestAlignment(int size) +{ + if ((scattr & TEXT) && (largestAlign[0] < size)) + largestAlign[0] = size; + else if ((scattr & DATA) && (largestAlign[1] < size)) + largestAlign[1] = size; + else if ((scattr & BSS) && (largestAlign[2] < size)) + largestAlign[2] = size; +} + + // // .error - Abort compilation, printing an error message // @@ -147,7 +184,7 @@ int d_error(char *str) return error(string[tok[1]]); break; default: - return error("error directive encountered - aborting assembling"); + return error("error directive encountered--aborting assembly"); } } } @@ -179,7 +216,7 @@ int d_warn(char *str) // int d_org(void) { - VALUE address; + uint64_t address; if (!rgpu && !rdsp && !m6502) return error(".org permitted only in gpu/dsp and 6502 sections"); @@ -232,7 +269,7 @@ int d_print(void) int wordlong = 0; // WORD = 0, LONG = 1 int outtype = 0; // 0:hex, 1:decimal, 2:unsigned - VALUE eval; // Expression value + uint64_t eval; // Expression value WORD eattr; // Expression attributes SYM * esym; // External symbol involved in expr. TOKEN r_expr[EXPRSIZE]; @@ -410,14 +447,13 @@ int d_incbin(void) int fd; int bytes = 0; long pos, size, bytesRead; - char msg[256]; char buf1[256]; int i; // Check to see if we're in BSS, and, if so, throw an error if (scattr & SBSS) { - errors("cannot include binary file \"%s\" in BSS section", string[tok[1]]); + error("cannot include binary file \"%s\" in BSS section", string[tok[1]]); return ERROR; } @@ -446,7 +482,7 @@ int d_incbin(void) goto allright; } - return errors("cannot open: \"%s\"", string[tok[1]]); + return error("cannot open: \"%s\"", string[tok[1]]); } allright: @@ -462,8 +498,7 @@ allright: if (bytesRead != size) { - sprintf(msg, "was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size); - error(msg); + error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size); return ERROR; } @@ -561,6 +596,7 @@ int d_long(void) unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03; unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03; SkipBytes(bytesToSkip); + SetLargestAlignment(4); return 0; } @@ -583,6 +619,7 @@ int d_phrase(void) unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07; unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07; SkipBytes(bytesToSkip); + SetLargestAlignment(8); return 0; } @@ -596,6 +633,7 @@ int d_dphrase(void) unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F; unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F; SkipBytes(bytesToSkip); + SetLargestAlignment(16); return 0; } @@ -609,6 +647,7 @@ int d_qphrase(void) unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F; unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F; SkipBytes(bytesToSkip); + SetLargestAlignment(32); return 0; } @@ -651,7 +690,7 @@ int d_unimpl(void) // // Return absolute (not TDB) and defined expression or return an error // -int abs_expr(VALUE * a_eval) +int abs_expr(uint64_t * a_eval) { WORD eattr; @@ -723,7 +762,7 @@ int d_include(void) // Make sure the user didn't try anything like: // .include equates.s if (*++tok != EOL) - return error("extra stuff after filename -- enclose it in quotes"); + return error("extra stuff after filename--enclose it in quotes"); // Attempt to open the include file in the current directory, then (if that // failed) try list of include files passed in the enviroment string or by @@ -744,7 +783,7 @@ int d_include(void) goto allright; } - return errors("cannot open: \"%s\"", fn); + return error("cannot open: \"%s\"", fn); } allright: @@ -759,7 +798,7 @@ allright: int d_assert(void) { WORD eattr; - VALUE eval; + uint64_t eval; for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok) { @@ -817,13 +856,13 @@ int d_globl(void) // int d_prgflags(void) { - VALUE eval; + uint64_t eval; if (*tok == EOL) return error("PRGFLAGS requires value"); else if (abs_expr(&eval) == OK) { - PRGFLAGS=eval; + PRGFLAGS = (uint32_t)eval; return 0; } else @@ -838,7 +877,7 @@ int d_prgflags(void) // int d_abs(void) { - VALUE eval; + uint64_t eval; if (m6502) return error(in_6502mode); @@ -851,7 +890,7 @@ int d_abs(void) return 0; SwitchSection(ABS); - sloc = eval; + sloc = (uint32_t)eval; return 0; } @@ -917,7 +956,7 @@ int d_ds(WORD siz) { DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); } - VALUE eval; + uint64_t eval; if (cursect != M6502) { @@ -930,7 +969,9 @@ int d_ds(WORD siz) // Check to see if the value being passed in is negative (who the hell does // that?--nobody does; it's the code gremlins, or rum, that does it) - if (eval < 0) + // N.B.: Since 'eval' is of type uint32_t, if it goes negative, it will have + // its high bit set. + if (eval & 0x80000000) return error("negative sizes not allowed"); // In non-TDB section (BSS, ABS and M6502) just advance the location @@ -938,9 +979,9 @@ int d_ds(WORD siz) // of zeroed memory.... if ((scattr & SBSS) || cursect == M6502) { - listvalue(eval); + listvalue((uint32_t)eval); eval *= siz; - sloc += eval; + sloc += (uint32_t)eval; if (cursect == M6502) chptr += eval; @@ -949,7 +990,7 @@ int d_ds(WORD siz) } else { - dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED | ABS), NULL); + dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), NULL); } at_eol(); @@ -958,12 +999,12 @@ int d_ds(WORD siz) // -// dc.b, dc.w / dc, dc.l, dc.i +// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d // int d_dc(WORD siz) { WORD eattr; - VALUE eval; + uint64_t eval; uint8_t * p; if ((scattr & SBSS) != 0) @@ -983,28 +1024,27 @@ int d_dc(WORD siz) for(;; tok++) { // dc.b 'string' [,] ... - if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL)) + if (siz == SIZB && (*tok == STRING || *tok == STRINGA8) && (tok[2] == ',' || tok[2] == EOL)) { uint32_t i = strlen(string[tok[1]]); if ((challoc - ch_size) < i) chcheck(i); - if (stringtype == NORMAL) - { - for (p = string[tok[1]]; *p != EOS; p++) - D_byte(*p); - } - else if(stringtype == A8INT) - { - for (p = string[tok[1]]; *p != EOS; p++) - D_byte(strtoa8[*p]); - } - else - { - error("String format not supported yet"); - } - + if (*tok == STRING) + { + for(p=string[tok[1]]; *p!=EOS; p++) + D_byte(*p); + } + else if(*tok == STRINGA8) + { + for(p=string[tok[1]]; *p!=EOS; p++) + D_byte(strtoa8[*p]); + } + else + { + error("String format not supported... yet"); + } tok += 2; goto comma; @@ -1041,15 +1081,12 @@ int d_dc(WORD siz) } else { - if (eval + 0x100 >= 0x200) - { - sprintf(buffer, "%s (value = $%X)", range_error, eval); - return error(buffer); - } - if (tdb) return error("non-absolute byte value"); + if (eval + 0x100 >= 0x200) + return error("%s (value = $%X)", range_error, eval); + D_byte(eval); } @@ -1078,6 +1115,7 @@ int d_dc(WORD siz) break; case SIZL: + // Shamus: Why can't we do longs in 6502 mode? if (m6502) return error(in_6502mode); @@ -1100,6 +1138,77 @@ int d_dc(WORD siz) D_long(eval); } + break; + case SIZQ: + // 64-bit size + if (m6502) + return error(in_6502mode); + + // Shamus: We only handle DC.Q type stuff, will have to add fixups + // and stuff later (maybe... might not be needed...) + D_quad(eval); + break; + case SIZS: + if (m6502) + return error(in_6502mode); + + if (!defined) + { + float vv = 0; + AddFixup(FU_FLOATSING, sloc, exprbuf); + + D_single(vv); + } + else + { + if (tdb) + MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL); + + D_single(eval); + } + + break; + case SIZD: + if (m6502) + return error(in_6502mode); + + if (!defined) + { + double vv = 0; + AddFixup(FU_FLOATDOUB, sloc, exprbuf); + + D_double(vv); + } + else + { + if (tdb) + MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL); + + double vv = *(double *)&eval; + D_double(vv); + } + + break; + case SIZX: + if (m6502) + return error(in_6502mode); + + if (!defined) + { + double vv = 0; + AddFixup(FU_FLOATEXT, sloc, exprbuf); + + D_extend(vv); + } + else + { + if (tdb) + MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL); + + float vv = *(double *)&eval; + D_extend(vv); + } + break; } @@ -1118,7 +1227,7 @@ comma: // int d_dcb(WORD siz) { - VALUE evalc, eval; + uint64_t evalc, eval; WORD eattr; DEBUG { printf("dcb: section is %s%s%s (scattr=$%X)\n", (cursect & TEXT ? "TEXT" : ""), (cursect & DATA ? " DATA" : ""), (cursect & BSS ? "BSS" : ""), scattr); } @@ -1138,7 +1247,7 @@ int d_dcb(WORD siz) if (cursect != M6502 && (siz != SIZB) && (sloc & 1)) auto_even(); - dep_block(evalc, siz, eval, eattr, exprbuf); + dep_block((uint32_t)evalc, siz, (uint32_t)eval, eattr, exprbuf); return 0; } @@ -1155,8 +1264,8 @@ int d_dcb(WORD siz) // int d_init(WORD def_siz) { - VALUE count; - VALUE eval; + uint64_t count; + uint64_t eval; WORD eattr; WORD siz; @@ -1171,7 +1280,7 @@ int d_init(WORD def_siz) // Get repeat count (defaults to 1) if (*tok == '#') { - ++tok; + tok++; if (abs_expr(&count) != OK) return 0; @@ -1186,7 +1295,7 @@ int d_init(WORD def_siz) if (expr(exprbuf, &eval, &eattr, NULL) < 0) return 0; - switch ((int)*tok++) + switch (*tok++) { // Determine size of object to deposit case DOTB: siz = SIZB; break; case DOTW: siz = SIZB; break; @@ -1197,9 +1306,9 @@ int d_init(WORD def_siz) break; } - dep_block(count, siz, eval, eattr, exprbuf); + dep_block((uint32_t)count, siz, (uint32_t)eval, eattr, exprbuf); - switch ((int)*tok) + switch (*tok) { case EOL: return 0; @@ -1216,7 +1325,7 @@ int d_init(WORD def_siz) // // Deposit 'count' values of size 'siz' in the current (non-BSS) segment // -int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf) +int dep_block(uint32_t count, WORD siz, uint32_t eval, WORD eattr, TOKEN * exprbuf) { WORD tdb; WORD defined; @@ -1305,7 +1414,7 @@ int d_comm(void) { SYM * sym; char * p; - VALUE eval; + uint64_t eval; if (m6502) return error(in_6502mode); @@ -1335,7 +1444,7 @@ int d_comm(void) if (abs_expr(&eval) != OK) // Parse size of common region return 0; - sym->svalue = eval; // Install common symbol's size + sym->svalue = (uint32_t)eval; // Install common symbol's size at_eol(); return 0; } @@ -1376,10 +1485,98 @@ int d_68000(void) orgwarning = 0; SaveSection(); SwitchSection(TEXT); + activecpu = CPU_68000; return 0; } +// +// .68020 - Back to 68000 TEXT segment and select 68020 +// +int d_68020(void) +{ + d_68000(); + activecpu = CPU_68020; + return 0; +} + + +// +// .68030 - Back to 68000 TEXT segment and select 68030 +// +int d_68030(void) +{ + d_68000(); + activecpu = CPU_68030; + return 0; +} + + +// +// .68040 - Back to 68000 TEXT segment and select 68040 +// +int d_68040(void) +{ + d_68000(); + activecpu = CPU_68040; + activefpu = FPU_68040; + return 0; +} + + +// +// .68060 - Back to 68000 TEXT segment and select 68060 +// +int d_68060(void) +{ + d_68000(); + activecpu = CPU_68060; + activefpu = FPU_68040; + return 0; +} + + +// +// .68881 - Back to 68000 TEXT segment and select 68881 FPU +// +int d_68881(void) +{ + d_68000(); + activefpu = FPU_68881; + return 0; +} + + +// +// .68882 - Back to 68000 TEXT segment and select 68882 FPU +// +int d_68882(void) +{ + d_68000(); + activefpu = FPU_68881; + return 0; +} + + +// +// nofpu - Deselect FPUs. +// +int d_nofpu(void) +{ + activefpu = FPU_NONE; + return 0; +} + + +// +// DSP56001 +// +int d_56001(void) +{ + return error("Not yet, child. Be patient."); +} + + // // .gpu - Switch to GPU assembler // @@ -1391,14 +1588,12 @@ int d_gpu(void) return ERROR; } - // If previous section was dsp or 68000 then we need to reset ORG'd Addresses + // If previous section was DSP or 68000 then we need to reset ORG'd Addresses if (!rgpu) { -//printf("Resetting ORG...\n"); orgactive = 0; orgwarning = 0; } -//else printf("NOT resetting ORG!\n"); rgpu = 1; // Set GPU assembly rdsp = 0; // Unset DSP assembly @@ -1444,7 +1639,7 @@ int d_dsp(void) // int d_cargs(void) { - VALUE eval = 4; // Default to 4 if no offset specified (to account for + uint64_t eval = 4; // Default to 4 if no offset specified (to account for // return address) WORD rlist; SYM * symbol; @@ -1483,13 +1678,13 @@ int d_cargs(void) symbol->sattr = 0; } else if (symbol->sattr & DEFINED) - return errors("multiply-defined label '%s'", p); + return error("multiply-defined label '%s'", p); // Put symbol in "order of definition" list AddToSymbolDeclarationList(symbol); symbol->sattr |= (ABS | DEFINED | EQUATED); - symbol->svalue = eval; + symbol->svalue = (uint32_t)eval; tok += 2; // What this does is eat any dot suffixes attached to a symbol. If @@ -1559,7 +1754,7 @@ int d_cargs(void) // int d_cstruct(void) { - VALUE eval = 0; // Default, if no offset specified, is zero + uint64_t eval = 0; // Default, if no offset specified, is zero WORD rlist; SYM * symbol; char * symbolName; @@ -1599,7 +1794,7 @@ int d_cstruct(void) symbol->sattr = 0; } else if (symbol->sattr & DEFINED) - return errors("multiply-defined label '%s'", symbolName); + return error("multiply-defined label '%s'", symbolName); // Put symbol in "order of definition" list AddToSymbolDeclarationList(symbol); @@ -1616,7 +1811,7 @@ int d_cstruct(void) } symbol->sattr |= (ABS | DEFINED | EQUATED); - symbol->svalue = eval; + symbol->svalue = (uint32_t)eval; // Check for dot suffixes and adjust space accordingly (longs and // words on an odd boundary get bumped to the next word aligned @@ -1732,11 +1927,7 @@ int d_opt(void) char * tmpstr = string[*tok++]; if (ParseOptimization(tmpstr) != OK) - { - char temperr[256]; - sprintf(temperr, "unknown optimization flag '%s'", tmpstr); - return error(temperr); - } + return error("unknown optimization flag '%s'", tmpstr); } else return error(".opt directive needs every switch enclosed inside quotation marks"); @@ -1745,3 +1936,78 @@ int d_opt(void) return OK; } + +// +// .if, Start conditional assembly +// +int d_if(void) +{ + WORD eattr; + uint64_t eval; + SYM * esym; + IFENT * rif = f_ifent; + + // Alloc an IFENTRY + if (rif == NULL) + rif = (IFENT *)malloc(sizeof(IFENT)); + else + f_ifent = rif->if_prev; + + rif->if_prev = ifent; + ifent = rif; + + if (!disabled) + { + if (expr(exprbuf, &eval, &eattr, &esym) != OK) + return 0; + + if ((eattr & DEFINED) == 0) + return error(undef_error); + + disabled = !eval; + } + + rif->if_state = (WORD)disabled; + return 0; +} + + +// +// .else, Do alternate case for .if +// +int d_else(void) +{ + IFENT * rif = ifent; + + if (rif->if_prev == NULL) + return error("mismatched .else"); + + if (disabled) + disabled = rif->if_prev->if_state; + else + disabled = 1; + + rif->if_state = (WORD)disabled; + return 0; +} + + +// +// .endif, End of conditional assembly block +// This is also called by fpop() to pop levels of IFENTs in case a macro or +// include file exits early with `exitm' or `end'. +// +int d_endif(void) +{ + IFENT * rif = ifent; + + if (rif->if_prev == NULL) + return error("mismatched .endif"); + + ifent = rif->if_prev; + disabled = rif->if_prev->if_state; + rif->if_prev = f_ifent; + f_ifent = rif; + return 0; +} +