{KERNEL32]

- move BaseFiberStartup to fiber.S
- add FPO debug info for MSVC builds
- remove excessive END directives (fixes msvc build)
- add a stub for amd64

svn path=/trunk/; revision=52810

reactos/dll/win32/kernel32/client/amd64/fiber.S

@@ -1,19 +1,27 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS system libraries
- * FILE:        lib/kernel32/thread/i386/fiber.S
- * PURPOSE:     Fiber context switch code for the x86 architecture
- * PROGRAMMERS: Alex Ionescu (alex@relsoft.net)
- *              KJK::Hyperion <noog@libero.it>
+ * FILE:        dll/win32//kernel32/client/amd64/fiber.S
+ * PURPOSE:     Fiber context switch code for the amd64 architecture
+ * PROGRAMMER:
  */
 
 #include <asm.inc>
 
+PUBLIC BaseFiberStartup
+.PROC BaseFiberStartup
+    UNIMPLEMENTED BaseFiberStartup
+    /* FIXME: TODO */
+    ret
+
+.ENDP BaseFiberStartup
+
 
 PUBLIC SwitchToFiber
 
 SwitchToFiber:
+    UNIMPLEMENTED BaseFiberStartup
     /* FIXME: TODO */
-    ret 4
+    ret
 
 END

reactos/dll/win32/kernel32/client/i386/fiber.S

@@ -10,8 +10,24 @@
 #include <asm.inc>
 #include <ks386.inc>
 
+EXTERN _BaseThreadStartup@8:PROC
+
 .code
 
+PUBLIC _BaseFiberStartup@0
+.PROC BaseFiberStartup@0
+    /* Frame pointer is zeroed */
+    FPO 0, 0, 0, 0, 0, FRAME_FPO
+
+    /* Get the fiber data */
+    mov eax, fs:[TEB_FIBER_DATA]
+
+    push dword ptr [eax+FIBER_CONTEXT_EBX] /* Parameter */
+    push dword ptr [eax+FIBER_CONTEXT_EAX] /* Start Address */
+    call _BaseThreadStartup@8
+.ENDP BaseFiberStartup@0
+
+
 PUBLIC _SwitchToFiber@4
 _SwitchToFiber@4:
     /* Get the TEB */

reactos/dll/win32/kernel32/client/i386/thread.S

@@ -24,7 +24,7 @@ _BaseThreadStartupThunk@0:
     push eax                  /* lpStartAddress */
     push 0                    /* Return EIP */
     jmp _BaseThreadStartup@8
-END
+
 
 PUBLIC _BaseProcessStartThunk@0
 _BaseProcessStartThunk@0:
@@ -35,16 +35,7 @@ _BaseProcessStartThunk@0:
     push 0                    /* Return EIP */
     jmp _BaseProcessStartup@4
 
-END
 
-PUBLIC _BaseFiberStartup@0
-_BaseFiberStartup@0:
-    /* Get the fiber data */
-    mov eax, fs:[TEB_FIBER_DATA]
-
-    push dword ptr [eax+FIBER_CONTEXT_EBX] /* Parameter */
-    push dword ptr [eax+FIBER_CONTEXT_EAX] /* Start Address */
-    call _BaseThreadStartup@8
 END
 
 /* EOF */