Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[gschneider] 47632: [WIN32K] Free allocations with the tag that was used to allocate them
by gschneider＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: gschneider Date: Sun Jun 6 20:34:57 2010 New Revision: 47632 URL: http://svn.reactos.org/svn/reactos?rev=47632&view=rev Log: [WIN32K] Free allocations with the tag that was used to allocate them Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Jun 6 20:34:57 2010 @@ -983,7 +983,7 @@ } /* free the message */ - ExFreePool(Message); + ExFreePoolWithTag(Message, TAG_USRMSG); return(TRUE); } @@ -1060,7 +1060,7 @@ } /* free the message */ - ExFreePool(SentMessage); + ExFreePoolWithTag(SentMessage, TAG_USRMSG); CurrentEntry = MessageQueue->SentMessagesListHead.Flink; }

1 0

[gschneider] 47631: [WIN32K] assert -> ASSERT
by gschneider＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: gschneider Date: Sun Jun 6 20:32:57 2010 New Revision: 47631 URL: http://svn.reactos.org/svn/reactos?rev=47631&view=rev Log: [WIN32K] assert -> ASSERT Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] Sun Jun 6 20:32:57 2010 @@ -597,7 +597,7 @@ Driver = Driver->Next; } DPRINT( "Driver %S not found to reference, generic count: %d\n", Name, GenericDriver->ReferenceCount ); - assert( GenericDriver != 0 ); + ASSERT( GenericDriver != 0 ); return ++GenericDriver->ReferenceCount; } @@ -615,7 +615,7 @@ Driver = Driver->Next; } DPRINT( "Driver '%S' not found to dereference, generic count: %d\n", Name, GenericDriver->ReferenceCount ); - assert( GenericDriver != 0 ); + ASSERT( GenericDriver != 0 ); return --GenericDriver->ReferenceCount; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Jun 6 20:32:57 2010 @@ -145,7 +145,7 @@ break; default: - assert(FALSE); + ASSERT(FALSE); Size = 0; break; } Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Sun Jun 6 20:32:57 2010 @@ -1745,7 +1745,7 @@ } while (iModeNum-- > 0 && CachedMode < CachedDevModesEnd) { - assert(CachedMode->dmSize > 0); + ASSERT(CachedMode->dmSize > 0); CachedMode = (DEVMODEW *)((PCHAR)CachedMode + CachedMode->dmSize + CachedMode->dmDriverExtra); } if (CachedMode >= CachedDevModesEnd)

1 0

[cgutman] 47630: [NDIS] - Implement miniport timer queuing - Add some BUGCODE_ID_DRIVER bug check cases for missing interrupt deregistration, missing timer cancellation, and invalid IRQL when calling NdisMAllocateSharedMemory
by cgutman＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: cgutman Date: Sun Jun 6 20:09:25 2010 New Revision: 47630 URL: http://svn.reactos.org/svn/reactos?rev=47630&view=rev Log: [NDIS] - Implement miniport timer queuing - Add some BUGCODE_ID_DRIVER bug check cases for missing interrupt deregistration, missing timer cancellation, and invalid IRQL when calling NdisMAllocateSharedMemory Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Sun Jun 6 20:09:25 2010 @@ -171,6 +171,15 @@ NDIS_DbgPrint(MAX_TRACE,("Called.\n")); + if (KeGetCurrentIrql() != PASSIVE_LEVEL) + { + KeBugCheckEx(BUGCODE_ID_DRIVER, + (ULONG_PTR)MiniportAdapterHandle, + Length, + 0, + 1); + } + *VirtualAddress = Adapter->NdisMiniportBlock.SystemAdapterObject->DmaOperations->AllocateCommonBuffer( Adapter->NdisMiniportBlock.SystemAdapterObject, Length, PhysicalAddress, Cached); } Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Jun 6 20:09:25 2010 @@ -364,6 +364,15 @@ NdisMIndicateStatusComplete(Adapter); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + if (Adapter->NdisMiniportBlock.ResetStatus != NDIS_STATUS_PENDING) + { + KeBugCheckEx(BUGCODE_ID_DRIVER, + (ULONG_PTR)MiniportAdapterHandle, + (ULONG_PTR)Status, + (ULONG_PTR)AddressingReset, + 0); + } Adapter->NdisMiniportBlock.ResetStatus = Status; @@ -1959,6 +1968,22 @@ { NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + if (Adapter->NdisMiniportBlock.Interrupt) + { + KeBugCheckEx(BUGCODE_ID_DRIVER, + (ULONG_PTR)Adapter, + (ULONG_PTR)Adapter->NdisMiniportBlock.Interrupt, + (ULONG_PTR)Adapter->NdisMiniportBlock.TimerQueue, + 1); + } + if (Adapter->NdisMiniportBlock.TimerQueue) + { + KeBugCheckEx(BUGCODE_ID_DRIVER, + (ULONG_PTR)Adapter, + (ULONG_PTR)Adapter->NdisMiniportBlock.Interrupt, + (ULONG_PTR)Adapter->NdisMiniportBlock.TimerQueue, + 1); + } return NdisStatus; } Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Jun 6 20:09:25 2010 @@ -95,6 +95,32 @@ KeInitializeDpc (&Timer->Dpc, (PKDEFERRED_ROUTINE)TimerFunction, FunctionContext); } +VOID DequeueMiniportTimer(PNDIS_MINIPORT_TIMER Timer) +{ + PNDIS_MINIPORT_TIMER CurrentTimer; + + ASSERT(Timer->Miniport->TimerQueue); + + if (Timer->Miniport->TimerQueue == Timer) + { + Timer->Miniport->TimerQueue = Timer->NextDeferredTimer; + } + else + { + CurrentTimer = Timer->Miniport->TimerQueue; + while (CurrentTimer->NextDeferredTimer) + { + if (CurrentTimer->NextDeferredTimer == Timer) + { + CurrentTimer->NextDeferredTimer = Timer->NextDeferredTimer; + return; + } + CurrentTimer = CurrentTimer->NextDeferredTimer; + } + ASSERT(FALSE); + } +} + /* * @implemented @@ -118,6 +144,25 @@ ASSERT(Timer); *TimerCancelled = KeCancelTimer (&Timer->Timer); + + DequeueMiniportTimer(Timer); +} + +VOID NTAPI +MiniTimerDpcFunction(PKDPC Dpc, + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2) +{ + PNDIS_MINIPORT_TIMER Timer = DeferredContext; + + Timer->MiniportTimerFunction(Dpc, + Timer->MiniportTimerContext, + SystemArgument1, + SystemArgument2); + + /* FIXME: We can't call this if we have a periodic timer */ + //DequeueMiniportTimer(Timer); } @@ -145,9 +190,14 @@ { PAGED_CODE(); ASSERT(Timer); + KeInitializeTimer (&Timer->Timer); - - KeInitializeDpc (&Timer->Dpc, (PKDEFERRED_ROUTINE)TimerFunction, FunctionContext); + KeInitializeDpc (&Timer->Dpc, MiniTimerDpcFunction, Timer); + + Timer->MiniportTimerFunction = TimerFunction; + Timer->MiniportTimerContext = FunctionContext; + Timer->Miniport = &((PLOGICAL_ADAPTER)MiniportAdapterHandle)->NdisMiniportBlock; + Timer->NextDeferredTimer = NULL; } @@ -177,6 +227,10 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000); + /* Add the timer at the head of the timer queue */ + Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; + Timer->Miniport->TimerQueue = Timer; + KeSetTimerEx (&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc); } @@ -207,6 +261,10 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000); + + /* Add the timer at the head of the timer queue */ + Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; + Timer->Miniport->TimerQueue = Timer; KeSetTimer (&Timer->Timer, Timeout, &Timer->Dpc); }

1 0

[spetreolle] 47629: Forgotten in previous commit.
by spetreolle＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: spetreolle Date: Sun Jun 6 18:46:25 2010 New Revision: 47629 URL: http://svn.reactos.org/svn/reactos?rev=47629&view=rev Log: Forgotten in previous commit. Modified: branches/aicom-network-branch/lib/rtl/network.c Modified: branches/aicom-network-branch/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/rtl/ne… ============================================================================== --- branches/aicom-network-branch/lib/rtl/network.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/rtl/network.c [iso-8859-1] Sun Jun 6 18:46:25 2010 @@ -103,9 +103,9 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressW(IN PWCHAR String, - IN UCHAR Strict, - OUT PWCHAR Terminator, +RtlIpv4StringToAddressW(IN PCWSTR String, + IN BOOLEAN Strict, + OUT LPTSTR *Terminator, OUT struct in_addr *Addr) { UNIMPLEMENTED;

1 0

[spetreolle] 47628: Fix RtlIpv4StringToAddressW prototype and its caller in ws2_32. Fixes crash in GetAddrInfoW on xp sp3.
by spetreolle＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: spetreolle Date: Sun Jun 6 18:33:17 2010 New Revision: 47628 URL: http://svn.reactos.org/svn/reactos?rev=47628&view=rev Log: Fix RtlIpv4StringToAddressW prototype and its caller in ws2_32. Fixes crash in GetAddrInfoW on xp sp3. Modified: branches/aicom-network-branch/dll/win32/ws2_32/src/addrinfo.c branches/aicom-network-branch/include/ndk/rtlfuncs.h Modified: branches/aicom-network-branch/dll/win32/ws2_32/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/ws2_32/src/addrinfo.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/ws2_32/src/addrinfo.c [iso-8859-1] Sun Jun 6 18:33:17 2010 @@ -91,7 +91,7 @@ LPWSTR Ip = 0; /* Do the conversion, don't accept wildcard */ - RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, Ip, (IN_ADDR *)&Address); + RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, &Ip, (IN_ADDR *)&Address); /* Return the address and success */ *pAddress = Address; Modified: branches/aicom-network-branch/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/nd… ============================================================================== --- branches/aicom-network-branch/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ branches/aicom-network-branch/include/ndk/rtlfuncs.h [iso-8859-1] Sun Jun 6 18:33:17 2010 @@ -3183,9 +3183,9 @@ NTSTATUS NTAPI RtlIpv4StringToAddressW( - IN PWCHAR String, - IN UCHAR Strict, - OUT PWCHAR Terminator, + IN PCWSTR String, + IN BOOLEAN Strict, + OUT LPWSTR *Terminator, OUT struct in_addr *Addr );

1 0

