Changeset 1314

Timestamp:

01/15/07 15:40:30 (2 years ago)

Author:

mclysenk

Message:

Added fiber support for the following targets via assembler:

Intel x86 OS X
PowerPC 32-bit OS X
Intel x86 Linux

Files:

• trunk/patches/Thread.d (modified) (16 diffs)
• trunk/patches/bits.s (added)

trunk/patches/Thread.d

@@ -1263 +1263 @@
-            if( t.prev )
-                t.prev.next = t.next;
+
-            if( t.next )
-                t.next.prev = t.prev;
+
-            if( sm_tbeg == t )
-                sm_tbeg = t.next;
@@ -2005 +2007 @@
-    }
-}
+else version ( PPC )
+{
+    version( GNU )
+    {
+        version( darwin )
+            version = AsmPPC_Posix_GDC;
+    }
+}
-
-
@@ -2014 +2024 @@
-    version( AsmX86_Linux ) {} else
-    version( AsmX86_Posix_GDC ) {} else
+    version( AsmPPC_Posix_GDC )
+    {
+       // Mik: mmap does not work on OSX, so we use malloc instead
+       extern (C) size_t malloc_good_size(size_t);
+       extern (C) void* valloc(size_t size);
+
+       // Mik: No inline assember, so we need external code
+       extern (C) void doSwitchASM(void**, void*);
+    } else
-    version( X86_64 ) {} else
-    version( X86 )
@@ -2136 +2155 @@
-class Fiber
-{
-
+
+
+
+
-
-
@@ -2378 +2400 @@
-        }
-    }
-
-
-private:
@@ -2508 +2529 @@
-        else version( Posix )
-        {
+            // Mik: mmap does not work on OS X.
-        version( darwin )
-        {
-
+
+
+
+
+
+
+
+
+
+
-        }
-        else
@@ -2520 +2551 @@
-                               0,
-                               0 );
-    }
-
-if( m_pmem == MAP_FAILED )
-{
-m_pmem = null
- throw new FiberException( "Unable to allocate memory for stack" );
+
+
+   {
+       m_pmem = null;
+   throw new FiberException( "Unable to allocate memory for stack" )
+}
-            }
-
@@ -2565 +2596 @@
-    else version( darwin )
-    {
-       
+            
-    }
-        else version( Posix )
@@ -2587 +2618 @@
-        void* pstack = m_ctxt.tstack;
-        scope( exit )  m_ctxt.tstack = pstack;
+
+        // Mik: On OS X the stack must be 16-byte aligned according to the
+        // IA-32 call spec.
+        version( darwin )
+        {
+             pstack = cast(void*)(cast(uint)(pstack) - (cast(uint)(pstack) & 0x0F));
+        }
-
-        void push( size_t val )
@@ -2636 +2674 @@
-            push( 0x00000000 );                                     // EDI
-        }
-   // Mik: Context does not have to store as much, since GDC uses the  // simpler C calling convention
+        // Mik:  The same asm should work on all GDC-posix x86 targets
-        else version( AsmX86_Posix_GDC )
-        {
-            push( cast(size_t) &fiber_entryPoint );             // EIP
-            push( 0x00000000 );                                 // EBP
+        push( 0x00000000 );                                 // ESI
+            push( 0x00000000 );                                 // EDI
+            push( 0x00000000 );                                 // EBX
+            push( 0x00000000 );                                 // EAX
+        }
+        // Mik: Posix support for PowerPC architecture
+    else version( AsmPPC_Posix_GDC )
+        {
+            version( StackGrowsDown )
+            {
+                pstack -= int.sizeof * 5;
+            }
+            else
+            {
+                pstack += int.sizeof * 5;
+            }
+
+            push( cast(size_t) &fiber_entryPoint );             // Link register
+            push( 0x00000000 );                                 // Control register
+            push( 0x00000000 );                                 // Old stack pointer
+
+            //GPR values
+            version( StackGrowsDown )
+            {
+                pstack -= int.sizeof * 20;
+            }
+            else
+            {
+                pstack += int.sizeof * 20;
+            }
+
+            assert(cast(uint)pstack & 0x0f == 0);
-        }
-        else version( JmpX86_Posix )
@@ -2735 +2805 @@
-        tobj.pushContext( &m_ctxt );
-
-*
+
-
-        // NOTE: As above, these operations must be performed in a strict order
@@ -2768 +2838 @@
-        volatile tobj.m_lock = true;
-
-*
+
-
-        // NOTE: As above, these operations must be performed in a strict order
@@ -2782 +2852 @@
-    // data will also be saved.
-    //
-inout void
+void*
-    {
-        // NOTE: The data pushed and popped in this routine must match the
@@ -2868 +2938 @@
-                push EBP;
-                mov  EBP, ESP;
+        push ESI;
+        push EDI;
+        push EBX;
+        push EAX;
-                
-                // Swap stack pointers
@@ -2875 +2949 @@
-
-                // Load old frame pointer
+        pop EAX;
+        pop EBX;
+        pop EDI;
+        pop ESI;
-                pop EBP;
-
@@ -2881 +2959 @@
-            }
-        }
+        else version( AsmPPC_Posix_GDC)
+        {
+            doSwitchASM(oldp, newp);
+        }
-        else version( JmpX86_Posix )
-        {
-            sigjmp_buf buf = void;
-
+*
-            // Basically, oldp will be the address of the current sigjmp_buf
-            // and newp will be the address of the new sigjmp_buf. This means
-            // that tstack will effectively point to a sigjmp_buf if the
-            // context has been swapped out via this Fiber code.
-
+*
-                siglongjmp( *(cast(sigjmp_buf*) newp), 1 );
-        }
-    }
-}
+
+