Author: tkreuzer Date: Tue Jul 29 19:54:12 2008 New Revision: 34942
URL: http://svn.reactos.org/svn/reactos?rev=34942&view=rev Log: - add stubbed out mm/amd64/page.c - add amd64 specific mm.h - add a temp hack (can't inline a function with SEH atm) - add baseaddress and entrypoint to ntoskrnl rbuild - add all mm files to ntoskrnl rbuild - update subs file
Added: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c (with props) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Tue Jul 29 19:54:12 2008 @@ -15,39 +15,25 @@ STUB(KeBugcheckCallbackListHead) STUB(NtAdjustGroupsToken) STUB(NtAdjustPrivilegesToken) -STUB(NtAllocateUserPhysicalPages) -STUB(NtAreMappedFilesTheSame) -STUB(MmUserProbeAddress) -STUB(MmSizeOfMdl) -STUB(MmBuildMdlForNonPagedPool) -STUB(MmMapViewOfSection) STUB(ExpInterlockedPushEntrySList) -STUB(ExAllocatePool) -STUB(ExFreePool) -STUB(ExFreePoolWithTag) -STUB(ExAllocatePoolWithTag) STUB(PsGetCurrentThreadId) STUB(NtContinue) STUB(NtCreateEvent) STUB(NtCreateMutant) -STUB(NtCreateSection) STUB(NtCreateSemaphore) STUB(NtCreateThread) STUB(NtCreateTimer) STUB(NtCreateToken) STUB(NtDebugContinue) STUB(NtDuplicateToken) -STUB(NtExtendSection) STUB(NtFilterToken) STUB(NtFlushInstructionCache) -STUB(NtFreeUserPhysicalPages) STUB(NtDebugActiveProcess) STUB(KeActiveProcessors) STUB(KeDisableInterrupts) STUB(KiSwapContext) STUB(KeContextToTrapFrame) STUB(KiDispatchException) -STUB(MmSystemRangeStart) STUB(MiGetUserPageDirectoryCount) STUB(MmStats) STUB(PsCreateSystemThread) @@ -55,7 +41,6 @@ STUB(ExReleaseResourceLock) STUB(MiNonPagedPoolLength) STUB(MiNonPagedPoolStart) -STUB(MmGetPfnForProcess) STUB(KiInitializeUserApc) STUB(KiComputeTimerTableIndex) STUB(KeBugcheckReasonCallbackListHead) @@ -67,42 +52,30 @@ STUB(NtCreateDebugObject) STUB(NtCreateIoCompletion) STUB(NtEnumerateSystemEnvironmentValuesEx) -STUB(NtFlushVirtualMemory) -STUB(NtGetWriteWatch) STUB(NtImpersonateAnonymousToken) -STUB(NtLockVirtualMemory) -STUB(NtMapUserPhysicalPages) -STUB(NtMapUserPhysicalPagesScatter) -STUB(NtMapViewOfSection) STUB(NtOpenEvent) STUB(NtOpenIoCompletion) STUB(NtOpenMutant) -STUB(NtOpenSection) STUB(NtOpenSemaphore) STUB(NtOpenThread) STUB(NtOpenThreadToken) STUB(NtOpenTimer) -STUB(NtProtectVirtualMemory) STUB(NtPulseEvent) STUB(NtQueryEvent) STUB(NtQueryInformationToken) STUB(NtQueryIoCompletion) STUB(NtQueryMutant) -STUB(NtQuerySection) STUB(NtQuerySemaphore) STUB(NtQuerySystemEnvironmentValue) STUB(NtQuerySystemEnvironmentValueEx) STUB(NtQuerySystemInformation) STUB(NtQueryTimer) -STUB(NtQueryVirtualMemory) STUB(NtRaiseException) -STUB(NtReadVirtualMemory) STUB(NtReleaseMutant) STUB(NtReleaseSemaphore) STUB(NtRemoveIoCompletion) STUB(NtRemoveProcessDebug) STUB(NtResetEvent) -STUB(NtResetWriteWatch) STUB(NtSetEvent) STUB(NtSetEventBoostPriority) STUB(NtSetInformationTokenNtSetInformationDebugObject) @@ -112,32 +85,22 @@ STUB(NtSetSystemEnvironmentValueEx) STUB(NtSetSystemInformation) STUB(NtSetTimer) -STUB(NtUnlockVirtualMemory) -STUB(NtUnmapViewOfSection) STUB(NtVdmControl) STUB(NtWaitForDebugEvent) -STUB(NtWriteVirtualMemory) STUB(NtGetCurrentProcessorNumber) STUB(NtOpenThreadTokenEx) STUB(NtSetInformationDebugObject) STUB(NtSetInformationToken) STUB(KiSwapProcess) -STUB(MmUpdatePageDir) STUB(KeGetCurrentProcessorNumber) -STUB(MmDeleteKernelStack) -STUB(MmCreateKernelStack) STUB(Ke386InitThreadWithContext) -STUB(MmUnmapLockedPages) STUB(ExpInterlockedPopEntrySList) -STUB(MmGetPhysicalAddress) -STUB(MmFreeSectionSegments) STUB(ExAllocateFromNPagedLookasideList) STUB(ExInitializeNPagedLookasideList) STUB(SeTokenType) STUB(RtlGetCallersAddress) STUB(RtlCompareMemory) STUB(DbgkpSendApiMessage) -STUB(MmGetFileNameForSection) STUB(DbgkpTraceLevel) STUB(ExpInitializeEventImplementation) STUB(ExpInitializeMutantImplementation) @@ -145,31 +108,23 @@ STUB(ExpInitializeTimerImplementation) STUB(ExpEnvironmentLock) STUB(ExpFirmwareTableProviderListHead) -STUB(MmSectionObjectType) STUB(IoAcquireCancelSpinLock) STUB(IoReleaseCancelSpinLock) STUB(ExInterlockedInsertTailList) STUB(ExInterlockedRemoveHeadList) STUB(ExInterlockedAddLargeStatistic) -STUB(MmProbeAndLockPages) STUB(IopCompletionMapping) STUB(CmpInitializeMachineDependentConfiguration) STUB(ExpInitLookasideLists) STUB(ExpFirmwareTableResource) -STUB(MmMapViewInSystemSpace) STUB(MmNumberOfPhysicalPages) -STUB(MmInitSystem) STUB(RtlInitializeRangeListPackage) STUB(ExInitPoolLookasidePointers) STUB(KiInitializeBugCheck) -STUB(MmHighestUserAddress) STUB(DbgkInitialize) -STUB(MmCreateMdl) STUB(MmMapLockedPage) STUB(PsThreadType) -STUB(MiShutdownMemoryManager) STUB(ExfInterlockedCompareExchange64) -STUB(ExAllocatePoolWithQuotaTag) STUB(ExInitializePagedLookasideList) STUB(ExInterlockedInsertHeadList) STUB(IoCheckEaBufferValidity) @@ -179,58 +134,28 @@ STUB(IoCompletionPacketLookaside) STUB(CancelSpinLock) STUB(KdbpCliInit) -STUB(MmUnlockPages) STUB(KeDisconnectInterrupt) STUB(KeInitializeInterrupt) -STUB(MmUnmapViewOfSection) STUB(MiFreeDescriptor) STUB(MmPfnDatabase) STUB(MmHighestPhysicalPage) -STUB(MmIsPagePresent) -STUB(MmCreateVirtualMappingForKernel) -STUB(MmSetPageProtect) STUB(MiFreeDescriptorOrg) -STUB(MmMapLockedPages) STUB(_PsThreadType) STUB(_ExEventObjectType) -STUB(MmCreateHyperspaceMapping) -STUB(MmDeleteHyperspaceMapping) -STUB(MmCreateVirtualMapping) -STUB(MmRawDeleteVirtualMapping) -STUB(MmIsPageSwapEntry) -STUB(MmDeletePageFileMapping) STUB(KeRosDumpStackFrames) STUB(RtlWalkFrameChain) -STUB(MmCommitPagedPoolAddress) -STUB(MmIsDirtyPage) -STUB(MmSetDirtyPage) -STUB(MmSetCleanPage) -STUB(MmPageOutSectionView) -STUB(MmAllocateSection) -STUB(MmDeleteVirtualMapping) STUB(ExSystemLookasideListHead) STUB(PspGetOrSetContextKernelRoutine) STUB(PspW32ThreadCallout) STUB(ExTimerRundown) STUB(KeConnectInterrupt) -STUB(MmWritePageSectionView) STUB(ExInitializeSystemLookasideList) STUB(KeRaiseUserException) STUB(PsIsThreadTerminating) STUB(ExMutantObjectType) STUB(_ExSemaphoreObjectType) -STUB(MmCleanProcessAddressSpace) -STUB(MmDeleteProcessAddressSpace) -STUB(MmDeleteTeb) STUB(DbgkClearProcessDebugObject) -STUB(MmSetMemoryPriorityProcess) -STUB(MmInitializeHandBuiltProcess) -STUB(MmInitializeHandBuiltProcess2) -STUB(MmInitializeProcessAddressSpace) -STUB(MmCreatePeb) -STUB(MmQuerySystemSize) STUB(KeFeatureBits) -STUB(MmGetFileObjectForSection) STUB(SepTokenObjectType) STUB(SeExchangePrimaryToken) STUB(SeIsTokenChild) @@ -255,7 +180,6 @@ STUB(PspW32ProcessCallout) STUB(DbgkDebugObjectType) STUB(DbgkCopyProcessDebugPort) -STUB(MmCreateProcessAddressSpace) STUB(SeAssignPrimaryToken) STUB(SeDeassignPrimaryToken) STUB(SepCreateSystemProcessToken) @@ -287,15 +211,12 @@ STUB(RtlpCreateAtomHandle) STUB(RtlInitializeContext) STUB(RtlpCurrentPeb) - STUB(DbgCommandString) STUB(ExAcquireRundownProtection) STUB(ExAcquireRundownProtectionCacheAware) STUB(ExAcquireRundownProtectionCacheAwareEx) STUB(ExAcquireRundownProtectionEx) STUB(ExAllocateFromPagedLookasideList) -STUB(ExAllocatePoolWithQuota) -STUB(ExAllocatePoolWithTagPriority) STUB(ExDeleteNPagedLookasideList) STUB(ExDeletePagedLookasideList) STUB(ExEnterCriticalRegionAndAcquireResourceShared) @@ -311,7 +232,6 @@ STUB(ExInterlockedPushEntryList) STUB(ExIsProcessorFeaturePresent) STUB(ExQueryDepthSList) -STUB(ExQueryPoolBlockSize) STUB(ExRaiseException) STUB(ExRaiseStatus) STUB(ExReInitializeRundownProtection) @@ -418,51 +338,11 @@ STUB(KfRaiseIrql) STUB(KiBugCheckData) STUB(KiCpuId) -STUB(Mm64BitPhysicalAddress) -STUB(MmAdjustWorkingSetSize) -STUB(MmAdvanceMdl) -STUB(MmAllocateContiguousMemory) -STUB(MmAllocateContiguousMemorySpecifyCache) -STUB(MmAllocateMappingAddress) -STUB(MmAllocateNonCachedMemory) -STUB(MmAllocatePagesForMdl) STUB(MmAllocatePagesForMdlEx) -STUB(MmCanFileBeTruncated) STUB(MmCommitSessionMappedView) STUB(MmCreateMirror) -STUB(MmCreateSection) -STUB(MmDisableModifiedWriteOfSection) -STUB(MmFlushImageSection) -STUB(MmForceSectionClosed) -STUB(MmFreeContiguousMemory) -STUB(MmFreeContiguousMemorySpecifyCache) -STUB(MmFreeMappingAddress) -STUB(MmFreeNonCachedMemory) -STUB(MmFreePagesFromMdl) -STUB(MmGetVirtualForPhysical) -STUB(MmGrowKernelStack) -STUB(MmIsAddressValid) STUB(MmIsIoSpaceActive) -STUB(MmIsNonPagedSystemAddressValid) -STUB(MmIsThisAnNtAsSystem) STUB(MmLockPagableImageSection) -STUB(MmMapLockedPagesSpecifyCache) -STUB(MmMapLockedPagesWithReservedMapping) -STUB(MmMapMemoryDumpMdl) -STUB(MmMapVideoDisplay) -STUB(MmMapViewInSessionSpace) -STUB(MmPrefetchPages) -STUB(MmProbeAndLockProcessPages) -STUB(MmProbeAndLockSelectedPages) -STUB(MmProtectMdlSystemAddress) -STUB(MmSecureVirtualMemory) -STUB(MmSetAddressRangeModified) -STUB(MmSetBankedSection) -STUB(MmUnmapReservedMapping) -STUB(MmUnmapVideoDisplay) -STUB(MmUnmapViewInSessionSpace) -STUB(MmUnmapViewInSystemSpace) -STUB(MmUnsecureVirtualMemory) STUB(NlsOemLeadByteInfo) STUB(ObDeleteCapturedInsertInfo) STUB(ObSetHandleAttributes) @@ -564,11 +444,3 @@ STUB(KeReleaseInStackQueuedSpinLock) STUB(KfAcquireSpinLock) STUB(KeBugCheck) -STUB(MmMapIoSpace) -STUB(MmUnmapIoSpace) -STUB(MmFindRegion) -STUB(MmAlterRegion) -STUB(MmInitializeRegion) -STUB(MmDisableVirtualMapping) -STUB(MmCreatePageFileMapping) -STUB(MmEnableVirtualMapping)
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- 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] Tue Jul 29 19:54:12 2008 @@ -6,7 +6,7 @@ #define __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H
struct _EPROCESS; -PULONG MmGetPageDirectory(VOID); +PULONG_PTR MmGetPageDirectory(VOID);
#define PAGE_MASK(x) ((x)&(~0xfff)) #define PAE_PAGE_MASK(x) ((x)&(~0xfffLL))
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Tue Jul 29 19:54:12 2008 @@ -35,9 +35,13 @@ #define InterlockedExchangeAdd _InterlockedExchangeAdd
#include "ke.h" +#ifdef _M_AMD64 +#include "amd64/mm.h" +#else #include "i386/mm.h" #include "i386/fpu.h" #include "i386/v86m.h" +#endif #include "ob.h" #include "mm.h" #include "ex.h" @@ -136,7 +140,11 @@ #define IQS(TypeQuery, TypeSet, AlignmentQuery, AlignmentSet, Flags) \ { sizeof(TypeQuery), sizeof(TypeSet), sizeof(AlignmentQuery), sizeof(AlignmentSet), Flags }
+#ifndef _M_AMD64 FORCEINLINE +#else +static inline +#endif NTSTATUS DefaultSetInfoBufferCheck(ULONG Class, const INFORMATION_CLASS_INFO *ClassList, @@ -186,7 +194,11 @@ return Status; }
+#ifndef _M_AMD64 FORCEINLINE +#else +static inline +#endif NTSTATUS DefaultQueryInfoBufferCheck(ULONG Class, const INFORMATION_CLASS_INFO *ClassList,
Added: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Tue Jul 29 19:54:12 2008 @@ -1,0 +1,323 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/mm/i386/page.c + * PURPOSE: Low level memory managment manipulation + * + * PROGRAMMERS: David Welch (welch@cwcom.net) + */ + +/* INCLUDES ***************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) +#pragma alloc_text(INIT, MiInitPageDirectoryMap) +#endif + + +/* GLOBALS *****************************************************************/ + + + +/* FUNCTIONS ***************************************************************/ + +BOOLEAN MmUnmapPageTable(PULONG Pt); + +ULONG_PTR +NTAPI +MiFlushTlbIpiRoutine(ULONG_PTR Address) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +MiFlushTlb(PULONG Pt, PVOID Address) +{ + UNIMPLEMENTED; +} + + + +PULONG_PTR +MmGetPageDirectory(VOID) +{ + return (PULONG_PTR)__readcr3(); +} + +static ULONG +ProtectToPTE(ULONG flProtect) +{ + +} + +NTSTATUS +NTAPI +Mmi386ReleaseMmInfo(PEPROCESS Process) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +MmInitializeHandBuiltProcess(IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +BOOLEAN +STDCALL +MmCreateProcessAddressSpace(IN ULONG MinWs, + IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +MmDeletePageTable(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmFreePageTable(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; +} + +BOOLEAN MmUnmapPageTable(PULONG Pt) +{ + UNIMPLEMENTED; + return FALSE; +} + +PFN_TYPE +NTAPI +MmGetPfnForProcess(PEPROCESS Process, + PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmRawDeleteVirtualMapping(PVOID Address) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, + BOOLEAN* WasDirty, PPFN_TYPE Page) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, + SWAPENTRY* SwapEntry) +{ + UNIMPLEMENTED; +} + +BOOLEAN +Mmi386MakeKernelPageTableGlobal(PVOID PAddress) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOLEAN +NTAPI +MmIsDirtyPage(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOLEAN +NTAPI +MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +MmSetCleanPage(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmSetDirtyPage(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +MmEnableVirtualMapping(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; +} + +BOOLEAN +NTAPI +MmIsPagePresent(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +BOOLEAN +NTAPI +MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +NTSTATUS +NTAPI +MmCreateVirtualMappingForKernel(PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +MmCreatePageFileMapping(PEPROCESS Process, + PVOID Address, + SWAPENTRY SwapEntry) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +NTSTATUS +NTAPI +MmCreateVirtualMappingUnsafe(PEPROCESS Process, + PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +MmCreateVirtualMapping(PEPROCESS Process, + PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +MmGetPageProtect(PEPROCESS Process, PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) +{ + UNIMPLEMENTED; +} + +/* + * @implemented + */ +PHYSICAL_ADDRESS STDCALL +MmGetPhysicalAddress(PVOID vaddr) +{ + PHYSICAL_ADDRESS ret = {{0}}; + UNIMPLEMENTED; + return ret; +} + +PVOID +NTAPI +MmCreateHyperspaceMapping(PFN_TYPE Page) +{ + UNIMPLEMENTED; + return NULL; +} + +PFN_TYPE +NTAPI +MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage) +{ + UNIMPLEMENTED; + return 0; +} + +PFN_TYPE +NTAPI +MmDeleteHyperspaceMapping(PVOID Address) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) +{ + UNIMPLEMENTED; +} + +VOID +INIT_FUNCTION +NTAPI +MmInitGlobalKernelPageDirectory(VOID) +{ + UNIMPLEMENTED; +} + +VOID +INIT_FUNCTION +NTAPI +MiInitPageDirectoryMap(VOID) +{ + UNIMPLEMENTED; +} + +/* EOF */
Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] Tue Jul 29 19:54:12 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> -<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" allowwarnings="true"> +<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" baseaddress="0xfffff80000800000" entrypoint="KiSystemStartup" allowwarnings="true"> <bootstrap installbase="$(CDOUTPUT)" /> <importlibrary definition="ntoskrnl_$(ARCH).def" /> <define name="_DISABLE_TIDENTS" /> @@ -358,20 +358,25 @@ <file>page.c</file> </directory> </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>page.c</file> + </directory> + </if> <file>anonmem.c</file> <file>aspace.c</file> <file>balance.c</file> - <!-- file>cont.c</file --> + <file>cont.c</file> <file>drvlck.c</file> <file>freelist.c</file> - <!-- file>iospace.c</file --> + <file>iospace.c</file> <file>kmap.c</file> <file>marea.c</file> - <!-- file>mdlsup.c</file --> - <!-- file>mm.c</file --> - <!-- file>mminit.c</file --> + <file>mdlsup.c</file> + <file>mm.c</file> + <file>mminit.c</file> <file>mpw.c</file> - <!-- file>ncache.c</file --> + <file>ncache.c</file> <file>npool.c</file> <file>pagefile.c</file> <file>pageop.c</file> @@ -380,15 +385,15 @@ <file>paging.c</file> <file>pe.c</file> <file>physical.c</file> - <!-- file>pool.c</file --> + <file>pool.c</file> <file>ppool.c</file> - <!-- file>procsup.c</file --> - <!-- file>region.c</file --> + <file>procsup.c</file> + <file>region.c</file> <file>rmap.c</file> - <!-- file>section.c</file --> + <file>section.c</file> <file>sysldr.c</file> <file>verifier.c</file> - <!-- file>virtual.c</file --> + <file>virtual.c</file> <file>wset.c</file> <if property="_ELF_" value="1"> <file>elf32.c</file>