[sir_richard] 47627: [NTOS]: Enable usage of ARM3 paged pool, up until Mm Phase 2. [NTOS]: Re-arrange some of the init code, now that we have access to ARM3 paged pool early-on. Move more code to ARM3::INIT in its right place. [NTOS]: Enable using the ARM3 PFN Database, getting rid of the old ReactOS PFN database. Should reduce physical memory usage now that we don't have two copies anymore. [NTOS]: Fix the ARM3 PFN Datbase initialization code. [NTOS]: Get rid of MiInitializePageList, use MiGetP
by sir_richard＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: sir_richard Date: Sun Jun 6 17:59:42 2010 New Revision: 47627 URL: http://svn.reactos.org/svn/reactos?rev=47627&view=rev Log: [NTOS]: Enable usage of ARM3 paged pool, up until Mm Phase 2. [NTOS]: Re-arrange some of the init code, now that we have access to ARM3 paged pool early-on. Move more code to ARM3::INIT in its right place. [NTOS]: Enable using the ARM3 PFN Database, getting rid of the old ReactOS PFN database. Should reduce physical memory usage now that we don't have two copies anymore. [NTOS]: Fix the ARM3 PFN Datbase initialization code. [NTOS]: Get rid of MiInitializePageList, use MiGetPfnEntryOffset instead of hard-coded pointer math in freelist.c. This is the last big low-level Mm/ARM3 patch for a long, long time. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Jun 6 17:59:42 2010 @@ -364,7 +364,7 @@ } u4; } MMPFN, *PMMPFN; -extern PMMPFN MmPfnDatabase[2]; +extern PMMPFN MmPfnDatabase; typedef struct _MMPFNLIST { @@ -1095,7 +1095,7 @@ if ((MiPfnBitMap.Buffer) && !(RtlTestBit(&MiPfnBitMap, Pfn))) return NULL; /* Get the entry */ - Page = &MmPfnDatabase[0][Pfn]; + Page = &MmPfnDatabase[Pfn]; /* Return it */ return Page; @@ -1108,7 +1108,7 @@ // // This will return the Page Frame Number (PFN) from the MMPFN // - return Pfn1 - MmPfnDatabase[0]; + return Pfn1 - MmPfnDatabase; } PFN_TYPE Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sun Jun 6 17:59:42 2010 @@ -19,7 +19,7 @@ #undef ExAllocatePoolWithQuota #undef ExAllocatePoolWithQuotaTag -BOOLEAN AllowPagedPool = FALSE; +BOOLEAN AllowPagedPool = TRUE; /* GLOBALS ********************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sun Jun 6 17:59:42 2010 @@ -306,7 +306,7 @@ // then add the color tables and convert to pages // MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); - MxPfnAllocation <<= 1; + //MxPfnAllocation <<= 1; MxPfnAllocation += (MmSecondaryColors * sizeof(MMCOLOR_TABLES) * 2); MxPfnAllocation >>= PAGE_SHIFT; @@ -380,19 +380,13 @@ // with the old memory manager, so we'll create a "Shadow PFN Database" // instead, and arbitrarly start it at 0xB0000000. // - // We actually create two PFN databases, one for ReactOS starting here, - // and the next one used for ARM3, which starts right after. The MmPfnAllocation - // variable actually holds the size of both (the colored tables come after - // the ARM3 PFN database). - // - MmPfnDatabase[0] = (PVOID)0xB0000000; - MmPfnDatabase[1] = &MmPfnDatabase[0][MmHighestPhysicalPage]; - ASSERT(((ULONG_PTR)MmPfnDatabase[0] & (PDE_MAPPED_VA - 1)) == 0); + MmPfnDatabase = (PVOID)0xB0000000; + ASSERT(((ULONG_PTR)MmPfnDatabase & (PDE_MAPPED_VA - 1)) == 0); // // Non paged pool comes after the PFN database // - MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmPfnDatabase[0] + + MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT)); // @@ -443,7 +437,7 @@ // // Now we need pages for the page tables which will map initial NP // - StartPde = MiAddressToPde(MmPfnDatabase[0]); + StartPde = MiAddressToPde(MmPfnDatabase); EndPde = MiAddressToPde((PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); while (StartPde <= EndPde) @@ -510,12 +504,14 @@ /* Initialize the color tables */ MiInitializeColorTables(); + /* ReactOS Stuff */ + extern KEVENT ZeroPageThreadEvent; + KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); + /* Build the PFN Database */ MiInitializePfnDatabase(LoaderBlock); - - /* Call back into shitMM to setup the ReactOS PFN database */ - MmInitializePageList(); - + MmInitializeBalancer(MmAvailablePages, 0); + // // Reset the descriptor back so we can create the correct memory blocks // Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sun Jun 6 17:59:42 2010 @@ -439,7 +439,7 @@ MMPTE TempPte = ValidKernelPte; /* The color table starts after the ARM3 PFN database */ - MmFreePagesByColor[0] = (PMMCOLOR_TABLES)&MmPfnDatabase[1][MmHighestPhysicalPage + 1]; + MmFreePagesByColor[0] = (PMMCOLOR_TABLES)&MmPfnDatabase[MmHighestPhysicalPage + 1]; /* Loop the PTEs. We have two color tables for each secondary color */ PointerPte = MiAddressToPte(&MmFreePagesByColor[0][0]); @@ -585,8 +585,8 @@ } /* Get the PTEs for this range */ - PointerPte = MiAddressToPte(&MmPfnDatabase[0][BasePage]); - LastPte = MiAddressToPte(((ULONG_PTR)&MmPfnDatabase[0][BasePage + PageCount]) - 1); + PointerPte = MiAddressToPte(&MmPfnDatabase[BasePage]); + LastPte = MiAddressToPte(((ULONG_PTR)&MmPfnDatabase[BasePage + PageCount]) - 1); DPRINT("MD Type: %lx Base: %lx Count: %lx\n", MdBlock->MemoryType, BasePage, PageCount); /* Loop them */ @@ -625,49 +625,7 @@ /* Next! */ PointerPte++; } - - /* Get the PTEs for this range */ - PointerPte = MiAddressToPte(&MmPfnDatabase[1][BasePage]); - LastPte = MiAddressToPte(((ULONG_PTR)&MmPfnDatabase[1][BasePage + PageCount]) - 1); - DPRINT("MD Type: %lx Base: %lx Count: %lx\n", MdBlock->MemoryType, BasePage, PageCount); - - /* Loop them */ - while (PointerPte <= LastPte) - { - /* We'll only touch PTEs that aren't already valid */ - if (PointerPte->u.Hard.Valid == 0) - { - /* Use the next free page */ - TempPte.u.Hard.PageFrameNumber = FreePage; - ASSERT(FreePageCount != 0); - - /* Consume free pages */ - FreePage++; - FreePageCount--; - if (!FreePageCount) - { - /* Out of memory */ - KeBugCheckEx(INSTALL_MORE_MEMORY, - MmNumberOfPhysicalPages, - FreePageCount, - MxOldFreeDescriptor.PageCount, - 1); - } - - /* Write out this PTE */ - PagesLeft++; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; - - /* Zero this page */ - RtlZeroMemory(MiPteToAddress(PointerPte), PAGE_SIZE); - } - - /* Next! */ - PointerPte++; - } - + /* Do the next address range */ NextEntry = MdBlock->ListEntry.Flink; } @@ -706,7 +664,7 @@ if (MiIsRegularMemory(LoaderBlock, PageFrameIndex)) { /* Yes we do, set it up */ - Pfn1 = MI_PFN_TO_PFNENTRY(PageFrameIndex); + Pfn1 = MiGetPfnEntry(PageFrameIndex); Pfn1->u4.PteFrame = StartupPdIndex; Pfn1->PteAddress = PointerPde; Pfn1->u2.ShareCount++; @@ -745,7 +703,7 @@ MmSizeOfNonPagedPoolInBytes))) { /* Get the PFN entry and make sure it too is valid */ - Pfn2 = MI_PFN_TO_PFNENTRY(PtePageIndex); + Pfn2 = MiGetPfnEntry(PtePageIndex); if ((MmIsAddressValid(Pfn2)) && (MmIsAddressValid(Pfn2 + 1))) { @@ -785,7 +743,7 @@ PMMPDE PointerPde; /* Grab the lowest page and check if it has no real references */ - Pfn1 = MI_PFN_TO_PFNENTRY(MmLowestPhysicalPage); + Pfn1 = MiGetPfnEntry(MmLowestPhysicalPage); if (!(MmLowestPhysicalPage) && !(Pfn1->u3.e2.ReferenceCount)) { /* Make it a bogus page to catch errors */ @@ -810,6 +768,7 @@ PMMPFN Pfn1; PMMPTE PointerPte; PMMPDE PointerPde; + KIRQL OldIrql; /* Now loop through the descriptors */ NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; @@ -860,14 +819,18 @@ /* Get the last page of this descriptor. Note we loop backwards */ PageFrameIndex += PageCount - 1; - Pfn1 = MI_PFN_TO_PFNENTRY(PageFrameIndex); + Pfn1 = MiGetPfnEntry(PageFrameIndex); + + /* Lock the PFN Database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); while (PageCount--) { /* If the page really has no references, mark it as free */ if (!Pfn1->u3.e2.ReferenceCount) { + /* Add it to the free list */ Pfn1->u3.e1.CacheAttribute = MiNonCached; - //MiInsertPageInFreeList(PageFrameIndex); + MiInsertPageInFreeList(PageFrameIndex); } /* Go to the next page */ @@ -875,6 +838,9 @@ PageFrameIndex--; } + /* Release PFN database */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + /* Done with this block */ break; @@ -890,7 +856,7 @@ /* Map these pages with the KSEG0 mapping that adds 0x80000000 */ PointerPte = MiAddressToPte(KSEG0_BASE + (PageFrameIndex << PAGE_SHIFT)); - Pfn1 = MI_PFN_TO_PFNENTRY(PageFrameIndex); + Pfn1 = MiGetPfnEntry(PageFrameIndex); while (PageCount--) { /* Check if the page is really unused */ @@ -940,15 +906,15 @@ PMMPFN Pfn1; /* Loop the PFN database page */ - PointerPte = MiAddressToPte(MI_PFN_TO_PFNENTRY(MmLowestPhysicalPage)); - LastPte = MiAddressToPte(MI_PFN_TO_PFNENTRY(MmHighestPhysicalPage)); + PointerPte = MiAddressToPte(MiGetPfnEntry(MmLowestPhysicalPage)); + LastPte = MiAddressToPte(MiGetPfnEntry(MmHighestPhysicalPage)); while (PointerPte <= LastPte) { /* Make sure the page is valid */ if (PointerPte->u.Hard.Valid == 1) { /* Get the PFN entry and just mark it referenced */ - Pfn1 = MI_PFN_TO_PFNENTRY(PointerPte->u.Hard.PageFrameNumber); + Pfn1 = MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber); Pfn1->u2.ShareCount = 1; Pfn1->u3.e2.ReferenceCount = 1; } @@ -1258,7 +1224,7 @@ // for (i = 0; i <= MmHighestPhysicalPage; i++) { - Pfn1 = MI_PFN_TO_PFNENTRY(i); + Pfn1 = MiGetPfnEntry(i); if (!Pfn1) continue; // @@ -1848,7 +1814,7 @@ // Sync us up with ReactOS Mm // MiSyncARM3WithROS(MmNonPagedSystemStart, (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - 1)); - MiSyncARM3WithROS(MmPfnDatabase[0], (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); + MiSyncARM3WithROS(MmPfnDatabase, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); MiSyncARM3WithROS((PVOID)HYPER_SPACE, (PVOID)(HYPER_SPACE + PAGE_SIZE - 1)); // @@ -2029,6 +1995,12 @@ /* Size up paged pool and build the shadow system page directory */ MiBuildPagedPool(); + + /* Debugger physical memory support is now ready to be used */ + MiDbgReadyForPhysical = TRUE; + + /* Initialize the loaded module list */ + MiInitializeLoadedModuleList(LoaderBlock); } // Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sun Jun 6 17:59:42 2010 @@ -33,8 +33,7 @@ #define PHYSICAL_PAGE MMPFN #define PPHYSICAL_PAGE PMMPFN -/* The first array contains ReactOS PFNs, the second contains ARM3 PFNs */ -PPHYSICAL_PAGE MmPfnDatabase[2]; +PPHYSICAL_PAGE MmPfnDatabase; PFN_NUMBER MmAvailablePages; PFN_NUMBER MmResidentAvailablePages; @@ -450,89 +449,6 @@ VOID NTAPI -MmInitializePageList(VOID) -{ - ULONG i; - PHYSICAL_PAGE UsedPage; - PMEMORY_ALLOCATION_DESCRIPTOR Md; - PLIST_ENTRY NextEntry; - ULONG NrSystemPages = 0; - KIRQL OldIrql; - - /* This is what a used page looks like */ - RtlZeroMemory(&UsedPage, sizeof(UsedPage)); - UsedPage.u3.e1.PageLocation = ActiveAndValid; - UsedPage.u3.e2.ReferenceCount = 1; - - /* Lock PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* Loop the memory descriptors */ - for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; - NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; - NextEntry = NextEntry->Flink) - { - /* Get the descriptor */ - Md = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Skip bad memory */ - if ((Md->MemoryType == LoaderFirmwarePermanent) || - (Md->MemoryType == LoaderBBTMemory) || - (Md->MemoryType == LoaderSpecialMemory) || - (Md->MemoryType == LoaderBad)) - { - // - // We do not build PFN entries for this - // - continue; - } - else if ((Md->MemoryType == LoaderFree) || - (Md->MemoryType == LoaderLoadedProgram) || - (Md->MemoryType == LoaderFirmwareTemporary) || - (Md->MemoryType == LoaderOsloaderStack)) - { - /* Loop every page part of the block */ - for (i = 0; i < Md->PageCount; i++) - { - /* Mark it as a free page */ - MmPfnDatabase[0][Md->BasePage + i].u3.e1.PageLocation = FreePageList; - MiInsertInListTail(&MmFreePageListHead, - &MmPfnDatabase[0][Md->BasePage + i]); - MmAvailablePages++; - } - } - else - { - /* Loop every page part of the block */ - for (i = 0; i < Md->PageCount; i++) - { - /* Everything else is used memory */ - MmPfnDatabase[0][Md->BasePage + i] = UsedPage; - NrSystemPages++; - } - } - } - - /* Finally handle the pages describing the PFN database themselves */ - for (i = MxOldFreeDescriptor.BasePage; i < MxFreeDescriptor->BasePage; i++) - { - /* Mark it as used kernel memory */ - MmPfnDatabase[0][i] = UsedPage; - NrSystemPages++; - } - - /* Release the PFN database lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - - KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); - DPRINT("Pages: %x %x\n", MmAvailablePages, NrSystemPages); - MmInitializeBalancer(MmAvailablePages, NrSystemPages); -} - -VOID -NTAPI MmSetRmapListHeadPage(PFN_TYPE Pfn, struct _MM_RMAP_ENTRY* ListHead) { KIRQL oldIrql; @@ -695,7 +611,7 @@ MmAvailablePages--; - PfnOffset = PageDescriptor - MmPfnDatabase[0]; + PfnOffset = MiGetPfnEntryIndex(PageDescriptor); if ((NeedClear) && (Type != MC_SYSTEM)) { MiZeroPage(PfnOffset); @@ -761,7 +677,7 @@ PageDescriptor = MiRemoveHeadList(&MmFreePageListHead); /* We set the page to used, because MmCreateVirtualMapping failed with unused pages */ KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - Pfn = PageDescriptor - MmPfnDatabase[0]; + Pfn = MiGetPfnEntryIndex(PageDescriptor); Status = MiZeroPage(Pfn); oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sun Jun 6 17:59:42 2010 @@ -109,7 +109,7 @@ // // Protect the PFN database // - BaseAddress = MmPfnDatabase[0]; + BaseAddress = MmPfnDatabase; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, @@ -292,8 +292,8 @@ (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize, "Paged Pool"); DPRINT1(" 0x%p - 0x%p\t%s\n", - MmPfnDatabase[0], - (ULONG_PTR)MmPfnDatabase[0] + (MxPfnAllocation << PAGE_SHIFT), + MmPfnDatabase, + (ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), "PFN Database"); DPRINT1(" 0x%p - 0x%p\t%s\n", MmNonPagedPoolStart, @@ -371,18 +371,8 @@ /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); - // - // Initialize ARMÂ³ in phase 0 - // + /* Initialize ARMÂ³ in phase 0 */ MmArmInitSystem(0, KeLoaderBlock); - -#if defined(_WINKD_) - // - // Everything required for the debugger to read and write - // physical memory is now set up - // - MiDbgReadyForPhysical = TRUE; -#endif /* Put the paged pool after the loaded modules */ MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart + @@ -394,15 +384,10 @@ /* Dump the address space */ MiDbgDumpAddressSpace(); - - /* Initialize paged pool */ - MmInitializePagedPool(); - - /* Initialize the loaded module list */ - MiInitializeLoadedModuleList(LoaderBlock); } else if (Phase == 1) { + MmInitializePagedPool(); MiInitializeUserPfnBitmap(); MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); MmInitializeRmapList(); @@ -453,7 +438,9 @@ } else if (Phase == 2) { - + /* Enough fun for now */ + extern BOOLEAN AllowPagedPool; + AllowPagedPool = FALSE; } return TRUE;

