Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[fireball] 23668: - Unmess header files a little - create one header file (usbdriver.h) which includes all other needed headers, also splitting a bit. Also split out the roothub driver and device manager from hub.c (which was over 4500 SLOC) - Enable PCH usage - Reduced a few warnings

by fireball＠svn.reactos.org

Author: fireball Date: Wed Aug 23 16:36:08 2006 New Revision: 23668 URL: http://svn.reactos.org/svn/reactos?rev=23668&view=rev Log: - Unmess header files a little - create one header file (usbdriver.h) which includes all other needed headers, also splitting a bit. Also split out the roothub driver and device manager from hub.c (which was over 4500 SLOC) - Enable PCH usage - Reduced a few warnings Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h trunk/reactos/drivers/usb/nt4compat/usbdriver/events.h trunk/reactos/drivers/usb/nt4compat/usbdriver/irplist.h trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c trunk/reactos/drivers/usb/nt4compat/usbdriver/compdrv.c trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.h trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.h trunk/reactos/drivers/usb/nt4compat/usbdriver/hcd.h trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.h trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.h trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/compdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/events.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/irplist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd…

18 years, 4 months

[fireball] 23667: Add accidentally deleted line (a call to WideCharToMultiByte() )

by fireball＠svn.reactos.org

Author: fireball Date: Wed Aug 23 12:24:37 2006 New Revision: 23667 URL: http://svn.reactos.org/svn/reactos?rev=23667&view=rev Log: Add accidentally deleted line (a call to WideCharToMultiByte() ) Modified: trunk/reactos/regtests/winetests/ntdll/reg.c Modified: trunk/reactos/regtests/winetests/ntdll/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/ntdll/r… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/reg.c (original) +++ trunk/reactos/regtests/winetests/ntdll/reg.c Wed Aug 23 12:24:37 2006 @@ -167,7 +167,7 @@ ValueNameLength = lstrlenW(ValueName); ValName = (LPSTR)pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength); - + WideCharToMultiByte(0, 0, ValueName, ValueNameLength+1,ValName, ValueNameLength, 0, 0); trace("ValueName: %s\n", ValName); }

18 years, 4 months

[ion] 23666: - Kill two more hacks. IDR isn't hacked at 0xFFFFFFA on startup anymore, and the PIC is correctly set to 0xFA at startup.

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 23 10:59:11 2006 New Revision: 23666 URL: http://svn.reactos.org/svn/reactos?rev=23666&view=rev Log: - Kill two more hacks. IDR isn't hacked at 0xFFFFFFA on startup anymore, and the PIC is correctly set to 0xFA at startup. Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/up/halinit_up.c Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 10:59:11 2006 @@ -134,7 +134,7 @@ jmp $+2 /* Mask all interrupts */ - mov al, 0xFA // FIXME: Should be 0xFF + mov al, 0xFF out dx, al /* Check if we're done, otherwise initialize next PIC */ Modified: trunk/reactos/hal/halx86/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halinit_up.c… ============================================================================== --- trunk/reactos/hal/halx86/up/halinit_up.c (original) +++ trunk/reactos/hal/halx86/up/halinit_up.c Wed Aug 23 10:59:11 2006 @@ -21,8 +21,6 @@ HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { HalpInitPICs(); - /* FIXME: Big-ass hack. First, should be 0xFFFFFFFF, second, shouldnt' be done here */ - KeGetPcr()->IDR = 0xFFFFFFFA; /* Setup busy waiting */ HalpCalibrateStallExecution();

18 years, 4 months

