Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 43493: reenable some spinlock code
by tkreuzer＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: tkreuzer Date: Thu Oct 15 21:24:21 2009 New Revision: 43493 URL: http://svn.reactos.org/svn/reactos?rev=43493&view=rev Log: reenable some spinlock code Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/spinlock.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Thu Oct 15 21:24:21 2009 @@ -140,7 +140,6 @@ /* PUBLIC FUNCTIONS **********************************************************/ -#ifdef _X86_ /* * @implemented */ @@ -183,7 +182,6 @@ /* Clear it */ *SpinLock = 0; } -#endif /* * @implemented

1 0

[tkreuzer] 43492: - Add CPUID - rename Ke386InitThreadWithContext to KiInitializeContextThread
by tkreuzer＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: tkreuzer Date: Thu Oct 15 21:23:49 2009 New Revision: 43492 URL: http://svn.reactos.org/svn/reactos?rev=43492&view=rev Log: - Add CPUID - rename Ke386InitThreadWithContext to KiInitializeContextThread Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Thu Oct 15 21:23:49 2009 @@ -54,6 +54,28 @@ static const CHAR CmpCentaurID[] = "CentaurHauls"; static const CHAR CmpRiseID[] = "RiseRiseRise"; +/* SUPPORT ROUTINES FOR MSVC COMPATIBILITY ***********************************/ + +VOID +NTAPI +CPUID(IN ULONG InfoType, + OUT PULONG CpuInfoEax, + OUT PULONG CpuInfoEbx, + OUT PULONG CpuInfoEcx, + OUT PULONG CpuInfoEdx) +{ + ULONG CpuInfo[4]; + + /* Perform the CPUID Operation */ + __cpuid((int*)CpuInfo, InfoType); + + /* Return the results */ + *CpuInfoEax = CpuInfo[0]; + *CpuInfoEbx = CpuInfo[1]; + *CpuInfoEcx = CpuInfo[2]; + *CpuInfoEdx = CpuInfo[3]; +} + /* FUNCTIONS *****************************************************************/ VOID Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] Thu Oct 15 21:23:49 2009 @@ -46,13 +46,13 @@ VOID NTAPI -Ke386InitThreadWithContext(IN PKTHREAD Thread, +KiInitializeContextThread(IN PKTHREAD Thread, IN PKSYSTEM_ROUTINE SystemRoutine, IN PKSTART_ROUTINE StartRoutine, IN PVOID StartContext, IN PCONTEXT ContextPointer) { - FrLdrDbgPrint("Ke386InitThreadWithContext stub\n"); + FrLdrDbgPrint("KiInitializeContextThread stub\n"); #if 0 PFX_SAVE_AREA FxSaveArea; PFXSAVE_FORMAT FxSaveFormat;

1 0

[tkreuzer] 43491: Add some missing macros
by tkreuzer＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: tkreuzer Date: Thu Oct 15 21:22:09 2009 New Revision: 43491 URL: http://svn.reactos.org/svn/reactos?rev=43491&view=rev Log: Add some missing macros Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Thu Oct 15 21:22:09 2009 @@ -75,6 +75,31 @@ #define KD_BREAKPOINT_TYPE UCHAR #define KD_BREAKPOINT_SIZE sizeof(UCHAR) #define KD_BREAKPOINT_VALUE 0xCC + +// +// Macros for getting and setting special purpose registers in portable code +// +#define KeGetContextPc(Context) \ + ((Context)->Rip) + +#define KeSetContextPc(Context, ProgramCounter) \ + ((Context)->Rip = (ProgramCounter)) + +#define KeGetTrapFramePc(TrapFrame) \ + ((TrapFrame)->Rip) + +#define KeGetContextReturnRegister(Context) \ + ((Context)->Rax) + +#define KeSetContextReturnRegister(Context, ReturnValue) \ + ((Context)->Rax = (ReturnValue)) + +// +// Returns the Interrupt State from a Trap Frame. +// ON = TRUE, OFF = FALSE +// +#define KeGetTrapFrameInterruptState(TrapFrame) \ + BooleanFlagOn((TrapFrame)->EFlags, EFLAGS_INTERRUPT_MASK) struct _KPCR; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Thu Oct 15 21:22:09 2009 @@ -47,4 +47,14 @@ /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) +// FIXME, only copied from x86 +#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) +#define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) +#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) +#define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Write == 1) +#define MI_IS_PAGE_COPY_ON_WRITE(x)((x)->u.Hard.CopyOnWrite == 1) +#define MI_IS_PAGE_DIRTY(x) ((x)->u.Hard.Dirty == 1) + #endif /* __NTOSKRNL_INCLUDE_INTERNAL_AMD64_MM_H */

