[NMIDEBUG]

Fix amd64 build

svn path=/trunk/; revision=53460
This commit is contained in:
Timo Kreuzer 2011-08-26 20:05:58 +00:00
parent 57b7866842
commit cb83086870
2 changed files with 5 additions and 3 deletions

View file

@ -7,7 +7,5 @@ add_subdirectory(kddll)
else()
add_subdirectory(kdcom)
endif()
if(ARCH MATCHES i386)
add_subdirectory(nmidebug)
endif()
add_subdirectory(nmidebug)
add_subdirectory(null)

View file

@ -21,6 +21,7 @@ NmiClearFlag(VOID)
{
((PCHAR)&KiBugCheckData[4])[0] -= (NmiBegin[3] | NmiBegin[7]);
((PCHAR)&KiBugCheckData[4])[3] |= 1;
#ifdef _M_IX86
#ifdef _MSC_VER
__asm
{
@ -29,6 +30,7 @@ NmiClearFlag(VOID)
#else
__asm__("rcrl %b[shift], %k[retval]" : [retval] "=rm" (KiBugCheckData[4]) : "[retval]" (KiBugCheckData[4]), [shift] "Nc" (8));
#endif
#endif
}
BOOLEAN
@ -44,7 +46,9 @@ NmiDbgCallback(IN PVOID Context,
((void(*)())&KiBugCheckData[4])();
/* Handle the NMI safely */
#ifdef _M_IX86
KiEnableTimerWatchdog = (RtlCompareMemory(NmiBegin, NmiBegin + 4, 4) != 4);
#endif
return TRUE;
}