Ros-dev

ros-dev@reactos.org

1 participants
5790 discussions

Re: [ros-dev] [ros-diffs] [akhaldi] 59692: [CRT/INTRIN_X86] * Fix __ll_rshift() and __ull_rshift(). Thanks to Filip Navara for his help with the issue. * Properly mark int64part as unsigned __int6 in _byteswap_uint64(). * A...

by Timo Kreuzer

Can you explain, why the change from unsigned to signed should make a difference, when it's used with inline assembly? And why adding prototypes, when the functions are declared as inline functions? Am 10.08.2013 23:17, schrieb akhaldi(a)svn.reactos.org: > Author: akhaldi > Date: Sat Aug 10 21:17:38 2013 > New Revision: 59692 > > URL: http://svn.reactos.org/svn/reactos?rev=59692&view=rev > Log: > [CRT/INTRIN_X86] > * Fix __ll_rshift() and __ull_rshift(). Thanks to Filip Navara for his help with the issue. > * Properly mark int64part as unsigned __int6 in _byteswap_uint64(). > * Add missing prototypes. > > Modified: > trunk/reactos/include/crt/mingw32/intrin_x86.h > > Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… > ============================================================================== > --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) > +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sat Aug 10 21:17:38 2013 > @@ -88,6 +88,14 @@ > > /*** Memory barriers ***/ > > +__INTRIN_INLINE void _ReadWriteBarrier(void); > +__INTRIN_INLINE void _mm_mfence(void); > +__INTRIN_INLINE void _mm_lfence(void); > +__INTRIN_INLINE void _mm_sfence(void); > +#ifdef __x86_64__ > +__INTRIN_INLINE void __faststorefence(void); > +#endif > + > __INTRIN_INLINE void _ReadWriteBarrier(void) > { > __asm__ __volatile__("" : : : "memory"); > @@ -127,7 +135,46 @@ > > /*** Atomic operations ***/ > > +__INTRIN_INLINE long _InterlockedAddLargeStatistic(volatile long long * const Addend, const long Value); > +__INTRIN_INLINE unsigned char _interlockedbittestandreset(volatile long * a, const long b); > +__INTRIN_INLINE unsigned char _interlockedbittestandset(volatile long * a, const long b); > +#if defined(_M_AMD64) > +__INTRIN_INLINE unsigned char _interlockedbittestandreset64(volatile long long * a, const long long b); > +__INTRIN_INLINE unsigned char _interlockedbittestandset64(volatile long long * a, const long long b); > +#endif > + > #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 > + > +__INTRIN_INLINE char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand); > +__INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand); > +__INTRIN_INLINE long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); > +__INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand); > +__INTRIN_INLINE long _InterlockedExchange(volatile long * const Target, const long Value); > +__INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value); > +__INTRIN_INLINE long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value); > +__INTRIN_INLINE long _InterlockedExchangeAdd(volatile long * const Addend, const long Value); > +__INTRIN_INLINE char _InterlockedAnd8(volatile char * const value, const char mask); > +__INTRIN_INLINE short _InterlockedAnd16(volatile short * const value, const short mask); > +__INTRIN_INLINE long _InterlockedAnd(volatile long * const value, const long mask); > +__INTRIN_INLINE char _InterlockedOr8(volatile char * const value, const char mask); > +__INTRIN_INLINE short _InterlockedOr16(volatile short * const value, const short mask); > +__INTRIN_INLINE long _InterlockedOr(volatile long * const value, const long mask); > +__INTRIN_INLINE char _InterlockedXor8(volatile char * const value, const char mask); > +__INTRIN_INLINE short _InterlockedXor16(volatile short * const value, const short mask); > +__INTRIN_INLINE long _InterlockedXor(volatile long * const value, const long mask); > +__INTRIN_INLINE long _InterlockedDecrement(volatile long * const lpAddend); > +__INTRIN_INLINE long _InterlockedIncrement(volatile long * const lpAddend); > +__INTRIN_INLINE short _InterlockedDecrement16(volatile short * const lpAddend); > +__INTRIN_INLINE short _InterlockedIncrement16(volatile short * const lpAddend); > +#if defined(_M_AMD64) > +__INTRIN_INLINE long long _InterlockedExchange64(volatile long long * const Target, const long long Value); > +__INTRIN_INLINE long long _InterlockedExchangeAdd64(volatile long long * const Addend, const long long Value); > +__INTRIN_INLINE long long _InterlockedAnd64(volatile long long * const value, const long long mask); > +__INTRIN_INLINE long long _InterlockedOr64(volatile long long * const value, const long long mask); > +__INTRIN_INLINE long long _InterlockedXor64(volatile long long * const value, const long long mask); > +__INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * const lpAddend); > +__INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * const lpAddend); > +#endif > > __INTRIN_INLINE char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) > { > @@ -287,7 +334,33 @@ > } > #endif > > -#else > +#else /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 */ > + > +__INTRIN_INLINE char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand); > +__INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand); > +__INTRIN_INLINE long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); > +__INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand); > +__INTRIN_INLINE long _InterlockedExchange(volatile long * const Target, const long Value); > +__INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value); > +__INTRIN_INLINE long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value); > +__INTRIN_INLINE long _InterlockedExchangeAdd(volatile long * const Addend, const long Value); > +__INTRIN_INLINE char _InterlockedAnd8(volatile char * const value, const char mask); > +__INTRIN_INLINE short _InterlockedAnd16(volatile short * const value, const short mask); > +__INTRIN_INLINE long _InterlockedAnd(volatile long * const value, const long mask); > +__INTRIN_INLINE char _InterlockedOr8(volatile char * const value, const char mask); > +__INTRIN_INLINE short _InterlockedOr16(volatile short * const value, const short mask); > +__INTRIN_INLINE long _InterlockedOr(volatile long * const value, const long mask); > +__INTRIN_INLINE char _InterlockedXor8(volatile char * const value, const char mask); > +__INTRIN_INLINE short _InterlockedXor16(volatile short * const value, const short mask); > +__INTRIN_INLINE long _InterlockedXor(volatile long * const value, const long mask); > +__INTRIN_INLINE long _InterlockedDecrement(volatile long * const lpAddend); > +__INTRIN_INLINE long _InterlockedIncrement(volatile long * const lpAddend); > +__INTRIN_INLINE short _InterlockedDecrement16(volatile short * const lpAddend); > +__INTRIN_INLINE short _InterlockedIncrement16(volatile short * const lpAddend); > +#if defined(_M_AMD64) > +__INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * const lpAddend); > +__INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * const lpAddend); > +#endif > > __INTRIN_INLINE char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) > { > @@ -530,10 +603,11 @@ > } > #endif > > -#endif > +#endif /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 */ > > #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 && defined(__x86_64__) > > +__INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand); > __INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) > { > return __sync_val_compare_and_swap(Destination, Comperand, Exchange); > @@ -541,6 +615,7 @@ > > #else > > +__INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand); > __INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) > { > long long retval = Comperand; > @@ -609,6 +684,19 @@ > #endif > > /*** String operations ***/ > + > +__INTRIN_INLINE void __stosb(unsigned char * Dest, const unsigned char Data, size_t Count); > +__INTRIN_INLINE void __stosw(unsigned short * Dest, const unsigned short Data, size_t Count); > +__INTRIN_INLINE void __stosd(unsigned long * Dest, const unsigned long Data, size_t Count); > +__INTRIN_INLINE void __movsb(unsigned char * Destination, const unsigned char * Source, size_t Count); > +__INTRIN_INLINE void __movsw(unsigned short * Destination, const unsigned short * Source, size_t Count); > +__INTRIN_INLINE void __movsd(unsigned long * Destination, const unsigned long * Source, size_t Count); > +#ifdef _M_AMD64 > +__INTRIN_INLINE void __stosq(unsigned __int64 * Dest, const unsigned __int64 Data, size_t Count); > +__INTRIN_INLINE void __movsq(unsigned long * Destination, const unsigned long * Source, size_t Count); > +#endif > + > + > /* NOTE: we don't set a memory clobber in the __stosX functions because Visual C++ doesn't */ > __INTRIN_INLINE void __stosb(unsigned char * Dest, const unsigned char Data, size_t Count) > { > @@ -695,7 +783,25 @@ > #endif > > #if defined(_M_AMD64) > + > /*** GS segment addressing ***/ > + > +__INTRIN_INLINE void __writegsbyte(const unsigned long Offset, const unsigned char Data); > +__INTRIN_INLINE void __writegsword(const unsigned long Offset, const unsigned short Data); > +__INTRIN_INLINE void __writegsdword(const unsigned long Offset, const unsigned long Data); > +__INTRIN_INLINE void __writegsqword(const unsigned long Offset, const unsigned __int64 Data); > +__INTRIN_INLINE unsigned char __readgsbyte(const unsigned long Offset); > +__INTRIN_INLINE unsigned short __readgsword(const unsigned long Offset); > +__INTRIN_INLINE unsigned long __readgsdword(const unsigned long Offset); > +__INTRIN_INLINE unsigned __int64 __readgsqword(const unsigned long Offset); > +__INTRIN_INLINE void __incgsbyte(const unsigned long Offset); > +__INTRIN_INLINE void __incgsword(const unsigned long Offset); > +__INTRIN_INLINE void __incgsdword(const unsigned long Offset); > +__INTRIN_INLINE void __addgsbyte(const unsigned long Offset, const unsigned char Data); > +__INTRIN_INLINE void __addgsword(const unsigned long Offset, const unsigned short Data); > +__INTRIN_INLINE void __addgsdword(const unsigned long Offset, const unsigned int Data); > +__INTRIN_INLINE void __addgsqword(const unsigned long Offset, const unsigned __int64 Data); > + > > __INTRIN_INLINE void __writegsbyte(const unsigned long Offset, const unsigned char Data) > { > @@ -780,8 +886,24 @@ > __asm__ __volatile__("addq %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); > } > > -#else > +#else /* defined(_M_AMD64) */ > + > /*** FS segment addressing ***/ > + > +__INTRIN_INLINE void __writefsbyte(const unsigned long Offset, const unsigned char Data); > +__INTRIN_INLINE void __writefsword(const unsigned long Offset, const unsigned short Data); > +__INTRIN_INLINE void __writefsdword(const unsigned long Offset, const unsigned long Data); > +__INTRIN_INLINE unsigned char __readfsbyte(const unsigned long Offset); > +__INTRIN_INLINE unsigned short __readfsword(const unsigned long Offset); > +__INTRIN_INLINE unsigned long __readfsdword(const unsigned long Offset); > +__INTRIN_INLINE void __incfsbyte(const unsigned long Offset); > +__INTRIN_INLINE void __incfsword(const unsigned long Offset); > +__INTRIN_INLINE void __incfsdword(const unsigned long Offset); > +__INTRIN_INLINE void __addfsbyte(const unsigned long Offset, const unsigned char Data); > +__INTRIN_INLINE void __addfsword(const unsigned long Offset, const unsigned short Data); > +__INTRIN_INLINE void __addfsdword(const unsigned long Offset, const unsigned int Data); > + > + > __INTRIN_INLINE void __writefsbyte(const unsigned long Offset, const unsigned char Data) > { > __asm__ __volatile__("movb %b[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); > @@ -857,10 +979,39 @@ > else > __asm__ __volatile__("addl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); > } > -#endif > + > +#endif /* defined(_M_AMD64) */ > > > /*** Bit manipulation ***/ > + > +__INTRIN_INLINE unsigned char _BitScanForward(unsigned long * const Index, const unsigned long Mask); > +__INTRIN_INLINE unsigned char _BitScanReverse(unsigned long * const Index, const unsigned long Mask); > +__INTRIN_INLINE unsigned char _bittest(const long * const a, const long b); > +#ifdef _M_AMD64 > +__INTRIN_INLINE unsigned char _bittest64(const __int64 * const a, const __int64 b); > +#endif > +__INTRIN_INLINE unsigned char _bittestandcomplement(long * const a, const long b); > +__INTRIN_INLINE unsigned char _bittestandreset(long * const a, const long b); > +__INTRIN_INLINE unsigned char _bittestandset(long * const a, const long b); > +__INTRIN_INLINE unsigned char _rotl8(unsigned char value, unsigned char shift); > +__INTRIN_INLINE unsigned short _rotl16(unsigned short value, unsigned char shift); > +__INTRIN_INLINE unsigned int _rotl(unsigned int value, int shift); > +__INTRIN_INLINE unsigned int _rotr(unsigned int value, int shift); > +__INTRIN_INLINE unsigned char _rotr8(unsigned char value, unsigned char shift); > +__INTRIN_INLINE unsigned short _rotr16(unsigned short value, unsigned char shift); > +__INTRIN_INLINE unsigned long long __ll_lshift(const unsigned long long Mask, const int Bit); > +__INTRIN_INLINE long long __ll_rshift(const long long Mask, const int Bit); > +__INTRIN_INLINE unsigned long long __ull_rshift(const unsigned long long Mask, int Bit); > +__INTRIN_INLINE unsigned short _byteswap_ushort(unsigned short value); > +__INTRIN_INLINE unsigned long _byteswap_ulong(unsigned long value); > +#ifdef _M_AMD64 > +__INTRIN_INLINE unsigned __int64 _byteswap_uint64(unsigned __int64 value); > +#else > +__INTRIN_INLINE unsigned __int64 _byteswap_uint64(unsigned __int64 value); > +#endif > + > + > __INTRIN_INLINE unsigned char _BitScanForward(unsigned long * const Index, const unsigned long Mask) > { > __asm__("bsfl %[Mask], %[Index]" : [Index] "=r" (*Index) : [Mask] "mr" (Mask)); > @@ -1001,11 +1152,11 @@ > > __INTRIN_INLINE long long __ll_rshift(const long long Mask, const int Bit) > { > - unsigned long long retval = Mask; > + long long retval = Mask; > > __asm__ > ( > - "shldl %b[Bit], %%eax, %%edx; sarl %b[Bit], %%eax" : > + "shrdl %b[Bit], %%edx, %%eax; sarl %b[Bit], %%edx" : > "+A" (retval) : > [Bit] "Nc" ((unsigned char)((unsigned long)Bit) & 0xFF) > ); > @@ -1019,7 +1170,7 @@ > > __asm__ > ( > - "shrdl %b[Bit], %%eax, %%edx; shrl %b[Bit], %%eax" : > + "shrdl %b[Bit], %%edx, %%eax; shrl %b[Bit], %%edx" : > "+A" (retval) : > [Bit] "Nc" ((unsigned char)((unsigned long)Bit) & 0xFF) > ); > @@ -1052,7 +1203,7 @@ > __INTRIN_INLINE unsigned __int64 _byteswap_uint64(unsigned __int64 value) > { > union { > - __int64 int64part; > + unsigned __int64 int64part; > struct { > unsigned long lowpart; > unsigned long hipart; > @@ -1067,6 +1218,15 @@ > #endif > > /*** 64-bit math ***/ > + > +__INTRIN_INLINE long long __emul(const int a, const int b); > +__INTRIN_INLINE unsigned long long __emulu(const unsigned int a, const unsigned int b); > +#ifdef _M_AMD64 > +__INTRIN_INLINE __int64 __mulh(__int64 a, __int64 b); > +__INTRIN_INLINE unsigned __int64 __umulh(unsigned __int64 a, unsigned __int64 b); > +#endif > + > + > __INTRIN_INLINE long long __emul(const int a, const int b) > { > long long retval; > @@ -1100,6 +1260,27 @@ > #endif > > /*** Port I/O ***/ > + > +__INTRIN_INLINE unsigned char __inbyte(const unsigned short Port); > +__INTRIN_INLINE unsigned short __inword(const unsigned short Port); > +__INTRIN_INLINE unsigned long __indword(const unsigned short Port); > +__INTRIN_INLINE void __inbytestring(unsigned short Port, unsigned char * Buffer, unsigned long Count); > +__INTRIN_INLINE void __inwordstring(unsigned short Port, unsigned short * Buffer, unsigned long Count); > +__INTRIN_INLINE void __indwordstring(unsigned short Port, unsigned long * Buffer, unsigned long Count); > +__INTRIN_INLINE void __outbyte(unsigned short const Port, const unsigned char Data); > +__INTRIN_INLINE void __outword(unsigned short const Port, const unsigned short Data); > +__INTRIN_INLINE void __outdword(unsigned short const Port, const unsigned long Data); > +__INTRIN_INLINE void __outbytestring(unsigned short const Port, const unsigned char * const Buffer, const unsigned long Count); > +__INTRIN_INLINE void __outwordstring(unsigned short const Port, const unsigned short * const Buffer, const unsigned long Count); > +__INTRIN_INLINE void __outdwordstring(unsigned short const Port, const unsigned long * const Buffer, const unsigned long Count); > +__INTRIN_INLINE int _inp(unsigned short Port); > +__INTRIN_INLINE unsigned short _inpw(unsigned short Port); > +__INTRIN_INLINE unsigned long _inpd(unsigned short Port); > +__INTRIN_INLINE int _outp(unsigned short Port, int databyte); > +__INTRIN_INLINE unsigned short _outpw(unsigned short Port, unsigned short dataword); > +__INTRIN_INLINE unsigned long _outpd(unsigned short Port, unsigned long dataword); > + > + > __INTRIN_INLINE unsigned char __inbyte(const unsigned short Port) > { > unsigned char byte; > @@ -1201,7 +1382,7 @@ > > __INTRIN_INLINE int _outp(unsigned short Port, int databyte) > { > - __outbyte(Port, databyte); > + __outbyte(Port, (unsigned char)databyte); > return databyte; > } > > @@ -1219,6 +1400,13 @@ > > > /*** System information ***/ > + > +__INTRIN_INLINE void __cpuid(int CPUInfo [], const int InfoType); > +__INTRIN_INLINE unsigned long long __rdtsc(void); > +__INTRIN_INLINE void __writeeflags(uintptr_t Value); > +__INTRIN_INLINE uintptr_t __readeflags(void); > + > + > __INTRIN_INLINE void __cpuid(int CPUInfo[], const int InfoType) > { > __asm__ __volatile__("cpuid" : "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3]) : "a" (InfoType)); > @@ -1250,9 +1438,16 @@ > } > > /*** Interrupts ***/ > + > +__INTRIN_INLINE void __int2c(void); > +__INTRIN_INLINE void _disable(void); > +__INTRIN_INLINE void _enable(void); > +__INTRIN_INLINE void __halt(void); > + > #ifdef __clang__ > #define __debugbreak() __asm__("int $3") > #else > +__INTRIN_INLINE void __debugbreak(void); > __INTRIN_INLINE void __debugbreak(void) > { > __asm__("int $3"); > @@ -1281,7 +1476,34 @@ > > /*** Protected memory management ***/ > > +__INTRIN_INLINE void __invlpg(void * const Address); > #ifdef _M_AMD64 > +__INTRIN_INLINE void __writecr0(const unsigned __int64 Data); > +__INTRIN_INLINE void __writecr3(const unsigned __int64 Data); > +__INTRIN_INLINE void __writecr4(const unsigned __int64 Data); > +__INTRIN_INLINE void __writecr8(const unsigned __int64 Data); > +__INTRIN_INLINE unsigned __int64 __readcr0(void); > +__INTRIN_INLINE unsigned __int64 __readcr2(void); > +__INTRIN_INLINE unsigned __int64 __readcr3(void); > +__INTRIN_INLINE unsigned __int64 __readcr4(void); > +__INTRIN_INLINE unsigned __int64 __readcr8(void); > +__INTRIN_INLINE unsigned __int64 __readdr(unsigned int reg); > +__INTRIN_INLINE void __writedr(unsigned reg, unsigned __int64 value); > +#else /* _M_AMD64 */ > +__INTRIN_INLINE void __writecr0(const unsigned int Data); > +__INTRIN_INLINE void __writecr3(const unsigned int Data); > +__INTRIN_INLINE void __writecr4(const unsigned int Data); > +__INTRIN_INLINE unsigned long __readcr0(void); > +__INTRIN_INLINE unsigned long __readcr2(void); > +__INTRIN_INLINE unsigned long __readcr3(void); > +__INTRIN_INLINE unsigned long __readcr4(void); > +__INTRIN_INLINE unsigned int __readdr(unsigned int reg); > +__INTRIN_INLINE void __writedr(unsigned reg, unsigned int value); > +#endif /* _M_AMD64 */ > + > + > +#ifdef _M_AMD64 > + > __INTRIN_INLINE void __writecr0(const unsigned __int64 Data) > { > __asm__("mov %[Data], %%cr0" : : [Data] "r" (Data) : "memory"); > @@ -1336,7 +1558,9 @@ > __asm__ __volatile__("movq %%cr8, %q[value]" : [value] "=r" (value)); > return value; > } > -#else > + > +#else /* _M_AMD64 */ > + > __INTRIN_INLINE void __writecr0(const unsigned int Data) > { > __asm__("mov %[Data], %%cr0" : : [Data] "r" (Data) : "memory"); > @@ -1379,9 +1603,11 @@ > __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=r" (value)); > return value; > } > -#endif > + > +#endif /* _M_AMD64 */ > > #ifdef _M_AMD64 > + > __INTRIN_INLINE unsigned __int64 __readdr(unsigned int reg) > { > unsigned __int64 value; > @@ -1445,7 +1671,9 @@ > break; > } > } > -#else > + > +#else /* _M_AMD64 */ > + > __INTRIN_INLINE unsigned int __readdr(unsigned int reg) > { > unsigned int value; > @@ -1509,7 +1737,8 @@ > break; > } > } > -#endif > + > +#endif /* _M_AMD64 */ > > __INTRIN_INLINE void __invlpg(void * const Address) > { > @@ -1518,6 +1747,16 @@ > > > /*** System operations ***/ > + > +__INTRIN_INLINE unsigned long long __readmsr(const int reg); > +__INTRIN_INLINE void __writemsr(const unsigned long Register, const unsigned long long Value); > +__INTRIN_INLINE unsigned long long __readpmc(const int counter); > +__INTRIN_INLINE unsigned long __segmentlimit(const unsigned long a); > +__INTRIN_INLINE void __wbinvd(void); > +__INTRIN_INLINE void __lidt(void *Source); > +__INTRIN_INLINE void __sidt(void *Destination); > + > + > __INTRIN_INLINE unsigned long long __readmsr(const int reg) > { > #ifdef _M_AMD64 > @@ -1572,6 +1811,9 @@ > > /*** Misc operations ***/ > > +__INTRIN_INLINE void _mm_pause(void); > +__INTRIN_INLINE void __nop(void); > + > __INTRIN_INLINE void _mm_pause(void) > { > __asm__ __volatile__("pause" : : : "memory"); > > >

