Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[jimtabor] 34499: Fix boot and leave the code for research.
by jimtabor＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: jimtabor Date: Mon Jul 14 02:39:58 2008 New Revision: 34499 URL: http://svn.reactos.org/svn/reactos?rev=34499&view=rev Log: Fix boot and leave the code for research. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Jul 14 02:39:58 2008 @@ -570,7 +570,7 @@ /* We only (partially) support local WH_CBT hooks and * WH_KEYBOARD_LL/WH_MOUSE_LL hooks for now */ if ((WH_CBT != HookId || Global) - && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId && WH_GETMESSAGE != HookId) + && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId) // && WH_GETMESSAGE != HookId) { #if 0 /* Removed to get winEmbed working again */ UNIMPLEMENTED

1 0

[jimtabor] 34498: Added WH_GETMESSAGE support.
by jimtabor＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: jimtabor Date: Mon Jul 14 02:26:13 2008 New Revision: 34498 URL: http://svn.reactos.org/svn/reactos?rev=34498&view=rev Log: Added WH_GETMESSAGE support. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Jul 14 02:26:13 2008 @@ -570,7 +570,7 @@ /* We only (partially) support local WH_CBT hooks and * WH_KEYBOARD_LL/WH_MOUSE_LL hooks for now */ if ((WH_CBT != HookId || Global) - && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId) + && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId && WH_GETMESSAGE != HookId) { #if 0 /* Removed to get winEmbed working again */ UNIMPLEMENTED 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] Mon Jul 14 02:26:13 2008 @@ -856,6 +856,10 @@ } Present = co_IntPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg); + // 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); + if (Present) { Info.Msg = Msg.Msg; @@ -1845,6 +1849,7 @@ { LRESULT lResult = 0; PWINDOW_OBJECT Window = NULL; + USER_REFERENCE_ENTRY Ref; UserEnterExclusive(); @@ -1852,15 +1857,15 @@ if (hWnd && (hWnd != INVALID_HANDLE_VALUE) && !(Window = UserGetWindowObject(hWnd))) { return 0; - } - + } + UserRefObjectCo(Window, &Ref); switch(dwType) { case NUMC_DEFWINDOWPROC: lResult = IntDefWindowProc(Window, Msg, wParam, lParam); break; } - + UserDerefObjectCo(Window); UserLeave(); return lResult; }

1 0

[ros-arm-bringup] 34497: - Get rid of stubs.c, it's empty now.
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 22:51:35 2008 New Revision: 34497 URL: http://svn.reactos.org/svn/reactos?rev=34497&view=rev Log: - Get rid of stubs.c, it's empty now. Removed: trunk/reactos/ntoskrnl/ke/arm/stubs.c Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Removed: trunk/reactos/ntoskrnl/ke/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs.c (removed) @@ -1,4 +1,0 @@ -#include "ntoskrnl.h" -#define NDEBUG -#include "debug.h" - Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jul 13 22:51:35 2008 @@ -66,7 +66,6 @@ <file>exp.c</file> <file>kiinit.c</file> <file>stubs_asm.s</file> - <file>stubs.c</file> <file>thrdini.c</file> <file>time.c</file> <file>trap.s</file>

1 0

