Changeset 4172

Timestamp:

12/15/08 12:05:57 (3 years ago)

Author:

fawzi

Message:

LDC patch refs #1212

Files:

• trunk/lib/common/tango/core/BitManip.d (modified) (1 diff)
• trunk/lib/common/tango/core/Thread.d (modified) (7 diffs)
• trunk/lib/gc/basic/gcbits.d (modified) (1 diff)
• trunk/lib/gc/basic/gcx.d (modified) (4 diffs)

trunk/lib/common/tango/core/BitManip.d

@@ -171 +171 @@
-     */
-    uint outpl( uint port_address, uint value );
+}
+else version( LDC )
+{
+    public import ldc.bitmanip;
-}
-else

trunk/lib/common/tango/core/Thread.d

@@ -274 +274 @@
-        body
-        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-                asm
@@ -331 +373 @@
-            }
-
-
+
+
+
+
+
-            {
-                asm
@@ -2348 +2394 @@
-            version = AsmPPC_Posix;
-    }
+    version( LLVM_InlineAsm_X86 ) 
+    {
+        version( Win32 )
+            version = LLVM_AsmX86_Win32;
+        else version( Posix )
+            version = LLVM_AsmX86_Posix;
+    }
+    else version( LLVM_InlineAsm_X86_64 )
+    {
+        version( Posix )
+            version = LLVM_AsmX86_64_Posix;
+    }
-
-    version( Posix )
@@ -2358 +2416 @@
-        version( AsmX86_Posix ) {} else
-        version( AsmPPC_Posix ) {} else
+        version( LLVM_AsmX86_Win32 ) {} else
+        version( LLVM_AsmX86_Posix ) {} else
+//TODO: Enable when x86-64 Posix supports fibers
+//        version( LLVM_AsmX86_64_Posix ) {} else
-        {
-            // NOTE: The ucontext implementation requires architecture specific
@@ -2511 +2573 @@
-            }
-        }
+        else version( LLVM_AsmX86_Posix )
+        {
+            asm
+            {
+                // clobber registers to save
+                inc EBX;
+                inc ESI;
+                inc EDI;
+
+                // store oldp again with more accurate address
+                mov EAX, oldp;
+                mov [EAX], ESP;
+                // load newp to begin context switch
+                mov ESP, newp;
+            }
+        }
+/+
+        version( LLVM_AsmX86_64_Posix )
+        {
+            //TODO: Fiber implementation here
+        }
++/
-        else static if( is( ucontext_t ) )
-        {
@@ -2522 +2606 @@
-    }
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
@@ -3256 +3339 @@
-            push( 0x00000000 );                                     // EDI
-        }
+        else version( LLVM_AsmX86_Posix )
+        {
+            push( cast(size_t) &fiber_entryPoint );                 // EIP
+            push( 0x00000000 );                                     // newp
+            push( 0x00000000 );                                     // oldp
+            push( 0x00000000 );                                     // EBP
+            push( 0x00000000 );                                     // EBX
+            push( 0x00000000 );                                     // ESI
+            push( 0x00000000 );                                     // EDI
+        }
+//TODO: Implement x86-64 fibers
+/+
+        else version( LLVM_AsmX86_Posix )
+        {
+        }
++/
-        else version( AsmPPC_Posix )
-        {

trunk/lib/gc/basic/gcbits.d

@@ -40 +40 @@
-    // use the unoptimized version
-}
+else version(LDC)
+{
+    // ditto
+}
-else version (D_InlineAsm_X86)
-{

trunk/lib/gc/basic/gcx.d

@@ -66 +66 @@
-
-
+struct BlkInfo
+{
+    void*  base;
+    size_t size;
+    uint   attr;
+}
+
-private
-{
@@ -74 +81 @@
-        NO_MOVE  = 0b0000_0100,
-        ALL_BITS = 0b1111_1111
-    }
-
-    struct BlkInfo
-    {
-        void*  base;
-        size_t size;
-        uint   attr;
-    }
-
@@ -2179 +2179 @@
-            sp = & sp;
-        }
+        else version(LDC)
+        {
+            version(X86)
+            {
+                uint eax,ecx,edx,ebx,ebp,esi,edi;
+                asm
+                {
+                    mov eax[EBP], EAX      ;
+                    mov ecx[EBP], ECX      ;
+                    mov edx[EBP], EDX      ;
+                    mov ebx[EBP], EBX      ;
+                    mov ebp[EBP], EBP      ;
+                    mov esi[EBP], ESI      ;
+                    mov edi[EBP], EDI      ;
+                    mov sp[EBP],ESP     ;
+                }
+            }
+            else version (X86_64)
+            {
+                ulong rax,rbx,rcx,rdx,rbp,rsi,rdi,rsp,r10,r11,r12,r13,r14,r15;
+                asm
+                {
+                    movq rax[RBP], RAX      ;
+                    movq rbx[RBP], RBX      ;
+                    movq rcx[RBP], RCX      ;
+                    movq rdx[RBP], RDX      ;
+                    movq rbp[RBP], RBP      ;
+                    movq rsi[RBP], RSI      ;
+                    movq rdi[RBP], RDI      ;
+                    movq rsp[RBP], RSP      ;
+                    movq r10[RBP], R10      ;
+                    movq r11[RBP], R11      ;
+                    movq r12[RBP], R12      ;
+                    movq r13[RBP], R13      ;
+                    movq r14[RBP], R14      ;
+                    movq r15[RBP], R15      ;
+                }
+            }
+            else
+            {
+                static assert( false, "Architecture not supported." );
+            }
+        }
-        else
-        {
@@ -2189 +2232 @@
-        result = fullcollect(sp);
-        version (GNU)
+        {
+            // nothing to do
+        }
+        else version(LDC)
-        {
-            // nothing to do