12 years

Fisheye going down for upgrade

by Zachary Gorden

Going to try to upgrade fisheye so expect code.reactos.org to be non-responsive for however long the upgrade/rollbackififail takes. Z

12 years

Re: [ros-dev] [ros-diffs] [akhaldi] 59663: [CMAKE] * We no longer need to maintain a transitional compatibility with the old CMake/RosBE for MSVC builds.

by Timo Kreuzer

We don't? Doesn't this break WDK builds? Am 07.08.2013 14:28, schrieb akhaldi(a)svn.reactos.org: > Author: akhaldi > Date: Wed Aug 7 12:28:47 2013 > New Revision: 59663 > > URL: http://svn.reactos.org/svn/reactos?rev=59663&view=rev > Log: > [CMAKE] > * We no longer need to maintain a transitional compatibility with the old CMake/RosBE for MSVC builds. > > Removed: > trunk/reactos/cmake/Platform/Windows-cl.cmake > > Removed: trunk/reactos/cmake/Platform/Windows-cl.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-cl.… > ============================================================================== > --- trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/Platform/Windows-cl.cmake (removed) > @@ -1,307 +0,0 @@ > -# try to load any previously computed information for C on this platform > -INCLUDE( ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake OPTIONAL) > -# try to load any previously computed information for CXX on this platform > -INCLUDE( ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake OPTIONAL) > - > -SET(WIN32 1) > - > -INCLUDE(Platform/cl) > - > -############ > -# Detect WDK build environment > -IF($ENV{DDKBUILDENV} MATCHES "chk") > - MESSAGE(STATUS "DDK/WDK checked build environment detected.") > - SET(CMAKE_USE_WDK_ENV 1) > -ENDIF() > - > -IF($ENV{DDKBUILDENV} MATCHES "fre") > - MESSAGE(STATUS "DDK/WDK free build environment detected.") > - SET(CMAKE_USE_WDK_ENV 1) > -ENDIF() > - > -if(CMAKE_USE_WDK_ENV) > - > - # Detect output architecture > - if(NOT ARCH) > - if($ENV{AMD64} MATCHES 1) > - set(ARCH amd64) > - set(MSVC_C_ARCHITECTURE_ID 64) > - else() > - set(ARCH i386) > - endif() > - endif() > - > - # Force C/C++ Compilers > - include(CMakeForceCompiler) > - CMAKE_FORCE_C_COMPILER(cl MSVC) > - CMAKE_FORCE_CXX_COMPILER(cl MSVC) > - > - # Add library directories > - STRING(REPLACE * ${ARCH} ATL_LIB_PATH $ENV{ATL_LIB_PATH}) > - STRING(REPLACE * ${ARCH} CRT_LIB_PATH $ENV{CRT_LIB_PATH}) > - STRING(REPLACE * ${ARCH} DDK_LIB_PATH $ENV{DDK_LIB_PATH}) > - STRING(REPLACE * ${ARCH} KMDF_LIB_PATH $ENV{KMDF_LIB_PATH}) > - STRING(REPLACE * ${ARCH} MFC_LIB_PATH $ENV{MFC_LIB_PATH}) > - STRING(REPLACE * ${ARCH} SDK_LIB_PATH $ENV{SDK_LIB_PATH}) > - LINK_DIRECTORIES(${ATL_LIB_PATH} > - ${CRT_LIB_PATH} > - ${DDK_LIB_PATH} > - ${IFSKIT_LIB_PATH} > - ${KMDF_LIB_PATH} > - ${MFC_LIB_PATH} > - ${SDK_LIB_PATH}) > - > - # Add environment variables > - if(NOT CMAKE_CROSSCOMPILING) > - set(ENV{INCLUDE} "$ENV{CRT_INC_PATH};$ENV{SDK_INC_PATH};$ENV{SDK_INC_PATH}\\crt\\stl60") > - include_directories($ENV{INCLUDE}) > - set(ENV{LIBPATH} "${CRT_LIB_PATH};${SDK_LIB_PATH}") > - set(ENV{USE_MSVCRT} 1) > - set(ENV{USE_STL} 1) > - set(ENV{STL_VER} 60) > - endif() > -endif() > - > -############ > - > -# Set lib path for ARM compiler > -if(${ARCH} MATCHES arm) > - message("Using ARM build for cross compilation. Host tools are x86.") > - > - # Force C/C++ Compilers > - include(CMakeForceCompiler) > - CMAKE_FORCE_C_COMPILER(cl MSVC) > - CMAKE_FORCE_CXX_COMPILER(cl MSVC) > - > - if(NOT CMAKE_CROSSCOMPILING) > - message("Using x86 target for ARM host tools.") > - set(ARCH i386) > - > - LINK_DIRECTORIES($ENV{WindowsSdkDir}\\Lib\\win8\\um\\x86) > - endif() > - > - #LINK_DIRECTORIES($ENV{LIB}) > -endif() > - > - > -############ > - > -SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows) > -SET(CMAKE_CREATE_CONSOLE_EXE /subsystem:console) > - > -IF(CMAKE_GENERATOR MATCHES "Visual Studio 6") > - SET (CMAKE_NO_BUILD_TYPE 1) > -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 6") > -IF(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio") > - SET (CMAKE_NO_BUILD_TYPE 1) > - SET (CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" CACHE STRING > - "Semicolon separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.") > - MARK_AS_ADVANCED(CMAKE_CONFIGURATION_TYPES) > -ENDIF(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio") > -# does the compiler support pdbtype and is it the newer compiler > -IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") > - SET(CMAKE_COMPILER_2005 1) > -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8") > - > -# make sure to enable languages after setting configuration types > -ENABLE_LANGUAGE(RC) > -SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") > - > -# for nmake we need to compute some information about the compiler > -# that is being used. > -# the compiler may be free command line, 6, 7, or 71, and > -# each have properties that must be determined. > -# to avoid running these tests with each cmake run, the > -# test results are saved in CMakeCPlatform.cmake, a file > -# that is automatically copied into try_compile directories > -# by the global generator. > -SET(MSVC_IDE 1) > -IF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja") > - SET(MSVC_IDE 0) > - IF(NOT CMAKE_VC_COMPILER_TESTS_RUN) > - SET(CMAKE_VC_COMPILER_TESTS 1) > - SET(testNmakeCLVersionFile > - "${CMAKE_ROOT}/Modules/CMakeTestNMakeCLVersion.c") > - STRING(REGEX REPLACE "/" "\\\\" testNmakeCLVersionFile "${testNmakeCLVersionFile}") > - MESSAGE(STATUS "Check for CL compiler version") > - SET(CMAKE_TEST_COMPILER ${CMAKE_C_COMPILER}) > - IF (NOT CMAKE_C_COMPILER) > - SET(CMAKE_TEST_COMPILER ${CMAKE_CXX_COMPILER}) > - ENDIF(NOT CMAKE_C_COMPILER) > - EXEC_PROGRAM(${CMAKE_TEST_COMPILER} > - ARGS /nologo -EP \"${testNmakeCLVersionFile}\" > - OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT > - RETURN_VALUE CMAKE_COMPILER_RETURN > - ) > - IF(NOT CMAKE_COMPILER_RETURN) > - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log > - "Determining the version of compiler passed with the following output:\n" > - "${CMAKE_COMPILER_OUTPUT}\n\n") > - STRING(REGEX REPLACE "\n" " " compilerVersion "${CMAKE_COMPILER_OUTPUT}") > - STRING(REGEX REPLACE ".*VERSION=(.*)" "\\1" > - compilerVersion "${compilerVersion}") > - MESSAGE(STATUS "Check for CL compiler version - ${compilerVersion}") > - SET(MSVC60) > - SET(MSVC70) > - SET(MSVC71) > - SET(MSVC80) > - SET(CMAKE_COMPILER_2005) > - IF("${compilerVersion}" LESS 1300) > - SET(MSVC60 1) > - SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 1) > - ENDIF("${compilerVersion}" LESS 1300) > - IF("${compilerVersion}" EQUAL 1300) > - SET(MSVC70 1) > - SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0) > - ENDIF("${compilerVersion}" EQUAL 1300) > - IF("${compilerVersion}" EQUAL 1310) > - SET(MSVC71 1) > - SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0) > - ENDIF("${compilerVersion}" EQUAL 1310) > - IF("${compilerVersion}" EQUAL 1400) > - SET(MSVC80 1) > - SET(CMAKE_COMPILER_2005 1) > - ENDIF("${compilerVersion}" EQUAL 1400) > - IF("${compilerVersion}" EQUAL 1500) > - SET(MSVC90 1) > - ENDIF("${compilerVersion}" EQUAL 1500) > - IF("${compilerVersion}" EQUAL 1600) > - SET(MSVC10 1) > - ENDIF("${compilerVersion}" EQUAL 1600) > - SET(MSVC_VERSION "${compilerVersion}") > - ELSE(NOT CMAKE_COMPILER_RETURN) > - MESSAGE(STATUS "Check for CL compiler version - failed") > - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log > - "Determining the version of compiler failed with the following output:\n" > - "${CMAKE_COMPILER_OUTPUT}\n\n") > - ENDIF(NOT CMAKE_COMPILER_RETURN) > - # try to figure out if we are running the free command line > - # tools from Microsoft. These tools do not provide debug libraries, > - # so the link flags used have to be different. > - MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp2") > - SET(testForFreeVCFile > - "${CMAKE_ROOT}/Modules/CMakeTestForFreeVC.cxx") > - STRING(REGEX REPLACE "/" "\\\\" testForFreeVCFile "${testForFreeVCFile}") > - MESSAGE(STATUS "Check if this is a free VC compiler") > - EXEC_PROGRAM(${CMAKE_TEST_COMPILER} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp2 > - ARGS /nologo /EHsc > - \"${testForFreeVCFile}\" > - OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT > - RETURN_VALUE CMAKE_COMPILER_RETURN > - ) > - IF(CMAKE_COMPILER_RETURN) > - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log > - "Determining if this is a free VC compiler failed with the following output:\n" > - "${CMAKE_COMPILER_OUTPUT}\n\n") > - MESSAGE(STATUS "Check if this is a free VC compiler - yes") > - SET(CMAKE_USING_VC_FREE_TOOLS 1) > - ELSE(CMAKE_COMPILER_RETURN) > - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log > - "Determining if this is a free VC compiler passed with the following output:\n" > - "${CMAKE_COMPILER_OUTPUT}\n\n") > - MESSAGE(STATUS "Check if this is a free VC compiler - no") > - SET(CMAKE_USING_VC_FREE_TOOLS 0) > - ENDIF(CMAKE_COMPILER_RETURN) > - MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp3") > - ENDIF(NOT CMAKE_VC_COMPILER_TESTS_RUN) > -ENDIF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja") > - > -IF(MSVC_C_ARCHITECTURE_ID MATCHES 64) > - SET(CMAKE_CL_64 1) > -ELSE(MSVC_C_ARCHITECTURE_ID MATCHES 64) > - SET(CMAKE_CL_64 0) > -ENDIF(MSVC_C_ARCHITECTURE_ID MATCHES 64) > -IF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) > - SET(CMAKE_CL_64 1) > -ENDIF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) > - > -IF("${MSVC_VERSION}" GREATER 1599) > - SET(MSVC_INCREMENTAL_DEFAULT ON) > -ENDIF() > - > -# No support for old versions > -if(MSVC_VERSION LESS 1310) > -message(FATAL_ERROR "Your compiler is too old. Get a newer version!") > -endif() > - > -# for 2005 make sure the manifest is put in the dll with mt > -#SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") > -#SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}") > -# create a C shared library > -#SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") > -# create a C shared module just copy the shared library rule > -#SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") > -#SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}") > -#SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") > - > -SET(CMAKE_BUILD_TYPE_INIT Debug) > -SET(CMAKE_CXX_FLAGS_DEBUG_INIT "") > -SET(CMAKE_C_FLAGS_DEBUG_INIT "") > -SET(CMAKE_CXX_FLAGS_INIT "") > -SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") > -SET(CMAKE_CXX_FLAGS_RELEASE_INIT "") > -SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") > -SET(CMAKE_C_FLAGS_INIT "") > -SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") > -SET(CMAKE_C_FLAGS_RELEASE_INIT "") > -SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") > -SET(CMAKE_C_STANDARD_LIBRARIES_INIT "") > -SET(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}") > -SET(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") > - > -# executable linker flags > -SET (CMAKE_LINK_DEF_FILE_FLAG "/DEF:") > -# set the stack size and the machine type > -SET(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID}) > -IF(NOT _MACHINE_ARCH_FLAG) > - SET(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID}) > -ENDIF(NOT _MACHINE_ARCH_FLAG) > -# HACK > -if(${ARCH} MATCHES arm) > - SET(_MACHINE_ARCH_FLAG ARM) > -endif() > -SET (CMAKE_EXE_LINKER_FLAGS_INIT > - "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:${_MACHINE_ARCH_FLAG}") > - > -# add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtype > -# on versions that support it > -SET( MSVC_INCREMENTAL_YES_FLAG "") > -IF(NOT MSVC_INCREMENTAL_DEFAULT) > - SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES") > -ENDIF() > - > -IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) > - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") > - SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") > -ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE) > - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") > - SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") > -ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) > -# for release and minsize release default to no incremental linking > -SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT "/INCREMENTAL:NO") > -SET(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO") > - > -# copy the EXE_LINKER flags to SHARED and MODULE linker flags > -# shared linker flags > -SET (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT}) > -SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) > -SET (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) > -SET (CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) > -SET (CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) > -# module linker flags > -SET (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT}) > -SET (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT}) > -SET (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT}) > -SET (CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) > -SET (CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) > - > -# save computed information for this platform > -IF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake") > - CONFIGURE_FILE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake.in > - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCPlatform.cmake IMMEDIATE) > -ENDIF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake") > - > -IF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake") > - CONFIGURE_FILE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake.in > - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXPlatform.cmake IMMEDIATE) > -ENDIF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake") > > >

