mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 21:44:31 +00:00
[NTOS:MM] Pass The FaultCode to MmArmAcceessFault as well and translate it there to what was declared as "StoreInstruction"
No functional changes.
This commit is contained in:
parent
3021c2d571
commit
d5c71429d7
|
@ -1766,7 +1766,7 @@ MiRosProtectVirtualMemory(
|
|||
NTSTATUS
|
||||
NTAPI
|
||||
MmArmAccessFault(
|
||||
IN BOOLEAN StoreInstruction,
|
||||
IN ULONG FaultCode,
|
||||
IN PVOID Address,
|
||||
IN KPROCESSOR_MODE Mode,
|
||||
IN PVOID TrapInformation
|
||||
|
|
|
@ -1618,7 +1618,7 @@ MiDispatchFault(IN BOOLEAN StoreInstruction,
|
|||
|
||||
NTSTATUS
|
||||
NTAPI
|
||||
MmArmAccessFault(IN BOOLEAN StoreInstruction,
|
||||
MmArmAccessFault(IN ULONG FaultCode,
|
||||
IN PVOID Address,
|
||||
IN KPROCESSOR_MODE Mode,
|
||||
IN PVOID TrapInformation)
|
||||
|
@ -1644,6 +1644,7 @@ MmArmAccessFault(IN BOOLEAN StoreInstruction,
|
|||
ULONG Color;
|
||||
BOOLEAN IsSessionAddress;
|
||||
PMMPFN Pfn1;
|
||||
BOOLEAN StoreInstruction = !MI_IS_NOT_PRESENT_FAULT(FaultCode);
|
||||
DPRINT("ARM3 FAULT AT: %p\n", Address);
|
||||
|
||||
/* Check for page fault on high IRQL */
|
||||
|
|
|
@ -207,7 +207,6 @@ MmAccessFault(IN ULONG FaultCode,
|
|||
IN PVOID TrapInformation)
|
||||
{
|
||||
PMEMORY_AREA MemoryArea = NULL;
|
||||
BOOLEAN StoreInstruction = !MI_IS_NOT_PRESENT_FAULT(FaultCode);
|
||||
|
||||
/* Cute little hack for ROS */
|
||||
if ((ULONG_PTR)Address >= (ULONG_PTR)MmSystemRangeStart)
|
||||
|
@ -227,7 +226,7 @@ MmAccessFault(IN ULONG FaultCode,
|
|||
{
|
||||
/* This is an ARM3 fault */
|
||||
DPRINT("ARM3 fault %p\n", MemoryArea);
|
||||
return MmArmAccessFault(StoreInstruction, Address, Mode, TrapInformation);
|
||||
return MmArmAccessFault(FaultCode, Address, Mode, TrapInformation);
|
||||
}
|
||||
|
||||
/* Is there a ReactOS address space yet? */
|
||||
|
@ -249,11 +248,11 @@ MmAccessFault(IN ULONG FaultCode,
|
|||
{
|
||||
/* This is an ARM3 fault */
|
||||
DPRINT("ARM3 fault %p\n", MemoryArea);
|
||||
return MmArmAccessFault(StoreInstruction, Address, Mode, TrapInformation);
|
||||
return MmArmAccessFault(FaultCode, Address, Mode, TrapInformation);
|
||||
}
|
||||
|
||||
/* Keep same old ReactOS Behaviour */
|
||||
if (StoreInstruction)
|
||||
if (!MI_IS_NOT_PRESENT_FAULT(FaultCode))
|
||||
{
|
||||
/* Call access fault */
|
||||
return MmpAccessFault(Mode, (ULONG_PTR)Address, TrapInformation ? FALSE : TRUE);
|
||||
|
|
Loading…
Reference in a new issue