Author: ion
Date: Fri Aug 25 08:11:45 2006
New Revision: 23701
URL:
http://svn.reactos.org/svn/reactos?rev=23701&view=rev
Log:
- Add some debugging code to see why trap frames are screwed up.
Modified:
trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S
trunk/reactos/ntoskrnl/ke/i386/trap.s
Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original)
+++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Fri Aug 25 08:11:45 2006
@@ -570,7 +570,7 @@
5:
#ifdef DBG
sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00
- //jnz 0f // FIXME: ROS IS BROKEN
+ jnz 0f
/* Assert FS */
mov bx, fs
@@ -752,12 +752,26 @@
jmp 3b
.endif
+#if DBG
0:
+#if 0
+ /* Print a message */
+ mov esi, [esp+KTRAP_FRAME_DEBUGARGMARK]
+ mov edi, [esp+KTRAP_FRAME_DEBUGARGMARK-4]
+ push edi
+ push esi
+ push offset Broken
+ call _DbgPrint
+ add esp, 12
+#endif
+ jmp 2b // ros hack
+
/* Fix up the mask */
add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00
6:
int 3
jmp 5b
+#endif
2:
/* Check if this was V86 mode */
Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/trap.s (original)
+++ trunk/reactos/ntoskrnl/ke/i386/trap.s Fri Aug 25 08:11:45 2006
@@ -84,6 +84,9 @@
_UnexpectedMsg:
.asciz "\n\x7\x7!!! Unexpected Interrupt %02lx !!!\n"
+Broken:
+ .asciz "\n\x7\x7!!! Broken TrapFrame. Magic: %08lx MagicB: %08lx!!!\n"
+
/* SOFTWARE INTERRUPT SERVICES ***********************************************/
_KiGetTickCount: