fix relocations in inline asm; there are still gotchas, but some basic examples work

Author: totalspectrum

backends/asm/assemble_ir.c

@@ -462,7 +462,7 @@ OutputAlignLong(Flexbuf *fb)
 }
 
 void
-OutputDataBlob(Flexbuf *fb, Flexbuf *databuf, Flexbuf *relocbuf, const char *startLabel)
+OutputDataBlob(Flexbuf *fb, Flexbuf *databuf, Flexbuf *relocbuf, const char *startLabel, bool outLabel)
 {
     uint8_t *data;
     int len;
@@ -472,7 +472,7 @@ OutputDataBlob(Flexbuf *fb, Flexbuf *databuf, Flexbuf *relocbuf, const char *sta
     uint32_t runlen;
     int lastdata;
 
-    if (startLabel) {
+    if (outLabel && startLabel) {
         OutputAlignLong(fb);
         flexbuf_printf(fb, startLabel);
         flexbuf_printf(fb, "\n");
@@ -675,7 +675,7 @@ OutputDataBlob(Flexbuf *fb, Flexbuf *databuf, Flexbuf *relocbuf, const char *sta
 }
 
 static void
-OutputBlob(Flexbuf *fb, Operand *label, Operand *op, Module *P)
+OutputBlob(Flexbuf *fb, Operand *label, Operand *op, Module *P, bool initLabel)
 {
     Flexbuf *databuf;
     Flexbuf *relocbuf;
@@ -692,7 +692,7 @@ OutputBlob(Flexbuf *fb, Operand *label, Operand *op, Module *P)
     }
     databuf = (Flexbuf *)op->name;
     relocbuf = (Flexbuf *)op->val;
-    OutputDataBlob(fb, databuf, relocbuf, baseLabel);
+    OutputDataBlob(fb, databuf, relocbuf, baseLabel, initLabel);
 }
 
 /* find string for opcode */
@@ -1450,7 +1450,7 @@ DoAssembleIR(struct flexbuf *fb, IR *ir, Module *P)
         // dst has a label (or is NULL for no label)
         // src has the data in a string
         // src2 is re-used as a pointer to the module
-        OutputBlob(fb, ir->dst, ir->src, (Module *)ir->src2);
+        OutputBlob(fb, ir->dst, ir->src, (Module *)ir->src2, ir->opc == OPC_LABELED_BLOB);
         break;
     case OPC_FIT:
         flexbuf_printf(fb, "\tfit\t");

backends/asm/inlineasm.c

@@ -930,7 +930,7 @@ CompileMiniDatBlock(IRList *irl, AST *origtop, unsigned asmFlags)
         AppendIR(irl, org0);
     }
     Operand *op = NewOperand(IMM_BINARY, (const char *)fb, (intptr_t)relocs);
-    ir = EmitOp2(irl, OPC_BINARY_BLOB, NULL, op);
+    ir = EmitOp2(irl, OPC_BINARY_BLOB, ModData(current)->datlabel, op);
     ir->src2 = (Operand *)current;
 
     /* finish off the block */

backends/becommon.h

@@ -7,7 +7,7 @@
 
 AST *BuildMethodPointer(AST *ast);
 void OutputAlignLong(Flexbuf *fb);
-void OutputDataBlob(Flexbuf *fb, Flexbuf *databuf, Flexbuf *relocbuf, const char *startLabel);
+void OutputDataBlob(Flexbuf *fb, Flexbuf *databuf, Flexbuf *relocbuf, const char *startLabel, bool emitLabel);
 
 void NormalizeVarOffsets(Function *f);
 

backends/nucode/outnu.c

@@ -2453,7 +2453,7 @@ static int NuCompileObject(void *vptr, Module *P) {
         PrintDataBlock(&datBuf,P->datblock,NULL,&datRelocs);
         OutputAlignLong(&datBuf);
         //NuOutputLabelNL(fb, ModData(P)->datLabel); // actually done by OutputDataBlob
-        OutputDataBlob(fb, &datBuf, &datRelocs, NuLabelName(ModData(P)->datLabel));
+        OutputDataBlob(fb, &datBuf, &datRelocs, NuLabelName(ModData(P)->datLabel), true);
 
         flexbuf_delete(&datRelocs);
         flexbuf_delete(&datBuf);
@@ -2470,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, &FunData(pf)->dataBufRelocs, NULL);
+            OutputDataBlob(fb, &FunData(pf)->dataBuf, &FunData(pf)->dataBufRelocs, NuLabelName(ModData(P)->datLabel), false);
         }
     }
     return 1;