1 0

[tkreuzer] 43490: Add some stuff needed for the ARM3 code
by tkreuzer＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: tkreuzer Date: Thu Oct 15 21:20:57 2009 New Revision: 43490 URL: http://svn.reactos.org/svn/reactos?rev=43490&view=rev Log: Add some stuff needed for the ARM3 code Added: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c (with props) Added: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Thu Oct 15 21:20:57 2009 @@ -1,0 +1,62 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/mm/amd64/init.c + * PURPOSE: Memory Manager Initialization for amd64 + * + * PROGRAMMERS: Timo kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#include "../ARM3/miarm.h" + + +/* GLOBALS *****************************************************************/ + +ULONG MmMaximumNonPagedPoolPercent; +ULONG MmSizeOfNonPagedPoolInBytes; +ULONG MmMaximumNonPagedPoolInBytes; + +ULONG64 MmUserProbeAddress; +PVOID MmHighestUserAddress; +PVOID MmSystemRangeStart; + +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; + +ULONG MmBootImageSize; + +PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; + +RTL_BITMAP MiPfnBitMap; + +PVOID MmNonPagedSystemStart; +PVOID MmNonPagedPoolStart; +PVOID MmNonPagedPoolExpansionStart; +PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; + +PVOID MmPagedPoolStart = MI_PAGED_POOL_START; +PVOID MmPagedPoolEnd; + +ULONG MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; + +PVOID MmSessionBase; +ULONG MmSessionSize; + +PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; +MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; + + +NTSTATUS +NTAPI +MmArmInitSystem(IN ULONG Phase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ros-arm-bringup] 43489: - Fix comments. - Fix reading the incorrect pool type when freeing pool. The PoolType in the entry is offset by 1, so it can be either 1 for NonPaged or 2 for paged. This used to give us index 0 for nonpaged (correct), and index -1 for paged (oops!). Mask by 3 instead, so we get 0 and 1.
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 21:19:40 2009 New Revision: 43489 URL: http://svn.reactos.org/svn/reactos?rev=43489&view=rev Log: - Fix comments. - Fix reading the incorrect pool type when freeing pool. The PoolType in the entry is offset by 1, so it can be either 1 for NonPaged or 2 for paged. This used to give us index 0 for nonpaged (correct), and index -1 for paged (oops!). Mask by 3 instead, so we get 0 and 1. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c 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] Thu Oct 15 21:19:40 2009 @@ -241,7 +241,7 @@ if (!IsListEmpty(ListHead)) { // - // Acquire the nonpaged pool lock now + // Acquire the pool lock now // OldIrql = ExLockPool(PoolDesc); @@ -420,7 +420,7 @@ if (FragmentEntry->BlockSize != 1) { // - // Excellent -- acquire the nonpaged pool lock + // Excellent -- acquire the pool lock // OldIrql = ExLockPool(PoolDesc); @@ -431,7 +431,7 @@ (PLIST_ENTRY)FragmentEntry + 1); // - // Release the nonpaged pool lock + // Release the pool lock // ExUnlockPool(PoolDesc, OldIrql); } @@ -487,7 +487,7 @@ // for this pool type // BlockSize = Entry->BlockSize; - PoolType = (Entry->PoolType & BASE_POOL_TYPE_MASK) - 1; + PoolType = (Entry->PoolType & 3) - 1; PoolDesc = PoolVector[PoolType]; // @@ -496,7 +496,7 @@ NextEntry = Entry + BlockSize; // - // Acquire the nonpaged pool lock + // Acquire the pool lock // OldIrql = ExLockPool(PoolDesc); @@ -588,7 +588,7 @@ (PAGE_ALIGN(Entry + Entry->BlockSize) == Entry + Entry->BlockSize)) { // - // In this case, release the nonpaged pool lock, and free the page + // In this case, release the pool lock, and free the page // ExUnlockPool(PoolDesc, OldIrql); MiFreePoolPages(Entry); @@ -621,7 +621,7 @@ } // - // Insert this new free block, and release the nonpaged pool lock + // Insert this new free block, and release the pool lock // InsertHeadList(&PoolDesc->ListHeads[BlockSize - 1], (PLIST_ENTRY)Entry + 1); ExUnlockPool(PoolDesc, OldIrql);

