Ros-diffs February 2010

ros-diffs@reactos.org

22 participants
365 discussions

[tkreuzer] 45431: [FREELDR] - Add DPRINT_WINDOWS DPRINT_PELOADER (the only useful) to DEBUG_ALL and DEBUG_CUSTOM - Enable a few useful DPRINTs
by tkreuzer＠svn.reactos.org 05 Feb '10

05 Feb '10

Author: tkreuzer Date: Fri Feb 5 04:03:38 2010 New Revision: 45431 URL: http://svn.reactos.org/svn/reactos?rev=45431&view=rev Log: [FREELDR] - Add DPRINT_WINDOWS DPRINT_PELOADER (the only useful) to DEBUG_ALL and DEBUG_CUSTOM - Enable a few useful DPRINTs Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Fri Feb 5 04:03:38 2010 @@ -32,15 +32,13 @@ #if defined (DEBUG_ALL) ULONG DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | DPRINT_FILESYSTEM | DPRINT_UI | DPRINT_DISK | DPRINT_CACHE | DPRINT_REACTOS | - DPRINT_LINUX | DPRINT_HWDETECT; + DPRINT_LINUX | DPRINT_HWDETECT | DPRINT_WINDOWS | DPRINT_PELOADER; #elif defined (DEBUG_INIFILE) ULONG DebugPrintMask = DPRINT_INIFILE; #elif defined (DEBUG_REACTOS) ULONG DebugPrintMask = DPRINT_REACTOS | DPRINT_REGISTRY; #elif defined (DEBUG_CUSTOM) -ULONG DebugPrintMask = DPRINT_WARNING | - DPRINT_UI | DPRINT_CACHE | DPRINT_REACTOS | - DPRINT_LINUX; +ULONG DebugPrintMask = DPRINT_WARNING | DPRINT_WINDOWS | DPRINT_PELOADER; #else //#elif defined (DEBUG_NONE) ULONG DebugPrintMask = 0; #endif Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Fri Feb 5 04:03:38 2010 @@ -507,8 +507,8 @@ LONG High, Low, Middle, Result; ULONG Hint; - //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", - // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); + DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", + DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); /* Check passed DllBase param */ if(DllBase == NULL) @@ -525,7 +525,7 @@ { /* Yes, calculate the ordinal */ Ordinal = (ULONG)(IMAGE_ORDINAL(ThunkData->u1.Ordinal) - (UINT32)ExportDirectory->Base); - //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal); + DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal); } else { @@ -543,12 +543,12 @@ NameTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames)); OrdinalTable = (PUSHORT)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); - //DPRINTM(DPRINT_PELOADER, "NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", - // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals); + DPRINTM(DPRINT_PELOADER, "NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", + NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals); /* Get the hint, convert it to a physical pointer */ Hint = ((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Hint; - //DPRINTM(DPRINT_PELOADER, "HintIndex %d\n", Hint); + DPRINTM(DPRINT_PELOADER, "HintIndex %d\n", Hint); /* If Hint is less than total number of entries in the export directory, and import name == export name, then we can just get it from the OrdinalTable */ @@ -561,18 +561,19 @@ ) { Ordinal = OrdinalTable[Hint]; - //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal); + DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal); } else { /* It's not the easy way, we have to lookup import name in the name table. Let's use a binary search for this task. */ - - //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName() looking up the import name using binary search...\n"); /* Low boundary is set to 0, and high boundary to the maximum index */ Low = 0; High = ExportDirectory->NumberOfNames - 1; + + DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName() looking up import '%s' in #0..#%d\n", + VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]), High); /* Perform a binary-search loop */ while (High >= Low) @@ -584,9 +585,9 @@ Result = strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Name[0]), (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))); - /*DPRINTM(DPRINT_PELOADER, "Binary search: comparing Import '__', Export '%s'\n",*/ - /*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/ - /*(PCHAR)VaToPa(RVA(DllBase, NameTable[Middle])));*/ + DPRINTM(DPRINT_PELOADER, "Binary search: comparing Import '%s', Export #%ld:'%s' -> %d\n", + VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]), + Middle, (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle])), Result); /*DPRINTM(DPRINT_PELOADER, "TE->u1.AOD %p, fulladdr %p\n", ThunkData->u1.AddressOfData, Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Fri Feb 5 04:03:38 2010 @@ -256,7 +256,10 @@ sprintf(FullPath,"%s%S", BootPath, FilePath->Buffer); Status = WinLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase); if (!Status) + { + DPRINTM(DPRINT_WINDOWS, "WinLdrLoadImage() failed\n"); return FALSE; + } // Allocate a DTE for it Status = WinLdrAllocateDataTableEntry(LoaderBlock, DllName, DllName, DriverBase, DriverDTE); @@ -310,6 +313,7 @@ //FIXME: Maybe remove it from the list and try to continue? if (!Status) { + DPRINTM(DPRINT_WARNING, "Can't load boot driver: %wZ\n", &BootDriver->FilePath); UiMessageBox("Can't load boot driver!"); return FALSE; } @@ -583,11 +587,15 @@ /* Turn on paging mode of CPU*/ WinLdrTurnOnPaging(LoaderBlock, PcrBasePage, TssBasePage, GdtIdt); +DbgPrint("Heeelooo\n"); + /* Save final value of LoaderPagesSpanned */ LoaderBlock->Extension->LoaderPagesSpanned = LoaderPagesSpanned; DPRINTM(DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", KiSystemStartup, LoaderBlockVA); + +DbgPrint("Heeelooo\n"); WinLdrpDumpMemoryDescriptors(LoaderBlockVA); WinLdrpDumpBootDriver(LoaderBlockVA);

1 0

[tkreuzer] 45430: - Add #pragma intrinsic for msvc intrinsics
by tkreuzer＠svn.reactos.org 05 Feb '10

05 Feb '10

