Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 41990: Fix definition of KeInitializeSpinLock for x86 - it never inlined the operation. It should check if WIN9X_COMPAT_SPINLOCK is defined and don't inline it if so. Also, don't define this flag when building ntoskrnl (MS DDK/WDK compilation fix) so we get the inline. Instead, make the implementation "internal" to fix compilation.
by sginsberg＠svn.reactos.org 16 Jul '09

16 Jul '09

Author: sginsberg Date: Thu Jul 16 13:42:09 2009 New Revision: 41990 URL: http://svn.reactos.org/svn/reactos?rev=41990&view=rev Log: Fix definition of KeInitializeSpinLock for x86 - it never inlined the operation. It should check if WIN9X_COMPAT_SPINLOCK is defined and don't inline it if so. Also, don't define this flag when building ntoskrnl (MS DDK/WDK compilation fix) so we get the inline. Instead, make the implementation "internal" to fix compilation. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/ke/spinlock.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/ntoskrnl.pspec Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Thu Jul 16 13:42:09 2009 @@ -5642,11 +5642,26 @@ #if defined (_X86_) +#if defined(WIN9X_COMPAT_SPINLOCK) + NTKERNELAPI VOID NTAPI KeInitializeSpinLock( - IN PKSPIN_LOCK SpinLock); + IN PKSPIN_LOCK SpinLock +); + +#else + +FORCEINLINE +VOID +KeInitializeSpinLock(IN PKSPIN_LOCK SpinLock) +{ + /* Clear the lock */ + *SpinLock = 0; +} + +#endif NTHALAPI KIRQL Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Thu Jul 16 13:42:09 2009 @@ -123,7 +123,7 @@ */ VOID NTAPI -KeInitializeSpinLock(IN PKSPIN_LOCK SpinLock) +_KeInitializeSpinLock(IN PKSPIN_LOCK SpinLock) { /* Clear it */ *SpinLock = 0; 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] Thu Jul 16 13:42:09 2009 @@ -7,7 +7,6 @@ <define name="_NTOSKRNL_" /> <define name="_NTSYSTEM_" /> <define name="__NO_CTYPE_INLINES" /> - <define name="WIN9X_COMPAT_SPINLOCK" /> <define name="_IN_KERNEL_" /> <if property="_WINKD_" value="1"> <define name="_WINKD_" /> Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Thu Jul 16 13:42:09 2009 @@ -599,7 +599,7 @@ @ stdcall KeInitializeMutex(ptr long) @ stdcall KeInitializeQueue(ptr long) @ stdcall KeInitializeSemaphore(ptr long long) -@ stdcall KeInitializeSpinLock(ptr) +@ stdcall KeInitializeSpinLock(ptr) _KeInitializeSpinLock @ stdcall KeInitializeThreadedDpc(ptr ptr ptr) @ stdcall KeInitializeTimer(ptr) @ stdcall KeInitializeTimerEx(ptr long)

1 0

[fireball] 41989: Maciej Bialas <bjauy@o2.pl> - Don't check boot partition during unattended setup if MBR installation is skipped anyway.
by fireball＠svn.reactos.org 16 Jul '09

16 Jul '09

Author: fireball Date: Thu Jul 16 11:09:26 2009 New Revision: 41989 URL: http://svn.reactos.org/svn/reactos?rev=41989&view=rev Log: Maciej Bialas <bjauy(a)o2.pl> - Don't check boot partition during unattended setup if MBR installation is skipped anyway. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Thu Jul 16 11:09:26 2009 @@ -3353,6 +3353,18 @@ PartitionType = PartitionList->ActiveBootPartition-> PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType; + if (IsUnattendedSetup) + { + if (UnattendMBRInstallType == 0) /* skip MBR installation */ + { + return SUCCESS_PAGE; + } + else if (UnattendMBRInstallType == 1) /* install on floppy */ + { + return BOOT_LOADER_FLOPPY_PAGE; + } + } + if (PartitionType == PARTITION_ENTRY_UNUSED) { DPRINT("Error: active partition invalid (unused)\n"); @@ -3398,20 +3410,10 @@ return BOOT_LOADER_FLOPPY_PAGE; } - if (IsUnattendedSetup) - { - if (UnattendMBRInstallType == 0) /* skip MBR installation */ - { - return SUCCESS_PAGE; - } - else if (UnattendMBRInstallType == 1) /* install on floppy */ - { - return BOOT_LOADER_FLOPPY_PAGE; - } - else if (UnattendMBRInstallType == 2) /* install on hdd */ - { - return BOOT_LOADER_HARDDISK_PAGE; - } + /* Unattended install on hdd? */ + if (IsUnattendedSetup && UnattendMBRInstallType == 2) + { + return BOOT_LOADER_HARDDISK_PAGE; } MUIDisplayPage(BOOT_LOADER_PAGE);

1 0