1 0

[sir_richard] 47626: [COMPBATT]: Remove useless function.
by sir_richard＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: sir_richard Date: Sun Jun 6 17:49:54 2010 New Revision: 47626 URL: http://svn.reactos.org/svn/reactos?rev=47626&view=rev Log: [COMPBATT]: Remove useless function. Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] Sun Jun 6 17:49:54 2010 @@ -209,15 +209,6 @@ CompBattSetStatusNotify(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, IN ULONG BatteryTag, IN PBATTERY_NOTIFY BatteryNotify) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -CompBattGetBatteryStatus(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, - IN ULONG Tag) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED;

1 0

[sginsberg] 47625: - Fix a comment and remove a superfluous extern.
by sginsberg＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: sginsberg Date: Sun Jun 6 16:42:03 2010 New Revision: 47625 URL: http://svn.reactos.org/svn/reactos?rev=47625&view=rev Log: - Fix a comment and remove a superfluous extern. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] Sun Jun 6 16:42:03 2010 @@ -42,7 +42,6 @@ MiDbgTranslatePhysicalAddress(IN ULONG64 PhysicalAddress, IN ULONG Flags) { - extern MMPTE ValidKernelPte; PFN_NUMBER Pfn; MMPTE TempPte; PVOID MappingBaseAddress; @@ -83,7 +82,7 @@ MappingBaseAddress = MiPteToAddress(MmDebugPte); // - // + // Get the template // TempPte = ValidKernelPte;

