ntoskrnl:

- Use generic Interlocked functions for amd64, too - use generic rbuild file (2 hax left) - add baseaddress for ntoskrnl - update and sort amd64stubs svn path=/branches/ros-amd64-bringup/; revision=37410
2026-09-03 04:13:31 +00:00 · 2008-11-17 16:24:37 +00:00
parent b89fdd3cc2
commit a2c562c00b
6 changed files with 109 additions and 583 deletions
@@ -214,7 +214,7 @@
 	</directory>

 	<directory name="ntoskrnl">
-		<xi:include href="ntoskrnl/ntoskrnl-amd64hack.rbuild" />
+		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
 	</directory>

 	<!-- directory name="subsystems">
@@ -5,88 +5,24 @@ unsigned long (*FrLdrDbgPrint)(const char *Format, ...);

 #define STUB(x) void x() {FrLdrDbgPrint("Sorry, %s is only a stub!\n", __FUNCTION__);}

-STUB(KdpEnableSafeMem)
-STUB(KiIdleLoop)
-STUB(KeBugcheckCallbackListHead)
-STUB(ExpInterlockedPushEntrySList)
-STUB(NtContinue)
-STUB(KeActiveProcessors)
-STUB(KeDisableInterrupts)
-STUB(KeContextToTrapFrame)
-STUB(KiDispatchException)
-STUB(MiGetUserPageDirectoryCount)
-STUB(MmStats)
 STUB(ExAcquireResourceLock)
-STUB(ExReleaseResourceLock)
-STUB(MiNonPagedPoolLength)
-STUB(MiNonPagedPoolStart)
-STUB(KiInitializeUserApc)
-STUB(KiComputeTimerTableIndex)
-STUB(KeBugcheckReasonCallbackListHead)
-STUB(BugCheckCallbackLock)
-STUB(NtCallbackReturn)
-STUB(NtRaiseException)
-STUB(NtSetLdtEntries)
-STUB(NtVdmControl)
-STUB(KiSwapProcess)
-STUB(KeGetCurrentProcessorNumber)
-STUB(ExpInterlockedPopEntrySList)
-STUB(ExAllocateFromNPagedLookasideList)
-STUB(RtlGetCallersAddress)
-STUB(RtlCompareMemory)
-STUB(ExpEnvironmentLock)
-STUB(ExpFirmwareTableProviderListHead)
-STUB(ExInterlockedInsertTailList)
-STUB(ExInterlockedRemoveHeadList)
-STUB(ExInterlockedAddLargeStatistic)
-STUB(ExpFirmwareTableResource)
-STUB(MmNumberOfPhysicalPages)
-STUB(MmMapLockedPage)
-STUB(PsThreadType)
-STUB(ExfInterlockedCompareExchange64)
-STUB(ExInterlockedInsertHeadList)
-STUB(IoCompletionType)
-STUB(IoCompletionPacketLookaside)
-STUB(CancelSpinLock)
-STUB(KdbpCliInit)
-STUB(KeDisconnectInterrupt)
-STUB(KeInitializeInterrupt)
-STUB(MiFreeDescriptor)
-STUB(MmPfnDatabase)
-STUB(MmHighestPhysicalPage)
-STUB(MiFreeDescriptorOrg)
-STUB(ExEventObjectType)
-STUB(ExSystemLookasideListHead)
-STUB(PspGetOrSetContextKernelRoutine)
-STUB(KeConnectInterrupt)
-STUB(KeRaiseUserException)
-STUB(_ExSemaphoreObjectType)
-STUB(KeFeatureBits)
-STUB(KiSystemService)
-STUB(KdpGdbStubInit)
-STUB(KdbpSafeReadMemory)
-STUB(RtlFillMemoryUlong)
-STUB(DbgkDebugObjectType)
-STUB(KdbEnterDebuggerException)
-STUB(KdbpCliModuleLoaded)
-STUB(RtlUnwind)
-STUB(DbgCommandString)
 STUB(ExAcquireRundownProtection)
 STUB(ExAcquireRundownProtectionCacheAware)
 STUB(ExAcquireRundownProtectionCacheAwareEx)
 STUB(ExAcquireRundownProtectionEx)
