Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Prevent int16_t -> int64_t promotion on negative numbers.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-08-15 20:58:16 +02:00
parent 3db3952135
commit c9d7b96c81
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/TracyEvent.hpp
View File

@ -83,7 +83,7 @@ struct ZoneEvent
void SetStart( int64_t start ) void SetStart( int64_t start )
{ {
assert( start < ( 1ll << 47 ) ); assert( start < ( 1ll << 47 ) );
_start_srcloc = ( _start_srcloc & 0xFFFF ) | ( start << 16 ); _start_srcloc = ( _start_srcloc & 0xFFFF ) | uint64_t( start << 16 );
} }
int16_t SrcLoc() const int16_t SrcLoc() const
{ {
@ -91,7 +91,7 @@ struct ZoneEvent
} }
void SetSrcLoc( int16_t srcloc ) void SetSrcLoc( int16_t srcloc )
{ {
_start_srcloc = ( _start_srcloc & 0xFFFFFFFFFFFF0000 ) | srcloc; _start_srcloc = ( _start_srcloc & 0xFFFFFFFFFFFF0000 ) | uint16_t( srcloc );
} }
uint64_t _start_srcloc; uint64_t _start_srcloc;
@ -127,7 +127,7 @@ struct LockEvent
void SetTime( int64_t time ) void SetTime( int64_t time )
{ {
assert( time < ( 1ll << 47 ) ); assert( time < ( 1ll << 47 ) );
_start_time = ( _start_time & 0xFFFF ) | ( time << 16 ); _start_time = ( _start_time & 0xFFFF ) | uint64_t( time << 16 );
} }
int16_t SrcLoc() const int16_t SrcLoc() const
{ {
@ -135,7 +135,7 @@ struct LockEvent
} }
void SetSrcLoc( int16_t srcloc ) void SetSrcLoc( int16_t srcloc )
{ {
_start_time = ( _start_time & 0xFFFFFFFFFFFF0000 ) | srcloc; _start_time = ( _start_time & 0xFFFFFFFFFFFF0000 ) | uint16_t( srcloc );
} }
uint64_t _start_time; uint64_t _start_time;