1 0

[sir_richard] 47624: [NTOS]: Another one bites the dust, another one bites the dust. And another one gone and another one gone. Another one bites the dust, yeah. Out of the doorway the bullets rip, Repeating to the sound of the beat.
by sir_richard＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: sir_richard Date: Sun Jun 6 16:24:18 2010 New Revision: 47624 URL: http://svn.reactos.org/svn/reactos?rev=47624&view=rev Log: [NTOS]: Another one bites the dust, another one bites the dust. And another one gone and another one gone. Another one bites the dust, yeah. Out of the doorway the bullets rip, Repeating to the sound of the beat. Added: trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c - copied, changed from r47623, trunk/reactos/ntoskrnl/mm/mmdbg.c Removed: trunk/reactos/ntoskrnl/mm/mmdbg.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Copied: trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c (from r47623, trunk/reactos/ntoskrnl/mm/mmdbg.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c?p… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] Sun Jun 6 16:24:18 2010 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/mm/mmdbg.c + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/mmdbg.c * PURPOSE: Memory Manager support routines for the Kernel Debugger * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) */ @@ -9,9 +9,16 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> -#include "ARM3/miarm.h" #define NDEBUG #include <debug.h> + +#line 16 "ARMÂ³::DEBUGSUP" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +#ifndef _WINKD_ +#define KdpDprintf DPRINT +#endif /* GLOBALS ********************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sun Jun 6 16:24:18 2010 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel -* LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/mm/sysldr.c +* LICENSE: BSD - See COPYING.ARM in the top level directory +* FILE: ntoskrnl/mm/ARM3/sysldr.c * PURPOSE: Contains the Kernel Loader (SYSLDR) for loading PE files. * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * ReactOS Portable Systems Group Removed: trunk/reactos/ntoskrnl/mm/mmdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmdbg.c?rev=47… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmdbg.c (removed) @@ -1,320 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/mm/mmdbg.c - * PURPOSE: Memory Manager support routines for the Kernel Debugger - * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) - */ - -/* INCLUDES *******************************************************************/ - -#include <ntoskrnl.h> -#include "ARM3/miarm.h" -#define NDEBUG -#include <debug.h> - -/* GLOBALS ********************************************************************/ - -PMMPTE MmDebugPte = MiAddressToPte(MI_DEBUG_MAPPING); -BOOLEAN MiDbgReadyForPhysical = FALSE; - -/* FUNCTIONS ******************************************************************/ - -BOOLEAN -NTAPI -MmIsSessionAddress(IN PVOID Address) -{ - // - // No session space support yet - // - return FALSE; -} - -PVOID -NTAPI -MiDbgTranslatePhysicalAddress(IN ULONG64 PhysicalAddress, - IN ULONG Flags) -{ - extern MMPTE ValidKernelPte; - PFN_NUMBER Pfn; - MMPTE TempPte; - PVOID MappingBaseAddress; - - // - // Check if we are called too early - // - if (MiDbgReadyForPhysical == FALSE) - { - // - // The structures we require aren't initialized yet, fail - // - KdpDprintf("MiDbgTranslatePhysicalAddress called too early! " - "Address: 0x%I64x\n", PhysicalAddress); - return NULL; - } - - // - // FIXME: No support for cache flags yet - // - if ((Flags & (MMDBG_COPY_CACHED | - MMDBG_COPY_UNCACHED | - MMDBG_COPY_WRITE_COMBINED)) != 0) - { - // - // Fail - // - KdpDprintf("MiDbgTranslatePhysicalAddress: Cache Flags not yet supported. " - "Flags: 0x%lx\n", Flags & (MMDBG_COPY_CACHED | - MMDBG_COPY_UNCACHED | - MMDBG_COPY_WRITE_COMBINED)); - return NULL; - } - - // - // Save the base address of our mapping page - // - MappingBaseAddress = MiPteToAddress(MmDebugPte); - - // - // - // - TempPte = ValidKernelPte; - - // - // Convert physical address to PFN - // - Pfn = (PFN_NUMBER)(PhysicalAddress >> PAGE_SHIFT); - - /* Check if this could be an I/O mapping */ - if (!MiGetPfnEntry(Pfn)) - { - // - // FIXME: We don't support this yet - // - KdpDprintf("MiDbgTranslatePhysicalAddress: I/O Space not yet supported. " - "PFN: 0x%I64x\n", (ULONG64)Pfn); - return NULL; - } - else - { - // - // Set the PFN in the PTE - // - TempPte.u.Hard.PageFrameNumber = Pfn; - } - - // - // Map the PTE and invalidate its TLB entry - // - *MmDebugPte = TempPte; - KeInvalidateTlbEntry(MappingBaseAddress); - - // - // Calculate and return the virtual offset into our mapping page - // - return (PVOID)((ULONG_PTR)MappingBaseAddress + - BYTE_OFFSET(PhysicalAddress)); -} - -VOID -NTAPI -MiDbgUnTranslatePhysicalAddress(VOID) -{ - PVOID MappingBaseAddress = MiPteToAddress(MmDebugPte); - - // - // The address must still be valid at this point - // - ASSERT(MmIsAddressValid(MappingBaseAddress)); - - // - // Clear the mapping PTE and invalidate its TLB entry - // - MmDebugPte->u.Long = 0; - KeInvalidateTlbEntry(MappingBaseAddress); -} - -NTSTATUS -NTAPI -MmDbgCopyMemory(IN ULONG64 Address, - IN PVOID Buffer, - IN ULONG Size, - IN ULONG Flags) -{ - NTSTATUS Status; - PVOID TargetAddress; - - // - // No local kernel debugging support yet, so don't worry about locking - // - ASSERT(Flags & MMDBG_COPY_UNSAFE); - - // - // We only handle 1, 2, 4 and 8 byte requests - // - if ((Size != 1) && - (Size != 2) && - (Size != 4) && - (Size != MMDBG_COPY_MAX_SIZE)) - { - // - // Invalid size, fail - // - KdpDprintf("MmDbgCopyMemory: Received Illegal Size 0x%lx\n", Size); - return STATUS_INVALID_PARAMETER_3; - } - - // - // The copy must be aligned - // - if ((Address & (Size - 1)) != 0) - { - // - // Fail - // - KdpDprintf("MmDbgCopyMemory: Received Unaligned Address 0x%I64x Size %lx\n", - Address, Size); - return STATUS_INVALID_PARAMETER_3; - } - - // - // Check if this is physical or virtual copy - // - if (Flags & MMDBG_COPY_PHYSICAL) - { - // - // Physical: translate and map it to our mapping space - // - TargetAddress = MiDbgTranslatePhysicalAddress(Address, Flags); - - // - // Check if translation failed - // - if (!TargetAddress) - { - // - // Fail - // - KdpDprintf("MmDbgCopyMemory: Failed to Translate Physical Address " - "%I64x\n", Address); - return STATUS_UNSUCCESSFUL; - } - - // - // The address we received must be valid! - // - ASSERT(MmIsAddressValid(TargetAddress)); - } - else - { - // - // Virtual; truncate it to avoid casts later down - // - TargetAddress = (PVOID)(ULONG_PTR)Address; - - // - // Check if the address is invalid - // - if (!MmIsAddressValid(TargetAddress)) - { - // - // Fail - // - KdpDprintf("MmDbgCopyMemory: Failing %s for invalid " - "Virtual Address 0x%p\n", - Flags & MMDBG_COPY_WRITE ? "write" : "read", - TargetAddress); - return STATUS_UNSUCCESSFUL; - } - - // - // No session space support yet - // - ASSERT(MmIsSessionAddress(TargetAddress) == FALSE); - } - - // - // If we are going to write to the address then make sure it is writeable too - // - if ((Flags & MMDBG_COPY_WRITE) && - (!MI_IS_PAGE_WRITEABLE(MiAddressToPte(TargetAddress)))) - { - // - // Check if we mapped anything - // - if (Flags & MMDBG_COPY_PHYSICAL) - { - // - // Get rid of the mapping - // - MiDbgUnTranslatePhysicalAddress(); - } - - // - // Fail - // - // FIXME: We should attempt to override the write protection instead of - // failing here - // - KdpDprintf("MmDbgCopyMemory: Failing Write for Protected Address 0x%p\n", - TargetAddress); - return STATUS_UNSUCCESSFUL; - } - - // - // Use SEH to try to catch anything else somewhat cleanly - // - _SEH2_TRY - { - // - // Check if this is read or write - // - if (Flags & MMDBG_COPY_WRITE) - { - // - // Do the write - // - RtlCopyMemory(TargetAddress, - Buffer, - Size); - } - else - { - // - // Do the read - // - RtlCopyMemory(Buffer, - TargetAddress, - Size); - } - - // - // Copy succeeded - // - Status = STATUS_SUCCESS; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - // - // Get the exception code - // - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - // - // Get rid of the mapping if this was a physical copy - // - if (Flags & MMDBG_COPY_PHYSICAL) - { - // - // Unmap and flush it - // - MiDbgUnTranslatePhysicalAddress(); - } - - // - // Return status to caller - // - return Status; -} Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jun 6 16:24:18 2010 @@ -397,6 +397,7 @@ <file>iosup.c</file> <file>largepag.c</file> <file>mdlsup.c</file> + <file>mmdbg.c</file> <file>mminit.c</file> <file>mmsup.c</file> <file>ncache.c</file> @@ -412,9 +413,6 @@ <file>balance.c</file> <file>freelist.c</file> <file>marea.c</file> - <if property="_WINKD_" value ="1"> - <file>mmdbg.c</file> - </if> <file>mmfault.c</file> <file>mminit.c</file> <file>mpw.c</file>