[ion] 23665: - Enable 2nd entry for HalEndSystemInterrupt but not actually using the optimized 2nd entry since ROS IRQs are currently built with a completely different trap frame.

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 23 10:51:54 2006 New Revision: 23665 URL: http://svn.reactos.org/svn/reactos?rev=23665&view=rev Log: - Enable 2nd entry for HalEndSystemInterrupt but not actually using the optimized 2nd entry since ROS IRQs are currently built with a completely different trap frame. Modified: trunk/reactos/hal/halx86/generic/irq.S Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 10:51:54 2006 @@ -35,8 +35,7 @@ /* End of initialization table */ .short 0 -.globl _KiI8259MaskTable -_KiI8259MaskTable: +KiI8259MaskTable: .long 0 /* IRQL 0 */ .long 0 /* IRQL 1 */ .long 0 /* IRQL 2 */ @@ -83,8 +82,7 @@ .long GenericIRQ /* IRQ 16-35 */ .endr -.globl _SoftIntByteTable -_SoftIntByteTable: +SoftIntByteTable: .byte PASSIVE_LEVEL /* IRR 0 */ .byte PASSIVE_LEVEL /* IRR 1 */ .byte APC_LEVEL /* IRR 2 */ @@ -94,8 +92,7 @@ .byte DISPATCH_LEVEL /* IRR 6 */ .byte DISPATCH_LEVEL /* IRR 7 */ -.globl _SoftIntHandlerTable -_SoftIntHandlerTable: +SoftIntHandlerTable: .long _KiUnexpectedInterrupt /* PASSIVE_LEVEL */ .long _HalpApcInterrupt /* APC_LEVEL */ .long _HalpDispatchInterrupt /* DISPATCH_LEVEL */ @@ -175,12 +172,12 @@ /* Get highest pending software interrupt and check if it's higher */ xor edx, edx - mov dl, _SoftIntByteTable[eax] + mov dl, SoftIntByteTable[eax] cmp dl, cl jbe AfterCall /* Call the pending interrupt */ - call _SoftIntHandlerTable[edx*4] + call SoftIntHandlerTable[edx*4] AfterCall: @@ -272,7 +269,7 @@ /* Get the current IRQL and mask the IRQs in the PIC */ movzx eax, byte ptr [fs:KPCR_IRQL] - mov eax, _KiI8259MaskTable[eax*4] + mov eax, KiI8259MaskTable[eax*4] or eax, [fs:KPCR_IDR] out 0x21, al shr eax, 8 @@ -336,7 +333,7 @@ mov [fs:KPCR_IRQL], al /* Set IRQ mask in the PIC */ - mov eax, _KiI8259MaskTable[eax*4] + mov eax, KiI8259MaskTable[eax*4] or eax, [fs:KPCR_IDR] out 0x21, al shr eax, 8 @@ -377,7 +374,7 @@ jbe SkipMask2 /* Hardware interrupt, mask the appropriate IRQs in the PIC */ - mov eax, _KiI8259MaskTable[ecx*4] + mov eax, KiI8259MaskTable[ecx*4] or eax, [fs:KPCR_IDR] out 0x21, al shr eax, 8 @@ -388,16 +385,19 @@ /* Set IRQL and check if there are pending software interrupts */ mov [fs:KPCR_IRQL], cl mov eax, [fs:KPCR_IRR] - mov al, _SoftIntByteTable[eax] + mov al, SoftIntByteTable[eax] cmp al, cl - //ja DoCall + ja DoCall ret 8 DoCall: - /* There are pending softwate interrupts, call their handlers */ - add esp, 12 - jmp SoftIntHandlerTable2[eax*4] + /* There are pending software interrupts, call their handlers */ + /* FIXME: Because ROS IRQs don't setup a nice trap frame yet, we can't optimize a 2nd entry */ + //add esp, 12 + //jmp SoftIntHandlerTable2[eax*4] + call SoftIntHandlerTable[eax*4] + ret 8 .endfunc .globl @KfLowerIrql@4 @@ -415,7 +415,7 @@ jbe SkipMask /* Clear interrupt masks since there's a pending hardware interrupt */ - mov eax, _KiI8259MaskTable[ecx*4] + mov eax, KiI8259MaskTable[ecx*4] or eax, [fs:KPCR_IDR] out 0x21, al shr eax, 8 @@ -426,12 +426,12 @@ /* Set the new IRQL and check if there's a pending software interrupt */ mov [fs:KPCR_IRQL], cl mov eax, [fs:KPCR_IRR] - mov al, _SoftIntByteTable[eax] + mov al, SoftIntByteTable[eax] cmp al, cl jbe DoCall3 /* There is, call it */ - call _SoftIntHandlerTable[eax*4] + call SoftIntHandlerTable[eax*4] DoCall3: @@ -464,7 +464,7 @@ mov [fs:KPCR_IRQL], cl /* Mask the interrupts in the PIC */ - mov eax, _KiI8259MaskTable[ecx*4] + mov eax, KiI8259MaskTable[ecx*4] or eax, [fs:KPCR_IDR] out 0x21, al shr eax, 8 @@ -513,7 +513,7 @@ cli /* Mask out interrupts */ - mov eax, _KiI8259MaskTable + DISPATCH_LEVEL * 2 + mov eax, KiI8259MaskTable + DISPATCH_LEVEL * 2 or eax, [fs:KPCR_IDR] out 0x21, al shr eax, 8 @@ -616,7 +616,7 @@ jbe SoftwareInt /* Set the right mask in the PIC for the hardware IRQ */ - mov eax, _KiI8259MaskTable[ecx*4] + mov eax, KiI8259MaskTable[ecx*4] or eax, [fs:KPCR_IDR] out 0x21, al shr eax, 8 @@ -626,7 +626,7 @@ /* Check if there are pending software interrupts */ mov [fs:KPCR_IRQL], cl mov eax, [fs:KPCR_IRR] - mov al, _SoftIntByteTable[eax] + mov al, SoftIntByteTable[eax] cmp al, cl ja DoCall2 ret 4

