Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 49580: [win32k] - Simplify co_IntPeekMessage even more
by gadamopoulos＠svn.reactos.org 14 Nov '10

14 Nov '10

Author: gadamopoulos Date: Sun Nov 14 09:01:17 2010 New Revision: 49580 URL: http://svn.reactos.org/svn/reactos?rev=49580&view=rev Log: [win32k] - Simplify co_IntPeekMessage even more Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/win32kp.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sun Nov 14 09:01:17 2010 @@ -127,7 +127,7 @@ IN PWND Window, IN UINT MsgFilterLow, IN UINT MsgFilterHigh, - OUT PUSER_MESSAGE* Message); + OUT PMSG Message); BOOLEAN FASTCALL MsqInitializeMessageQueue(struct _ETHREAD *Thread, PUSER_MESSAGE_QUEUE MessageQueue); VOID FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sun Nov 14 09:01:17 2010 @@ -11,8 +11,12 @@ #pragma once #define INTERNAL_CALL APIENTRY +#ifndef _MSC_VER #define PLACE_IN_SECTION(s) __attribute__((section(s))) #define INIT_FUNCTION PLACE_IN_SECTION("INIT") +#else +#define INIT_FUNCTION +#endif /* Internal Win32k Headers */ #include <include/accelerator.h> Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Nov 14 09:01:17 2010 @@ -887,7 +887,7 @@ * Internal version of PeekMessage() doing all the work */ BOOL FASTCALL -co_IntPeekMessage( PUSER_MESSAGE Msg, +co_IntPeekMessage( PMSG Msg, PWND Window, UINT MsgFilterMin, UINT MsgFilterMax, @@ -896,7 +896,6 @@ PTHREADINFO pti; LARGE_INTEGER LargeTickCount; PUSER_MESSAGE_QUEUE ThreadQueue; - PUSER_MESSAGE Message; BOOL RemoveMessages; pti = PsGetCurrentThreadWin32Thread(); @@ -920,10 +919,10 @@ { /* According to the PSDK, WM_QUIT messages are always returned, regardless of the filter specified */ - Msg->Msg.hwnd = NULL; - Msg->Msg.message = WM_QUIT; - Msg->Msg.wParam = ThreadQueue->QuitExitCode; - Msg->Msg.lParam = 0; + Msg->hwnd = NULL; + Msg->message = WM_QUIT; + Msg->wParam = ThreadQueue->QuitExitCode; + Msg->lParam = 0; if (RemoveMessages) { ThreadQueue->QuitPosted = FALSE; @@ -939,14 +938,9 @@ Window, MsgFilterMin, MsgFilterMax, - &Message )) - { - RtlCopyMemory(Msg, Message, sizeof(USER_MESSAGE)); - if (RemoveMessages) - { - MsqDestroyMessage(Message); - } - break; + Msg )) + { + return TRUE; } /* Check for hardware events. */ @@ -956,18 +950,13 @@ Window, MsgFilterMin, MsgFilterMax, - &Message )) - { - RtlCopyMemory(Msg, Message, sizeof(USER_MESSAGE)); - if (RemoveMessages) - { - MsqDestroyMessage(Message); - } - - if(!ProcessHardwareMessage(&Msg->Msg, RemoveMessages)) + Msg )) + { + + if(!ProcessHardwareMessage(Msg, RemoveMessages)) continue; - break; + return TRUE; } /* Check for sent messages again. */ @@ -979,10 +968,10 @@ MsgFilterMin, MsgFilterMax, pti, - &Msg->Msg, + Msg, RemoveMessages)) { - break; + return TRUE; } if (PostTimerMessages(Window)) @@ -1099,7 +1088,7 @@ PTHREADINFO pti; PUSER_MESSAGE_QUEUE ThreadQueue; NTSTATUS Status = STATUS_SUCCESS; - USER_MESSAGE Msg; + MSG Msg; pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; @@ -1142,7 +1131,6 @@ BOOL bGMSG ) { PWND Window; - USER_MESSAGE Msg; BOOL Present = FALSE; if ( hWnd == HWND_TOPMOST || hWnd == HWND_BROADCAST ) @@ -1170,19 +1158,15 @@ MsgFilterMax = 0; } - RtlZeroMemory(&Msg, sizeof(USER_MESSAGE)); - do { - Present = co_IntPeekMessage( &Msg, + Present = co_IntPeekMessage( pMsg, Window, MsgFilterMin, MsgFilterMax, RemoveMsg ); if (Present) { - RtlCopyMemory( pMsg, &Msg.Msg, sizeof(MSG)); - // The WH_GETMESSAGE hook enables an application to monitor messages about to // be returned by the GetMessage or PeekMessage function. @@ -2764,7 +2748,7 @@ case STATUS_WAIT_2: { - USER_MESSAGE Msg; + MSG Msg; co_IntPeekMessage( &Msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); DPRINT1("WFII: WAIT 2\n"); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Nov 14 09:01:17 2010 @@ -535,7 +535,7 @@ BOOL APIENTRY co_MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, PWND Window, UINT FilterLow, UINT FilterHigh, BOOL Remove, - PUSER_MESSAGE* Message) + PMSG Message) { KIRQL OldIrql; POINT ScreenPoint; @@ -587,14 +587,15 @@ DesktopWindow, &ScreenPoint, FALSE, &CurrentEntry); if (Accept) { + *Message = Current->Msg; if (Remove) { RemoveEntryList(&Current->ListEntry); + MsqDestroyMessage(Current); } IntUnLockHardwareMessageQueue(MessageQueue); IntUnLockSystemHardwareMessageQueueLock(FALSE); - *Message = Current; - + if (Desk) Desk->LastInputWasKbd = FALSE; @@ -604,13 +605,14 @@ } else { + *Message = Current->Msg; if (Remove) { RemoveEntryList(&Current->ListEntry); + MsqDestroyMessage(Current); } IntUnLockHardwareMessageQueue(MessageQueue); IntUnLockSystemHardwareMessageQueueLock(FALSE); - *Message = Current; RETURN(TRUE); } @@ -693,7 +695,12 @@ IntUnLockHardwareMessageQueue(MessageQueue); } IntUnLockSystemHardwareMessageQueueLock(FALSE); - *Message = Current; + *Message = Current->Msg; + + if (Remove) + { + MsqDestroyMessage(Current); + } RETURN(TRUE); } @@ -1325,7 +1332,7 @@ IN PWND Window, IN UINT MsgFilterLow, IN UINT MsgFilterHigh, - OUT PUSER_MESSAGE* Message) + OUT PMSG Message) { PLIST_ENTRY CurrentEntry; PUSER_MESSAGE CurrentMessage; @@ -1359,7 +1366,13 @@ RemoveEntryList(&CurrentMessage->ListEntry); } - *Message = CurrentMessage; + *Message= CurrentMessage->Msg; + + if (Remove) + { + MsqDestroyMessage(CurrentMessage); + } + return(TRUE); } CurrentEntry = CurrentEntry->Flink;

1 0

[jimtabor] 49579: [Win32k] - Fixed WaitForInputIdle, finally!, passed all the wine tests for it. - Moved Get/Peek message to the new all in one support routine. - Foreground hook hits one out of fi...
by jimtabor＠svn.reactos.org 14 Nov '10

14 Nov '10

