1 files changed, 16 insertions, 6 deletions
diff --git a/src/main/java/com/seaofnodes/simple/codegen/LinkMem.java b/src/main/java/com/seaofnodes/simple/codegen/LinkMem.java
index 2415203d..252b5bf0 100644
--- a/src/main/java/com/seaofnodes/simple/codegen/LinkMem.java
+++ b/src/main/java/com/seaofnodes/simple/codegen/LinkMem.java
@@ -1,6 +1,8 @@
 package com.seaofnodes.simple.codegen;
 
 import com.seaofnodes.simple.node.Node;
+import com.seaofnodes.simple.type.TypeStruct;
+import com.seaofnodes.simple.util.SB;
 import com.seaofnodes.simple.util.Utils;
 
 // In-memory linking
@@ -8,16 +10,24 @@ public class LinkMem {
     final CodeGen _code;
     LinkMem( CodeGen code ) { _code = code; }
 
-    public CodeGen link() {
-        Encoding enc = _code._encoding;
-
+    public CodeGen link(Encoding enc) {
         // Patch external calls internally
         enc.patchGlobalRelocations();
 
-        // Write any large constants into a constant pool; they
-        // are accessed by RIP-relative addressing.
-        enc.writeConstantPool(enc._bits,true);
+        // Place constant pool after code, static data after constants
+        int code  = 0;                     // Code start
+        int cpool = (enc._bits .size() + code  + 15) & -16;  // pad to 16
+        int sdata = (enc._cpool.size() + cpool + 15) & -16;
+
+
+        // Patch local ops, e.g. loading float constants from the constant pool
+        for( Node op : enc._bigCons.keySet() ) {
+            Encoding.Relo relo = enc._bigCons.get(op);
+            int target = enc._data.address(enc._data.object(relo._t),cpool,sdata);
+            ((RIPRelSize)relo._op).patch(enc, relo._opStart, enc.opLen(relo._op), target - relo._opStart);
+        }
 
+        enc._data.link(cpool,sdata);
         return _code;
     }
 }