Author: tkreuzer Date: Fri Feb 5 03:56:55 2010 New Revision: 45430 URL: http://svn.reactos.org/svn/reactos?rev=45430&view=rev Log: - Add #pragma intrinsic for msvc intrinsics Modified: branches/ros-amd64-bringup/reactos/include/crt/msc/intrin.h Modified: branches/ros-amd64-bringup/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/msc/intrin.h [iso-8859-1] Fri Feb 5 03:56:55 2010 @@ -7,160 +7,284 @@ /*** Stack frame juggling ***/ void * _ReturnAddress(void); +#pragma intrinsic(_ReturnAddress) void * _AddressOfReturnAddress(void); +#pragma intrinsic(_AddressOfReturnAddress) unsigned int __getcallerseflags(void); +#pragma intrinsic(__getcallerseflags) /*** Atomic operations ***/ void _ReadWriteBarrier(void); +#pragma intrinsic(_ReadWriteBarrier) void _ReadBarrier(void); +#pragma intrinsic(_ReadBarrier) void _WriteBarrier(void); +#pragma intrinsic(_WriteBarrier) char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand); +#pragma intrinsic(_InterlockedCompareExchange8) short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand); +#pragma intrinsic(_InterlockedCompareExchange16) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); +#pragma intrinsic(_InterlockedCompareExchange) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand); +#pragma intrinsic(_InterlockedCompareExchangePointer) long _InterlockedExchange(volatile long * const Target, const long Value); +#pragma intrinsic(_InterlockedExchange) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value); +#pragma intrinsic(_InterlockedExchangePointer) long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value); +#pragma intrinsic(_InterlockedExchangeAdd16) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value); +#pragma intrinsic(_InterlockedExchangeAdd) char _InterlockedAnd8(volatile char * const value, const char mask); +#pragma intrinsic(_InterlockedAnd8) short _InterlockedAnd16(volatile short * const value, const short mask); +#pragma intrinsic(_InterlockedAnd16) long _InterlockedAnd(volatile long * const value, const long mask); +#pragma intrinsic(_InterlockedAnd) char _InterlockedOr8(volatile char * const value, const char mask); +#pragma intrinsic(_InterlockedOr8) short _InterlockedOr16(volatile short * const value, const short mask); +#pragma intrinsic(_InterlockedOr16) long _InterlockedOr(volatile long * const value, const long mask); +#pragma intrinsic(_InterlockedOr) char _InterlockedXor8(volatile char * const value, const char mask); +#pragma intrinsic(_InterlockedXor8) short _InterlockedXor16(volatile short * const value, const short mask); +#pragma intrinsic(_InterlockedXor16) long _InterlockedXor(volatile long * const value, const long mask); +#pragma intrinsic(_InterlockedXor) long _InterlockedAddLargeStatistic(volatile __int64 * const Addend, const long Value); +#pragma intrinsic(_InterlockedAddLargeStatistic) long _InterlockedDecrement(volatile long * const lpAddend); +#pragma intrinsic(_InterlockedDecrement) long _InterlockedIncrement(volatile long * const lpAddend); +#pragma intrinsic(_InterlockedIncrement) short _InterlockedDecrement16(volatile short * const lpAddend); +#pragma intrinsic(_InterlockedDecrement16) short _InterlockedIncrement16(volatile short * const lpAddend); +#pragma intrinsic(_InterlockedIncrement16) unsigned char _interlockedbittestandreset(volatile long * a, const long b); +#pragma intrinsic(_interlockedbittestandreset) unsigned char _interlockedbittestandset(volatile long * a, const long b); +#pragma intrinsic(_interlockedbittestandset) #if defined(_M_AMD64) __int64 _InterlockedExchange64(volatile __int64 * const Target, const __int64 Value); +#pragma intrinsic(_InterlockedExchange64) __int64 _InterlockedExchangeAdd64(volatile __int64 * const Addend, const __int64 Value); -long _InterlockedAnd64(volatile __int64 * const value, const __int64 mask); +#pragma intrinsic(_InterlockedExchangeAdd64) +__int64 _InterlockedAnd64(volatile __int64 * const value, const __int64 mask); +#pragma intrinsic(_InterlockedAnd64) long _InterlockedOr64(volatile __int64 * const value, const __int64 mask); +#pragma intrinsic(_InterlockedOr64) __int64 _InterlockedCompareExchange64(volatile __int64 * const Destination, const __int64 Exchange, const __int64 Comperand); +#pragma intrinsic(_InterlockedCompareExchange64) __int64 _InterlockedDecrement64(volatile __int64 * const lpAddend); +#pragma intrinsic(_InterlockedDecrement64) __int64 _InterlockedIncrement64(volatile __int64 * const lpAddend); +#pragma intrinsic(_InterlockedIncrement64) unsigned char _interlockedbittestandreset64(volatile __int64 * a, const __int64 b); +#pragma intrinsic(_interlockedbittestandreset64) unsigned char _interlockedbittestandset64(volatile __int64 * a, const __int64 b); +#pragma intrinsic(_interlockedbittestandset64) #endif /*** String operations ***/ void __stosb(unsigned char * Dest, const unsigned char Data, size_t Count); +#pragma intrinsic(__stosb) void __stosw(unsigned short * Dest, const unsigned short Data, size_t Count); +#pragma intrinsic(__stosw) void __stosd(unsigned long * Dest, const unsigned long Data, size_t Count); +#pragma intrinsic(__stosd) void __movsb(unsigned char * Destination, const unsigned char * Source, size_t Count); +#pragma intrinsic(__movsb) void __movsw(unsigned short * Destination, const unsigned short * Source, size_t Count); +#pragma intrinsic(__movsw) void __movsd(unsigned long * Destination, const unsigned long * Source, size_t Count); +#pragma intrinsic(__movsd) #if defined(_M_AMD64) /*** GS segment addressing ***/ void __writegsbyte(const unsigned long Offset, const unsigned char Data); +#pragma intrinsic(__writegsbyte) void __writegsword(const unsigned long Offset, const unsigned short Data); +#pragma intrinsic(__writegsword) void __writegsdword(const unsigned long Offset, const unsigned long Data); +#pragma intrinsic(__writegsdword) void __writegsqword(const unsigned long Offset, const unsigned __int64 Data); +#pragma intrinsic(__writegsqword) unsigned char __readgsbyte(const unsigned long Offset); +#pragma intrinsic(__readgsbyte) unsigned short __readgsword(const unsigned long Offset); +#pragma intrinsic(__readgsword) unsigned long __readgsdword(const unsigned long Offset); +#pragma intrinsic(__readgsdword) unsigned __int64 __readgsqword(const unsigned long Offset); +#pragma intrinsic(__readgsqword) void __incgsbyte(const unsigned long Offset); +#pragma intrinsic(__incgsbyte) void __incgsword(const unsigned long Offset); +#pragma intrinsic(__incgsword) void __incgsdword(const unsigned long Offset); +#pragma intrinsic(__incgsdword) void __addgsbyte(const unsigned long Offset, const unsigned char Data); +#pragma intrinsic(__addgsbyte) void __addgsword(const unsigned long Offset, const unsigned short Data); +#pragma intrinsic(__addgsword) void __addgsdword(const unsigned long Offset, const unsigned int Data); +#pragma intrinsic(__addgsdword) void __addgsqword(const unsigned long Offset, const unsigned __int64 Data); -#endif - -#if defined(_M_IX86) +#pragma intrinsic(__addgsqword) +#endif + +//#if defined(_M_IX86) /*** FS segment addressing ***/ void __writefsbyte(const unsigned long Offset, const unsigned char Data); +#pragma intrinsic(__writefsbyte) void __writefsword(const unsigned long Offset, const unsigned short Data); +#pragma intrinsic(__writefsword) void __writefsdword(const unsigned long Offset, const unsigned long Data); +#pragma intrinsic(__writefsdword) unsigned char __readfsbyte(const unsigned long Offset); +#pragma intrinsic(__readfsbyte) unsigned short __readfsword(const unsigned long Offset); +#pragma intrinsic(__readfsword) unsigned long __readfsdword(const unsigned long Offset); +#pragma intrinsic(__readfsdword) void __incfsbyte(const unsigned long Offset); +#pragma intrinsic(__incfsbyte) void __incfsword(const unsigned long Offset); +#pragma intrinsic(__incfsword) void __incfsdword(const unsigned long Offset); +#pragma intrinsic(__incfsdword) void __addfsbyte(const unsigned long Offset, const unsigned char Data); +#pragma intrinsic(__addfsbyte) void __addfsword(const unsigned long Offset, const unsigned short Data); +#pragma intrinsic(__addfsword) void __addfsdword(const unsigned long Offset, const unsigned int Data); -#endif +#pragma intrinsic(__addfsdword) +//#endif /*** Bit manipulation ***/ unsigned char _BitScanForward(unsigned long * const Index, const unsigned long Mask); +#pragma intrinsic(_BitScanForward) unsigned char _BitScanReverse(unsigned long * const Index, const unsigned long Mask); +#pragma intrinsic(_BitScanReverse) unsigned char _bittest(const long * const a, const long b); +#pragma intrinsic(_bittest) unsigned char _bittestandcomplement(long * const a, const long b); +#pragma intrinsic(_bittestandcomplement) unsigned char _bittestandreset(long * const a, const long b); +#pragma intrinsic(_bittestandreset) unsigned char _bittestandset(long * const a, const long b); +#pragma intrinsic(_bittestandset) unsigned char _rotl8(unsigned char value, unsigned char shift); +#pragma intrinsic(_rotl8) unsigned short _rotl16(unsigned short value, unsigned char shift); +#pragma intrinsic(_rotl16) unsigned int _rotl(unsigned int value, int shift); +#pragma intrinsic(_rotl) unsigned int _rotr(unsigned int value, int shift); +#pragma intrinsic(_rotr) unsigned char _rotr8(unsigned char value, unsigned char shift); +#pragma intrinsic(_rotr8) unsigned short _rotr16(unsigned short value, unsigned char shift); +#pragma intrinsic(_rotr16) unsigned __int64 __ll_lshift(const unsigned __int64 Mask, const int Bit); +#pragma intrinsic(__ll_lshift) __int64 __ll_rshift(const __int64 Mask, const int Bit); +#pragma intrinsic(__ll_rshift) unsigned __int64 __ull_rshift(const unsigned __int64 Mask, int Bit); +#pragma intrinsic(__ull_rshift) unsigned short _byteswap_ushort(unsigned short value); +#pragma intrinsic(_byteswap_ushort) unsigned long _byteswap_ulong(unsigned long value); +#pragma intrinsic(_byteswap_ulong) unsigned __int64 _byteswap_uint64(unsigned __int64 value); +#pragma intrinsic(_byteswap_uint64) /*** 64-bit math ***/ __int64 __emul(const int a, const int b); +#pragma intrinsic(__emul) unsigned __int64 __emulu(const unsigned int a, const unsigned int b); +#pragma intrinsic(__emulu) /*** Port I/O ***/ unsigned char __inbyte(const unsigned short Port); +#pragma intrinsic(__inbyte) unsigned short __inword(const unsigned short Port); +#pragma intrinsic(__inword) unsigned long __indword(const unsigned short Port); +#pragma intrinsic(__indword) void __inbytestring(unsigned short Port, unsigned char * Buffer, unsigned long Count); +#pragma intrinsic(__inbytestring) void __inwordstring(unsigned short Port, unsigned short * Buffer, unsigned long Count); +#pragma intrinsic(__inwordstring) void __indwordstring(unsigned short Port, unsigned long * Buffer, unsigned long Count); +#pragma intrinsic(__indwordstring) void __outbyte(unsigned short const Port, const unsigned char Data); +#pragma intrinsic(__outbyte) void __outword(unsigned short const Port, const unsigned short Data); +#pragma intrinsic(__outword) void __outdword(unsigned short const Port, const unsigned long Data); +#pragma intrinsic(__outdword) void __outbytestring(unsigned short const Port, const unsigned char * const Buffer, const unsigned long Count); +#pragma intrinsic(__outbytestring) void __outwordstring(unsigned short const Port, const unsigned short * const Buffer, const unsigned long Count); +#pragma intrinsic(__outwordstring) void __outdwordstring(unsigned short const Port, const unsigned long * const Buffer, const unsigned long Count); +#pragma intrinsic(__outdwordstring) /*** System information ***/ void __cpuid(int CPUInfo[], const int InfoType); +#pragma intrinsic(__cpuid) unsigned __int64 __rdtsc(void); +#pragma intrinsic(__rdtsc) void __writeeflags(uintptr_t Value); +#pragma intrinsic(__writeeflags) uintptr_t __readeflags(void); +#pragma intrinsic(__readeflags) /*** Interrupts ***/ void __debugbreak(void); +#pragma intrinsic(__debugbreak) void __int2c(void); +#pragma intrinsic(__int2c) void _disable(void); +#pragma intrinsic(_disable) void _enable(void); +#pragma intrinsic(_enable) void __halt(void); +#pragma intrinsic(__halt) /*** Protected memory management ***/ void __writecr0(const unsigned __int64 Data); +#pragma intrinsic(__writecr0) void __writecr3(const unsigned __int64 Data); +#pragma intrinsic(__writecr3) void __writecr4(const unsigned __int64 Data); +#pragma intrinsic(__writecr4) #ifdef _M_AMD64 void __writecr8(const unsigned __int64 Data); +#pragma intrinsic(__writecr8) unsigned __int64 __readcr0(void); +#pragma intrinsic(__readcr0) unsigned __int64 __readcr2(void); +#pragma intrinsic(__readcr2) unsigned __int64 __readcr3(void); +#pragma intrinsic(__readcr3) unsigned __int64 __readcr4(void); +#pragma intrinsic(__readcr4) unsigned __int64 __readcr8(void); +#pragma intrinsic(__readcr8) unsigned __int64 __readdr(unsigned int reg); +#pragma intrinsic(__readdr) void __writedr(unsigned reg, unsigned __int64 value); +#pragma intrinsic(__writedr) #else unsigned long __readcr0(void); unsigned long __readcr2(void); @@ -171,16 +295,25 @@ #endif void __invlpg(void * const Address); +#pragma intrinsic(__invlpg) /*** System operations ***/ unsigned __int64 __readmsr(const int reg); +#pragma intrinsic(__readmsr) void __writemsr(const unsigned long Register, const unsigned __int64 Value); +#pragma intrinsic(__writemsr) unsigned __int64 __readpmc(const int counter); +#pragma intrinsic(__readpmc) unsigned long __segmentlimit(const unsigned long a); +#pragma intrinsic(__segmentlimit) void __wbinvd(void); +#pragma intrinsic(__wbinvd) void __lidt(void *Source); +#pragma intrinsic(__lidt) void __sidt(void *Destination); +#pragma intrinsic(__sidt) void _mm_pause(void); +#pragma intrinsic(_mm_pause) #ifdef __cplusplus }

