Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 44065: Use LoaderMemoryData instead of LoaderSpecialMemory for page tables
by tkreuzer＠svn.reactos.org 10 Nov '09

10 Nov '09

Author: tkreuzer Date: Tue Nov 10 01:48:09 2009 New Revision: 44065 URL: http://svn.reactos.org/svn/reactos?rev=44065&view=rev Log: Use LoaderMemoryData instead of LoaderSpecialMemory for page tables Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c [iso-8859-1] Tue Nov 10 01:48:09 2009 @@ -80,7 +80,7 @@ if (!pDir->Pde[Index].Valid) { - pSubDir = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); + pSubDir = MmAllocateMemoryWithType(PAGE_SIZE, LoaderMemoryData); if (!pSubDir) return NULL; RtlZeroMemory(pSubDir, PAGE_SIZE);

1 0

[tkreuzer] 44064: [KE] - implement KiPageFault
by tkreuzer＠svn.reactos.org 09 Nov '09

09 Nov '09

Author: tkreuzer Date: Tue Nov 10 00:37:54 2009 New Revision: 44064 URL: http://svn.reactos.org/svn/reactos?rev=44064&view=rev Log: [KE] - implement KiPageFault Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Tue Nov 10 00:37:54 2009 @@ -235,8 +235,9 @@ /* Set up EXCEPTION_RECORD */ mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionCode], ecx - mov dword ptr [rsp + 0x28 + EXCEPTION_RECORD_ExceptionFlags], 0 - mov qword ptr [rsp + 0x28 + EXCEPTION_RECORD_ExceptionRecord], 0 + xor rax, rax + mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionFlags], eax + mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionRecord], rax mov rax, [rbp + KTRAP_FRAME_Rip] mov [rsp + 0x28 + EXCEPTION_RECORD_ExceptionAddress], rax mov [rsp + 0x28 + EXCEPTION_RECORD_NumberParameters], edx @@ -494,28 +495,66 @@ .pushframe 1 /* We have an error code */ - lea rcx, _MsgPageFault[rip] - mov rdx, [rsp] - mov r8, [rsp+8] - mov r9, rsp - call _FrLdrDbgPrint[rip] - - jmp $ +// lea rcx, _MsgPageFault[rip] +// mov rdx, [rsp] +// mov r8, [rsp+8] +// mov r9, rsp +// call _FrLdrDbgPrint[rip] ENTER_TRAP_FRAME (0x28), TRAPFLAG_ALL /* Save page fault address */ - mov rax, cr2 - mov [rbp + KTRAP_FRAME_FaultAddress], rax - - /* Dispatch the exception */ - mov ecx, STATUS_BREAKPOINT - mov edx, 0 - mov r9, 0 - mov r10, 0 - mov r11, 0 + mov rdx, cr2 + mov [rbp + KTRAP_FRAME_FaultAddress], rdx + + /* Call page fault handler */ + mov ecx, [ebp + KTRAP_FRAME_ErrorCode] // StoreInstruction + and ecx, 1 + // rdx == Address + mov r8b, [ebp + KTRAP_FRAME_SegCs] // Mode + and r8b, 1 + mov r9, rbp // TrapInformation +// call _MmAccessFault + + // HACK + mov eax, STATUS_ACCESS_VIOLATION + + /* Check for success */ + test eax, eax + jge PageFaultReturn + + /* Set parameter 1 to error code */ + mov r9d, [ebp + KTRAP_FRAME_ErrorCode] + + /* Set parameter2 to faulting address */ + mov r10, cr2 // Param2 = faulting address + + cmp eax, STATUS_ACCESS_VIOLATION + je AccessViolation + cmp eax, STATUS_GUARD_PAGE_VIOLATION + je SpecialCode + cmp eax, STATUS_STACK_OVERFLOW + je SpecialCode + +InPageException: + /* Dispatch in-page exception */ + mov ecx, STATUS_IN_PAGE_ERROR // ExceptionCode + mov r11d, eax // Param3 = Status + mov edx, 3 // ParamCount call _InternalDispatchException - + jmp PageFaultReturn + +AccessViolation: + /* Use more proper status code */ + mov eax, KI_EXCEPTION_ACCESS_VIOLATION + +SpecialCode: + /* Setup a normal page fault exception */ + mov ecx, eax // ExceptionCode + mov edx, 2 // ParamCount + call _InternalDispatchException + +PageFaultReturn: LEAVE_TRAP_FRAME; iretq .endproc

1 0