18 years, 4 months

[ion] 23664: - Fix some IDR->IRR bugs. - Enable 2ndEntry for HalpEndSoftwareInterrupt (pending interrupt inside an interrupt).

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 23 10:42:25 2006 New Revision: 23664 URL: http://svn.reactos.org/svn/reactos?rev=23664&view=rev Log: - Fix some IDR->IRR bugs. - Enable 2ndEntry for HalpEndSoftwareInterrupt (pending interrupt inside an interrupt). Modified: trunk/reactos/hal/halx86/generic/irq.S Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 10:42:25 2006 @@ -387,18 +387,16 @@ /* Set IRQL and check if there are pending software interrupts */ mov [fs:KPCR_IRQL], cl -#if 0 mov eax, [fs:KPCR_IRR] mov al, _SoftIntByteTable[eax] cmp al, cl - ja DoCall -#endif + //ja DoCall ret 8 DoCall: /* There are pending softwate interrupts, call their handlers */ - add esp, 8 + add esp, 12 jmp SoftIntHandlerTable2[eax*4] .endfunc @@ -627,12 +625,10 @@ SoftwareInt: /* Check if there are pending software interrupts */ mov [fs:KPCR_IRQL], cl -#if 0 - mov eax, [fs:KPCR_IDR] + mov eax, [fs:KPCR_IRR] mov al, _SoftIntByteTable[eax] cmp al, cl ja DoCall2 -#endif ret 4 DoCall2:

18 years, 4 months

