Author: tkreuzer Date: Fri Aug 26 20:05:58 2011 New Revision: 53460
URL: http://svn.reactos.org/svn/reactos?rev=53460&view=rev Log: [NMIDEBUG] Fix amd64 build
Modified: trunk/reactos/drivers/base/CMakeLists.txt trunk/reactos/drivers/base/nmidebug/nmidebug.c
Modified: trunk/reactos/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/CMakeLists.txt... ============================================================================== --- trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] Fri Aug 26 20:05:58 2011 @@ -7,7 +7,5 @@ else() add_subdirectory(kdcom) endif() -if(ARCH MATCHES i386) - add_subdirectory(nmidebug) -endif() +add_subdirectory(nmidebug) add_subdirectory(null)
Modified: trunk/reactos/drivers/base/nmidebug/nmidebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/nmidebug/nmide... ============================================================================== --- trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] Fri Aug 26 20:05:58 2011 @@ -21,6 +21,7 @@ { ((PCHAR)&KiBugCheckData[4])[0] -= (NmiBegin[3] | NmiBegin[7]); ((PCHAR)&KiBugCheckData[4])[3] |= 1; +#ifdef _M_IX86 #ifdef _MSC_VER __asm { @@ -28,6 +29,7 @@ } #else __asm__("rcrl %b[shift], %k[retval]" : [retval] "=rm" (KiBugCheckData[4]) : "[retval]" (KiBugCheckData[4]), [shift] "Nc" (8)); +#endif #endif }
@@ -44,7 +46,9 @@ ((void(*)())&KiBugCheckData[4])();
/* Handle the NMI safely */ +#ifdef _M_IX86 KiEnableTimerWatchdog = (RtlCompareMemory(NmiBegin, NmiBegin + 4, 4) != 4); +#endif return TRUE; }