+STUB(ExAllocateFromNPagedLookasideList)
 STUB(ExAllocateFromPagedLookasideList)
+STUB(ExpEnvironmentLock)
+STUB(ExEventObjectType)
+STUB(ExpFirmwareTableResource)
 STUB(ExFreeToPagedLookasideList)
 STUB(ExInitializeRundownProtection)
-STUB(ExInterlockedAddLargeInteger)
-STUB(ExInterlockedAddUlong)
-STUB(ExInterlockedPopEntryList)
-STUB(ExInterlockedPushEntryList)
 STUB(ExQueryDepthSList)
 STUB(ExRaiseException)
 STUB(ExRaiseStatus)
 STUB(ExReInitializeRundownProtection)
 STUB(ExReInitializeRundownProtectionCacheAware)
+STUB(ExReleaseResourceLock)
 STUB(ExReleaseRundownProtection)
 STUB(ExReleaseRundownProtectionCacheAware)
 STUB(ExReleaseRundownProtectionCacheAwareEx)
@@ -94,9 +30,10 @@ STUB(ExReleaseRundownProtectionEx)
 STUB(ExRundownCompleted)
 STUB(ExRundownCompletedCacheAware)
 STUB(ExSemaphoreObjectType)
+STUB(ExSystemLookasideListHead)
 STUB(ExWaitForRundownProtectionRelease)
 STUB(ExWaitForRundownProtectionReleaseCacheAware)
-STUB(ExpInterlockedFlushSList)
+STUB(ExpFirmwareTableProviderListHead)
 STUB(FsRtlAddBaseMcbEntry)
 STUB(FsRtlGetNextBaseMcbEntry)
 STUB(FsRtlInitializeBaseMcb)
@@ -110,29 +47,41 @@ STUB(FsRtlResetBaseMcb)
 STUB(FsRtlSplitBaseMcb)
 STUB(FsRtlTruncateBaseMcb)
 STUB(FsRtlUninitializeBaseMcb)
-STUB(HalDispatchTable)
-STUB(HeadlessDispatch)
-STUB(InitializeSListHead)
+STUB(IoCompletionType)
+STUB(IoCompletionPacketLookaside)
 STUB(IoFileObjectType)
 STUB(IoForwardAndCatchIrp)
 STUB(IoIs32bitProcess)
 STUB(IoWMIDeviceObjectToProviderId)
-STUB(KdDebuggerEnabled)
-STUB(KdDebuggerNotPresent)
+STUB(KeActiveProcessors)
+STUB(KeBugcheckCallbackListHead)
+STUB(KiBugCheckData)
+STUB(KeBugcheckReasonCallbackListHead)
+STUB(KeConnectInterrupt)
+STUB(KeContextToTrapFrame)
+STUB(KeDisableInterrupts)
+STUB(KeDisconnectInterrupt)
 STUB(KeEnterCriticalRegion)
 STUB(KeEnterGuardedRegion)
 STUB(KeExpandKernelStackAndCallout)
+STUB(KeFeatureBits)
 STUB(KeFlushEntireTb)
 STUB(KeGenericCallDpc)
 STUB(KeGetRecommendedSharedDataAlignment)
+STUB(KeGetCurrentProcessorNumber)
+STUB(KeInitializeInterrupt)
 STUB(KeInvalidateAllCaches)
 STUB(KeIsWaitListEmpty)
 STUB(KeLastBranchMSR)
 STUB(KeLeaveCriticalRegion)
 STUB(KeLeaveGuardedRegion)
+STUB(KeProcessorArchitecture)
+STUB(KeProcessorLevel)
+STUB(KeProcessorRevision)
 STUB(KeQueryActiveProcessors)
 STUB(KeQueryMultiThreadProcessorSet)
 STUB(KeQueryPrcbAddress)
