some attempts at improving inline assembly in mini-dat blocks

Author: totalspectrum

backends/asm/inlineasm.c

@@ -868,8 +868,7 @@ static int copyLocal(Symbol *sym, void *arg)
             size = TypeSize((AST *)sym->v.ptr);
             break;
         default:
-            size = LONG_SIZE;
-            break;
+            return 1;
         }
 
         hubtmp = CompileSymbolForFunc(irl, sym, curfunc, linesrc); 
@@ -895,9 +894,11 @@ CompileMiniDatBlock(IRList *irl, AST *origtop, unsigned asmFlags)
     IR *ir, *fitir;
     Operand *enddst, *startdst;
     Flexbuf *fb = (Flexbuf *)malloc(sizeof(Flexbuf));
+    Flexbuf *relocs = (Flexbuf *)malloc(sizeof(Flexbuf));
     struct CopyLocalData copyInfo;
 
     flexbuf_init(fb, 1024);
+    flexbuf_init(relocs, 1024);
 
     startdst = NewHubLabel();
     enddst = NewHubLabel();
@@ -915,7 +916,7 @@ CompileMiniDatBlock(IRList *irl, AST *origtop, unsigned asmFlags)
     /* compile the inline assembly as a DAT block */
     curfunc->localsUsedInAsm = 0;
     AssignAddresses(&curfunc->localsyms, top, 0);
-    PrintDataBlock(fb, top, NULL, NULL);
+    PrintDataBlock(fb, top, NULL, relocs);
 
     /* copy the locals used in the inline assembly */
     copyInfo.irl = irl;
@@ -931,7 +932,7 @@ CompileMiniDatBlock(IRList *irl, AST *origtop, unsigned asmFlags)
         org0->dst = NewImmediate(0);
         AppendIR(irl, org0);
     }
-    Operand *op = NewOperand(IMM_BINARY, (const char *)fb, 0);
+    Operand *op = NewOperand(IMM_BINARY, (const char *)fb, (intptr_t)relocs);
     ir = EmitOp2(irl, OPC_BINARY_BLOB, NULL, op);
     ir->src2 = (Operand *)current;
 

backends/nucode/outnu.c

@@ -1,7 +1,7 @@
 //
 // Bytecode (nucode) compiler for spin2cpp
 //
-// Copyright 2021-2024 Total Spectrum Software Inc.
+// Copyright 2021-2025 Total Spectrum Software Inc.
 // see the file COPYING for conditions of redistribution
 //
 #include "outnu.h"
@@ -1673,6 +1673,7 @@ NuCompileExpression(NuIrList *irl, AST *node) {
         if (!fdata->dataLabel) {
             fdata->dataLabel = NuCreateLabel();
             flexbuf_init(&fdata->dataBuf, 256);
+            flexbuf_init(&fdata->dataBufRelocs, 256);
         }
         tmpLabel = NuIrOffsetLabel(fdata->dataLabel, flexbuf_curlen(&fdata->dataBuf));
         StringBuildBuffer(&fdata->dataBuf, node->left, node->d.ival);
@@ -1924,7 +1925,7 @@ static void NuCompileInlineAsm(NuIrList *irl, AST *ast) {
     startPos = flexbuf_curlen(&fdata->dataBuf);
     startLabel = NuIrOffsetLabel(fdata->dataLabel, startPos);
     AssignAddresses(&curfunc->localsyms, list, 0);
-    PrintDataBlock(&fdata->dataBuf,list,NULL,NULL);
+    PrintDataBlock(&fdata->dataBuf,list,NULL,&fdata->dataBufRelocs);
     // append a RET instruction
     // which is $FD64002D
     flexbuf_addchar(&fdata->dataBuf, 0x2d);
@@ -2469,7 +2470,7 @@ static int NuCompileObject(void *vptr, Module *P) {
         NuOutputIrList(fb, &FunData(pf)->irl);
         if (FunData(pf)->dataLabel) {
             NuOutputLabelNL(fb, FunData(pf)->dataLabel);
-            OutputDataBlob(fb, &FunData(pf)->dataBuf, NULL, NULL);
+            OutputDataBlob(fb, &FunData(pf)->dataBuf, &FunData(pf)->dataBufRelocs, NULL);
         }
     }
     return 1;

backends/nucode/outnu.h

@@ -20,6 +20,7 @@ typedef struct {
     NuIrLabel *entryLabel;
     NuIrLabel *dataLabel;
     Flexbuf dataBuf;         // inline data for the function
+    Flexbuf dataBufRelocs;   // relocations for same
     FunctionList *funcdups;  // functions that are aliases to this one
     bool isRemoved;          // flag, if set function is a duplicate of something else
     unsigned char hash[SHA256_BLOCK_SIZE];