archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-08 16:01:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

ConLog unicode support improved

Browse source
This commit is contained in:
Nekotekina 2014-03-21 19:06:08 +04:00
parent 39d1e21802
commit 5ea58d9451
3 changed files with 76 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

50
rpcs3/stdafx.h
View file

@ -35,7 +35,8 @@
#endif
#ifndef _WIN32
#define wx_str() ToStdString().c_str()
//hack, disabled
//#define wx_str() ToStdString().c_str()
#endif
#include <cstdint>
@ -72,6 +73,12 @@ union u128
operator bool() const { return _u64[0] != 0 || _u64[1] != 0; }
static u128 From128( u64 hi, u64 lo )
{
u128 ret = {hi, lo};
return ret;
}
static u128 From64( u64 src )
{
u128 ret = {0, src};
@ -88,6 +95,27 @@ union u128
return ret;
}
static u128 FromBit ( u32 bit )
{
u128 ret;
if (bit < 64)
{
ret.hi = 0;
ret.lo = (u64)1 << bit;
}
else if (bit < 128)
{
ret.hi = (u64)1 << (bit - 64);
ret.lo = 0;
}
else
{
ret.hi = 0;
ret.lo = 0;
}
return ret;
}
bool operator == ( const u128& right ) const
{
return (lo == right.lo) && (hi == right.hi);
@ -97,6 +125,26 @@ union u128
{
return (lo != right.lo) || (hi != right.hi);
}
u128 operator | ( const u128& right ) const
{
return From128(hi | right.hi, lo | right.lo);
}
u128 operator & ( const u128& right ) const
{
return From128(hi & right.hi, lo & right.lo);
}
u128 operator ^ ( const u128& right ) const
{
return From128(hi ^ right.hi, lo ^ right.lo);
}
u128 operator ~ () const
{
return From128(~hi, ~lo);
}
};
union s128