[tkreuzer] 41988: [WIN32K] Keep a shared lock on palettes selected into DCs. This allows us to get rid of a large number of lock and unlock operations and checks.
by tkreuzer＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: tkreuzer Date: Wed Jul 15 23:06:40 2009 New Revision: 41988 URL: http://svn.reactos.org/svn/reactos?rev=41988&view=rev Log: [WIN32K] Keep a shared lock on palettes selected into DCs. This allows us to get rid of a large number of lock and unlock operations and checks. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c trunk/reactos/subsystems/win32/win32k/objects/dcstate.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Jul 15 23:06:40 2009 @@ -1,9 +1,12 @@ #ifndef __WIN32K_DC_H #define __WIN32K_DC_H + +typedef struct _DC *PDC; #include "brush.h" #include "bitmaps.h" #include "pdevobj.h" +#include "palette.h" /* Constants ******************************************************************/ @@ -125,7 +128,7 @@ /* Reactos specific members */ ROS_DC_INFO rosdc; -} DC, *PDC; +} DC; /* Internal functions *********************************************************/ @@ -217,6 +220,18 @@ pdc->dclevel.pbrLine = pbrLine; } +VOID +FORCEINLINE +DC_vSelectPalette(PDC pdc, PPALETTE ppal) +{ + PPALETTE ppalOld = pdc->dclevel.ppal; + if (ppalOld) + PALETTE_ShareUnlockPalette(ppalOld); + if (ppal) + GDIOBJ_IncrementShareCount((POBJ)ppal); + pdc->dclevel.ppal = ppal; +} + BOOL FASTCALL IntPrepareDriverIfNeeded(); extern PDEVOBJ PrimarySurface; Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] Wed Jul 15 23:06:40 2009 @@ -67,6 +67,12 @@ #define PALETTE_FreePaletteByHandle(hPalette) GDIOBJ_FreeObjByHandle((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE) #define PALETTE_LockPalette(hPalette) ((PPALETTE)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE)) #define PALETTE_UnlockPalette(pPalette) GDIOBJ_UnlockObjByPtr((POBJ)pPalette) + +#define PALETTE_ShareLockPalette(hpal) \ + ((PPALETTE)GDIOBJ_ShareLockObj((HGDIOBJ)hpal, GDI_OBJECT_TYPE_PALETTE)) +#define PALETTE_ShareUnlockPalette(ppal) \ + GDIOBJ_ShareUnlockObjByPtr(&ppal->BaseObject) + BOOL INTERNAL_CALL PALETTE_Cleanup(PVOID ObjectBody); HPALETTE FASTCALL PALETTE_Init (VOID); Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Wed Jul 15 23:06:40 2009 @@ -120,7 +120,11 @@ TextIntRealizeFont(pdcattr->hlfntNew,NULL); NewDC->dclevel.hpal = NtGdiGetStockObject(DEFAULT_PALETTE); - NewDC->dclevel.laPath.eMiterLimit = 10.0; + NewDC->dclevel.ppal = PALETTE_ShareLockPalette(NewDC->dclevel.hpal); + /* This should never fail */ + ASSERT(NewDC->dclevel.ppal); + + NewDC->dclevel.laPath.eMiterLimit = 10.0; // FIXME: use FLOATL or FLOATOBJ! NewDC->dclevel.lSaveDepth = 1; @@ -153,10 +157,11 @@ if (pDC->rosdc.DriverName.Buffer) ExFreePoolWithTag(pDC->rosdc.DriverName.Buffer, TAG_DC); - /* Clean up selected objects */ + /* Deselect dc objects */ DC_vSelectSurface(pDC, NULL); DC_vSelectFillBrush(pDC, NULL); DC_vSelectLineBrush(pDC, NULL); + DC_vSelectPalette(pDC, NULL); /* Dereference default brushes */ BRUSH_ShareUnlockBrush(pDC->eboText.pbrush); Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Wed Jul 15 23:06:40 2009 @@ -200,7 +200,7 @@ } /* Check if this is a valid palette handle */ - ppal = PALETTE_LockPalette(hpal); + ppal = PALETTE_ShareLockPalette(hpal); if (!ppal) { DC_UnlockDc(pdc); @@ -215,13 +215,14 @@ /* Get old palette, set new one */ oldPal = pdc->dclevel.hpal; pdc->dclevel.hpal = hpal; + DC_vSelectPalette(pdc, ppal); /* Mark the brushes invalid */ pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE | DIRTY_BACKGROUND | DIRTY_TEXT; } - PALETTE_UnlockPalette(ppal); + PALETTE_ShareUnlockPalette(ppal); DC_UnlockDc(pdc); return oldPal; Modified: trunk/reactos/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] Wed Jul 15 23:06:40 2009 @@ -36,15 +36,15 @@ pdcDst->dclevel.efM11PtoD = pdcSrc->dclevel.efM11PtoD; pdcDst->dclevel.efM22PtoD = pdcSrc->dclevel.efM22PtoD; pdcDst->dclevel.sizl = pdcSrc->dclevel.sizl; + pdcDst->dclevel.hpal = pdcSrc->dclevel.hpal; /* Handle references here correctly */ DC_vSelectSurface(pdcDst, pdcSrc->dclevel.pSurface); DC_vSelectFillBrush(pdcDst, pdcSrc->dclevel.pbrFill); DC_vSelectLineBrush(pdcDst, pdcSrc->dclevel.pbrLine); + DC_vSelectPalette(pdcDst, pdcSrc->dclevel.ppal); // FIXME: handle refs - pdcDst->dclevel.hpal = pdcSrc->dclevel.hpal; - pdcDst->dclevel.ppal = pdcSrc->dclevel.ppal; pdcDst->dclevel.plfnt = pdcSrc->dclevel.plfnt; /* ROS hacks */ @@ -122,7 +122,7 @@ /* Check if we have a valid instance */ if (iSaveLevel <= 0 || iSaveLevel >= pdc->dclevel.lSaveDepth) { - DPRINT("Illegal save level, requested: %ld, current: %ld\n", + DPRINT("Illegal save level, requested: %ld, current: %ld\n", iSaveLevel, pdc->dclevel.lSaveDepth); DC_UnlockDc(pdc); SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -220,7 +220,7 @@ } hdcSave = pdcSave->BaseObject.hHmgr; - /* Make it a kernel handle + /* Make it a kernel handle (FIXME: windows handles this different, see wiki)*/ GDIOBJ_SetOwnership(hdcSave, NULL);

1 0

[tkreuzer] 41987: Remove unused struct ColorShifts
by tkreuzer＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: tkreuzer Date: Wed Jul 15 22:02:33 2009 New Revision: 41987 URL: http://svn.reactos.org/svn/reactos?rev=41987&view=rev Log: Remove unused struct ColorShifts Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] Wed Jul 15 22:02:33 2009 @@ -33,12 +33,6 @@ #define PAL_RGB16_565 0x00400000 // 16-bit RGB in 565 format #define PAL_GAMMACORRECTION 0x00800000 // Correct colors -typedef struct -{ - int shift; - int scale; - int max; -} ColorShifts; typedef struct _PALETTE {

