Author: tkreuzer
Date: Sat Aug 20 15:53:56 2011
New Revision: 53340
URL: http://svn.reactos.org/svn/reactos?rev=53340&view=rev
Log:
[PSDK] Simplify definition for YieldProcessor and add DbgRaiseAssertion for
amd64 in winnt.h
[ASM] Fix some stuff for amd64
Modified:
trunk/reactos/include/asm/asm.inc
trunk/reactos/include/psdk/winnt.h
trunk/reactos/include/reactos/asm.inc
Modified: trunk/reactos/include/asm/asm.inc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=53340&r1=53339&r2=53340&view=diff
==============================================================================
--- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original)
+++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Sat Aug 20 15:53:56 2011
@@ -197,16 +197,22 @@
/* 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
Modified: trunk/reactos/include/psdk/winnt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=53340&r1=53339&r2=53340&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Aug 20 15:53:56 2011
@@ -3318,7 +3318,7 @@
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 @@
#error Unknown architecture
#endif
-#if defined(_M_IX86)
-
-#ifdef _MSC_VER
-#pragma intrinsic(__int2c)
-#pragma intrinsic(_mm_pause)
+#if defined(_M_IX86) || defined(_M_AMD64)
+
#define YieldProcessor _mm_pause
-#else
-#define YieldProcessor() __asm__ __volatile__("pause");
-#define __int2c() __asm__ __volatile__("int $0x2c");
-#endif
-
FORCEINLINE
VOID
@@ -5284,13 +5276,6 @@
__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)
Modified: trunk/reactos/include/reactos/asm.inc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.inc?rev=53340&r1=53339&r2=53340&view=diff
==============================================================================
--- trunk/reactos/include/reactos/asm.inc [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/asm.inc [iso-8859-1] Sat Aug 20 15:53:56 2011
@@ -149,16 +149,22 @@
/* 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 @@
#define else .else
#define elseif .elseif
+#define CR "\r"
+#define LF "\n"
+#define NUL "\0"
+
#endif
/* Common definitions for FPO macro
