X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=0c8dfb5b0fba563a5081a800c4cf64df83bb57f1;hp=7447553694944895c62c5e94dd428ba34c62ca4f;hb=c299aabe0ac1ab89bcea7961652d1f5fa3c078aa;hpb=29b32d134bc12831a8ddd098bf9aeeda26dcfe7c diff --git a/direct.c b/direct.c index 7447553..0c8dfb5 100644 --- a/direct.c +++ b/direct.c @@ -1,7 +1,7 @@ // // RMAC - Reboot's Macro Assembler for all Atari computers // DIRECT.C - Directive Handling -// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -9,6 +9,7 @@ #include "direct.h" #include "6502.h" #include "amode.h" +#include "dsp56k.h" #include "error.h" #include "expr.h" #include "fltpoint.h" @@ -35,7 +36,6 @@ 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); @@ -80,6 +80,7 @@ int d_cstruct(void); int d_prgflags(void); int d_opt(void); int d_dsp(void); +int d_objproc(void); void SetLargestAlignment(int); // Directive handler table @@ -150,7 +151,8 @@ int (*dirtab[])() = { d_68882, // 63 .68882 d_56001, // 64 .56001 d_nofpu, // 65 nofpu - d_opt, // 58 .opt + d_opt, // 66 .opt + d_objproc, // 67 .objproc }; @@ -217,23 +219,26 @@ int d_org(void) { uint64_t address; - if (!rgpu && !rdsp && !m6502) - return error(".org permitted only in gpu/dsp and 6502 sections"); + if (!rgpu && !rdsp && !robjproc && !m6502 && !dsp56001) + return error(".org permitted only in GPU/DSP/OP, 56001 and 6502 sections"); - if (abs_expr(&address) == ERROR) + // M56K can leave the expression off the org for some reason :-/ + // (It's because the expression is non-standard, and so we have to look at + // it in isolation) + if (!dsp56001 && (abs_expr(&address) == ERROR)) { error("cannot determine org'd address"); return ERROR; } - if (rgpu | rdsp) + if (rgpu | rdsp | robjproc) { orgaddr = address; orgactive = 1; } - else + else if (m6502) { - // 6502. We also kludge `lsloc' so the listing generator doesn't try + // 6502. We also kludge 'lsloc' so the listing generator doesn't try // to spew out megabytes. if (address > 0xFFFF) return error(range_error); @@ -250,9 +255,97 @@ int d_org(void) chptr = scode->chptr + address; orgaddr = address; orgactive = 1; - at_eol(); } + else if (dsp56001) + { + // Only mark segments we actually wrote something + if (chptr != dsp_currentorg->start && dsp_written_data_in_current_org) + { + dsp_currentorg->end = chptr; + dsp_currentorg++; + } + + // Maybe we switched from a non-DSP section (TEXT, DATA, etc) and + // scode isn't initialised yet. Not that it's going to be a valid + // scenario, but if we try it anyhow it's going to lead to a crash. So + // let's fudge a value of 0 and get on with it. + orgaddr = (scode != NULL ? sloc : 0); + SaveSection(); + + if (tok[1] != ':') + return error(syntax_error); + int sectionToSwitch = 0; + + switch (tok[0]) + { + case KW_X: + dsp_currentorg->memtype = ORG_X; + sectionToSwitch = M56001X; + break; + + case KW_Y: + dsp_currentorg->memtype = ORG_Y; + sectionToSwitch = M56001Y; + break; + + case KW_P: + dsp_currentorg->memtype = ORG_P; + sectionToSwitch = M56001P; + break; + + case KW_L: + dsp_currentorg->memtype = ORG_L; + sectionToSwitch = M56001L; + break; + + default: + return error("unknown type in ORG"); + } + + if ((obj_format == LOD) || (obj_format == P56)) + SwitchSection(sectionToSwitch); + + tok += 2; + chcheck(3); // Ensure we got a valid address to write + dsp_currentorg->chunk = scode; // Mark down which chunk this org starts from (will be needed when outputting) + + if (*tok == EOL) + { + // Well, the user didn't specify an address at all so we'll have to + // use the last used address of that section (or 0 if there wasn't one) + address = orgaddr; + dsp_currentorg->start = chptr; + dsp_currentorg->orgadr = orgaddr; + } + else + { + if (abs_expr(&address) == ERROR) + { + error("cannot determine org'd address"); + return ERROR; + } + + dsp_currentorg->start = chptr; + dsp_currentorg->orgadr = (uint32_t)address; + sect[cursect].orgaddr = (uint32_t)address; + } + + if (address > DSP_MAX_RAM) + { + return error(range_error); + } + + dsp_written_data_in_current_org = 0; + + // Copied from 6502 above: kludge `lsloc' so the listing generator + // doesn't try to spew out megabytes. + lsloc = sloc = (int32_t)address; +// N.B.: It seems that by enabling this, even though it works elsewhere, will cause symbols to royally fuck up. Will have to do some digging to figure out why. +// orgactive = 1; + } + + ErrorIfNotAtEOL(); return 0; } @@ -275,7 +368,7 @@ int d_print(void) while (*tok != EOL) { - switch(*tok) + switch (*tok) { case STRING: sprintf(prntstr, "%s", string[tok[1]]); @@ -289,25 +382,39 @@ int d_print(void) case '/': formatting = 1; - if (tok[1] != SYMBOL) + // "X" & "L" get tokenized now... :-/ Probably should look into preventing this kind of thing from happening (was added with DSP56K code) + if ((tok[1] != SYMBOL) && (tok[1] != KW_L) && (tok[1] != KW_X)) goto token_err; -// strcpy(prntstr, (char *)tok[2]); - strcpy(prntstr, string[tok[2]]); - - switch(prntstr[0]) + if (tok[1] == KW_L) { - case 'l': case 'L': wordlong = 1; break; - case 'w': case 'W': wordlong = 0; break; - case 'x': case 'X': outtype = 0; break; - case 'd': case 'D': outtype = 1; break; - case 'u': case 'U': outtype = 2; break; - default: - error("unknown print format flag"); - return ERROR; + wordlong = 1; + tok += 2; + } + else if (tok[1] == KW_X) + { + outtype = 0; + tok += 2; + } + else + { + strcpy(prntstr, string[tok[2]]); + + switch (prntstr[0]) + { + case 'l': case 'L': wordlong = 1; break; + case 'w': case 'W': wordlong = 0; break; + case 'x': case 'X': outtype = 0; break; + case 'd': case 'D': outtype = 1; break; + case 'u': case 'U': outtype = 2; break; + default: + error("unknown print format flag"); + return ERROR; + } + + tok += 3; } - tok += 3; break; case ',': tok++; @@ -348,7 +455,7 @@ int d_print(void) return 0; token_err: - error("illegal print token"); + error("illegal print token [@ '%s']", prntstr); return ERROR; } @@ -458,7 +565,7 @@ int d_incbin(void) if (*tok != STRING) { - error("syntax error; string missing"); + error("syntax error; file to include missing"); return ERROR; } @@ -811,7 +918,7 @@ int d_assert(void) break; } - at_eol(); + ErrorIfNotAtEOL(); return 0; } @@ -957,7 +1064,7 @@ int d_ds(WORD siz) uint64_t eval; - if (cursect != M6502) + if ((cursect & (M6502 | M56KPXYL)) == 0) { if ((siz != SIZB) && (sloc & 1)) // Automatic .even auto_even(); @@ -967,11 +1074,11 @@ int d_ds(WORD siz) return 0; // 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) - // N.B.: Since 'eval' is of type uint32_t, if it goes negative, it will have - // its high bit set. + // that?--nobody does; it's the code gremlins, or rum, what does it) + // 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"); + return error("negative sizes not allowed in DS"); // In non-TDB section (BSS, ABS and M6502) just advance the location // counter appropriately. In TDB sections, deposit (possibly large) chunks @@ -987,18 +1094,41 @@ int d_ds(WORD siz) just_bss = 1; // No data deposited (8-bit CPU mode) } + else if (cursect == M56001P || cursect == M56001X || cursect == M56001Y || cursect == M56001L) + { + // Change segment instead of marking blanks. + // Only mark segments we actually wrote something + if (chptr != dsp_currentorg->start && dsp_written_data_in_current_org) + { + dsp_currentorg->end = chptr; + dsp_currentorg++; + dsp_currentorg->memtype = dsp_currentorg[-1].memtype; + } + + listvalue((uint32_t)eval); + sloc += (uint32_t)eval; + + // And now let's create a new segment + dsp_currentorg->start = chptr; + dsp_currentorg->chunk = scode; // Mark down which chunk this org starts from (will be needed when outputting) + sect[cursect].orgaddr = sloc; + dsp_currentorg->orgadr = sloc; + dsp_written_data_in_current_org = 0; + + just_bss = 1; // No data deposited + } else { - dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), NULL); + dep_block(eval, siz, 0, (DEFINED | ABS), NULL); } - at_eol(); + ErrorIfNotAtEOL(); return 0; } // -// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d +// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d, dc.s, dc.x // int d_dc(WORD siz) { @@ -1010,7 +1140,9 @@ int d_dc(WORD siz) return error("illegal initialization of section"); // Do an auto_even if it's not BYTE sized (hmm, should we be doing this???) - if (cursect != M6502 && (siz != SIZB) && (sloc & 1)) + if ((cursect != M6502) && (cursect != M56001P) && (cursect != M56001X) + && (cursect != M56001Y) && (cursect != M56001L) + && (siz != SIZB) && (sloc & 1)) auto_even(); // Check to see if we're trying to set LONGS on a non 32-bit aligned @@ -1035,7 +1167,7 @@ int d_dc(WORD siz) for(p=string[tok[1]]; *p!=EOS; p++) D_byte(*p); } - else if(*tok == STRINGA8) + else if (*tok == STRINGA8) { for(p=string[tok[1]]; *p!=EOS; p++) D_byte(strtoa8[*p]); @@ -1067,8 +1199,98 @@ int d_dc(WORD siz) uint16_t tdb = eattr & TDB; uint16_t defined = eattr & DEFINED; - if ((challoc - ch_size) < 4) - chcheck(4); +// N.B.: This is awful. This needs better handling, rather than just bodging something in that, while works, is basically an ugly wart on the assembler. !!! FIX !!! + if (dsp56001) + { + if (cursect != M56001L) + { + if (!defined) + { + AddFixup(FU_DSPIMM24 | FU_SEXT, sloc, exprbuf); + D_dsp(0); + } + else + { + if (eattr & FLOAT) + { + double fval = *(double *)&eval; + eval = DoubleToDSPFloat(fval); + } + else + { + if ((uint32_t)eval + 0x1000000 >= 0x2000000) + return error(range_error); + } + + // Deposit DSP word (24-bit) + D_dsp(eval); + } + } + else + { + // In L: we deposit stuff to both X: and Y: instead + // We will be a bit lazy and require that there is a 2nd value + // in the same source line. (Motorola's assembler can parse + // 12-digit hex values, which we can't do at the moment) This + // of course requires to parse 2 values in one pass. If there + // isn't another value in this line, assume X: value is 0. + int secondword = 0; + uint32_t evaly; +l_parse_loop: + + if (!defined) + { + AddFixup(FU_DSPIMM24 | FU_SEXT, sloc, exprbuf); + D_dsp(0); + } + else + { + if (eattr & FLOAT) + { + float fval = *(float *)&eval; + eval = DoubleToDSPFloat(fval); + } + else + { + if (eval + 0x1000000 >= 0x2000000) + return error(range_error); + } + + // Parse 2nd value if we didn't do this yet + if (secondword == 0) + { + evaly = (uint32_t)eval; + secondword = 1; + + if (*tok != ':') + { + // If we don't have a : then we're probably at EOL, + // which means the X: value will be 0 + eval = 0; + ErrorIfNotAtEOL(); + } + else + { + tok++; // Eat the comma; + + if (expr(exprbuf, &eval, &eattr, NULL) != OK) + return 0; + + defined = (WORD)(eattr & DEFINED); + goto l_parse_loop; + } + } + + // Deposit DSP words (24-bit) + D_dsp(eval); + D_dsp(evaly); + sloc--; // We do write 2 DSP words but as far as L: space is concerned we actually advance our counter by one + } + + } + + goto comma; + } switch (siz) { @@ -1090,6 +1312,7 @@ int d_dc(WORD siz) } break; + case SIZW: case SIZN: if (!defined) @@ -1113,6 +1336,7 @@ int d_dc(WORD siz) } break; + case SIZL: // Shamus: Why can't we do longs in 6502 mode? if (m6502) @@ -1120,11 +1344,7 @@ int d_dc(WORD siz) if (!defined) { - if (movei) - AddFixup(FU_LONG | FU_MOVEI, sloc, exprbuf); - else - AddFixup(FU_LONG, sloc, exprbuf); - + AddFixup(FU_LONG | (movei ? FU_MOVEI : 0), sloc, exprbuf); D_long(0); } else @@ -1137,30 +1357,41 @@ 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...) + // DEFINITELY NEED FIXUPS HERE! + if (!defined) + { + AddFixup(FU_QUAD, sloc, exprbuf); + eval = 0; + } + D_quad(eval); break; + case SIZS: // 32-bit float size if (m6502) return error(in_6502mode); +/* Seems to me that if something is undefined here, then that should be an error. Likewise for the D & X variants. */ if (!defined) { - AddFixup(FU_FLOATSING, sloc, exprbuf); - D_long(0); +// AddFixup(FU_FLOATSING, sloc, exprbuf); +// D_long(0); + return error("labels not allowed in floating point expressions"); } else { - if (tdb) - MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL); +//Would this *ever* happen? +// if (tdb) +// MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL); PTR ptr; ptr.u64 = &eval; @@ -1169,6 +1400,7 @@ int d_dc(WORD siz) } break; + case SIZD: // 64-bit double size if (m6502) @@ -1176,13 +1408,15 @@ int d_dc(WORD siz) if (!defined) { - AddFixup(FU_FLOATDOUB, sloc, exprbuf); - D_quad(0LL); +// AddFixup(FU_FLOATDOUB, sloc, exprbuf); +// D_quad(0LL); + return error("labels not allowed in floating point expressions"); } else { - if (tdb) - MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL); +//Would this *ever* happen? +// if (tdb) +// MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL); PTR ptr; ptr.u64 = &eval; @@ -1191,6 +1425,7 @@ int d_dc(WORD siz) } break; + case SIZX: if (m6502) return error(in_6502mode); @@ -1200,13 +1435,15 @@ int d_dc(WORD siz) if (!defined) { - AddFixup(FU_FLOATEXT, sloc, exprbuf); - D_extend(extDbl); +// AddFixup(FU_FLOATEXT, sloc, exprbuf); +// D_extend(extDbl); + return error("labels not allowed in floating point expressions"); } else { - if (tdb) - MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL); +//Would this *ever* happen? +// if (tdb) +// MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL); PTR ptr; ptr.u64 = &eval; @@ -1222,7 +1459,7 @@ comma: break; } - at_eol(); + ErrorIfNotAtEOL(); return 0; } @@ -1332,11 +1569,8 @@ int d_init(WORD def_siz) // int dep_block(uint32_t count, WORD siz, uint32_t eval, WORD eattr, TOKEN * exprbuf) { - WORD tdb; - WORD defined; - - tdb = (WORD)(eattr & TDB); - defined = (WORD)(eattr & DEFINED); + WORD tdb = eattr & TDB; + WORD defined = eattr & DEFINED; while (count--) { @@ -1430,7 +1664,7 @@ int d_comm(void) p = string[tok[1]]; tok += 2; - if (*p == '.') // Cannot .comm a local symbol + if (*p == '.') // Cannot .comm a local symbol return error(locgl_error); if ((sym = lookup(p, LABEL, 0)) == NULL) @@ -1446,11 +1680,11 @@ int d_comm(void) if (*tok++ != ',') return error(comma_error); - if (abs_expr(&eval) != OK) // Parse size of common region + if (abs_expr(&eval) != OK) // Parse size of common region return 0; - sym->svalue = (uint32_t)eval; // Install common symbol's size - at_eol(); + sym->svalue = eval; // Install common symbol's size + ErrorIfNotAtEOL(); return 0; } @@ -1484,7 +1718,7 @@ int d_nlist(void) // int d_68000(void) { - rgpu = rdsp = 0; + rgpu = rdsp = robjproc = dsp56001 = 0; // Switching from gpu/dsp sections should reset any ORG'd Address orgactive = 0; orgwarning = 0; @@ -1536,29 +1770,29 @@ int d_68060(void) { d_68000(); activecpu = CPU_68060; - activefpu = FPU_68040; + activefpu = FPU_68060; return 0; } // -// .68881 - Back to 68000 TEXT segment and select 68881 FPU +// .68881 - Back to 680x0 TEXT segment and select 68881 FPU // int d_68881(void) { - d_68000(); + //d_68000(); activefpu = FPU_68881; return 0; } // -// .68882 - Back to 68000 TEXT segment and select 68882 FPU +// .68882 - Back to 680x0 TEXT segment and select 68882 FPU // int d_68882(void) { - d_68000(); - activefpu = FPU_68881; + //d_68000(); + activefpu = FPU_68882; return 0; } @@ -1574,11 +1808,18 @@ int d_nofpu(void) // -// DSP56001 +// .56001 - Switch to DSP56001 assembler // int d_56001(void) { - return error("Not yet, child. Be patient."); + dsp56001 = 1; + rgpu = rdsp = robjproc = 0; + SaveSection(); + + if ((obj_format == LOD) || (obj_format == P56)) + SwitchSection(M56001P); + + return 0; } @@ -1602,6 +1843,8 @@ int d_gpu(void) rgpu = 1; // Set GPU assembly rdsp = 0; // Unset DSP assembly + robjproc = 0; // Unset OP assembly + dsp56001 = 0; // Unset 56001 assembly regbank = BANK_N; // Set no default register bank return 0; } @@ -1627,6 +1870,8 @@ int d_dsp(void) rdsp = 1; // Set DSP assembly rgpu = 0; // Unset GPU assembly + robjproc = 0; // Unset OP assembly + dsp56001 = 0; // Unset 56001 assembly regbank = BANK_N; // Set no default register bank return 0; } @@ -1689,7 +1934,7 @@ int d_cargs(void) AddToSymbolDeclarationList(symbol); symbol->sattr |= (ABS | DEFINED | EQUATED); - symbol->svalue = (uint32_t)eval; + symbol->svalue = eval; tok += 2; // What this does is eat any dot suffixes attached to a symbol. If @@ -1816,7 +2061,7 @@ int d_cstruct(void) } symbol->sattr |= (ABS | DEFINED | EQUATED); - symbol->svalue = (uint32_t)eval; + symbol->svalue = eval; // Check for dot suffixes and adjust space accordingly (longs and // words on an odd boundary get bumped to the next word aligned @@ -1877,6 +2122,33 @@ int d_cstruct(void) } +// +// Define start of OP object list (allows the use of ORG) +// +int d_objproc(void) +{ + if ((cursect != TEXT) && (cursect != DATA)) + { + error(".objproc can only be used in the TEXT or DATA segments"); + return ERROR; + } + + // If previous section was DSP or 68000 then we need to reset ORG'd + // Addresses + if (!robjproc) + { + orgactive = 0; + orgwarning = 0; + } + + robjproc = 1; // Set OP assembly + rgpu = 0; // Unset GPU assembly + rdsp = 0; // Unset DSP assembly + dsp56001 = 0; // Unset 56001 assembly + return OK; +} + + // // Undefine a macro - .undefmac macname [, macname...] //