1 0

[sginsberg] 41986: - What's the deal with using Iof* and Obf*, Arch?
by sginsberg＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: sginsberg Date: Wed Jul 15 21:40:44 2009 New Revision: 41986 URL: http://svn.reactos.org/svn/reactos?rev=41986&view=rev Log: - What's the deal with using Iof* and Obf*, Arch? Modified: trunk/reactos/drivers/filesystems/fastfat/misc.c trunk/reactos/hal/halppc/generic/dma.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/ntoskrnl/fsrtl/fastio.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] Wed Jul 15 21:40:44 2009 @@ -86,7 +86,7 @@ Fail:; IrpContext->Irp->IoStatus.Status = Status; - IofCompleteRequest(IrpContext->Irp, (CCHAR)(NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT)); + IoCompleteRequest(IrpContext->Irp, (CCHAR)(NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT)); VfatFreeIrpContext(IrpContext); return Status; } Modified: trunk/reactos/hal/halppc/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] Wed Jul 15 21:40:44 2009 @@ -770,7 +770,7 @@ { if (!HalpDmaInitializeEisaAdapter(AdapterObject, DeviceDescription)) { - ObfDereferenceObject(AdapterObject); + ObDereferenceObject(AdapterObject); return NULL; } } @@ -817,7 +817,7 @@ KeSetEvent(&HalpDmaLock, 0, 0); } - ObfDereferenceObject(AdapterObject); + ObDereferenceObject(AdapterObject); } /** Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Wed Jul 15 21:40:44 2009 @@ -770,7 +770,7 @@ { if (!HalpDmaInitializeEisaAdapter(AdapterObject, DeviceDescription)) { - ObfDereferenceObject(AdapterObject); + ObDereferenceObject(AdapterObject); return NULL; } } @@ -817,7 +817,7 @@ KeSetEvent(&HalpDmaLock, 0, 0); } - ObfDereferenceObject(AdapterObject); + ObDereferenceObject(AdapterObject); } /** Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Wed Jul 15 21:40:44 2009 @@ -746,7 +746,7 @@ IoStackLocation->Parameters.QueryFile.FileInformationClass = FileStandardInformation; /* Send the IRP to the related device object */ - Status = IofCallDriver(DeviceObject,Irp); + Status = IoCallDriver(DeviceObject,Irp); /* Standard DDK IRP result processing */ if (Status == STATUS_PENDING) Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Jul 15 21:40:44 2009 @@ -4427,7 +4427,7 @@ if (!(Section->AllocationAttributes & SEC_FILE)) { - ObfDereferenceObject(Section); + ObDereferenceObject(Section); return STATUS_INVALID_PARAMETER; } Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Wed Jul 15 21:40:44 2009 @@ -2239,7 +2239,7 @@ &ImpersonationLevel); if (Token == NULL) { - ObfDereferenceObject(Thread); + ObDereferenceObject(Thread); return STATUS_NO_TOKEN; } @@ -2247,7 +2247,7 @@ if (ImpersonationLevel == SecurityAnonymous) { - ObfDereferenceObject(Token); + ObDereferenceObject(Token); return STATUS_CANT_OPEN_ANONYMOUS; } @@ -2267,7 +2267,7 @@ (PVOID*)&Thread, NULL); if (!NT_SUCCESS(Status)) { - ObfDereferenceObject(Token); + ObDereferenceObject(Token); if (OpenAsSelf) { PsRestoreImpersonation(PsGetCurrentThread(), &ImpersonationState); @@ -2278,11 +2278,11 @@ PrimaryToken = PsReferencePrimaryToken(Thread->ThreadsProcess); Status = SepCreateImpersonationTokenDacl(Token, PrimaryToken, &Dacl); ASSERT(FALSE); - ObfDereferenceObject(PrimaryToken); - ObfDereferenceObject(Thread); + ObDereferenceObject(PrimaryToken); + ObDereferenceObject(Thread); if (!NT_SUCCESS(Status)) { - ObfDereferenceObject(Token); + ObDereferenceObject(Token); if (OpenAsSelf) { PsRestoreImpersonation(PsGetCurrentThread(), &ImpersonationState); @@ -2304,7 +2304,7 @@ ExFreePool(Dacl); if (!NT_SUCCESS(Status)) { - ObfDereferenceObject(Token); + ObDereferenceObject(Token); if (OpenAsSelf) { PsRestoreImpersonation(PsGetCurrentThread(), &ImpersonationState); @@ -2323,7 +2323,7 @@ PreviousMode, &hToken); } - ObfDereferenceObject(Token); + ObDereferenceObject(Token); if (OpenAsSelf) {

1 0

[sginsberg] 41985: - Hey Arch, did you know MmpDeleteSection can be called for a Section Object before it is fully set up (when ObDereferenceObject is called before all fields are initialized), and it will now crash due to a bogus, nonintialized Segment/ImageSection pointer? Always zero out the whole buffer to prevent this. Fixes the kernel32 loader Winetest.
by sginsberg＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: sginsberg Date: Wed Jul 15 20:35:31 2009 New Revision: 41985 URL: http://svn.reactos.org/svn/reactos?rev=41985&view=rev Log: - Hey Arch, did you know MmpDeleteSection can be called for a Section Object before it is fully set up (when ObDereferenceObject is called before all fields are initialized), and it will now crash due to a bogus, nonintialized Segment/ImageSection pointer? Always zero out the whole buffer to prevent this. Fixes the kernel32 loader Winetest. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Jul 15 20:35:31 2009 @@ -2375,12 +2375,9 @@ /* * Initialize it */ - Section->Type = 0; - Section->Size = 0; + RtlZeroMemory(Section, sizeof(ROS_SECTION_OBJECT)); Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; - Section->Segment = NULL; - Section->FileObject = NULL; Section->MaximumSize = MaximumSize; Segment = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_SECTION_SEGMENT), TAG_MM_SECTION_SEGMENT); @@ -2449,11 +2446,9 @@ /* * Initialize it */ - Section->Type = 0; - Section->Size = 0; + RtlZeroMemory(Section, sizeof(ROS_SECTION_OBJECT)); Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; - Section->Segment = NULL; /* * Check file access required @@ -3377,9 +3372,7 @@ /* * Initialize it */ - Section->Type = 0; - Section->Size = 0; - Section->MaximumSize.QuadPart = 0; + RtlZeroMemory(Section, sizeof(ROS_SECTION_OBJECT)); Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes;

