Changeset 766:af04bbae8553

Timestamp:

11/11/08 23:40:31 (2 months ago)

Author:

Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>

branch:

default

Message:

D2: Fixed global constants not initialized until module constructor.

Files:

• gen/toobj.cpp (modified) (2 diffs)
• runtime/ldc2.diff (modified) (8 diffs)

gen/toobj.cpp

@@ -965 +965 @@
-        Logger::println("data segment");
-
+    #if DMDV2
+        if (storage_class & STCmanifest)
+        {
+            assert(0 && "manifest constant being codegened!!!");
+        }
+    #endif
+
-        // don't duplicate work
-        if (this->ir.resolved) return;
@@ -976 +983 @@
-        // handle static local variables
-        bool static_local = false;
+    #if DMDV2
+        // not sure why this is only needed for d2
+        bool _isconst = isConst() && init;
+    #else
-        bool _isconst = isConst();
+    #endif
-        if (parent && parent->isFuncDeclaration())
-        {

runtime/ldc2.diff

@@ -84 +84 @@
-                 {
-                     popad;
+@@ -717,7 +763,7 @@
+      * represents the minimum valid priority for the scheduling policy of
+      * the process.
+      */
+-    static const int PRIORITY_MIN;
++    static int PRIORITY_MIN;
+ 
+ 
+     /**
+@@ -726,7 +772,7 @@
+      * represents the minimum valid priority for the scheduling policy of
+      * the process.
+      */
+-    static const int PRIORITY_MAX;
++    static int PRIORITY_MAX;
+ 
+ 
+     /**
-@@ -2259,6 +2305,18 @@
-             version = AsmPPC_Posix;
@@ -114 +132 @@
-             // NOTE: The ucontext implementation requires architecture specific
-             //       data definitions to operate so testing for it must be done
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                 ret;
-             }
@@ -143 +173 @@
-         {
-             Fiber   cfib = Fiber.getThis();
-2
+1
-             push( 0x00000000 );                                     // ESI
-             push( 0x00000000 );                                     // EDI
@@ -166 +196 @@
-         {
-             version( StackGrowsDown )
-Index: src/common/ldc.mak
-===================================================================
---- src/common/ldc.mak  (revision 0)
-+++ src/common/ldc.mak  (revision 0)
-@@ -0,0 +1,139 @@
-+# Makefile to build the D runtime library core components for Posix
-+# Designed to work with GNU make
-+# Targets:
-+#  make
-+#      Same as make all
-+#  make lib
-+#      Build the common library
-+#   make doc
-+#       Generate documentation
-+#  make clean
-+#      Delete unneeded files created by build process
-+
-+LIB_TARGET=libdruntime-core.a
-+LIB_MASK=libdruntime-core*.a
-+
-+CP=cp -f
-+RM=rm -f
-+MD=mkdir -p
-+
-+ADD_CFLAGS=
-+ADD_DFLAGS=
-+
-+CFLAGS=-O $(ADD_CFLAGS)
-+#CFLAGS=-g $(ADD_CFLAGS)
-+
-+DFLAGS=-release -O -inline -w $(ADD_DFLAGS)
-+#DFLAGS=-g -w $(ADD_DFLAGS)
-+
-+TFLAGS=-O -inline -w $(ADD_DFLAGS)
-+#TFLAGS=-g -w $(ADD_DFLAGS)
-+
-+DOCFLAGS=-version=DDoc
-+
-+CC=gcc
-+LC=$(AR) -qsv
-+DC=ldc2
-+
-+INC_DEST=../../import
-+LIB_DEST=../../lib
-+DOC_DEST=../../doc
-+
-+.SUFFIXES: .s .S .c .cpp .d .html .o
-+
-+.s.o:
-+   $(CC) -c $(CFLAGS) $< -o$@
-+
-+.S.o:
-+   $(CC) -c $(CFLAGS) $< -o$@
-+
-+.c.o:
-+   $(CC) -c $(CFLAGS) $< -o$@
-+
-+.cpp.o:
-+   g++ -c $(CFLAGS) $< -o$@
-+
-+.d.o:
-+   $(DC) -c $(DFLAGS) -Hf$*.di $< -of$@
-+#  $(DC) -c $(DFLAGS) $< -of$@
-+
-+.d.html:
-+   $(DC) -c -o- $(DOCFLAGS) -Df$*.html $<
-+
-+targets : lib doc
-+all     : lib doc
-+core    : lib
-+lib     : core.lib
-+doc     : core.doc
-+
-+######################################################
-+
-+OBJ_CORE= \
-+    core/bitmanip.o \
-+    core/exception.o \
-+    core/memory_.o \
-+    core/runtime.o \
-+    core/thread.o
-+
-+OBJ_STDC= \
-+    core/stdc/errno.o
-+
-+ALL_OBJS= \
-+    $(OBJ_CORE) \
-+    $(OBJ_STDC)
-+
-+######################################################
-+
-+DOC_CORE= \
-+    core/bitmanip.html \
-+    core/exception.html \
-+    core/memory.html \
-+    core/runtime.html \
-+    core/thread.html
-+
-+
-+ALL_DOCS=
-+
-+######################################################
-+
-+core.lib : $(LIB_TARGET)
-+
-+$(LIB_TARGET) : $(ALL_OBJS)
-+   $(RM) $@
-+   $(LC) $@ $(ALL_OBJS)
-+
-+core.doc : $(ALL_DOCS)
-+   echo Documentation generated.
-+
-+######################################################
-+
-+### bitmanip
-+
-+core/bitmanip.o : core/bitmanip.d
-+   $(DC) -c $(DFLAGS) core/bitmanip.d -of$@
-+
-+### memory
-+
-+core/memory_.o : core/memory.d
-+   $(DC) -c $(DFLAGS) -Hf$*.di $< -of$@
-+
-+### thread
-+
-+core/thread.o : core/thread.d
-+   $(DC) -c $(DFLAGS) -d -Hf$*.di core/thread.d -of$@
-+
-+######################################################
-+
-+clean :
-+   find . -name "*.di" | xargs $(RM)
-+   $(RM) $(ALL_OBJS)
-+   $(RM) $(ALL_DOCS)
-+   find . -name "$(LIB_MASK)" | xargs $(RM)
-+
-+install :
-+   $(MD) $(INC_DEST)
-+   find . -name "*.di" -exec cp -f {} $(INC_DEST)/{} \;
-+   $(MD) $(DOC_DEST)
-+   find . -name "*.html" -exec cp -f {} $(DOC_DEST)/{} \;
-+   $(MD) $(LIB_DEST)
-+   find . -name "$(LIB_MASK)" -exec cp -f {} $(LIB_DEST)/{} \;
-Index: src/ldc2.conf
-===================================================================
---- src/ldc2.conf   (revision 0)
-+++ src/ldc2.conf   (revision 0)
-@@ -0,0 +1,2 @@
-+[Environment]
-+DFLAGS="-I%HOME%/common" "-I%HOME%/../import"
-Index: src/build-ldc.sh
-===================================================================
---- src/build-ldc.sh    (revision 0)
-+++ src/build-ldc.sh    (revision 0)
-@@ -0,0 +1,19 @@
-+#!/usr/bin/env bash
-+
-+OLDHOME=$HOME
-+export HOME=`pwd`
-+
-+goerror(){
-+    export HOME=$OLDHOME
-+    echo "="
-+    echo "= *** Error ***"
-+    echo "="
-+    exit 1
-+}
-+
-+make clean -fldc.mak           || goerror
-+make lib doc install -fldc.mak || goerror
-+make clean -fldc.mak           || goerror
-+chmod 644 ../import/*.di       || goerror
-+
-+export HOME=$OLDHOME
-Index: src/gc/basic/gcx.d
-===================================================================
---- src/gc/basic/gcx.d  (revision 46)
-+++ src/gc/basic/gcx.d  (working copy)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     private import gcc.builtins; // for __builtin_unwind_init
- }
@@ -358 +226 @@
- private
- {
-3
+7
-         ALL_BITS = 0b1111_1111
-     }
@@ -372 +240 @@
-     extern (C) void* rt_stackTop();
- 
-67
+71
-     void initialize()
-     {   int dummy;
@@ -381 +249 @@
-         log_init();
-         debug (THREADINVARIANT)
-Index: src/gc/basic/ldc.mak
-===================================================================
---- src/gc/basic/ldc.mak    (revision 0)
-+++ src/gc/basic/ldc.mak    (revision 0)
-@@ -0,0 +1,100 @@
-+# Makefile to build the garbage collector D library for Posix
-+# Designed to work with GNU make
-+# Targets:
-+#  make
-+#      Same as make all
-+#  make lib
-+#      Build the garbage collector library
-+#   make doc
-+#       Generate documentation
-+#  make clean
-+#      Delete unneeded files created by build process
-+
-+LIB_TARGET=libdruntime-gc-basic.a
-+LIB_MASK=libdruntime-gc-basic*.a
-+
-+CP=cp -f
-+RM=rm -f
-+MD=mkdir -p
-+
-+ADD_CFLAGS=
-+ADD_DFLAGS=
-+
-+CFLAGS=-O $(ADD_CFLAGS)
-+#CFLAGS=-g $(ADD_CFLAGS)
-+
-+DFLAGS=-release -O -inline -w $(ADD_DFLAGS)
-+#DFLAGS=-g -w $(ADD_DFLAGS)
-+
-+TFLAGS=-O -inline -w $(ADD_DFLAGS)
-+#TFLAGS=-g -w $(ADD_DFLAGS)
-+
-+DOCFLAGS=-version=DDoc
-+
-+CC=gcc
-+LC=$(AR) -qsv
-+DC=ldc2
-+
-+LIB_DEST=../../../lib
-+
-+.SUFFIXES: .s .S .c .cpp .d .html .o
-+
-+.s.o:
-+   $(CC) -c $(CFLAGS) $< -o$@
-+
-+.S.o:
-+   $(CC) -c $(CFLAGS) $< -o$@
-+
-+.c.o:
-+   $(CC) -c $(CFLAGS) $< -o$@
-+
-+.cpp.o:
-+   g++ -c $(CFLAGS) $< -o$@
-+
-+.d.o:
-+   $(DC) -c $(DFLAGS) $< -of$@
-+
-+.d.html:
-+   $(DC) -c -o- $(DOCFLAGS) -Df$*.html $<
-+#  $(DC) -c -o- $(DOCFLAGS) -Df$*.html dmd.ddoc $<
-+
-+targets : lib doc
-+all     : lib doc
-+lib     : basic.lib
-+doc     : basic.doc
-+
-+######################################################
-+
-+ALL_OBJS= \
-+    gc.o \
-+    gcalloc.o \
-+    gcbits.o \
-+    gcstats.o \
-+    gcx.o
-+
-+######################################################
-+
-+ALL_DOCS=
-+
-+######################################################
-+
-+basic.lib : $(LIB_TARGET)
-+
-+$(LIB_TARGET) : $(ALL_OBJS)
-+   $(RM) $@
-+   $(LC) $@ $(ALL_OBJS)
-+
-+basic.doc : $(ALL_DOCS)
-+   echo No documentation available.
-+
-+######################################################
-+
-+clean :
-+   find . -name "*.di" | xargs $(RM)
-+   $(RM) $(ALL_OBJS)
-+   $(RM) $(ALL_DOCS)
-+   $(RM) $(LIB_MASK)
-+
-+install :
-+   $(MD) $(LIB_DEST)
-+   $(CP) $(LIB_MASK) $(LIB_DEST)/.
-Index: src/gc/stub/ldc.mak
-===================================================================
---- src/gc/stub/ldc.mak (revision 0)
-+++ src/gc/stub/ldc.mak (revision 0)
-@@ -0,0 +1,98 @@
-+# Makefile to build the garbage collector D library for Posix
-+# Designed to work with GNU make
-+# Targets:
-+#  make
-+#      Same as make all
-+#  make lib
-+#      Build the garbage collector library
-+#   make doc
-+#       Generate documentation
-+#  make clean
-+#      Delete unneeded files created by build process
-+
-+LIB_TARGET=druntime-gc-stub.a
-+LIB_MASK=druntime-gc-stub*.a
-+
-+CP=cp -f
-+RM=rm -f
-+MD=mkdir -p
-+
-+ADD_CFLAGS=
-+ADD_DFLAGS=
-+
-+CFLAGS=-O -m32 $(ADD_CFLAGS)
-+#CFLAGS=-g -m32 $(ADD_CFLAGS)
-+
-+### warnings disabled because gcx has issues ###
-+
-+DFLAGS=-release -O -inline $(ADD_DFLAGS)
-+#DFLAGS=-g $(ADD_DFLAGS)
-+
-+TFLAGS=-O -inline $(ADD_DFLAGS)
-+#TFLAGS=-g $(ADD_DFLAGS)
-+
-+DOCFLAGS=-version=DDoc
-+
-+CC=gcc
-+LC=$(AR) -qsv
-+DC=ldc2
-+
-+LIB_DEST=..
-+
-+.SUFFIXES: .s .S .c .cpp .d .html .o
-+
-+.s.o:
-+   $(CC) -c $(CFLAGS) $< -o$@
-+
-+.S.o:
-+   $(CC) -c $(CFLAGS) $< -o$@
-+
-+.c.o:
-+   $(CC) -c $(CFLAGS) $< -o$@
-+
-+.cpp.o:
-+   g++ -c $(CFLAGS) $< -o$@
-+
-+.d.o:
-+   $(DC) -c $(DFLAGS) $< -of$@
-+
-+.d.html:
-+   $(DC) -c -o- $(DOCFLAGS) -Df$*.html $<
-+#  $(DC) -c -o- $(DOCFLAGS) -Df$*.html dmd.ddoc $<
-+
-+targets : lib doc
-+all     : lib doc
-+lib     : stub.lib
-+doc     : stub.doc
-+
-+######################################################
-+
-+ALL_OBJS= \
-+    gc.o
-+
-+######################################################
-+
-+ALL_DOCS=
-+
-+######################################################
-+
-+stub.lib : $(LIB_TARGET)
-+
-+$(LIB_TARGET) : $(ALL_OBJS)
-+   $(RM) $@
-+   $(LC) $@ $(ALL_OBJS)
-+
-+stub.doc : $(ALL_DOCS)
-+   echo No documentation available.
-+
-+######################################################
-+
-+clean :
-+   find . -name "*.di" | xargs $(RM)
-+   $(RM) $(ALL_OBJS)
-+   $(RM) $(ALL_DOCS)
-+   $(RM) $(LIB_MASK)
-+
-+install :
-+   $(MD) $(LIB_DEST)
-+   $(CP) $(LIB_MASK) $(LIB_DEST)/.
-Index: src/ldc.mak
-===================================================================
---- src/ldc.mak (revision 0)
-+++ src/ldc.mak (revision 0)
-@@ -0,0 +1,78 @@
-+# Makefile to build the composite D runtime library for Linux
-+# Designed to work with GNU make
-+# Targets:
-+#  make
-+#      Same as make all
-+#  make lib
-+#      Build the runtime library
-+#   make doc
-+#       Generate documentation
-+#  make clean
-+#      Delete unneeded files created by build process
-+
-+LIB_TARGET=libdruntime-ldc.a
-+DUP_TARGET=libdruntime.a
-+LIB_MASK=libdruntime*.a
-+
-+DIR_RT=compiler/ldc
-+DIR_CC=common
-+DIR_GC=gc/basic
-+
-+CP=cp -f
-+RM=rm -f
-+MD=mkdir -p
-+
-+CC=gcc
-+LC=$(AR) -qsv
-+DC=ldc2
-+
-+LIB_DEST=../lib
-+
-+ADD_CFLAGS=
-+ADD_DFLAGS=
-+
-+targets : lib doc
-+all     : lib doc
-+
-+######################################################
-+
-+ALL_OBJS=
-+
-+######################################################
-+
-+ALL_DOCS=
-+
-+######################################################
-+
-+lib : $(ALL_OBJS)
-+   make -C $(DIR_RT) -fldc.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
-+   make -C $(DIR_CC) -fldc.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
-+   make -C $(DIR_GC) -fldc.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
-+   $(RM) $(LIB_TARGET)
-+   $(LC) $(LIB_TARGET) `find $(DIR_RT) -name "*.o" | xargs echo`
-+   $(LC) $(LIB_TARGET) `find $(DIR_CC) -name "*.o" | xargs echo`
-+   $(LC) $(LIB_TARGET) `find $(DIR_GC) -name "*.o" | xargs echo`
-+   $(RM) $(DUP_TARGET)
-+   $(CP) $(LIB_TARGET) $(DUP_TARGET)
-+
-+doc : $(ALL_DOCS)
-+   make -C $(DIR_RT) -fldc.mak doc DC=$(DC)
-+   make -C $(DIR_CC) -fldc.mak doc DC=$(DC)
-+   make -C $(DIR_GC) -fldc.mak doc DC=$(DC)
-+
-+######################################################
-+
-+clean :
-+   find . -name "*.di" | xargs $(RM)
-+   $(RM) $(ALL_OBJS)
-+   $(RM) $(ALL_DOCS)
-+   make -C $(DIR_RT) -fldc.mak clean
-+   make -C $(DIR_CC) -fldc.mak clean
-+   make -C $(DIR_GC) -fldc.mak clean
-+   $(RM) $(LIB_MASK)
-+
-+install :
-+   make -C $(DIR_RT) -fldc.mak install
-+   make -C $(DIR_CC) -fldc.mak install
-+   make -C $(DIR_GC) -fldc.mak install
-+   $(CP) $(LIB_MASK) $(LIB_DEST)/.
-Index: src/compiler/ldc/adi.d
-===================================================================
---- src/compiler/ldc/adi.d  (revision 0)
-+++ src/compiler/ldc/adi.d  (revision 0)
-@@ -0,0 +1,602 @@
-+//_ adi.d
-+
-+/**
-+ * Part of the D programming language runtime library.
-+ * Dynamic array property support routines
-+ */
-+
-+/*
-+ *  Copyright (C) 2000-2006 by Digital Mars, www.digitalmars.com
-+ *  Written by Walter Bright
-+ *
-+ *  This software is provided 'as-is', without any express or implied
-+ *  warranty. In no event will the authors be held liable for any damages
-+ *  arising from the use of this software.
-+ *
-+ *  Permission is granted to anyone to use this software for any purpose,
-+ *  including commercial applications, and to alter it and redistribute it
-+ *  freely, in both source and binary form, subject to the following
-+ *  restrictions:
-+ *
-+ *  o  The origin of this software must not be misrepresented; you must not
-+ *     claim that you wrote the original software. If you use this software
-+ *     in a product, an acknowledgment in the product documentation would be
-+ *     appreciated but is not required.
-+ *  o  Altered source versions must be plainly marked as such, and must not
-+ *     be misrepresented as being the original software.
-+ *  o  This notice may not be removed or altered from any source
-+ *     distribution.
-+ */
-+
-+/*
-+ *  Modified by Sean Kelly <sean@f4.ca> for use with Tango.
-+ */
-+
-+
-+//debug=adi;            // uncomment to turn on debugging printf's
-+
-+private
-+{
-+    version( D_Version2 )
-+    {
-+    import core.stdc.stdlib;
-+    import core.stdc.string;
-+    }
-+    else
-+    {
-+    import tango.stdc.stdlib;
-+    import tango.stdc.string;
-+    }
-+    import util.utf;
-+
-+    enum BlkAttr : uint
-+    {
-+        FINALIZE = 0b0000_0001,
-+        NO_SCAN  = 0b0000_0010,
-+        NO_MOVE  = 0b0000_0100,
-+        ALL_BITS = 0b1111_1111
-+    }
-+
-+    extern (C) void* gc_malloc( size_t sz, uint ba = 0 );
-+    extern (C) void* gc_calloc( size_t sz, uint ba = 0 );
-+    extern (C) void  gc_free( void* p );
-+}
-+
-+
-+/**********************************************
-+ * Reverse array of chars.
-+ * Handled separately because embedded multibyte encodings should not be
-+ * reversed.
-+ */
-+
-+extern (C) char[] _adReverseChar(char[] a)
-+{
-+    if (a.length > 1)
-+    {
-+        char[6] tmp;
-+        char[6] tmplo;
-+        char* lo = a.ptr;
-+        char* hi = &a[length - 1];
-+
-+        while (lo < hi)
-+        {   auto clo = *lo;
-+            auto chi = *hi;
-+
-+       debug(adi) printf("lo = %d, hi = %d\n", lo, hi);
-+            if (clo <= 0x7F && chi <= 0x7F)
-+            {
-+       debug(adi) printf("\tascii\n");
-+                *lo = chi;
-+                *hi = clo;
-+                lo++;
-+                hi--;
-+                continue;
-+            }
-+
-+            uint stridelo = UTF8stride[clo];
-+            // don't barf on invalid strides, just ignore it
-+            if (stridelo == 0xFF)
-+                stridelo = 1;
-+
-+            uint stridehi = 1;
-+            while ((chi & 0xC0) == 0x80)
-+            {
-+                chi = *--hi;
-+                stridehi++;
-+                assert(hi >= lo);
-+            }
-+            if (lo == hi)
-+                break;
-+
-+       debug(adi) printf("\tstridelo = %d, stridehi = %d\n", stridelo, stridehi);
-+            if (stridelo == stridehi)
-+            {
-+
-+                memcpy(tmp.ptr, lo, stridelo);
-+                memcpy(lo, hi, stridelo);
-+                memcpy(hi, tmp.ptr, stridelo);
-+                lo += stridelo;
-+                hi--;
-+                continue;
-+            }
-+
-+            /* Shift the whole array. This is woefully inefficient
-+             */
-+            memcpy(tmp.ptr, hi, stridehi);
-+            memcpy(tmplo.ptr, lo, stridelo);
-+            memmove(lo + stridehi, lo + stridelo , cast(size_t)(hi - lo) - stridelo);
-+            memcpy(lo, tmp.ptr, stridehi);
-+            memcpy(hi + stridehi - stridelo, tmplo.ptr, stridelo);
-+
-+            lo += stridehi;
-+            hi = hi - 1 + (stridehi - stridelo);
-+        }
-+    }
-+    return a;
-+}
-+
-+unittest
-+{
-+    char[] a = "abcd"c;
-+
-+    char[] r = a.dup.reverse;
-+    //writefln(r);
-+    assert(r == "dcba");
-+
-+    a = "a\u1235\u1234c";
-+    //writefln(a);
-+    r = a.dup.reverse;
-+    //writefln(r);
-+    assert(r == "c\u1234\u1235a");
-+
-+    a = "ab\u1234c";
-+    //writefln(a);
-+    r = a.dup.reverse;
-+    //writefln(r);
-+    assert(r == "c\u1234ba");
-+
-+    a = "\u3026\u2021\u3061\n";
-+    r = a.dup.reverse;
-+    assert(r == "\n\u3061\u2021\u3026");
-+}
-+
-+
-+/**********************************************
-+ * Reverse array of wchars.
-+ * Handled separately because embedded multiword encodings should not be
-+ * reversed.
-+ */
-+
-+extern (C) wchar[] _adReverseWchar(wchar[] a)
-+{
-+    if (a.length > 1)
-+    {
-+        wchar[2] tmp;
-+        wchar* lo = a.ptr;
-+        wchar* hi = &a[length - 1];
-+
-+        while (lo < hi)
-+        {   auto clo = *lo;
-+            auto chi = *hi;
-+
-+            if ((clo < 0xD800 || clo > 0xDFFF) &&
-+                (chi < 0xD800 || chi > 0xDFFF))
-+            {
-+                *lo = chi;
-+                *hi = clo;
-+                lo++;
-+                hi--;
-+                continue;
-+            }
-+
-+            int stridelo = 1 + (clo >= 0xD800 && clo <= 0xDBFF);
-+
-+            int stridehi = 1;
-+            if (chi >= 0xDC00 && chi <= 0xDFFF)
-+            {
-+                chi = *--hi;
-+                stridehi++;
-+                assert(hi >= lo);
-+            }
-+            if (lo == hi)
-+                break;
-+
-+            if (stridelo == stridehi)
-+            {   int stmp;
-+
-+                assert(stridelo == 2);
-+                assert(stmp.sizeof == 2 * (*lo).sizeof);
-+                stmp = *cast(int*)lo;
-+                *cast(int*)lo = *cast(int*)hi;
-+                *cast(int*)hi = stmp;
-+                lo += stridelo;
-+                hi--;
-+                continue;
-+            }
-+
-+            /* Shift the whole array. This is woefully inefficient
-+             */
-+            memcpy(tmp.ptr, hi, stridehi * wchar.sizeof);
-+            memcpy(hi + stridehi - stridelo, lo, stridelo * wchar.sizeof);
-+            memmove(lo + stridehi, lo + stridelo , (hi - (lo + stridelo)) * wchar.sizeof);
-+            memcpy(lo, tmp.ptr, stridehi * wchar.sizeof);
-+
-+            lo += stridehi;
-+            hi = hi - 1 + (stridehi - stridelo);
-+        }
-+    }
-+    return a;
-+}
-+
-+unittest
-+{
-+    wchar[] a = "abcd";
-+    wchar[] r;
-+
-+    r = a.dup.reverse;
-+    assert(r == "dcba");
-+
-+    a = "a\U00012356\U00012346c";
-+    r = a.dup.reverse;
-+    assert(r == "c\U00012346\U00012356a");
-+
-+    a = "ab\U00012345c";
-+    r = a.dup.reverse;
-+    assert(r == "c\U00012345ba");
-+}
-+
-+
-+/**********************************************
-+ * Support for array.reverse property.
-+ * The actual type is painted on the return value by the frontend
-+ * Given and returned length are number of elements
-+ */
-+
-+extern (C) void[] _adReverse(void[] a, size_t szelem)
-+    out (result)
-+    {
-+        assert(result.ptr is a.ptr);
-+    }
-+    body
-+    {
-+        if (a.length >= 2)
-+        {
-+            byte*    tmp;
-+            byte[16] buffer;
-+
-+            void* lo = a.ptr;
-+            void* hi = a.ptr + (a.length - 1) * szelem;
-+
-+            tmp = buffer.ptr;
-+            if (szelem > 16)
-+            {
-+                //version (Win32)
-+                    //tmp = cast(byte*) alloca(szelem);
-+                //else
-+                    tmp = cast(byte*) gc_malloc(szelem);
-+            }
-+
-+            for (; lo < hi; lo += szelem, hi -= szelem)
-+            {
-+                memcpy(tmp, lo,  szelem);
-+                memcpy(lo,  hi,  szelem);
-+                memcpy(hi,  tmp, szelem);
-+            }
-+
-+            version (Win32)
-+            {
-+            }
-+            else
-+            {
-+                //if (szelem > 16)
-+                    // BUG: bad code is generate for delete pointer, tries
-+                    // to call delclass.
-+                    //gc_free(tmp);
-+            }
-+        }
-+        return a.ptr[0 .. a.length];
-+    }
-+
-+unittest
-+{
-+    debug(adi) printf("array.reverse.unittest\n");
-+
-+    int[] a = new int[5];
-+    int[] b;
-+    size_t i;
-+
-+    for (i = 0; i < 5; i++)
-+        a[i] = i;
-+    b = a.reverse;
-+    assert(b is a);
-+    for (i = 0; i < 5; i++)
-+        assert(a[i] == 4 - i);
-+
-+    struct X20
-+    {   // More than 16 bytes in size
-+        int a;
-+        int b, c, d, e;
-+    }
-+
-+    X20[] c = new X20[5];
-+    X20[] d;
-+
-+    for (i = 0; i < 5; i++)
-+    {   c[i].a = i;
-+        c[i].e = 10;
-+    }
-+    d = c.reverse;
-+    assert(d is c);
-+    for (i = 0; i < 5; i++)
-+    {
-+        assert(c[i].a == 4 - i);
-+        assert(c[i].e == 10);
-+    }
-+}
-+
-+/**********************************************
-+ * Sort array of chars.
-+ */
-+
-+extern (C) char[] _adSortChar(char[] a)
-+{
-+    if (a.length > 1)
-+    {
-+   dstring da = toUTF32(a);
-+        da.sort;
-+        size_t i = 0;
-+        foreach (dchar d; da)
-+        {   char[4] buf;
-+            auto t = toUTF8(buf, d);
-+            a[i .. i + t.length] = t[];
-+            i += t.length;
-+        }
-+        delete da;
-+    }
-+    return a;
-+}
-+
-+/**********************************************
-+ * Sort array of wchars.
-+ */
-+
-+extern (C) wchar[] _adSortWchar(wchar[] a)
-+{
-+    if (a.length > 1)
-+    {
-+   dstring da = toUTF32(a);
-+        da.sort;
-+        size_t i = 0;
-+        foreach (dchar d; da)
-+        {   wchar[2] buf;
-+       auto t = toUTF16(buf, d);
-+            a[i .. i + t.length] = t[];
-+            i += t.length;
-+        }
-+        delete da;
-+    }
-+    return a;
-+}
-+
-+/***************************************
-+ * Support for array equality test.
-+ * The actual type is painted on the return value by the frontend
-+ * Given lengths are number of elements
-+ */
-+
-+extern (C) int _adEq(void[] a1, void[] a2, TypeInfo ti)
-+{
-+    debug(adi) printf("_adEq(a1.length = %d, a2.length = %d)\n", a1.length, a2.length);
-+
-+    if (a1.length != a2.length)
-+        return 0;               // not equal
-+    else if (a1.ptr == a2.ptr)
-+        return 1;               // equal
-+
-+    // let typeinfo decide
-+    return ti.equals(&a1, &a2);
-+}
-+
-+unittest
-+{
-+    debug(adi) printf("array.Eq unittest\n");
-+
-+    char[] a = "hello"c;
-+
-+    assert(a != "hel");
-+    assert(a != "helloo");
-+    assert(a != "betty");
-+    assert(a == "hello");
-+    assert(a != "hxxxx");
-+}
-+
-+/***************************************
-+ * Support for array compare test.
-+ * The actual type is painted on the return value by the frontend
-+ * Given lengths are number of elements
-+ */
-+
-+extern (C) int _adCmp(void[] a1, void[] a2, TypeInfo ti)
-+{
-+    debug(adi) printf("adCmp()\n");
-+
-+    if (a1.ptr == a2.ptr &&
-+        a1.length == a2.length)
-+        return 0;
-+
-+    auto len = a1.length;
-+    if (a2.length < len)
-+        len = a2.length;
-+
-+    // let typeinfo decide
-+    return ti.compare(&a1, &a2);
-+}
-+
-+unittest
-+{
-+    debug(adi) printf("array.Cmp unittest\n");
-+
-+    char[] a = "hello"c;
-+
-+    assert(a >  "hel");
-+    assert(a >= "hel");
-+    assert(a <  "helloo");
-+    assert(a <= "helloo");
-+    assert(a >  "betty");
-+    assert(a >= "betty");
-+    assert(a == "hello");
-+    assert(a <= "hello");
-+    assert(a >= "hello");
-+}
-+
-+/***************************************
-+ * Support for array compare test.
-+ * The actual type is painted on the return value by the frontend
-+ * Given lengths are number of elements
-+ */
-+
-+extern (C) int _adCmpChar(void[] a1, void[] a2)
-+{
-+  version(D_InlineAsm_X86)
-+  {
-+  //version = Asm86;
-+  }
-+  version (Asm86)
-+  {
-+    asm
-+    {   naked                   ;
-+
-+        push    EDI             ;
-+        push    ESI             ;
-+
-+        mov    ESI,a1+4[4+ESP]  ;
-+        mov    EDI,a2+4[4+ESP]  ;
-+
-+        mov    ECX,a1[4+ESP]    ;
-+        mov    EDX,a2[4+ESP]    ;
-+
-+        cmp     ECX,EDX         ;
-+        jb      GotLength       ;
-+
-+        mov     ECX,EDX         ;
-+
-+GotLength:
-+        cmp    ECX,4            ;
-+        jb    DoBytes           ;
-+
-+        // Do alignment if neither is dword aligned
-+        test    ESI,3           ;
-+        jz    Aligned           ;
-+
-+        test    EDI,3           ;
-+        jz    Aligned           ;
-+DoAlign:
-+        mov    AL,[ESI]         ; //align ESI to dword bounds
-+        mov    DL,[EDI]         ;
-+
-+        cmp    AL,DL            ;
-+        jnz    Unequal          ;
-+
-+        inc    ESI              ;
-+        inc    EDI              ;
-+
-+        test    ESI,3           ;
-+
-+        lea    ECX,[ECX-1]      ;
-+        jnz    DoAlign          ;
-+Aligned:
-+        mov    EAX,ECX          ;
-+
-+        // do multiple of 4 bytes at a time
-+
-+        shr    ECX,2            ;
-+        jz    TryOdd            ;
-+
-+        repe                    ;
-+        cmpsd                   ;
-+
-+        jnz    UnequalQuad      ;
-+
-+TryOdd:
-+        mov    ECX,EAX          ;
-+DoBytes:
-+        // if still equal and not end of string, do up to 3 bytes slightly
-+        // slower.
-+
-+        and    ECX,3            ;
-+        jz    Equal             ;
-+
-+        repe                    ;
-+        cmpsb                   ;
-+
-+        jnz    Unequal          ;
-+Equal:
-+        mov    EAX,a1[4+ESP]    ;
-+        mov    EDX,a2[4+ESP]    ;
-+
-+        sub    EAX,EDX          ;
-+        pop    ESI              ;
-+
-+        pop    EDI              ;
-+        ret                     ;
-+
-+UnequalQuad:
-+        mov    EDX,[EDI-4]      ;
-+        mov    EAX,[ESI-4]      ;
-+
-+        cmp    AL,DL            ;
-+        jnz    Unequal          ;
-+
-+        cmp    AH,DH            ;
-+        jnz    Unequal          ;
-+
-+        shr    EAX,16           ;
-+
-+        shr    EDX,16           ;
-+
-+        cmp    AL,DL            ;
-+        jnz    Unequal          ;
-+
-+        cmp    AH,DH            ;
-+Unequal:
-+