X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=0c8dfb5b0fba563a5081a800c4cf64df83bb57f1;hp=32e5dd19233c679bab7845f0f6a41f51bc030452;hb=412fe3614e2d9ea6bf35ebb5b335c1adb79b5c39;hpb=29fa5dcf504b966803063a1c2891f58f97126d04 diff --git a/direct.c b/direct.c index 32e5dd1..0c8dfb5 100644 --- a/direct.c +++ b/direct.c @@ -1074,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 @@ -1094,9 +1094,32 @@ 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); } ErrorIfNotAtEOL(); @@ -1105,7 +1128,7 @@ int d_ds(WORD siz) // -// 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) { @@ -1191,28 +1214,7 @@ int d_dc(WORD siz) if (eattr & FLOAT) { double fval = *(double *)&eval; - - if (fval >= 1) - { - warn("value clamped to +1."); - eval = 0x7fffff; - } - else if (fval <= -1) - { - warn("value clamped to -1."); - eval = 0x800000; - } - else - { - // Convert fraction to 24 bits fixed point with sign and rounding - // Yeah, that cast to int32_t has to be there because casting - // a float to unsigned int is "undefined" according to the C - // standard. Which most compilers seem to do the sensible thing - // and just cast the f**king value properly, except gcc 4.x.x - // for arm (tested on raspbian). - // Thanks, C and gcc! Thanks for making me waste a few hours \o/ - eval = 0;//!!! FIX !!! (uint32_t)(int32_t)round(fval*(1 << 23)); - } + eval = DoubleToDSPFloat(fval); } else { @@ -1227,10 +1229,11 @@ int d_dc(WORD siz) 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. + // 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: @@ -1245,27 +1248,7 @@ l_parse_loop: if (eattr & FLOAT) { float fval = *(float *)&eval; - if (fval >= 1) - { - warn("value clamped to +1."); - eval = 0x7fffff; - } - else if (fval <= -1) - { - warn("value clamped to -1."); - eval = 0x800000; - } - else - { - // Convert fraction to 24 bits fixed point with sign and rounding - // Yeah, that cast to int32_t has to be there because casting - // a float to unsigned int is "undefined" according to the C - // standard. Which most compilers seem to do the sensible thing - // and just cast the f**king value properly, except gcc 4.x.x - // for arm (tested on raspbian). - // Thanks, C and gcc! Thanks for making me waste a few hours \o/ - eval = 0;//!!! FIX !!! (uint32_t)(int32_t)round(fval*(1 << 23)); - } + eval = DoubleToDSPFloat(fval); } else { @@ -1305,6 +1288,7 @@ l_parse_loop: } } + goto comma; } @@ -1328,6 +1312,7 @@ l_parse_loop: } break; + case SIZW: case SIZN: if (!defined) @@ -1351,6 +1336,7 @@ l_parse_loop: } break; + case SIZL: // Shamus: Why can't we do longs in 6502 mode? if (m6502) @@ -1358,11 +1344,7 @@ l_parse_loop: 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 @@ -1377,34 +1359,33 @@ l_parse_loop: } 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 { @@ -1419,6 +1400,7 @@ l_parse_loop: } break; + case SIZD: // 64-bit double size if (m6502) @@ -1426,8 +1408,9 @@ l_parse_loop: 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 { @@ -1442,6 +1425,7 @@ l_parse_loop: } break; + case SIZX: if (m6502) return error(in_6502mode); @@ -1451,8 +1435,9 @@ l_parse_loop: 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 { @@ -1584,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--) {