X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=294ea4ac32649b19846bc8a69f5951c5ca522278;hp=54c09d694118c1de435a8097956e0478cc08f34c;hb=30a208654896284b50e7b362e97d3e63ec717b96;hpb=cfd001aea60f54e49d9beae0f941c513f45c202b diff --git a/direct.c b/direct.c index 54c09d6..294ea4a 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-2018 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -11,6 +11,7 @@ #include "amode.h" #include "error.h" #include "expr.h" +#include "fltpoint.h" #include "listing.h" #include "mach.h" #include "macro.h" @@ -24,6 +25,7 @@ #define DEF_KW #include "kwtab.h" + TOKEN exprbuf[128]; // Expression buffer SYM * symbolPtr[1000000]; // Symbol pointers table static long unused; // For supressing 'write' warnings @@ -33,7 +35,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); @@ -78,6 +79,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 @@ -148,7 +150,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 }; @@ -213,25 +216,26 @@ int d_warn(char *str) // int d_org(void) { - uint32_t address; + 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 :-/ + if ((abs_expr(&address) == ERROR) && !dsp56001) { 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); @@ -248,9 +252,12 @@ int d_org(void) chptr = scode->chptr + address; orgaddr = address; orgactive = 1; - at_eol(); + } + else if (dsp56001) + { } + at_eol(); return 0; } @@ -266,7 +273,7 @@ int d_print(void) int wordlong = 0; // WORD = 0, LONG = 1 int outtype = 0; // 0:hex, 1:decimal, 2:unsigned - uint32_t eval; // Expression value + uint64_t eval; // Expression value WORD eattr; // Expression attributes SYM * esym; // External symbol involved in expr. TOKEN r_expr[EXPRSIZE]; @@ -287,25 +294,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++; @@ -346,7 +367,7 @@ int d_print(void) return 0; token_err: - error("illegal print token"); + error("illegal print token [@ '%s']", prntstr); return ERROR; } @@ -456,7 +477,7 @@ int d_incbin(void) if (*tok != STRING) { - error("syntax error; string missing"); + error("syntax error; file to include missing"); return ERROR; } @@ -687,7 +708,7 @@ int d_unimpl(void) // // Return absolute (not TDB) and defined expression or return an error // -int abs_expr(uint32_t * a_eval) +int abs_expr(uint64_t * a_eval) { WORD eattr; @@ -795,7 +816,7 @@ allright: int d_assert(void) { WORD eattr; - uint32_t eval; + uint64_t eval; for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok) { @@ -853,13 +874,13 @@ int d_globl(void) // int d_prgflags(void) { - uint32_t 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 @@ -874,7 +895,7 @@ int d_prgflags(void) // int d_abs(void) { - uint32_t eval; + uint64_t eval; if (m6502) return error(in_6502mode); @@ -887,7 +908,7 @@ int d_abs(void) return 0; SwitchSection(ABS); - sloc = eval; + sloc = (uint32_t)eval; return 0; } @@ -953,9 +974,9 @@ int d_ds(WORD siz) { DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); } - uint32_t eval; + uint64_t eval; - if (cursect != M6502) + if ((cursect & (M6502 | M56KPXYL)) == 0) { if ((siz != SIZB) && (sloc & 1)) // Automatic .even auto_even(); @@ -976,9 +997,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; @@ -996,12 +1017,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; - uint32_t eval; + uint64_t eval; uint8_t * p; if ((scattr & SBSS) != 0) @@ -1033,7 +1054,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]); @@ -1065,9 +1086,6 @@ int d_dc(WORD siz) uint16_t tdb = eattr & TDB; uint16_t defined = eattr & DEFINED; - if ((challoc - ch_size) < 4) - chcheck(4); - switch (siz) { case SIZB: @@ -1112,6 +1130,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); @@ -1134,6 +1153,97 @@ 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); + D_quad(0LL); + } + else + { + D_quad(eval); + } + + break; + case SIZS: + // 32-bit float size + if (m6502) + return error(in_6502mode); + + if (!defined) + { + AddFixup(FU_FLOATSING, sloc, exprbuf); + D_long(0); + } + else + { +//Would this *ever* happen? +// if (tdb) +// MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL); + + PTR ptr; + ptr.u64 = &eval; + uint32_t ieee754 = FloatToIEEE754((float)*ptr.dp); + D_long(ieee754); + } + + break; + case SIZD: + // 64-bit double size + if (m6502) + return error(in_6502mode); + + if (!defined) + { + AddFixup(FU_FLOATDOUB, sloc, exprbuf); + D_quad(0LL); + } + else + { +//Would this *ever* happen? +// if (tdb) +// MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL); + + PTR ptr; + ptr.u64 = &eval; + uint64_t ieee754 = DoubleToIEEE754(*ptr.dp); + D_quad(ieee754); + } + + break; + case SIZX: + if (m6502) + return error(in_6502mode); + + uint8_t extDbl[12]; + memset(extDbl, 0, 12); + + if (!defined) + { + AddFixup(FU_FLOATEXT, sloc, exprbuf); + D_extend(extDbl); + } + else + { +//Would this *ever* happen? +// if (tdb) +// MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL); + + PTR ptr; + ptr.u64 = &eval; + DoubleToExtended(*ptr.dp, extDbl); + D_extend(extDbl); + } + break; } @@ -1152,7 +1262,7 @@ comma: // int d_dcb(WORD siz) { - uint32_t 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); } @@ -1172,7 +1282,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; } @@ -1189,8 +1299,8 @@ int d_dcb(WORD siz) // int d_init(WORD def_siz) { - uint32_t count; - uint32_t eval; + uint64_t count; + uint64_t eval; WORD eattr; WORD siz; @@ -1205,7 +1315,7 @@ int d_init(WORD def_siz) // Get repeat count (defaults to 1) if (*tok == '#') { - ++tok; + tok++; if (abs_expr(&count) != OK) return 0; @@ -1220,7 +1330,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; @@ -1231,9 +1341,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; @@ -1339,7 +1449,7 @@ int d_comm(void) { SYM * sym; char * p; - uint32_t eval; + uint64_t eval; if (m6502) return error(in_6502mode); @@ -1350,7 +1460,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) @@ -1366,10 +1476,10 @@ 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 = eval; // Install common symbol's size + sym->svalue = eval; // Install common symbol's size at_eol(); return 0; } @@ -1404,7 +1514,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; @@ -1456,29 +1566,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; } @@ -1494,11 +1604,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; } @@ -1513,17 +1630,17 @@ 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 + robjproc = 0; // Unset OP assembly + dsp56001 = 0; // Unset 56001 assembly regbank = BANK_N; // Set no default register bank return 0; } @@ -1549,6 +1666,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; } @@ -1566,7 +1685,7 @@ int d_dsp(void) // int d_cargs(void) { - uint32_t 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; @@ -1681,7 +1800,7 @@ int d_cargs(void) // int d_cstruct(void) { - uint32_t 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; @@ -1799,6 +1918,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...] // @@ -1870,7 +2016,7 @@ int d_opt(void) int d_if(void) { WORD eattr; - uint32_t eval; + uint64_t eval; SYM * esym; IFENT * rif = f_ifent;