6 Jun
2010
6 Jun
'10
2:24 p.m.
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>