[sginsberg] 44063: - Add KCALLOUT_FRAME to define the kernel callback stack layout during user mode callbacks. Define the NextCallback and FramePointer members of the debugger data block more portably with this. - AMD64's is a copy of x86's to match asm.h's the assembly offsets. ARM's is a stub containing two necessary members to have some offsets for the debugger data block. - Add ARM stub for KiCallUserMode as this is referenced from the debugger data block.
by sginsberg＠svn.reactos.org 09 Nov '09

09 Nov '09

Author: sginsberg Date: Tue Nov 10 00:19:03 2009 New Revision: 44063 URL: http://svn.reactos.org/svn/reactos?rev=44063&view=rev Log: - Add KCALLOUT_FRAME to define the kernel callback stack layout during user mode callbacks. Define the NextCallback and FramePointer members of the debugger data block more portably with this. - AMD64's is a copy of x86's to match asm.h's the assembly offsets. ARM's is a stub containing two necessary members to have some offsets for the debugger data block. - Add ARM stub for KiCallUserMode as this is referenced from the debugger data block. Modified: trunk/reactos/include/ndk/amd64/asm.h trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/ndk/i386/asm.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Modified: trunk/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/asm.h?re… ============================================================================== --- trunk/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/asm.h [iso-8859-1] Tue Nov 10 00:19:03 2009 @@ -255,7 +255,6 @@ #define CBSTACK_RBP 0x18 #define CBSTACK_RESULT 0x20 #define CBSTACK_RESULT_LENGTH 0x28 -#define CBSTACK_FRAME_POINTER CBSTACK_RBP /* Following ones are ASM only! ***********************************************/ Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Tue Nov 10 00:19:03 2009 @@ -230,6 +230,23 @@ USHORT Fill3; LONG CodePatchCycle; } KTRAP_FRAME, *PKTRAP_FRAME; + +// +// Defines the Callback Stack Layout for User Mode Callbacks +// +typedef struct _KCALLOUT_FRAME +{ + ULONG64 InitialStack; + ULONG64 TrapFrame; + ULONG64 CallbackStack; + ULONG64 Rdi; + ULONG64 Rsi; + ULONG64 Rbx; + ULONG64 Rbp; + ULONG64 ReturnAddress; + ULONG64 Result; + ULONG64 ResultLength; +} KCALLOUT_FRAME, *PKCALLOUT_FRAME; // // Dummy LDT_ENTRY Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Tue Nov 10 00:19:03 2009 @@ -83,6 +83,17 @@ ULONG PreviousMode; ULONG PreviousTrapFrame; } KTRAP_FRAME, *PKTRAP_FRAME; + +// +// Defines the Callback Stack Layout for User Mode Callbacks +// +// Just a stub with some required members for now +// +typedef struct _KCALLOUT_FRAME +{ + ULONG CallbackStack; + ULONG DummyFramePointer; +} KCALLOUT_FRAME, *PKCALLOUT_FRAME; #ifndef NTOS_MODE_USER Modified: trunk/reactos/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… ============================================================================== --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Tue Nov 10 00:19:03 2009 @@ -534,7 +534,6 @@ #define CBSTACK_EBP 0x18 #define CBSTACK_RESULT 0x20 #define CBSTACK_RESULT_LENGTH 0x24 -#define CBSTACK_FRAME_POINTER CBSTACK_EBP // // NTSTATUS, Bugcheck Codes and Debug Codes Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Tue Nov 10 00:19:03 2009 @@ -200,6 +200,23 @@ ULONG V86Fs; ULONG V86Gs; } KTRAP_FRAME, *PKTRAP_FRAME; + +// +// Defines the Callback Stack Layout for User Mode Callbacks +// +typedef struct _KCALLOUT_FRAME +{ + ULONG InitialStack; + ULONG TrapFrame; + ULONG CallbackStack; + ULONG Edi; + ULONG Esi; + ULONG Ebx; + ULONG Ebp; + ULONG ReturnAddress; + ULONG Result; + ULONG ResultLength; +} KCALLOUT_FRAME, *PKCALLOUT_FRAME; // // LDT Entry Definition Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Tue Nov 10 00:19:03 2009 @@ -30,6 +30,7 @@ #define KPCR_INITIAL_STACK_OFFSET 0 #define KPCR_STACK_LIMIT_OFFSET 0 #define KPRCB_PCR_PAGE_OFFSET 0 +#define CBSTACK_FRAME_POINTER Ebp #elif defined(_AMD64_) @@ -39,6 +40,7 @@ #define KPCR_INITIAL_STACK_OFFSET 0 #define KPCR_STACK_LIMIT_OFFSET 0 #define KPRCB_PCR_PAGE_OFFSET 0 +#define CBSTACK_FRAME_POINTER Rbp #elif defined(_ARM_) @@ -48,6 +50,7 @@ #define KPCR_INITIAL_STACK_OFFSET FIELD_OFFSET(KPCR, InitialStack) #define KPCR_STACK_LIMIT_OFFSET FIELD_OFFSET(KPCR, StackLimit) #define KPRCB_PCR_PAGE_OFFSET FIELD_OFFSET(KPRCB, PcrPage) +#define CBSTACK_FRAME_POINTER DummyFramePointer #else #error Unsupported Architecture @@ -392,8 +395,8 @@ {(ULONG_PTR)RtlpBreakWithStatusInstruction}, 0, FIELD_OFFSET(KTHREAD, CallbackStack), - CBSTACK_CALLBACK_STACK, - CBSTACK_FRAME_POINTER, + FIELD_OFFSET(KCALLOUT_FRAME, CallbackStack), + FIELD_OFFSET(KCALLOUT_FRAME, CBSTACK_FRAME_POINTER), FALSE, {(ULONG_PTR)KiCallUserMode}, 0, @@ -505,7 +508,7 @@ KPCR_STACK_LIMIT_OFFSET, KPRCB_PCR_PAGE_OFFSET, FIELD_OFFSET(KPRCB, ProcessorState.SpecialRegisters), -#if defined(_M_IX86) +#if defined(_X86_) // // x86 GDT/LDT/TSS constants // @@ -519,7 +522,7 @@ KGDT_TSS, 0, 0, -#elif defined(_M_AMD64) +#elif defined(_AMD64_) // // AMD64 GDT/LDT/TSS constants // 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] Tue Nov 10 00:19:03 2009 @@ -34,6 +34,7 @@ GENERATE_ARM_STUB KeSwitchKernelStack GENERATE_ARM_STUB RtlCreateUserThread GENERATE_ARM_STUB RtlInitializeContext -GENERATE_ARM_STUB KeUserModeCallback +GENERATE_ARM_STUB KeUserModeCallback +GENERATE_ARM_STUB KiCallUserMode GENERATE_ARM_STUB NtCallbackReturn GENERATE_ARM_STUB NtContinue