1 0

[sir_richard] 47623: [NTOS]: A PFN entry is not necessarily physical only if it is higher than MmHighestPhysicalPage. It can also be physical if it lies in a memory hole within the min-max physical page range. We can detect this by using our PFN Bitmap. So replace all "Is this an I/O mapping?" checks with a check on whether or not the PFN Database entry is NULL (which will check for us both of these statements). This ought to be a macro...
by sir_richard＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: sir_richard Date: Sun Jun 6 16:15:18 2010 New Revision: 47623 URL: http://svn.reactos.org/svn/reactos?rev=47623&view=rev Log: [NTOS]: A PFN entry is not necessarily physical only if it is higher than MmHighestPhysicalPage. It can also be physical if it lies in a memory hole within the min-max physical page range. We can detect this by using our PFN Bitmap. So replace all "Is this an I/O mapping?" checks with a check on whether or not the PFN Database entry is NULL (which will check for us both of these statements). This ought to be a macro... Modified: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/mmdbg.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/iosup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Sun Jun 6 16:15:18 2010 @@ -90,8 +90,8 @@ // Also translate the cache attribute // Pfn = (PFN_NUMBER)(PhysicalAddress.QuadPart >> PAGE_SHIFT); - IsIoMapping = (Pfn > MmHighestPhysicalPage) ? TRUE : FALSE; - if (!IsIoMapping) Pfn1 = MiGetPfnEntry(Pfn); + Pfn1 = MiGetPfnEntry(Pfn); + IsIoMapping = (Pfn1 == NULL) ? TRUE : FALSE; CacheAttribute = MiPlatformCacheAttributes[IsIoMapping][CacheType]; // @@ -219,7 +219,7 @@ // // Is this an I/O mapping? // - if (Pfn > MmHighestPhysicalPage) + if (!MiGetPfnEntry(Pfn)) { // // Destroy the PTE Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Sun Jun 6 16:15:18 2010 @@ -129,7 +129,7 @@ // // Check if this is an I/O mapping // - if (Pfn > MmHighestPhysicalPage) Mdl->MdlFlags |= MDL_IO_SPACE; + if (!MiGetPfnEntry(Pfn)) Mdl->MdlFlags |= MDL_IO_SPACE; } /* Modified: trunk/reactos/ntoskrnl/mm/mmdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmdbg.c?rev=47… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] Sun Jun 6 16:15:18 2010 @@ -85,10 +85,8 @@ // Pfn = (PFN_NUMBER)(PhysicalAddress >> PAGE_SHIFT); - // - // Check if this could be an I/O mapping - // - if (Pfn > MmHighestPhysicalPage) + /* Check if this could be an I/O mapping */ + if (!MiGetPfnEntry(Pfn)) { // // FIXME: We don't support this yet

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010