[ion] 23663: - Switch HalEndSystemInterrupt to ASM version and get completely rid of the irql.C file.

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 23 10:38:46 2006 New Revision: 23663 URL: http://svn.reactos.org/svn/reactos?rev=23663&view=rev Log: - Switch HalEndSystemInterrupt to ASM version and get completely rid of the irql.C file. Removed: trunk/reactos/hal/halx86/generic/irql.c Modified: trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/irq.S Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Wed Aug 23 10:38:46 2006 @@ -31,7 +31,6 @@ <define name="_NTHAL_" /> <define name="__USE_W32API" /> <file>ipi.c</file> - <file>irql.c</file> <file>irq.S</file> <file>processor.c</file> <file>resource.c</file> Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 10:38:46 2006 @@ -367,7 +367,6 @@ ret 12 .endfunc -#if 0 .globl _HalEndSystemInterrupt@8 .func HalEndSystemInterrupt@8 _HalEndSystemInterrupt@8: @@ -389,7 +388,7 @@ /* Set IRQL and check if there are pending software interrupts */ mov [fs:KPCR_IRQL], cl #if 0 - mov eax, [fs:KPCR_IDR] + mov eax, [fs:KPCR_IRR] mov al, _SoftIntByteTable[eax] cmp al, cl ja DoCall @@ -402,7 +401,6 @@ add esp, 8 jmp SoftIntHandlerTable2[eax*4] .endfunc -#endif .globl @KfLowerIrql@4 .func @KfLowerIrql@4 Removed: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c (removed) @@ -1,54 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/irql.c - * PURPOSE: Implements IRQLs - * PROGRAMMER: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ******************************************************************/ - -typedef VOID (*PSW_HANDLER)(VOID); -extern PSW_HANDLER SoftIntHandlerTable[]; -extern ULONG KiI8259MaskTable[]; -extern UCHAR SoftIntByteTable[]; - -/* FUNCTIONS ****************************************************************/ - - -VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) -{ - ULONG Mask; - ULONG Flags; - UCHAR Pending; - - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); - - if (KeGetPcr()->Irql > DISPATCH_LEVEL) - { - Mask = KeGetPcr()->IDR | KiI8259MaskTable[Irql]; - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)Mask); - Mask >>= 8; - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); - } - - - KeGetPcr()->Irql = Irql; - Pending = SoftIntByteTable[KeGetPcr()->IRR]; - if (Pending > Irql) - { - SoftIntHandlerTable[Pending](); - } - Ki386RestoreFlags(Flags); -} - - -/* EOF */

18 years, 4 months

[ion] 23662: - Switch to ASM version of KfLowerIrql

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 23 10:35:33 2006 New Revision: 23662 URL: http://svn.reactos.org/svn/reactos?rev=23662&view=rev Log: - Switch to ASM version of KfLowerIrql Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/irql.c Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 10:35:33 2006 @@ -404,7 +404,6 @@ .endfunc #endif -#if 0 .globl @KfLowerIrql@4 .func @KfLowerIrql@4 _@KfLowerIrql@4: @@ -444,7 +443,6 @@ popf ret .endfunc -#endif .globl @KfRaiseIrql@4 .func @KfRaiseIrql@4 Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Wed Aug 23 10:35:33 2006 @@ -22,33 +22,6 @@ /* FUNCTIONS ****************************************************************/ -VOID FASTCALL -KfLowerIrql (KIRQL NewIrql) -{ - ULONG Mask; - ULONG Flags; - UCHAR Pending; - - Ki386SaveFlags(Flags); - Ki386DisableInterrupts(); - - if (KeGetPcr()->Irql > DISPATCH_LEVEL) - { - Mask = KeGetPcr()->IDR | KiI8259MaskTable[NewIrql]; - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)Mask); - Mask >>= 8; - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); - } - - - KeGetPcr()->Irql = NewIrql; - Pending = SoftIntByteTable[KeGetPcr()->IRR]; - if (Pending > NewIrql) - { - SoftIntHandlerTable[Pending](); - } - Ki386RestoreFlags(Flags); -} VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) {

18 years, 4 months