1 0

[tkreuzer] 45429: fix UNIMPLEMENTED macro yet another time
by tkreuzer＠svn.reactos.org 05 Feb '10

05 Feb '10

Author: tkreuzer Date: Fri Feb 5 03:53:23 2010 New Revision: 45429 URL: http://svn.reactos.org/svn/reactos?rev=45429&view=rev Log: fix UNIMPLEMENTED macro yet another time Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] Fri Feb 5 03:53:23 2010 @@ -157,7 +157,7 @@ 2: .asciz \file 3: sub rsp, 0x20 - lea rcx, _MsgUnimplemented[rip] + lea rcx, MsgUnimplemented[rip] lea rdx, 1b[rip] lea r8, 2b[rip] mov r9, \line

1 0

[tkreuzer] 45428: [RTL] Make slist.S ML64 compatible
by tkreuzer＠svn.reactos.org 05 Feb '10

05 Feb '10

Author: tkreuzer Date: Fri Feb 5 03:51:38 2010 New Revision: 45428 URL: http://svn.reactos.org/svn/reactos?rev=45428&view=rev Log: [RTL] Make slist.S ML64 compatible Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S [iso-8859-1] Fri Feb 5 03:51:38 2010 @@ -9,44 +9,46 @@ #include <reactos/asm.h> #include <ndk/amd64/asm.h> -#define SLIST8A_DEPTH_MASK 0x000000000000FFFF -#define SLIST8A_DEPTH_INC 0x0000000000000001 -#define SLIST8A_SEQUENCE_MASK 0x0000000001FF0000 -#define SLIST8A_SEQUENCE_INC 0x0000000000010000 -#define SLIST8A_NEXTENTRY_MASK 0xFFFFFFFFFE000000 +#define SLIST8A_DEPTH_MASK HEX(000000000000FFFF) +#define SLIST8A_DEPTH_INC HEX(0000000000000001) +#define SLIST8A_SEQUENCE_MASK HEX(0000000001FF0000) +#define SLIST8A_SEQUENCE_INC HEX(0000000000010000) +#define SLIST8A_NEXTENTRY_MASK HEX(FFFFFFFFFE000000) #define SLIST8A_NEXTENTRY_SHIFT 21 -#define SLIST8B_HEADERTYPE_MASK 0x0000000000000001 -#define SLIST8B_INIT_MASK 0x0000000000000002 -#define SLIST8B_REGION_MASK 0xE000000000000000 -#define SLIST8_POINTER_MASK 0x000007FFFFFFFFF0 - -#define SLIST16A_DEPTH_MASK 0x000000000000FFFF -#define SLIST16A_DEPTH_INC 0x0000000000000001 -#define SLIST16A_SEQUENCE_MASK 0xFFFFFFFFFFFF0000 -#define SLIST16A_SEQUENCE_INC 0x0000000000010000 -#define SLIST16B_HEADERTYPE_MASK 0x0000000000000001 -#define SLIST16B_INIT_MASK 0x0000000000000002 -#define SLIST16B_NEXTENTY_MASK 0xFFFFFFFFFFFFFFF0 +#define SLIST8B_HEADERTYPE_MASK HEX(0000000000000001) +#define SLIST8B_INIT_MASK HEX(0000000000000002) +#define SLIST8B_REGION_MASK HEX(E000000000000000) +#define SLIST8_POINTER_MASK HEX(000007FFFFFFFFF0) + +#define SLIST16A_DEPTH_MASK HEX(000000000000FFFF) +#define SLIST16A_DEPTH_INC HEX(0000000000000001) +#define SLIST16A_SEQUENCE_MASK HEX(FFFFFFFFFFFF0000) +#define SLIST16A_SEQUENCE_INC HEX(0000000000010000) +#define SLIST16B_HEADERTYPE_MASK HEX(0000000000000001) +#define SLIST16B_INIT_MASK HEX(0000000000000002) +#define SLIST16B_NEXTENTY_MASK HEX(FFFFFFFFFFFFFFF0) /* FUNCTIONS ****************************************************************/ -.global ExpInterlockedPopEntrySList -.global ExpInterlockedPopEntrySListResume -.global ExpInterlockedPopEntrySListFault -.global ExpInterlockedPopEntrySListEnd -.global ExpInterlockedPopEntrySListResume16 -.global ExpInterlockedPopEntrySListFault16 -.global ExpInterlockedPopEntrySListEnd16 -.global ExpInterlockedPushEntrySList -.global ExpInterlockedFlushSList +.code64 + +PUBLIC ExpInterlockedPopEntrySList +PUBLIC ExpInterlockedPopEntrySListResume +PUBLIC ExpInterlockedPopEntrySListFault +PUBLIC ExpInterlockedPopEntrySListEnd +PUBLIC ExpInterlockedPopEntrySListResume16 +PUBLIC ExpInterlockedPopEntrySListFault16 +PUBLIC ExpInterlockedPopEntrySListEnd16 +PUBLIC ExpInterlockedPushEntrySList +PUBLIC ExpInterlockedFlushSList /* PSLIST_ENTRY * NTAPI * RtlInterlockedPopEntrySList( * IN PSLIST_HEADER ListHead); */ -.proc RtlInterlockedPopEntrySList +RtlInterlockedPopEntrySList: ExpInterlockedPopEntrySList: /* Load ListHead->Region into rdx */ @@ -70,10 +72,10 @@ /* Copy Depth and Sequence number and adjust Depth */ lea r8, [rax - SLIST8A_DEPTH_INC] - and r8, SLIST8A_SEQUENCE_MASK | SLIST8A_DEPTH_MASK + and r8, (SLIST8A_SEQUENCE_MASK OR SLIST8A_DEPTH_MASK) /* Create a pointer template from rcx in rdx */ - mov rdx, ~SLIST8_POINTER_MASK + mov rdx, (NOT SLIST8_POINTER_MASK) and rdx, rcx /* Shift the NextEntry pointer */ @@ -106,7 +108,7 @@ shr rax, SLIST8A_NEXTENTRY_SHIFT /* Use rcx as pointer template */ - mov rdx, ~SLIST8_POINTER_MASK + mov rdx, (NOT SLIST8_POINTER_MASK) and rdx, rcx /* Combine result and return */ @@ -139,7 +141,7 @@ mov rcx, [r9] /* Set ListHead->HeaderType = 1 and ListHead->Init = 1 */ - or rcx, 0x3 + or rcx, 3 /* Copy Depth and Sequence number and adjust Depth */ lea rbx, [rax - SLIST16A_DEPTH_INC] @@ -164,8 +166,6 @@ xor rax, rax pop rbx ret - -.endp RtlInterlockedPopEntrySList /* PSLIST_ENTRY @@ -174,7 +174,7 @@ * IN PSLIST_HEADER ListHead, * IN PSLIST_ENTRY ListEntry); */ -.proc RtlInterlockedPushEntrySList +RtlInterlockedPushEntrySList: ExpInterlockedPushEntrySList: /* Load ListHead->Alignment into rax */ @@ -200,7 +200,7 @@ shr r8, SLIST8A_NEXTENTRY_SHIFT /* Create a pointer template from rcx in rdx */ - mov r9, ~SLIST8_POINTER_MASK + mov r9, (NOT SLIST8_POINTER_MASK) and r9, rcx /* Combine to new pointer and save as ListEntry->NextEntry */ @@ -217,7 +217,7 @@ /* Copy and adjust depth and sequence number */ lea r9, [rax + SLIST8A_DEPTH_INC + SLIST8A_SEQUENCE_INC] - and r9, SLIST8A_SEQUENCE_MASK | SLIST8A_DEPTH_MASK + and r9, SLIST8A_SEQUENCE_MASK OR SLIST8A_DEPTH_MASK /* Combine to exchange value in r8 */ or r8, r9 @@ -247,7 +247,7 @@ /* Set ListHead->HeaderType = 1 and ListHead->Init = 1 */ mov rcx, rdx - or rcx, 0x3 + or rcx, 3 mov rdx, [r8 + 8] @@ -277,14 +277,13 @@ pop rbx ret -.endp RtlInterlockedPushEntrySList /* PSLIST_ENTRY * NTAPI * RtlInterlockedFlushSList( * IN PSINGLE_LIST_ENTRY ListHead); */ -.proc RtlInterlockedFlushSList +RtlInterlockedFlushSList: ExpInterlockedFlushSList: /* Load ListHead->Region into rdx */ @@ -308,7 +307,7 @@ jnz RtlInterlockedFlushSListLoop /* Use rcx as pointer template */ - mov rdx, ~SLIST8_POINTER_MASK + mov rdx, (not SLIST8_POINTER_MASK) or rdx, rcx /* Combine result and return */ @@ -321,7 +320,7 @@ mov rdx, [rcx + 8] xor rbx, rbx - mov rcx, 0x3 + mov rcx, 3 RtlInterlockedFlushSListLoop16: @@ -339,4 +338,4 @@ pop rbx ret -.endp RtlInterlockedFlushSList +END