Author: jimtabor Date: Sun Nov 14 00:27:38 2010 New Revision: 49579 URL: http://svn.reactos.org/svn/reactos?rev=49579&view=rev Log: [Win32k] - Fixed WaitForInputIdle, finally!, passed all the wine tests for it. - Moved Get/Peek message to the new all in one support routine. - Foreground hook hits one out of five, this needs more research. - Attempted to workout synchronizing issues with low level and regular hooks. Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sun Nov 14 00:27:38 2010 @@ -103,6 +103,8 @@ ExInitializeFastMutex(&Win32Process->DriverObjListLock); Win32Process->KeyboardLayout = W32kGetDefaultKeyLayout(); + EngCreateEvent((PEVENT *)&Win32Process->InputIdleEvent); + KeInitializeEvent(Win32Process->InputIdleEvent, NotificationEvent, FALSE); if(Process->Peb != NULL) { @@ -118,6 +120,13 @@ else { DPRINT("Destroying W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); + Win32Process->W32PF_flags |= W32PF_TERMINATED; + if (Win32Process->InputIdleEvent) + { + EngFreeMem((PVOID)Win32Process->InputIdleEvent); + Win32Process->InputIdleEvent = NULL; + } + IntCleanupMenus(Process, Win32Process); IntCleanupCurIcons(Process, Win32Process); CleanupMonitorImpl(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Nov 14 00:27:38 2010 @@ -14,6 +14,8 @@ #define NDEBUG #include <debug.h> + +BOOLEAN NTAPI PsGetProcessExitProcessCalled(PEPROCESS Process); #define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE) @@ -323,6 +325,52 @@ return STATUS_INVALID_PARAMETER; } +// +// Wakeup any thread/process waiting on idle input. +// +VOID FASTCALL +IdlePing(VOID) +{ + PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); + PUSER_MESSAGE_QUEUE ForegroundQueue; + PTHREADINFO pti, ptiForeground = NULL; + + ForegroundQueue = IntGetFocusMessageQueue(); + + if (ForegroundQueue) + ptiForeground = ForegroundQueue->Thread->Tcb.Win32Thread; + + pti = PsGetCurrentThreadWin32Thread(); + + if ( pti && pti->pDeskInfo && pti == ptiForeground ) + { + if ( pti->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE) || + pti->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE) ) + { + co_HOOK_CallHooks(WH_FOREGROUNDIDLE,HC_ACTION,0,0); + } + } + + DPRINT("IdlePing ppi 0x%x\n",ppi); + if ( ppi && ppi->InputIdleEvent ) + { + DPRINT("InputIdleEvent\n"); + KeSetEvent( ppi->InputIdleEvent, IO_NO_INCREMENT, FALSE); + } +} + +VOID FASTCALL +IdlePong(VOID) +{ + PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); + + DPRINT("IdlePong ppi 0x%x\n",ppi); + if ( ppi && ppi->InputIdleEvent ) + { + KeClearEvent(ppi->InputIdleEvent); + } +} + static VOID FASTCALL IntCallWndProc( PWND Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { @@ -856,6 +904,8 @@ RemoveMessages = RemoveMsg & PM_REMOVE; + IdlePong(); + do { KeQueryTickCount(&LargeTickCount); @@ -944,10 +994,6 @@ } while (TRUE); - // The WH_GETMESSAGE hook enables an application to monitor messages about to - // be returned by the GetMessage or PeekMessage function. - - co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg->Msg); return TRUE; } @@ -1068,6 +1114,7 @@ { return TRUE; } + /* Nothing found. Wait for new messages. */ Status = co_MsqWaitForNewMessages( ThreadQueue, Window, @@ -1094,9 +1141,9 @@ UINT RemoveMsg, BOOL bGMSG ) { - BOOL Present; PWND Window; USER_MESSAGE Msg; + BOOL Present = FALSE; if ( hWnd == HWND_TOPMOST || hWnd == HWND_BROADCAST ) hWnd = HWND_BOTTOM; @@ -1122,6 +1169,8 @@ MsgFilterMin = 0; MsgFilterMax = 0; } + + RtlZeroMemory(&Msg, sizeof(USER_MESSAGE)); do { @@ -1132,33 +1181,40 @@ RemoveMsg ); if (Present) { - RtlCopyMemory( pMsg, &Msg.Msg, sizeof(MSG)); - - if (bGMSG) - return (WM_QUIT != pMsg->message); - else - return TRUE; - } - - if ( bGMSG && !co_IntWaitMessage(Window, MsgFilterMin, MsgFilterMax) ) - { - return -1; + RtlCopyMemory( pMsg, &Msg.Msg, sizeof(MSG)); + + // The WH_GETMESSAGE hook enables an application to monitor messages about to + // be returned by the GetMessage or PeekMessage function. + + co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)pMsg); + + if ( bGMSG ) + return (WM_QUIT != pMsg->message); + } + + if ( bGMSG ) + { + if ( !co_IntWaitMessage(Window, MsgFilterMin, MsgFilterMax) ) + return -1; } else { - if (!(RemoveMsg & PM_NOYIELD)) - { - // Yield this thread! - UserLeave(); - ZwYieldExecution(); - UserEnterExclusive(); - // Fall through to fail. - } + if (!(RemoveMsg & PM_NOYIELD)) + { + IdlePing(); + // Yield this thread! + UserLeave(); + ZwYieldExecution(); + UserEnterExclusive(); + // Fall through to exit. + IdlePong(); + } + break; } } while( bGMSG && !Present ); - return FALSE; + return Present; } BOOL FASTCALL @@ -2049,49 +2105,30 @@ * retrieved. */ { - BOOL GotMessage; NTUSERGETMESSAGEINFO Info; NTSTATUS Status; /* FIXME: if initialization is removed, gcc complains that this may be used before initialization. Please review */ - PWND Window = NULL; PMSGMEMORY MsgMemoryEntry; PVOID UserMem; ULONG Size; - USER_MESSAGE Msg; - - DPRINT("Enter NtUserGetMessage\n"); + MSG Msg; + BOOL GotMessage; + + if ( (MsgFilterMin|MsgFilterMax) & ~WM_MAXIMUM ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + UserEnterExclusive(); - /* Validate input */ - if (hWnd && !(Window = UserGetWindowObject(hWnd))) - { - UserLeave(); - return -1; - } - - // if (Window) UserRefObjectCo(Window, &Ref); - - if (MsgFilterMax < MsgFilterMin) - { - MsgFilterMin = 0; - MsgFilterMax = 0; - } - - do - { - GotMessage = co_IntPeekMessage(&Msg, Window, MsgFilterMin, MsgFilterMax, PM_REMOVE); - - if (!GotMessage && !co_IntWaitMessage(Window, MsgFilterMin, MsgFilterMax)) - { - UserLeave(); - return -1; - } - } - while (! GotMessage); + RtlZeroMemory(&Msg, sizeof(MSG)); + + GotMessage = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, PM_REMOVE, TRUE); UserLeave(); - Info.Msg = Msg.Msg; + Info.Msg = Msg; //.Msg; /* See if this message type is present in the table */ MsgMemoryEntry = FindMsgMemory(Info.Msg.message); @@ -2103,7 +2140,7 @@ if (NULL == MsgMemoryEntry) { /* Not present, no copying needed */ - Info.LParamSize = 0; + UnsafeInfo->LParamSize = 0; } else { @@ -2127,8 +2164,8 @@ ProbeForWrite(UserMem, Size, 1); RtlCopyMemory(UserMem, (PVOID)Info.Msg.lParam, Size); - Info.LParamSize = Size; - Info.Msg.lParam = (LPARAM) UserMem; + UnsafeInfo->LParamSize = Size; + UnsafeInfo->Msg.lParam = (LPARAM) UserMem; } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -2144,7 +2181,7 @@ } _SEH2_END; - return (Info.Msg.message != WM_QUIT ); + return GotMessage; } @@ -2163,9 +2200,9 @@ return FALSE; } + UserEnterExclusive(); + RtlZeroMemory(&Msg, sizeof(MSG)); - - UserEnterExclusive(); Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, PM_REMOVE, TRUE); @@ -2197,46 +2234,30 @@ UINT RemoveMsg) { NTSTATUS Status; - BOOL Ret; NTUSERGETMESSAGEINFO Info; - PWND Window; PMSGMEMORY MsgMemoryEntry; PVOID UserMem = NULL; ULONG Size; - USER_MESSAGE Msg; + MSG Msg; + BOOL Ret; + + if ( RemoveMsg & PM_BADMSGFLAGS ) + { + SetLastWin32Error(ERROR_INVALID_FLAGS); + return FALSE; + } UserEnterExclusive(); - if (hWnd == (HWND)-1 || hWnd == (HWND)0x0000FFFF || hWnd == (HWND)0xFFFFFFFF) - hWnd = (HWND)1; - - /* Validate input */ - if (hWnd && hWnd != (HWND)1) - { - if (!(Window = UserGetWindowObject(hWnd))) - { - UserLeave(); - return -1; - } - } - else - { - Window = (PWND)hWnd; - } - - if (MsgFilterMax < MsgFilterMin) - { - MsgFilterMin = 0; - MsgFilterMax = 0; - } - - Ret = co_IntPeekMessage(&Msg, Window, MsgFilterMin, MsgFilterMax, RemoveMsg); + RtlZeroMemory(&Msg, sizeof(MSG)); + + Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg, FALSE); UserLeave(); if (Ret) { - Info.Msg = Msg.Msg; + Info.Msg = Msg; /* See if this message type is present in the table */ MsgMemoryEntry = FindMsgMemory(Info.Msg.message); @@ -2248,7 +2269,7 @@ if (NULL == MsgMemoryEntry) { /* Not present, no copying needed */ - Info.LParamSize = 0; + UnsafeInfo->LParamSize = 0; } else { @@ -2272,8 +2293,8 @@ ProbeForWrite(UserMem, Size, 1); RtlCopyMemory(UserMem, (PVOID)Info.Msg.lParam, Size); - Info.LParamSize = Size; - Info.Msg.lParam = (LPARAM) UserMem; + UnsafeInfo->LParamSize = Size; + UnsafeInfo->Msg.lParam = (LPARAM) UserMem; } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -2308,9 +2329,9 @@ return FALSE; } + UserEnterExclusive(); + RtlZeroMemory(&Msg, sizeof(MSG)); - - UserEnterExclusive(); Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg, FALSE); @@ -2665,10 +2686,10 @@ { PEPROCESS Process; PPROCESSINFO W32Process; + PTHREADINFO pti; NTSTATUS Status; - HANDLE Handles[2]; + HANDLE Handles[3]; LARGE_INTEGER Timeout; - ULONGLONG StartTime, Run, Elapsed = 0; UserEnterExclusive(); @@ -2686,8 +2707,13 @@ return WAIT_FAILED; } + pti = PsGetCurrentThreadWin32Thread(); + W32Process = (PPROCESSINFO)Process->Win32Process; - if (!W32Process) + + if ( PsGetProcessExitProcessCalled(Process) || + !W32Process || + pti->ppi == W32Process) { ObDereferenceObject(Process); UserLeave(); @@ -2695,10 +2721,9 @@ return WAIT_FAILED; } - EngCreateEvent((PEVENT *)&W32Process->InputIdleEvent); - Handles[0] = Process; Handles[1] = W32Process->InputIdleEvent; + Handles[2] = pti->MessageQueue->NewMessages; // pEventQueueServer; IntMsqSetWakeMask returns hEventQueueClient if (!Handles[1]) { @@ -2707,16 +2732,15 @@ return STATUS_SUCCESS; /* no event to wait on */ } - StartTime = EngGetTickCount(); - - Run = dwMilliseconds; - + if (dwMilliseconds != INFINITE) + Timeout.QuadPart = (LONGLONG) dwMilliseconds * (LONGLONG) -10000; + + DPRINT("WFII: ppi 0x%x\n",W32Process); DPRINT("WFII: waiting for %p\n", Handles[1] ); do { - Timeout.QuadPart = Run - Elapsed; UserLeave(); - Status = KeWaitForMultipleObjects( 2, + Status = KeWaitForMultipleObjects( 3, Handles, WaitAny, UserRequest, @@ -2736,21 +2760,19 @@ switch (Status) { case STATUS_WAIT_0: - Status = WAIT_FAILED; goto WaitExit; case STATUS_WAIT_2: { - USER_MESSAGE Msg; - co_IntPeekMessage( &Msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); - break; - } - - case STATUS_USER_APC: - case STATUS_ALERTED: + USER_MESSAGE Msg; + co_IntPeekMessage( &Msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); + DPRINT1("WFII: WAIT 2\n"); + } + break; + case STATUS_TIMEOUT: DPRINT1("WFII: timeout\n"); - Status = STATUS_TIMEOUT; + case WAIT_FAILED: goto WaitExit; default: @@ -2758,24 +2780,10 @@ Status = STATUS_SUCCESS; goto WaitExit; } - - if (dwMilliseconds != INFINITE) - { - Elapsed = EngGetTickCount() - StartTime; - - if (Elapsed > Run) - Status = STATUS_TIMEOUT; - break; - } - } - while (1); + } + while (TRUE); WaitExit: - if (W32Process->InputIdleEvent) - { - EngFreeMem((PVOID)W32Process->InputIdleEvent); - W32Process->InputIdleEvent = NULL; - } ObDereferenceObject(Process); UserLeave(); return Status; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Nov 14 00:27:38 2010 @@ -62,32 +62,6 @@ /* FUNCTIONS *****************************************************************/ -// -// Wakeup any thread/process waiting on idle input. -// -static VOID FASTCALL -IdlePing(VOID) -{ - HWND hWnd; - PWND Window; - PPROCESSINFO W32d = PsGetCurrentProcessWin32Process(); - - hWnd = UserGetForegroundWindow(); - - Window = UserGetWindowObject(hWnd); - - if (Window && Window->head.pti) - { - if (Window->head.pti->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE)) - { - co_HOOK_CallHooks(WH_FOREGROUNDIDLE,HC_ACTION,0,0); - } - } - - if (W32d && W32d->InputIdleEvent) - KePulseEvent( W32d->InputIdleEvent, EVENT_INCREMENT, TRUE); -} - HANDLE FASTCALL IntMsqSetWakeMask(DWORD WakeMask) { @@ -578,8 +552,6 @@ WaitObjects[0] = &HardwareMessageQueueLock; do { - IdlePing(); - UserLeaveCo(); WaitStatus = KeWaitForMultipleObjects(2, WaitObjects, WaitAny, UserRequest, @@ -1185,8 +1157,6 @@ if(Block) { - IdlePing(); - UserLeaveCo(); /* don't process messages sent to the thread */ @@ -1248,8 +1218,6 @@ WaitObjects[1] = ThreadQueue->NewMessages; do { - IdlePing(); - UserLeaveCo(); WaitStatus = KeWaitForMultipleObjects(2, WaitObjects, WaitAny, UserRequest, @@ -1406,8 +1374,6 @@ { PVOID WaitObjects[2] = {MessageQueue->NewMessages, &HardwareMessageEvent}; NTSTATUS ret; - - IdlePing(); // Going to wait so send Idle ping. UserLeaveCo();