1 0

[sginsberg] 44062: - Fix unsigned/signed compare, spotted by Christoph
by sginsberg＠svn.reactos.org 09 Nov '09

09 Nov '09

Author: sginsberg Date: Tue Nov 10 00:07:04 2009 New Revision: 44062 URL: http://svn.reactos.org/svn/reactos?rev=44062&view=rev Log: - Fix unsigned/signed compare, spotted by Christoph Modified: trunk/reactos/hal/halx86/generic/bus/bushndlr.c Modified: trunk/reactos/hal/halx86/generic/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/bus… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/bushndlr.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus/bushndlr.c [iso-8859-1] Tue Nov 10 00:07:04 2009 @@ -30,7 +30,7 @@ ULONG Size; /* Compute array size */ - if (ArraySize == -1) ArraySize = 0; + if (ArraySize == MAXULONG) ArraySize = 0; Size = ArraySize * sizeof(PARRAY) + sizeof(ARRAY); /* Allocate the array */

1 0

[sginsberg] 44061: - Implement the generic bus handler support and initialization. - Add missing hack flags for ACPI hacks. - Add the hack flags to the registry.
by sginsberg＠svn.reactos.org 09 Nov '09

09 Nov '09

Author: sginsberg Date: Mon Nov 9 23:59:49 2009 New Revision: 44061 URL: http://svn.reactos.org/svn/reactos?rev=44061&view=rev Log: - Implement the generic bus handler support and initialization. - Add missing hack flags for ACPI hacks. - Add the hack flags to the registry. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/hal/halx86/generic/bus/bushndlr.c trunk/reactos/hal/halx86/generic/bus/halbus.c trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/include/bus.h trunk/reactos/hal/halx86/include/halp.h trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Nov 9 23:59:49 2009 @@ -44,6 +44,24 @@ ; Device classes key HKLM,"SYSTEM\CurrentControlSet\Control\DeviceClasses",,0x00000012 + +; HAL Chipset Hacks +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","10390530",0x00010001,0x1 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","10390620",0x00010001,0x1 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","10B90533",0x00010001,0x1 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","10B91533",0x00010001,0x1 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","11060596",0x00010001,0x1 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","11060686",0x00010001,0x5 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","1166004F",0x00010001,0x1 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","11660050",0x00010001,0x1 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","11660200",0x00010001,0x1 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","80862410",0x00010001,0x8 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","80862420",0x00010001,0x8 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","80862440",0x00010001,0x8 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","8086244C",0x00010001,0x8 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","80862480",0x00010001,0x8 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","8086248C",0x00010001,0x8 +HKLM,"SYSTEM\CurrentControlSet\Control\HAL","80867110",0x00010001,0x1 ; Hardware profile settings HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB",,0x00000012 Modified: trunk/reactos/hal/halx86/generic/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/bus… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/bushndlr.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus/bushndlr.c [iso-8859-1] Mon Nov 9 23:59:49 2009 @@ -2,6 +2,185 @@ * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory * FILE: hal/halx86/generic/bus/bushndlr.c - * PURPOSE: + * PURPOSE: Generic HAL Bus Handler Support * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) */ + +/* INCLUDES *******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +KSPIN_LOCK HalpBusDatabaseSpinLock; +KEVENT HalpBusDatabaseEvent; +LIST_ENTRY HalpAllBusHandlers; +PARRAY HalpBusTable; +PARRAY HalpConfigTable; + +/* PRIVATE FUNCTIONS **********************************************************/ + +PARRAY +NTAPI +HalpAllocateArray(IN ULONG ArraySize) +{ + PARRAY Array; + ULONG Size; + + /* Compute array size */ + if (ArraySize == -1) ArraySize = 0; + Size = ArraySize * sizeof(PARRAY) + sizeof(ARRAY); + + /* Allocate the array */ + Array = ExAllocatePoolWithTag(NonPagedPool, + Size, + 'BusH'); + if (!Array) KeBugCheckEx(HAL_MEMORY_ALLOCATION, Size, 0, (ULONG_PTR)__FILE__, __LINE__); + + /* Initialize it */ + Array->ArraySize = ArraySize; + RtlZeroMemory(Array->Element, sizeof(PVOID) * (ArraySize + 1)); + return Array; +} + +VOID +NTAPI +HalpGrowArray(IN PARRAY *CurrentArray, + IN PARRAY *NewArray) +{ + PVOID Tmp; + + /* Check if the current array doesn't exist yet, or if it's smaller than the new one */ + if (!(*CurrentArray) || ((*NewArray)->ArraySize > (*CurrentArray)->ArraySize)) + { + /* Does it exist (and can it fit?) */ + if (*CurrentArray) + { + /* Copy the current array into the new one */ + RtlCopyMemory(&(*NewArray)->Element, + &(*CurrentArray)->Element, + sizeof(PVOID) * ((*CurrentArray)->ArraySize + 1)); + } + + /* Swap the pointers (XOR swap would be more l33t) */ + Tmp = *CurrentArray; + *CurrentArray = *NewArray; + *NewArray = Tmp; + } +} + +PBUS_HANDLER +FASTCALL +HalpLookupHandler(IN PARRAY Array, + IN ULONG Type, + IN ULONG Number, + IN BOOLEAN AddReference) +{ + PHAL_BUS_HANDLER Bus; + PBUS_HANDLER Handler = NULL; + + /* Make sure the entry exists */ + if (Array->ArraySize >= Type) + { + /* Retrieve it */ + Array = Array->Element[Type]; + + /* Make sure the entry array exists */ + if ((Array) && (Array->ArraySize >= Number)) + { + /* Retrieve the bus and its handler */ + Bus = Array->Element[Number]; + Handler = &Bus->Handler; + + /* Reference the handler if needed */ + if (AddReference) Bus->ReferenceCount++; + } + } + + /* Return the handler */ + return Handler; +} + +VOID +FASTCALL +HaliReferenceBusHandler(IN PBUS_HANDLER Handler) +{ + PHAL_BUS_HANDLER Bus; + + /* Find and reference the bus handler */ + Bus = CONTAINING_RECORD(Handler, HAL_BUS_HANDLER, Handler); + Bus->ReferenceCount++; +} + +VOID +FASTCALL +HaliDereferenceBusHandler(IN PBUS_HANDLER Handler) +{ + PHAL_BUS_HANDLER Bus; + + /* Find and dereference the bus handler */ + Bus = CONTAINING_RECORD(Handler, HAL_BUS_HANDLER, Handler); + Bus->ReferenceCount--; + ASSERT(Bus->ReferenceCount != 0); +} + +PBUS_HANDLER +FASTCALL +HaliHandlerForBus(IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber) +{ + /* Lookup the interface in the bus table */ + return HalpLookupHandler(HalpBusTable, InterfaceType, BusNumber, FALSE); +} + +PBUS_HANDLER +FASTCALL +HaliHandlerForConfigSpace(IN BUS_DATA_TYPE ConfigType, + IN ULONG BusNumber) +{ + /* Lookup the configuration in the configuration table */ + return HalpLookupHandler(HalpConfigTable, ConfigType, BusNumber, FALSE); +} + +PBUS_HANDLER +FASTCALL +HaliReferenceHandlerForBus(IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber) +{ + /* Lookup the interface in the bus table, and reference the handler */ + return HalpLookupHandler(HalpBusTable, InterfaceType, BusNumber, TRUE); +} + +PBUS_HANDLER +FASTCALL +HaliReferenceHandlerForConfigSpace(IN BUS_DATA_TYPE ConfigType, + IN ULONG BusNumber) +{ + /* Lookup the configuration in the configuration table and add a reference */ + return HalpLookupHandler(HalpConfigTable, ConfigType, BusNumber, TRUE); +} + +VOID +NTAPI +HalpInitBusHandler(VOID) +{ + /* Setup the bus lock */ + KeInitializeSpinLock(&HalpBusDatabaseSpinLock); + + /* Setup the bus event */ + KeInitializeEvent(&HalpBusDatabaseEvent, SynchronizationEvent, TRUE); + + /* Setup the bus configuration and bus table */ + HalpBusTable = HalpAllocateArray(0); + HalpConfigTable = HalpAllocateArray(0); + + /* Setup the bus list */ + InitializeListHead(&HalpAllBusHandlers); + + /* These should be written by the PCI driver later, but we give defaults */ + HalPciTranslateBusAddress = HalpTranslateBusAddress; + HalPciAssignSlotResources = HalpAssignSlotResources; + HalFindBusAddressTranslation = HalpFindBusAddressTranslation; +} Modified: trunk/reactos/hal/halx86/generic/bus/halbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/hal… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/halbus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus/halbus.c [iso-8859-1] Mon Nov 9 23:59:49 2009 @@ -115,16 +115,6 @@ return TRUE; } -VOID -NTAPI -HalpInitNonBusHandler(VOID) -{ - /* These should be written by the PCI driver later, but we give defaults */ - HalPciTranslateBusAddress = HalpTranslateBusAddress; - HalPciAssignSlotResources = HalpAssignSlotResources; - HalFindBusAddressTranslation = HalpFindBusAddressTranslation; -} - /* PUBLIC FUNCTIONS **********************************************************/ /* Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Mon Nov 9 23:59:49 2009 @@ -139,8 +139,8 @@ } else if (BootPhase == 1) { - /* Initialize the default HAL stubs for bus handling functions */ - HalpInitNonBusHandler(); + /* Initialize bus handlers */ + HalpInitBusHandler(); /* Enable IRQ 0 */ HalpEnableInterruptHandler(IDT_DEVICE, Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Mon Nov 9 23:59:49 2009 @@ -157,6 +157,19 @@ PCI_CARD_DESCRIPTOR CardList[ANYSIZE_ARRAY]; } PCI_REGISTRY_INFO_INTERNAL, *PPCI_REGISTRY_INFO_INTERNAL; +typedef struct _ARRAY +{ + ULONG ArraySize; + PVOID Element[ANYSIZE_ARRAY]; +} ARRAY, *PARRAY; + +typedef struct _HAL_BUS_HANDLER +{ + LIST_ENTRY AllHandlers; + ULONG ReferenceCount; + BUS_HANDLER Handler; +} HAL_BUS_HANDLER, *PHAL_BUS_HANDLER; + /* FUNCTIONS *****************************************************************/ VOID @@ -306,6 +319,45 @@ VOID ); +VOID +NTAPI +HalpInitBusHandler( + VOID +); + +BOOLEAN +NTAPI +HalpTranslateBusAddress( + IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber, + IN PHYSICAL_ADDRESS BusAddress, + IN OUT PULONG AddressSpace, + OUT PPHYSICAL_ADDRESS TranslatedAddress +); + +NTSTATUS +NTAPI +HalpAssignSlotResources( + IN PUNICODE_STRING RegistryPath, + IN PUNICODE_STRING DriverClassName, + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT DeviceObject, + IN INTERFACE_TYPE BusType, + IN ULONG BusNumber, + IN ULONG SlotNumber, + IN OUT PCM_RESOURCE_LIST *AllocatedResources +); + +BOOLEAN +NTAPI +HalpFindBusAddressTranslation( + IN PHYSICAL_ADDRESS BusAddress, + IN OUT PULONG AddressSpace, + OUT PPHYSICAL_ADDRESS TranslatedAddress, + IN OUT PULONG_PTR Context, + IN BOOLEAN NextBus +); + extern ULONG HalpBusType; extern BOOLEAN HalpPCIConfigInitialized; extern BUS_HANDLER HalpFakePciBusHandler; Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Mon Nov 9 23:59:49 2009 @@ -61,9 +61,6 @@ /* adapter.c */ PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses); -/* bus.c */ -VOID NTAPI HalpInitNonBusHandler (VOID); - /* sysinfo.c */ VOID NTAPI Modified: trunk/reactos/include/ndk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/haltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/haltypes.h [iso-8859-1] Mon Nov 9 23:59:49 2009 @@ -249,8 +249,10 @@ // // HAL Chip Hacks // -#define HAL_PCI_CHIP_HACK_DISABLE_HIBERNATE 0x02 -#define HAL_PCI_CHIP_HACK_USB_SMI_DISABLE 0x08 +#define HAL_PCI_CHIP_HACK_BROKEN_ACPI_TIMER 0x01 +#define HAL_PCI_CHIP_HACK_DISABLE_HIBERNATE 0x02 +#define HAL_PCI_CHIP_HACK_DISABLE_ACPI_IRQ_ROUTING 0x04 +#define HAL_PCI_CHIP_HACK_USB_SMI_DISABLE 0x08 // // Kernel Exports