1 0

[ros-arm-bringup] 43488: - Collapse MmInit1 into MmInitSystem. - Check for ARM3-owned memory areas during a page fault, and crash the system as this shouldn't happen yet. - Use portable PTE macro instead of setting the owner bit directly, fixing an ARM port build issue.
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 21:12:43 2009 New Revision: 43488 URL: http://svn.reactos.org/svn/reactos?rev=43488&view=rev Log: - Collapse MmInit1 into MmInitSystem. - Check for ARM3-owned memory areas during a page fault, and crash the system as this shouldn't happen yet. - Use portable PTE macro instead of setting the owner bit directly, fixing an ARM port build issue. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Oct 15 21:12:43 2009 @@ -157,6 +157,22 @@ extern ULONG MmSizeOfPagedPoolInBytes; extern PMMPTE MmSystemPagePtes; +NTSTATUS +NTAPI +MmArmInitSystem( + IN ULONG Phase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +NTSTATUS +NTAPI +MmArmAccessFault( + IN BOOLEAN StoreInstruction, + IN PVOID Address, + IN KPROCESSOR_MODE Mode, + IN PVOID TrapInformation +); + VOID NTAPI MiInitializeArmPool( Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Thu Oct 15 21:12:43 2009 @@ -12,6 +12,9 @@ #define NDEBUG #include <debug.h> +#define MODULE_INVOLVED_IN_ARM3 +#include "ARM3/miarm.h" + /* PRIVATE FUNCTIONS **********************************************************/ VOID @@ -256,6 +259,8 @@ IN KPROCESSOR_MODE Mode, IN PVOID TrapInformation) { + PMEMORY_AREA MemoryArea; + /* Cute little hack for ROS */ if ((ULONG_PTR)Address >= (ULONG_PTR)MmSystemRangeStart) { @@ -268,6 +273,20 @@ } #endif } + + // + // Check if this is an ARM3 memory area + // + MemoryArea = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), Address); + if ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3)) + { + // + // Hand it off to more competent hands... + // + UNIMPLEMENTED; + KeBugCheckEx(MEMORY_AREA_OWNED_BY_ARM3, Mode, (ULONG_PTR)Address, 0, 0); + //return MmArmAccessFault(StoreInstruction, Address, Mode, TrapInformation); + } /* Keep same old ReactOS Behaviour */ if (StoreInstruction) 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] Thu Oct 15 21:12:43 2009 @@ -54,7 +54,6 @@ PMMPTE MmSharedUserDataPte; PMMSUPPORT MmKernelAddressSpace; extern KMUTANT MmSystemLoadLock; -extern ULONG MmBootImageSize; BOOLEAN MiDbgEnableMdDump = #ifdef _ARM_ TRUE; @@ -313,55 +312,6 @@ DPRINT1("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); } -NTSTATUS -NTAPI -MmArmInitSystem(IN ULONG Phase, - IN PLOADER_PARAMETER_BLOCK LoaderBlock); - -VOID -INIT_FUNCTION -NTAPI -MmInit1(VOID) -{ - /* Initialize the kernel address space */ - KeInitializeGuardedMutex(&PsGetCurrentProcess()->AddressCreationLock); - MmKernelAddressSpace = MmGetCurrentAddressSpace(); - MmInitGlobalKernelPageDirectory(); - - /* Dump memory descriptors */ - if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); - - // - // Initialize ARMÂ³ in phase 0 - // - MmArmInitSystem(0, KeLoaderBlock); - - /* Initialize the page list */ - MmInitializePageList(); - - // - // Initialize ARMÂ³ in phase 1 - // - MmArmInitSystem(1, KeLoaderBlock); - - /* Put the paged pool after the loaded modules */ - MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart + - MmBootImageSize); - MmPagedPoolSize = MM_PAGED_POOL_SIZE; - - /* Intialize system memory areas */ - MiInitSystemMemoryAreas(); - - /* Dump the address space */ - MiDbgDumpAddressSpace(); - - /* Initialize paged pool */ - MmInitializePagedPool(); - - /* Initialize working sets */ - MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); -} - BOOLEAN NTAPI MmInitSystem(IN ULONG Phase, @@ -374,8 +324,43 @@ if (Phase == 0) { - /* Initialize Mm bootstrap */ - MmInit1(); + /* Initialize the kernel address space */ + KeInitializeGuardedMutex(&PsGetCurrentProcess()->AddressCreationLock); + MmKernelAddressSpace = MmGetCurrentAddressSpace(); + MmInitGlobalKernelPageDirectory(); + + /* Dump memory descriptors */ + if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); + + // + // Initialize ARMÂ³ in phase 0 + // + MmArmInitSystem(0, KeLoaderBlock); + + /* Initialize the page list */ + MmInitializePageList(); + + // + // Initialize ARMÂ³ in phase 1 + // + MmArmInitSystem(1, KeLoaderBlock); + + /* Put the paged pool after the loaded modules */ + MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart + + MmBootImageSize); + MmPagedPoolSize = MM_PAGED_POOL_SIZE; + + /* Intialize system memory areas */ + MiInitSystemMemoryAreas(); + + /* Dump the address space */ + MiDbgDumpAddressSpace(); + + /* Initialize paged pool */ + MmInitializePagedPool(); + + /* Initialize working sets */ + MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); @@ -422,7 +407,7 @@ // // Now write a copy of it // - TempPte.u.Hard.Owner = 1; + MI_MAKE_OWNER_PAGE(&TempPte); TempPte.u.Hard.PageFrameNumber = PageFrameNumber; *MmSharedUserDataPte = TempPte;