1 0

[ros-arm-bringup] 41984: - NEVER TELL ME THE ODDS (of breaking the build).
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 20:31:53 2009 New Revision: 41984 URL: http://svn.reactos.org/svn/reactos?rev=41984&view=rev Log: - NEVER TELL ME THE ODDS (of breaking the build). Added: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c (with props) Added: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Wed Jul 15 20:31:53 2009 @@ -1,0 +1,46 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/init.c + * PURPOSE: ARM Memory Manager Initialization + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::INIT" +#define MODULE_INVOLVED_IN_ARM3 +#include "../../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +ULONG MmMaximumNonPagedPoolPercent; +ULONG MmSizeOfNonPagedPoolInBytes; +ULONG MmMaximumNonPagedPoolInBytes; +PVOID MmNonPagedSystemStart; +PVOID MmNonPagedPoolStart; +PVOID MmNonPagedPoolExpansionStart; +PVOID MmNonPagedPoolEnd = (PVOID)0xFFBE0000; +ULONG MmNumberOfSystemPtes; +PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; + +/* PRIVATE FUNCTIONS **********************************************************/ + +NTSTATUS +NTAPI +MmArmInitSystem(IN ULONG Phase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + // + // Always return success for now + // + DPRINT1("NEVER TELL ME THE ODDS!\n"); + while (TRUE); + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[ros-arm-bringup] 41983: - Add initial support for TI OMAP3530 (last commit said OMAP3450, this was incorrect), an ARM Cortex-A8 based SoC. - This gets us booting to FreeLDR with some serial output. - The entire MMU code needs a rewrite.
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 20:30:04 2009 New Revision: 41983 URL: http://svn.reactos.org/svn/reactos?rev=41983&view=rev Log: - Add initial support for TI OMAP3530 (last commit said OMAP3450, this was incorrect), an ARM Cortex-A8 based SoC. - This gets us booting to FreeLDR with some serial output. - The entire MMU code needs a rewrite. Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/omapuart.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h trunk/reactos/boot/freeldr/freeldr/machine.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s [iso-8859-1] Wed Jul 15 20:30:04 2009 @@ -10,7 +10,6 @@ .include "ntoskrnl/include/internal/arm/kxarm.h" .include "ntoskrnl/include/internal/arm/ksarm.h" - .section startup NESTED_ENTRY _start PROLOG_END _start @@ -45,7 +44,7 @@ // // Okay, now give us a stack // - ldr sp, L_BootStackEnd + //ldr sp, L_BootStackEnd // // Go ahead and call the C initialization code @@ -59,13 +58,6 @@ L_ArmInit: .long ArmInit - - .align 4 -.global BootStack -BootStack: - .space 0x4000 -BootStackEnd: - .long 0 .section pagedata .global TranslationTableStart Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Wed Jul 15 20:30:04 2009 @@ -12,6 +12,8 @@ /* GLOBALS ********************************************************************/ +UCHAR BootStack[0x4000]; +PUCHAR BootStackEnd = &BootStack[0x3FFF]; PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; ULONG BootDrive, BootPartition; VOID ArmPrepareForReactOS(IN BOOLEAN Setup); @@ -40,7 +42,8 @@ // This should probably go away once we support more boards // ASSERT((ArmBoardBlock->BoardType == MACH_TYPE_FEROCEON) || - (ArmBoardBlock->BoardType == MACH_TYPE_VERSATILE_PB)); + (ArmBoardBlock->BoardType == MACH_TYPE_VERSATILE_PB) || + (ArmBoardBlock->BoardType == MACH_TYPE_OMAP3_BEAGLE)); // // Save data required for memory initialization @@ -169,10 +172,25 @@ MachVtbl.ConsGetCh = ArmVersaGetCh; break; + // + // Check for TI OMAP3 boards + // For now that means only Beagle, but ZOOM and others should be ok too + // + case MACH_TYPE_OMAP3_BEAGLE: + + // + // These boards use a UART16550 + // + ArmOmap3SerialInit(115200); + MachVtbl.ConsPutChar = ArmOmap3PutChar; + MachVtbl.ConsKbHit = ArmOmap3KbHit; + MachVtbl.ConsGetCh = ArmOmap3GetCh; + break; + default: ASSERT(FALSE); } - + // // Setup generic ARM routines for all boards // Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/omapuart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/omapuart.c (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/omapuart.c [iso-8859-1] Wed Jul 15 20:30:04 2009 @@ -1,0 +1,162 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/freeldr/arch/arm/omapuart.c + * PURPOSE: Implements code for TI OMAP3 boards using the 16550 UART + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> + +/* GLOBALS ********************************************************************/ + +// +// UART Registers +// +#define UART0_RHR (ArmBoardBlock->UartRegisterBase + 0x00) +#define UART0_THR UART0_RHR +#define UART0_IER (ArmBoardBlock->UartRegisterBase + 0x04) +#define UART0_FCR (ArmBoardBlock->UartRegisterBase + 0x08) +#define UART0_LCR (ArmBoardBlock->UartRegisterBase + 0x0C) +#define UART0_MCR (ArmBoardBlock->UartRegisterBase + 0x10) +#define UART0_LSR (ArmBoardBlock->UartRegisterBase + 0x14) +#define UART0_MDR1 (ArmBoardBlock->UartRegisterBase + 0x20) + +// +// When we enable the divisor latch +// +#define UART0_DLL UART0_RHR +#define UART0_DLH UART0_IER + +// +// FCR Values +// +#define FCR_FIFO_EN 0x01 +#define FCR_RXSR 0x02 +#define FCR_TXSR 0x04 + +// +// LCR Values +// +#define LCR_WLS_8 0x03 +#define LCR_1_STB 0x00 +#define LCR_DIVL_EN 0x80 +#define LCR_NO_PAR 0x00 + +// +// LSR Values +// +#define LSR_DR 0x01 +#define LSR_THRE 0x20 + +// +// MCR Values +// +#define MCR_DTR 0x01 +#define MCR_RTS 0x02 + +// +// MDR1 Modes +// +#define MDR1_UART16X 1 +#define MDR1_SIR 2 +#define MDR1_UART16X_AUTO_BAUD 3 +#define MDR1_UART13X 4 +#define MDR1_MIR 5 +#define MDR1_FIR 6 +#define MDR1_CIR 7 +#define MDR1_DISABLE 8 + +/* FUNCTIONS ******************************************************************/ + +VOID +ArmOmap3SerialInit(IN ULONG Baudrate) +{ + ULONG BaudClock; + + // + // Calculate baudrate clock divider to set the baud rate + // + BaudClock = (ArmBoardBlock->ClockRate / 16) / Baudrate; + + // + // Disable serial port + // + WRITE_REGISTER_UCHAR(UART0_MDR1, MDR1_DISABLE); + + // + // Disable interrupts + // + WRITE_REGISTER_UCHAR(UART0_IER, 0); + + // + // Set the baud rate to 115200 bps + // + WRITE_REGISTER_UCHAR(UART0_LCR, LCR_DIVL_EN); + WRITE_REGISTER_UCHAR(UART0_DLL, BaudClock); + WRITE_REGISTER_UCHAR(UART0_DLH, (BaudClock >> 8) & 0xFF); + + // + // Setup loopback + // + WRITE_REGISTER_UCHAR(UART0_MCR, MCR_DTR | MCR_RTS); + + // + // Set 8 bits for data, 1 stop bit, no parity + // + WRITE_REGISTER_UCHAR(UART0_LCR, LCR_WLS_8 | LCR_1_STB | LCR_NO_PAR); + + // + // Clear and enable FIFO + // + WRITE_REGISTER_UCHAR(UART0_FCR, FCR_FIFO_EN | FCR_RXSR | FCR_TXSR); + + // + // Enable serial port + // + WRITE_REGISTER_UCHAR(UART0_MDR1, MDR1_UART16X); +} + +VOID +ArmOmap3PutChar(IN INT Char) +{ + // + // Properly support new-lines + // + if (Char == '\n') ArmOmap3PutChar('\r'); + + // + // Wait for ready + // + while ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_THRE) == 0); + + // + // Send the character + // + WRITE_REGISTER_UCHAR(UART0_THR, Char); +} + +INT +ArmOmap3GetCh(VOID) +{ + // + // Wait for ready + // + while ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_DR) == 0); + + // + // Read the character + // + return READ_REGISTER_UCHAR(UART0_RHR); +} + +BOOLEAN +ArmOmap3KbHit(VOID) +{ + // + // Return if something is ready + // + return ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_DR) != 0); +} Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/omapuart.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/omapuart.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Wed Jul 15 20:30:04 2009 @@ -69,10 +69,11 @@ </directory> <directory name="arm"> <if property="ARCH" value="arm"> - <file>boot.s</file> + <file first="true">boot.s</file> <file>ferouart.c</file> <file>loader.c</file> <file>macharm.c</file> + <file>omapuart.c</file> <file>versuart.c</file> </if> </directory> Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] Wed Jul 15 20:30:04 2009 @@ -24,6 +24,12 @@ // qemu-system-arm -M versatilepb, RealView Development Boards and others // #define MACH_TYPE_VERSATILE_PB 387 + +// +// TI Beagle Board, OMAP3530 SoC +// qemu-system-arm -M beagle, Beagle Board +// +#define MACH_TYPE_OMAP3_BEAGLE 1546 // // Compatible boot-loaders should return us this information @@ -106,6 +112,18 @@ ArmFeroKbHit(VOID); VOID +ArmOmap3SerialInit(IN ULONG Baudrate); + +VOID +ArmOmap3PutChar(IN INT Char); + +INT +ArmOmap3GetCh(VOID); + +BOOLEAN +ArmOmap3KbHit(VOID); + +VOID ArmVersaSerialInit(IN ULONG Baudrate); VOID Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Wed Jul 15 20:30:04 2009 @@ -169,10 +169,10 @@ { { MemoryFirmwareTemporary, 0x90, 0x10 }, 5, }, // Disk read buffer for int 13h. DISKREADBUFFER { { MemoryFirmwarePermanent, 0xA0, 0x60 }, 6, }, // ROM / Video { { MemorySpecialMemory, 0xFFF, 1 }, 7, }, // unusable memory -#elif __arm__ - { { MemoryFirmwarePermanent, 0x00, 1 }, 0, }, // arm exception handlers - { { MemoryFirmwareTemporary, 0x01, 7 }, 1, }, // arm board block + freeldr stack + cmdline - { { MemoryLoadedProgram, 0x08, 0x70 }, 2, }, // freeldr image (roughly max. 0x64 pages) +#elif __arm__ // This needs to be done per-platform specific way + { { MemoryLoadedProgram, 0x80000, 32 }, 0, }, // X-Loader + OmapLdr + { { MemoryLoadedProgram, 0x81000, 128 }, 1, }, // FreeLDR + { { MemoryFirmwareTemporary, 0x80500, 4096 }, 2, }, // Video Buffer #endif }; MEMORY_DESCRIPTOR*

