X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=0c8dfb5b0fba563a5081a800c4cf64df83bb57f1;hp=c42d8b8c727f5cd3e5ee938ccc6fc383f03c51a0;hb=f733eb133e448318c0f0773882d804eca461f616;hpb=bdbf34766f4d074a5933eb1326fe4ce03d249e10 diff --git a/direct.c b/direct.c index c42d8b8..0c8dfb5 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" @@ -222,7 +223,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 +258,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 +918,7 @@ int d_assert(void) break; } - at_eol(); + ErrorIfNotAtEOL(); return 0; } @@ -986,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 @@ -1006,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) { @@ -1029,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 @@ -1086,6 +1199,99 @@ int d_dc(WORD siz) uint16_t tdb = eattr & TDB; uint16_t defined = eattr & DEFINED; +// 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) { case SIZB: @@ -1106,6 +1312,7 @@ int d_dc(WORD siz) } break; + case SIZW: case SIZN: if (!defined) @@ -1129,6 +1336,7 @@ int d_dc(WORD siz) } break; + case SIZL: // Shamus: Why can't we do longs in 6502 mode? if (m6502) @@ -1136,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 @@ -1155,34 +1359,33 @@ int d_dc(WORD siz) } 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); + 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 { @@ -1197,6 +1400,7 @@ int d_dc(WORD siz) } break; + case SIZD: // 64-bit double size if (m6502) @@ -1204,8 +1408,9 @@ 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 { @@ -1220,6 +1425,7 @@ int d_dc(WORD siz) } break; + case SIZX: if (m6502) return error(in_6502mode); @@ -1229,8 +1435,9 @@ 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 { @@ -1252,7 +1459,7 @@ comma: break; } - at_eol(); + ErrorIfNotAtEOL(); return 0; } @@ -1362,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--) { @@ -1480,7 +1684,7 @@ int d_comm(void) return 0; sym->svalue = eval; // Install common symbol's size - at_eol(); + ErrorIfNotAtEOL(); return 0; } @@ -1612,7 +1816,7 @@ int d_56001(void) rgpu = rdsp = robjproc = 0; SaveSection(); - if (obj_format == LOD || obj_format == P56) + if ((obj_format == LOD) || (obj_format == P56)) SwitchSection(M56001P); return 0;