convert divcoeff.c to D

WalterBright · WalterBright · commit c9798664cf08 · 2018-02-14T23:28:23.000-08:00
diff --git a/.circleci/run.sh b/.circleci/run.sh
@@ -2,7 +2,7 @@
 
 set -uexo pipefail
 
-HOST_DMD_VER=2.072.2 # same as in dmd/src/posix.mak
+HOST_DMD_VER=2.074.1 # same as in dmd/src/posix.mak
 CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
 N=4
 CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
diff --git a/src/dmd/backend/cod2.c b/src/dmd/backend/cod2.c
@@ -14,6 +14,7 @@
 
 #include        <stdio.h>
 #include        <string.h>
+#include        <stdint.h>
 #include        <time.h>
 #include        "cc.h"
 #include        "oper.h"
@@ -32,9 +33,11 @@ int cdcmp_flag;
 extern signed char regtorm[8];
 
 // from divcoeff.c
-extern bool choose_multiplier(int N, targ_ullong d, int prec, targ_ullong *pm, int *pshpost);
-extern bool udiv_coefficients(int N, targ_ullong d, int *pshpre, targ_ullong *pm, int *pshpost);
-
+extern "C"
+{
+extern bool choose_multiplier(int N, uint64_t d, int prec, uint64_t *pm, int *pshpost);
+extern bool udiv_coefficients(int N, uint64_t d, int *pshpre, uint64_t *pm, int *pshpost);
+}
 
 /*******************************
  * Swap two integers.
@@ -1090,7 +1093,7 @@ void cdmul(CodeBuilder& cdb,elem *e,regm_t *pretregs)
 
             unsigned r3;
 
-            targ_ullong m;
+            uint64_t m;
             int shpost;
             int N = sz * 8;
             bool mhighbit = choose_multiplier(N, d, N - 1, &m, &shpost);
@@ -1191,7 +1194,7 @@ void cdmul(CodeBuilder& cdb,elem *e,regm_t *pretregs)
             unsigned r3;
             regm_t regm;
             unsigned reg;
-            targ_ullong m;
+            uint64_t m;
             int shpre;
             int shpost;
             if (udiv_coefficients(sz * 8, e2factor, &shpre, &m, &shpost))
diff --git a/src/dmd/backend/divcoeff.d b/src/dmd/backend/divcoeff.d
@@ -2,38 +2,47 @@
  * Compiler implementation of the
  * $(LINK2 http://www.dlang.org, D programming language).
  *
- * Copyright:   Copyright (C) 2013-2018 by The D Language Foundation, All Rights Reserved
+ * Copyright:   Copyright (c) 2013-2018 by The D Language Foundation, All Rights Reserved
  * Authors:     $(LINK2 http://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
- * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/backend/divcoeff.c, backend/divcoeff.c)
+ * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/backend/divcoeff.d, backend/divcoeff.d)
  */
 
 /***************************************************
  * Algorithms from "Division by Invariant Integers using Multiplication"
  * by Torbjoern Granlund and Peter L. Montgomery
  */
 
-#include <stdio.h>
-#include <assert.h>
+import core.stdc.stdio;
 
-// This MUST MATCH typedef targ_ullong in cdef.h.
-#if defined(__UINT64_TYPE__) && !defined(__APPLE__)
-typedef __UINT64_TYPE__ ullong;
-#elif defined(__UINTMAX_TYPE__)
-typedef __UINTMAX_TYPE__ ullong;
-#else
-typedef unsigned long long ullong;
-#endif
+extern (C):
 
-void test_udiv_coefficients();
+alias ullong = ulong;
 
 /* unsigned 128 bit math
  */
 