+STUB(KeRaiseUserException)
 STUB(KeReadStateMutex)
 STUB(KeRestoreFloatingPointState)
 STUB(KeSaveFloatingPointState)
@@ -140,18 +89,46 @@ STUB(KeSaveStateForHibernate)
 STUB(KeSetDmaIoCoherency)
 STUB(KeSignalCallDpcDone)
 STUB(KeSignalCallDpcSynchronize)
+STUB(KeSwitchKernelStack)
 STUB(KeSynchronizeExecution)
 STUB(KeUpdateRunTime)
 STUB(KeUpdateSystemTime)
 STUB(KeUserModeCallback)
 STUB(KeWaitForMutexObject)
-STUB(KiBugCheckData)
 STUB(KiCpuId)
+STUB(KiComputeTimerTableIndex)
+STUB(KiDispatchException)
+STUB(KiIdleLoop)
+STUB(KiInitializeUserApc)
+STUB(KiSwapProcess)
+STUB(KiSystemService)
+STUB(KdbEnterDebuggerException)
+STUB(KdbpCliModuleLoaded)
+STUB(KdbpSafeReadMemory)
+STUB(KdbpCliInit)
+STUB(KdDebuggerEnabled)
+STUB(KdDebuggerNotPresent)
+STUB(KdpEnableSafeMem)
+STUB(KdpGdbStubInit)
+STUB(MiGetUserPageDirectoryCount)
+STUB(MiNonPagedPoolLength)
+STUB(MiNonPagedPoolStart)
+STUB(MiFreeDescriptor)
+STUB(MiFreeDescriptorOrg)
+STUB(MmPfnDatabase)
+STUB(MmHighestPhysicalPage)
+STUB(MmNumberOfPhysicalPages)
+STUB(MmMapLockedPage)
+STUB(MmStats)
 STUB(MmCommitSessionMappedView)
 STUB(MmCreateMirror)
 STUB(MmIsIoSpaceActive)
 STUB(MmLockPagableImageSection)
-STUB(NlsOemLeadByteInfo)
+STUB(NtContinue)
+STUB(NtCallbackReturn)
+STUB(NtRaiseException)
+STUB(NtSetLdtEntries)
+STUB(NtVdmControl)
 STUB(ObDeleteCapturedInsertInfo)
 STUB(ObSetHandleAttributes)
 STUB(PfxFindPrefix)
@@ -168,12 +145,17 @@ STUB(PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion)
 STUB(PsGetProcessSessionIdEx)
 STUB(PsGetProcessWow64Process)
 STUB(PsProcessType)
+STUB(PsThreadType)
 STUB(PsWrapApcWow64Thread)
+STUB(PspGetOrSetContextKernelRoutine)
 STUB(RtlAnsiStringToUnicodeSize)
+STUB(RtlCompareMemory)
 STUB(RtlCompareMemoryUlong)
 STUB(RtlCopyMemory)
 STUB(RtlCopyMemoryNonTemporal)
 STUB(RtlFillMemory)
+STUB(RtlFillMemoryUlong)
+STUB(RtlGetCallersAddress)
 STUB(RtlMoveMemory)
 STUB(RtlOemStringToUnicodeSize)
 STUB(RtlPcToFileHeader)
@@ -189,7 +171,9 @@ STUB(RtlTraceDatabaseUnlock)
 STUB(RtlTraceDatabaseValidate)
 STUB(RtlUnicodeStringToAnsiSize)
 STUB(RtlUnicodeStringToOemSize)
+STUB(RtlUnwind)
 STUB(RtlZeroMemory)
+STUB(RtlpGetStackLimits)
 STUB(SeReportSecurityEvent)
 STUB(SeSetAuditParameter)
 STUB(SeTokenObjectType)
@@ -204,15 +188,4 @@ STUB(WmiStartTrace)
 STUB(WmiStopTrace)
 STUB(WmiTraceFastEvent)
 STUB(WmiUpdateTrace)