[ros-arm-bringup] 34496: - Implement NtSetLdrEntries, NtVdmControl, KeSaveStateForHibernate, KeQueryActiveProcessors, KeSetDmaIoCoherency, KeFlushEntireTb, KeGetRecommendedSharedDataAlignment, KeDisableInterrupts, KeInvalidateAllCaches, KeIcacheFlushCount and remove them from stubs_asm.S
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 22:50:38 2008 New Revision: 34496 URL: http://svn.reactos.org/svn/reactos?rev=34496&view=rev Log: - Implement NtSetLdrEntries, NtVdmControl, KeSaveStateForHibernate, KeQueryActiveProcessors, KeSetDmaIoCoherency, KeFlushEntireTb, KeGetRecommendedSharedDataAlignment, KeDisableInterrupts, KeInvalidateAllCaches, KeIcacheFlushCount and remove them from stubs_asm.S Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h trunk/reactos/ntoskrnl/ke/arm/cpu.c trunk/reactos/ntoskrnl/ke/arm/stubs.c trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h [iso-8859-1] Sun Jul 13 22:50:38 2008 @@ -136,6 +136,13 @@ FORCEINLINE VOID +KeArmInvalidateAllCaches(VOID) +{ + __asm__ __volatile__ ("mcr p15, 0, %0, c7, c7, 0" : : "r"(0) : "cc"); +} + +FORCEINLINE +VOID KeArmFlushIcache(VOID) { __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 0" : : "r"(0) : "cc"); Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/cpu.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] Sun Jul 13 22:50:38 2008 @@ -16,6 +16,15 @@ ULONG KeFixedTbEntries; ULONG KiDmaIoCoherency; +ULONG KeIcacheFlushCount = 0; +CCHAR KeNumberProcessors; +ULONG KeDcacheFlushCount; +ULONG KeActiveProcessors; +ULONG KeProcessorArchitecture; +ULONG KeProcessorLevel; +ULONG KeProcessorRevision; +ULONG KeFeatureBits; +ULONG KeLargestCacheLine = 32; // FIXME: It depends /* FUNCTIONS ******************************************************************/ @@ -117,6 +126,16 @@ VOID NTAPI +KeFlushCurrentTb(VOID) +{ + // + // Rename? + // + KeFlushTb(); +} + +VOID +NTAPI KiSaveProcessorControlState(OUT PKPROCESSOR_STATE ProcessorState) { // @@ -127,3 +146,146 @@ ProcessorState->SpecialRegisters.CacheRegister = KeArmCacheRegisterGet(); ProcessorState->SpecialRegisters.StatusRegister = KeArmStatusRegisterGet(); } + +BOOLEAN +NTAPI +KeInvalidateAllCaches(VOID) +{ + // + // Invalidate D cache and I cache + // + KeArmInvalidateAllCaches(); + return TRUE; +} + +BOOLEAN +NTAPI +KeDisableInterrupts(VOID) +{ + ARM_STATUS_REGISTER Flags; + + // + // Get current interrupt state and disable interrupts + // + Flags = KeArmStatusRegisterGet(); + _disable(); + + // + // Return previous interrupt state + // + return Flags.IrqDisable; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ +ULONG +NTAPI +KeGetRecommendedSharedDataAlignment(VOID) +{ + /* Return the global variable */ + return KeLargestCacheLine; +} + +/* + * @implemented + */ +VOID +NTAPI +KeFlushEntireTb(IN BOOLEAN Invalid, + IN BOOLEAN AllProcessors) +{ + KIRQL OldIrql; + + // + // Raise the IRQL for the TB Flush + // + OldIrql = KeRaiseIrqlToSynchLevel(); + + // + // Flush the TB for the Current CPU + // + KeFlushCurrentTb(); + + // + // Return to Original IRQL + // + KeLowerIrql(OldIrql); +} + +/* + * @implemented + */ +VOID +NTAPI +KeSetDmaIoCoherency(IN ULONG Coherency) +{ + // + // Save the coherency globally + // + KiDmaIoCoherency = Coherency; +} + +/* + * @implemented + */ +KAFFINITY +NTAPI +KeQueryActiveProcessors(VOID) +{ + PAGED_CODE(); + + // + // Simply return the number of active processors + // + return KeActiveProcessors; +} + +/* + * @implemented + */ +VOID +__cdecl +KeSaveStateForHibernate(IN PKPROCESSOR_STATE State) +{ + // + // Capture the context + // + RtlCaptureContext(&State->ContextFrame); + + // + // Capture the control state + // + KiSaveProcessorControlState(State); +} + +/* SYSTEM CALLS NOT VALID ON THIS CPU *****************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtVdmControl(IN ULONG ControlCode, + IN PVOID ControlData) +{ + // + // Does not exist on ARM + // + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSetLdtEntries(IN ULONG Selector1, + IN LDT_ENTRY LdtEntry1, + IN ULONG Selector2, + IN LDT_ENTRY LdtEntry2) +{ + // + // Does not exist on ARM + // + return STATUS_NOT_IMPLEMENTED; +} Modified: trunk/reactos/ntoskrnl/ke/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] Sun Jul 13 22:50:38 2008 @@ -2,10 +2,3 @@ #define NDEBUG #include "debug.h" -CCHAR KeNumberProcessors; -ULONG KeDcacheFlushCount; -ULONG KeActiveProcessors; -ULONG KeProcessorArchitecture; -ULONG KeProcessorLevel; -ULONG KeProcessorRevision; -ULONG KeFeatureBits; Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] Sun Jul 13 22:50:38 2008 @@ -40,21 +40,3 @@ GENERATE_ARM_STUB KeUserModeCallback GENERATE_ARM_STUB NtCallbackReturn GENERATE_ARM_STUB NtContinue - -// -// Non-ARM Functionality -// -GENERATE_ARM_STUB NtSetLdtEntries -GENERATE_ARM_STUB NtVdmControl - -// -// Ke Arch-Specific Helpers -// -GENERATE_ARM_STUB KeDisableInterrupts -GENERATE_ARM_STUB KeFlushEntireTb -GENERATE_ARM_STUB KeGetRecommendedSharedDataAlignment -GENERATE_ARM_STUB KeIcacheFlushCount -GENERATE_ARM_STUB KeInvalidateAllCaches -GENERATE_ARM_STUB KeQueryActiveProcessors -GENERATE_ARM_STUB KeSaveStateForHibernate -GENERATE_ARM_STUB KeSetDmaIoCoherency

