cv8.d: compile for all platforms

Author: WalterBright

dm/src/dmc/cod3.d

@@ -533,11 +533,13 @@ void cod3_stackalign(ref CodeBuilder cdb, int nbytes)
     cdb.genc2(0x81, grex | rm, -nbytes);
 }
 
-static if (ELFOBJ)
-{
 /* Constructor that links the ModuleReference to the head of
  * the list pointed to by _Dmoduleref
+ *
+ * For ELF object files.
  */
+static if (0)
+{
 void cod3_buildmodulector(Outbuffer* buf, int codeOffset, int refOffset)
 {
     /*      ret
@@ -595,10 +597,8 @@ void cod3_buildmodulector(Outbuffer* buf, int codeOffset, int refOffset)
 
     buf.writeByte(0xC3); /* ret */
 }
-
 }
 
-
 /*****************************
  * Given a type, return a mask of
  * registers to hold that type.
@@ -1616,8 +1616,10 @@ static if (JMPJMPTABLE)
             cgstate.stackclean--;
             return;
 }
-else static if (TARGET_OSX)
+else
 {
+        if (config.exe & (EX_OSX | EX_OSX64))
+        {
             /*     CALL L1
              * L1: POP  R1
              *     ADD  R1,disp[reg*4][R1]
@@ -1634,9 +1636,9 @@ else static if (TARGET_OSX)
             cdb.last().IEV1.Vswitch = b;
             cdb.last().Isib = modregrm(2,reg,r1);
             cdb.gen2(0xFF,modregrm(3,4,r1));               // JMP R1
-}
-else
-{
+        }
+        else
+        {
             if (config.flags3 & CFG3pic)
             {
                 /* MOV  R1,EBX
@@ -1664,6 +1666,7 @@ else
                 cdb.last().IEV1.Vswitch = b;
                 cdb.last().Isib = modregrm(2,reg,5);
             }
+        }
 }
         }
         else if (I16)

dm/src/dmc/cv8.d

@@ -49,13 +49,13 @@ extern (C++):
 
 nothrow:
 
-static if (TARGET_WINDOS)
+static if (1)
 {
 
 int REGSIZE();
 
 // Determine if this Symbol is stored in a COMDAT
-bool symbol_iscomdat(Symbol* s)
+private bool symbol_iscomdat4(Symbol* s)
 {
     version (MARS)
     {
@@ -272,7 +272,7 @@ void cv8_termfile(const(char)* objfilename)
         F2_buf.write(linepair.buf + fd.linepairstart, fd.linepairbytes);
 
         int f2seg = seg;
-        if (symbol_iscomdat(fd.sfunc))
+        if (symbol_iscomdat4(fd.sfunc))
         {
             f2seg = MsCoffObj_seg_debugS_comdat(fd.sfunc);
             objmod.bytes(f2seg, 0, 4, &value);
@@ -356,7 +356,7 @@ void cv8_func_start(Symbol *sfunc)
     currentfuncdata.linepairbytes = 0;
     currentfuncdata.f1buf = F1_buf;
     currentfuncdata.f1fixup = F1fixup;
-    if (symbol_iscomdat(sfunc))
+    if (symbol_iscomdat4(sfunc))
     {
         // This leaks memory
         currentfuncdata.f1buf = cast(Outbuffer*)mem_calloc(Outbuffer.sizeof);

dm/src/dmc/dexp2.d

@@ -4603,16 +4603,8 @@ enum LLLNG   = OP64_32;
 enum PTRLPTR = OPnp_fp;
 enum OFFSET  = OPoffset;
 enum FPTR    = OPvp_fp;
-static if (TARGET_OSX)
-{
-enum TOF16   = NONE;
-enum FRF16   = PAINT;
-}
-else
-{
 enum TOF16   = OPnp_f16p;
 enum FRF16   = OPf16p_np;
-}
 
 enum NONE    = OPMAX;           /* no conversion                        */
 enum PAINT   = (OPMAX+1);       /* just 'paint' new type over the old one */
@@ -5118,6 +5110,12 @@ static if (0)
             e = exp2_cast(e, newt);
             break;
 
+        case OPnp_f16p:
+        case OPf16p_np:
+            if (config.exe & (EX_OSX | EX_OSX64))
+                goto paint;
+            goto default;
+
         default:                /* action is operator number            */
         doaction:
 static if (0)

dm/src/dmc/dt.d

@@ -263,6 +263,10 @@ nothrow:
     /*****************************************
      * Write a reference to the data ptr[0..size+nzeros]
      * Params:
+     *  ty = pointer type
+     *  offset = to be added to offset of data generated
+     *  size = number of bytes pointed to by ptr
+     *  ptr = points to data bytes
      *  nzeros = number of zero bytes to add to the end
      *  _align = alignment of pointed-to data
      */
@@ -429,7 +433,7 @@ nothrow:
     {
         dt_t *dt = dt_calloc(DT_coff);
 
-        static if (TARGET_SEGMENTED)
+        if (config.exe & EX_segmented)
             dt.Dty = TYcptr;
         else
             dt.Dty = TYnptr;

dm/src/dmc/mscoffobj.d

@@ -2588,6 +2588,13 @@ extern (D) private void objflush_pointerRefs()
     ptrref_buf.reset();
 }
 
+}
+else
+{
+segidx_t MsCoffObj_seg_pdata() { assert(0); }
+segidx_t MsCoffObj_seg_xdata() { assert(0); }
+segidx_t MsCoffObj_seg_pdata_comdat(Symbol *sfunc) { assert(0); }
+segidx_t MsCoffObj_seg_xdata_comdat(Symbol *sfunc) { assert(0); }
 }
 
 }