1 0

[ros-arm-bringup] 41982: - Build freeldr_arch first -- otherwise the fact you specific a file as "first = true" won't do anything, since it will only be the "first" in its sub-build. - This is required because freeldr is a binary file, and so the first function must be the start routine. - Freeldr_startup ironically does not contain the startup code, since startup code is arch-specific, it actually lives in freeldr_arch. - Also get rid of another ARM linker hack, and define the correct base addr
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 20:25:26 2009 New Revision: 41982 URL: http://svn.reactos.org/svn/reactos?rev=41982&view=rev Log: - Build freeldr_arch first -- otherwise the fact you specific a file as "first = true" won't do anything, since it will only be the "first" in its sub-build. - This is required because freeldr is a binary file, and so the first function must be the start routine. - Freeldr_startup ironically does not contain the startup code, since startup code is arch-specific, it actually lives in freeldr_arch. - Also get rid of another ARM linker hack, and define the correct base address for FreeLDR on OMAP3450. - Need a platform-specific way of specifying this. Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Wed Jul 15 20:25:26 2009 @@ -22,10 +22,10 @@ <if property="ARCH" value="arm"> <module name="freeldr" type="bootloader" installbase=".." installname="freeldr.sys"> <bootstrap installbase="loader" /> + <library>freeldr_arch</library> <library>freeldr_startup</library> <library>freeldr_base64k</library> <library>freeldr_base</library> - <library>freeldr_arch</library> <library>freeldr_main</library> <library>rossym</library> <library>cmlib</library> @@ -33,8 +33,7 @@ <library>libcntpr</library> <group linkerset="ld"> <linkerflag>-lgcc</linkerflag> - <linkerflag>-static</linkerflag> - <linkerflag>-Wl,--section-start,pagedata=0x50000</linkerflag> + <linkerflag>-Wl,--image-base=0x80FFF000</linkerflag> </group> </module> </if>

