Allows setting the segment for the DATA statements.

This allows placing DATA in ROM in the Atari Cartridge and Atari 5200
targets, minimizing RAM usage.

Author: dmsc

manual.md

@@ -1644,6 +1644,22 @@ General Statements
   the same folder than the current
   basic source.
 
+  *Storing data into ROM*
+
+  In addition to the above, the cross
+  compiler allows to specify that the
+  data should be stored in ROM, instead
+  of the default in RAM. This means
+  that the data can't be modified in
+  targets that use ROM (cartridges),
+  but will lower RAM usage.
+
+  To specify this, simply add the `ROM`
+  word after the type:
+
+      DATA img() ROM 1234,5678
+      DATA pos() BYTE ROM 1,2,3,4
+
 
 **Decrements variable by 1**  
 **DEC _var_ / DE.**

src/compiler/compile.cc

@@ -299,7 +299,11 @@ int compiler::compile_file(std::string iname, std::string output_filename,
                     std::cerr << "internal error: unknown label type '" << name << "'\n";
                 else
                 {
-                    if(it->second.is_proc())
+                    auto lbl = it->second;
+                    auto seg = lbl.get_segment();
+                    if(seg.size())
+                        ofile << "\t.segment \"" << seg << "\"\n";
+                    else if(lbl.is_proc())
                         ofile << "\t.segment \"" << segname << "\"\n";
                     else
                         ofile << "\t.segment \"DATA\"\n";

src/compiler/parser-actions.cc

@@ -675,6 +675,32 @@ static bool SMB_E_LABEL_SET_TYPE(parse &s)
     return true;
 }
 
+static bool SMB_E_DATA_SET_ROM_SEG(parse &s)
+{
+    s.debug("E_DATA_SET_ROM_SEG");
+    s.skipws();
+    s.labels[s.last_label].set_segment("CODE");
+    return true;
+}
+
+static bool SMB_E_DATA_SET_SEGMENT(parse &s)
+{
+    s.debug("E_DATA_SET_SEGMENT");
+    s.skipws();
+    // Get segment name
+    std::string seg;
+    if(s.get_ident(seg))
+    {
+        s.labels[s.last_label].set_segment(seg);
+        return true;
+    }
+    else
+    {
+        s.error("segment name");
+        return false;
+    }
+}
+
 // Reads a DATA array from a file
 static bool SMB_E_DATA_FILE(parse &s)
 {
@@ -714,6 +740,8 @@ static std::map<std::string, bool (*)(parse &s)> actions = {
     {"E_LABEL_CREATE", SMB_E_LABEL_CREATE},
     {"E_LABEL_DEF", SMB_E_LABEL_DEF},
     {"E_LABEL_SET_TYPE", SMB_E_LABEL_SET_TYPE},
+    {"E_DATA_SET_ROM_SEG", SMB_E_DATA_SET_ROM_SEG},
+    {"E_DATA_SET_SEGMENT", SMB_E_DATA_SET_SEGMENT},
     {"E_NUMBER_BYTE", SMB_E_NUMBER_BYTE},
     {"E_NUMBER_FP", SMB_E_NUMBER_FP},
     {"E_NUMBER_WORD", SMB_E_NUMBER_WORD},

src/compiler/vartype.cc

@@ -121,6 +121,16 @@ void labelType::set_type(std::string str)
         throw std::runtime_error("invalid label type " + str);
 }
 
+void labelType::set_segment(std::string str)
+{
+    segment = str;
+}
+
+std::string labelType::get_segment()
+{
+    return segment;
+}
+
 bool labelType::is_defined()
 {
     return type >= 64;

src/compiler/vartype.h

@@ -56,8 +56,11 @@ class labelType
     int num_params();
     void define();
     void set_type(std::string);
+    void set_segment(std::string);
+    std::string get_segment();
     bool operator!=(const labelType &l) const { return type != l.type; }
 
   private:
+    std::string segment;
     int type;
 };

src/syntax/basic.syn

@@ -445,9 +445,13 @@ DATA_BYTES: data byte
         DATA_BYTE "," DATA_BYTES
         DATA_BYTE
 
+# Used in the extended compiler, set's the segment of the label
+DATA_EXT_TYPE: extended data type
+        pass
+
 DATA_TYPE: data type
-        TYPE_BYTE EQUAL E_LABEL_SET_TYPE DATA_BYTES
-        TYPE_WORD EQUAL E_LABEL_SET_TYPE E_NUMBER_WORD DATA_WORDS
+        TYPE_BYTE DATA_EXT_TYPE EQUAL E_LABEL_SET_TYPE DATA_BYTES
+        TYPE_WORD DATA_EXT_TYPE EQUAL E_LABEL_SET_TYPE E_NUMBER_WORD DATA_WORDS
 
 DATA_END:
         ","

src/syntax/extended.syn

@@ -20,14 +20,25 @@
 
 EXTERN {
  E_DATA_FILE
+ E_DATA_SET_ROM_SEG
+ E_DATA_SET_SEGMENT
  E_COUNT_PARAM
  E_PROC_CHECK
 }
 
 # Reda DATA statements from a file:
+DATA_FILE:
+        "File" DATA_EXT_TYPE E_LABEL_SET_TYPE "\"" E_DATA_FILE
+
+# Expands data types with "file" data
 DATA_TYPE:
-        TYPE_BYTE "File" E_LABEL_SET_TYPE "\"" E_DATA_FILE
-        TYPE_WORD "File" E_LABEL_SET_TYPE "\"" E_DATA_FILE
+        TYPE_BYTE DATA_FILE
+        TYPE_WORD DATA_FILE
+
+# Reda DATA statements location (ROM or RAM):
+DATA_EXT_TYPE:
+        "ROM" E_DATA_SET_ROM_SEG
+        "["   E_DATA_SET_SEGMENT "]"
 
 # In the cross-compiler, we count parameters to detect program errors:
 #  Count parameters before EXEC

testsuite/tests/data-rom.bas

@@ -0,0 +1,13 @@
+' Test DATA in ROM segments
+? "Start"
+
+DATA rfb() ROM = 1,2,3,4,5
+DATA rfw() BYTE ROM = 1,2,3,4,5,6
+DATA dfw() BYTE = 7, 8, 9
+DATA other() [RUNTIME] = 128, 129, 130, 131
+
+? rfb(0), rfb(1)
+? rfw(0), other(1)
+' Check that the DATA addresses are in different segments
+? ABS(ADR(dfw) - ADR(rfw)) > 10
+

testsuite/tests/data-rom.chk

@@ -0,0 +1,7 @@
+Name: Test DATA ROM
+Test: run-int
+Output:
+Start
+1         2
+1         129
+1