1 0

[tkreuzer] 45427: [NTOS] - Make assembly ML64 safe - remove 2 stubs, add 2 others
by tkreuzer＠svn.reactos.org 05 Feb '10

05 Feb '10

Author: tkreuzer Date: Fri Feb 5 02:39:05 2010 New Revision: 45427 URL: http://svn.reactos.org/svn/reactos?rev=45427&view=rev Log: [NTOS] - Make assembly ML64 safe - remove 2 stubs, add 2 others Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/ctxswitch.S branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S 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] Fri Feb 5 02:39:05 2010 @@ -11,6 +11,7 @@ #include <reactos/asm.h> #include <ndk/amd64/asm.h> +EXTERN KiInitializeKernelAndGotoIdleLoop:PROC /* GLOBALS *******************************************************************/ @@ -37,13 +38,15 @@ mov rsi, rsp /* Setup the new stack */ - mov ax, 0x18 + mov ax, HEX(18) mov ss, ax mov rsp, r8 - sub rsp, 0x300 // FIXME + sub rsp, HEX(300) // FIXME /* Copy stack parameters to the new stack */ - sub rsp, 0x38 + sub rsp, HEX(38) + .ENDPROLOG + mov rdi, rsp movsq movsq Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/ctxswitch.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/ctxswitch.S [iso-8859-1] Fri Feb 5 02:39:05 2010 @@ -13,6 +13,8 @@ #include <ndk/amd64/asm.h> /* FUNCTIONS ****************************************************************/ + +.code64 /*++ * KiThreadStartup @@ -43,8 +45,7 @@ * If a return from a system thread is detected, a bug check will occur. * *--*/ - .func KiThreadStartup -.globl KiThreadStartup +PUBLIC KiThreadStartup KiThreadStartup: /* @@ -85,13 +86,12 @@ /* Exit back to user-mode */ // jmp _KiServiceExit2 -UNIMPLEMENTED KiThreadStartup->KiServiceExit2 +UNIMPLEMENTED KiThreadStartup_KiServiceExit2 BadThread: /* A system thread returned...this is very bad! */ int 3 -.endfunc /*++ @@ -112,13 +112,11 @@ * Absolutely all registers except ESP can be trampled here for maximum code flexibility. * *--*/ -.globl KiSwapContextInternal -.func KiSwapContextInternal +PUBLIC KiSwapContextInternal KiSwapContextInternal: UNIMPLEMENTED KiSwapContextInternal ret -.endfunc /** * KiSwapContext @@ -147,8 +145,7 @@ * another thread switches to IT. * *--*/ -.globl KiSwapContext -.func KiSwapContext +PUBLIC KiSwapContext KiSwapContext: /* Save 10 registers */ @@ -198,4 +195,5 @@ /* Clean stack */ add esp, 10 * 8 ret -.endfunc + +END 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] Fri Feb 5 02:39:05 2010 @@ -165,22 +165,15 @@ { } +BOOLEAN CcPfEnablePrefetcher; -NTKERNELAPI -PSLIST_ENTRY -ExpInterlockedPopEntrySList( - PSLIST_HEADER ListHead) +unsigned long __readfsdword(const unsigned long Offset) { return 0; } -NTKERNELAPI -PSLIST_ENTRY -ExpInterlockedPushEntrySList( - PSLIST_HEADER ListHead, - PSLIST_ENTRY ListEntry) +void main() { - return 0; } #endif Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Fri Feb 5 02:39:05 2010 @@ -24,28 +24,28 @@ .data PUBLIC MsgUnimplemented -_MsgUnimplemented: +MsgUnimplemented: .ascii "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" -_MsgPageFault: +MsgPageFault: .ascii "Page fault! Code = 0x%x, RIP = %p, FaultingAddress = %p\n\0" -_MsgGeneralProtFault: +MsgGeneralProtFault: .ascii "General protection fault at %p!\n\0" -_MsgBreakpointTrap: +MsgBreakpointTrap: .ascii "BreakpointTrap at %p\n\0" -_MsgUnexpectedInterrupt: +MsgUnexpectedInterrupt: .ascii "UnexpectedInterrupt Vector=0x%02lx\n\0" -_MsgInvalidOpcodeFault: +MsgInvalidOpcodeFault: .ascii "Invalid opcode fault at %p!\n\0" -_MsgDoubleFault: +MsgDoubleFault: .ascii "Double fault at %p, rbp=%p!\n\0" -_MsgTrapInfo: +MsgTrapInfo: .ascii "Trap: %s at %p\n\0" MACRO(TRAPINFO, func) @@ -55,7 +55,7 @@ label1: .asciz "\func" label2: sub rsp, 32 - lea rcx, _MsgTrapInfo[rip] + lea rcx, MsgTrapInfo[rip] lea rdx, 1b[rip] mov r8, [rbp + KTRAP_FRAME_Rip] call qword ptr FrLdrDbgPrint[rip] @@ -421,7 +421,7 @@ TRAPINFO KiBreakpointTrap -// lea rcx, _MsgBreakpointTrap[rip] +// lea rcx, MsgBreakpointTrap[rip] // mov rdx, rsp // call qword ptr FrLdrDbgPrint[rip] @@ -501,7 +501,7 @@ TRAPINFO KiInvalidOpcodeFault mov rdx, [rbp + KTRAP_FRAME_Rip] - lea rcx, _MsgInvalidOpcodeFault[rip] + lea rcx, MsgInvalidOpcodeFault[rip] call qword ptr FrLdrDbgPrint[rip] /* Enable interrupts */ @@ -562,7 +562,7 @@ /* Push pseudo error code */ ENTER_TRAP_FRAME TRAPFLAG_ALL - lea rcx, _MsgDoubleFault[rip] + lea rcx, MsgDoubleFault[rip] mov rdx, [rbp + KTRAP_FRAME_FaultAddress] mov r8, rbp call qword ptr FrLdrDbgPrint[rip] @@ -639,7 +639,7 @@ TRAPINFO KiGeneralProtectionFault mov rdx, [rbp + KTRAP_FRAME_Rip] - lea rcx, _MsgGeneralProtFault[rip] + lea rcx, MsgGeneralProtFault[rip] call qword ptr FrLdrDbgPrint[rip] /* Call the C handler */ @@ -682,7 +682,7 @@ TRAPINFO KiPageFault #if 0 - lea rcx, _MsgPageFault[rip] + lea rcx, MsgPageFault[rip] mov rdx, [rbp + KTRAP_FRAME_ErrorCode] mov r8, [rbp + KTRAP_FRAME_Rip] mov r9, [rbp + KTRAP_FRAME_FaultAddress]