1 0

[gschneider] 43487: [kernel32] IsBadStringPtrA/W: - Remove overflow failure case, this isn't checked for string validation - Adapt page check to let the full string be checked in case of overflow See issue #4861 for more details.
by gschneider＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: gschneider Date: Thu Oct 15 21:12:37 2009 New Revision: 43487 URL: http://svn.reactos.org/svn/reactos?rev=43487&view=rev Log: [kernel32] IsBadStringPtrA/W: - Remove overflow failure case, this isn't checked for string validation - Adapt page check to let the full string be checked in case of overflow See issue #4861 for more details. Modified: trunk/reactos/dll/win32/kernel32/mem/isbad.c Modified: trunk/reactos/dll/win32/kernel32/mem/isbad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/isb… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/isbad.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/isbad.c [iso-8859-1] Thu Oct 15 21:12:37 2009 @@ -171,9 +171,6 @@ /* Calculate the last page */ Last = (PWCHAR)((ULONG_PTR)lpsz + (ucchMax * 2) - 2); - /* Another quick failure case */ - if ((ULONG_PTR)Last < (ULONG_PTR)lpsz) return TRUE; - /* Enter SEH */ _SEH2_TRY { @@ -184,7 +181,7 @@ { Char = *Current; Current++; - } while (Char && (Current <= Last)); + } while (Char && (Current != Last)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -217,9 +214,6 @@ /* Calculate the last page */ Last = (PCHAR)((ULONG_PTR)lpsz + ucchMax - 1); - /* Another quick failure case */ - if ((ULONG_PTR)Last < (ULONG_PTR)lpsz) return TRUE; - /* Enter SEH */ _SEH2_TRY { @@ -230,7 +224,7 @@ { Char = *Current; Current++; - } while (Char && (Current <= Last)); + } while (Char && (Current != Last)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