-STUB(XIPDispatch)
-STUB(__C_specific_handler)
-STUB(__misaligned_access)
-STUB(_local_unwind)
-STUB(_setjmp)
-STUB(_setjmpex)
-STUB(longjmp)
-STUB(KeProcessorArchitecture)
-STUB(KeProcessorLevel)
-STUB(KeProcessorRevision)
-STUB(RtlpGetStackLimits)
-STUB(KeSwitchKernelStack)
+
@@ -8,7 +8,7 @@

 /* INCLUDES *******************************************************************/

-#if defined(_ARM_) || defined(_PPC_) || defined(NTOS_USE_GENERICS)
+#if defined(_ARM_) || defined(_PPC_) || defined(_M_AMD64) || defined(NTOS_USE_GENERICS)

 #include <ntoskrnl.h>
 #define NDEBUG
@@ -311,6 +311,7 @@ ExInterlockedCompareExchange64(IN OUT PLONGLONG Destination,
    return Result;
 }

+#ifndef _M_AMD64
 VOID
 NTAPI
 READ_REGISTER_BUFFER_UCHAR(IN PUCHAR Register,
@@ -454,5 +455,6 @@ WRITE_REGISTER_USHORT(IN PUSHORT Register,
    *(volatile USHORT * const)Register = Value;
    KeFlushWriteBuffer();  
 }
+#endif // !_M_AMD64

 #endif
@@ -1,488 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
-<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" baseaddress="0xfffff80000800000" entrypoint="KiSystemStartup" allowwarnings="true">
-	<bootstrap installbase="$(CDOUTPUT)" />
-	<importlibrary definition="ntoskrnl.pspec" />
-	<define name="_DISABLE_TIDENTS" />
-	<define name="__NTOSKRNL__" />
-	<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_" />
-	</if>
-	<if property="_ELF_" value="1">
-		<define name="_ELF_" />
-	</if>
-	<include base="cmlib">.</include>
-	<include base="ntoskrnl">include</include>
-	<include base="ntoskrnl" root="intermediate"></include>
-	<include base="ntoskrnl" root="intermediate">include</include>
-	<include base="ntoskrnl" root="intermediate">include/internal</include>
-	<include base="ReactOS">include/reactos/drivers</include>
-	<library>csq</library>
-	<library>hal</library>
-	<library>pseh</library>
-	<library>cmlib</library>
-	<library>rtl</library>
-	<library>rossym</library>
-	<library>libcntpr</library>
-	<library>kdcom</library>
-	<library>bootvid</library>
-	<library>wdmguid</library>
-	<dependency>bugcodes</dependency>
-	<directory name="include">
-		<pch>ntoskrnl.h</pch>
-	</directory>
-	<file>amd64stubs.c</file>
-	<directory name="ke">
-		<if property="ARCH" value="i386">
-			<directory name="i386">
-				<file first="true">boot.S</file>
-				<file>abios.c</file>
-				<file>cpu.c</file>
-				<file>ctxswitch.S</file>
-				<file>exp.c</file>
-				<file>irqobj.c</file>
-				<file>kiinit.c</file>
-				<file>ldt.c</file>
-				<file>mtrr.c</file>
-				<file>patpge.c</file>
-				<file>systimer.S</file>
-				<file>thrdini.c</file>
-				<file>trap.s</file>
-				<file>usercall_asm.S</file>
-				<file>usercall.c</file>
-				<file>v86vdm.c</file>
-				<file>v86m_sup.S</file>
-			</directory>
-		</if>
-		<if property="ARCH" value="arm">
-			<directory name="arm">
-				<file first="true">boot.s</file>
-				<file>cpu.c</file>
-				<file>ctxswtch.s</file>
-				<file>exp.c</file>
-				<file>kiinit.c</file>
-				<file>stubs_asm.s</file>
-				<file>thrdini.c</file>
-				<file>time.c</file>
-				<file>trap.s</file>
-				<file>trapc.c</file>
-				<file>usercall.c</file>
-			</directory>
-		</if>
-		<if property="ARCH" value="powerpc">
-			<directory name="powerpc">
-				<file first="true">main_asm.S</file>
-				<file>cpu.c</file>
-				<file>exp.c</file>
-				<file>kiinit.c</file>
-				<file>ppc_irq.c</file>
-				<file>stubs.c</file>
-				<file>systimer.c</file>
-				<file>thrdini.c</file>
-				<file>ctxswitch.c</file>
-				<file>ctxhelp.S</file>
-			</directory>
-		</if>
-		<if property="ARCH" value="amd64">
-			<directory name="amd64">
-				<file first="true">boot.S</file>
-				<file>cpu.c</file>
-				<file>ctxswitch.S</file>
-				<file>except.c</file>
-				<file>irql.c</file>
-				<file>kiinit.c</file>
-				<file>spinlock.c</file>
-				<file>thrdini.c</file>
-				<file>trap.S</file>
-			</directory>
-		</if>
-		<file>apc.c</file>
-		<file>balmgr.c</file>
-		<file>bug.c</file>
-		<file>clock.c</file>
-		<file>config.c</file>
-		<file>devqueue.c</file>
-		<file>dpc.c</file>
-		<file>eventobj.c</file>
-		<file>except.c</file>
-		<file>freeldr.c</file>
-		<file>gate.c</file>
-		<file>gmutex.c</file>
-		<file>ipi.c</file>
-		<file>krnlinit.c</file>
-		<file>mutex.c</file>
-		<file>procobj.c</file>
-		<file>profobj.c</file>
-		<file>queue.c</file>
-		<file>semphobj.c</file>
-		<file>spinlock.c</file>
-		<file>thrdschd.c</file>
-		<file>thrdobj.c</file>
-		<file>timerobj.c</file>
-		<file>wait.c</file>
-	</directory>
-	<directory name="cc">
-		<file>cacheman.c</file>
-		<file>copy.c</file>
-		<file>fs.c</file>
-		<file>mdl.c</file>
-		<file>pin.c</file>
-		<file>view.c</file>
-	</directory>
-	<directory name="config">
-		<if property="ARCH" value="i386">
-			<directory name="i386">
-				<file>cmhardwr.c</file>
-			</directory>
-		</if>
-		<if property="ARCH" value="amd64">
-			<directory name="i386">
-				<file>cmhardwr.c</file>
-			</directory>
-		</if>
-		<if property="ARCH" value="arm">
-			<directory name="arm">
-				<file>cmhardwr.c</file>
-			</directory>
-		</if>
-		<if property="ARCH" value="powerpc">
-			<directory name="powerpc">
-				<file>cmhardwr.c</file>
-			</directory>
-		</if>
-		<file>cmalloc.c</file>
-		<file>cmapi.c</file>
-		<file>cmboot.c</file>
-		<file>cmcheck.c</file>
-		<file>cmcontrl.c</file>
-		<file>cmconfig.c</file>
-		<file>cmdata.c</file>
-		<file>cmdelay.c</file>
-		<file>cmindex.c</file>
-		<file>cminit.c</file>
-		<file>cmhook.c</file>
-		<file>cmkcbncb.c</file>
-		<file>cmkeydel.c</file>
-		<file>cmlazy.c</file>
-		<file>cmmapvw.c</file>
-		<file>cmname.c</file>
-		<file>cmparse.c</file>
-		<file>cmse.c</file>
-		<file>cmsecach.c</file>
-		<file>cmsysini.c</file>
-		<file>cmvalue.c</file>
-		<file>cmvalche.c</file>
-		<file>cmwraprs.c</file>
-		<file>ntapi.c</file>
-	</directory>
-	<directory name="dbgk">
-		<file>dbgkutil.c</file>
-		<file>dbgkobj.c</file>
-	</directory>
-	<directory name="ex" root="intermediate">
-		<file>zw.S</file>
-	</directory>
-	<directory name="ex">
-		<if property="ARCH" value="i386">
-			<directory name="i386">
-				<file>interlck_asm.S</file>
-				<file>fastinterlck_asm.S</file>
-				<file>ioport.S</file>
-			</directory>
-		</if>
-		<file>atom.c</file>
-		<file>callback.c</file>
-		<file>dbgctrl.c</file>
-		<file>efi.c</file>
-		<file>event.c</file>
-		<file>evtpair.c</file>
-		<file>exintrin.c</file>
-		<file>fastinterlck.c</file>
-		<file>fmutex.c</file>
-		<file>handle.c</file>
-		<file>harderr.c</file>
-		<file>hdlsterm.c</file>
-		<file>init.c</file>
-		<file>keyedevt.c</file>
-		<file>locale.c</file>
-		<file>lookas.c</file>
-		<file>mutant.c</file>
-		<file>pushlock.c</file>
-		<file>profile.c</file>
-		<file>resource.c</file>
-		<file>rundown.c</file>
-		<file>sem.c</file>
-		<file>shutdown.c</file>
-		<file>sysinfo.c</file>
-		<file>time.c</file>
-		<file>timer.c</file>
-		<file>uuid.c</file>
-		<file>win32k.c</file>
-		<file>work.c</file>
-		<file>xipdisp.c</file>
-		<file>zone.c</file>
-	</directory>
-	<directory name="fsrtl">
-		<file>dbcsname.c</file>
-		<file>fastio.c</file>
-		<file>faulttol.c</file>
-		<file>filelock.c</file>
-		<file>filter.c</file>
-		<file>filtrctx.c</file>
-		<file>fsfilter.c</file>
-		<file>fsrtlpc.c</file>
-		<file>largemcb.c</file>
-		<file>name.c</file>
-		<file>notify.c</file>
-		<file>oplock.c</file>
-		<file>pnp.c</file>
-		<file>stackovf.c</file>
-		<file>tunnel.c</file>
-		<file>unc.c</file>
-	</directory>
-	<directory name="fstub">
-		<file>disksup.c</file>
-		<file>fstubex.c</file>
-		<file>halstub.c</file>
-	</directory>
-	<directory name="inbv">
-		<file>inbv.c</file>
-	</directory>
-	<directory name="io">
-		<directory name="iomgr">
-			<file>adapter.c</file>
-			<file>arcname.c</file>
-			<file>bootlog.c</file>
-			<file>controller.c</file>
-			<file>device.c</file>
-			<file>deviface.c</file>
-			<file>driver.c</file>
-			<file>drvrlist.c</file>
-			<file>error.c</file>
-			<file>file.c</file>
-			<file>iocomp.c</file>
-			<file>ioevent.c</file>
-			<file>iofunc.c</file>
-			<file>iomdl.c</file>
-			<file>iomgr.c</file>
-			<file>iorsrce.c</file>
-			<file>iotimer.c</file>
-			<file>iowork.c</file>
-			<file>irp.c</file>
-			<file>irq.c</file>
-			<file>ramdisk.c</file>
-			<file>rawfs.c</file>
-			<file>remlock.c</file>
-			<file>util.c</file>
-			<file>symlink.c</file>
-			<file>volume.c</file>
-		</directory>
-		<directory name="pnpmgr">
-			<file>plugplay.c</file>
-			<file>pnpdma.c</file>
-			<file>pnpmgr.c</file>
-			<file>pnpnotify.c</file>
-			<file>pnpreport.c</file>
-			<file>pnproot.c</file>
-		</directory>
-	</directory>
-	<if property="_WINKD_" value="0">
-		<directory name="kdbg">
-			<if property="ARCH" value="i386">
-				<directory name="i386">
-					<if property="KDBG" value="1">
-						<group>
-							<file>i386-dis.c</file>
-							<file>kdb_help.S</file>
-							<file>longjmp.S</file>
-							<file>setjmp.S</file>
-						</group>
-					</if>
-				</directory>
-			</if>
-			<if property="KDBG" value="1">
-				<!-- file>kdb.c</file -->
-				<!-- file>kdb_cli.c</file -->
-				<!-- file>kdb_expr.c</file -->
-				<file>kdb_keyboard.c</file>
-				<file>kdb_serial.c</file>
-				<if property="ARCH" value="amd64">
-					<directory name="amd64">
-						<file>kdb.c</file>
-					</directory>
-				</if>
-			</if>
-			<if property="DBG_OR_KDBG" value="true">
-				<file>kdb_symbols.c</file>
-			</if>
-		</directory>
-		<directory name="kd">
-			<directory name="wrappers">
-				<file>bochs.c</file>
-				<if property="ARCH" value="i386">
-					<file>gdbstub.c</file>
-				</if>
-				<if property="ARCH" value="powerpc">
-					<file>gdbstub_powerpc.c</file>
-				</if>
-				<file>kdbg.c</file>
-			</directory>
-			<file>kdinit.c</file>
-			<file>kdio.c</file>
-			<file>kdmain.c</file>
-		</directory>
-	</if>
-	<if property="_WINKD_" value ="1">
-		<directory name="kd64">
-			<file>kdapi.c</file>
-			<file>kdbreak.c</file>
-			<file>kddata.c</file>
-			<file>kdinit.c</file>
-			<file>kdlock.c</file>
-			<file>kdprint.c</file>
-			<file>kdtrap.c</file>
-		</directory>
-	</if>
-	<directory name="lpc">
-		<file>close.c</file>
-		<file>complete.c</file>
-		<file>connect.c</file>
-		<file>create.c</file>
-		<file>listen.c</file>
-		<file>port.c</file>
-		<file>reply.c</file>
-		<file>send.c</file>
-	</directory>
-	<directory name="mm">
-		<if property="ARCH" value="i386">
-			<directory name="i386">
-				<file>page.c</file>
-			</directory>
-		</if>
-		<if property="ARCH" value="arm">
-			<directory name="arm">
-				<file>stubs.c</file>
-			</directory>
-		</if>
-		<if property="ARCH" value="powerpc">
-			<directory name="powerpc">
-				<file>pfault.c</file>
-				<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>balance.c</file>
-		<file>cont.c</file>
-		<file>drvlck.c</file>
-		<file>freelist.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>mpw.c</file>
-		<file>ncache.c</file>
-		<file>npool.c</file>
-		<file>pagefile.c</file>
-		<file>pageop.c</file>
-		<file>pe.c</file>
-		<file>physical.c</file>
-		<file>pool.c</file>
-		<file>ppool.c</file>
-		<file>procsup.c</file>
-		<file>region.c</file>
-		<file>rmap.c</file>
-		<file>section.c</file>
-		<file>sysldr.c</file>
-		<file>verifier.c</file>
-		<file>virtual.c</file>
-		<file>wset.c</file>
-		<if property="_ELF_" value="1">
-			<file>elf32.c</file>
-			<file>elf64.c</file>
-		</if>
-	</directory>
-	<directory name="ob">
-		<file>obdir.c</file>
-		<file>obinit.c</file>
-		<file>obhandle.c</file>
-		<file>obname.c</file>
-		<file>oblife.c</file>
-		<file>obref.c</file>
-		<file>obsdcach.c</file>
-		<file>obsecure.c</file>
-		<file>oblink.c</file>
-		<file>obwait.c</file>
-	</directory>
-	<directory name="po">
-		<file>power.c</file>
-		<file>events.c</file>
-	</directory>
-	<directory name="ps">
-		<if property="ARCH" value="i386">
-			<directory name="i386">
-				<file>psctx.c</file>
-			</directory>
-		</if>
-		<if property="ARCH" value="arm">
-			<directory name="arm">
-				<file>psctx.c</file>
-			</directory>
-		</if>
-		<file>debug.c</file>
-		<file>job.c</file>
-		<file>kill.c</file>
-		<file>psnotify.c</file>
-		<file>process.c</file>
-		<file>psmgr.c</file>
-		<file>query.c</file>
-		<file>quota.c</file>
-		<file>security.c</file>
-		<file>state.c</file>
-		<file>thread.c</file>
-		<file>win32.c</file>
-	</directory>
-	<directory name="rtl">
-		<if property="ARCH" value="arm">
-			<directory name="arm">
-				<file>rtlexcpt.c</file>
-			</directory>
-		</if>
-		<file>libsupp.c</file>
-		<file>misc.c</file>
-	</directory>
-	<directory name="se">
-		<file>access.c</file>
-		<file>acl.c</file>
-		<file>audit.c</file>
-		<file>lsa.c</file>
-		<file>priv.c</file>
-		<file>sd.c</file>
-		<file>semgr.c</file>
-		<file>sid.c</file>
-		<file>token.c</file>
-	</directory>
-	<directory name="vdm">
-		<if property="ARCH" value="i386">
-			<file>vdmmain.c</file>
-			<file>vdmexec.c</file>
-		</if>
-	</directory>
-	<directory name="wmi">
-		<file>wmi.c</file>
-	</directory>
-	<file>ntoskrnl.rc</file>
-	<linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript>
-</module>
-
@@ -36,6 +36,9 @@
 	<directory name="include">
 		<pch>ntoskrnl.h</pch>
 	</directory>
+	<if property="ARCH" value="amd64">
+		<file>amd64stubs.c</file>
+	</if>
 	<directory name="ke">
 		<if property="ARCH" value="i386">
 			<directory name="i386">
@@ -87,6 +90,19 @@
 				<file>ctxhelp.S</file>
 			</directory>
 		</if>
+		<if property="ARCH" value="amd64">
+			<directory name="amd64">
+				<file first="true">boot.S</file>
+				<file>cpu.c</file>
+				<file>ctxswitch.S</file>
+				<file>except.c</file>
+				<file>irql.c</file>
+				<file>kiinit.c</file>
+				<file>spinlock.c</file>
+				<file>thrdini.c</file>
+				<file>trap.S</file>
+			</directory>
+		</if>
 		<file>apc.c</file>
 		<file>balmgr.c</file>
 		<file>bug.c</file>
@@ -126,6 +142,11 @@
 				<file>cmhardwr.c</file>
 			</directory>
 		</if>
+		<if property="ARCH" value="amd64">
+			<directory name="i386">
+				<file>cmhardwr.c</file>
+			</directory>
+		</if>
 		<if property="ARCH" value="arm">
 			<directory name="arm">
 				<file>cmhardwr.c</file>
@@ -294,11 +315,18 @@
 				</directory>
 			</if>
 			<if property="KDBG" value="1">
-				<file>kdb.c</file>
-				<file>kdb_cli.c</file>
-				<file>kdb_expr.c</file>
+				<ifnot property="ARCH" value="amd64">
+					<file>kdb.c</file>
+					<file>kdb_cli.c</file>
+					<file>kdb_expr.c</file>
+				</ifnot>
 				<file>kdb_keyboard.c</file>
 				<file>kdb_serial.c</file>
+				<if property="ARCH" value="amd64">
+					<directory name="amd64">
+						<file>kdb.c</file>
+					</directory>
+				</if>
 			</if>
 			<if property="DBG_OR_KDBG" value="true">
 				<file>kdb_symbols.c</file>
@@ -358,6 +386,11 @@
 				<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>balance.c</file>
 		<file>cont.c</file>
@@ -1,7 +1,13 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" allowwarnings="true">
+	<ifnot property="ARCH" value="amd64">
+		<property name="BASEADDRESS_NTOSKRNL" value="0x80800000" />
+	</ifnot>
+	<if property="ARCH" value="amd64">
+		<property name="BASEADDRESS_NTOSKRNL" value="0xfffff80000800000" />
+	</if>
+	<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" baseaddress="${BASEADDRESS_NTOSKRNL}" entrypoint="KiSystemStartup" allowwarnings="true">
 		<xi:include href="ntoskrnl-generic.rbuild" />
 	</module>
 </group>