fix struct usage in DAT

Author: totalspectrum

Changelog.txt

@@ -1,6 +1,7 @@
 Version 7.1.2
 - Fix namespace usage during initial address assignment (so labels in namespaces work in ORG/RES/FIT etc.)
 - Fix some issues around array address calculations in Spin2
+- Fix struct usage in DAT sections
 
 Version 7.1.1
 - Fixed using struct names for return values and parameters in Spin2

backends/dat/outdat.c

@@ -2026,9 +2026,10 @@ outputVarDeclare(Flexbuf *f, AST *ast, Flexbuf *relocs)
     AST *type = ast->left;
     int siz;
     int typsiz;
-    
-    ast = ast->right;
-    if (ast->kind == AST_ASSIGN) {
+
+    if (ast)
+        ast = ast->right;
+    if (ast && ast->kind == AST_ASSIGN) {
         initval = ast->right;
         ast = ast->left;
     }

frontends/spin/spin.y

@@ -1316,15 +1316,6 @@ datline:
         idast = NewAST(AST_LISTHOLDER, linebreak, idast);
         $$ = idast;
     }
-  | identifier structname
-    {
-        AST *ident = $1;
-        AST *typ = $2;
-        AST *var;
-
-        var = NewAST(AST_DECLARE_VAR, typ, ident);
-        $$ = NewAST(AST_LISTHOLDER, var, NULL);
-    }
   ;
 
 basedatline:
@@ -1465,6 +1456,15 @@ basedatline:
   {
       $$ = NewAST(AST_NAMESPACE, $2, NULL);
   }
+  | structname
+    {
+        AST *ident = NULL;
+        AST *typ = $1;
+        AST *var;
+
+        var = NewAST(AST_DECLARE_VAR, typ, ident);
+        $$ = var;
+    }
   ;
 
 optidentifier:

pasm.c

@@ -1078,8 +1078,8 @@ AssignAddresses(PASMAddresses *addr, SymbolTable *orig_symtab, AST *instrlist, i
                 // initializers always go in HUB memory
                 inHub = 1;
                 MARK_DATA(label_flags);
-                AstReportAs(ident, &saveinfo);
-                if (ident->kind == AST_ASSIGN) {
+                AstReportAs(ast, &saveinfo);
+                if (ident && ident->kind == AST_ASSIGN) {
                     initptr = &ident->right;
                     initializer = ident->right;
                     ident = ident->left;
@@ -1090,6 +1090,7 @@ AssignAddresses(PASMAddresses *addr, SymbolTable *orig_symtab, AST *instrlist, i
                 }
                 typalign = TypeAlign(type);
                 typsize = TypeSize(type);
+                lasttype = type;
                 if (typsize == 0 && IsClassType(type)) {
                     // empty object; this is OK if it has methods
                     Module *Q = GetClassPtr(type);
@@ -1102,13 +1103,15 @@ AssignAddresses(PASMAddresses *addr, SymbolTable *orig_symtab, AST *instrlist, i
                     *initptr = initializer;
                 }
                 ALIGNPC(typalign);
-                if (ident->kind == AST_LOCAL_IDENTIFIER) {
-                    ident = ident->left;
-                }
-                if (ident->kind != AST_IDENTIFIER) {
-                    ERROR(ast, "Internal error in DECLARE_VAR: expected identifier");
-                } else {
-                    pendingLabels = AddToList(pendingLabels, NewAST(AST_LISTHOLDER, ident, NULL));
+                if (ident) {
+                    if (ident->kind == AST_LOCAL_IDENTIFIER) {
+                        ident = ident->left;
+                    }
+                    if (ident->kind != AST_IDENTIFIER) {
+                        ERROR(ast, "Internal error in DECLARE_VAR: expected identifier");
+                    } else {
+                        pendingLabels = AddToList(pendingLabels, NewAST(AST_LISTHOLDER, ident, NULL));
+                    }
                 }
                 pendingLabels = emitPendingLabels(symtab, pendingLabels, hubpc, cogpc, type, lastOrg, inHub, label_flags, pass);
                 INCPC(typsize);