1 0

[tkreuzer] 49578: [PSDK] Move definitions of BitScanForward and BitScanReverse out of gcc specific area
by tkreuzer＠svn.reactos.org 13 Nov '10

13 Nov '10

Author: tkreuzer Date: Sat Nov 13 23:57:49 2010 New Revision: 49578 URL: http://svn.reactos.org/svn/reactos?rev=49578&view=rev Log: [PSDK] Move definitions of BitScanForward and BitScanReverse out of gcc specific area Modified: branches/cmake-bringup/include/psdk/winnt.h Modified: branches/cmake-bringup/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/winn… ============================================================================== --- branches/cmake-bringup/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/winnt.h [iso-8859-1] Sat Nov 13 23:57:49 2010 @@ -5209,10 +5209,10 @@ #endif } +#endif + #define BitScanForward _BitScanForward #define BitScanReverse _BitScanReverse - -#endif /* TODO: Other architectures than X86 */ #if defined(_M_IX86)

1 0

[jgardou] 49577: [CMAKE] - syssetup.inf has its place in bootcd until we generate it automatically.
by jgardou＠svn.reactos.org 13 Nov '10

13 Nov '10

Author: jgardou Date: Sat Nov 13 23:49:08 2010 New Revision: 49577 URL: http://svn.reactos.org/svn/reactos?rev=49577&view=rev Log: [CMAKE] - syssetup.inf has its place in bootcd until we generate it automatically. Modified: branches/cmake-bringup/media/inf/CMakeLists.txt Modified: branches/cmake-bringup/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/inf/CMakeLi… ============================================================================== --- branches/cmake-bringup/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/inf/CMakeLists.txt [iso-8859-1] Sat Nov 13 23:49:08 2010 @@ -33,4 +33,4 @@ add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 6) endforeach(item) -add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf reactos/inf) +add_cab(${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf 6)

1 0

[jgardou] 49576: [CMAKE] - improve some files
by jgardou＠svn.reactos.org 13 Nov '10

13 Nov '10

Author: jgardou Date: Sat Nov 13 22:23:59 2010 New Revision: 49576 URL: http://svn.reactos.org/svn/reactos?rev=49576&view=rev Log: [CMAKE] - improve some files Modified: branches/cmake-bringup/media/fonts/CMakeLists.txt branches/cmake-bringup/media/inf/CMakeLists.txt Modified: branches/cmake-bringup/media/fonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/fonts/CMake… ============================================================================== --- branches/cmake-bringup/media/fonts/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/fonts/CMakeLists.txt [iso-8859-1] Sat Nov 13 22:23:59 2010 @@ -1,4 +1,38 @@ -file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.ttf") -foreach(item ${NLS_FILES}) +list(APPEND FONT_FILES + DejaVuSans.ttf + DejaVuSans-Bold.ttf + DejaVuSans-BoldOblique.ttf + DejaVuSans-Oblique.ttf + DejaVuSansMono.ttf + DejaVuSansMono-Bold.ttf + DejaVuSansMono-BoldOblique.ttf + DejaVuSansMono-Oblique.ttf + DejaVuSerif.ttf + DejaVuSerif-Bold.ttf + DejaVuSerif-BoldItalic.ttf + DejaVuSerif-Italic.ttf + FreeMono.ttf + FreeMonoBold.ttf + FreeMonoBoldOblique.ttf + FreeMonoOblique.ttf + LiberationMono-Bold.ttf + LiberationMono-BoldItalic.ttf + LiberationMono-Italic.ttf + LiberationMono-Regular.ttf + LiberationSans-Bold.ttf + LiberationSans-BoldItalic.ttf + LiberationSans-Italic.ttf + LiberationSans-Regular.ttf + LiberationSerif-Bold.ttf + LiberationSerif-BoldItalic.ttf + LiberationSerif-Italic.ttf + LiberationSerif-Regular.ttf + Marlett.ttf + symbol.ttf + tahoma.ttf + tahomabd.ttf +) + +foreach(item ${FONT_FILES}) add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 3) endforeach(item) Modified: branches/cmake-bringup/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/inf/CMakeLi… ============================================================================== --- branches/cmake-bringup/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/inf/CMakeLists.txt [iso-8859-1] Sat Nov 13 22:23:59 2010 @@ -1,5 +1,35 @@ -file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.inf") -foreach(item ${NLS_FILES}) +list(APPEND INF_FILES + acpi.inf + audio.inf + battery.inf + bda.inf + cdrom.inf + cpu.inf + display.inf + fdc.inf + font.inf + hdc.inf + intl.inf + keyboard.inf + ks.inf + kscaptur.inf + layout.inf + machine.inf + msmouse.inf + NET_NIC.inf + netamd.inf + netisa.inf + netrtpnt.inf + nettcpip.inf + ports.inf + scsi.inf + usb.inf + usbport.inf + usbstor.inf + xboxdisp.inf +) + +foreach(item ${INF_FILES}) add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 6) endforeach(item)

1 0

[tkreuzer] 49575: [CMAKE] Fix a typo
by tkreuzer＠svn.reactos.org 13 Nov '10

13 Nov '10

Author: tkreuzer Date: Sat Nov 13 21:06:05 2010 New Revision: 49575 URL: http://svn.reactos.org/svn/reactos?rev=49575&view=rev Log: [CMAKE] Fix a typo Modified: branches/cmake-bringup/boot/CMakeLists.txt Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Sat Nov 13 21:06:05 2010 @@ -29,7 +29,7 @@ freeldr/freeldr/arch/i386/i386trap.S freeldr/freeldr/arch/i386/int386.S freeldr/freeldr/arch/i386/linux.S - freeldr/freeldr/arch/i386/mb.S) + freeldr/freeldr/arch/i386/mb.S freeldr/freeldr/arch/i386/i386bug.c) elseif(ARCH MATCHES amd64) list(APPEND FREELDR_BASE64K_SOURCE

1 0

[tkreuzer] 49574: [FREELDR] Merge r49573
by tkreuzer＠svn.reactos.org 13 Nov '10

13 Nov '10