[ros-arm-bringup] 43486: - Fix a bug in memory area creation: Static memory areas had the static flag embedded in their type, so code that was switch()ing on the type would fail to recognize the actual type, because MEMORY_AREA_STATIC was ORed in. - Add a new memory area type: MEMORY_AREA_OWNED_BY_ARM3. This will allow us to instruct the ReactOS Memory MAnager to "Back. The Fuck. Off." during page faults and such, so we can handle page faults inside ARM3-owned PTEs ourselves. - Right now, all AR
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 20:54:35 2009 New Revision: 43486 URL: http://svn.reactos.org/svn/reactos?rev=43486&view=rev Log: - Fix a bug in memory area creation: Static memory areas had the static flag embedded in their type, so code that was switch()ing on the type would fail to recognize the actual type, because MEMORY_AREA_STATIC was ORed in. - Add a new memory area type: MEMORY_AREA_OWNED_BY_ARM3. This will allow us to instruct the ReactOS Memory MAnager to "Back. The Fuck. Off." during page faults and such, so we can handle page faults inside ARM3-owned PTEs ourselves. - Right now, all ARM3 PTEs and data is nonpaged, so no page faults should happen, but this may change in the future. - Also will allow us to manage our own PDEs so we can do on-demand inpage instead of syncing with the ReactOS Mm hack cache. - Create all memory areas in one shot in MmCreateSystemMemoryAreas (get rid of MiInitPageDirectoryMap and MiInitPagedPool memory area creation). - Mark all of ours as owned by ARM3. - Make them all static. - The only non-ARM3 one right now is paged pool, we own all the other static areas. - Move this code into mm, instead of mm/ARM3, since memory areas are not an ARM3 concept. - Also create memory areas for session space, session view, and other ARM3 memory ranges, so nobody touches those ranges. - Dump the kernel address space after all this is done, in a MmDbg function in mm. - This cleans up ARM3 of some ROS-specific code, and also collapses Phase 1 and 2 into a single phase. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/ppool.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] Thu Oct 15 20:54:35 2009 @@ -46,7 +46,7 @@ #define MMDBG_COPY_MAX_SIZE 0x8 -#define MI_STATIC_MEMORY_AREAS (8) +#define MI_STATIC_MEMORY_AREAS (12) #define MEMORY_AREA_INVALID (0) #define MEMORY_AREA_SECTION_VIEW (1) @@ -62,6 +62,7 @@ #define MEMORY_AREA_PAGED_POOL (12) #define MEMORY_AREA_NO_ACCESS (13) #define MEMORY_AREA_PEB_OR_TEB (14) +#define MEMORY_AREA_OWNED_BY_ARM3 (15) #define MEMORY_AREA_STATIC (0x80000000) #define MM_PHYSICAL_PAGE_MPW_PENDING (0x8) 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] Thu Oct 15 20:54:35 2009 @@ -600,20 +600,16 @@ PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; ULONG FreePages = 0; - PMEMORY_AREA MArea; - PHYSICAL_ADDRESS BoundaryAddressMultiple; PFN_NUMBER PageFrameIndex; PMMPTE StartPde, EndPde, PointerPte, LastPte; MMPTE TempPde = HyperTemplatePte, TempPte = HyperTemplatePte; - PVOID NonPagedPoolExpansionVa, BaseAddress; - NTSTATUS Status; + PVOID NonPagedPoolExpansionVa; ULONG OldCount; BOOLEAN IncludeType[LoaderMaximum]; ULONG i; PVOID Bitmap; PPHYSICAL_MEMORY_RUN Run; PFN_NUMBER FreePage, FreePageCount, PagesLeft, BasePage, PageCount; - BoundaryAddressMultiple.QuadPart = 0; if (Phase == 0) { @@ -1083,37 +1079,6 @@ ASSERT(TempPte.u.Hard.Valid == 1); *PointerPte++ = TempPte; } - - // - // ReactOS requires a memory area to keep the initial NP area off-bounds - // - BaseAddress = MmNonPagedPoolStart; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, - &BaseAddress, - MmSizeOfNonPagedPoolInBytes, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - ASSERT(Status == STATUS_SUCCESS); - - // - // And we need one more for the system NP - // - BaseAddress = MmNonPagedSystemStart; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, - &BaseAddress, - (ULONG_PTR)MmNonPagedPoolEnd - - (ULONG_PTR)MmNonPagedSystemStart, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - ASSERT(Status == STATUS_SUCCESS); // // Sanity check: make sure we have properly defined the system PTE space @@ -1324,9 +1289,7 @@ MiSyncARM3WithROS(MmNonPagedSystemStart, (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - 1)); MiSyncARM3WithROS(MmPfnDatabase, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); MiSyncARM3WithROS((PVOID)HYPER_SPACE, (PVOID)(HYPER_SPACE + PAGE_SIZE - 1)); - } - else // NOW WE HAVE NONPAGED POOL - { + // // Instantiate memory that we don't consider RAM/usable // We use the same exclusions that Windows does, in order to try to be @@ -1400,53 +1363,6 @@ // Size up paged pool and build the shadow system page directory // MiBuildPagedPool(); - - // - // Print the memory layout - // - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmSystemRangeStart, - (ULONG_PTR)MmSystemRangeStart + MmBootImageSize, - "Boot Loaded Image"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmPagedPoolBase, - (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize, - "Paged Pool"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmPfnDatabase, - (ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), - "PFN Database"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedPoolStart, - (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes, - "ARMÂ³ Non Paged Pool"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MiSystemViewStart, - (ULONG_PTR)MiSystemViewStart + MmSystemViewSize, - "System View Space"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmSessionBase, - MiSessionSpaceEnd, - "Session Space"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - PTE_BASE, PDE_BASE, - "Page Tables"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - PDE_BASE, HYPER_SPACE, - "Page Directories"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - HYPER_SPACE, HYPER_SPACE + (4 * 1024 * 1024), - "Hyperspace"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmPagedPoolStart, - (ULONG_PTR)MmPagedPoolStart + MmSizeOfPagedPoolInBytes, - "ARMÂ³ Paged Pool"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedSystemStart, MmNonPagedPoolExpansionStart, - "System PTE Space"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedPoolExpansionStart, MmNonPagedPoolEnd, - "Non Paged Pool Expansion PTE Space"); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Oct 15 20:54:35 2009 @@ -147,6 +147,15 @@ extern MM_PAGED_POOL_INFO MmPagedPoolInfo; extern RTL_BITMAP MiPfnBitMap; extern KGUARDED_MUTEX MmPagedPoolMutex; +extern PVOID MmPagedPoolStart; +extern PVOID MmPagedPoolEnd; +extern PVOID MmNonPagedSystemStart; +extern PVOID MiSystemViewStart; +extern ULONG MmSystemViewSize; +extern PVOID MmSessionBase; +extern PVOID MiSessionSpaceEnd; +extern ULONG MmSizeOfPagedPoolInBytes; +extern PMMPTE MmSystemPagePtes; VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Thu Oct 15 20:54:35 2009 @@ -1034,48 +1034,4 @@ } } -VOID -INIT_FUNCTION -NTAPI -MiInitPageDirectoryMap(VOID) -{ - MEMORY_AREA* kernel_map_desc = NULL; - MEMORY_AREA* hyperspace_desc = NULL; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PVOID BaseAddress; - NTSTATUS Status; - - DPRINT("MiInitPageDirectoryMap()\n"); - - BoundaryAddressMultiple.QuadPart = 0; - BaseAddress = (PVOID)PAGETABLE_MAP; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, - &BaseAddress, - 0x400000, - PAGE_READWRITE, - &kernel_map_desc, - TRUE, - 0, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - BaseAddress = (PVOID)HYPERSPACE; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, - &BaseAddress, - 0x400000, - PAGE_READWRITE, - &hyperspace_desc, - TRUE, - 0, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Oct 15 20:54:35 2009 @@ -996,6 +996,7 @@ // ASSERT(MiStaticMemoryAreaCount < MI_STATIC_MEMORY_AREAS); MemoryArea = &MiStaticMemoryAreas[MiStaticMemoryAreaCount++]; + Type &= ~MEMORY_AREA_STATIC; } else { 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] Thu Oct 15 20:54:35 2009 @@ -11,6 +11,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#define MODULE_INVOLVED_IN_ARM3 +#include "ARM3/miarm.h" /* GLOBALS *******************************************************************/ @@ -69,19 +72,151 @@ PVOID BaseAddress; PHYSICAL_ADDRESS BoundaryAddressMultiple; PMEMORY_AREA MArea; + NTSTATUS Status; BoundaryAddressMultiple.QuadPart = 0; // - // First initialize the page table and hyperspace memory areas - // - MiInitPageDirectoryMap(); + // Create the memory area to define the PTE base + // + BaseAddress = (PVOID)PTE_BASE; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + 4 * 1024 * 1024, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // Create the memory area to define Hyperspace + // + BaseAddress = (PVOID)HYPER_SPACE; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + 4 * 1024 * 1024, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // Protect the PFN database + // + BaseAddress = MmPfnDatabase; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + (MxPfnAllocation << PAGE_SHIFT), + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // ReactOS requires a memory area to keep the initial NP area off-bounds + // + BaseAddress = MmNonPagedPoolStart; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + MmSizeOfNonPagedPoolInBytes, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // And we need one more for the system NP + // + BaseAddress = MmNonPagedSystemStart; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + (ULONG_PTR)MmNonPagedPoolEnd - + (ULONG_PTR)MmNonPagedSystemStart, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // We also need one for system view space + // + BaseAddress = MiSystemViewStart; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + MmSystemViewSize, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // And another for session space + // + BaseAddress = MmSessionBase; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + (ULONG_PTR)MiSessionSpaceEnd - + (ULONG_PTR)MmSessionBase, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // One more for ARM paged pool + // + BaseAddress = MmPagedPoolStart; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + MmSizeOfPagedPoolInBytes, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // And now, ReactOS paged pool + // + BaseAddress = MmPagedPoolBase; + MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_PAGED_POOL | MEMORY_AREA_STATIC, + &BaseAddress, + MmPagedPoolSize, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); // // Next, the KPCR // BaseAddress = (PVOID)PCR; MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, PAGE_SIZE * KeNumberProcessors, PAGE_READWRITE, @@ -89,13 +224,13 @@ TRUE, 0, BoundaryAddressMultiple); - + // // Now the KUSER_SHARED_DATA // BaseAddress = (PVOID)KI_USER_SHARED_DATA; MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, PAGE_SIZE, PAGE_READWRITE, @@ -103,6 +238,58 @@ TRUE, 0, BoundaryAddressMultiple); +} + +VOID +NTAPI +MiDbgDumpAddressSpace(VOID) +{ + // + // Print the memory layout + // + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmSystemRangeStart, + (ULONG_PTR)MmSystemRangeStart + MmBootImageSize, + "Boot Loaded Image"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmPagedPoolBase, + (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize, + "Paged Pool"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmPfnDatabase, + (ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), + "PFN Database"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedPoolStart, + (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes, + "ARMÂ³ Non Paged Pool"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MiSystemViewStart, + (ULONG_PTR)MiSystemViewStart + MmSystemViewSize, + "System View Space"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmSessionBase, + MiSessionSpaceEnd, + "Session Space"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + PTE_BASE, PDE_BASE, + "Page Tables"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + PDE_BASE, HYPER_SPACE, + "Page Directories"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + HYPER_SPACE, HYPER_SPACE + (4 * 1024 * 1024), + "Hyperspace"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmPagedPoolStart, + (ULONG_PTR)MmPagedPoolStart + MmSizeOfPagedPoolInBytes, + "ARMÂ³ Paged Pool"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedSystemStart, MmNonPagedPoolExpansionStart, + "System PTE Space"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedPoolExpansionStart, MmNonPagedPoolEnd, + "Non Paged Pool Expansion PTE Space"); } VOID @@ -149,9 +336,6 @@ // MmArmInitSystem(0, KeLoaderBlock); - /* Intialize system memory areas */ - MiInitSystemMemoryAreas(); - /* Initialize the page list */ MmInitializePageList(); @@ -164,12 +348,13 @@ MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart + MmBootImageSize); MmPagedPoolSize = MM_PAGED_POOL_SIZE; - - // - // Initialize ARMÂ³ in phase 2 - // - MmArmInitSystem(2, KeLoaderBlock); - + + /* Intialize system memory areas */ + MiInitSystemMemoryAreas(); + + /* Dump the address space */ + MiDbgDumpAddressSpace(); + /* Initialize paged pool */ MmInitializePagedPool(); Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Thu Oct 15 20:54:35 2009 @@ -51,23 +51,7 @@ INIT_FUNCTION NTAPI MmInitializePagedPool(VOID) -{ - PVOID BaseAddress; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PMEMORY_AREA MArea; - BoundaryAddressMultiple.QuadPart = 0; - - BaseAddress = MmPagedPoolBase; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_PAGED_POOL, - &BaseAddress, - MmPagedPoolSize, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - +{ /* * We are still at a high IRQL level at this point so explicitly commit * the first page of the paged pool before writing the first block header.

