libAthena/athena
2
0
Fork 0
mirror of https://github.com/libAthena/athena.git synced 2025-12-10 22:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Changed swap* functions to both return, and take a reference

Browse Source 
* Fixed writeInt64 in FileWriter
* Fixed ec.cpp on big endian systems
This commit is contained in:
Phillip Stephens
2014-04-25 15:17:52 -07:00
parent b7c359ea40
commit 6150d728a5
4 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Athena/Utility.cpp
View File

@@ -32,43 +32,43 @@ bool isEmpty(Int8* buf, Uint32 size)
return buf[0] == 0 && !memcmp(buf, buf + 1, size - 1);
}
Uint16 swapU16(Uint16 val )
Uint16 swapU16(Uint16& val )
{
return (Uint16)swap16(val);
return (Uint16)swap16((Int16&)val);
}
Int16 swap16(Int16 val )
Int16 swap16(Int16& val )
{
return (val << 8) | ((val >> 8) & 0xFF);
return (val = (val << 8) | ((val >> 8) & 0xFF));
}
Uint32 swapU32(Uint32 val)
Uint32 swapU32(Uint32& val)
{
return (Uint32)swap32(val);
return (Uint32)swap32((Int32&)val);
}
int swap32(Int32 val )
int swap32(Int32& val )
{
val = (val & 0x0000FFFF) << 16 | (val & 0xFFFF0000) >> 16;
val = (val & 0x00FF00FF) << 8 | (val & 0xFF00FF00) >> 8;
return val;
}
Uint64 swapU64(Uint64 val)
Uint64 swapU64(Uint64& val)
{
return (Uint64)swap64(val);
return (Uint64)swap64((Int64&)val);
}
Int64 swap64(Int64 val)
Int64 swap64(Int64& val)
{
return ((Int64)((((Int64)(val) & 0xFF00000000000000ULL) >> 56) |
return (val = ((Int64)((((Int64)(val) & 0xFF00000000000000ULL) >> 56) |
(((Int64)(val) & 0x00FF000000000000ULL) >> 40) |
(((Int64)(val) & 0x0000FF0000000000ULL) >> 24) |
(((Int64)(val) & 0x000000FF00000000ULL) >> 8) |
(((Int64)(val) & 0x00000000FF000000ULL) << 8) |
(((Int64)(val) & 0x0000000000FF0000ULL) << 24) |
(((Int64)(val) & 0x000000000000FF00ULL) << 40) |
(((Int64)(val) & 0x00000000000000FFULL) << 56)));
(((Int64)(val) & 0x00000000000000FFULL) << 56))));
}
bool isSystemBigEndian()