1 0

[hyperion] 44060: ... on the other hand, O_BINARY is a Win32 thing
by hyperion＠svn.reactos.org 09 Nov '09

09 Nov '09

Author: hyperion Date: Mon Nov 9 23:56:06 2009 New Revision: 44060 URL: http://svn.reactos.org/svn/reactos?rev=44060&view=rev Log: ... on the other hand, O_BINARY is a Win32 thing Modified: trunk/reactos/tools/pefixup.c Modified: trunk/reactos/tools/pefixup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.c?rev=44060&… ============================================================================== --- trunk/reactos/tools/pefixup.c [iso-8859-1] (original) +++ trunk/reactos/tools/pefixup.c [iso-8859-1] Mon Nov 9 23:56:06 2009 @@ -25,6 +25,10 @@ #include <string.h> #include <fcntl.h> #include <unistd.h> + +#ifndef O_BINARY +#define O_BINARY 0 +#endif /* The following definitions are ripped from MinGW W32API headers. We don't use these headers directly in order to allow compilation on Linux hosts. */

1 0

[hyperion] 44059: modified base/shell/explorer/notifyhook/notifyhook.def modified dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def modified dll/nls/idndl/idndl.def modified dll/nls/normaliz/normaliz.def modified drivers/video/font/ftfd/freetype.def Soon, the rbuild "dllname" attribute will have no effect for .def files (only .spec/.pspec): prepare the sources for it by specifying the DLL name in the .def files themselves with the LIBRARY directory
by hyperion＠svn.reactos.org 09 Nov '09

