0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3311 from AbigailBuccaneer/develop

Browse Source 
Fix endianness handling errors
This commit is contained in:
Petr Mrázek 2021-02-09 23:12:32 +01:00 committed by GitHub
commit 485f123362
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libraries/classparser/src/javaendian.h
View File

@ -11,32 +11,17 @@ inline uint64_t bigswap(uint64_t x)
{ {
return x; return x;
} }
;
inline uint32_t bigswap(uint32_t x) inline uint32_t bigswap(uint32_t x)
{ {
return x; return x;
} }
;
inline uint16_t bigswap(uint16_t x) inline uint16_t bigswap(uint16_t x)
{ {
return x; return x;
} }
;
inline int64_t bigswap(int64_t x)
{
return x;
}
;
inline int32_t bigswap(int32_t x)
{
return x;
}
;
inline int16_t bigswap(int16_t x)
{
return x;
}
;
#else #else
inline uint64_t bigswap(uint64_t x) inline uint64_t bigswap(uint64_t x)
{ {
@ -55,22 +40,20 @@ inline uint16_t bigswap(uint16_t x)
return (x >> 8) | (x << 8); return (x >> 8) | (x << 8);
} }
#endif
inline int64_t bigswap(int64_t x) inline int64_t bigswap(int64_t x)
{ {
return (x >> 56) | ((x << 40) & 0x00FF000000000000) | ((x << 24) & 0x0000FF0000000000) | return static_cast<int64_t>(bigswap(static_cast<uint64_t>(x)));
((x << 8) & 0x000000FF00000000) | ((x >> 8) & 0x00000000FF000000) |
((x >> 24) & 0x0000000000FF0000) | ((x >> 40) & 0x000000000000FF00) | (x << 56);
} }
inline int32_t bigswap(int32_t x) inline int32_t bigswap(int32_t x)
{ {
return (x >> 24) | ((x << 8) & 0x00FF0000) | ((x >> 8) & 0x0000FF00) | (x << 24); return static_cast<int32_t>(bigswap(static_cast<uint32_t>(x)));
} }
inline int16_t bigswap(int16_t x) inline int16_t bigswap(int16_t x)
{ {
return (x >> 8) | (x << 8); return static_cast<int16_t>(bigswap(static_cast<uint16_t>(x)));
} }
#endif
} }