1 0

[tkreuzer] 45426: [RTL] MSVC compatibility fixes: inline -> __inline
by tkreuzer＠svn.reactos.org 05 Feb '10

05 Feb '10

Author: tkreuzer Date: Fri Feb 5 02:36:20 2010 New Revision: 45426 URL: http://svn.reactos.org/svn/reactos?rev=45426&view=rev Log: [RTL] MSVC compatibility fixes: inline -> __inline Modified: branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c branches/ros-amd64-bringup/reactos/lib/rtl/heap.c branches/ros-amd64-bringup/reactos/lib/rtl/timerqueue.c branches/ros-amd64-bringup/reactos/lib/rtl/version.c branches/ros-amd64-bringup/reactos/lib/rtl/wait.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c [iso-8859-1] Fri Feb 5 02:36:20 2010 @@ -234,23 +234,23 @@ return strW; } -static inline BOOL xmlstr_cmp(const xmlstr_t* xmlstr, const WCHAR *str) +static __inline BOOL xmlstr_cmp(const xmlstr_t* xmlstr, const WCHAR *str) { return !strncmpW(xmlstr->ptr, str, xmlstr->len) && !str[xmlstr->len]; } -static inline BOOL xmlstr_cmpi(const xmlstr_t* xmlstr, const WCHAR *str) +static __inline BOOL xmlstr_cmpi(const xmlstr_t* xmlstr, const WCHAR *str) { return !strncmpiW(xmlstr->ptr, str, xmlstr->len) && !str[xmlstr->len]; } -static inline BOOL xmlstr_cmp_end(const xmlstr_t* xmlstr, const WCHAR *str) +static __inline BOOL xmlstr_cmp_end(const xmlstr_t* xmlstr, const WCHAR *str) { return (xmlstr->len && xmlstr->ptr[0] == '/' && !strncmpW(xmlstr->ptr + 1, str, xmlstr->len - 1) && !str[xmlstr->len - 1]); } -static inline BOOL isxmlspace( WCHAR ch ) +static __inline BOOL isxmlspace( WCHAR ch ) { return (ch == ' ' || ch == '\r' || ch == '\n' || ch == '\t'); } @@ -498,7 +498,7 @@ return ret; } -static inline void append_string( WCHAR *buffer, const WCHAR *prefix, const WCHAR *str ) +static __inline void append_string( WCHAR *buffer, const WCHAR *prefix, const WCHAR *str ) { WCHAR *p = buffer; @@ -562,7 +562,7 @@ return ret; } -static inline void actctx_addref( ACTIVATION_CONTEXT *actctx ) +static __inline void actctx_addref( ACTIVATION_CONTEXT *actctx ) { _InterlockedExchangeAdd( &actctx->ref_count, 1 ); } Modified: branches/ros-amd64-bringup/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/heap.c [iso-8859-1] Fri Feb 5 02:36:20 2010 @@ -219,7 +219,7 @@ } /* get the memory protection type to use for a given heap */ -static inline ULONG get_protection_type( DWORD flags ) +static __inline ULONG get_protection_type( DWORD flags ) { return (flags & HEAP_CREATE_ENABLE_EXECUTE) ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; } Modified: branches/ros-amd64-bringup/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/timerqueue.c [iso-8859-1] Fri Feb 5 02:36:20 2010 @@ -27,7 +27,7 @@ return STATUS_NOT_IMPLEMENTED; } -static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout ) +static __inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout ) { if (timeout == INFINITE) return NULL; pTime->QuadPart = (ULONGLONG)timeout * -10000; @@ -101,7 +101,7 @@ return 0; } -static inline ULONGLONG queue_current_time(void) +static __inline ULONGLONG queue_current_time(void) { LARGE_INTEGER now; NtQuerySystemTime(&now); @@ -134,7 +134,7 @@ NtSetEvent(q->event, NULL); } -static inline void queue_move_timer(struct queue_timer *t, ULONGLONG time, +static __inline void queue_move_timer(struct queue_timer *t, ULONGLONG time, BOOL set_event) { /* We MUST hold the queue cs while calling this function. */ Modified: branches/ros-amd64-bringup/reactos/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/version.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/version.c [iso-8859-1] Fri Feb 5 02:36:20 2010 @@ -22,7 +22,7 @@ /* FUNCTIONS ****************************************************************/ -static inline NTSTATUS version_compare_values(ULONG left, ULONG right, UCHAR condition) +static __inline NTSTATUS version_compare_values(ULONG left, ULONG right, UCHAR condition) { switch (condition) { case VER_EQUAL: Modified: branches/ros-amd64-bringup/reactos/lib/rtl/wait.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/wait.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/wait.c [iso-8859-1] Fri Feb 5 02:36:20 2010 @@ -31,7 +31,7 @@ /* PRIVATE FUNCTIONS *******************************************************/ -static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout ) +static __inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout ) { if (timeout == INFINITE) return NULL; pTime->QuadPart = (ULONGLONG)timeout * -10000;