1 0

[ros-arm-bringup] 34495: - Fix exports
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 22:36:40 2008 New Revision: 34495 URL: http://svn.reactos.org/svn/reactos?rev=34495&view=rev Log: - Fix exports Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.def Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.def?… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] Sun Jul 13 22:36:40 2008 @@ -679,7 +679,6 @@ MmCanFileBeTruncated MmCreateMdl MmCreateSection -MmDbgTranslatePhysicalAddress MmDisableModifiedWriteOfSection MmFlushImageSection MmForceSectionClosed

1 0

[ros-arm-bringup] 34494: - Re-organize our unimplemented function stubs according to port targets (user mode support, exceptions/SEH, driver ISRs, x86-only functionality and arch-specific Ke).
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 22:34:07 2008 New Revision: 34494 URL: http://svn.reactos.org/svn/reactos?rev=34494&view=rev Log: - Re-organize our unimplemented function stubs according to port targets (user mode support, exceptions/SEH, driver ISRs, x86-only functionality and arch-specific Ke). Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] Sun Jul 13 22:34:07 2008 @@ -8,51 +8,53 @@ GENERATE_ARM_STUB _except_handler3 GENERATE_ARM_STUB _global_unwind2 GENERATE_ARM_STUB _local_unwind2 - -// -// Exported Ke Arch-Specific APIs -// -GENERATE_ARM_STUB DbgBreakPointWithStatus -GENERATE_ARM_STUB KeConnectInterrupt -GENERATE_ARM_STUB KeDisconnectInterrupt -GENERATE_ARM_STUB KeFlushEntireTb -GENERATE_ARM_STUB KeGetRecommendedSharedDataAlignment -GENERATE_ARM_STUB KeIcacheFlushCount -GENERATE_ARM_STUB KeInitializeInterrupt -GENERATE_ARM_STUB KeInvalidateAllCaches -GENERATE_ARM_STUB KeQueryActiveProcessors -GENERATE_ARM_STUB KeRaiseUserException -GENERATE_ARM_STUB KeSaveStateForHibernate -GENERATE_ARM_STUB KeSetDmaIoCoherency -GENERATE_ARM_STUB KeSynchronizeExecution -GENERATE_ARM_STUB KeUserModeCallback -GENERATE_ARM_STUB NtSetLdtEntries -GENERATE_ARM_STUB NtRaiseException -GENERATE_ARM_STUB NtCallbackReturn -GENERATE_ARM_STUB NtContinue -GENERATE_ARM_STUB NtVdmControl -GENERATE_ARM_STUB RtlCreateUserThread -GENERATE_ARM_STUB RtlInitializeContext - -// -// Internal Ke Arch-Specific Helpers -// -GENERATE_ARM_STUB KiInitializeUserApc -GENERATE_ARM_STUB KeDisableInterrupts -GENERATE_ARM_STUB KiSwapProcess -GENERATE_ARM_STUB KeSwitchKernelStack - -// -// Traps, Debugging and Execeptions -// -GENERATE_ARM_STUB KiPassiveRelease -GENERATE_ARM_STUB KiInterruptTemplate -GENERATE_ARM_STUB KiUnexpectedInterrupt GENERATE_ARM_STUB RtlGetCallersAddress GENERATE_ARM_STUB RtlUnwind GENERATE_ARM_STUB RtlpGetExceptionAddress GENERATE_ARM_STUB RtlDispatchException GENERATE_ARM_STUB RtlpGetStackLimits +GENERATE_ARM_STUB DbgBreakPointWithStatus +GENERATE_ARM_STUB KeRaiseUserException +GENERATE_ARM_STUB KdpGdbStubInit +GENERATE_ARM_STUB NtRaiseException -GENERATE_ARM_STUB KdpGdbStubInit -GENERATE_ARM_STUB MmDbgTranslatePhysicalAddress +// +// Driver ISRs +// +GENERATE_ARM_STUB KeConnectInterrupt +GENERATE_ARM_STUB KeDisconnectInterrupt +GENERATE_ARM_STUB KiPassiveRelease +GENERATE_ARM_STUB KiInterruptTemplate +GENERATE_ARM_STUB KiUnexpectedInterrupt +GENERATE_ARM_STUB KeInitializeInterrupt +GENERATE_ARM_STUB KeSynchronizeExecution + +// +// User Mode Support +// +GENERATE_ARM_STUB KiInitializeUserApc +GENERATE_ARM_STUB KiSwapProcess +GENERATE_ARM_STUB KeSwitchKernelStack +GENERATE_ARM_STUB RtlCreateUserThread +GENERATE_ARM_STUB RtlInitializeContext +GENERATE_ARM_STUB KeUserModeCallback +GENERATE_ARM_STUB NtCallbackReturn +GENERATE_ARM_STUB NtContinue + +// +// Non-ARM Functionality +// +GENERATE_ARM_STUB NtSetLdtEntries +GENERATE_ARM_STUB NtVdmControl + +// +// Ke Arch-Specific Helpers +// +GENERATE_ARM_STUB KeDisableInterrupts +GENERATE_ARM_STUB KeFlushEntireTb +GENERATE_ARM_STUB KeGetRecommendedSharedDataAlignment +GENERATE_ARM_STUB KeIcacheFlushCount +GENERATE_ARM_STUB KeInvalidateAllCaches +GENERATE_ARM_STUB KeQueryActiveProcessors +GENERATE_ARM_STUB KeSaveStateForHibernate +GENERATE_ARM_STUB KeSetDmaIoCoherency

