Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[tkreuzer] 45196: Merge from amd64-branch: 44886 KxAcquireSpinLock: check for already owned lock only on debug builds, fix check in inner loop, don't call Kii386SpinOnSpinLock inside the inner loop, but instead of it, simplify the code. Stubplement Kii386SpinOnSpinLock in C 44893 Move spinlock inline functions into their own header, so they can be shared with hal.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 21 23:34:01 2010 New Revision: 45196 URL: http://svn.reactos.org/svn/reactos?rev=45196&view=rev Log: Merge from amd64-branch: 44886 KxAcquireSpinLock: check for already owned lock only on debug builds, fix check in inner loop, don't call Kii386SpinOnSpinLock inside the inner loop, but instead of it, simplify the code. Stubplement Kii386SpinOnSpinLock in C 44893 Move spinlock inline functions into their own header, so they can be shared with hal. Added: trunk/reactos/ntoskrnl/include/internal/spinlock.h - copied unchanged from r44893, branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/spinlock.h Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ke/spinlock.c Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Thu Jan 21 23:34:01 2010 @@ -102,27 +102,6 @@ } #ifndef CONFIG_SMP -// -// Spinlock Acquire at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) -{ - /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ - UNREFERENCED_PARAMETER(SpinLock); -} - -// -// Spinlock Release at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock) -{ - /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ - UNREFERENCED_PARAMETER(SpinLock); -} // // This routine protects against multiple CPU acquires, it's meaningless on UP. @@ -302,72 +281,6 @@ } #else - -// -// Spinlock Acquisition at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) -{ - /* Make sure that we don't own the lock already */ - if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock) - { - /* We do, bugcheck! */ - KeBugCheckEx(SPIN_LOCK_ALREADY_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); - } - - /* Start acquire loop */ - for (;;) - { - /* Try to acquire it */ - if (InterlockedBitTestAndSet((PLONG)SpinLock, 0)) - { - /* Value changed... wait until it's unlocked */ - while (*(volatile KSPIN_LOCK *)SpinLock == 1) - { -#if DBG - /* On debug builds, we use a much slower but useful routine */ - //Kii386SpinOnSpinLock(SpinLock, 5); - - /* FIXME: Do normal yield for now */ - YieldProcessor(); -#else - /* Otherwise, just yield and keep looping */ - YieldProcessor(); -#endif - } - } - else - { -#if DBG - /* On debug builds, we OR in the KTHREAD */ - *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1; -#endif - /* All is well, break out */ - break; - } - } -} - -// -// Spinlock Release at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock) -{ -#if DBG - /* Make sure that the threads match */ - if (((KSPIN_LOCK)KeGetCurrentThread() | 1) != *SpinLock) - { - /* They don't, bugcheck */ - KeBugCheckEx(SPIN_LOCK_NOT_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); - } -#endif - /* Clear the lock */ - InterlockedAnd((PLONG)SpinLock, 0); -} FORCEINLINE VOID Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Thu Jan 21 23:34:01 2010 @@ -83,6 +83,7 @@ #include "../kdbg/kdb.h" #endif #include "dbgk.h" +#include "spinlock.h" #include "tag.h" #include "test.h" #include "inbv.h" 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 Jan 21 23:34:01 2010 @@ -456,15 +456,20 @@ } #ifdef _M_IX86 -/* - * @unimplemented - */ -VOID -NTAPI -Kii386SpinOnSpinLock(IN PKSPIN_LOCK SpinLock, - IN ULONG Flags) -{ - UNIMPLEMENTED; - while (TRUE); -} -#endif +VOID +NTAPI +Kii386SpinOnSpinLock(PKSPIN_LOCK SpinLock, ULONG Flags) +{ + // FIXME: Handle flags + UNREFERENCED_PARAMETER(Flags); + + /* Spin until it's unlocked */ + while (*(volatile KSPIN_LOCK *)SpinLock & 1) + { + // FIXME: Check for timeout + + /* Yield and keep looping */ + YieldProcessor(); + } +} +#endif

14 years, 11 months