1 0

[evb] 45425: - Reading MBR from RAMDISK does not work since RAMDISK starts at BootSector (rdoffset) and disk sector functions are NULL. Build bogus signature/checksum for now, unless MBR really needed later. - Now FreeLDR crashes no more and arrives at FrLdrStartup to boot kernel and setup paging.
by evb＠svn.reactos.org 04 Feb '10

04 Feb '10

Author: evb Date: Thu Feb 4 21:11:48 2010 New Revision: 45425 URL: http://svn.reactos.org/svn/reactos?rev=45425&view=rev Log: - Reading MBR from RAMDISK does not work since RAMDISK starts at BootSector (rdoffset) and disk sector functions are NULL. Build bogus signature/checksum for now, unless MBR really needed later. - Now FreeLDR crashes no more and arrives at FrLdrStartup to boot kernel and setup paging. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] Thu Feb 4 21:11:48 2010 @@ -1031,13 +1031,13 @@ PLIST_ENTRY NextEntry, OldEntry; PARC_DISK_INFORMATION ArcDiskInformation; PARC_DISK_SIGNATURE ArcDiskSignature; - ULONG ArcDiskCount = 0, Checksum = 0; + ULONG ArcDiskCount = 0; +#if 0 + ULONG Checksum = 0; PMASTER_BOOT_RECORD Mbr; PULONG Buffer; +#endif PWCHAR ArmModuleName; - - TuiPrintf("About to prepare for kernel boot\n"); - while (TRUE); // // Allocate the ARM Shared Heap @@ -1533,6 +1533,7 @@ InitializeListHead(&ArcDiskInformation->DiskSignatureListHead); ArmLoaderBlock->ArcDiskInformation = (PVOID)((ULONG_PTR)ArcDiskInformation | KSEG0_BASE); +#if 0 // // Read the MBR // @@ -1546,12 +1547,13 @@ for (i = 0; i < 128; i++) Checksum += Buffer[i]; Checksum = ~Checksum + 1; +#endif // // Allocate a disk signature and fill it out // ArcDiskSignature = ArmAllocateFromSharedHeap(sizeof(ARC_DISK_SIGNATURE)); - ArcDiskSignature->Signature = Mbr->Signature; - ArcDiskSignature->CheckSum = Checksum; + ArcDiskSignature->Signature = 0xBADAB00B;// Mbr->Signature; + ArcDiskSignature->CheckSum = 0xFAB4BEEF; //Checksum; // // Allocare a string for the name and fill it out

1 0