09 Nov '09

Author: hyperion Date: Mon Nov 9 23:49:18 2009 New Revision: 44059 URL: http://svn.reactos.org/svn/reactos?rev=44059&view=rev Log: modified base/shell/explorer/notifyhook/notifyhook.def modified dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def modified dll/nls/idndl/idndl.def modified dll/nls/normaliz/normaliz.def modified drivers/video/font/ftfd/freetype.def Soon, the rbuild "dllname" attribute will have no effect for .def files (only .spec/.pspec): prepare the sources for it by specifying the DLL name in the .def files themselves with the LIBRARY directory Modified: trunk/reactos/base/shell/explorer/notifyhook/notifyhook.def trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def trunk/reactos/dll/nls/idndl/idndl.def trunk/reactos/dll/nls/normaliz/normaliz.def trunk/reactos/drivers/video/font/ftfd/freetype.def Modified: trunk/reactos/base/shell/explorer/notifyhook/notifyhook.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/notify… ============================================================================== --- trunk/reactos/base/shell/explorer/notifyhook/notifyhook.def [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/notifyhook/notifyhook.def [iso-8859-1] Mon Nov 9 23:49:18 2009 @@ -1,3 +1,4 @@ +LIBRARY notifyhook.dll EXPORTS DeinstallNotifyHook GetWindowModulePath Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def [iso-8859-1] Mon Nov 9 23:49:18 2009 @@ -1,5 +1,6 @@ +LIBRARY mesa32.dll DESCRIPTION 'Mesa (OpenGL driver) for Win32' -VERSION 7.4 +; VERSION 7.4 EXPORTS ; Modified: trunk/reactos/dll/nls/idndl/idndl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl/idndl.def?re… ============================================================================== --- trunk/reactos/dll/nls/idndl/idndl.def [iso-8859-1] (original) +++ trunk/reactos/dll/nls/idndl/idndl.def [iso-8859-1] Mon Nov 9 23:49:18 2009 @@ -1,4 +1,4 @@ -LIBRARY "idndl" +LIBRARY "idndl.dll" EXPORTS DownlevelGetLocaleScripts = DownlevelGetLocaleScripts@12 @1 Modified: trunk/reactos/dll/nls/normaliz/normaliz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz/normaliz.… ============================================================================== --- trunk/reactos/dll/nls/normaliz/normaliz.def [iso-8859-1] (original) +++ trunk/reactos/dll/nls/normaliz/normaliz.def [iso-8859-1] Mon Nov 9 23:49:18 2009 @@ -27,7 +27,7 @@ ; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ; POSSIBILITY OF SUCH DAMAGE. -LIBRARY "normaliz" +LIBRARY "normaliz.dll" EXPORTS IdnToAscii@20 = kernel32.IdnToAscii @1 Modified: trunk/reactos/drivers/video/font/ftfd/freetype.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/fr… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/freetype.def [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/freetype.def [iso-8859-1] Mon Nov 9 23:49:18 2009 @@ -1,4 +1,4 @@ -LIBRARY freetype +LIBRARY ftfd.dll EXPORTS FT_Done_Face FT_Done_Glyph

