X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=5628ef90f8226d59d064e0e9757634c3ac3d6852;hp=c42d8b8c727f5cd3e5ee938ccc6fc383f03c51a0;hb=c59f7a33730dacf753e066a4002e2f749051a137;hpb=bdbf34766f4d074a5933eb1326fe4ce03d249e10 diff --git a/direct.c b/direct.c index c42d8b8..5628ef9 100644 --- a/direct.c +++ b/direct.c @@ -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" @@ -50,6 +51,7 @@ int d_abs(void); int d_comm(void); int d_dc(WORD); int d_ds(WORD); +int d_dsm(WORD); int d_dcb(WORD); int d_globl(void); int d_gpu(void); @@ -152,6 +154,7 @@ int (*dirtab[])() = { d_nofpu, // 65 nofpu d_opt, // 66 .opt d_objproc, // 67 .objproc + d_dsm, // 68 .dsm }; @@ -222,7 +225,9 @@ int d_org(void) return error(".org permitted only in GPU/DSP/OP, 56001 and 6502 sections"); // M56K can leave the expression off the org for some reason :-/ - if ((abs_expr(&address) == ERROR) && !dsp56001) + // (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; @@ -255,9 +260,94 @@ int d_org(void) } 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; } - at_eol(); + ErrorIfNotAtEOL(); return 0; } @@ -830,7 +920,7 @@ int d_assert(void) break; } - at_eol(); + ErrorIfNotAtEOL(); return 0; } @@ -986,11 +1076,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 @@ -1006,18 +1096,86 @@ 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 +// dsm[.siz] expression +// Define modulo storage +// Quoting the Motorola assembler manual: +// "The DSM directive reserves a block of memory the length of which in words is equal to +// the value of .If the runtime location counter is not zero, this directive first +// advances the runtime location counter to a base address that is a multiple of 2k, where +// 2k >= ." +// The kicker of course is written a few sentences after: +// "