more cgstate for x86/cod3.d

Author: WalterBright

compiler/src/dmd/backend/arm/cod3.d

@@ -703,7 +703,7 @@ void prolog_genvarargs(ref CGstate cg, ref CodeBuilder cdb, Symbol* sv)
             disassemble(c.Iop);
         }
 
-        assignaddrc(cx);
+        assignaddrc(cgstate,cx);
         cdb.append(cx);
     }
 }
@@ -751,7 +751,7 @@ void prolog_genvarargs_osx(ref CGstate cg, ref CodeBuilder cdb, Symbol* sv)
     code* cx = cdbx.finish();
     if (cx)
     {
-        assignaddrc(cx);
+        assignaddrc(cgstate,cx);
 
         static if (0)
         for (code* c = cx; c; c = code_next(c))
@@ -1228,7 +1228,7 @@ void cod3_thunk(Symbol* sthunk,Symbol* sfunc,uint p,tym_t thisty,
         code* c1 = cdbgot.finish();
         if (c1)
         {
-            assignaddrc(c1);
+            assignaddrc(cgstate,c1);
             cdb.append(c1);
         }
     }
@@ -1721,7 +1721,7 @@ bool orr_solution(ulong value, out uint N, out uint immr, out uint imms)
  * Replace symbolic references with values
  */
 @trusted
-void assignaddrc(code* c)
+void assignaddrc(ref CGstate cg, code* c)
 {
     //printf("assignaddrc()\n");
     int sn;
@@ -1730,7 +1730,6 @@ void assignaddrc(code* c)
     uint sectionOff;
     ulong offset;
     code* csave = c;
-    auto cg = &cgstate;
 
     for (; c; c = code_next(c))
     {

compiler/src/dmd/backend/dout.d

@@ -1126,7 +1126,7 @@ private void writefunc2(Symbol* sfunc, ref GlobalOptimizer go, ref BlockOpt bo)
      * are relative to the frame pointer.
      * Necessary for nested function access to lexically enclosing frames.
      */
-     cod3_adjSymOffsets();
+     cod3_adjSymOffsets(cgstate);
 
     if (symbol_iscomdat2(sfunc))         // if generated a COMDAT
     {

compiler/src/dmd/backend/x86/cgcod.d

@@ -319,15 +319,15 @@ void codgen(Symbol* sfunc)
                 goto case BC.retexp;
 
             case BC.retexp:
-                epilog(b);
+                epilog(cgstate,b);
                 break;
 
             default:
                 if (b.Bflags & BFL.epilog)
-                    epilog(b);
+                    epilog(cgstate,b);
                 break;
         }
-        assignaddr(b);                  // assign addresses
+        assignaddr(cgstate,b);          // assign addresses
         pinholeopt(b.Bcode,b);         // do pinhole optimization
         if (b.Bflags & BFL.prolog)      // do function prolog
         {
@@ -955,15 +955,15 @@ else
     {
         prolog_frameadj(cg, cdbx, tyf, xlocalsize, enter, &pushalloc);
         if (cg.Alloca.size)
-            prolog_setupalloca(cdbx);
+            prolog_setupalloca(cgstate, cdbx);
     }
     else if (cg.needframe)                      /* if variables or parameters   */
     {
         if (xlocalsize)                 /* if any stack offset          */
         {
             prolog_frameadj(cg, cdbx, tyf, xlocalsize, enter, &pushalloc);
             if (cg.Alloca.size)
-                prolog_setupalloca(cdbx);
+                prolog_setupalloca(cgstate, cdbx);
         }
         else
             assert(cg.Alloca.size == 0);
@@ -1013,7 +1013,7 @@ Lcont:
     {
         if (variadic(funcsym_p.Stype))
             prolog_gen_win64_varargs(cdb);
-        prolog_loadparams(cdb, tyf, pushalloc);
+        prolog_loadparams(cgstate, cdb, tyf, pushalloc);
         return;
     }
 
@@ -1028,7 +1028,7 @@ Lcont:
     // Load register parameters off of the stack. Do not use
     // assignaddr(), as it will replace the stack reference with
     // the register!
-    prolog_loadparams(cdb, tyf, pushalloc);
+    prolog_loadparams(cgstate, cdb, tyf, pushalloc);
 
     if (sv64)
         prolog_genvarargs(cg, cdb, sv64);

compiler/src/dmd/backend/x86/cod1.d

@@ -321,7 +321,7 @@ void genEEcode(ref CGstate cg)
     cdb.genadjesp(cast(int)cg.EEStack.offset);
     gencodelem(cdb, eecontext.EEelem, retregs, false);
     code* c = cdb.finish();
-    assignaddrc(c);
+    assignaddrc(cg,c);
     pinholeopt(c,null);
     jmpaddr(c);
     eecontext.EEcode = gen1(c, 0xCC);        // INT 3