[ion] 23661: - Fix bugs in ASM version of KfLowerIrql (not yet used) - Fix bugs in INT_PROLOG. - Fix an important bug in TRAP_EPILOG which was causing register restoration to happen at all times (such as in Kei386EoiHelper/KiServiceExit2 when it shouldn't happen). - Add DRx restoration from trap frame, if DR7 is set. - Added and fixed some debugging assertions in TRAP_EPILOG.

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 23 10:33:52 2006 New Revision: 23661 URL: http://svn.reactos.org/svn/reactos?rev=23661&view=rev Log: - Fix bugs in ASM version of KfLowerIrql (not yet used) - Fix bugs in INT_PROLOG. - Fix an important bug in TRAP_EPILOG which was causing register restoration to happen at all times (such as in Kei386EoiHelper/KiServiceExit2 when it shouldn't happen). - Add DRx restoration from trap frame, if DR7 is set. - Added and fixed some debugging assertions in TRAP_EPILOG. Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 10:33:52 2006 @@ -180,7 +180,6 @@ jbe AfterCall /* Call the pending interrupt */ - jmp $ call _SoftIntHandlerTable[edx*4] AfterCall: @@ -403,8 +402,9 @@ add esp, 8 jmp SoftIntHandlerTable2[eax*4] .endfunc - - +#endif + +#if 0 .globl @KfLowerIrql@4 .func @KfLowerIrql@4 _@KfLowerIrql@4: @@ -430,21 +430,15 @@ /* Set the new IRQL and check if there's a pending software interrupt */ mov [fs:KPCR_IRQL], cl - mov eax, [fs:KPCR_IDR] + mov eax, [fs:KPCR_IRR] mov al, _SoftIntByteTable[eax] cmp al, cl - ja DoCall3 - - /* Restore interrupts and return */ - popf - ret - .align 4 - -DoCall3: + jbe DoCall3 /* There is, call it */ call _SoftIntHandlerTable[eax*4] - jmp $ + +DoCall3: /* Restore interrupts and return */ popf Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2366… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Wed Aug 23 10:33:52 2006 @@ -372,6 +372,11 @@ #endif // +// DR7 Values +// +#define DR7_RESERVED_MASK 0xDC00 + +// // Usermode callout frame definitions // #define CBSTACK_STACK 0x0 Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Wed Aug 23 10:33:52 2006 @@ -352,7 +352,7 @@ mov [esp+KTRAP_FRAME_EAX], eax mov [esp+KTRAP_FRAME_ECX], ecx mov [esp+KTRAP_FRAME_EDX], edx - mov dword ptr [esp+KTRAP_FRAME_EXCEPTION_LIST], -1 + mov dword ptr [esp+KTRAP_FRAME_PREVIOUS_MODE], -1 /* Check if this was from V86 Mode */ /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK */ @@ -366,22 +366,27 @@ mov word ptr [esp+KTRAP_FRAME_FS], fs mov word ptr [esp+KTRAP_FRAME_DS], ds mov word ptr [esp+KTRAP_FRAME_ES], es - mov word ptr [esp+KTRAP_FRAME_GS], gs - - /* Load the segment registers */ + mov [esp+KTRAP_FRAME_GS], gs + + /* Load the segment registers (use OVERRIDE (0x66)) */ mov ebx, KGDT_R0_PCR mov eax, KGDT_R3_DATA | RPL_MASK + .byte 0x66 mov fs, bx + .byte 0x66 mov ds, ax + .byte 0x66 mov es, ax 1: - /* Save the previous exception list */ + /* Get the previous exception list */ mov ebx, [fs:KPCR_EXCEPTION_LIST] - mov [esp+KTRAP_FRAME_EXCEPTION_LIST], ebx /* Set the exception handler chain terminator */ mov dword ptr [fs:KPCR_EXCEPTION_LIST], -1 + + /* Save the previous exception list */ + mov [esp+KTRAP_FRAME_EXCEPTION_LIST], ebx /* Check if this is the ABIOS stack */ /* cmp esp, 0x10000*/ @@ -534,16 +539,16 @@ pushfd pop edx test edx, EFLAGS_INTERRUPT_MASK - jnz 1f + jnz 6f /* Assert the stack */ cmp esp, ebp - jnz 1f + jnz 6f /* Assert the trap frame */ -0: - //sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - //jnz 2f +5: + sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 + //jnz 0f // FIXME: ROS IS BROKEN /* Assert FS */ mov bx, fs @@ -552,24 +557,23 @@ /* Assert exception list */ cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 - jnz 4f + jnz 2f + +1: + push -1 + call _KeBugCheck@4 +#endif + 2: - add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 -1: - int 3 - jmp 0b -4: -#endif - /* Get exception list */ mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] #ifdef DBG /* Assert the saved exception list */ or edx, edx - jnz 5f + jnz 1f int 3 -5: +1: #endif /* Restore it */ @@ -582,17 +586,32 @@ #ifdef DBG /* Assert the saved previous mode */ cmp ecx, -1 - jnz 6f + jnz 1f int 3 -6: +1: #endif /* Restore the previous mode */ mov esi, [fs:KPCR_CURRENT_THREAD] mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl +.else + +#ifdef DBG + /* Assert the saved previous mode */ + mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE] + cmp ecx, -1 + jz 1f + int 3 +1: +#endif .endif + /* Check for debug registers */ + test dword ptr [esp+KTRAP_FRAME_DR7], ~DR7_RESERVED_MASK + jnz 2f + /* Check for V86 */ +4: test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz V86_Exit @@ -600,7 +619,7 @@ test word ptr [esp+KTRAP_FRAME_CS], FRAME_EDITED jz 7f -.ifeq \RestoreAllRegs +.if \RestoreAllRegs /* Check the old mode */ cmp word ptr [esp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK bt word ptr [esp+KTRAP_FRAME_CS], 0 @@ -692,6 +711,7 @@ sysexit .endif +.if \RestoreAllRegs 8: /* Restore EAX */ mov eax, [esp+KTRAP_FRAME_EAX] @@ -708,6 +728,49 @@ /* Jump back to mainline code */ jmp 3b +.endif + +0: + /* Fix up the mask */ + add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 +6: + int 3 + jmp 5b + +2: + /* Check if this was V86 mode */ + test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz 1f + + /* Check if it was user mode */ + test word ptr [esp+KTRAP_FRAME_CS], MODE_MASK + jz 4b + +1: + /* Clear DR7 */ + xor ebx, ebx + mov dr7, ebx + + /* Get DR0, 1, 2 */ + mov esi, [ebp+KTRAP_FRAME_DR0] + mov edi, [ebp+KTRAP_FRAME_DR1] + mov ebx, [ebp+KTRAP_FRAME_DR2] + + /* Set them */ + mov dr0, esi + mov dr1, edi + mov dr2, ebx + + /* Get DR3, 6, 7 */ + mov esi, [ebp+KTRAP_FRAME_DR3] + mov edi, [ebp+KTRAP_FRAME_DR6] + mov ebx, [ebp+KTRAP_FRAME_DR7] + + /* Set them */ + mov dr3, esi + mov dr6, edi + mov dr7, ebx + jz 4b 7: /* Restore real CS value */

18 years, 4 months

[ion] 23660: - Duplicate code between the remaining functions (KfLowerIRql and HalEndSystemInterrupt) so testing the switch to their ASM versions will be easier. - Use same table as in ASM code.

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 23 05:23:11 2006 New Revision: 23660 URL: http://svn.reactos.org/svn/reactos?rev=23660&view=rev Log: - Duplicate code between the remaining functions (KfLowerIRql and HalEndSystemInterrupt) so testing the switch to their ASM versions will be easier. - Use same table as in ASM code. Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/irql.c Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 05:23:11 2006 @@ -83,7 +83,8 @@ .long GenericIRQ /* IRQ 16-35 */ .endr -SoftIntByteTable: +.globl _SoftIntByteTable +_SoftIntByteTable: .byte PASSIVE_LEVEL /* IRR 0 */ .byte PASSIVE_LEVEL /* IRR 1 */ .byte APC_LEVEL /* IRR 2 */ @@ -174,7 +175,7 @@ /* Get highest pending software interrupt and check if it's higher */ xor edx, edx - mov dl, SoftIntByteTable[eax] + mov dl, _SoftIntByteTable[eax] cmp dl, cl jbe AfterCall @@ -388,10 +389,12 @@ /* Set IRQL and check if there are pending software interrupts */ mov [fs:KPCR_IRQL], cl +#if 0 mov eax, [fs:KPCR_IDR] - mov al, SoftIntByteTable[eax] + mov al, _SoftIntByteTable[eax] cmp al, cl ja DoCall +#endif ret 8 DoCall: @@ -400,6 +403,7 @@ add esp, 8 jmp SoftIntHandlerTable2[eax*4] .endfunc + .globl @KfLowerIrql@4 .func @KfLowerIrql@4 @@ -427,14 +431,20 @@ /* Set the new IRQL and check if there's a pending software interrupt */ mov [fs:KPCR_IRQL], cl mov eax, [fs:KPCR_IDR] - mov al, SoftIntByteTable[eax] + mov al, _SoftIntByteTable[eax] cmp al, cl - jbe AfterCall2 + ja DoCall3 + + /* Restore interrupts and return */ + popf + ret + .align 4 + +DoCall3: /* There is, call it */ - call SoftIntHandlerTable[eax*4] - -AfterCall2: + call _SoftIntHandlerTable[eax*4] + jmp $ /* Restore interrupts and return */ popf @@ -629,7 +639,7 @@ mov [fs:KPCR_IRQL], cl #if 0 mov eax, [fs:KPCR_IDR] - mov al, SoftIntByteTable[eax] + mov al, _SoftIntByteTable[eax] cmp al, cl ja DoCall2 #endif Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Wed Aug 23 05:23:11 2006 @@ -12,29 +12,22 @@ #include <hal.h> #define NDEBUG #include <debug.h> -#include <ndk/asm.h> /* GLOBALS ******************************************************************/ -UCHAR Table[8] = -{ - 0, 0, - 1, 1, - 2, 2, 2, 2 -}; - typedef VOID (*PSW_HANDLER)(VOID); extern PSW_HANDLER SoftIntHandlerTable[]; +extern ULONG KiI8259MaskTable[]; +extern UCHAR SoftIntByteTable[]; /* FUNCTIONS ****************************************************************/ -extern ULONG KiI8259MaskTable[]; - -VOID STATIC -HalpLowerIrql(KIRQL NewIrql) +VOID FASTCALL +KfLowerIrql (KIRQL NewIrql) { ULONG Mask; ULONG Flags; + UCHAR Pending; Ki386SaveFlags(Flags); Ki386DisableInterrupts(); @@ -47,66 +40,42 @@ WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); } - if (NewIrql >= PROFILE_LEVEL) + + KeGetPcr()->Irql = NewIrql; + Pending = SoftIntByteTable[KeGetPcr()->IRR]; + if (Pending > NewIrql) { - KeGetPcr()->Irql = NewIrql; - Ki386RestoreFlags(Flags); - return; - } - if (NewIrql >= DISPATCH_LEVEL) - { - KeGetPcr()->Irql = NewIrql; - Ki386RestoreFlags(Flags); - return; - } - KeGetPcr()->Irql = NewIrql; - if (Table[KeGetPcr()->IRR] > NewIrql) - { - SoftIntHandlerTable[Table[KeGetPcr()->IRR]](); + SoftIntHandlerTable[Pending](); } Ki386RestoreFlags(Flags); } -/********************************************************************** - * NAME EXPORTED - * KfLowerIrql - * - * DESCRIPTION - * Restores the irq level on the current processor - * - * ARGUMENTS - * NewIrql = Irql to lower to - * - * RETURN VALUE - * None - * - * NOTES - * Uses fastcall convention - */ -VOID FASTCALL -KfLowerIrql (KIRQL NewIrql) +VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) { - DPRINT("KfLowerIrql(NewIrql %d)\n", NewIrql); - - if (NewIrql > KeGetPcr()->Irql) + ULONG Mask; + ULONG Flags; + UCHAR Pending; + + Ki386SaveFlags(Flags); + Ki386DisableInterrupts(); + + if (KeGetPcr()->Irql > DISPATCH_LEVEL) { - DbgPrint ("(%s:%d) NewIrql %x CurrentIrql %x\n", - __FILE__, __LINE__, NewIrql, KeGetPcr()->Irql); - KEBUGCHECK(0); - for(;;); + Mask = KeGetPcr()->IDR | KiI8259MaskTable[Irql]; + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)Mask); + Mask >>= 8; + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); } - - HalpLowerIrql(NewIrql); + + + KeGetPcr()->Irql = Irql; + Pending = SoftIntByteTable[KeGetPcr()->IRR]; + if (Pending > Irql) + { + SoftIntHandlerTable[Pending](); + } + Ki386RestoreFlags(Flags); } -VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) -/* - * FUNCTION: Finish a system interrupt and restore the specified irq level. - */ -{ - //DPRINT1("ENDING: %lx %lx\n", Irql, Unknown2); - HalpLowerIrql(Irql); -} - /* EOF */

18 years, 4 months

[ion] 23659: - Disable interrupts while in HalpLowerIrql - Properly handle IRR. - Call IRR Handlers through the SWINT table.

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 23 05:07:14 2006 New Revision: 23659 URL: http://svn.reactos.org/svn/reactos?rev=23659&view=rev Log: - Disable interrupts while in HalpLowerIrql - Properly handle IRR. - Call IRR Handlers through the SWINT table. Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/irql.c Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 05:07:14 2006 @@ -93,7 +93,8 @@ .byte DISPATCH_LEVEL /* IRR 6 */ .byte DISPATCH_LEVEL /* IRR 7 */ -SoftIntHandlerTable: +.globl _SoftIntHandlerTable +_SoftIntHandlerTable: .long _KiUnexpectedInterrupt /* PASSIVE_LEVEL */ .long _HalpApcInterrupt /* APC_LEVEL */ .long _HalpDispatchInterrupt /* DISPATCH_LEVEL */ @@ -179,7 +180,7 @@ /* Call the pending interrupt */ jmp $ - call SoftIntHandlerTable[edx*4] + call _SoftIntHandlerTable[edx*4] AfterCall: Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Wed Aug 23 05:07:14 2006 @@ -23,8 +23,8 @@ 2, 2, 2, 2 }; -VOID HalpDispatchInterrupt(VOID); -VOID HalpApcInterrupt(VOID); +typedef VOID (*PSW_HANDLER)(VOID); +extern PSW_HANDLER SoftIntHandlerTable[]; /* FUNCTIONS ****************************************************************/ @@ -34,6 +34,10 @@ HalpLowerIrql(KIRQL NewIrql) { ULONG Mask; + ULONG Flags; + + Ki386SaveFlags(Flags); + Ki386DisableInterrupts(); if (KeGetPcr()->Irql > DISPATCH_LEVEL) { @@ -46,34 +50,21 @@ if (NewIrql >= PROFILE_LEVEL) { KeGetPcr()->Irql = NewIrql; + Ki386RestoreFlags(Flags); return; } if (NewIrql >= DISPATCH_LEVEL) { KeGetPcr()->Irql = NewIrql; + Ki386RestoreFlags(Flags); return; } - KeGetPcr()->Irql = DISPATCH_LEVEL; - if (Table[KeGetPcr()->IRR] >= NewIrql) + KeGetPcr()->Irql = NewIrql; + if (Table[KeGetPcr()->IRR] > NewIrql) { - if (Table[KeGetPcr()->IRR] == DISPATCH_LEVEL) - { - HalpDispatchInterrupt(); - } + SoftIntHandlerTable[Table[KeGetPcr()->IRR]](); } - KeGetPcr()->Irql = APC_LEVEL; - if (NewIrql == APC_LEVEL) - { - return; - } - if (Table[KeGetPcr()->IRR] >= NewIrql) - { - if (Table[KeGetPcr()->IRR] == APC_LEVEL) - { - HalpApcInterrupt(); - } - } - KeGetPcr()->Irql = PASSIVE_LEVEL; + Ki386RestoreFlags(Flags); } /**********************************************************************

18 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
...
45
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2006