Changeset 837

Timestamp:

01/02/11 07:08:10 (14 years ago)

Author:

walter

Message:

coverage analyzer now works in 64 bits

Files:

• branches/dmd-1.x/src/glue.c (modified) (1 diff)
• trunk/src/glue.c (modified) (1 diff)

branches/dmd-1.x/src/glue.c

@@ -300 +300 @@
-
-        /* Generate:
-         *  _d_cover_register(uint[] __coverage, BitArray __bcoverage, string filename);
-         * and prepend it to the static constructor.
-         */
-
-        /* t will be the type of the functions generated:
-         *      extern (C) void func();
-         */
-        type *t = type_alloc(TYnfunc);
-        t->Tflags |= TFprototype | TFfixed;
-        t->Tmangle = mTYman_c;
-        t->Tnext = tsvoid;
-        tsvoid->Tcount++;
-
-        sictor = toSymbolX("__modictor", SCglobal, t, "FZv");
-        cstate.CSpsymtab = &sictor->Sfunc->Flocsym;
-        localgot = ictorlocalgot;
-        elem *e;
-
-tr(cov), el_long(TYuint, numlines
-tr(bcov), el_long(TYuint, numlines
+air(TYdarray, el_long(TYsize_t, numlines), el_ptr(cov)
+air(TYdarray, el_long(TYsize_t, numlines), el_ptr(bcov)
-                      toEfilename(),
-                      NULL);
-        e = el_bin(OPcall, TYvoid, el_var(rtlsym[RTLSYM_DCOVER]), e);
-        eictor = el_combine(e, eictor);
-        ictorlocalgot = localgot;
-    }
-
-    // If coverage / static constructor / destructor / unittest calls
-    if (eictor || ector || edtor || etest)
-    {
-        /* t will be the type of the functions generated:
-         *      extern (C) void func();
-         */
-        type *t = type_alloc(TYnfunc);
-        t->Tflags |= TFprototype | TFfixed;
-        t->Tmangle = mTYman_c;
-        t->Tnext = tsvoid;
-        tsvoid->Tcount++;
-
-        static char moddeco[] = "FZv";

trunk/src/glue.c

@@ -300 +300 @@
-
-        /* Generate:
-         *  _d_cover_register(uint[] __coverage, BitArray __bcoverage, string filename);
-         * and prepend it to the static constructor.
-         */
-
-        /* t will be the type of the functions generated:
-         *      extern (C) void func();
-         */
-        type *t = type_alloc(TYnfunc);
-        t->Tflags |= TFprototype | TFfixed;
-        t->Tmangle = mTYman_c;
-        t->Tnext = tsvoid;
-        tsvoid->Tcount++;
-
-        sictor = toSymbolX("__modictor", SCglobal, t, "FZv");
-        cstate.CSpsymtab = &sictor->Sfunc->Flocsym;
-        localgot = ictorlocalgot;
-        elem *e;
-
-tr(cov), el_long(TYuint, numlines
-tr(bcov), el_long(TYuint, numlines
+air(TYdarray, el_long(TYsize_t, numlines), el_ptr(cov)
+air(TYdarray, el_long(TYsize_t, numlines), el_ptr(bcov)
-                      toEfilename(),
-                      NULL);
-        e = el_bin(OPcall, TYvoid, el_var(rtlsym[RTLSYM_DCOVER]), e);
-        eictor = el_combine(e, eictor);
-        ictorlocalgot = localgot;
-    }
-
-    // If coverage / static constructor / destructor / unittest calls
-    if (eictor || ector || ectorgates.dim || edtor ||
-        esharedctor || esharedctorgates.dim || eshareddtor || etest)
-    {
-        /* t will be the type of the functions generated:
-         *      extern (C) void func();
-         */
-        type *t = type_alloc(TYnfunc);
-        t->Tflags |= TFprototype | TFfixed;
-        t->Tmangle = mTYman_c;
-        t->Tnext = tsvoid;
-        tsvoid->Tcount++;
-