1 0

[ros-arm-bringup] 41981: - Start re-defining the PTE and PDE structures for: - ARMv6 support. - Support of new ARM3 and overall portability. - Still have to find a better way to deal with the fact that PDE/PTE types are different on ARM. - Fix the current arm low-level mm implementation to use the new structures. - However parts of the code will now be totaly obsoleted by the new ARMv6 MMU support. - The ARM port now builds again.
by ros-arm-bringup＠svn.reactos.org 15 Jul '09

15 Jul '09

Author: ros-arm-bringup Date: Wed Jul 15 20:20:53 2009 New Revision: 41981 URL: http://svn.reactos.org/svn/reactos?rev=41981&view=rev Log: - Start re-defining the PTE and PDE structures for: - ARMv6 support. - Support of new ARM3 and overall portability. - Still have to find a better way to deal with the fact that PDE/PTE types are different on ARM. - Fix the current arm low-level mm implementation to use the new structures. - However parts of the code will now be totaly obsoleted by the new ARMv6 MMU support. - The ARM port now builds again. Modified: trunk/reactos/include/ndk/arm/mmtypes.h trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/mm/arm/stubs.c Modified: trunk/reactos/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] Wed Jul 15 20:20:53 2009 @@ -185,7 +185,7 @@ ULONG filler1:1; } MMPTE_LIST; -typedef struct _MMPTE_HARDWARE +typedef struct _MMPDE_HARDWARE // FIXFIX: Find a way to make this more portable { union { @@ -193,81 +193,50 @@ { struct { - ULONG Type:2; - ULONG Unused:30; - } Fault; - struct - { - ULONG Type:2; - ULONG Ignored:2; + ULONG Valid:1; + ULONG Section:1; + ULONG Sbz:3; + ULONG Domain:4; + ULONG EccEnabled:1; + ULONG PageFrameNumber:22; + } Coarse; + struct + { + ULONG Coarse:1; + ULONG Valid:1; + ULONG Buffered:1; + ULONG Cached:1; ULONG Reserved:1; ULONG Domain:4; - ULONG Ignored1:1; - ULONG BaseAddress:22; - } Coarse; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Reserved:1; - ULONG Domain:4; - ULONG Ignored:1; + ULONG EccEnabled:1; ULONG Access:2; - ULONG Ignored1:8; - ULONG BaseAddress:12; + ULONG ExtendedAccess:3; + ULONG Sbz:3; + ULONG SuperSection:1; + ULONG Sbz1:1; + ULONG PageFrameNumber:12; } Section; - struct - { - ULONG Type:2; - ULONG Reserved:3; - ULONG Domain:4; - ULONG Ignored:3; - ULONG BaseAddress:20; - } Fine; - } L1; - union - { - struct - { - ULONG Type:2; - ULONG Unused:30; - } Fault; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Access1:2; - ULONG Access2:2; - ULONG Access3:2; - ULONG Ignored:4; - ULONG BaseAddress:16; - } Large; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Access1:2; - ULONG Access2:2; - ULONG Access3:2; - ULONG BaseAddress:20; - } Small; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Ignored:4; - ULONG BaseAddress:22; - } Tiny; - } L2; - ULONG AsUlong; + ULONG AsUlong; + } Hard; + } u; +} MMPDE_HARDWARE, *PMMPDE_HARDWARE; + +typedef union _MMPTE_HARDWARE +{ + struct + { + ULONG ExecuteNever:1; + ULONG Valid:1; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Access:2; + ULONG TypeExtension:3; + ULONG ExtendedAccess:1; + ULONG Shared:1; + ULONG NonGlobal:1; + ULONG PageFrameNumber:20; }; + ULONG AsUlong; } MMPTE_HARDWARE, *PMMPTE_HARDWARE; // Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Wed Jul 15 20:20:53 2009 @@ -7,6 +7,12 @@ #define PDE_SHIFT 20 #define PDE_SIZE (1 << PDE_SHIFT) + +// +// FIXFIX: This is all wrong now!!! +// + + // // Number of bits corresponding to the area that a coarse page table entry represents (4KB) // @@ -19,6 +25,11 @@ #define CPT_SHIFT 10 #define CPT_SIZE (1 << CPT_SHIFT) + + +// +// FIXFIX: This is all wrong now!!! +// typedef union _ARM_PTE { union @@ -143,6 +154,11 @@ ManagerDomain } ARM_DOMAIN; + +// +// FIXFIX: This is all wrong now!!! +// + // // Take 0x80812345 and extract: // PTE_BASE[0x808][0x12] @@ -153,7 +169,7 @@ ((((ULONG)(x) >> 12) & 0xFF) << 2)) #define MiGetPdeAddress(x) \ - (PMMPTE)(PDE_BASE + \ + (PMMPDE_HARDWARE)(PDE_BASE + \ (((ULONG)(x) >> 20) << 2)) #define MiGetPdeOffset(x) (((ULONG)(x)) >> 22) @@ -165,4 +181,36 @@ struct _EPROCESS; PULONG MmGetPageDirectory(VOID); + +// +// FIXME: THESE ARE WRONG ATM. +// +#define MiAddressToPde(x) \ +((PMMPTE)(((((ULONG)(x)) >> 22) << 2) + PDE_BASE)) +#define MiAddressToPte(x) \ +((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PTE_BASE)) +#define MiAddressToPteOffset(x) \ +((((ULONG)(x)) << 10) >> 22) + +// +// Convert a PTE into a corresponding address +// +#define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10)) + +#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) +#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) +#define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) + +#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.NonGlobal = 1) +#define MI_MAKE_DIRTY_PAGE(x) +#define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.Cached = 0) +#define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.Buffered = 0) +#define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.Buffered = 1) +#define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.ExtendedAccess == 0) +#define MI_IS_PAGE_COPY_ON_WRITE(x)FALSE +#define MI_IS_PAGE_DIRTY(x) TRUE + +/* Easy accessing PFN in PTE */ +#define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) + #endif Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Wed Jul 15 20:20:53 2009 @@ -15,7 +15,8 @@ /* GLOBALS ********************************************************************/ ULONG MmGlobalKernelPageDirectory[1024]; -MMPTE MiArmTemplatePte, MiArmTemplatePde; +MMPTE MiArmTemplatePte; +MMPDE_HARDWARE MiArmTemplatePde; /* PRIVATE FUNCTIONS **********************************************************/ @@ -67,8 +68,10 @@ IN BOOLEAN Create) { //ULONG PdeOffset; - PMMPTE PointerPde, PointerPte; - MMPTE TempPde, TempPte; + PMMPTE PointerPte; + PMMPDE_HARDWARE PointerPde; + MMPDE_HARDWARE TempPde; + MMPTE TempPte; NTSTATUS Status; PFN_NUMBER Pfn; @@ -95,7 +98,7 @@ // Get the PDE // PointerPde = MiGetPdeAddress(Address); - if (PointerPde->u.Hard.L1.Fault.Type == FaultPte) + if (PointerPde->u.Hard.Coarse.Valid) { // // Invalid PDE, is this a kernel address? @@ -125,13 +128,13 @@ // // Setup the PFN // - TempPde.u.Hard.L1.Coarse.BaseAddress = (Pfn << PAGE_SHIFT) >> CPT_SHIFT; + TempPde.u.Hard.Coarse.PageFrameNumber = (Pfn << PAGE_SHIFT) >> CPT_SHIFT; // // Write the PDE // - ASSERT(PointerPde->u.Hard.L1.Fault.Type == FaultPte); - ASSERT(TempPde.u.Hard.L1.Coarse.Type == CoarsePte); + ASSERT(PointerPde->u.Hard.Coarse.Valid == 0); + ASSERT(TempPde.u.Hard.Coarse.Valid == 1); *PointerPde = TempPde; // @@ -153,13 +156,13 @@ // // Write the PFN of the PDE // - TempPte.u.Hard.L2.Small.BaseAddress = Pfn; + TempPte.u.Hard.PageFrameNumber = Pfn; // // Write the PTE // - ASSERT(PointerPte->u.Hard.L2.Fault.Type == FaultPte); - ASSERT(TempPte.u.Hard.L2.Small.Type == SmallPte); + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); *PointerPte = TempPte; ///// } @@ -191,12 +194,12 @@ // // Make the entry valid // - TempPte.u.Hard.AsUlong = 0xDEADBEEF; + TempPde.u.Hard.AsUlong = 0xDEADBEEF; // // Set it // - *PointerPde = TempPte; + *PointerPde = TempPde; } } @@ -239,7 +242,7 @@ MmDeletePageTable(IN PEPROCESS Process, IN PVOID Address) { - PMMPTE PointerPde; + PMMPDE_HARDWARE PointerPde; // // Not valid for kernel addresses @@ -266,24 +269,24 @@ // // On ARM, we use a section mapping for the original low-memory mapping // - if ((Address) || (PointerPde->u.Hard.L1.Section.Type != SectionPte)) + if ((Address) || (PointerPde->u.Hard.Section.Valid == 0)) { // // Make sure it's valid // - ASSERT(PointerPde->u.Hard.L1.Coarse.Type == CoarsePte); + ASSERT(PointerPde->u.Hard.Coarse.Valid == 1); } // // Clear the PDE // PointerPde->u.Hard.AsUlong = 0; - ASSERT(PointerPde->u.Hard.L1.Fault.Type == FaultPte); + ASSERT(PointerPde->u.Hard.Coarse.Valid == 0); // // Invalidate the TLB entry // - MiFlushTlb(PointerPde, MiGetPteAddress(Address)); + MiFlushTlb((PMMPTE)PointerPde, MiGetPteAddress(Address)); } BOOLEAN @@ -295,8 +298,8 @@ NTSTATUS Status; ULONG i; PFN_NUMBER Pfn[2]; - PMMPTE PageDirectory, PointerPde; - MMPTE TempPde; + PMMPDE_HARDWARE PageDirectory, PointerPde; + MMPDE_HARDWARE TempPde; ASSERT(FALSE); // @@ -329,27 +332,27 @@ // Setup the PDE for the table base // TempPde = MiArmTemplatePde; - TempPde.u.Hard.L1.Coarse.BaseAddress = (Pfn[0] << PAGE_SHIFT) >> CPT_SHIFT; + TempPde.u.Hard.Coarse.PageFrameNumber = (Pfn[0] << PAGE_SHIFT) >> CPT_SHIFT; PointerPde = &PageDirectory[MiGetPdeOffset(PTE_BASE)]; // // Write the PDE // - ASSERT(PointerPde->u.Hard.L1.Fault.Type == FaultPte); - ASSERT(TempPde.u.Hard.L1.Coarse.Type == CoarsePte); + ASSERT(PointerPde->u.Hard.Coarse.Valid == 0); + ASSERT(TempPde.u.Hard.Coarse.Valid == 1); *PointerPde = TempPde; // // Setup the PDE for the hyperspace // - TempPde.u.Hard.L1.Coarse.BaseAddress = (Pfn[1] << PAGE_SHIFT) >> CPT_SHIFT; + TempPde.u.Hard.Coarse.PageFrameNumber = (Pfn[1] << PAGE_SHIFT) >> CPT_SHIFT; PointerPde = &PageDirectory[MiGetPdeOffset(HYPER_SPACE)]; // // Write the PDE // - ASSERT(PointerPde->u.Hard.L1.Fault.Type == FaultPte); - ASSERT(TempPde.u.Hard.L1.Coarse.Type == CoarsePte); + ASSERT(PointerPde->u.Hard.Coarse.Valid == 0); + ASSERT(TempPde.u.Hard.Coarse.Valid == 1); *PointerPde = TempPde; // @@ -515,13 +518,13 @@ // // Set the PFN // - TempPte.u.Hard.L2.Small.BaseAddress = *Pages++; + TempPte.u.Hard.PageFrameNumber = *Pages++; // // Write the PTE // - ASSERT(PointerPte->u.Hard.L2.Fault.Type == FaultPte); - ASSERT(TempPte.u.Hard.L2.Small.Type == SmallPte); + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); *PointerPte = TempPte; // @@ -626,7 +629,7 @@ // Get the PTE // PointerPte = MiGetPageTableForProcess(NULL, Address, FALSE); - if ((PointerPte) && (PointerPte->u.Hard.L2.Fault.Type != FaultPte)) + if ((PointerPte) && (PointerPte->u.Hard.Valid)) { // // Destroy it @@ -672,7 +675,7 @@ // // Unmap the PFN // - Pfn = Pte.u.Hard.L2.Small.BaseAddress; + Pfn = Pte.u.Hard.PageFrameNumber; if (Pfn) MmMarkPageUnmapped(Pfn); // @@ -726,12 +729,12 @@ // Get the PTE // Pte = MiGetPageEntryForProcess(Process, Address); - if (Pte.u.Hard.L2.Fault.Type == FaultPte) return 0; + if (Pte.u.Hard.Valid == 0) return 0; // // Return PFN // - return Pte.u.Hard.L2.Small.BaseAddress; + return Pte.u.Hard.PageFrameNumber; } BOOLEAN @@ -779,7 +782,7 @@ // // Fault PTEs are 0, which is FALSE (non-present) // - return MiGetPageEntryForProcess(Process, Address).u.Hard.L2.Fault.Type; + return MiGetPageEntryForProcess(Process, Address).u.Hard.Valid; } BOOLEAN @@ -795,9 +798,9 @@ Pte = MiGetPageEntryForProcess(Process, Address); // - // Make sure it's valid, but faulting - // - return (Pte.u.Hard.L2.Fault.Type == FaultPte) && (Pte.u.Hard.AsUlong); + // Make sure it exists, but is faulting + // + return (Pte.u.Hard.Valid == 0) && (Pte.u.Hard.AsUlong); } ULONG @@ -934,10 +937,10 @@ // // ARM Hack while we still use a section PTE // - PMMPTE PointerPte; - PointerPte = MiGetPdeAddress(PCR); - ASSERT(PointerPte->u.Hard.L1.Section.Type == SectionPte); - PhysicalAddress.QuadPart = PointerPte->u.Hard.L1.Section.BaseAddress; + PMMPDE_HARDWARE PointerPde; + PointerPde = MiGetPdeAddress(PCR); + ASSERT(PointerPde->u.Hard.Section.Valid == 1); + PhysicalAddress.QuadPart = PointerPde->u.Hard.Section.PageFrameNumber; PhysicalAddress.QuadPart <<= CPT_SHIFT; PhysicalAddress.LowPart += BYTE_OFFSET(Address); return PhysicalAddress; @@ -947,13 +950,12 @@ // Get the PTE // Pte = MiGetPageEntryForProcess(NULL, Address); - if ((Pte.u.Hard.AsUlong) && (Pte.u.Hard.L2.Fault.Type != FaultPte)) + if (Pte.u.Hard.Valid) { // // Return the information // - ASSERT(Pte.u.Hard.L2.Small.Type == SmallPte); - PhysicalAddress.QuadPart = Pte.u.Hard.L2.Small.BaseAddress; + PhysicalAddress.QuadPart = Pte.u.Hard.PageFrameNumber; PhysicalAddress.QuadPart <<= PAGE_SHIFT; PhysicalAddress.LowPart += BYTE_OFFSET(Address); }

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