1 0

[hyperion] 44058: modified tools/pefixup.c MinGW provides a good enough POSIX-like environment to do away with a couple platform checks/hacks Print error messages on stderr instead of stdout Don't print anything when pefixup does nothing - "no news is good news"
by hyperion＠svn.reactos.org 09 Nov '09

09 Nov '09

Author: hyperion Date: Mon Nov 9 23:42:17 2009 New Revision: 44058 URL: http://svn.reactos.org/svn/reactos?rev=44058&view=rev Log: modified tools/pefixup.c MinGW provides a good enough POSIX-like environment to do away with a couple platform checks/hacks Print error messages on stderr instead of stdout Don't print anything when pefixup does nothing - "no news is good news" Modified: trunk/reactos/tools/pefixup.c Modified: trunk/reactos/tools/pefixup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.c?rev=44058&… ============================================================================== --- trunk/reactos/tools/pefixup.c [iso-8859-1] (original) +++ trunk/reactos/tools/pefixup.c [iso-8859-1] Mon Nov 9 23:42:17 2009 @@ -24,13 +24,7 @@ #include <stdlib.h> #include <string.h> #include <fcntl.h> -#ifndef _WIN32 #include <unistd.h> -#endif - -#ifndef O_BINARY -#define O_BINARY 0 -#endif /* The following definitions are ripped from MinGW W32API headers. We don't use these headers directly in order to allow compilation on Linux hosts. */ @@ -259,14 +253,14 @@ else if (!strcmp(argv[i], "-exports")) fixup_exports = 1; else - { printf("Invalid option: %s\n", argv[i]); return 1; } - } - + { fprintf(stderr, "Invalid option: %s\n", argv[i]); return 1; } + } + + /* + * Nothing to do. + */ if (fixup_sections == 0 && fixup_exports == 0) - { - printf("Nothing to do.\n"); return 0; - } /* * Read the whole file to memory. @@ -275,7 +269,7 @@ fd_in = open(argv[1], O_RDONLY | O_BINARY); if (fd_in == 0) { - printf("Can't open input file.\n"); + fprintf(stderr, "Can't open input file.\n"); return 1; } @@ -290,7 +284,7 @@ if (len < sizeof(IMAGE_DOS_HEADER)) { close(fd_in); - printf("'%s' isn't a PE image (too short)\n", argv[1]); + fprintf(stderr, "'%s' isn't a PE image (too short)\n", argv[1]); return 1; } @@ -300,7 +294,7 @@ if (buffer == NULL) { close(fd_in); - printf("Not enough memory available.\n"); + fprintf(stderr, "Not enough memory available.\n"); return 1; } @@ -323,7 +317,7 @@ if (dtohs(dos_header->e_magic) != IMAGE_DOS_SIGNATURE || dtohl(nt_header->Signature) != IMAGE_NT_SIGNATURE) { - printf("'%s' isn't a PE image (bad headers)\n", argv[1]); + fprintf(stderr, "'%s' isn't a PE image (bad headers)\n", argv[1]); free(buffer); return 1; } @@ -345,7 +339,7 @@ exports = malloc(sizeof(export_t) * dtohl(export_directory->NumberOfNames)); if (exports == NULL) { - printf("Not enough memory.\n"); + fprintf(stderr, "Not enough memory.\n"); free(buffer); return 1; }

