Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 34487: - Force a 5 second wait before loading drivers, on ARM. - Context switching doesn't really work -- but we've been lucky since we're stuck on a priority 31 thread. - Instead of worrying about this later when the system will be fully operational, this forces us to expose these bugs, and to make sure everything works. - This will stress our context switching, waiting, unwaiting and scheduling code on ARM but once it all works well, after 5 seconds we'll be back on track.
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 20:41:44 2008 New Revision: 34487 URL: http://svn.reactos.org/svn/reactos?rev=34487&view=rev Log: - Force a 5 second wait before loading drivers, on ARM. - Context switching doesn't really work -- but we've been lucky since we're stuck on a priority 31 thread. - Instead of worrying about this later when the system will be fully operational, this forces us to expose these bugs, and to make sure everything works. - This will stress our context switching, waiting, unwaiting and scheduling code on ARM but once it all works well, after 5 seconds we'll be back on track. 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 20:41:44 2008 @@ -1703,6 +1703,17 @@ /* 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] 34486: - Increment the PC by 4 during a DebugService-style trap, just like on x86, so that we can skip the actual instruction when we're done. - Exit the trap after a prefetch abort. DbgPrint fully works now, and we're back where we started -- RamdiskCreateDiskDevice.
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 19:26:18 2008 New Revision: 34486 URL: http://svn.reactos.org/svn/reactos?rev=34486&view=rev Log: - Increment the PC by 4 during a DebugService-style trap, just like on x86, so that we can skip the actual instruction when we're done. - Exit the trap after a prefetch abort. DbgPrint fully works now, and we're back where we started -- RamdiskCreateDiskDevice. Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sun Jul 13 19:26:18 2008 @@ -458,6 +458,7 @@ // Debug Service // Parameter0 = TrapFrame->R0; + TrapFrame->Pc += sizeof(ULONG); } else { @@ -491,10 +492,11 @@ TrapFrame, KiGetPreviousMode(TrapFrame), TRUE); - // - // TODO - // - while (TRUE); + + // + // We're done + // + return STATUS_SUCCESS; } //

1 0

[ros-arm-bringup] 34485: - ARM instructions are 4 bytes long, not 1, so decrement the PC by four during breakpoints (so the caller gets the address of the previous instruction, just like on x86).
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 19:24:33 2008 New Revision: 34485 URL: http://svn.reactos.org/svn/reactos?rev=34485&view=rev Log: - ARM instructions are 4 bytes long, not 1, so decrement the PC by four during breakpoints (so the caller gets the address of the previous instruction, just like on x86). Modified: trunk/reactos/ntoskrnl/ke/arm/exp.c Modified: trunk/reactos/ntoskrnl/ke/arm/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/exp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] Sun Jul 13 19:24:33 2008 @@ -213,9 +213,9 @@ case STATUS_BREAKPOINT: // - // Decrement PC by one - // - Context.Pc--; + // We want the instruction right before the int 3 + // + Context.Pc -= sizeof(ULONG); break; //

1 0

[ros-arm-bringup] 34484: - Also bump PC for ARM after a KD exception.
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 19:23:43 2008 New Revision: 34484 URL: http://svn.reactos.org/svn/reactos?rev=34484&view=rev Log: - Also bump PC for ARM after a KD exception. Modified: trunk/reactos/ntoskrnl/kd/kdmain.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Sun Jul 13 19:23:43 2008 @@ -140,6 +140,8 @@ /* This we can handle: simply bump EIP */ #ifdef _M_IX86 Context->Eip++; +#elif _M_ARM + Context->Pc += sizeof(ULONG); #endif return TRUE; }

1 0