12 years

Re: [ros-dev] [ros-diffs] [hbelusca] 59660: [NTVDM] Code formatting only.

by Timo Kreuzer

Am 06.08.2013 23:06, schrieb hbelusca(a)svn.reactos.org: > Author: hbelusca > Date: Tue Aug 6 21:06:00 2013 > New Revision: 59660 > > URL: http://svn.reactos.org/svn/reactos?rev=59660&view=rev > Log: > [NTVDM] > Code formatting only. > > Modified: > branches/ntvdm/subsystems/ntvdm/bios.c > branches/ntvdm/subsystems/ntvdm/ntvdm.h > branches/ntvdm/subsystems/ntvdm/ps2.c > branches/ntvdm/subsystems/ntvdm/timer.c > > Modified: branches/ntvdm/subsystems/ntvdm/bios.c > URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… > ============================================================================== > --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) > +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Tue Aug 6 21:06:00 2013 > @@ -326,9 +326,9 @@ > > /* Set the start address in the CRTC */ > VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); > - VgaWritePort(VGA_CRTC_DATA, LOBYTE(Bda->VideoPageOffset)); > + VgaWritePort(VGA_CRTC_DATA , LOBYTE(Bda->VideoPageOffset)); > VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); > - VgaWritePort(VGA_CRTC_DATA, HIBYTE(Bda->VideoPageOffset)); > + VgaWritePort(VGA_CRTC_DATA , HIBYTE(Bda->VideoPageOffset)); That is a strange way of formatting. I don't thing we do this anywhere else.

