Ticket #2038: tango-dmd64.patch

object.di

@@ -131 +131 @@
-    PointerMap pointermap();
-    /// offsets of the various elements
-    OffsetTypeInfo[] offTi();
+
+    /** Return internal info on arguments fitting into 8byte.
+       * See X86-64 ABI 3.2.3
+     */
+    version (X86_64) int argTypes(out TypeInfo arg1, out TypeInfo arg2);
-}
-
-class TypeInfo_Typedef : TypeInfo

tango/core/rt/gc/basic/gcx.d

@@ -2344 +2344 @@
-        }
-        else
-        {
-asm
+version (D_InlineAsm_X86)
-        {
-
-
+
+
+
+
+
-        }
+        else version (D_InlineAsm_X86_64)
+        {
+            asm
+            {
+                push RAX ;
+                push RBX ;
+                push RCX ;
+                push RDX ;
+                push RSI ;
+                push RDI ;
+                push RBP ;
+                push R8  ;
+                push R9  ;
+                push R10  ;
+                push R11  ;
+                push R12  ;
+                push R13  ;
+                push R14  ;
+                push R15  ;
+                push EAX ;   // 16 byte align the stack
+            }
-        }
+        else
+        {
+            static assert( false, "Architecture not supported." );
+        }
+        }
-        result = fullcollect(sp);
-        version (GNU)
-        {
@@ -2519 +2548 @@
-        for (n = 0; n < npools; n++)
-        {   size_t pn;
-            size_t ncommitted;
-            uint*  bbase;
-
-            pool = pooltable[n];
-
+auto 
-            ncommitted = pool.ncommitted;
-            for (pn = 0; pn < ncommitted; pn++, bbase += PAGESIZE / (32 * 16))
-            {

tango/core/rt/gc/basic/gcbits.d

@@ -50 +50 @@
-
-struct GCBits
-{
-
-
-
+
-
-
+
+
+
+
+
+
-    size_t nwords = 0;    // allocated words in data[] excluding sentinals
-    size_t nbits = 0;     // number of bits in data[] excluding sentinals
-
@@ -79 +82 @@
-    {
-        this.nbits = nbits;
-        nwords = (nbits + (BITS_PER_WORD - 1)) >> BITS_SHIFT;
-uint*)calloc(nwords + 2, uint
+wordtype*)calloc(nwords + 2, wordtype
-        if (!data)
-            onOutOfMemoryError();
-    }
-
-uint
+wordtype
-    in
-    {
-        assert(i < nbits);
@@ -92 +95 @@
-    body
-    {
-        //return (cast(bit *)(data + 1))[i];
-
+BITS_
-    }
-
-    void set(size_t i)
@@ -103 +106 @@
-    body
-    {
-        //(cast(bit *)(data + 1))[i] = 1;
-
+BITS_
-    }
-
-    void clear(size_t i)
@@ -114 +117 @@
-    body
-    {
-        //(cast(bit *)(data + 1))[i] = 0;
-
+BITS_
-    }
-
-uint
+wordtype
-    {
-        version (bitops)
-        {
@@ -136 +139 @@
-            }
-        }
-        else
-uint
+wordtype
-
-            //result = (cast(bit *)(data + 1))[i];
-            //(cast(bit *)(data + 1))[i] = 0;
-
-uint
-uint  mask = (
+wordtype
+wordtype  mask = (BITS_
-            result = *p & mask;
-            *p &= ~mask;
-            return result;
@@ -188 +191 @@
-            for (;d1!=dEnd;++d1)
-                *d1=0u;
-        } else {
-uint
+wordtype
-        }
-    }
-
@@ -200 +203 @@
-    body
-    {
-        version(MEMCPY_NON_SIG_SAFE) {
-uint
+wordtype
-            for (;d1!=dEnd;++d1,++d2)
-                *d1=*d2;
-        } else {
-uint
+wordtype
-        }
-    }
-
-uint
+wordtype
-    in
-    {
-        assert(data);

tango/core/rt/compiler/dmd/rt/lifetime.d

@@ -303 +303 @@
-    if (ndims == 0)
-        result = 0;
-    else
-va_list q;
-start!(int)(q, ndims)
+
+list q
-
+        version(X86)
+            va_start(q, ndims);
+        else version(X86_64)
+            va_start(q, __va_argsave);
+        else
+            static assert(false, "platform not supported");
+
-        void[] foo(TypeInfo ti, size_t* pdim, int ndims)
-        {
-            size_t dim = *pdim;
@@ -358 +365 @@
-    else
-    {
-        va_list q;
-        va_start!(int)(q, ndims);
-
+        version(X86)
+            va_start(q, ndims);
+        else version(X86_64)
+            va_start(q, __va_argsave);
+        else
+            static assert(false, "platform not supported");
+
-        void[] foo(TypeInfo ti, size_t* pdim, int ndims)
-        {
-            size_t dim = *pdim;
@@ -1167 +1180 @@
-        }
-        result = gc_malloc(length * sizeelem, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0, pm);
-
-
-
+
+
+
+
-
-
+    
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
+ version(X86_64)
-        {
+            va_list q;
+            va_start(q, __va_argsave);
-            for (size_t i = 0; i < length; i++)
-            {
-
-
+
-            }
+            va_end(q);
-        }
-
-        va_end(q);
-    }
-    return result;
-}

tango/core/rt/compiler/dmd/rt/aaA.d

@@ -110 +110 @@
-
-size_t aligntsize(size_t tsize)
-{
-
-
+
+
+
+
+
-}
-
-extern (C):
@@ -824 +827 @@
-    else
-    {
-        va_list q;
-
+ersion(X86_64) va_start(q, __va_argsave); else v
-
-        result = new BB();
-        result.keyti = keyti;

tango/core/rt/compiler/dmd/object_.d

@@ -473 +473 @@
-
-    /// Get type information on the contents of the type; null if not available
-    OffsetTypeInfo[] offTi() { return null; }
+
+
+     /** Return internal info on arguments fitting into 8byte.
+       * See X86-64 ABI 3.2.3
+     */
+    version (X86_64) int argTypes(out TypeInfo arg1, out TypeInfo arg2)
+    {   arg1 = this;
+        return 0;
+    }
-}
-
-class TypeInfo_Typedef : TypeInfo

tango/core/Variant.d

@@ -37 +37 @@
-            version=EnableVararg;
-        }
-    }
+    version( X86_64 )
+    {
+        version( Windows )
+        {
+            version=EnableVararg;
+        }
+        else version( Posix )
+        {
+            version=EnableVararg;
+        }
+    }
-}
-else version( LDC )
-{

tango/core/Thread.d

@@ -348 +348 @@
-            {
-                __builtin_unwind_init();
-            }
+            else version ( D_InlineAsm_X86_64 )
+            {
+                asm
+                {
+                    // Not sure what goes here, pushad is invalid in 64 bit code
+                    push RAX ;
+                    push RBX ;
+                    push RCX ;
+                    push RDX ;
+                    push RSI ;
+                    push RDI ;
+                    push RBP ;
+                    push R8  ;
+                    push R9  ;
+                    push R10 ;
+                    push R11 ;
+                    push R12 ;
+                    push R13 ;
+                    push R14 ;
+                    push R15 ;
+                    push EAX ;   // 16 byte align the stack
+                }
+            }
-            else
-            {
-                static assert( false, "Architecture not supported." );
@@ -411 +434 @@
-            {
-                // registers will be popped automatically
-            }
+            else version ( D_InlineAsm_X86_64 )
+            {
+                asm
+                {
+                    // Not sure what goes here, popad is invalid in 64 bit code
+                    pop EAX ;   // 16 byte align the stack
+                    pop R15 ;
+                    pop R14 ;
+                    pop R13 ;
+                    pop R12 ;
+                    pop R11 ;
+                    pop R10 ;
+                    pop R9  ;
+                    pop R8  ;
+                    pop RBP ;
+                    pop RDI ;
+                    pop RSI ;
+                    pop RDX ;
+                    pop RCX ;
+                    pop RBX ;
+                    pop RAX ;
+                }
+            }
-            else
-            {
-                static assert( false, "Architecture not supported." );
@@ -2670 +2716 @@
-        }
-        else version( AsmX86_64_Posix )
-        {
-
+version( DigitalMars ) 
-            {
-                naked;
-
-                // save current stack state
+                push RBP;
+                mov RBP, RSP;
+                push RBX;
+                push R12;
+                push R13;
+                push R14;
+                push R15;
+                sub RSP, 4;
+                stmxcsr [RSP];
+                sub RSP, 4;
+                //version(SynchroFloatExcept){
+                    fstcw [RSP];
+                    fwait;
+                //} else {
+                //    fnstcw [RSP];
+                //    fnclex;
+                //}
+
+                // store oldp again with more accurate address
+                mov [RDI], RSP;
+                // load newp to begin context switch
+                mov RSP, RSI;
+
+                // load saved state from new stack
+                fldcw [RSP];
+                add RSP, 4;
+                ldmxcsr [RSP];
+                add RSP, 4;
+                pop R15;
+                pop R14;
+                pop R13;
+                pop R12;
+
+                pop RBX;
+                pop RBP;
+
+                // 'return' to complete switch
+                ret;
+
+            }
+            else asm
+            {
+                naked;
+
+                // save current stack state
-                pushq RBP;
-                mov RBP, RSP;
-                pushq RBX;

tango/core/Vararg.d

@@ -21 +21 @@
-}
-else
-{
-
-
-
+
+
-    alias void* va_list;
-
-
-
-
-
-
-
-
-
-
-
-
+
-    {
-
+
+
+
+
+
+
-    }
+}
+else
+{
+    public import tango.stdc.stdarg;
+}
-
-    /**
-     * This function returns the next argument in the sequence referenced by
-     * the supplied argument pointer.  The argument pointer will be adjusted
-     * to point to the next arggument in the sequence.
-     *
-     * Params:
-     *  ap  = The argument pointer.
-     *
-     * Returns:
-     *  The next argument in the sequence.  The result is undefined if ap
-     *  does not point to a valid argument.
-     */
-    T va_arg(T) ( ref va_list ap )
-    {
-        T arg = *cast(T*) ap;
-        ap = cast(va_list) ( cast(void*) ap + ( ( T.sizeof + int.sizeof - 1 ) & ~( int.sizeof - 1 ) ) );
-        return arg;
-    }
-
-    /**
-     * This function cleans up any resources allocated by va_start.  It is
-     * currently a no-op and exists mostly for syntax compatibility with
-     * the variadric argument functions for C.
-     *
-     * Params:
-     *  ap  = The argument pointer.
-     */
-    void va_end( va_list ap )
-    {
-
-    }
-
-
-    /**
-     * This function copied the argument pointer src to dst.
-     *
-     * Params:
-     *  src = The source pointer.
-     *  dst = The destination pointer.
-     */
-    void va_copy( out va_list dst, va_list src )
-    {
-        dst = src;
-    }
-}

tango/stdc/stdarg.d

@@ -8 +8 @@
- */
-module tango.stdc.stdarg;
-
-
-version( GNU )
-{
-    public import std.c.stdarg;
@@ -19 +18 @@
-}
-else
-{
+version (X86)
+{
+    /*********************
+     * The argument pointer type.
+     */
-    alias void* va_list;
-
-
+
+
+
+
+
+
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
+        else
+        {
+            static assert(0, "not a valid argument type for va_arg");
+        }
-    }
-
-template va_arg( T 
+void va_arg()(va_list apx, TypeInfo ti, void* parmn
-    {
-
+
+
+
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
+        else
+        {
+            assert(0, "not a valid argument type for va_arg");
+        }
-    }
-
- va_list ap 
+va_list ap
-    {
-
-    }
-
- out va_list dest, va_list src 
+out va_list dest, va_list src
-    {
-        dest = src;
-    }
-}
+else
+{
+    static assert(0);
+}
+}