[tkreuzer] 45195: [HAL] Cleanup part 1/x - Rename each architectures default hal to "hal" and delete the stubbed "hal" module. - Delete halamd64 (will later reuse the x86 hal) - Rename "halmp" to "halmps" as it's called on windows - Set HalInitSystem as entry point - Move pcibus.c into hal_generic.rbuild - Use a common .pspec file - Use a directory.rbuild for halx86 as it was done for the other architectures already - Move some code from hal_generic to hal_generic_up - No code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 21 22:05:45 2010 New Revision: 45195 URL: http://svn.reactos.org/svn/reactos?rev=45195&view=rev Log: [HAL] Cleanup part 1/x - Rename each architectures default hal to "hal" and delete the stubbed "hal" module. - Delete halamd64 (will later reuse the x86 hal) - Rename "halmp" to "halmps" as it's called on windows - Set HalInitSystem as entry point - Move pcibus.c into hal_generic.rbuild - Use a common .pspec file - Use a directory.rbuild for halx86 as it was done for the other architectures already - Move some code from hal_generic to hal_generic_up - No code change Added: trunk/reactos/hal/hal.pspec - copied, changed from r45183, trunk/reactos/hal/hal/hal.pspec trunk/reactos/hal/halx86/directory.rbuild (with props) trunk/reactos/hal/halx86/hal.rbuild - copied, changed from r45183, trunk/reactos/hal/halx86/halup.rbuild trunk/reactos/hal/halx86/hal_generic_mp.rbuild (with props) trunk/reactos/hal/halx86/halamd64.rbuild (with props) trunk/reactos/hal/halx86/halmps.rbuild - copied, changed from r45183, trunk/reactos/hal/halx86/halmp.rbuild Removed: trunk/reactos/hal/hal/ trunk/reactos/hal/halamd64/ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild trunk/reactos/hal/halx86/hal_generic_pc.rbuild trunk/reactos/hal/halx86/halmp.rbuild trunk/reactos/hal/halx86/halup.rbuild Modified: trunk/reactos/hal/hal.rbuild trunk/reactos/hal/halarm/up/halup.rbuild trunk/reactos/hal/halppc/up/halup.rbuild trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/halxbox.rbuild Copied: trunk/reactos/hal/hal.pspec (from r45183, trunk/reactos/hal/hal/hal.pspec) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.pspec?p2=trunk/rea… ============================================================================== --- trunk/reactos/hal/hal/hal.pspec [iso-8859-1] (original) +++ trunk/reactos/hal/hal.pspec [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,30 +1,30 @@ #include "include/reactos/msvctarget.h" +#undef i386 #ifdef _M_ARM @ fastcall ExAcquireFastMutex(ptr) @ fastcall ExReleaseFastMutex(ptr) #else -@ fastcall ExAcquireFastMutex(ptr) ExiAcquireFastMutex -@ fastcall ExReleaseFastMutex(ptr) ExiReleaseFastMutex +@ fastcall -arch=i386 ExAcquireFastMutex(ptr) ExiAcquireFastMutex +@ fastcall -arch=i386 ExReleaseFastMutex(ptr) ExiReleaseFastMutex #endif -@ fastcall ExTryToAcquireFastMutex(ptr) ExiTryToAcquireFastMutex +@ fastcall -arch=i386,arm ExTryToAcquireFastMutex(ptr) ExiTryToAcquireFastMutex @ fastcall HalClearSoftwareInterrupt(long) @ fastcall HalRequestSoftwareInterrupt(long) @ fastcall HalSystemVectorDispatchEntry(long long long) -@ fastcall KeAcquireInStackQueuedSpinLock(ptr ptr) -@ fastcall KeAcquireInStackQueuedSpinLockRaiseToSynch(ptr ptr) -@ fastcall KeAcquireSpinLockRaiseToSynch(ptr) -@ fastcall KeAcquireQueuedSpinLock(ptr) -@ fastcall KeAcquireQueuedSpinLockRaiseToSynch(ptr) -@ fastcall KeReleaseInStackQueuedSpinLock(ptr) -@ fastcall KeReleaseQueuedSpinLock(ptr long) -@ fastcall KeTryToAcquireQueuedSpinLock(long ptr) -@ fastcall KeTryToAcquireQueuedSpinLockRaiseToSynch(long ptr) -@ fastcall KfAcquireSpinLock(ptr) -@ fastcall KfLowerIrql(long) -@ fastcall KfRaiseIrql(long) -@ fastcall KfReleaseSpinLock(ptr long) - +@ fastcall -arch=i386,arm KeAcquireInStackQueuedSpinLock(ptr ptr) +@ fastcall -arch=i386,arm KeAcquireInStackQueuedSpinLockRaiseToSynch(ptr ptr) +@ fastcall -arch=i386,arm KeAcquireSpinLockRaiseToSynch(ptr) +@ fastcall -arch=i386,arm KeAcquireQueuedSpinLock(ptr) +@ fastcall -arch=i386,arm KeAcquireQueuedSpinLockRaiseToSynch(ptr) +@ fastcall -arch=i386,arm KeReleaseInStackQueuedSpinLock(ptr) +@ fastcall -arch=i386,arm KeReleaseQueuedSpinLock(ptr long) +@ fastcall -arch=i386,arm KeTryToAcquireQueuedSpinLock(long ptr) +@ fastcall -arch=i386,arm KeTryToAcquireQueuedSpinLockRaiseToSynch(long ptr) +@ fastcall -arch=i386,arm KfAcquireSpinLock(ptr) +@ fastcall -arch=i386,arm KfLowerIrql(long) +@ fastcall -arch=i386,arm KfRaiseIrql(long) +@ fastcall -arch=i386,arm KfReleaseSpinLock(ptr long) @ stdcall HalAcquireDisplayOwnership(ptr) @ stdcall HalAdjustResourceList(ptr) @ stdcall HalAllProcessorsStarted() @@ -44,9 +44,7 @@ @ stdcall HalGetBusData(long long long ptr long) @ stdcall HalGetBusDataByOffset(long long long ptr long long) @ stdcall HalGetEnvironmentVariable(str long str) -#ifdef _M_ARM -@ fastcall HalGetInterruptSource() -#endif +@ fastcall -arch=arm HalGetInterruptSource() @ stdcall HalGetInterruptVector(long long long long ptr ptr) @ stdcall HalHandleNMI(ptr) @ stdcall HalInitSystem(long ptr) @@ -69,41 +67,38 @@ @ stdcall HalStartNextProcessor(ptr ptr) @ stdcall HalStartProfileInterrupt(long) @ stdcall HalStopProfileInterrupt(long) -#ifdef _M_ARM -@ fastcall HalSweepIcache() -@ fastcall HalSweepDcache() -#endif +@ fastcall -arch=arm HalSweepIcache() +@ fastcall -arch=arm HalSweepDcache() @ stdcall HalTranslateBusAddress(long long long long ptr ptr) @ stdcall IoFlushAdapterBuffers(ptr ptr ptr ptr long long) @ stdcall IoFreeAdapterChannel(ptr) @ stdcall IoFreeMapRegisters(ptr ptr long) @ stdcall IoMapTransfer(ptr ptr ptr ptr ptr long) -#ifndef _M_ARM -@ stdcall IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters -@ stdcall IoReadPartitionTable(ptr long long ptr) HalpReadPartitionTable -@ stdcall IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation -@ stdcall IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable -#endif -@ stdcall KeAcquireSpinLock(ptr ptr) +@ stdcall -arch=i386,x86_64 IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters +@ stdcall -arch=i386,x86_64 IoReadPartitionTable(ptr long long ptr) HalpReadPartitionTable +@ stdcall -arch=i386,x86_64 IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation +@ stdcall -arch=i386,x86_64 IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable +@ stdcall -arch=i386,arm KeAcquireSpinLock(ptr ptr) @ extern KdComPortInUse @ stdcall KeFlushWriteBuffer() -@ stdcall KeGetCurrentIrql() -@ stdcall KeLowerIrql(long) +@ stdcall -arch=i386,arm KeGetCurrentIrql() +@ stdcall -arch=i386,arm KeLowerIrql(long) @ stdcall KeQueryPerformanceCounter(ptr) -@ stdcall KeRaiseIrql(long ptr) -@ stdcall KeRaiseIrqlToDpcLevel() -@ stdcall KeRaiseIrqlToSynchLevel() -@ stdcall KeReleaseSpinLock(ptr long) +@ stdcall -arch=i386,arm KeRaiseIrql(long ptr) +@ stdcall -arch=i386,arm KeRaiseIrqlToDpcLevel() +@ stdcall -arch=i386,arm KeRaiseIrqlToSynchLevel() +@ stdcall -arch=i386,arm KeReleaseSpinLock(ptr long) @ stdcall KeStallExecutionProcessor(long) -@ stdcall READ_PORT_BUFFER_UCHAR(ptr ptr long) -@ stdcall READ_PORT_BUFFER_ULONG(ptr ptr long) -@ stdcall READ_PORT_BUFFER_USHORT(ptr ptr long) -@ stdcall READ_PORT_UCHAR(ptr) -@ stdcall READ_PORT_ULONG(ptr) -@ stdcall READ_PORT_USHORT(ptr) -@ stdcall WRITE_PORT_BUFFER_UCHAR(ptr ptr long) -@ stdcall WRITE_PORT_BUFFER_ULONG(ptr ptr long) -@ stdcall WRITE_PORT_BUFFER_USHORT(ptr ptr long) -@ stdcall WRITE_PORT_UCHAR(ptr long) -@ stdcall WRITE_PORT_ULONG(ptr long) -@ stdcall WRITE_PORT_USHORT(ptr long) +@ stdcall -arch=i386,arm READ_PORT_BUFFER_UCHAR(ptr ptr long) +@ stdcall -arch=i386,arm READ_PORT_BUFFER_ULONG(ptr ptr long) +@ stdcall -arch=i386,arm READ_PORT_BUFFER_USHORT(ptr ptr long) +@ stdcall -arch=i386,arm READ_PORT_UCHAR(ptr) +@ stdcall -arch=i386,arm READ_PORT_ULONG(ptr) +@ stdcall -arch=i386,arm READ_PORT_USHORT(ptr) +@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_UCHAR(ptr ptr long) +@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_ULONG(ptr ptr long) +@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_USHORT(ptr ptr long) +@ stdcall -arch=i386,arm WRITE_PORT_UCHAR(ptr long) +@ stdcall -arch=i386,arm WRITE_PORT_ULONG(ptr long) +@ stdcall -arch=i386,arm WRITE_PORT_USHORT(ptr long) +@ stdcall -arch=x86_64 HalInitializeBios(long ptr) Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=45195&r… ============================================================================== --- trunk/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,21 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="hal"> - <xi:include href="hal/hal.rbuild" /> + <directory name="halx86"> + <xi:include href="halx86/directory.rbuild" /> </directory> - <if property="ARCH" value="i386"> - <directory name="halx86"> - <xi:include href="halx86/hal_generic.rbuild" /> - <xi:include href="halx86/hal_generic_up.rbuild" /> - <xi:include href="halx86/hal_generic_pc.rbuild" /> - <xi:include href="halx86/halup.rbuild" /> - <if property="BUILD_MP" value="1"> - <xi:include href="halx86/halmp.rbuild" /> - </if> - <xi:include href="halx86/halxbox.rbuild" /> - </directory> - </if> + <if property="ARCH" value="powerpc"> <directory name="halppc"> <xi:include href="halppc/directory.rbuild" /> @@ -26,12 +15,4 @@ <xi:include href="halarm/directory.rbuild" /> </directory> </if> - <if property="ARCH" value="amd64"> - <directory name="halx86"> - <xi:include href="halx86/hal_generic_amd64.rbuild" /> - </directory> - <directory name="halamd64"> - <xi:include href="halamd64/directory.rbuild" /> - </directory> - </if> </group> Modified: trunk/reactos/hal/halarm/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halarm_up" type="kernelmodedll" installbase="system32" installname="hal.dll"> - <importlibrary base="hal" definition="hal.pspec" /> +<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll"> + <importlibrary base="hal" definition="../../hal.pspec" /> <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="halarm_generic">../include</include> <include base="ntoskrnl">include</include> Modified: trunk/reactos/hal/halppc/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halppc_up" type="kernelmodedll"> - <importlibrary definition="../../hal/hal.def" /> +<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem"> + <importlibrary definition="../../hal/hal.pspec" /> <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="halppc_generic">../include</include> <include base="ntoskrnl">include</include> Added: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild (added) +++ trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,0 +1,21 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + + <xi:include href="hal_generic.rbuild" /> + <xi:include href="hal_generic_up.rbuild" /> + <xi:include href="hal_generic_mp.rbuild" /> + + <if property="ARCH" value="i386"> + <xi:include href="hal.rbuild" /> + <xi:include href="halxbox.rbuild" /> + <if property="BUILD_MP" value="1"> + <xi:include href="halmps.rbuild" /> + </if> + </if> + + <if property="ARCH" value="amd64"> + <xi:include href="halamd64.rbuild" /> + </if> + +</group> Propchange: trunk/reactos/hal/halx86/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/hal/halx86/hal.rbuild (from r45183, trunk/reactos/hal/halx86/halup.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal.rbuild?p2=t… ============================================================================== --- trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,15 +1,14 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halup" type="kernelmodedll" entrypoint="0" installname="hal.dll"> - <importlibrary base="hal" definition="hal.pspec" /> + <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="hal.dll"> + <importlibrary base="hal" definition="../hal.pspec" /> <bootstrap installbase="$(CDOUTPUT)" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <library>hal_generic</library> <library>hal_generic_up</library> - <library>hal_generic_pc</library> <library>ntoskrnl</library> <directory name="up"> <file>halinit_up.c</file> Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -10,6 +10,7 @@ <file>bushndlr.c</file> <file>isabus.c</file> <file>halbus.c</file> + <file>pcibus.c</file> <file>pcidata.c</file> <file>sysbus.c</file> </directory> Removed: trunk/reactos/hal/halx86/hal_generic_amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_amd… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild (removed) @@ -1,34 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> -<group> - <module name="hal_generic_amd64" type="objectlibrary"> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <directory name="generic"> - <directory name="bus"> - <file>bushndlr.c</file> - <file>isabus.c</file> - <file>halbus.c</file> - <file>pcibus.c</file> - <file>pcidata.c</file> - <file>sysbus.c</file> - </directory> - <file>beep.c</file> - <file>cmos.c</file> - <file>dma.c</file> - <file>drive.c</file> - <file>display.c</file> - <file>profil.c</file> - <file>reboot.c</file> - <file>sysinfo.c</file> - <file>timer.c</file> - </directory> - <directory name="mp"> - <file>apic.c</file> - </directory> - <directory name="include"> - <pch>hal.h</pch> - </directory> - </module> -</group> Added: trunk/reactos/hal/halx86/hal_generic_mp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_mp.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_mp.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic_mp.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic_mp" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_NTHAL_" /> + <define name="CONFIG_SMP" /> + <directory name="mp"> + <file>apic.c</file> + <file>halinit_mp.c</file> + <file>ioapic.c</file> + <file>ipi_mp.c</file> + <file>mpconfig.c</file> + <file>processor_mp.c</file> + <file>spinlock.c</file> + <file>halmp.rc</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/hal_generic_mp.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/hal/halx86/hal_generic_pc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_pc.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_pc.rbuild (removed) @@ -1,14 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> -<group> - <module name="hal_generic_pc" type="objectlibrary"> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <directory name="generic"> - <directory name="bus"> - <file>pcibus.c</file> - </directory> - </directory> - </module> -</group> Added: trunk/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/halamd64.rbuild (added) +++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,0 +1,1 @@ + Propchange: trunk/reactos/hal/halx86/halamd64.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmp.rbuild?re… ============================================================================== --- trunk/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halmp.rbuild (removed) @@ -1,28 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halmp" type="kernelmodedll" entrypoint="0"> - <importlibrary base="hal" definition="hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="CONFIG_SMP" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="mp"> - <file>apic.c</file> - <file>halinit_mp.c</file> - <file>ioapic.c</file> - <file>ipi_mp.c</file> - <file>mpconfig.c</file> - <file>mps.S</file> - <file>mpsboot.asm</file> - <file>mpsirql.c</file> - <file>processor_mp.c</file> - <file>spinlock.c</file> - <file>halmp.rc</file> - </directory> - </module> -</group> Copied: trunk/reactos/hal/halx86/halmps.rbuild (from r45183, trunk/reactos/hal/halx86/halmp.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?p… ============================================================================== --- trunk/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,28 +1,21 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halmp" type="kernelmodedll" entrypoint="0"> - <importlibrary base="hal" definition="hal.pspec" /> + <module name="halmps" type="kernelmodedll" entrypoint="HalInitSystem@8"> + <importlibrary base="hal" definition="../hal.pspec" /> <bootstrap installbase="$(CDOUTPUT)" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="CONFIG_SMP" /> <define name="_NTHAL_" /> <library>hal_generic</library> - <library>hal_generic_pc</library> + <library>hal_generic_mp</library> <library>ntoskrnl</library> <directory name="mp"> - <file>apic.c</file> - <file>halinit_mp.c</file> - <file>ioapic.c</file> - <file>ipi_mp.c</file> - <file>mpconfig.c</file> <file>mps.S</file> <file>mpsboot.asm</file> <file>mpsirql.c</file> - <file>processor_mp.c</file> - <file>spinlock.c</file> - <file>halmp.rc</file> + </directory> </module> </group> Removed: trunk/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halup.rbuild?re… ============================================================================== --- trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halup.rbuild (removed) @@ -1,19 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halup" type="kernelmodedll" entrypoint="0" installname="hal.dll"> - <importlibrary base="hal" definition="hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="up"> - <file>halinit_up.c</file> - <file>halup.rc</file> - </directory> - </module> -</group> Modified: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halxbox" type="kernelmodedll" entrypoint="0"> - <importlibrary base="hal" definition="hal.pspec" /> + <module name="halxbox" type="kernelmodedll" entrypoint="HalInitSystem@8"> + <importlibrary base="hal" definition="../hal.pspec" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> @@ -10,11 +10,6 @@ <library>hal_generic</library> <library>hal_generic_up</library> <library>ntoskrnl</library> - <directory name="generic"> - <directory name="bus"> - <file>pcibus.c</file> - </directory> - </directory> <directory name="xbox"> <file>halinit_xbox.c</file> <file>part_xbox.c</file>

14 years, 11 months

[sserapion] 45194: Minor fix

by sserapion＠svn.reactos.org

Author: sserapion Date: Thu Jan 21 20:59:46 2010 New Revision: 45194 URL: http://svn.reactos.org/svn/reactos?rev=45194&view=rev Log: Minor fix Modified: trunk/tools/Qemu GUI/QEmu.cs Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=45194… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/QEmu.cs [iso-8859-1] Thu Jan 21 20:59:46 2010 @@ -144,17 +144,13 @@ switch (Platform) { case Platforms.x86: + case Platforms.x86_ISA: p.StartInfo.FileName = this.Paths.QEmu + "\\qemu.exe"; break; - case Platforms.x86_ISA: - p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-x86_64.exe"; - break; case Platforms.x64: - p.StartInfo.FileName = this.Paths.QEmu + "\\qemu.exe"; - break; case Platforms.x64_ISA: p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-x86_64.exe"; - break; + break; case Platforms.ARM_integratorcp926: case Platforms.ARM_integratorcp1026: case Platforms.ARM_versatilepb:

14 years, 11 months

[sserapion] 45193: Fix build.

by sserapion＠svn.reactos.org

Author: sserapion Date: Thu Jan 21 20:54:40 2010 New Revision: 45193 URL: http://svn.reactos.org/svn/reactos?rev=45193&view=rev Log: Fix build. Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/irq.S branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/irq.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/irq.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/irq.S [iso-8859-1] Thu Jan 21 20:54:40 2010 @@ -35,18 +35,6 @@ .func _HalEnableInterrupt _HalEnableInterrupt: UNIMPLEMENTED "HalEnableInterrupt" -.endfunc - -.global _HalDisableSystemInterrupt -.func _HalDisableSystemInterrupt -_HalDisableSystemInterrupt: - UNIMPLEMENTED "HalDisableSystemInterrupt" -.endfunc - -.global _HalEnableSystemInterrupt -.func _HalEnableSystemInterrupt -_HalEnableSystemInterrupt: - UNIMPLEMENTED "HalEnableSystemInterrupt" .endfunc .global _HalDisableInterrupt Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Thu Jan 21 20:54:40 2010 @@ -6,7 +6,6 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <directory name="generic"> - <file>pic.c</file> <file>spinlock.c</file> </directory> <directory name="up">

14 years, 11 months

[tkreuzer] 45192: fix build with USERMODE = 1

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 21 20:48:38 2010 New Revision: 45192 URL: http://svn.reactos.org/svn/reactos?rev=45192&view=rev Log: fix build with USERMODE = 1 Modified: branches/ros-amd64-bringup/reactos/lib/tdilib/tdilib.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/tdilib/tdilib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/t… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/tdilib/tdilib.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/tdilib/tdilib.rbuild [iso-8859-1] Thu Jan 21 20:48:38 2010 @@ -1,9 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> - +</module> +</if>

14 years, 11 months

[tkreuzer] 45191: [FREELDR] Remove deprecated reactos loader code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 21 20:43:08 2010 New Revision: 45191 URL: http://svn.reactos.org/svn/reactos?rev=45191&view=rev Log: [FREELDR] Remove deprecated reactos loader code Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Thu Jan 21 20:43:08 2010 @@ -39,33 +39,6 @@ /* Already done */ } -void -DumpLoaderBlock() -{ - DbgPrint("LoaderBlock @ %p.\n", &LoaderBlock); - DbgPrint("Flags = 0x%x.\n", LoaderBlock.Flags); - DbgPrint("MemLower = 0x%p.\n", (PVOID)LoaderBlock.MemLower); - DbgPrint("MemHigher = 0x%p.\n", (PVOID)LoaderBlock.MemHigher); - DbgPrint("BootDevice = 0x%x.\n", LoaderBlock.BootDevice); - DbgPrint("CommandLine = %s.\n", LoaderBlock.CommandLine); - DbgPrint("ModsCount = 0x%x.\n", LoaderBlock.ModsCount); - DbgPrint("ModsAddr = 0x%p.\n", LoaderBlock.ModsAddr); - DbgPrint("Syms = 0x%s.\n", LoaderBlock.Syms); - DbgPrint("MmapLength = 0x%x.\n", LoaderBlock.MmapLength); - DbgPrint("MmapAddr = 0x%p.\n", (PVOID)LoaderBlock.MmapAddr); - DbgPrint("RdLength = 0x%x.\n", LoaderBlock.RdLength); - DbgPrint("RdAddr = 0x%p.\n", (PVOID)LoaderBlock.RdAddr); - DbgPrint("DrivesCount = 0x%x.\n", LoaderBlock.DrivesCount); - DbgPrint("DrivesAddr = 0x%p.\n", (PVOID)LoaderBlock.DrivesAddr); - DbgPrint("ConfigTable = 0x%x.\n", LoaderBlock.ConfigTable); - DbgPrint("BootLoaderName = 0x%x.\n", LoaderBlock.BootLoaderName); - DbgPrint("PageDirectoryStart = 0x%p.\n", (PVOID)LoaderBlock.PageDirectoryStart); - DbgPrint("PageDirectoryEnd = 0x%p.\n", (PVOID)LoaderBlock.PageDirectoryEnd); - DbgPrint("KernelBase = 0x%p.\n", (PVOID)LoaderBlock.KernelBase); - DbgPrint("ArchExtra = 0x%p.\n", (PVOID)LoaderBlock.ArchExtra); - -} - /*++ * FrLdrStartup * INTERNAL @@ -86,222 +59,7 @@ NTAPI FrLdrStartup(ULONG Magic) { - /* Disable Interrupts */ - _disable(); - - /* Re-initalize EFLAGS */ - __writeeflags(0); - - /* Initialize the page directory */ - FrLdrSetupPageDirectory(); - - /* Set the new PML4 */ - __writecr3((ULONGLONG)pPML4); - - FrLdrSetupGdtIdt(); - - LoaderBlock.FrLdrDbgPrint = DbgPrint; - -// DumpLoaderBlock(); - - DbgPrint("Jumping to kernel @ %p.\n", KernelEntryPoint); - - /* Jump to Kernel */ - (*KernelEntryPoint)(Magic, &LoaderBlock); - + DbgPrint("ReactOS loader is unsupported! Halting.\n", KernelEntryPoint); + for(;;); } -PPAGE_DIRECTORY_AMD64 -FrLdrGetOrCreatePageDir(PPAGE_DIRECTORY_AMD64 pDir, ULONG Index) -{ - PPAGE_DIRECTORY_AMD64 pSubDir; - - if (!pDir) - return NULL; - - if (!pDir->Pde[Index].Valid) - { - pSubDir = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); - if (!pSubDir) - return NULL; - RtlZeroMemory(pSubDir, PAGE_SIZE); - pDir->Pde[Index].PageFrameNumber = PtrToPfn(pSubDir); - pDir->Pde[Index].Valid = 1; - pDir->Pde[Index].Write = 1; - } - else - { - pSubDir = (PPAGE_DIRECTORY_AMD64)((ULONGLONG)(pDir->Pde[Index].PageFrameNumber) * PAGE_SIZE); - } - return pSubDir; -} - -BOOLEAN -FrLdrMapSinglePage(ULONGLONG VirtualAddress, ULONGLONG PhysicalAddress) -{ - PPAGE_DIRECTORY_AMD64 pDir3, pDir2, pDir1; - ULONG Index; - - pDir3 = FrLdrGetOrCreatePageDir(pPML4, VAtoPXI(VirtualAddress)); - pDir2 = FrLdrGetOrCreatePageDir(pDir3, VAtoPPI(VirtualAddress)); - pDir1 = FrLdrGetOrCreatePageDir(pDir2, VAtoPDI(VirtualAddress)); - - if (!pDir1) - return FALSE; - - Index = VAtoPTI(VirtualAddress); - if (pDir1->Pde[Index].Valid) - { - return FALSE; - } - - pDir1->Pde[Index].Valid = 1; - pDir1->Pde[Index].Write = 1; - pDir1->Pde[Index].PageFrameNumber = PhysicalAddress / PAGE_SIZE; - - return TRUE; -} - -ULONG -FrLdrMapRangeOfPages(ULONGLONG VirtualAddress, ULONGLONG PhysicalAddress, ULONG cPages) -{ - ULONG i; - - for (i = 0; i < cPages; i++) - { - if (!FrLdrMapSinglePage(VirtualAddress, PhysicalAddress)) - { - return i; - } - VirtualAddress += PAGE_SIZE; - PhysicalAddress += PAGE_SIZE; - } - return i; -} - - -/*++ - * FrLdrSetupPageDirectory - * INTERNAL - * - * Sets up the ReactOS Startup Page Directory. - * - * Params: - * None. - * - * Returns: - * None. - *--*/ -VOID -FASTCALL -FrLdrSetupPageDirectory(VOID) -{ - ULONG KernelPages; - PVOID UserSharedData; - - /* Allocate a Page for the PML4 */ - pPML4 = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); - - ASSERT(pPML4); - - /* The page tables are located at 0xfffff68000000000 - * We create a recursive self mapping through all 4 levels at - * virtual address 0xfffff6fb7dbedf68 */ - pPML4->Pde[VAtoPXI(PXE_BASE)].Valid = 1; - pPML4->Pde[VAtoPXI(PXE_BASE)].Write = 1; - pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(pPML4); - - /* Setup low memory pages */ - if (FrLdrMapRangeOfPages(0, 0, 1024) < 1024) - { - DbgPrint("Could not map low memory pages.\n"); - } - - /* Setup kernel pages */ - KernelPages = (ROUND_TO_PAGES(NextModuleBase - KERNEL_BASE_PHYS) / PAGE_SIZE); - if (FrLdrMapRangeOfPages(KernelBase, KERNEL_BASE_PHYS, KernelPages) != KernelPages) - { - DbgPrint("Could not map %d kernel pages.\n", KernelPages); - } - - /* Setup a page for the idt */ - pIdt = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); - IdtBase = KernelBase + KernelPages * PAGE_SIZE; - if (!FrLdrMapSinglePage(IdtBase, (ULONGLONG)pIdt)) - { - DbgPrint("Could not map idt page.\n", KernelPages); - } - - /* Setup a page for the gdt & tss */ - pGdt = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); - GdtBase = IdtBase + PAGE_SIZE; - TssBase = GdtBase + 20 * sizeof(ULONG64); // FIXME: don't hardcode - if (!FrLdrMapSinglePage(GdtBase, (ULONGLONG)pGdt)) - { - DbgPrint("Could not map gdt page.\n", KernelPages); - } - - /* Setup KUSER_SHARED_DATA page */ - UserSharedData = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); - if (!FrLdrMapSinglePage(KI_USER_SHARED_DATA, (ULONG64)UserSharedData)) - { - DbgPrint("Could not map KUSER_SHARED_DATA page.\n", KernelPages); - } - - /* Map APIC page */ - if (!FrLdrMapSinglePage(APIC_BASE, APIC_PHYS_BASE)) - { - DbgPrint("Could not map APIC page.\n"); - } - -} - -VOID -FrLdrSetupGdtIdt() -{ - PKGDTENTRY64 Entry; - KDESCRIPTOR Desc; - - RtlZeroMemory(pGdt, PAGE_SIZE); - - /* Setup KGDT_64_R0_CODE */ - Entry = KiGetGdtEntry(pGdt, KGDT_64_R0_CODE); - *(PULONG64)Entry = 0x00209b0000000000ULL; - - /* Setup KGDT_64_R0_SS */ - Entry = KiGetGdtEntry(pGdt, KGDT_64_R0_SS); - *(PULONG64)Entry = 0x00cf93000000ffffULL; - - /* Setup KGDT_64_DATA */ - Entry = KiGetGdtEntry(pGdt, KGDT_64_DATA); - *(PULONG64)Entry = 0x00cff3000000ffffULL; - - /* Setup KGDT_64_R3_CODE */ - Entry = KiGetGdtEntry(pGdt, KGDT_64_R3_CODE); - *(PULONG64)Entry = 0x0020fb0000000000ULL; - - /* Setup KGDT_32_R3_TEB */ - Entry = KiGetGdtEntry(pGdt, KGDT_32_R3_TEB); - *(PULONG64)Entry = 0xff40f3fd50003c00ULL; - - /* Setup TSS entry */ - Entry = KiGetGdtEntry(pGdt, KGDT_TSS); - KiInitGdtEntry(Entry, TssBase, sizeof(KTSS), I386_TSS, 0); - - /* Setup the gdt descriptor */ - Desc.Limit = 12 * sizeof(ULONG64) - 1; - Desc.Base = (PVOID)GdtBase; - - /* Set the new Gdt */ - __lgdt(&Desc.Limit); - DbgPrint("Gdtr.Base = %p\n", Desc.Base); - - /* Setup the idt descriptor */ - Desc.Limit = 12 * sizeof(ULONG64) - 1; - Desc.Base = (PVOID)IdtBase; - - /* Set the new Idt */ - __lidt(&Desc.Limit); - DbgPrint("Idtr.Base = %p\n", Desc.Base); - -}

14 years, 11 months

[sserapion] 45190: - Remove old HalpInitPICs

by sserapion＠svn.reactos.org

Author: sserapion Date: Thu Jan 21 20:40:32 2010 New Revision: 45190 URL: http://svn.reactos.org/svn/reactos?rev=45190&view=rev Log: - Remove old HalpInitPICs Removed: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/pic.c Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/irq.S branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c [iso-8859-1] Thu Jan 21 20:40:32 2010 @@ -94,7 +94,7 @@ DPRINT1("HalInitSystem 1\n"); /* Initialize the PICs */ - HalpInitializePICs(FALSE); + HalpInitializePICs(TRUE); DPRINT1("HalInitSystem 2\n"); Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/irq.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/irq.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/irq.S [iso-8859-1] Thu Jan 21 20:40:32 2010 @@ -35,6 +35,18 @@ .func _HalEnableInterrupt _HalEnableInterrupt: UNIMPLEMENTED "HalEnableInterrupt" +.endfunc + +.global _HalDisableSystemInterrupt +.func _HalDisableSystemInterrupt +_HalDisableSystemInterrupt: + UNIMPLEMENTED "HalDisableSystemInterrupt" +.endfunc + +.global _HalEnableSystemInterrupt +.func _HalEnableSystemInterrupt +_HalEnableSystemInterrupt: + UNIMPLEMENTED "HalEnableSystemInterrupt" .endfunc .global _HalDisableInterrupt Removed: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/pic.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/pic.c (removed) @@ -1,141 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/pic.c - * PURPOSE: Hardware Abstraction Layer DLL - * PROGRAMMER: Samuel Serapión - */ -#include <hal.h> - -//#define NDEBUG -#include <debug.h> -#include <asm.h> - -/* - * 8259 interrupt controllers - */ -enum -{ - Int0ctl= 0x20, /* control port (ICW1, OCW2, OCW3) */ - Int0aux= 0x21, /* everything else (ICW2, ICW3, ICW4, OCW1) */ - Int1ctl= 0xA0, /* control port */ - Int1aux= 0xA1, /* everything else (ICW2, ICW3, ICW4, OCW1) */ - - Icw1= 0x10, /* select bit in ctl register */ - Ocw2= 0x00, - Ocw3= 0x08, - - EOI= 0x20, /* non-specific end of interrupt */ - - Elcr1= 0x4D0, /* Edge/Level Triggered Register */ - Elcr2= 0x4D1, -}; - - - -INT i8259mask = 0xFFFF; /* disabled interrupts */ -INT i8259elcr; - - -VOID -NTAPI -HalpInitPICs(VOID) -{ - ULONG OldEflags; - INT x; - - OldEflags = __readeflags(); - _disable(); - - /* - * Set up the first 8259 interrupt processor. - * Make 8259 interrupts start at CPU vector VectorPIC. - * Set the 8259 as master with edge triggered - * input with fully nested interrupts. - */ - __outbyte(Int0ctl, 0x20); /* ICW1 - master, edge triggered */ - __outbyte(Int0aux, 0x11); /* Edge, cascade, CAI 8, ICW4 */ - __outbyte(Int0aux, PRIMARY_VECTOR_BASE); /* ICW2 - interrupt vector offset */ - __outbyte(Int0aux, 0x04); /* ICW3 - have slave on level 2 */ - __outbyte(Int0aux, 0x01); /* ICW4 - 8086 mode, not buffered */ - __outbyte(Int0aux, 0xFF); /* Mask Interrupts */ - /* - * Set up the second 8259 interrupt processor. - * Make 8259 interrupts start at CPU vector VectorPIC+8. - * Set the 8259 as slave with edge triggered - * input with fully nested interrupts. - */ - __outbyte(Int1ctl, 0xA0); /* ICW1 - master, edge triggered, */ - __outbyte(Int1aux, 0x11); /* Edge, cascade, CAI 8, ICW4 */ - __outbyte(Int1aux, PRIMARY_VECTOR_BASE+8); /* ICW2 - interrupt vector offset */ - __outbyte(Int1aux, 0x02); /* ICW3 - I am a slave on level 2 */ - __outbyte(Int1aux, 0x01); /* ICW4 - 8086 mode, not buffered */ - __outbyte(Int1aux, 0xFF); /* Mask Interrupts */ - - - /* - * pass #2 8259 interrupts to #1 - */ - i8259mask &= ~0x04; - __outbyte(Int0aux, i8259mask & 0xFF); - - /* - * Set Ocw3 to return the ISR when ctl read. - * After initialisation status read is set to IRR. - * Read IRR first to possibly deassert an outstanding - * interrupt. - */ - __inbyte (Int0ctl); - __outbyte(Int0ctl, Ocw3|0x03); - __inbyte (Int1ctl); - __outbyte(Int1ctl, Ocw3|0x03); - - /* - * Check for Edge/Level register. - * This check may not work for all chipsets. - * First try a non-intrusive test - the bits for - * IRQs 13, 8, 2, 1 and 0 must be edge (0). If - * that's OK try a R/W test. - */ - x = (__inbyte(Elcr2) << 8) | __inbyte(Elcr1); - - if (!(x & 0x2107)) - { - __outbyte(Elcr1, 0); - - if (__inbyte (Elcr1) == 0) - { - __outbyte(Elcr1, 0x20); - - if (__inbyte (Elcr1) == 0x20) - { - i8259elcr = x; - } - __outbyte(Elcr1, x & 0xFF); - DPRINT("ELCR: %4.4uX\n", i8259elcr); - } - } - - __writeeflags(OldEflags); -} - -VOID -NTAPI -HalDisableSystemInterrupt( - ULONG Vector, - KIRQL Irql) -{ - UNIMPLEMENTED; -} - -BOOLEAN -NTAPI -HalEnableSystemInterrupt( - ULONG Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode) -{ - UNIMPLEMENTED; - return FALSE; -} - Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Thu Jan 21 20:40:32 2010 @@ -20,6 +20,7 @@ <file>dma.c</file> <file>drive.c</file> <file>display.c</file> + <file>pic.c</file> <file>profil.c</file> <file>reboot.c</file> <file>sysinfo.c</file>

14 years, 11 months

[tkreuzer] 45189: [HAL] Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 21 20:34:30 2010 New Revision: 45189 URL: http://svn.reactos.org/svn/reactos?rev=45189&view=rev Log: [HAL] Fix build Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/misc.c Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c [iso-8859-1] Thu Jan 21 20:34:30 2010 @@ -94,7 +94,7 @@ DPRINT1("HalInitSystem 1\n"); /* Initialize the PICs */ - HalpInitPICs(); + HalpInitializePICs(FALSE); DPRINT1("HalInitSystem 2\n"); Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/misc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/misc.c [iso-8859-1] Thu Jan 21 20:34:30 2010 @@ -169,3 +169,23 @@ return Result; } +VOID +NTAPI +HalDisableSystemInterrupt( + ULONG Vector, + KIRQL Irql) +{ + UNIMPLEMENTED; +} + +BOOLEAN +NTAPI +HalEnableSystemInterrupt( + ULONG Vector, + KIRQL Irql, + KINTERRUPT_MODE InterruptMode) +{ + UNIMPLEMENTED; + return FALSE; +} +

14 years, 11 months

[tkreuzer] 45188: [NTOS] Fixup code based on recent changes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 21 20:33:47 2010 New Revision: 45188 URL: http://svn.reactos.org/svn/reactos?rev=45188&view=rev Log: [NTOS] Fixup code based on recent changes Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S [iso-8859-1] Thu Jan 21 20:33:47 2010 @@ -14,18 +14,6 @@ /* GLOBALS *******************************************************************/ -.bss -.align 16 - -/* Kernel Boot Stack */ -.globl _P0BootStack -.space KERNEL_STACK_SIZE -_P0BootStack: - -/* Kernel Double-Fault and Temporary DPC Stack */ -.globl _KiDoubleFaultStack -.space KERNEL_STACK_SIZE -_KiDoubleFaultStack: /* FUNCTIONS *****************************************************************/ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Thu Jan 21 20:33:47 2010 @@ -29,6 +29,12 @@ extern ADDRESS_RANGE KeMemoryMap[64]; KIPCR KiInitialPcr; + +/* Boot and double-fault/NMI/DPC stack */ +UCHAR P0BootStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0}; +UCHAR KiDoubleFaultStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0}; +ULONG_PTR P0BootStack = (ULONG_PTR)&P0BootStackData[KERNEL_STACK_SIZE]; +ULONG_PTR KiDoubleFaultStack = (ULONG_PTR)&KiDoubleFaultStackData[KERNEL_STACK_SIZE]; /* FUNCTIONS *****************************************************************/ @@ -344,30 +350,20 @@ VOID NTAPI -KiSystemStartup(IN ULONG_PTR Dummy, - IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) -{ - FrLdrDbgPrint = ((PLOADER_PARAMETER_BLOCK)Dummy)->u.I386.CommonDataArea; - FrLdrDbgPrint("Hello from KiSystemStartup!!!\n"); - - /* HACK, because freeldr maps page 0 */ - MiAddressToPte((PVOID)0)->u.Hard.Valid = 0; - - KiSystemStartupReal((PLOADER_PARAMETER_BLOCK)Dummy); - -// KiRosPrepareForSystemStartup(Dummy, LoaderBlock); -} - - -VOID -NTAPI -KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { ULONG Cpu; PKTHREAD InitialThread; ULONG64 InitialStack; PKIPCR Pcr; + /* HACK */ + FrLdrDbgPrint = LoaderBlock->u.I386.CommonDataArea; + FrLdrDbgPrint("Hello from KiSystemStartup!!!\n"); + + /* HACK, because freeldr maps page 0 */ + MiAddressToPte((PVOID)0)->u.Hard.Valid = 0; + /* Save the loader block */ KeLoaderBlock = LoaderBlock; @@ -416,7 +412,7 @@ InitialThread->ApcState.Process = (PVOID)LoaderBlock->Process; /* Initialize the PCR */ - KiInitializePcr(Pcr, Cpu, InitialThread, KiDoubleFaultStack); + KiInitializePcr(Pcr, Cpu, InitialThread, (PVOID)KiDoubleFaultStack); /* Initialize the CPU features */ KiInitializeCpuFeatures(Cpu); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] Thu Jan 21 20:33:47 2010 @@ -41,14 +41,6 @@ VOID NTAPI -KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql) -{ - UNIMPLEMENTED; -} - -VOID -NTAPI KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, IN KIRQL Irql, IN ULONG Increment) @@ -67,14 +59,6 @@ { UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; -} - -ULONG -NTAPI -KiComputeTimerTableIndex(LONGLONG Timer) -{ - UNIMPLEMENTED; - return 0; } VOID

14 years, 11 months

[tkreuzer] 45187: [NTOS] - Comment out NtRaiseException and NtContinue for now - Use TrapFrame->PreviousMode like done for arm

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 21 20:32:39 2010 New Revision: 45187 URL: http://svn.reactos.org/svn/reactos?rev=45187&view=rev Log: [NTOS] - Comment out NtRaiseException and NtContinue for now - Use TrapFrame->PreviousMode like done for arm Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/time.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c [iso-8859-1] Thu Jan 21 20:32:39 2010 @@ -167,6 +167,8 @@ /* SYSTEM CALLS ***************************************************************/ +#ifndef _M_AMD64 + NTSTATUS NTAPI NtRaiseException(IN PEXCEPTION_RECORD ExceptionRecord, @@ -239,5 +241,6 @@ /* We don't actually make it here */ return Status; } +#endif /* EOF */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/time.c [iso-8859-1] Thu Jan 21 20:32:39 2010 @@ -133,7 +133,7 @@ Prcb->InterruptCount++; /* Check if we came from user mode */ -#ifndef _M_ARM +#if !defined(_M_ARM) && !defined(_M_AMD64) if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) #else if (TrapFrame->PreviousMode == UserMode)

14 years, 11 months

← Newer
1
...
15
16
17
18
19
20
21
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010