dm/src/dmc/obj.d

@@ -184,14 +184,15 @@ version (Windows)
     void MsCoffObj_addrel(int seg, targ_size_t offset, Symbol *targsym,
                           uint targseg, int rtype, int val);
     int  MsCoffObj_seg_drectve();
-    int  MsCoffObj_seg_pdata();
-    int  MsCoffObj_seg_xdata();
-    int  MsCoffObj_seg_pdata_comdat(Symbol *sfunc);
-    int  MsCoffObj_seg_xdata_comdat(Symbol *sfunc);
     int  MsCoffObj_seg_debugS();
     int  MsCoffObj_seg_debugS_comdat(Symbol *sfunc);
 }
 
+int  MsCoffObj_seg_pdata();
+int  MsCoffObj_seg_xdata();
+int  MsCoffObj_seg_pdata_comdat(Symbol *sfunc);
+int  MsCoffObj_seg_xdata_comdat(Symbol *sfunc);
+
 version (Posix)
 {
     Obj Obj_init(Outbuffer *, const(char)* filename, const(char)* csegname);

dm/src/dmc/pdata.d

@@ -36,11 +36,8 @@ extern (C++):
 
 nothrow:
 
-static if (TARGET_WINDOS)
-{
-
 // Determine if this Symbol is stored in a COMDAT
-bool symbol_iscomdat3(Symbol* s)
+private bool symbol_iscomdat3(Symbol* s)
 {
     version (MARS)
     {
@@ -65,14 +62,12 @@ enum ALLOCA_LIMIT = 0x10000;
  * Creates an instance of struct RUNTIME_FUNCTION:
  *   http://msdn.microsoft.com/en-US/library/ft9x1kdx(v=vs.80).aspx
  *
- * Input:
- *      sf      function to generate unwind data for
+ * Params:
+ *      sf = function to generate unwind data for
  */
 
-void win64_pdata(Symbol *sf)
+public void win64_pdata(Symbol *sf)
 {
-//    return; // doesn't work yet
-
     //printf("win64_pdata()\n");
     assert(config.exe == EX_WIN64);
 
@@ -108,6 +103,8 @@ void win64_pdata(Symbol *sf)
     if (sflen >= ALLOCA_LIMIT) free(pdata_name);
 }
 
+private:
+
 /**************************************************
  * Unwind data symbol goes in the .xdata section.
  * Input:
@@ -116,7 +113,7 @@ void win64_pdata(Symbol *sf)
  *      generated symbol referring to unwind data
  */
 
-Symbol *win64_unwind(Symbol *sf)
+private Symbol *win64_unwind(Symbol *sf)
 {
     // Generate the unwind name, which is $unwind$funcname
     size_t sflen = strlen(sf.Sident.ptr);
@@ -213,7 +210,7 @@ static if (0)
 
 
 
-dt_t *unwind_data()
+private dt_t *unwind_data()
 {
     UNWIND_INFO ui;
 
@@ -288,9 +285,4 @@ static if (1)
     dtb.nbytes(4 + ((ui.CountOfCodes + 1) & ~1) * 2,cast(char *)&ui);
     return dtb.finish();
 }
-
-}
-else
-void win64_pdata(Symbol *sf) { }
-
 }

dm/src/dmc/stubobj.d

@@ -94,6 +94,7 @@ class Obj
     int common_block(Symbol *s,int flag,targ_size_t size,targ_size_t count) { return 0; }
     void write_bytes(seg_data *pseg, uint nbytes, void *p) { }
     void gotref(Symbol *s) { }
+    void refGOTsym() { }
     int jmpTableSegment(Symbol* s) { return 0; }
   }
 }