12 years

Re: [ros-dev] [ros-diffs] [akhaldi] 59598: [CMAKE/GCC] * Compile debug builds using -O1 instead of -Os. This results in faster compilation time with no measurable difference in runtime performance according to tests. CORE-7...

by Alex Ionescu

I don't really like this. Maybe only do this on the build server, or at least don't do it to kernel code. "Measurable" difference in performance doesn't really mean much on an OS that does not have any performance infrastructure, but trust me, there's a difference between O1 and O2. Best regards, Alex Ionescu On Wed, Jul 31, 2013 at 6:04 AM, <akhaldi(a)svn.reactos.org> wrote: > Author: akhaldi > Date: Wed Jul 31 13:04:38 2013 > New Revision: 59598 > > URL: http://svn.reactos.org/svn/reactos?rev=59598&view=rev > Log: > [CMAKE/GCC] > * Compile debug builds using -O1 instead of -Os. This results in faster > compilation time with no measurable difference in runtime performance > according to tests. > CORE-7374 #resolve #comment Committed in r59598. > > Modified: > trunk/reactos/cmake/config.cmake > > Modified: trunk/reactos/cmake/config.cmake > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=595… > > ============================================================================== > --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Wed Jul 31 13:04:38 > 2013 > @@ -10,7 +10,7 @@ > set(TUNE "i686" CACHE STRING > "Which CPU ReactOS should be optimized for.") > > -set(OPTIMIZE "1" CACHE STRING > +set(OPTIMIZE "4" CACHE STRING > "What level of optimization to use. > 0 = off > 1 = Default option, optimize for size (-Os) with some additional options > > >