Author: tkreuzer Date: Sat Nov 13 21:02:14 2010 New Revision: 49574 URL: http://svn.reactos.org/svn/reactos?rev=49574&view=rev Log: [FREELDR] Merge r49573 Added: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/i386bug.c - copied unchanged from r49573, trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c Modified: branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/i386trap.S Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Sat Nov 13 21:02:14 2010 @@ -30,6 +30,7 @@ freeldr/freeldr/arch/i386/int386.S freeldr/freeldr/arch/i386/linux.S freeldr/freeldr/arch/i386/mb.S) + freeldr/freeldr/arch/i386/i386bug.c) elseif(ARCH MATCHES amd64) list(APPEND FREELDR_BASE64K_SOURCE freeldr/freeldr/arch/amd64/drvmap.S @@ -231,4 +232,4 @@ add_custom_target(livecd_hives DEPENDS ${LIVECD_DIR}/reactos/system32/config/sam) add_livecd_target(setupldr loader) -add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) +add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/i386trap.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/i386trap.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/i386trap.S [iso-8859-1] Sat Nov 13 21:02:14 2010 @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +.intel_syntax noprefix .text .code16 @@ -27,244 +28,67 @@ #define SCREEN_ATTR 0x1f /* Bright white on blue background */ .macro SAVE_CPU_REGS - movl %eax,i386_EAX - movl %ebx,i386_EBX - movl %ecx,i386_ECX - movl %edx,i386_EDX - movl %esp,i386_ESP - movl %ebp,i386_EBP - movl %esi,i386_ESI - movl %edi,i386_EDI - movw %ds,%ax - movw %ax,i386_DS - movw %es,%ax - movw %ax,i386_ES - movw %fs,%ax - movw %ax,i386_FS - movw %gs,%ax - movw %ax,i386_GS - movw %ss,%ax - movw %ax,i386_SS - popl %eax - movl %eax,i386_EIP - popl %eax - movw %ax,i386_CS - popl %eax - movl %eax,i386_EFLAGS - movl %cr0,%eax - movl %eax,i386_CR0 - //movl %cr1,%eax - //movl %eax,i386_CR1 - movl %cr2,%eax - movl %eax,i386_CR2 - movl %cr3,%eax - movl %eax,i386_CR3 - movl %dr0,%eax - movl %eax,i386_DR0 - movl %dr1,%eax - movl %eax,i386_DR1 - movl %dr2,%eax - movl %eax,i386_DR2 - movl %dr3,%eax - movl %eax,i386_DR3 - movl %dr6,%eax - movl %eax,i386_DR6 - movl %dr7,%eax - movl %eax,i386_DR7 - sgdt i386_GDTR - sidt i386_IDTR - sldt i386_LDTR - str i386_TR + /* push the rest of the KTRAP_FRAME */ + push ebp + push ebx + push esi + push edi + push fs + push 0 // ExceptionList + push 0 // PreviousPreviousMode + push eax + push ecx + push edx + push ds + push es + push gs + mov eax, dr7 + push eax + mov eax, dr6 + push eax + mov eax, dr3 + push eax + mov eax, dr2 + push eax + mov eax, dr1 + push eax + mov eax, dr0 + push eax + sub esp, 6 * 4 + + /* push KSPECIAL_REGISTERS */ + /* Gdtr, Idtr, Tr, Ldtr, Reserved */ + sub esp, 44 + sgdt [esp] + sidt [esp + 8] + str [esp + 16] + sldt [esp + 18] + mov eax, dr7; + push eax + mov eax, dr6; + push eax + mov eax, dr3; + push eax + mov eax, dr2; + push eax + mov eax, dr1; + push eax + mov eax, dr0; + push eax + mov eax, cr4; + push eax + mov eax, cr3; + push eax + mov eax, cr2; + push eax + mov eax, cr0; + push eax .endm - - -i386ExceptionHandlerText: - .ascii "An error occured in FreeLoader\n" - .ascii VERSION - .ascii "\n" - .asciz "Report this error to the ReactOS Development mailing list <ros-dev(a)reactos.org>\n\n" - -i386DivideByZeroText: - .asciz "Exception 00: DIVIDE BY ZERO\n\n" -i386DebugExceptionText: - .asciz "Exception 01: DEBUG EXCEPTION\n\n" -i386NMIExceptionText: - .asciz "Exception 02: NON-MASKABLE INTERRUPT EXCEPTION\n\n" -i386BreakpointText: - .asciz "Exception 03: BREAKPOINT (INT 3)\n\n" -i386OverflowText: - .asciz "Exception 04: OVERFLOW\n\n" -i386BoundExceptionText: - .asciz "Exception 05: BOUND EXCEPTION\n\n" -i386InvalidOpcodeText: - .asciz "Exception 06: INVALID OPCODE\n\n" -i386FPUNotAvailableText: - .asciz "Exception 07: FPU NOT AVAILABLE\n\n" -i386DoubleFaultText: - .asciz "Exception 08: DOUBLE FAULT\n\n" -i386CoprocessorSegmentText: - .asciz "Exception 09: COPROCESSOR SEGMENT OVERRUN\n\n" -i386InvalidTSSText: - .asciz "Exception 0A: INVALID TSS\n\n" -i386SegmentNotPresentText: - .asciz "Exception 0B: SEGMENT NOT PRESENT\n\n" -i386StackExceptionText: - .asciz "Exception 0C: STACK EXCEPTION\n\n" -i386GeneralProtectionFaultText: - .asciz "Exception 0D: GENERAL PROTECTION FAULT\n\n" -i386PageFaultText: - .asciz "Exception 0E: PAGE FAULT\n\n" -i386CoprocessorErrorText: - .asciz "Exception 10: COPROCESSOR ERROR\n\n" -i386AlignmentCheckText: - .asciz "Exception 11: ALIGNMENT CHECK\n\n" -i386MachineCheckText: - .asciz "Exception 12: MACHINE CHECK\n\n" - -i386_EAX_Text: - .asciz "EAX: " -i386_EBX_Text: - .asciz "EBX: " -i386_ECX_Text: - .asciz "ECX: " -i386_EDX_Text: - .asciz "EDX: " -i386_ESP_Text: - .asciz " ESP: " -i386_EBP_Text: - .asciz " EBP: " -i386_ESI_Text: - .asciz " ESI: " -i386_EDI_Text: - .asciz " EDI: " -i386_CS_Text: - .asciz "CS: " -i386_DS_Text: - .asciz "DS: " -i386_ES_Text: - .asciz "ES: " -i386_FS_Text: - .asciz "FS: " -i386_GS_Text: - .asciz "GS: " -i386_SS_Text: - .asciz "SS: " -i386_EFLAGS_Text: - .asciz " EFLAGS: " -i386_EIP_Text: - .asciz " EIP: " -i386_ERROR_CODE_Text: - .asciz " ERROR CODE: " -i386_CR0_Text: - .asciz " CR0: " -i386_CR1_Text: - .asciz " CR1: " -i386_CR2_Text: - .asciz " CR2: " -i386_CR3_Text: - .asciz " CR3: " -i386_DR0_Text: - .asciz " DR0: " -i386_DR1_Text: - .asciz " DR1: " -i386_DR2_Text: - .asciz " DR2: " -i386_DR3_Text: - .asciz " DR3: " -i386_DR6_Text: - .asciz " DR6: " -i386_DR7_Text: - .asciz " DR7: " -i386_GDTR_Text: - .asciz " GDTR Base: " -i386_IDTR_Text: - .asciz " IDTR Base: " -i386_Limit_Text: - .asciz " Limit: " -i386_LDTR_Text: - .asciz " LDTR: " -i386_TR_Text: - .asciz " TR: " - -i386FramesText: - .asciz "Frames:\n" - /* Set by each exception handler to the address of the description text */ -i386ExceptionDescriptionText: +i386ExceptionIndex: .long 0 -/* Used to store the contents of all the registers when an exception occurs */ -i386_EAX: - .long 0 -i386_EBX: - .long 0 -i386_ECX: - .long 0 -i386_EDX: - .long 0 -i386_ESP: - .long 0 -i386_EBP: - .long 0 -i386_ESI: - .long 0 -i386_EDI: - .long 0 -i386_CS: - .word 0 -i386_DS: - .word 0 -i386_ES: - .word 0 -i386_FS: - .word 0 -i386_GS: - .word 0 -i386_SS: - .word 0 -i386_EFLAGS: - .long 0 -i386_EIP: - .long 0 -i386_ERROR_CODE: - .long 0 -i386_CR0: - .long 0 -i386_CR1: - .long 0 -i386_CR2: - .long 0 -i386_CR3: - .long 0 -i386_DR0: - .long 0 -i386_DR1: - .long 0 -i386_DR2: - .long 0 -i386_DR3: - .long 0 -i386_DR6: - .long 0 -i386_DR7: - .long 0 -i386_GDTR: - .word 0 - .long 0 -i386_IDTR: - .word 0 - .long 0 -i386_LDTR: - .word 0 -i386_TR: - .word 0 - -/* Used to store the current X and Y position on the screen */ -i386_ScreenPosX: - .long 0 -i386_ScreenPosY: - .long 0 /************************************************************************/ i386CommonExceptionHandler: @@ -272,177 +96,11 @@ SAVE_CPU_REGS - pushl $SCREEN_ATTR - call _MachVideoClearScreen - add $4,%esp - - movl $i386ExceptionHandlerText,%esi - call i386PrintText - - movl i386ExceptionDescriptionText,%esi - call i386PrintText - - movl $i386_EAX_Text,%esi - call i386PrintText - movl i386_EAX,%eax - call i386PrintHexDword // Display EAX - movl $i386_ESP_Text,%esi - call i386PrintText - movl i386_ESP,%eax - call i386PrintHexDword // Display ESP - movl $i386_CR0_Text,%esi - call i386PrintText - movl i386_CR0,%eax - call i386PrintHexDword // Display CR0 - movl $i386_DR0_Text,%esi - call i386PrintText - movl i386_DR0,%eax - call i386PrintHexDword // Display DR0 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_EBX_Text,%esi - call i386PrintText - movl i386_EBX,%eax - call i386PrintHexDword // Display EBX - movl $i386_EBP_Text,%esi - call i386PrintText - movl i386_EBP,%eax - call i386PrintHexDword // Display EBP - movl $i386_CR1_Text,%esi - call i386PrintText - movl i386_CR1,%eax - call i386PrintHexDword // Display CR1 - movl $i386_DR1_Text,%esi - call i386PrintText - movl i386_DR1,%eax - call i386PrintHexDword // Display DR1 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_ECX_Text,%esi - call i386PrintText - movl i386_ECX,%eax - call i386PrintHexDword // Display ECX - movl $i386_ESI_Text,%esi - call i386PrintText - movl i386_ESI,%eax - call i386PrintHexDword // Display ESI - movl $i386_CR2_Text,%esi - call i386PrintText - movl i386_CR2,%eax - call i386PrintHexDword // Display CR2 - movl $i386_DR2_Text,%esi - call i386PrintText - movl i386_DR2,%eax - call i386PrintHexDword // Display DR2 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_EDX_Text,%esi - call i386PrintText - movl i386_EDX,%eax - call i386PrintHexDword // Display EDX - movl $i386_EDI_Text,%esi - call i386PrintText - movl i386_EDI,%eax - call i386PrintHexDword // Display EDI - movl $i386_CR3_Text,%esi - call i386PrintText - movl i386_CR3,%eax - call i386PrintHexDword // Display CR3 - movl $i386_DR3_Text,%esi - call i386PrintText - movl i386_DR3,%eax - call i386PrintHexDword // Display DR3 - incl i386_ScreenPosY - movl $55,i386_ScreenPosX - movl $i386_DR6_Text,%esi - call i386PrintText - movl i386_DR6,%eax - call i386PrintHexDword // Display DR6 - incl i386_ScreenPosY - movl $55,i386_ScreenPosX - movl $i386_DR7_Text,%esi - call i386PrintText - movl i386_DR7,%eax - call i386PrintHexDword // Display DR7 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - incl i386_ScreenPosY - movl $i386_CS_Text,%esi - call i386PrintText - movw i386_CS,%ax - call i386PrintHexWord // Display CS - movl $i386_EIP_Text,%esi - call i386PrintText - movl i386_EIP,%eax - call i386PrintHexDword // Display EIP - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_DS_Text,%esi - call i386PrintText - movw i386_DS,%ax - call i386PrintHexWord // Display DS - movl $i386_ERROR_CODE_Text,%esi - call i386PrintText - movl i386_ERROR_CODE,%eax - call i386PrintHexDword // Display ERROR CODE - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_ES_Text,%esi - call i386PrintText - movw i386_ES,%ax - call i386PrintHexWord // Display ES - movl $i386_EFLAGS_Text,%esi - call i386PrintText - movl i386_EFLAGS,%eax - call i386PrintHexDword // Display EFLAGS - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_FS_Text,%esi - call i386PrintText - movw i386_FS,%ax - call i386PrintHexWord // Display FS - movl $i386_GDTR_Text,%esi - call i386PrintText - movl i386_GDTR+2,%eax - call i386PrintHexDword // Display GDTR Base - movl $i386_Limit_Text,%esi - call i386PrintText - movw i386_GDTR,%ax - call i386PrintHexWord // Display GDTR Limit - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_GS_Text,%esi - call i386PrintText - movw i386_GS,%ax - call i386PrintHexWord // Display GS - movl $i386_IDTR_Text,%esi - call i386PrintText - movl i386_IDTR+2,%eax - call i386PrintHexDword // Display IDTR Base - movl $i386_Limit_Text,%esi - call i386PrintText - movw i386_IDTR,%ax - call i386PrintHexWord // Display IDTR Limit - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_SS_Text,%esi - call i386PrintText - movw i386_SS,%ax - call i386PrintHexWord // Display SS - movl $i386_LDTR_Text,%esi - call i386PrintText - movw i386_LDTR,%ax - call i386PrintHexWord // Display LDTR - movl $i386_TR_Text,%esi - call i386PrintText - movw i386_TR,%ax - call i386PrintHexWord // Display TR - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - incl i386_ScreenPosY - call i386PrintFrames // Display frames - incl i386_ScreenPosY - incl i386_ScreenPosY + lea eax, [esp + (21 * 4)] // KTRAP_FRAME + push esp // KSPECIAL_REGISTERS + push eax + push i386ExceptionIndex + call _i386PrintExceptionText@12 cli i386ExceptionHandlerHang: @@ -451,492 +109,69 @@ iret -i386PrintFrames: - movl $0,i386_ScreenPosX - movl $i386FramesText,%esi - call i386PrintText +.macro TRAP_STUB function, index + EXTERN(\function) + push 0 // Fake error code + mov dword ptr i386ExceptionIndex, \index + jmp i386CommonExceptionHandler +.endm - movl i386_EBP,%edi -printnextframe: - test %edi,%edi - je nomoreframes - movl $STACK32ADDR,%eax - cmpl %edi,%eax - jbe nomoreframes - movl 4(%edi),%eax - pushl %edi - call i386PrintHexDword // Display frame - popl %edi - incl i386_ScreenPosX - incl i386_ScreenPosX - movl 0(%edi),%edi - jmp printnextframe -nomoreframes: - ret +.macro TRAP_STUB2 function, index + EXTERN(\function) + mov dword ptr i386ExceptionIndex, \index + jmp i386CommonExceptionHandler +.endm /************************************************************************/ -/* AL = Char to display */ -/************************************************************************/ -i386PrintChar: - .code32 - - pushl i386_ScreenPosY - pushl i386_ScreenPosX - pushl $SCREEN_ATTR - andl $0xff,%eax - pushl %eax - call _MachVideoPutChar - addl $16,%esp - - ret - -/************************************************************************/ -/* ESI = Address of text to display */ -/************************************************************************/ -i386PrintText: - .code32 - -i386PrintTextLoop: - lodsb - - // Check for end of string char - cmp $0,%al - je i386PrintTextDone - - // Check for newline char - cmp $0x0a,%al - jne i386PrintTextLoop2 - incl i386_ScreenPosY - movl $0,i386_ScreenPosX - jmp i386PrintTextLoop - -i386PrintTextLoop2: - call i386PrintChar - incl i386_ScreenPosX - - jmp i386PrintTextLoop - -i386PrintTextDone: - - ret - -/************************************************************************/ -/* Prints the value in EAX on the screen in hex */ -/************************************************************************/ -i386PrintHexDword: - .code32 - - call i386PrintHex1 - -i386PrintHex1: - call i386PrintHex2 -i386PrintHex2: - call i386PrintHex3 -i386PrintHex3: - movb $4,%cl - rol %cl,%eax - push %eax - andb $0x0f,%al - movl $i386PrintHexTable,%ebx - xlat /*$i386PrintHexTable*/ - call i386PrintChar - incl i386_ScreenPosX - pop %eax - - ret - -i386PrintHexTable: - .ascii "0123456789ABCDEF" - -/************************************************************************/ -/* Prints the value in AX on the screen in hex */ -/************************************************************************/ -i386PrintHexWord: - .code32 - - call i386PrintHexWord1 -i386PrintHexWord1: - call i386PrintHexWord2 -i386PrintHexWord2: - movb $4,%cl - rol %cl,%ax - push %eax - andb $0x0f,%al - movl $i386PrintHexTable,%ebx - xlat /*$i386PrintHexTable*/ - call i386PrintChar - incl i386_ScreenPosX - pop %eax - - ret - -/************************************************************************/ -/* Prints the value in AL on the screen in hex */ -/************************************************************************/ -i386PrintHexByte: - .code32 - - call i386PrintHexByte1 -i386PrintHexByte1: - movb $4,%cl - rol %cl,%al - push %eax - andb $0x0f,%al - movl $i386PrintHexTable,%ebx - xlat /*$i386PrintHexTable*/ - call i386PrintChar - incl i386_ScreenPosX - pop %eax - - ret - -/************************************************************************/ -EXTERN(i386DivideByZero) - .code32 - - movl $i386DivideByZeroText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386DebugException) - .code32 - - movl $i386DebugExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386NMIException) - .code32 - - movl $i386NMIExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386Breakpoint) - .code32 - - movl $i386BreakpointText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386Overflow) - .code32 - - movl $i386OverflowText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386BoundException) - .code32 - - movl $i386BoundExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386InvalidOpcode) - .code32 - - movl $i386InvalidOpcodeText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386FPUNotAvailable) - .code32 - - movl $i386FPUNotAvailableText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386DoubleFault) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386DoubleFaultText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386CoprocessorSegment) - .code32 - - movl $i386CoprocessorSegmentText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386InvalidTSS) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386InvalidTSSText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386SegmentNotPresent) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386SegmentNotPresentText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386StackException) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386StackExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386GeneralProtectionFault) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386GeneralProtectionFaultText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386PageFault) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386PageFaultText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386CoprocessorError) - .code32 - - movl $i386CoprocessorErrorText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386AlignmentCheck) - .code32 - - movl $i386AlignmentCheckText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386MachineCheck) - .code32 - - movl $i386MachineCheckText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler +TRAP_STUB i386DivideByZero, 0 +TRAP_STUB i386DebugException, 1 +TRAP_STUB i386NMIException, 2 +TRAP_STUB i386Breakpoint, 3 +TRAP_STUB i386Overflow, 4 +TRAP_STUB i386BoundException, 5 +TRAP_STUB i386InvalidOpcode, 6 +TRAP_STUB i386FPUNotAvailable, 7 +TRAP_STUB2 i386DoubleFault, 8 +TRAP_STUB i386CoprocessorSegment, 9 +TRAP_STUB2 i386InvalidTSS, 10 +TRAP_STUB2 i386SegmentNotPresent, 11 +TRAP_STUB2 i386StackException, 12 +TRAP_STUB2 i386GeneralProtectionFault, 13 +TRAP_STUB2 i386PageFault, 14 +// 15 is reserved +TRAP_STUB i386CoprocessorError, 16 +TRAP_STUB i386AlignmentCheck, 17 +TRAP_STUB i386MachineCheck, 18 +TRAP_STUB i386SimdFloatError, 19 /************************************************************************ * DEBUGGING SUPPORT FUNCTIONS ************************************************************************/ -EXTERN(_INSTRUCTION_BREAKPOINT1) - .code32 - pushl %eax +.macro BREAKPOINT_TEPLATE functionname, mask1, mask2 + EXTERN(\functionname) + push eax + mov eax, [esp + 8] + mov dr3, eax + mov eax, dr7 + and eax, \mask1 + or eax, \mask2 + mov dr7, eax + pop eax + ret +.endm - movl 8(%esp),%eax +BREAKPOINT_TEPLATE _INSTRUCTION_BREAKPOINT1, 0xfff0ffff, 0x00000303 +BREAKPOINT_TEPLATE _MEMORY_READWRITE_BREAKPOINT1, 0xfff0ffff, 0x00030303 +BREAKPOINT_TEPLATE _MEMORY_WRITE_BREAKPOINT1, 0xfff0ffff, 0x00010303 +BREAKPOINT_TEPLATE _INSTRUCTION_BREAKPOINT2, 0xff0fffff, 0x0000030c +BREAKPOINT_TEPLATE _MEMORY_READWRITE_BREAKPOINT2, 0xff0fffff, 0x0030030c +BREAKPOINT_TEPLATE _MEMORY_WRITE_BREAKPOINT2, 0xff0fffff, 0x0010030c +BREAKPOINT_TEPLATE _INSTRUCTION_BREAKPOINT3, 0xf0ffffff, 0x00000330 +BREAKPOINT_TEPLATE _MEMORY_READWRITE_BREAKPOINT3, 0xf0ffffff, 0x03000330 +BREAKPOINT_TEPLATE _MEMORY_WRITE_BREAKPOINT3, 0xf0ffffff, 0x01000330 +BREAKPOINT_TEPLATE _INSTRUCTION_BREAKPOINT4, 0x0fffffff, 0x000003c0 +BREAKPOINT_TEPLATE _MEMORY_READWRITE_BREAKPOINT4, 0x0fffffff, 0x300003c0 +BREAKPOINT_TEPLATE _MEMORY_WRITE_BREAKPOINT4, 0x0fffffff, 0x100003c0 - movl %eax,%dr0 - movl %dr7,%eax - andl $0xfff0ffff,%eax - orl $0x00000303,%eax - movl %eax,%dr7 - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT1) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr0 - movl %dr7,%eax - andl $0xfff0ffff,%eax - orl $0x00030303,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT1) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr0 - movl %dr7,%eax - andl $0xfff0ffff,%eax - orl $0x00010303,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_INSTRUCTION_BREAKPOINT2) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr1 - movl %dr7,%eax - andl $0xff0fffff,%eax - orl $0x0000030c,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT2) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr1 - movl %dr7,%eax - andl $0xff0fffff,%eax - orl $0x0030030c,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT2) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr1 - movl %dr7,%eax - andl $0xff0fffff,%eax - orl $0x0010030c,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_INSTRUCTION_BREAKPOINT3) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr2 - movl %dr7,%eax - andl $0xf0ffffff,%eax - orl $0x00000330,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT3) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr2 - movl %dr7,%eax - andl $0xf0ffffff,%eax - orl $0x03000330,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT3) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr2 - movl %dr7,%eax - andl $0xf0ffffff,%eax - orl $0x01000330,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_INSTRUCTION_BREAKPOINT4) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr3 - movl %dr7,%eax - andl $0x0fffffff,%eax - orl $0x000003c0,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT4) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr3 - movl %dr7,%eax - andl $0x0fffffff,%eax - orl $0x300003c0,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT4) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr3 - movl %dr7,%eax - andl $0x0fffffff,%eax - orl $0x100003c0,%eax - movl %eax,%dr7 - - popl %eax - - ret

