Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-29 22:18:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NMIDEBUG]

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/drivers/base/CMakeLists.txt
View file

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

4
reactos/drivers/base/nmidebug/nmidebug.c
View file

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