Changeset 755:61c7a96f28c3

Timestamp:

11/08/08 05:34:35 (2 months ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Merge in most of x86-64 tango patch.

Files:

• runtime/ldc.diff (modified) (16 diffs)

runtime/ldc.diff

@@ -97 +97 @@
- 
-         extern (C) void thread_suspendHandler( int sig )
-29
+50
-         }
-         body
@@ -118 +118 @@
-+                    }
-+                }
++                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
-+                {
@@ -128 +149 @@
-                 {
-                     pushad;
-20
+41
-                 status = sigdelset( &sigres, SIGUSR2 );
-                 assert( status == 0 );
@@ -137 +158 @@
- 
-                 sigsuspend( &sigres );
-31
+52
-                 }
-             }
@@ -151 +172 @@
-                 {
-                     popad;
-10
+31
-         status = sigaction( SIGUSR2, &sigusr2, null );
-         assert( status == 0 );
@@ -168 +189 @@
-         status = pthread_key_create( &Thread.sm_this, null );
-         assert( status == 0 );
-25
+46
-                 //       to simply loop on sem_wait at the end, but I'm not
-                 //       convinced that this would be much faster than the
@@ -177 +198 @@
-             else if( !t.m_lock )
-             {
-6 +2330,13
+7 +2351,20
-             version = AsmPPC_Posix;
-     }
@@ -188 +209 @@
-+            version = LLVM_AsmX86_Posix;
-+    }
-
+
+
+
+
+
+
+
-     version( Posix )
-     {
-
+
+
-         version( AsmX86_Win32 ) {} else
-         version( AsmX86_Posix ) {} else
@@ -197 +225 @@
-+        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
-             //       data definitions to operate so testing for it must be done
-59
+88
-             import tango.stdc.posix.ucontext;
-         }
@@ -213 +243 @@
- static this()
- {
-389
+418
-     }
- }
@@ -222 +252 @@
- // Fiber Entry Point and Context Switch
- ////////////////////////////////////////////////////////////////////////////////
-03,22
+32,28
-                 ret;
-             }
@@ -242 +272 @@
-+            }
-+        }
++/+
++        version( LLVM_AsmX86_64_Posix )
++        {
++            //TODO: Fiber implementation here
++        }
+++/
-         else static if( is( ucontext_t ) )
-         {
-             Fiber   cfib = Fiber.getThis();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-             push( 0x00000000 );                                     // ESI
-             push( 0x00000000 );                                     // EDI
@@ -259 +325 @@
-+            push( 0x00000000 );                                     // EDI
-+        }
++//TODO: Implement x86-64 fibers
++/+
++        else version( LLVM_AsmX86_Posix )
++        {
++        }
+++/
-         else version( AsmPPC_Posix )
-         {
@@ -294 +366 @@
-     extern (C) void* rt_stackTop();
- 
-28
+49
-             __builtin_unwind_init();
-             sp = & sp;
@@ -315 +387 @@
-+                }
-+            }
++            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
-+            {
@@ -323 +416 @@
-         {
-         asm
-13
+34
-         {
-             // nothing to do