1 0

[sginsberg] 44057: - Set and check for the correct PTE write bits on x86 SMP. The MP kernel is now functional again.
by sginsberg＠svn.reactos.org 09 Nov '09

09 Nov '09

Author: sginsberg Date: Mon Nov 9 23:05:36 2009 New Revision: 44057 URL: http://svn.reactos.org/svn/reactos?rev=44057&view=rev Log: - Set and check for the correct PTE write bits on x86 SMP. The MP kernel is now functional again. Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Mon Nov 9 23:05:36 2009 @@ -45,10 +45,18 @@ #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.CacheDisable = 1) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.WriteThrough = 1) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.WriteThrough = 0) +#if !defined(CONFIG_SMP) #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Write == 1) +#else +#define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Writable == 1) +#endif #define MI_IS_PAGE_COPY_ON_WRITE(x)((x)->u.Hard.CopyOnWrite == 1) #define MI_IS_PAGE_DIRTY(x) ((x)->u.Hard.Dirty == 1) #define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Owner = 1) +#if !defined(CONFIG_SMP) #define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.Write = 1) +#else +#define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.Writable = 1) +#endif #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H */

1 0

[tkreuzer] 44056: Fix my broken copy pasta, spotted by talley
by tkreuzer＠svn.reactos.org 09 Nov '09

