Fix a few minor problems with 030 mode PC relative fixups.

[rmac] / direct.c

diff --git a/direct.c b/direct.c
index 32e5dd19233c679bab7845f0f6a41f51bc030452..b17f9dde6393fc515f74df779a52b469d5a60464 100644 (file)
--- a/direct.c
+++ b/direct.c
@@ -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();
@@ -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;
                }
 
@@ -1584,11 +1568,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--)
        {