[evb] 45424: - Define memory map structure for Versatile board/QEMU and send to OS Loader. - Many hack removed. - Better efficency use of memory layout. - Region at 0x800000 now available for FreeLDR use to load kernel files. - Implement simple ArmDiskNormalizeSystemPath so boot is allowed to happen. - Use better stack address as defined in memory map. - Now FreeLDR loads all files correctly from disk and is ready to jump to kernel. ARMv5 paging code must be rewritten before that can happen.
by evb＠svn.reactos.org 04 Feb '10

04 Feb '10

Author: evb Date: Thu Feb 4 20:52:13 2010 New Revision: 45424 URL: http://svn.reactos.org/svn/reactos?rev=45424&view=rev Log: - Define memory map structure for Versatile board/QEMU and send to OS Loader. - Many hack removed. - Better efficency use of memory layout. - Region at 0x800000 now available for FreeLDR use to load kernel files. - Implement simple ArmDiskNormalizeSystemPath so boot is allowed to happen. - Use better stack address as defined in memory map. - Now FreeLDR loads all files correctly from disk and is ready to jump to kernel. ARMv5 paging code must be rewritten before that can happen. Modified: trunk/reactos/boot/armllb/boot.s trunk/reactos/boot/armllb/envir.c trunk/reactos/boot/armllb/hw/versatile/hwinfo.c trunk/reactos/boot/armllb/hw/versatile/hwinit.c trunk/reactos/boot/armllb/os/loader.c trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Modified: trunk/reactos/boot/armllb/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/boot.s?rev=454… ============================================================================== --- trunk/reactos/boot/armllb/boot.s [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/boot.s [iso-8859-1] Thu Feb 4 20:52:13 2010 @@ -31,7 +31,7 @@ ENTRY_END _start L_BootStackEnd: - .long 0x2000000 + .long 0x00010000 L_LlbStartup: .long LlbStartup Modified: trunk/reactos/boot/armllb/envir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/envir.c?rev=45… ============================================================================== --- trunk/reactos/boot/armllb/envir.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/envir.c [iso-8859-1] Thu Feb 4 20:52:13 2010 @@ -47,6 +47,14 @@ /* Save RAMDISK start and size */ LlbEnvRamDiskStart = Atag->u.InitRd2.Start; LlbEnvRamDiskSize = Atag->u.InitRd2.Size; + + /* Make sure it's 16MB-aligned */ + LlbEnvRamDiskSize = (LlbEnvRamDiskSize + (16 * 1024 * 1024) - 1) + &~ ((16 * 1024 * 1024) - 1); + + /* The RAMDISK actually starts 16MB later */ + LlbEnvRamDiskStart += 16 * 1024 * 1024; + LlbEnvRamDiskSize -= 16 * 1024 * 1024; break; case ATAG_CMDLINE: Modified: trunk/reactos/boot/armllb/hw/versatile/hwinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/versatile/h… ============================================================================== --- trunk/reactos/boot/armllb/hw/versatile/hwinfo.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/hw/versatile/hwinfo.c [iso-8859-1] Thu Feb 4 20:52:13 2010 @@ -37,14 +37,65 @@ LlbHwGetSerialUart(VOID) { return 0; -} +} + +// +// Versatile Memory Map +// +// 0x00000000 - 0x000000FF ARM Vectors [ 1 KB] +// 0x00000100 - 0x000001FF ATAG Structures [ 1 KB] +// 0x00000200 - 0x0000FFFF ARM STACK [ 62 KB] +// 0x00010000 - 0x0001FFFF ARM LLB [ 64 KB] +// 0x00020000 - 0x0009FFFF ARM OS LOADER [512 KB] +// 0x000A0000 - 0x007FFFFF OS LOADER FREE/UNUSED [7.3 MB] +// 0x00800000 - 0x017FFFFF KERNEL, HAL, INITIAL DRIVER LOAD ADDR [ 16 MB] +// 0x01800000 - 0x037FFFFF RAM DISK [ 32 MB] +// 0x03800000 - 0x07FFFFFF FREE RAM [ 72 MB] +// 0x08000000 - 0x0FFFFFFF FREE RAM IF 256MB DEVICE [128 MB] +// 0x10000000 - 0x1FFFFFFF MMIO DEVICES [256 MB] +BIOS_MEMORY_MAP LlbHwVersaMemoryMap[] = +{ + {0x00000000, 0x00000100, BiosMemoryReserved, 0}, + {0x00000100, 0x00000100, BiosMemoryBootStrap, 0}, + {0x00000200, 0x0000FE00, BiosMemoryBootStrap, 0}, + {0x00010000, 0x00010000, BiosMemoryBootStrap, 0}, + {0x00020000, 0x00080000, BiosMemoryBootLoader, 0}, + {0x00080000, 0x01000000, BiosMemoryUsable, 0}, + {0x01800000, 0x02000000, BiosMemoryReserved, 0}, + {0x10000000, 0x10000000, BiosMemoryReserved, 0}, + {0, 0, 0, 0} +}; VOID NTAPI LlbHwBuildMemoryMap(IN PBIOS_MEMORY_MAP MemoryMap) { - /* Mark MMIO space as reserved */ - LlbAllocateMemoryEntry(BiosMemoryReserved, 0x10000000, 128 * 1024 * 1024); + PBIOS_MEMORY_MAP MapEntry; + ULONG Base, Size, FsBase, FsSize; + + /* Parse hardware memory map */ + MapEntry = LlbHwVersaMemoryMap; + while (MapEntry->Length) + { + /* Add this entry */ + LlbAllocateMemoryEntry(MapEntry->Type, MapEntry->BaseAddress, MapEntry->Length); + + /* Move to the next one */ + MapEntry++; + } + + /* Query memory and RAMDISK information */ + LlbEnvGetMemoryInformation(&Base, &Size); + LlbEnvGetRamDiskInformation(&FsBase, &FsSize); + + /* Add-in the size of the ramdisk */ + Base = FsBase + FsSize; + + /* Subtract size of ramdisk and anything else before it */ + Size -= Base; + + /* Allocate an entry for it */ + LlbAllocateMemoryEntry(BiosMemoryUsable, Base, Size); } ULONG Modified: trunk/reactos/boot/armllb/hw/versatile/hwinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/versatile/h… ============================================================================== --- trunk/reactos/boot/armllb/hw/versatile/hwinit.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/hw/versatile/hwinit.c [iso-8859-1] Thu Feb 4 20:52:13 2010 @@ -33,14 +33,11 @@ PCHAR Offset; CHAR CommandLine[64]; - /* On versatile, the NAND image is loaded as the RAMDISK */ - LlbEnvGetRamDiskInformation(&Base, &Size); + /* On versatile we load the RAMDISK with initrd */ + LlbEnvGetRamDiskInformation(&RootFs, &Size); - /* The LLB is first, which we already have, so skip it */ - Base += 0x10000; // 64 KB (see nandflash) - - /* The OS loader is next, followed by the root file system */ - RootFs = Base + 0x80000; // 512 KB (see nandflash) + /* The OS Loader is at 0x20000, always */ + Base = 0x20000; /* Read image offset */ Offset = LlbEnvRead("rdoffset"); Modified: trunk/reactos/boot/armllb/os/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/os/loader.c?re… ============================================================================== --- trunk/reactos/boot/armllb/os/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/os/loader.c [iso-8859-1] Thu Feb 4 20:52:13 2010 @@ -93,21 +93,8 @@ NTAPI LlbBuildMemoryMap(VOID) { - ULONG Base, Size; - /* Zero out the memory map */ memset(MemoryMap, 0, sizeof(MemoryMap)); - - /* Query memory information */ - LlbEnvGetMemoryInformation(&Base, &Size); - - /* Don't use memory that the RAMDISK is using */ - /* HACK HACK */ - Base += 32 * 1024 * 1024; - Size -= 32 * 1024 * 1024; - - /* Allocate an entry for it */ - LlbAllocateMemoryEntry(BiosMemoryUsable, Base, Size); /* Call the hardware-specific function for hardware-defined regions */ LlbHwBuildMemoryMap(MemoryMap); Modified: trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arcem… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] Thu Feb 4 20:52:13 2010 @@ -32,9 +32,7 @@ { { MemoryFirmwarePermanent, 0xA0, 0x60 }, 6, }, // ROM / Video { { MemorySpecialMemory, 0xFFF, 1 }, 7, }, // unusable memory #elif __arm__ // This needs to be done per-platform specific way - { { MemoryLoadedProgram, 0x80000, 32 }, 0, }, // X-Loader + OmapLdr - { { MemoryLoadedProgram, 0x81000, 128 }, 1, }, // FreeLDR - { { MemoryFirmwareTemporary, 0x80500, 4096 }, 2, }, // Video Buffer + #endif }; MEMORY_DESCRIPTOR* Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] Thu Feb 4 20:52:13 2010 @@ -1036,6 +1036,9 @@ PULONG Buffer; PWCHAR ArmModuleName; + TuiPrintf("About to prepare for kernel boot\n"); + while (TRUE); + // // Allocate the ARM Shared Heap // @@ -1607,6 +1610,7 @@ // // Initialize the page directory // + TuiPrintf("About to jump into kernel\n"); while (TRUE); ArmSetupPageDirectory(); Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Thu Feb 4 20:52:13 2010 @@ -73,8 +73,8 @@ ArmDiskNormalizeSystemPath(IN OUT PCHAR SystemPath, IN unsigned Size) { - TuiPrintf("Called: %s\n", SystemPath); - while (TRUE); + /* Only RAMDISK supported for now */ + if (!strstr(SystemPath, "ramdisk(0)")) return FALSE; return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Thu Feb 4 20:52:13 2010 @@ -38,7 +38,7 @@ <linkerflag>-Wl,--image-base=0x80FFF000</linkerflag> </if> <if property="SARCH" value="versatile"> - <linkerflag>-Wl,--image-base=0x0080F000</linkerflag> + <linkerflag>-Wl,--image-base=0x0001F000</linkerflag> </if> </group> </module>