12 years

(no subject)

by elhoir

Hi all My Gmail account has been compromised. The mail i have sent to you is spam. I have just changed my password. Sorry for the inconveniences.

12 years

Status Meeting (July 2013)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place last Thursday of this month, 25th of Julu, 19:00 UTC. Put that into your calendars so you don't forget. I will handle the technical side of the meeting and you will get your login credentials shortly before the meeting. If someone still is not getting passwords sent before a meeting - please email Colin or Pierre before the meeting started to get one. The agenda will be posted shortly before the meeting, suggestions are welcome (preferably send them to me before the meeting starts). Regards, Aleksey Bragin

12 years

new TSVN version

by Timo Kreuzer

Hi, For all TSVN users: the new version 1.8.0 is broken. Merging doesn't work and aborts once you get a conflict. I had to install a nightly to make that work. Also: it uses a new working copy format, which is incompatible with older svn versions, like the one we use in RosBE. Which you would also need to update. Therefore I suggest to not update it yet, unless you really know what you are doing. I don't want to hear complaints later ;-) Timo

12 years, 1 month

Re: [ros-dev] [ros-diffs] [akhaldi] 59507: [DBGHELPHOST] * Fix some warnings. Brought to you by Thomas Faber.

by Timo Kreuzer

Seeing the __x86_64__ change, I wonder: Does the code work with 64 bit GCC builds? I mean 64 bit target not 64 bit host. Am 19.07.2013 02:11, schrieb akhaldi(a)svn.reactos.org: > Author: akhaldi > Date: Fri Jul 19 00:11:08 2013 > New Revision: 59507 > > URL: http://svn.reactos.org/svn/reactos?rev=59507&view=rev > Log: > [DBGHELPHOST] > * Fix some warnings. Brought to you by Thomas Faber. > > Modified: > trunk/reactos/dll/win32/dbghelp/compat.h > trunk/reactos/dll/win32/dbghelp/symbol.c > > Modified: trunk/reactos/dll/win32/dbghelp/compat.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/compat.h… > ============================================================================== > --- trunk/reactos/dll/win32/dbghelp/compat.h [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/dbghelp/compat.h [iso-8859-1] Fri Jul 19 00:11:08 2013 > @@ -15,7 +15,11 @@ > #define min(x, y) (((x) < (y)) ? (x) : (y)) > #define max(x, y) (((x) > (y)) ? (x) : (y)) > > +#ifdef __i386__ > #define CDECL __cdecl > +#else > +#define CDECL > +#endif > typedef PVOID IUnknown, IDispatch, IRecordInfo; > > // windef.h > @@ -719,7 +723,6 @@ > > BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, PSYM_ENUMMODULES_CALLBACKW64 EnumModulesCallback, PVOID UserContext); > > -#ifndef _LP64 > typedef struct _tagADDRESS > { > DWORD Offset; > @@ -763,23 +766,6 @@ > typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)(PCSTR, ULONG, ULONG, PVOID); > typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACKW)(PCWSTR, ULONG, ULONG, PVOID); > > -#else > -#define ADDRESS ADDRESS64 > -#define LPADDRESS LPADDRESS64 > -#define IMAGEHLP_MODULE IMAGEHLP_MODULE64 > -#define PIMAGEHLP_MODULE PIMAGEHLP_MODULE64 > -#define IMAGEHLP_MODULEW IMAGEHLP_MODULEW64 > -#define PIMAGEHLP_MODULEW PIMAGEHLP_MODULEW64 > -#define PENUMLOADED_MODULES_CALLBACK PENUMLOADED_MODULES_CALLBACK64 > -#define PFUNCTION_TABLE_ACCESS_ROUTINE PFUNCTION_TABLE_ACCESS_ROUTINE64 > -#define PTRANSLATE_ADDRESS_ROUTINE PTRANSLATE_ADDRESS_ROUTINE64 > -#define PSYMBOL_REGISTERED_CALLBACK PSYMBOL_REGISTERED_CALLBACK64 > -#define PREAD_PROCESS_MEMORY_ROUTINE PREAD_PROCESS_MEMORY_ROUTINE64 > -#define PGET_MODULE_BASE_ROUTINE PGET_MODULE_BASE_ROUTINE64 > -#define PSYM_ENUMMODULES_CALLBACK PSYM_ENUMMODULES_CALLBACK64 > -#define PSYM_ENUMSYMBOLS_CALLBACK PSYM_ENUMSYMBOLS_CALLBACK64 > -#define PSYM_ENUMSYMBOLS_CALLBACKW PSYM_ENUMSYMBOLS_CALLBACKW64 > -#endif > typedef struct _IMAGEHLP_MODULE64 > { > DWORD SizeOfStruct; > > Modified: trunk/reactos/dll/win32/dbghelp/symbol.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… > ============================================================================== > --- trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] Fri Jul 19 00:11:08 2013 > @@ -70,7 +70,7 @@ > > DWORD symt_ptr2index(struct module* module, const struct symt* sym) > { > -#ifdef _WIN64 > +#ifdef __x86_64__ > const struct symt** c; > int len = vector_length(&module->vsymt), i; > > @@ -91,7 +91,7 @@ > > struct symt* symt_index2ptr(struct module* module, DWORD id) > { > -#ifdef _WIN64 > +#ifdef __x86_64__ > if (!id-- || id >= vector_length(&module->vsymt)) return NULL; > return *(struct symt**)vector_at(&module->vsymt, id); > #else > > >