-#define SIGN64(x) ((long long)(x) < 0)
-#define SHL128(dh,dl, xh,xl) ((dh = (xh << 1) | SIGN64(xl)),  (dl = xl << 1))
-#define SHR128(dh,dl, xh,xl) ((dl = (xl >> 1) | ((xh & 1) << 63)),(dh = xh >> 1))
-#define XltY128(xh,xl,yh,yl) (xh < yh || (xh == yh && xl < yl))
+bool SIGN64(ullong x)
+{
+    return cast(long)x < 0;
+}
+
+void SHL128(out ullong dh, out ullong dl, ullong xh,ullong xl)
+{
+    dh = (xh << 1) | SIGN64(xl);
+    dl = xl << 1;
+}
+
+void SHR128(out ullong dh, out ullong dl, ullong xh,ullong xl)
+{
+    dl = (xl >> 1) | ((xh & 1) << 63);
+    dh = xh >> 1;
+}
+
+bool XltY128(ullong xh, ullong xl, ullong yh, ullong yl)
+{
+    return xh < yh || (xh == yh && xl < yl);
+}
 
 void u128Div(ullong xh, ullong xl, ullong yh, ullong yl, ullong *pqh, ullong *pql)
 {
@@ -46,7 +55,7 @@ void u128Div(ullong xh, ullong xl, ullong yh, ullong yl, ullong *pqh, ullong *pq
     assert(yh || yl);           // no div-by-0 bugs
 
     // left justify y
-    unsigned shiftcount = 1;
+    uint shiftcount = 1;
     if (!yh)
     {   yh = yl;
         yl = 0;
@@ -85,27 +94,28 @@ void u128Div(ullong xh, ullong xl, ullong yh, ullong yl, ullong *pqh, ullong *pq
 
     // Remainder is xh,xl
 
-#if 0
-    printf("%016llx_%016llx / %016llx_%016llx = %016llx_%016llx\n", xxh,xxl,yyh,yyl,qh,ql);
-    if (xxh == 0 && yyh == 0)
-        printf("should be %llx\n", xxl / yyl);
-#endif
+    version (none)
+    {
+        printf("%016llx_%016llx / %016llx_%016llx = %016llx_%016llx\n", xxh,xxl,yyh,yyl,qh,ql);
+        if (xxh == 0 && yyh == 0)
+            printf("should be %llx\n", xxl / yyl);
+    }
 }
 
 /************************************
  * Implement Algorithm 6.2: Selection of multiplier and shift count
- * Input:
- *      N       32 or 64
- *      d       divisor (must not be 0 or a power of 2)
- *      prec    bits of precision desired
+ * Params:
+ *      N =     32 or 64
+ *      d =     divisor (must not be 0 or a power of 2)
+ *      prec =  bits of precision desired
  * Output:
- *      *pm     factor
- *      *pshpost post shift
+ *      *pm =      factor
+ *      *pshpost = post shift
  * Returns:
  *      true    m >= 2**N
  */
 
-bool choose_multiplier(int N, ullong d, int prec, ullong *pm, int *pshpost)
+extern (C) bool choose_multiplier(int N, ullong d, int prec, ullong *pm, int *pshpost)
 {
     assert(N == 32 || N == 64);
     assert(prec <= N);
@@ -127,10 +137,10 @@ bool choose_multiplier(int N, ullong d, int prec, ullong *pm, int *pshpost)
     if (N == 32)
     {
         // mlow = (2**(N + b)) / d
-        ullong mlow = (1ULL << (N + b)) / d;
+        ullong mlow = (1UL << (N + b)) / d;
 
         // uhigh = (2**(N + b) + 2**(N + b - prec)) / d
-        ullong mhigh = ((1ULL << (N + b)) + (1ULL << (N + b - prec))) / d;
+        ullong mhigh = ((1UL << (N + b)) + (1UL << (N + b - prec))) / d;
 
         while (mlow/2 < mhigh/2 && shpost)
         {
@@ -140,27 +150,27 @@ bool choose_multiplier(int N, ullong d, int prec, ullong *pm, int *pshpost)
         }
 
         *pm = mhigh & 0xFFFFFFFF;
-        mhighbit = mhigh >> N;
+        mhighbit = (mhigh >> N) != 0;
     }
     else if (N == 64)
     {
         // Same as for N==32, but use 128 bit unsigned arithmetic
 
         // mlow = (2**(N + b)) / d
         ullong mlowl = 0;
-        ullong mlowh = 1ULL << b;
+        ullong mlowh = 1UL << b;
 
         // mlow /= d
         u128Div(mlowh, mlowl, 0, d, &mlowh, &mlowl);
 
         // mhigh = (2**(N + b) + 2**(N + b - prec)) / d
         ullong mhighl = 0;
-        ullong mhighh = 1ULL << b;
+        ullong mhighh = 1UL << b;
         int e = N + b - prec;
         if (e < 64)
-            mhighl = 1ULL << e;
+            mhighl = 1UL << e;
         else
-            mhighh |= 1ULL << (e - 64);
+            mhighh |= 1UL << (e - 64);
 
         // mhigh /= d
         u128Div(mhighh, mhighl, 0, d, &mhighh, &mhighl);
@@ -221,12 +231,8 @@ bool choose_multiplier(int N, ullong d, int prec, ullong *pm, int *pshpost)
  *              q = SRL(MULUH(m, SRL(n, shpre)), shpost)
  */
 
-bool udiv_coefficients(int N, ullong d, int *pshpre, ullong *pm, int *pshpost)
+extern (C) bool udiv_coefficients(int N, ullong d, int *pshpre, ullong *pm, int *pshpost)
 {
-    #ifdef DEBUG
-    test_udiv_coefficients();
-    #endif
-
     bool mhighbit = choose_multiplier(N, d, N, pm, pshpost);
     if (mhighbit && (d & 1) == 0)
     {
@@ -244,14 +250,8 @@ bool udiv_coefficients(int N, ullong d, int *pshpre, ullong *pm, int *pshpost)
     return mhighbit;
 }
 
-#ifdef DEBUG
-void test_udiv_coefficients()
+unittest
 {
-    static bool tested = false;
-    if (tested)
-        return;
-    tested = true;
-
     struct S
     {
         int N;
@@ -260,10 +260,10 @@ void test_udiv_coefficients()
         int highbit;
         ullong m;
         int shpost;
-    };
+    }
 
-    static S table[] =
-    {
+    static immutable S[14] table =
+    [
         { 32, 10,    0, 0, 0xCCCCCCCD, 3 },
         { 32, 13,    0, 0, 0x4EC4EC4F, 2 },
         { 32, 14,    1, 0, 0x92492493, 2 },
@@ -279,39 +279,40 @@ void test_udiv_coefficients()
         { 64, 17,    0, 0, 0xF0F0F0F0F0F0F0F1, 4 },
         { 64, 100,   2, 0, 0x28F5C28F5C28F5C3, 2 },
         { 64, 14007, 0, 1, 0x2B71840C5ADF02C3, 14 },
-    };
+    ];
 
-    for (int i = 0; i < sizeof(table)/sizeof(table[0]); i++)
-    {   S *ps = &table[i];
+    for (int i = 0; i < table.length; i++)
+    {   const ps = &table[i];
 
         ullong m;
         int shpre;
         int shpost;
-        bool mhighbit = udiv_coefficients(ps->N, ps->d, &shpre, &m, &shpost);
+        bool mhighbit = udiv_coefficients(ps.N, ps.d, &shpre, &m, &shpost);
 
         //printf("[%d] %d %d %llx %d\n", i, shpre, mhighbit, m, shpost);
-        assert(shpre == ps->shpre);
-        assert(mhighbit == (bool)ps->highbit);
-        assert(m == ps->m);
-        assert(shpost == ps->shpost);
+        assert(shpre == ps.shpre);
+        assert(mhighbit == ps.highbit);
+        assert(m == ps.m);
+        assert(shpost == ps.shpost);
     }
 }
-#endif
-
-#if 0
-#include <stdlib.h>
 
-void main(int argc, char **argv)
+version (none)
 {
-    if (argc == 2)
+    import core.stdc.stdlib;
+
+    extern (D) int main(string[] args)
     {
-        ullong d = atoi(argv[1]);
-        ullong m;
-        int shpre;
-        int shpost;
-        bool mhighbit = udiv_coefficients(64, d, &shpre, &m, &shpost);
+        if (args.length == 2)
+        {
+            ullong d = atoi(args[1].ptr);
+            ullong m;
+            int shpre;
+            int shpost;
+            bool mhighbit = udiv_coefficients(64, d, &shpre, &m, &shpost);
 
-        printf("%d %d %llx, %d\n", shpre, mhighbit, m, shpost);
+            printf("%d %d %llx, %d\n", shpre, mhighbit, m, shpost);
+        }
+        return 0;
     }
 }
-#endif
diff --git a/src/posix.mak b/src/posix.mak
@@ -136,7 +136,7 @@ ifeq (,$(AUTO_BOOTSTRAP))
 else
   # Auto-bootstrapping, will download dmd automatically
   # Keep var below in sync with other occurrences of that variable, e.g. in circleci.sh
-  HOST_DMD_VER=2.072.2
+  HOST_DMD_VER=2.074.1
   HOST_DMD_ROOT=$(TMP)/.host_dmd-$(HOST_DMD_VER)
   # dmd.2.072.2.osx.zip or dmd.2.072.2.linux.tar.xz
   HOST_DMD_BASENAME=dmd.$(HOST_DMD_VER).$(OS)$(if $(filter $(OS),freebsd),-$(MODEL),)
@@ -340,11 +340,14 @@ BACK_OBJS = go.o gdag.o gother.o gflow.o gloop.o gsroa.o var.o el.o \
 	cgcod.o cod5.o outbuf.o compress.o \
 	bcomplex.o aa.o ti_achar.o \
 	ti_pvoid.o pdata.o cv8.o backconfig.o \
-	divcoeff.o dwarf.o dwarfeh.o varstats.o \
+	dwarf.o dwarfeh.o varstats.o \
 	ph2.o util2.o tk.o strtold.o md5.o \
 	$(TARGET_OBJS)
 
-G_OBJS = $(addprefix $G/, $(BACK_OBJS))
+BACK_DOBJS = divcoeff.o
+
+G_OBJS  = $(addprefix $G/, $(BACK_OBJS))
+G_DOBJS = $(addprefix $G/, $(BACK_DOBJS))
 #$(info $$G_OBJS is [${G_OBJS}])
 
 ifeq (osx,$(OS))
@@ -384,7 +387,7 @@ BACK_SRC = \
 	$C/dwarf.c $C/dwarf.h $C/aa.h $C/aa.c $C/tinfo.h $C/ti_achar.c \
 	$C/ti_pvoid.c $C/platform_stub.c $C/code_x86.h $C/code_stub.h \
 	$C/machobj.c $C/mscoffobj.c \
-	$C/xmm.h $C/obj.h $C/pdata.c $C/cv8.c $C/backconfig.c $C/divcoeff.c \
+	$C/xmm.h $C/obj.h $C/pdata.c $C/cv8.c $C/backconfig.c $C/divcoeff.d \
 	$C/varstats.c $C/varstats.h \
 	$C/md5.c $C/md5.h \
 	$C/ph2.c $C/util2.c $C/dwarfeh.c \
@@ -415,7 +418,7 @@ SRC_MAKE = posix.mak osmodel.mak
 
 STRING_IMPORT_FILES = $G/VERSION $G/SYSCONFDIR.imp ../res/default_ddoc_theme.ddoc
 
-DEPS = $(patsubst %.o,%.deps,$(DMD_OBJS) $(GLUE_OBJS) $(BACK_OBJS))
+DEPS = $(patsubst %.o,%.deps,$(DMD_OBJS) $(GLUE_OBJS) $(BACK_OBJS) $(BACK_DOBJS))
 
 ######## Begin build targets
 
@@ -440,8 +443,8 @@ toolchain-info:
 $G/glue.a: $(G_GLUE_OBJS) $(SRC_MAKE)
 	$(AR) rcs $@ $(G_GLUE_OBJS)
 
-$G/backend.a: $(G_OBJS) $(SRC_MAKE)
-	$(AR) rcs $@ $(G_OBJS)
+$G/backend.a: $(G_OBJS) $(G_DOBJS) $(SRC_MAKE)
+	$(AR) rcs $@ $(G_OBJS) $(G_DOBJS)
 
 $G/lexer.a: $(LEXER_SRCS) $(LEXER_ROOT) $(HOST_DMD_PATH) $(SRC_MAKE)
 	CC="$(HOST_CXX)" $(HOST_DMD_RUN) -lib -of$@ $(MODEL_FLAG) -J$G -L-lstdc++ $(DFLAGS) $(LEXER_SRCS) $(LEXER_ROOT)
@@ -450,14 +453,14 @@ $G/dmd_frontend: $(FRONT_SRCS) $D/gluelayer.d $(ROOT_SRCS) $G/newdelete.o $G/lex
 	CC="$(HOST_CXX)" $(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J$G -J../res -L-lstdc++ $(DFLAGS) $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH),$^) -version=NoBackend
 
 ifdef ENABLE_LTO
-$G/dmd: $(DMD_SRCS) $(ROOT_SRCS) $G/newdelete.o $G/lexer.a $(G_GLUE_OBJS) $(G_OBJS) $(STRING_IMPORT_FILES) $(HOST_DMD_PATH) $G/dmd.conf
+$G/dmd: $(DMD_SRCS) $(ROOT_SRCS) $G/newdelete.o $G/lexer.a $(G_GLUE_OBJS) $(G_OBJS) $(G_DOBJS) $(STRING_IMPORT_FILES) $(HOST_DMD_PATH) $G/dmd.conf
 	CC="$(HOST_CXX)" $(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J$G -J../res -L-lstdc++ $(DFLAGS) $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH) $G/dmd.conf,$^)
 else
 $G/dmd: $(DMD_SRCS) $(ROOT_SRCS) $G/newdelete.o $G/backend.a $G/lexer.a $(STRING_IMPORT_FILES) $(HOST_DMD_PATH) $G/dmd.conf
 	CC="$(HOST_CXX)" $(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J$G -J../res -L-lstdc++ $(DFLAGS) $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH) $(LEXER_ROOT) $G/dmd.conf,$^)
 endif
 
-$G/dmd-unittest: $(DMD_SRCS) $(ROOT_SRCS) $G/newdelete.o $G/lexer.a $(G_GLUE_OBJS) $(G_OBJS) $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
+$G/dmd-unittest: $(DMD_SRCS) $(ROOT_SRCS) $G/newdelete.o $G/lexer.a $(G_GLUE_OBJS) $(G_OBJS) $(G_DOBJS) $(STRING_IMPORT_FILES) $(HOST_DMD_PATH)
 	CC=$(HOST_CXX) $(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J$G -J../res -L-lstdc++ $(DFLAGS) -g -unittest -main -version=NoMain $(filter-out $(STRING_IMPORT_FILES) $(HOST_DMD_PATH),$^)
 
 unittest: $G/dmd-unittest
@@ -540,6 +543,10 @@ $(G_OBJS): $G/%.o: $C/%.c $(optabgen_files) $(SRC_MAKE)
 	@echo "  (CC)  BACK_OBJS  $<"
 	$(CXX) -c -o$@ $(CXXFLAGS) $(BACK_FLAGS) $(MMD) $<
 
+$(G_DOBJS): $G/%.o: $C/%.d posix.mak
+	@echo "  (CC)  BACK_DOBJS  $<"
+	$(HOST_DMD_RUN) -c -of$@ $(DFLAGS) $(MODEL_FLAG) -betterC $<
+
 $(G_GLUE_OBJS): $G/%.o: $D/%.c $(optabgen_files) $(SRC_MAKE)
 	@echo "  (CC)  GLUE_OBJS  $<"
 	$(CXX) -c -o$@ $(CXXFLAGS) $(GLUE_FLAGS) $(MMD) $<
diff --git a/src/win32.mak b/src/win32.mak