1 0

[ros-arm-bringup] 34493: - Remove this DPRINT1 too, it was used for debugging scheduling issues which are fixed now.
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 22:20:40 2008 New Revision: 34493 URL: http://svn.reactos.org/svn/reactos?rev=34493&view=rev Log: - Remove this DPRINT1 too, it was used for debugging scheduling issues which are fixed now. Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/thrdini.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] Sun Jul 13 22:20:40 2008 @@ -130,5 +130,4 @@ // Save back the new value of the kernel stack // Thread->KernelStack = (PVOID)CtxSwitchFrame; - DPRINT1("NEW THREAD %p WITH EX FRAME AT: %p\n", Thread, Thread->KernelStack); }

1 0

[ros-arm-bringup] 34492: - Remove the 5-second delay in the initialization code, we've validated this works now.
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 22:19:12 2008 New Revision: 34492 URL: http://svn.reactos.org/svn/reactos?rev=34492&view=rev Log: - Remove the 5-second delay in the initialization code, we've validated this works now. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=344… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Jul 13 22:19:12 2008 @@ -1703,17 +1703,6 @@ /* Initialize in-place execution support */ XIPInit(LoaderBlock); - -#ifdef _M_ARM - // - // ARM: Force a wait so we can test thread scheduling, timing and context switching - // - DPRINT1("Beginning 5 second wait...\n"); - Timeout.QuadPart = Int32x32To64(5, -10000000); - KeDelayExecutionThread(KernelMode, FALSE, &Timeout); - DPRINT1("Wait complete\n"); - while (TRUE); -#endif /* Set maximum update to 75% */ InbvSetProgressBarSubset(25, 75);