[ros-arm-bringup] 34483: - Implement KeContextToTrapFrame. - No, we don't sanitize anything right now. There's no user-mode at this point, so it doesn't matter. If you think we should sanitize right now, you need to get out and get laid. - So this brings us back to KiPrefetchAbortHandler's while (TRUE). - We have to make sure the funky PC modifications are going to work well, and after that, we can exit the trap.
by ros-arm-bringup＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 19:04:53 2008 New Revision: 34483 URL: http://svn.reactos.org/svn/reactos?rev=34483&view=rev Log: - Implement KeContextToTrapFrame. - No, we don't sanitize anything right now. There's no user-mode at this point, so it doesn't matter. If you think we should sanitize right now, you need to get out and get laid. - So this brings us back to KiPrefetchAbortHandler's while (TRUE). - We have to make sure the funky PC modifications are going to work well, and after that, we can exit the trap. Modified: trunk/reactos/ntoskrnl/ke/arm/exp.c trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/ntoskrnl/ke/arm/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/exp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] Sun Jul 13 19:04:53 2008 @@ -29,8 +29,73 @@ IN ULONG ContextFlags, IN KPROCESSOR_MODE PreviousMode) { - while (TRUE); - return; + KIRQL OldIrql; + + // + // Do this at APC_LEVEL + // + OldIrql = KeGetCurrentIrql(); + if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); + + // + // Start with the Control flags + // + if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) + { + // + // So this basically means all the special stuff + // + if (PreviousMode == UserMode) + { + // + // ARM has register banks + // + TrapFrame->UserSp = Context->Sp; + TrapFrame->UserLr = Context->Lr; + } + else + { + // + // ARM has register banks + // + TrapFrame->SvcSp = Context->Sp; + TrapFrame->SvcLr = Context->Lr; + } + + // + // The rest is already in the right mode + // + TrapFrame->Pc = Context->Pc; + TrapFrame->Spsr = Context->Psr; + } + + // + // Now do the integers + // + if ((Context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + { + // + // Basically everything else but FPU + // + TrapFrame->R0 = Context->R0; + TrapFrame->R1 = Context->R1; + TrapFrame->R2 = Context->R2; + TrapFrame->R3 = Context->R3; + TrapFrame->R4 = Context->R4; + TrapFrame->R5 = Context->R5; + TrapFrame->R6 = Context->R6; + TrapFrame->R7 = Context->R7; + TrapFrame->R8 = Context->R8; + TrapFrame->R0 = Context->R9; + TrapFrame->R10 = Context->R10; + TrapFrame->R11 = Context->R11; + TrapFrame->R12 = Context->R12; + } + + // + // Restore IRQL + // + if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } VOID @@ -55,7 +120,7 @@ // // So this basically means all the special stuff // - if (KiGetPreviousMode(TrapFrame)) + if (KiGetPreviousMode(TrapFrame) == UserMode) { // // ARM has register banks Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sun Jul 13 19:04:53 2008 @@ -491,7 +491,6 @@ TrapFrame, KiGetPreviousMode(TrapFrame), TRUE); - // // TODO //

1 0