09 Nov '09

Author: tkreuzer Date: Mon Nov 9 22:49:56 2009 New Revision: 44056 URL: http://svn.reactos.org/svn/reactos?rev=44056&view=rev Log: Fix my broken copy pasta, spotted by talley Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/context.c [iso-8859-1] Mon Nov 9 22:49:56 2009 @@ -59,10 +59,15 @@ TrapFrame->Xmm4 = Context->Xmm4; TrapFrame->Xmm5 = Context->Xmm5; ExceptionFrame->Xmm6 = Context->Xmm6; - ExceptionFrame->Xmm6 = Context->Xmm6; - ExceptionFrame->Xmm6 = Context->Xmm6; - ExceptionFrame->Xmm6 = Context->Xmm6; - ExceptionFrame->Xmm6 = Context->Xmm6; + ExceptionFrame->Xmm7 = Context->Xmm7; + ExceptionFrame->Xmm8 = Context->Xmm8; + ExceptionFrame->Xmm9 = Context->Xmm9; + ExceptionFrame->Xmm10 = Context->Xmm10; + ExceptionFrame->Xmm11 = Context->Xmm11; + ExceptionFrame->Xmm12 = Context->Xmm12; + ExceptionFrame->Xmm13 = Context->Xmm13; + ExceptionFrame->Xmm14 = Context->Xmm14; + ExceptionFrame->Xmm15 = Context->Xmm15; } /* Handle control registers */ @@ -170,10 +175,15 @@ Context->Xmm4 = TrapFrame->Xmm4; Context->Xmm5 = TrapFrame->Xmm5; Context->Xmm6 = ExceptionFrame->Xmm6; - Context->Xmm6 = ExceptionFrame->Xmm6; - Context->Xmm6 = ExceptionFrame->Xmm6; - Context->Xmm6 = ExceptionFrame->Xmm6; - Context->Xmm6 = ExceptionFrame->Xmm6; + Context->Xmm7 = ExceptionFrame->Xmm7; + Context->Xmm8 = ExceptionFrame->Xmm8; + Context->Xmm9 = ExceptionFrame->Xmm9; + Context->Xmm10 = ExceptionFrame->Xmm10; + Context->Xmm11 = ExceptionFrame->Xmm11; + Context->Xmm12 = ExceptionFrame->Xmm12; + Context->Xmm13 = ExceptionFrame->Xmm13; + Context->Xmm14 = ExceptionFrame->Xmm14; + Context->Xmm15 = ExceptionFrame->Xmm15; } /* Handle control registers */

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