1 0

[tkreuzer] 49573: [FREELDR] Convert most of the trap and blue screen code from asm to C, use KTRAP_FRAME and KSPECIAL_REGISTERS on the stack, instead of using a bunch of global variables. Convert m...
by tkreuzer＠svn.reactos.org 13 Nov '10

13 Nov '10

Author: tkreuzer Date: Sat Nov 13 19:48:13 2010 New Revision: 49573 URL: http://svn.reactos.org/svn/reactos?rev=49573&view=rev Log: [FREELDR] Convert most of the trap and blue screen code from asm to C, use KTRAP_FRAME and KSPECIAL_REGISTERS on the stack, instead of using a bunch of global variables. Convert multiply used asm code chunks into macros. Use intel syntax for remaining asm. 135 lines of C + 178 lines of asm, instead of 942 lines of asm Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c [iso-8859-1] Sat Nov 13 19:48:13 2010 @@ -1,0 +1,135 @@ + +#include <freeldr.h> + +#define NDEBUG +#include <debug.h> + +typedef struct _FRAME +{ + struct _FRAME *Next; + void *Address; +} FRAME; + +char *i386ExceptionDescriptionText[] = +{ + "Exception 00: DIVIDE BY ZERO\n\n", + "Exception 01: DEBUG EXCEPTION\n\n", + "Exception 02: NON-MASKABLE INTERRUPT EXCEPTION\n\n", + "Exception 03: BREAKPOINT (INT 3)\n\n", + "Exception 04: OVERFLOW\n\n", + "Exception 05: BOUND EXCEPTION\n\n", + "Exception 06: INVALID OPCODE\n\n", + "Exception 07: FPU NOT AVAILABLE\n\n", + "Exception 08: DOUBLE FAULT\n\n", + "Exception 09: COPROCESSOR SEGMENT OVERRUN\n\n", + "Exception 0A: INVALID TSS\n\n", + "Exception 0B: SEGMENT NOT PRESENT\n\n", + "Exception 0C: STACK EXCEPTION\n\n", + "Exception 0D: GENERAL PROTECTION FAULT\n\n", + "Exception 0E: PAGE FAULT\n\n", + "Exception 0F: Reserved\n\n", + "Exception 10: COPROCESSOR ERROR\n\n", + "Exception 11: ALIGNMENT CHECK\n\n", + "Exception 12: MACHINE CHECK\n\n" +}; + +#define SCREEN_ATTR 0x1f +void +i386PrintChar(char chr, ULONG x, ULONG y) +{ + MachVideoPutChar(chr, SCREEN_ATTR, x, y); +} + +/* Used to store the current X and Y position on the screen */ +ULONG i386_ScreenPosX = 0; +ULONG i386_ScreenPosY = 0; + +void +i386PrintText(char *pszText) +{ + char chr; + while (1) + { + chr = *pszText++; + + if (chr == 0) break; + if (chr == '\n') + { + i386_ScreenPosY++; + i386_ScreenPosX = 0; + continue; + } + + MachVideoPutChar(chr, SCREEN_ATTR, i386_ScreenPosX, i386_ScreenPosY); + i386_ScreenPosX++; + } +} + +void +PrintText(const char *format, ...) +{ + va_list argptr; + char buffer[256]; + + va_start(argptr, format); + _vsnprintf(buffer, sizeof(buffer), format, argptr); + buffer[sizeof(buffer) - 1] = 0; + va_end(argptr); + i386PrintText(buffer); +} + +void +i386PrintFrames(PKTRAP_FRAME TrapFrame) +{ + FRAME *Frame; + + PrintText("Frames:\n"); + + for (Frame = (FRAME*)TrapFrame->Ebp; + Frame != 0 && (ULONG_PTR)Frame < STACK32ADDR; + Frame = Frame->Next) + { + PrintText("%p ", Frame->Address); + } +} + +void +NTAPI +i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGISTERS Special) +{ + MachVideoClearScreen(SCREEN_ATTR); + i386_ScreenPosX = 0; + i386_ScreenPosY = 0; + + PrintText("An error occured in FreeLoader\n" + VERSION"\n" + "Report this error to the ReactOS Development mailing list <ros-dev(a)reactos.org>\n\n" + "%s\n", i386ExceptionDescriptionText[TrapIndex]); + + PrintText("EAX: %.8lx ESP: %.8lx CR0: %.8lx DR0: %.8lx\n", + TrapFrame->Eax, TrapFrame->HardwareEsp, Special->Cr0, TrapFrame->Dr0); + PrintText("EBX: %.8lx EBP: %.8lx CR1: ???????? DR1: %.8lx\n", + TrapFrame->Ebx, TrapFrame->Ebp, TrapFrame->Dr1); + PrintText("ECX: %.8lx ESI: %.8lx CR2: %.8lx DR2: %.8lx\n", + TrapFrame->Ecx, TrapFrame->Esi, Special->Cr2, TrapFrame->Dr2); + PrintText("EDX: %.8lx EDI: %.8lx CR3: %.8lx DR3: %.8lx\n", + TrapFrame->Edx, TrapFrame->Edi, Special->Cr3, TrapFrame->Dr3); + PrintText(" DR6: %.8lx\n", + TrapFrame->Dr6); + PrintText(" DR7: %.8lx\n\n", + TrapFrame->Dr7); + PrintText("CS: %.4lx EIP: %.8lx\n", + TrapFrame->SegCs, TrapFrame->Eip); + PrintText("DS: %.4lx ERROR CODE: %.8lx\n", + TrapFrame->SegDs, TrapFrame->Eip); + PrintText("ES: %.4lx EFLAGS: %.8lx\n", + TrapFrame->SegEs, TrapFrame->EFlags); + PrintText("FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", + TrapFrame->SegFs, Special->Gdtr.Base, Special->Gdtr.Limit); + PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", + TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); + PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", + TrapFrame->HardwareSegSs, Special->Ldtr, Special->Idtr.Limit); + + i386PrintFrames(TrapFrame); // Display frames +} Propchange: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S [iso-8859-1] Sat Nov 13 19:48:13 2010 @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +.intel_syntax noprefix .text .code16 @@ -27,244 +28,67 @@ #define SCREEN_ATTR 0x1f /* Bright white on blue background */ .macro SAVE_CPU_REGS - movl %eax,i386_EAX - movl %ebx,i386_EBX - movl %ecx,i386_ECX - movl %edx,i386_EDX - movl %esp,i386_ESP - movl %ebp,i386_EBP - movl %esi,i386_ESI - movl %edi,i386_EDI - movw %ds,%ax - movw %ax,i386_DS - movw %es,%ax - movw %ax,i386_ES - movw %fs,%ax - movw %ax,i386_FS - movw %gs,%ax - movw %ax,i386_GS - movw %ss,%ax - movw %ax,i386_SS - popl %eax - movl %eax,i386_EIP - popl %eax - movw %ax,i386_CS - popl %eax - movl %eax,i386_EFLAGS - movl %cr0,%eax - movl %eax,i386_CR0 - //movl %cr1,%eax - //movl %eax,i386_CR1 - movl %cr2,%eax - movl %eax,i386_CR2 - movl %cr3,%eax - movl %eax,i386_CR3 - movl %dr0,%eax - movl %eax,i386_DR0 - movl %dr1,%eax - movl %eax,i386_DR1 - movl %dr2,%eax - movl %eax,i386_DR2 - movl %dr3,%eax - movl %eax,i386_DR3 - movl %dr6,%eax - movl %eax,i386_DR6 - movl %dr7,%eax - movl %eax,i386_DR7 - sgdt i386_GDTR - sidt i386_IDTR - sldt i386_LDTR - str i386_TR + /* push the rest of the KTRAP_FRAME */ + push ebp + push ebx + push esi + push edi + push fs + push 0 // ExceptionList + push 0 // PreviousPreviousMode + push eax + push ecx + push edx + push ds + push es + push gs + mov eax, dr7 + push eax + mov eax, dr6 + push eax + mov eax, dr3 + push eax + mov eax, dr2 + push eax + mov eax, dr1 + push eax + mov eax, dr0 + push eax + sub esp, 6 * 4 + + /* push KSPECIAL_REGISTERS */ + /* Gdtr, Idtr, Tr, Ldtr, Reserved */ + sub esp, 44 + sgdt [esp] + sidt [esp + 8] + str [esp + 16] + sldt [esp + 18] + mov eax, dr7; + push eax + mov eax, dr6; + push eax + mov eax, dr3; + push eax + mov eax, dr2; + push eax + mov eax, dr1; + push eax + mov eax, dr0; + push eax + mov eax, cr4; + push eax + mov eax, cr3; + push eax + mov eax, cr2; + push eax + mov eax, cr0; + push eax .endm - - -i386ExceptionHandlerText: - .ascii "An error occured in FreeLoader\n" - .ascii VERSION - .ascii "\n" - .asciz "Report this error to the ReactOS Development mailing list <ros-dev(a)reactos.org>\n\n" - -i386DivideByZeroText: - .asciz "Exception 00: DIVIDE BY ZERO\n\n" -i386DebugExceptionText: - .asciz "Exception 01: DEBUG EXCEPTION\n\n" -i386NMIExceptionText: - .asciz "Exception 02: NON-MASKABLE INTERRUPT EXCEPTION\n\n" -i386BreakpointText: - .asciz "Exception 03: BREAKPOINT (INT 3)\n\n" -i386OverflowText: - .asciz "Exception 04: OVERFLOW\n\n" -i386BoundExceptionText: - .asciz "Exception 05: BOUND EXCEPTION\n\n" -i386InvalidOpcodeText: - .asciz "Exception 06: INVALID OPCODE\n\n" -i386FPUNotAvailableText: - .asciz "Exception 07: FPU NOT AVAILABLE\n\n" -i386DoubleFaultText: - .asciz "Exception 08: DOUBLE FAULT\n\n" -i386CoprocessorSegmentText: - .asciz "Exception 09: COPROCESSOR SEGMENT OVERRUN\n\n" -i386InvalidTSSText: - .asciz "Exception 0A: INVALID TSS\n\n" -i386SegmentNotPresentText: - .asciz "Exception 0B: SEGMENT NOT PRESENT\n\n" -i386StackExceptionText: - .asciz "Exception 0C: STACK EXCEPTION\n\n" -i386GeneralProtectionFaultText: - .asciz "Exception 0D: GENERAL PROTECTION FAULT\n\n" -i386PageFaultText: - .asciz "Exception 0E: PAGE FAULT\n\n" -i386CoprocessorErrorText: - .asciz "Exception 10: COPROCESSOR ERROR\n\n" -i386AlignmentCheckText: - .asciz "Exception 11: ALIGNMENT CHECK\n\n" -i386MachineCheckText: - .asciz "Exception 12: MACHINE CHECK\n\n" - -i386_EAX_Text: - .asciz "EAX: " -i386_EBX_Text: - .asciz "EBX: " -i386_ECX_Text: - .asciz "ECX: " -i386_EDX_Text: - .asciz "EDX: " -i386_ESP_Text: - .asciz " ESP: " -i386_EBP_Text: - .asciz " EBP: " -i386_ESI_Text: - .asciz " ESI: " -i386_EDI_Text: - .asciz " EDI: " -i386_CS_Text: - .asciz "CS: " -i386_DS_Text: - .asciz "DS: " -i386_ES_Text: - .asciz "ES: " -i386_FS_Text: - .asciz "FS: " -i386_GS_Text: - .asciz "GS: " -i386_SS_Text: - .asciz "SS: " -i386_EFLAGS_Text: - .asciz " EFLAGS: " -i386_EIP_Text: - .asciz " EIP: " -i386_ERROR_CODE_Text: - .asciz " ERROR CODE: " -i386_CR0_Text: - .asciz " CR0: " -i386_CR1_Text: - .asciz " CR1: " -i386_CR2_Text: - .asciz " CR2: " -i386_CR3_Text: - .asciz " CR3: " -i386_DR0_Text: - .asciz " DR0: " -i386_DR1_Text: - .asciz " DR1: " -i386_DR2_Text: - .asciz " DR2: " -i386_DR3_Text: - .asciz " DR3: " -i386_DR6_Text: - .asciz " DR6: " -i386_DR7_Text: - .asciz " DR7: " -i386_GDTR_Text: - .asciz " GDTR Base: " -i386_IDTR_Text: - .asciz " IDTR Base: " -i386_Limit_Text: - .asciz " Limit: " -i386_LDTR_Text: - .asciz " LDTR: " -i386_TR_Text: - .asciz " TR: " - -i386FramesText: - .asciz "Frames:\n" - /* Set by each exception handler to the address of the description text */ -i386ExceptionDescriptionText: +i386ExceptionIndex: .long 0 -/* Used to store the contents of all the registers when an exception occurs */ -i386_EAX: - .long 0 -i386_EBX: - .long 0 -i386_ECX: - .long 0 -i386_EDX: - .long 0 -i386_ESP: - .long 0 -i386_EBP: - .long 0 -i386_ESI: - .long 0 -i386_EDI: - .long 0 -i386_CS: - .word 0 -i386_DS: - .word 0 -i386_ES: - .word 0 -i386_FS: - .word 0 -i386_GS: - .word 0 -i386_SS: - .word 0 -i386_EFLAGS: - .long 0 -i386_EIP: - .long 0 -i386_ERROR_CODE: - .long 0 -i386_CR0: - .long 0 -i386_CR1: - .long 0 -i386_CR2: - .long 0 -i386_CR3: - .long 0 -i386_DR0: - .long 0 -i386_DR1: - .long 0 -i386_DR2: - .long 0 -i386_DR3: - .long 0 -i386_DR6: - .long 0 -i386_DR7: - .long 0 -i386_GDTR: - .word 0 - .long 0 -i386_IDTR: - .word 0 - .long 0 -i386_LDTR: - .word 0 -i386_TR: - .word 0 - -/* Used to store the current X and Y position on the screen */ -i386_ScreenPosX: - .long 0 -i386_ScreenPosY: - .long 0 /************************************************************************/ i386CommonExceptionHandler: @@ -272,177 +96,11 @@ SAVE_CPU_REGS - pushl $SCREEN_ATTR - call _MachVideoClearScreen - add $4,%esp - - movl $i386ExceptionHandlerText,%esi - call i386PrintText - - movl i386ExceptionDescriptionText,%esi - call i386PrintText - - movl $i386_EAX_Text,%esi - call i386PrintText - movl i386_EAX,%eax - call i386PrintHexDword // Display EAX - movl $i386_ESP_Text,%esi - call i386PrintText - movl i386_ESP,%eax - call i386PrintHexDword // Display ESP - movl $i386_CR0_Text,%esi - call i386PrintText - movl i386_CR0,%eax - call i386PrintHexDword // Display CR0 - movl $i386_DR0_Text,%esi - call i386PrintText - movl i386_DR0,%eax - call i386PrintHexDword // Display DR0 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_EBX_Text,%esi - call i386PrintText - movl i386_EBX,%eax - call i386PrintHexDword // Display EBX - movl $i386_EBP_Text,%esi - call i386PrintText - movl i386_EBP,%eax - call i386PrintHexDword // Display EBP - movl $i386_CR1_Text,%esi - call i386PrintText - movl i386_CR1,%eax - call i386PrintHexDword // Display CR1 - movl $i386_DR1_Text,%esi - call i386PrintText - movl i386_DR1,%eax - call i386PrintHexDword // Display DR1 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_ECX_Text,%esi - call i386PrintText - movl i386_ECX,%eax - call i386PrintHexDword // Display ECX - movl $i386_ESI_Text,%esi - call i386PrintText - movl i386_ESI,%eax - call i386PrintHexDword // Display ESI - movl $i386_CR2_Text,%esi - call i386PrintText - movl i386_CR2,%eax - call i386PrintHexDword // Display CR2 - movl $i386_DR2_Text,%esi - call i386PrintText - movl i386_DR2,%eax - call i386PrintHexDword // Display DR2 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_EDX_Text,%esi - call i386PrintText - movl i386_EDX,%eax - call i386PrintHexDword // Display EDX - movl $i386_EDI_Text,%esi - call i386PrintText - movl i386_EDI,%eax - call i386PrintHexDword // Display EDI - movl $i386_CR3_Text,%esi - call i386PrintText - movl i386_CR3,%eax - call i386PrintHexDword // Display CR3 - movl $i386_DR3_Text,%esi - call i386PrintText - movl i386_DR3,%eax - call i386PrintHexDword // Display DR3 - incl i386_ScreenPosY - movl $55,i386_ScreenPosX - movl $i386_DR6_Text,%esi - call i386PrintText - movl i386_DR6,%eax - call i386PrintHexDword // Display DR6 - incl i386_ScreenPosY - movl $55,i386_ScreenPosX - movl $i386_DR7_Text,%esi - call i386PrintText - movl i386_DR7,%eax - call i386PrintHexDword // Display DR7 - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - incl i386_ScreenPosY - movl $i386_CS_Text,%esi - call i386PrintText - movw i386_CS,%ax - call i386PrintHexWord // Display CS - movl $i386_EIP_Text,%esi - call i386PrintText - movl i386_EIP,%eax - call i386PrintHexDword // Display EIP - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_DS_Text,%esi - call i386PrintText - movw i386_DS,%ax - call i386PrintHexWord // Display DS - movl $i386_ERROR_CODE_Text,%esi - call i386PrintText - movl i386_ERROR_CODE,%eax - call i386PrintHexDword // Display ERROR CODE - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_ES_Text,%esi - call i386PrintText - movw i386_ES,%ax - call i386PrintHexWord // Display ES - movl $i386_EFLAGS_Text,%esi - call i386PrintText - movl i386_EFLAGS,%eax - call i386PrintHexDword // Display EFLAGS - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_FS_Text,%esi - call i386PrintText - movw i386_FS,%ax - call i386PrintHexWord // Display FS - movl $i386_GDTR_Text,%esi - call i386PrintText - movl i386_GDTR+2,%eax - call i386PrintHexDword // Display GDTR Base - movl $i386_Limit_Text,%esi - call i386PrintText - movw i386_GDTR,%ax - call i386PrintHexWord // Display GDTR Limit - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_GS_Text,%esi - call i386PrintText - movw i386_GS,%ax - call i386PrintHexWord // Display GS - movl $i386_IDTR_Text,%esi - call i386PrintText - movl i386_IDTR+2,%eax - call i386PrintHexDword // Display IDTR Base - movl $i386_Limit_Text,%esi - call i386PrintText - movw i386_IDTR,%ax - call i386PrintHexWord // Display IDTR Limit - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - movl $i386_SS_Text,%esi - call i386PrintText - movw i386_SS,%ax - call i386PrintHexWord // Display SS - movl $i386_LDTR_Text,%esi - call i386PrintText - movw i386_LDTR,%ax - call i386PrintHexWord // Display LDTR - movl $i386_TR_Text,%esi - call i386PrintText - movw i386_TR,%ax - call i386PrintHexWord // Display TR - movl $0,i386_ScreenPosX - incl i386_ScreenPosY - incl i386_ScreenPosY - call i386PrintFrames // Display frames - incl i386_ScreenPosY - incl i386_ScreenPosY + lea eax, [esp + (21 * 4)] // KTRAP_FRAME + push esp // KSPECIAL_REGISTERS + push eax + push i386ExceptionIndex + call _i386PrintExceptionText@12 cli i386ExceptionHandlerHang: @@ -451,492 +109,69 @@ iret -i386PrintFrames: - movl $0,i386_ScreenPosX - movl $i386FramesText,%esi - call i386PrintText +.macro TRAP_STUB function, index + EXTERN(\function) + push 0 // Fake error code + mov dword ptr i386ExceptionIndex, \index + jmp i386CommonExceptionHandler +.endm - movl i386_EBP,%edi -printnextframe: - test %edi,%edi - je nomoreframes - movl $STACK32ADDR,%eax - cmpl %edi,%eax - jbe nomoreframes - movl 4(%edi),%eax - pushl %edi - call i386PrintHexDword // Display frame - popl %edi - incl i386_ScreenPosX - incl i386_ScreenPosX - movl 0(%edi),%edi - jmp printnextframe -nomoreframes: - ret +.macro TRAP_STUB2 function, index + EXTERN(\function) + mov dword ptr i386ExceptionIndex, \index + jmp i386CommonExceptionHandler +.endm /************************************************************************/ -/* AL = Char to display */ -/************************************************************************/ -i386PrintChar: - .code32 - - pushl i386_ScreenPosY - pushl i386_ScreenPosX - pushl $SCREEN_ATTR - andl $0xff,%eax - pushl %eax - call _MachVideoPutChar - addl $16,%esp - - ret - -/************************************************************************/ -/* ESI = Address of text to display */ -/************************************************************************/ -i386PrintText: - .code32 - -i386PrintTextLoop: - lodsb - - // Check for end of string char - cmp $0,%al - je i386PrintTextDone - - // Check for newline char - cmp $0x0a,%al - jne i386PrintTextLoop2 - incl i386_ScreenPosY - movl $0,i386_ScreenPosX - jmp i386PrintTextLoop - -i386PrintTextLoop2: - call i386PrintChar - incl i386_ScreenPosX - - jmp i386PrintTextLoop - -i386PrintTextDone: - - ret - -/************************************************************************/ -/* Prints the value in EAX on the screen in hex */ -/************************************************************************/ -i386PrintHexDword: - .code32 - - call i386PrintHex1 - -i386PrintHex1: - call i386PrintHex2 -i386PrintHex2: - call i386PrintHex3 -i386PrintHex3: - movb $4,%cl - rol %cl,%eax - push %eax - andb $0x0f,%al - movl $i386PrintHexTable,%ebx - xlat /*$i386PrintHexTable*/ - call i386PrintChar - incl i386_ScreenPosX - pop %eax - - ret - -i386PrintHexTable: - .ascii "0123456789ABCDEF" - -/************************************************************************/ -/* Prints the value in AX on the screen in hex */ -/************************************************************************/ -i386PrintHexWord: - .code32 - - call i386PrintHexWord1 -i386PrintHexWord1: - call i386PrintHexWord2 -i386PrintHexWord2: - movb $4,%cl - rol %cl,%ax - push %eax - andb $0x0f,%al - movl $i386PrintHexTable,%ebx - xlat /*$i386PrintHexTable*/ - call i386PrintChar - incl i386_ScreenPosX - pop %eax - - ret - -/************************************************************************/ -/* Prints the value in AL on the screen in hex */ -/************************************************************************/ -i386PrintHexByte: - .code32 - - call i386PrintHexByte1 -i386PrintHexByte1: - movb $4,%cl - rol %cl,%al - push %eax - andb $0x0f,%al - movl $i386PrintHexTable,%ebx - xlat /*$i386PrintHexTable*/ - call i386PrintChar - incl i386_ScreenPosX - pop %eax - - ret - -/************************************************************************/ -EXTERN(i386DivideByZero) - .code32 - - movl $i386DivideByZeroText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386DebugException) - .code32 - - movl $i386DebugExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386NMIException) - .code32 - - movl $i386NMIExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386Breakpoint) - .code32 - - movl $i386BreakpointText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386Overflow) - .code32 - - movl $i386OverflowText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386BoundException) - .code32 - - movl $i386BoundExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386InvalidOpcode) - .code32 - - movl $i386InvalidOpcodeText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386FPUNotAvailable) - .code32 - - movl $i386FPUNotAvailableText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386DoubleFault) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386DoubleFaultText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386CoprocessorSegment) - .code32 - - movl $i386CoprocessorSegmentText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386InvalidTSS) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386InvalidTSSText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386SegmentNotPresent) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386SegmentNotPresentText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386StackException) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386StackExceptionText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386GeneralProtectionFault) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386GeneralProtectionFaultText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386PageFault) - .code32 - - popl %eax - movl %eax,i386_ERROR_CODE - - movl $i386PageFaultText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386CoprocessorError) - .code32 - - movl $i386CoprocessorErrorText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386AlignmentCheck) - .code32 - - movl $i386AlignmentCheckText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler - -/************************************************************************/ -EXTERN(i386MachineCheck) - .code32 - - movl $i386MachineCheckText,i386ExceptionDescriptionText - jmp i386CommonExceptionHandler +TRAP_STUB i386DivideByZero, 0 +TRAP_STUB i386DebugException, 1 +TRAP_STUB i386NMIException, 2 +TRAP_STUB i386Breakpoint, 3 +TRAP_STUB i386Overflow, 4 +TRAP_STUB i386BoundException, 5 +TRAP_STUB i386InvalidOpcode, 6 +TRAP_STUB i386FPUNotAvailable, 7 +TRAP_STUB2 i386DoubleFault, 8 +TRAP_STUB i386CoprocessorSegment, 9 +TRAP_STUB2 i386InvalidTSS, 10 +TRAP_STUB2 i386SegmentNotPresent, 11 +TRAP_STUB2 i386StackException, 12 +TRAP_STUB2 i386GeneralProtectionFault, 13 +TRAP_STUB2 i386PageFault, 14 +// 15 is reserved +TRAP_STUB i386CoprocessorError, 16 +TRAP_STUB i386AlignmentCheck, 17 +TRAP_STUB i386MachineCheck, 18 +TRAP_STUB i386SimdFloatError, 19 /************************************************************************ * DEBUGGING SUPPORT FUNCTIONS ************************************************************************/ -EXTERN(_INSTRUCTION_BREAKPOINT1) - .code32 - pushl %eax +.macro BREAKPOINT_TEPLATE functionname, mask1, mask2 + EXTERN(\functionname) + push eax + mov eax, [esp + 8] + mov dr3, eax + mov eax, dr7 + and eax, \mask1 + or eax, \mask2 + mov dr7, eax + pop eax + ret +.endm - movl 8(%esp),%eax +BREAKPOINT_TEPLATE _INSTRUCTION_BREAKPOINT1, 0xfff0ffff, 0x00000303 +BREAKPOINT_TEPLATE _MEMORY_READWRITE_BREAKPOINT1, 0xfff0ffff, 0x00030303 +BREAKPOINT_TEPLATE _MEMORY_WRITE_BREAKPOINT1, 0xfff0ffff, 0x00010303 +BREAKPOINT_TEPLATE _INSTRUCTION_BREAKPOINT2, 0xff0fffff, 0x0000030c +BREAKPOINT_TEPLATE _MEMORY_READWRITE_BREAKPOINT2, 0xff0fffff, 0x0030030c +BREAKPOINT_TEPLATE _MEMORY_WRITE_BREAKPOINT2, 0xff0fffff, 0x0010030c +BREAKPOINT_TEPLATE _INSTRUCTION_BREAKPOINT3, 0xf0ffffff, 0x00000330 +BREAKPOINT_TEPLATE _MEMORY_READWRITE_BREAKPOINT3, 0xf0ffffff, 0x03000330 +BREAKPOINT_TEPLATE _MEMORY_WRITE_BREAKPOINT3, 0xf0ffffff, 0x01000330 +BREAKPOINT_TEPLATE _INSTRUCTION_BREAKPOINT4, 0x0fffffff, 0x000003c0 +BREAKPOINT_TEPLATE _MEMORY_READWRITE_BREAKPOINT4, 0x0fffffff, 0x300003c0 +BREAKPOINT_TEPLATE _MEMORY_WRITE_BREAKPOINT4, 0x0fffffff, 0x100003c0 - movl %eax,%dr0 - movl %dr7,%eax - andl $0xfff0ffff,%eax - orl $0x00000303,%eax - movl %eax,%dr7 - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT1) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr0 - movl %dr7,%eax - andl $0xfff0ffff,%eax - orl $0x00030303,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT1) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr0 - movl %dr7,%eax - andl $0xfff0ffff,%eax - orl $0x00010303,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_INSTRUCTION_BREAKPOINT2) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr1 - movl %dr7,%eax - andl $0xff0fffff,%eax - orl $0x0000030c,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT2) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr1 - movl %dr7,%eax - andl $0xff0fffff,%eax - orl $0x0030030c,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT2) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr1 - movl %dr7,%eax - andl $0xff0fffff,%eax - orl $0x0010030c,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_INSTRUCTION_BREAKPOINT3) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr2 - movl %dr7,%eax - andl $0xf0ffffff,%eax - orl $0x00000330,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT3) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr2 - movl %dr7,%eax - andl $0xf0ffffff,%eax - orl $0x03000330,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT3) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr2 - movl %dr7,%eax - andl $0xf0ffffff,%eax - orl $0x01000330,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_INSTRUCTION_BREAKPOINT4) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr3 - movl %dr7,%eax - andl $0x0fffffff,%eax - orl $0x000003c0,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_READWRITE_BREAKPOINT4) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr3 - movl %dr7,%eax - andl $0x0fffffff,%eax - orl $0x300003c0,%eax - movl %eax,%dr7 - - popl %eax - - ret - -EXTERN(_MEMORY_WRITE_BREAKPOINT4) - .code32 - - pushl %eax - - movl 8(%esp),%eax - - movl %eax,%dr3 - movl %dr7,%eax - andl $0x0fffffff,%eax - orl $0x100003c0,%eax - movl %eax,%dr7 - - popl %eax - - ret Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Sat Nov 13 19:48:13 2010 @@ -21,6 +21,7 @@ <file>hwacpi.c</file> <file>hwapm.c</file> <file>hwpci.c</file> + <file>i386bug.c</file> <file>i386disk.c</file> <file>i386rtl.c</file> <file>i386vid.c</file>

