better error checking for inline assembly being too large

Author: totalspectrum

backends/asm/inlineasm.c

@@ -888,12 +888,13 @@ CompileMiniDatBlock(IRList *irl, AST *origtop, unsigned asmFlags)
     AST *top = origtop;
     IR *fcache;
     IR *startlabel, *endlabel;
-    IR *ir, *fitir;
+    IR *ir;
     Operand *enddst, *startdst;
     Flexbuf *fb = (Flexbuf *)malloc(sizeof(Flexbuf));
     Flexbuf *relocs = (Flexbuf *)malloc(sizeof(Flexbuf));
     struct CopyLocalData copyInfo;
-    
+    PASMAddresses paddr;
+
     flexbuf_init(fb, 1024);
     flexbuf_init(relocs, 1024);
 
@@ -912,7 +913,11 @@ CompileMiniDatBlock(IRList *irl, AST *origtop, unsigned asmFlags)
 
     /* compile the inline assembly as a DAT block */
     curfunc->localsUsedInAsm = 0;
-    AssignAddresses(&curfunc->localsyms, top, 0);
+    AssignAddresses(&paddr, &curfunc->localsyms, top, 0);
+    if (paddr.cogPc > gl_fcache_size * LONG_SIZE) {
+        ERROR(origtop, "Inline assembly is too large to fit in %d longs\n",
+              gl_fcache_size);
+    }
     PrintDataBlock(fb, top, NULL, relocs);
 
     /* copy the locals used in the inline assembly */
@@ -934,10 +939,6 @@ CompileMiniDatBlock(IRList *irl, AST *origtop, unsigned asmFlags)
     ir->src2 = (Operand *)current;
 
     /* finish off the block */
-    fitir = NewIR(OPC_FIT);
-    fitir->dst = NewImmediate(gl_fcache_size);
-    fitir->flags |= FLAG_USER_INSTR;
-    AppendIR(irl, fitir);
     AppendIR(irl, endlabel);
     if (gl_p2) {
         IR *orgh = NewIR(OPC_HUBMODE);

backends/nucode/outnu.c

@@ -1917,14 +1917,19 @@ static void NuCompileInlineAsm(NuIrList *irl, AST *ast) {
     NuIrLabel *startLabel;
     NuFunData *fdata = FunData(curfunc);
     unsigned startPos, endPos;
-
+    PASMAddresses paddr;
+    
     if (!fdata->dataLabel) {
         fdata->dataLabel = NuCreateLabel();
         flexbuf_init(&fdata->dataBuf, 1024);
     }
     startPos = flexbuf_curlen(&fdata->dataBuf);
     startLabel = NuIrOffsetLabel(fdata->dataLabel, startPos);
-    AssignAddresses(&curfunc->localsyms, list, 0);
+    AssignAddresses(&paddr, &curfunc->localsyms, list, 0);
+    if (paddr.cogPc > gl_fcache_size * LONG_SIZE) {
+        ERROR(ast, "Inline assembly is too large to fit in %d longs\n",
+              gl_fcache_size);
+    }
     PrintDataBlock(&fdata->dataBuf,list,NULL,&fdata->dataBufRelocs);
     // append a RET instruction
     // which is $FD64002D

frontends/common.h

@@ -672,8 +672,15 @@ bool IsSystemModule(Module *P);
 /* create a new AST describing a table lookup */
 AST *NewLookup(AST *expr, AST *table);
 
+typedef struct PASMAddresses {
+    unsigned dataSize;   /* total data size */
+    unsigned cogPc;      /* last cog PC */
+    unsigned hubPc;      /* last (relative) hub PC */
+} PASMAddresses;
+
 /* declare labels in PASM */
-unsigned AssignAddresses(SymbolTable *symtab, AST *instrlist, int startFlags);
+/* fills out a struct giving the various maximum pc's and sizes */
+void AssignAddresses(PASMAddresses *addr, SymbolTable *symtab, AST *instrlist, int startFlags);
 void DeclareModuleLabels(Module *);
 #define ADDRESS_STARTFLAG_COG 0x0
 #define ADDRESS_STARTFLAG_HUB 0x1

pasm.c

@@ -1,6 +1,6 @@
 /*
  * PASM and data compilation
- * Copyright 2011-2023 Total Spectrum Software Inc.
+ * Copyright 2011-2025 Total Spectrum Software Inc.
  * 
  * +--------------------------------------------------------------------
  * ¦  TERMS OF USE: MIT License
@@ -657,8 +657,8 @@ IsJmpRetInstruction(AST *ast)
     return false;
 }
 
-unsigned
-AssignAddresses(SymbolTable *symtab, AST *instrlist, int startFlags)
+void
+AssignAddresses(PASMAddresses *addr, SymbolTable *symtab, AST *instrlist, int startFlags)
 {
     unsigned cogpc = 0;
     unsigned hubpc = 0;
@@ -1025,20 +1025,26 @@ AssignAddresses(SymbolTable *symtab, AST *instrlist, int startFlags)
         orig_datoff = datoff;
         goto again;
     }
-    return datoff;
+    if (addr) {
+        addr->dataSize = datoff;
+        addr->hubPc = hubpc;
+        addr->cogPc = cogpc;
+    }
 }
 
 void
 DeclareModuleLabels(Module *P)
 {
     Module *save = current;
     int startFlags = 0;
-
+    PASMAddresses paddr;
+    
     if (gl_no_coginit && gl_output == OUTPUT_DAT) {
         startFlags = ADDRESS_STARTFLAG_HUB;
     }
     current = P;
     P->gasPasm = gl_gas_dat;
-    P->datsize = AssignAddresses(&P->objsyms, P->datblock, startFlags);
+    AssignAddresses(&paddr, &P->objsyms, P->datblock, startFlags);
+    P->datsize = paddr.dataSize;
     current = save;
 }