1 0

[ros-arm-bringup] 34491: - Enable timer expiration code. - Timers now work, along with full scheduling, dispatching and context switching, so our 5 second wait in init.c allows other threads to runs, then completes appropriately.
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 22:17:57 2008 New Revision: 34491 URL: http://svn.reactos.org/svn/reactos?rev=34491&view=rev Log: - Enable timer expiration code. - Timers now work, along with full scheduling, dispatching and context switching, so our 5 second wait in init.c allows other threads to runs, then completes appropriately. Modified: trunk/reactos/ntoskrnl/ke/arm/time.c Modified: trunk/reactos/ntoskrnl/ke/arm/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/time.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/time.c [iso-8859-1] Sun Jul 13 22:17:57 2008 @@ -109,13 +109,17 @@ if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) { // - // Timer has expired! - // - DPRINT1("hand: %d\n", Hand); - DPRINT1("Interrupt time: %I64x\n", InterruptTime.QuadPart); - DPRINT1("TIMER EXPIRATION: %I64x!!!\n", - KiTimerTableListHead[Hand].Time.QuadPart); - while (TRUE); + // Check if we are already doing expiration + // + if (!Prcb->TimerRequest) + { + // + // Request a DPC to handle this + // + Prcb->TimerRequest = TrapFrame->SvcSp; + Prcb->TimerHand = Hand; + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + } } //

1 0

[ros-arm-bringup] 34490: - Fix context switch code. It works perfectly now.
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 22:17:09 2008 New Revision: 34490 URL: http://svn.reactos.org/svn/reactos?rev=34490&view=rev Log: - Fix context switch code. It works perfectly now. Modified: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s Modified: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] Sun Jul 13 22:17:09 2008 @@ -19,14 +19,26 @@ // // - // Save volatile registers for the OLD thread + // Make space for the trap frame // - sub sp, sp, #(4*8) - mrs ip, spsr_all - stmia sp, {ip, lr} - sub sp, sp, #(4*2) - stmia sp, {r4-r11} + sub sp, sp, #ExceptionFrameLength + // + // Build exception frame + // FIXME: Change to stmdb later + // + str r4, [sp, #ExR4] + str r5, [sp, #ExR5] + str r6, [sp, #ExR6] + str r7, [sp, #ExR7] + str r8, [sp, #ExR8] + str r9, [sp, #ExR9] + str r10, [sp, #ExR10] + str r11, [sp, #ExR11] + str lr, [sp, #ExLr] + mrs r4, spsr_all + str r4, [sp, #ExSpsr] + // // Switch stacks // @@ -39,13 +51,29 @@ bl KiSwapContextInternal // - // Restore volatile registers for the NEW thread + // Get the SPSR and restore it // - ldmia sp, {r4-r11} - add sp, sp, #(4*8) - ldmia sp, {ip, lr} - msr spsr_all, ip - add sp, sp, #(4*2) + ldr r4, [sp, #ExSpsr] + msr spsr_all, r4 + + // + // Restore the registers + // FIXME: Use LDMIA later + // + ldr r4, [sp, #ExR4] + ldr r5, [sp, #ExR5] + ldr r6, [sp, #ExR6] + ldr r7, [sp, #ExR7] + ldr r8, [sp, #ExR8] + ldr r9, [sp, #ExR9] + ldr r10, [sp, #ExR10] + ldr r11, [sp, #ExR11] + ldr lr, [sp, #ExLr] + + // + // Restore stack + // + add sp, sp, #ExceptionFrameLength // // Jump to saved restore address

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008