1 0

[jgardou] 49572: [CMAKE] - fix typo
by jgardou＠svn.reactos.org 13 Nov '10

13 Nov '10

Author: jgardou Date: Sat Nov 13 00:00:04 2010 New Revision: 49572 URL: http://svn.reactos.org/svn/reactos?rev=49572&view=rev Log: [CMAKE] - fix typo Modified: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/msdmo… ============================================================================== --- branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] Sat Nov 13 00:00:04 2010 @@ -15,7 +15,6 @@ set_entrypoint(msdmo 0) target_link_libraries(msdmo - ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def uuid wine) @@ -26,6 +25,6 @@ kernel32 ntdll) -add_dependencies(msdmo dxdsk psdk buildno_header) +add_dependencies(msdmo dxsdk psdk buildno_header) add_cab_target(msdmo 1)

1 0

[jgardou] 49571: [CAKE] - simplify set_image_base
by jgardou＠svn.reactos.org 12 Nov '10

12 Nov '10

Author: jgardou Date: Fri Nov 12 23:52:40 2010 New Revision: 49571 URL: http://svn.reactos.org/svn/reactos?rev=49571&view=rev Log: [CAKE] - simplify set_image_base Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=495… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Nov 12 23:52:40 2010 @@ -54,12 +54,7 @@ endmacro() macro(set_image_base MODULE IMAGE_BASE) - set(NEW_LINKER_FLAGS "-Wl,--image-base,${IMAGE_BASE}") - get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) - if(LINKER_FLAGS) - set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}") - endif() - set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS}) + add_linkerflag(${MODULE} "-Wl,--image-base,${IMAGE_BASE}") endmacro() macro(add_importlibs MODULE)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs