From 8bc82e23e6a50abdc88a702c14486aed88cb4cad Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 20 Aug 2011 15:53:56 +0000
Subject: [PATCH] [PSDK] Simplify definition for YieldProcessor and add
 DbgRaiseAssertion for amd64 in winnt.h [ASM] Fix some stuff for amd64

svn path=/trunk/; revision=53340
---
 reactos/include/asm/asm.inc     |  6 ++++++
 reactos/include/psdk/winnt.h    | 19 ++-----------------
 reactos/include/reactos/asm.inc | 10 ++++++++++
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/reactos/include/asm/asm.inc b/reactos/include/asm/asm.inc
index 17c57c30df4..d900634089a 100644
--- a/reactos/include/asm/asm.inc
+++ b/reactos/include/asm/asm.inc
@@ -197,16 +197,22 @@ ENDM
 /* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */
 .macro .PROC name
     .func \name
+#ifdef _X86_
     _\name:
+#else
+    \name:
+#endif
     .cfi_startproc
     .equ cfa_current_offset, -8
 .endm
+#define FUNC .PROC
 
 /* ... and .ENDP, replacing ENDP */
 .macro .ENDP name
     .cfi_endproc
     .endfunc
 .endm
+#define ENDFUNC .ENDP
 
 /* MASM compatible PUBLIC */
 .macro PUBLIC symbol
diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h
index 25ff67708ec..10e82d04e1a 100644
--- a/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@@ -3318,7 +3318,7 @@ typedef struct _QUOTA_LIMITS {
   SIZE_T PagefileLimit;
   LARGE_INTEGER TimeLimit;
 } QUOTA_LIMITS,*PQUOTA_LIMITS;
-    
+
 typedef struct _QUOTA_LIMITS_EX {
   SIZE_T PagedPoolLimit;
   SIZE_T NonPagedPoolLimit;
@@ -5265,17 +5265,9 @@ MemoryBarrier(VOID)
 #error Unknown architecture
 #endif
 
-#if defined(_M_IX86)
+#if defined(_M_IX86) || defined(_M_AMD64)
 
-#ifdef _MSC_VER
-#pragma intrinsic(__int2c)
-#pragma intrinsic(_mm_pause)
 #define YieldProcessor _mm_pause
-#else
-#define YieldProcessor() __asm__ __volatile__("pause");
-#define __int2c() __asm__ __volatile__("int $0x2c");
-#endif
-
 
 FORCEINLINE
 VOID
@@ -5284,13 +5276,6 @@ DbgRaiseAssertionFailure(VOID)
     __int2c();
 }
 
-#elif defined (_M_AMD64)
-#ifdef _MSC_VER
-#pragma intrinsic(_mm_pause)
-#define YieldProcessor _mm_pause
-#else
-#define YieldProcessor() __asm__ __volatile__("pause");
-#endif
 #elif defined(_M_PPC)
 #define YieldProcessor() __asm__ __volatile__("nop");
 #elif defined(_M_MIPS)
diff --git a/reactos/include/reactos/asm.inc b/reactos/include/reactos/asm.inc
index a99ecfb7074..5267889cad5 100644
--- a/reactos/include/reactos/asm.inc
+++ b/reactos/include/reactos/asm.inc
@@ -149,16 +149,22 @@ ENDM
 /* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */
 .macro .PROC name
     .func \name
+#ifdef _X86_
     _\name:
+#else
+    \name:
+#endif
     .cfi_startproc
     .equ cfa_current_offset, -8
 .endm
+#define FUNC .PROC
 
 /* ... and .ENDP, replacing ENDP */
 .macro .ENDP name
     .cfi_endproc
     .endfunc
 .endm
+#define ENDFUNC .ENDP
 
 /* MASM compatible PUBLIC */
 .macro PUBLIC symbol
@@ -269,6 +275,10 @@ code = 1
 #define else .else
 #define elseif .elseif
 
+#define CR "\r"
+#define LF "\n"
+#define NUL "\0"
+
 #endif
 
 /* Common definitions for FPO macro