X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=294ea4ac32649b19846bc8a69f5951c5ca522278;hp=9e397198465be703203a32f2a16bf6d76e865fe6;hb=30a208654896284b50e7b362e97d3e63ec717b96;hpb=9153334781cd2e23750f4dc002e847606c07a1f0 diff --git a/direct.c b/direct.c index 9e39719..294ea4a 100644 --- a/direct.c +++ b/direct.c @@ -79,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 @@ -149,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 }; @@ -216,23 +218,24 @@ 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 :-/ + 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); @@ -249,9 +252,12 @@ int d_org(void) chptr = scode->chptr + address; orgaddr = address; orgactive = 1; - at_eol(); + } + else if (dsp56001) + { } + at_eol(); return 0; } @@ -288,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++; @@ -347,7 +367,7 @@ int d_print(void) return 0; token_err: - error("illegal print token"); + error("illegal print token [@ '%s']", prntstr); return ERROR; } @@ -457,7 +477,7 @@ int d_incbin(void) if (*tok != STRING) { - error("syntax error; string missing"); + error("syntax error; file to include missing"); return ERROR; } @@ -956,7 +976,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(); @@ -1034,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]); @@ -1066,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: @@ -1136,6 +1153,7 @@ int d_dc(WORD siz) D_long(eval); } + break; case SIZQ: // 64-bit size @@ -1144,7 +1162,17 @@ int d_dc(WORD siz) // Shamus: We only handle DC.Q type stuff, will have to add fixups // and stuff later (maybe... might not be needed...) - D_quad(eval); + // 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 @@ -1158,8 +1186,9 @@ int d_dc(WORD siz) } 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; @@ -1180,8 +1209,9 @@ int d_dc(WORD siz) } 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; @@ -1204,8 +1234,9 @@ int d_dc(WORD siz) } 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; @@ -1483,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; @@ -1573,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; } @@ -1601,6 +1639,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; } @@ -1626,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; } @@ -1876,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...] //