12 years, 1 month

Re: [ros-dev] [ros-diffs] [ion] 59516: [WIN32K]: Get rid of unused variables, fix all warnings on GCC 4.7

by Timo Kreuzer

This one is used for debugging. We have this in other places, too, so we should add a define __unused __attribute__((unused)) for GCC or something Or we simply silence the warning. Am 19.07.2013 19:06, schrieb ion(a)svn.reactos.org: > ============================================================================== > --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) > +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Fri Jul 19 17:06:14 2013 > @@ -570,20 +570,18 @@ > NTAPI > GDIOBJ_vReferenceObjectByPointer(POBJ pobj) > { > - ULONG cRefs; > - > /* Check if the object has a handle */ > if (GDI_HANDLE_GET_INDEX(pobj->hHmgr)) > { > /* Increase the handle's reference count */ > ULONG ulIndex = GDI_HANDLE_GET_INDEX(pobj->hHmgr); > ASSERT((gpaulRefCount[ulIndex] & REF_MASK_COUNT) > 0); > - cRefs = InterlockedIncrement((LONG*)&gpaulRefCount[ulIndex]); > + InterlockedIncrement((LONG*)&gpaulRefCount[ulIndex]); > } > else > { > /* Increase the object's reference count */ > - cRefs = InterlockedIncrement((LONG*)&pobj->ulShareCount); > + InterlockedIncrement((LONG*)&pobj->ulShareCount); > } > > DBG_LOGEVENT(&pobj->slhLog, EVENT_REFERENCE, cRefs); >

12 years, 1 month

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-dev