1 0

[evb] 45423: - Change NANDFlash again for Versatile support. Now the LLB and OS Loader are created in one binary blob (loaded with -kernel), while the RAMDISK is loaded with -initrd. - Now the only complication is that RAMDISK loaded at 0x80000 which will conflict with the 0x800000 range where kernel loads. Could move RAMDISK in code through LLB, but that would be very expensive (shift by 16MB up). Instead, NANDflash creates ramdisk image starting at offset 16MB. This way, emulator thinks it's l
by evb＠svn.reactos.org 04 Feb '10

04 Feb '10

Author: evb Date: Thu Feb 4 20:49:25 2010 New Revision: 45423 URL: http://svn.reactos.org/svn/reactos?rev=45423&view=rev Log: - Change NANDFlash again for Versatile support. Now the LLB and OS Loader are created in one binary blob (loaded with -kernel), while the RAMDISK is loaded with -initrd. - Now the only complication is that RAMDISK loaded at 0x80000 which will conflict with the 0x800000 range where kernel loads. Could move RAMDISK in code through LLB, but that would be very expensive (shift by 16MB up). Instead, NANDflash creates ramdisk image starting at offset 16MB. This way, emulator thinks it's loading at 0x80000, but actually loads at 0x1800000. Would be better if QEMU not hardcoded the INITRD_LOAD_ADDR... Modified: trunk/reactos/tools/nandflash/main.c Modified: trunk/reactos/tools/nandflash/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nandflash/main.c?rev… ============================================================================== --- trunk/reactos/tools/nandflash/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/nandflash/main.c [iso-8859-1] Thu Feb 4 20:49:25 2010 @@ -16,7 +16,8 @@ PCHAR NandImageName = "reactos.bin"; PCHAR LlbImageName = "./output-arm/boot/armllb/armllb.bin"; PCHAR BootLdrImageName = "./output-arm/boot/freeldr/freeldr/freeldr.sys"; -PCHAR FsImageName = "ReactOS.img"; +PCHAR FsImageName = "ramdisk.img"; +PCHAR RamImageName = "ramdisk.bin"; /* NAND On-Disk Memory Map */ ULONG LlbStart = 0x00000000, LlbEnd = 0x00010000; // 64 KB @@ -135,11 +136,23 @@ close(FileDescriptor); } +VOID +NTAPI +WriteRamDisk(IN INT RamDiskFile) +{ + INT FileDescriptor; + + /* Open FS image and write it 16MB later */ + FileDescriptor = open(FsImageName, O_RDWR); + WriteToFlash(RamDiskFile, FileDescriptor, 16 * 1024 * 1024, (32 + 16) * 1024 * 1024); + close(FileDescriptor); +} + int main(ULONG argc, char **argv) { - INT NandImageFile; + INT NandImageFile, RamDiskFile; /* Flat NAND, no OOB */ if (argc == 2) NeedsOob = FALSE; @@ -151,7 +164,24 @@ /* Write components */ WriteLlb(NandImageFile); WriteBootLdr(NandImageFile); - WriteFileSystem(NandImageFile); + if (NeedsOob) + { + /* Write the ramdisk normaly */ + WriteFileSystem(NandImageFile); + } + else + { + /* Open a new file for the ramdisk */ + RamDiskFile = open(RamImageName, O_RDWR | O_CREAT); + if (!RamDiskFile) exit(-1); + + /* Write it */ + WriteRamDisk(RamDiskFile); + + /* Close */ + close(RamDiskFile); + } + /* Close and return */ close(NandImageFile);

1 0

[sir_richard] 45422: [RBUILD]: Fix make install and make install_registry. mkhive command was wrong (MKHIVE_TARGET instead of mkhive_TARGET) and so the executable was never launched.
by sir_richard＠svn.reactos.org 04 Feb '10

04 Feb '10

Author: sir_richard Date: Thu Feb 4 17:47:23 2010 New Revision: 45422 URL: http://svn.reactos.org/svn/reactos?rev=45422&view=rev Log: [RBUILD]: Fix make install and make install_registry. mkhive command was wrong (MKHIVE_TARGET instead of mkhive_TARGET) and so the executable was never launched. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Thu Feb 4 17:47:23 2010 @@ -1284,14 +1284,14 @@ "install_registry: %s\n", registryTargetFiles.c_str () ); fprintf ( fMakefile, - "%s: %s %s $(MKHIVE_TARGET)\n", + "%s: %s %s $(mkhive_TARGET)\n", registryTargetFiles.c_str (), registrySourceFiles.c_str (), GetFullPath ( system32 ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%chiveinst_$(ARCH).inf\n", + "\t$(mkhive_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%chiveinst_$(ARCH).inf\n", cSep, GetFullPath ( system32 ).c_str (), cSep, cSep ); fprintf ( fMakefile,

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2010