[ros-arm-bringup] 34482: - Implement KeTrapFrameToContext. - We now get to the point where we call KiDebugRoutine, which is registered as KdpEnterDebuggerException. - KdpEnterDebuggerException reads our exception record and understands this is a BREAKPOINT_PRINT. - It then calls the KdpServiceDispatcher. - This, in turn, calls KdpPrintString. - Which in turn loops the "debug providers" and calls KdpSerialPrintString. - Which calls into KDCOM. - And we see this on the debug log: (ntoskrnl/kd/kdio
by ros-arm-bringup＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 18:58:47 2008 New Revision: 34482 URL: http://svn.reactos.org/svn/reactos?rev=34482&view=rev Log: - Implement KeTrapFrameToContext. - We now get to the point where we call KiDebugRoutine, which is registered as KdpEnterDebuggerException. - KdpEnterDebuggerException reads our exception record and understands this is a BREAKPOINT_PRINT. - It then calls the KdpServiceDispatcher. - This, in turn, calls KdpPrintString. - Which in turn loops the "debug providers" and calls KdpSerialPrintString. - Which calls into KDCOM. - And we see this on the debug log: (ntoskrnl/kd/kdio.c:191) . - Epic Win. Need to implement KeContextToTrapFrame now. Modified: trunk/reactos/ntoskrnl/ke/arm/exp.c Modified: trunk/reactos/ntoskrnl/ke/arm/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/exp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] Sun Jul 13 18:58:47 2008 @@ -13,6 +13,10 @@ #include <debug.h> /* GLOBALS ********************************************************************/ + +#include <internal/arm/ksarm.h> +#define KiGetPreviousMode(tf) \ +((tf->Spsr & CPSR_MODES) == CPSR_USER_MODE) ? UserMode: KernelMode /* FUNCTIONS ******************************************************************/ @@ -35,8 +39,73 @@ IN PKEXCEPTION_FRAME ExceptionFrame, IN OUT PCONTEXT Context) { - while (TRUE); - return; + KIRQL OldIrql; + + // + // Do this at APC_LEVEL + // + OldIrql = KeGetCurrentIrql(); + if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); + + // + // Start with the Control flags + // + if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) + { + // + // So this basically means all the special stuff + // + if (KiGetPreviousMode(TrapFrame)) + { + // + // ARM has register banks + // + Context->Sp = TrapFrame->UserSp; + Context->Lr = TrapFrame->UserLr; + } + else + { + // + // ARM has register banks + // + Context->Sp = TrapFrame->SvcSp; + Context->Lr = TrapFrame->SvcLr; + } + + // + // The rest is already in the right mode + // + Context->Pc = TrapFrame->Pc; + Context->Psr = TrapFrame->Spsr; + } + + // + // Now do the integers + // + if ((Context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + { + // + // Basically everything else but FPU + // + Context->R0 = TrapFrame->R0; + Context->R1 = TrapFrame->R1; + Context->R2 = TrapFrame->R2; + Context->R3 = TrapFrame->R3; + Context->R4 = TrapFrame->R4; + Context->R5 = TrapFrame->R5; + Context->R6 = TrapFrame->R6; + Context->R7 = TrapFrame->R7; + Context->R8 = TrapFrame->R8; + Context->R0 = TrapFrame->R9; + Context->R10 = TrapFrame->R10; + Context->R11 = TrapFrame->R11; + Context->R12 = TrapFrame->R12; + } + + // + // Restore IRQL + // + if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } VOID

1 0

[ros-arm-bringup] 34481: - Okay so we've got a basic KiDispatchException, we now need KiTrapFrameToContext and KiContextToTrapFrame. - We aren't really sure where the hell we are since we can't printf anything otherwise we'll trap again and end up in an infinite loop. - So we're debugging with while (TRUE).
by ros-arm-bringup＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 18:46:50 2008 New Revision: 34481 URL: http://svn.reactos.org/svn/reactos?rev=34481&view=rev Log: - Okay so we've got a basic KiDispatchException, we now need KiTrapFrameToContext and KiContextToTrapFrame. - We aren't really sure where the hell we are since we can't printf anything otherwise we'll trap again and end up in an infinite loop. - So we're debugging with while (TRUE). Modified: trunk/reactos/ntoskrnl/ke/arm/exp.c trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Modified: trunk/reactos/ntoskrnl/ke/arm/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/exp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/exp.c [iso-8859-1] Sun Jul 13 18:46:50 2008 @@ -25,6 +25,149 @@ IN ULONG ContextFlags, IN KPROCESSOR_MODE PreviousMode) { - UNIMPLEMENTED; + while (TRUE); return; } + +VOID +NTAPI +KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN OUT PCONTEXT Context) +{ + while (TRUE); + return; +} + +VOID +NTAPI +KiDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PKTRAP_FRAME TrapFrame, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN FirstChance) +{ + CONTEXT Context; + + // + // Increase number of Exception Dispatches + // + KeGetCurrentPrcb()->KeExceptionDispatchCount++; + + // + // Set the context flags + // + Context.ContextFlags = CONTEXT_FULL; + + // + // FIXME: Fuck floating point + // + + // + // Get a Context + // + KeTrapFrameToContext(TrapFrame, ExceptionFrame, &Context); + + // + // Look at our exception code + // + switch (ExceptionRecord->ExceptionCode) + { + // + // Breakpoint + // + case STATUS_BREAKPOINT: + + // + // Decrement PC by one + // + Context.Pc--; + break; + + // + // Internal exception + // + case KI_EXCEPTION_ACCESS_VIOLATION: + + // + // Set correct code + // + ExceptionRecord->ExceptionCode = STATUS_ACCESS_VIOLATION; + break; + } + + // + // Handle kernel-mode first, it's simpler + // + if (PreviousMode == KernelMode) + { + // + // Check if this is a first-chance exception + // + if (FirstChance == TRUE) + { + // + // Break into the debugger for the first time + // + if (KiDebugRoutine(TrapFrame, + ExceptionFrame, + ExceptionRecord, + &Context, + PreviousMode, + FALSE)) + { + // + // Exception was handled + // + goto Handled; + } + + // + // If the Debugger couldn't handle it, dispatch the exception + // + if (RtlDispatchException(ExceptionRecord, &Context)) goto Handled; + } + + // + // This is a second-chance exception, only for the debugger + // + if (KiDebugRoutine(TrapFrame, + ExceptionFrame, + ExceptionRecord, + &Context, + PreviousMode, + TRUE)) + { + // + // Exception was handled + // + goto Handled; + } + + // + // Third strike; you're out + // + KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED, + ExceptionRecord->ExceptionCode, + (ULONG_PTR)ExceptionRecord->ExceptionAddress, + (ULONG_PTR)TrapFrame, + 0); + } + else + { + // + // FIXME: User mode + // + ASSERT(FALSE); + } + +Handled: + // + // Convert the context back into Trap/Exception Frames + // + KeContextToTrapFrame(&Context, + ExceptionFrame, + TrapFrame, + Context.ContextFlags, + PreviousMode); +} 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 18:46:50 2008 @@ -39,7 +39,6 @@ // GENERATE_ARM_STUB KiInitializeUserApc GENERATE_ARM_STUB KeDisableInterrupts -GENERATE_ARM_STUB KiDispatchException GENERATE_ARM_STUB KiSwapProcess GENERATE_ARM_STUB KeSwitchKernelStack

1 0

[ros-arm-bringup] 34480: - Start implementing KiPrefetchAbortHandler for BKPT instructions. - We pretty much try to duplicate what happens on x86, and build an exception record with the right information. - We are seeing the debug string in R1 and its length in R2, so we're on the right track. - We call KiDispatchException now, which isn't yet implemented. - Yup, all this work just to see a damn debug string the "*proper* NT way". Thanks, asshole.
by ros-arm-bringup＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 18:34:44 2008 New Revision: 34480 URL: http://svn.reactos.org/svn/reactos?rev=34480&view=rev Log: - Start implementing KiPrefetchAbortHandler for BKPT instructions. - We pretty much try to duplicate what happens on x86, and build an exception record with the right information. - We are seeing the debug string in R1 and its length in R2, so we're on the right track. - We call KiDispatchException now, which isn't yet implemented. - Yup, all this work just to see a damn debug string the "*proper* NT way". Thanks, asshole. Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sun Jul 13 18:34:44 2008 @@ -434,8 +434,78 @@ NTSTATUS KiPrefetchAbortHandler(IN PKTRAP_FRAME TrapFrame) { + PVOID Address = (PVOID)KeArmFaultAddressRegisterGet(); ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); + ULONG Instruction = *(PULONG)TrapFrame->Pc; + ULONG DebugType, Parameter0; + EXCEPTION_RECORD ExceptionRecord; + + // + // What we *SHOULD* do is look at the instruction fault status register + // and see if it's equal to 2 (debug trap). Unfortunately QEMU doesn't seem + // to emulate this behaviour properly, so we use a workaround. + // + //if (KeArmInstructionFaultStatusRegisterGet() == 2) + if (Instruction & 0xE1200070) // BKPT + { + // + // Okay, we know this is a breakpoint, extract the index + // + DebugType = Instruction & 0xF; + if (DebugType == BREAKPOINT_PRINT) + { + // + // Debug Service + // + Parameter0 = TrapFrame->R0; + } + else + { + // + // Standard INT3 (emulate x86 behavior) + // + Parameter0 = STATUS_SUCCESS; + } + + // + // Build the exception record + // + ExceptionRecord.ExceptionCode = STATUS_BREAKPOINT; + ExceptionRecord.ExceptionFlags = 0; + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.ExceptionAddress = (PVOID)TrapFrame->Pc; + ExceptionRecord.NumberParameters = 3; + + // + // Build the parameters + // + ExceptionRecord.ExceptionInformation[0] = Parameter0; + ExceptionRecord.ExceptionInformation[1] = TrapFrame->R1; + ExceptionRecord.ExceptionInformation[2] = TrapFrame->R2; + + // + // Dispatch the exception + // + KiDispatchException(&ExceptionRecord, + NULL, + TrapFrame, + KiGetPreviousMode(TrapFrame), + TRUE); + + // + // TODO + // + while (TRUE); + } + + // + // Unhandled + // while (TRUE); + DPRINT1("[PREFETCH ABORT] (%x) @ %p/%p/%p\n", + KeArmInstructionFaultStatusRegisterGet(), Address, TrapFrame->SvcLr, TrapFrame->Pc); + UNIMPLEMENTED; + ASSERT(FALSE); return STATUS_SUCCESS; } @@ -453,11 +523,14 @@ { Status = MmAccessFault(FALSE, Address, - KernelMode, + KiGetPreviousMode(TrapFrame), TrapFrame); if (Status == STATUS_SUCCESS) return Status; } + // + // Unhandled + // DPRINT1("[ABORT] (%x) @ %p/%p/%p\n", KeArmFaultStatusRegisterGet(), Address, TrapFrame->SvcLr, TrapFrame->Pc); UNIMPLEMENTED;

1 0

[ros-arm-bringup] 34479: - Prefetch aborts behave like other exceptions, not like data aborts, in terms of the PC offset due to the pipeline behavior. So call TRAP_PROLOG with 0, not 1
by ros-arm-bringup＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 18:32:38 2008 New Revision: 34479 URL: http://svn.reactos.org/svn/reactos?rev=34479&view=rev Log: - Prefetch aborts behave like other exceptions, not like data aborts, in terms of the PC offset due to the pipeline behavior. So call TRAP_PROLOG with 0, not 1 Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Sun Jul 13 18:32:38 2008 @@ -69,7 +69,7 @@ // // Handle trap entry // - TRAP_PROLOG 1 // FromAbort + TRAP_PROLOG 0 // NotFromAbort // // Call the C handler

1 0

[silverblade] 34478: Partially implemented wave output reset (WODM_RESET) which sends a request to the device to stop playing and (for now) drops the current buffer, which stops the streaming mechanism from doing anything further. This will need to be done more cleanly later. Think I've also fixed the bug where it was crashing on exit.
by silverblade＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: silverblade Date: Sun Jul 13 18:32:00 2008 New Revision: 34478 URL: http://svn.reactos.org/svn/reactos?rev=34478&view=rev Log: Partially implemented wave output reset (WODM_RESET) which sends a request to the device to stop playing and (for now) drops the current buffer, which stops the streaming mechanism from doing anything further. This will need to be done more cleanly later. Think I've also fixed the bug where it was crashing on exit. Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -222,6 +222,9 @@ POPUP("Click for WODM_RESTART"); Result = wodMessage(0, WODM_RESTART, (DWORD) InstanceData, (DWORD) 0, 0); + POPUP("Click for WODM_RESET"); + Result = wodMessage(0, WODM_RESET, (DWORD) InstanceData, (DWORD) 0, 0); + POPUP("Click for WODM_CLOSE test"); Result = wodMessage(0, WODM_CLOSE, (DWORD) InstanceData, (DWORD) 0, 0); /* SOUND_DEBUG_HEX(Result); */ Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -235,6 +235,7 @@ MMGETWAVESTATE_FUNC GetWaveDeviceState; MMSETWAVESTATE_FUNC PauseWaveDevice; MMSETWAVESTATE_FUNC RestartWaveDevice; + MMSETWAVESTATE_FUNC ResetWaveDevice; } MMFUNCTION_TABLE, *PMMFUNCTION_TABLE; @@ -664,6 +665,14 @@ DefaultRestartWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); +MMRESULT +ResetWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + +MMRESULT +DefaultResetWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + /* wave/wodMessage.c Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -66,6 +66,7 @@ Device->Functions.GetWaveDeviceState = DefaultGetWaveDeviceState; Device->Functions.PauseWaveDevice = DefaultPauseWaveDevice; Device->Functions.RestartWaveDevice = DefaultRestartWaveDevice; + Device->Functions.ResetWaveDevice = DefaultResetWaveDevice; if ( ! SourceFunctionTable ) { @@ -121,6 +122,12 @@ { Device->Functions.RestartWaveDevice = SourceFunctionTable->RestartWaveDevice; + } + + if ( SourceFunctionTable->ResetWaveDevice ) + { + Device->Functions.ResetWaveDevice = + SourceFunctionTable->ResetWaveDevice; } TRACE_EXIT(0); @@ -226,6 +233,7 @@ PSOUND_DEVICE PreviousDevice = NULL; /*TRACE_("Removing a sound device from list %d\n", DeviceType);*/ + TRACE_ENTRY(); VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); @@ -234,11 +242,13 @@ /* Clean up any instances */ if ( SoundDevice->FirstInstance != NULL ) { + TRACE_("About to destroy all instances of this sound device\n"); DestroyAllInstancesOfSoundDevice(SoundDevice); } if ( SoundDeviceLists[TypeIndex] == SoundDevice ) { + TRACE_("Removing head of list\n"); SoundDeviceLists[TypeIndex] = SoundDevice->Next; Done = TRUE; } @@ -247,6 +257,8 @@ /* Remove from list */ CurrentDevice = SoundDeviceLists[TypeIndex]; PreviousDevice = NULL; + + TRACE_("Removing from list\n"); while ( CurrentDevice ) { @@ -266,8 +278,11 @@ ASSERT(Done); + TRACE_("Freeing path at %p\n", SoundDevice->DevicePath); /* Free the memory associated with the device info */ FreeMemory(SoundDevice->DevicePath); + + TRACE_("Freeing struct\n"); FreeMemory(SoundDevice); TRACE_EXIT(MMSYSERR_NOERROR); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -20,6 +20,7 @@ static HANDLE ProcessHeapHandle = INVALID_HANDLE_VALUE; static DWORD CurrentAllocations = 0; +#if 0 typedef struct _ALLOCATION { DWORD Tag; @@ -68,6 +69,40 @@ ZeroMemory(AllocationInfo, AllocationInfo->Size + sizeof(ALLOCATION)); HeapFree(ProcessHeapHandle, 0, AllocationInfo); + + -- CurrentAllocations; +} +#endif + +PVOID +AllocateTaggedMemory( + IN DWORD Tag, + IN DWORD Size) +{ + PVOID Pointer = NULL; + + if ( ProcessHeapHandle == INVALID_HANDLE_VALUE ) + ProcessHeapHandle = GetProcessHeap(); + + Pointer = HeapAlloc(ProcessHeapHandle, HEAP_ZERO_MEMORY, Size); + + if ( ! Pointer ) + return NULL; + + ++ CurrentAllocations; + + return Pointer; +} + +VOID +FreeTaggedMemory( + IN DWORD Tag, + IN PVOID Pointer) +{ + ASSERT(ProcessHeapHandle != INVALID_HANDLE_VALUE); + ASSERT(Pointer); + + HeapFree(ProcessHeapHandle, 0, Pointer); -- CurrentAllocations; } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -47,14 +47,21 @@ VALIDATE_MMSYS_PARAMETER( BufferHeader ); VALIDATE_MMSYS_PARAMETER( BufferHeader->lpData ); VALIDATE_MMSYS_PARAMETER( BufferHeader->dwBufferLength > 0 ); - /* TODO: Check anything more about this buffer? */ - - if ( ! (BufferHeader->dwFlags & WHDR_PREPARED ) ) + + /* Make sure the buffer flags are sane */ + BufferHeader->dwFlags &= WHDR_INQUEUE | WHDR_DONE | WHDR_PREPARED | + WHDR_BEGINLOOP | WHDR_ENDLOOP; + + if ( ! ( BufferHeader->dwFlags & WHDR_PREPARED ) ) return WAVERR_UNPREPARED; - /* TODO: WHDR_INQUEUE */ - + if ( ( BufferHeader->dwFlags & WHDR_INQUEUE ) ) + return WAVERR_STILLPLAYING; + + /* Clear the "done" flag */ BufferHeader->dwFlags &= ~WHDR_DONE; + + /* ...and at present there's nothing after this buffer, so we do this: */ BufferHeader->lpNext = NULL; return CallUsingSoundThread(SoundDeviceInstance, @@ -172,3 +179,36 @@ TRACE_EXIT(Result); return Result; } + +MMRESULT +ResetWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + return CallUsingSoundThread(SoundDeviceInstance, + ResetWaveDevice_Request, + NULL); +} + +MMRESULT +DefaultResetWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + ULONG RequestedState = WAVE_DD_RESET; + MMRESULT Result; + + TRACE_ENTRY(); + + Result = SendToSoundDevice(SoundDeviceInstance, + IOCTL_WAVE_SET_STATE, + &RequestedState, + sizeof(RequestedState), + NULL); + + ASSERT( Result == MMSYSERR_NOERROR ); + + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(Result); + return Result; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -334,3 +334,29 @@ return Functions->RestartWaveDevice(SoundDeviceInstance); } + +/* This is quite horribly broken */ +MMRESULT +ResetWaveDevice_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + /* ugly HACK to stop sound playback... FIXME */ + SoundDeviceInstance->Streaming.Wave.CurrentBuffer = NULL; + + return Functions->ResetWaveDevice(SoundDeviceInstance); +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -32,4 +32,9 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter); +MMRESULT +ResetWaveDevice_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter); + #endif Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -144,6 +144,12 @@ } case WODM_RESET : + { + ASSERT(Instance != NULL); + + return ResetWaveDevice(Instance); + } + case WODM_BREAKLOOP : return MMSYSERR_INVALHANDLE;

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