1 0

[fireball] 43485: [kernel32] - Initialize PreviousStackBase/Limit to NULL in BasepCreateStack. Previously this bug was hidden because those values were ignored by the kernel.
by fireball＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: fireball Date: Thu Oct 15 20:36:35 2009 New Revision: 43485 URL: http://svn.reactos.org/svn/reactos?rev=43485&view=rev Log: [kernel32] - Initialize PreviousStackBase/Limit to NULL in BasepCreateStack. Previously this bug was hidden because those values were ignored by the kernel. Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c Modified: trunk/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ut… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] Thu Oct 15 20:36:35 2009 @@ -257,6 +257,8 @@ /* Now set up some basic Initial TEB Parameters */ InitialTeb->AllocatedStackBase = (PVOID)Stack; InitialTeb->StackBase = (PVOID)(Stack + StackReserve); + InitialTeb->PreviousStackBase = NULL; + InitialTeb->PreviousStackLimit = NULL; /* Update the Stack Position */ Stack += StackReserve - StackCommit;

1 0

[sginsberg] 43484: - MiReserveAlignedSystemPtes: Add missing lock release, spotted by janderwald
by sginsberg＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: sginsberg Date: Thu Oct 15 20:34:21 2009 New Revision: 43484 URL: http://svn.reactos.org/svn/reactos?rev=43484&view=rev Log: - MiReserveAlignedSystemPtes: Add missing lock release, spotted by janderwald Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Thu Oct 15 20:34:21 2009 @@ -109,7 +109,6 @@ // Decrement the free count and move to the next starting PTE // MmTotalFreeSystemPtes[SystemPtePoolType] -= NumberOfPtes; - KeReleaseQueuedSpinLock(LockQueueSystemSpaceLock, OldIrql); PointerPte += (ClusterSize - NumberOfPtes); break; } @@ -158,8 +157,9 @@ } // - // Flush the TLB and return the first PTE - // + // Release the lock, flush the TLB and return the first PTE + // + KeReleaseQueuedSpinLock(LockQueueSystemSpaceLock, OldIrql); KeFlushProcessTb(); return PointerPte; }

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