cod4.d cgcod.d: remove static compilation

dlang · Nov 12, 2020 · e9c19f9 · e9c19f9
1 parent 5299e29
commit e9c19f9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/src/dmd/backend/cgcod.d b/src/dmd/backend/cgcod.d
@@ -225,9 +225,10 @@ tryagain:
     calledFinally = false;
     usednteh = 0;
 
-    static if (MARS && TARGET_WINDOS)
+    static if (MARS)
     {
-        if (sfunc.Sfunc.Fflags3 & Fjmonitor)
+        if (sfunc.Sfunc.Fflags3 & Fjmonitor &&
+            config.exe & EX_windos)
             usednteh |= NTEHjmonitor;
     }
     else version (SCPP)
@@ -635,7 +636,7 @@ tryagain:
             if (retoffset < sfunc.Ssize)
                 objmod.linnum(sfunc.Sfunc.Fendline,sfunc.Sseg,funcoffset + retoffset);
 
-        static if (TARGET_WINDOS && MARS)
+        static if (MARS)
         {
             if (config.exe == EX_WIN64)
                 win64_pdata(sfunc);
@@ -850,7 +851,7 @@ Lagain:
         Fast.size -= nteh_contextsym_size();
         version (MARS)
         {
-            static if (TARGET_WINDOS)
+            if (config.exe & EX_windos)
             {
                 if (funcsym_p.Sfunc.Fflags3 & Ffakeeh && nteh_contextsym_size() == 0)
                     Fast.size -= 5 * 4;
@@ -2739,12 +2740,14 @@ reload:                                 /* reload result from memory    */
             cdrelconst(cdb,e,pretregs);
             break;
 
-static if (TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_DRAGONFLYBSD || TARGET_SOLARIS)
-{
         case OPgot:
-            cdgot(cdb,e,pretregs);
-            break;
-}
+            if (config.exe & EX_posix)
+            {
+                cdgot(cdb,e,pretregs);
+                break;
+            }
+            goto default;
+
         default:
             if (*pretregs == mPSW &&
                 config.fpxmmregs &&

diff --git a/src/dmd/backend/cod4.d b/src/dmd/backend/cod4.d
@@ -139,16 +139,15 @@ void modEA(ref CodeBuilder cdb,code *c)
     }
 }
 
-static if (TARGET_WINDOS)
-{
-// This code is for CPUs that do not support the 8087
 
 /****************************
  * Gen code for op= for doubles.
  */
 
 private void opassdbl(ref CodeBuilder cdb,elem *e,regm_t *pretregs,OPER op)
 {
+    assert(config.exe & EX_windos);  // for targets that may not have an 8087
+
     static immutable uint[OPdivass - OPpostinc + 1] clibtab =
     /* OPpostinc,OPpostdec,OPeq,OPaddass,OPminass,OPmulass,OPdivass       */
     [  CLIB.dadd, CLIB.dsub, cast(uint)-1,  CLIB.dadd,CLIB.dsub,CLIB.dmul,CLIB.ddiv ];
@@ -247,6 +246,8 @@ private void opassdbl(ref CodeBuilder cdb,elem *e,regm_t *pretregs,OPER op)
 
 private void opnegassdbl(ref CodeBuilder cdb,elem *e,regm_t *pretregs)
 {
+    assert(config.exe & EX_windos);  // for targets that may not have an 8087
+
     if (config.inline8087)
     {
         cdnegass87(cdb,e,pretregs);
@@ -346,7 +347,6 @@ private void opnegassdbl(ref CodeBuilder cdb,elem *e,regm_t *pretregs)
     freenode(e1);
     fixresult(cdb,e,retregs,pretregs);
 }
-}
 
 
 
@@ -864,7 +864,7 @@ void cdaddass(ref CodeBuilder cdb,elem *e,regm_t *pretregs)
 
     if (tyfloating(tyml))
     {
-        static if (TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_DRAGONFLYBSD || TARGET_SOLARIS)
+        if (config.exe & EX_posix)
         {
             if (op == OPnegass)
                 cdnegass87(cdb,e,pretregs);
@@ -1416,7 +1416,7 @@ void cdmulass(ref CodeBuilder cdb,elem *e,regm_t *pretregs)
 
     if (tyfloating(tyml))
     {
-        static if (TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_DRAGONFLYBSD || TARGET_SOLARIS)
+        if (config.exe & EX_posix)
         {
             opass87(cdb,e,pretregs);
         }
@@ -1698,7 +1698,7 @@ void cddivass(ref CodeBuilder cdb,elem *e,regm_t *pretregs)
 
     if (tyfloating(tyml))
     {
-        static if (TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_DRAGONFLYBSD || TARGET_SOLARIS)
+        if (config.exe & EX_posix)
         {
             opass87(cdb,e,pretregs);
         }
@@ -2565,7 +2565,7 @@ void cdcmp(ref CodeBuilder cdb,elem *e,regm_t *pretregs)
         }
         else
         {
-            static if (TARGET_WINDOS)
+            if (config.exe & EX_windos)
             {
                 int clib;
 
@@ -3033,7 +3033,7 @@ void cdcmp(ref CodeBuilder cdb,elem *e,regm_t *pretregs)
             goto L5;
 
         case OPvar:
-            static if (TARGET_OSX)
+            if (config.exe & (EX_OSX | EX_OSX64))
             {
                 if (movOnly(e2))
                     goto L2;
@@ -3503,8 +3503,7 @@ void cdcnvt(ref CodeBuilder cdb,elem *e, regm_t *pretregs)
                     cdd_u32(cdb,e,pretregs);
                     return;
                 }
-                static if (TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD ||
-                           TARGET_DRAGONFLYBSD || TARGET_SOLARIS)
+                if (config.exe & EX_posix)
                 {
                     retregs = mST0;
                 }

diff --git a/src/dmd/backend/pdata.d b/src/dmd/backend/pdata.d
@@ -290,4 +290,7 @@ static if (1)
 }
 
 }
+else
+void win64_pdata(Symbol *sf) { }
+
 }