diff --git a/src/ox/fs/filestore.hpp b/src/ox/fs/filestore.hpp index e00af641e..6176ab42d 100644 --- a/src/ox/fs/filestore.hpp +++ b/src/ox/fs/filestore.hpp @@ -45,52 +45,52 @@ struct FileStoreHeader { template void FileStoreHeader::setVersion(uint16_t version) { - m_version = std::toLittleEndian(version); + m_version = std::bigEndianAdapt(version); } template uint16_t FileStoreHeader::getVersion() { - return std::littleEndianToNative(m_version); + return std::bigEndianAdapt(m_version); } template void FileStoreHeader::setFsType(uint16_t fsType) { - m_fsType = std::toLittleEndian(fsType); + m_fsType = std::bigEndianAdapt(fsType); } template uint16_t FileStoreHeader::getFsType() { - return std::littleEndianToNative(m_fsType); + return std::bigEndianAdapt(m_fsType); } template void FileStoreHeader::setSize(FsSize_t size) { - m_size = std::toLittleEndian(size); + m_size = std::bigEndianAdapt(size); } template FsSize_t FileStoreHeader::getSize() { - return std::littleEndianToNative(m_size); + return std::bigEndianAdapt(m_size); } template void FileStoreHeader::setMemUsed(FsSize_t memUsed) { - m_memUsed = std::toLittleEndian(memUsed); + m_memUsed = std::bigEndianAdapt(memUsed); } template FsSize_t FileStoreHeader::getMemUsed() { - return std::littleEndianToNative(m_memUsed); + return std::bigEndianAdapt(m_memUsed); } template void FileStoreHeader::setRootInode(FsSize_t rootInode) { - m_rootInode = std::toLittleEndian(rootInode); + m_rootInode = std::bigEndianAdapt(rootInode); } template FsSize_t FileStoreHeader::getRootInode() { - return std::littleEndianToNative(m_rootInode); + return std::bigEndianAdapt(m_rootInode); } template @@ -321,72 +321,72 @@ typename Header::FsSize_t FileStore
::Inode::size() { template void FileStore
::Inode::setDataLen(typename Header::FsSize_t dataLen) { - this->m_dataLen = std::toLittleEndian(dataLen); + this->m_dataLen = std::bigEndianAdapt(dataLen); } template typename Header::FsSize_t FileStore
::Inode::getDataLen() { - return std::littleEndianToNative(this->m_dataLen); + return std::bigEndianAdapt(this->m_dataLen); } template void FileStore
::Inode::setPrev(typename Header::FsSize_t prev) { - this->m_prev = std::toLittleEndian(prev); + this->m_prev = std::bigEndianAdapt(prev); } template typename Header::FsSize_t FileStore
::Inode::getPrev() { - return std::littleEndianToNative(this->m_prev); + return std::bigEndianAdapt(this->m_prev); } template void FileStore
::Inode::setNext(typename Header::FsSize_t next) { - this->m_next = std::toLittleEndian(next); + this->m_next = std::bigEndianAdapt(next); } template typename Header::FsSize_t FileStore
::Inode::getNext() { - return std::littleEndianToNative(this->m_next); + return std::bigEndianAdapt(this->m_next); } template void FileStore
::Inode::setId(InodeId_t id) { - this->m_id = std::toLittleEndian(id); + this->m_id = std::bigEndianAdapt(id); } template typename Header::InodeId_t FileStore
::Inode::getId() { - return std::littleEndianToNative(this->m_id); + return std::bigEndianAdapt(this->m_id); } template void FileStore
::Inode::setFileType(uint8_t fileType) { - this->m_fileType = std::toLittleEndian(fileType); + this->m_fileType = std::bigEndianAdapt(fileType); } template uint8_t FileStore
::Inode::getFileType() { - return std::littleEndianToNative(this->m_fileType); + return std::bigEndianAdapt(this->m_fileType); } template void FileStore
::Inode::setLeft(typename Header::FsSize_t left) { - this->m_left = std::toLittleEndian(left); + this->m_left = std::bigEndianAdapt(left); } template typename Header::FsSize_t FileStore
::Inode::getLeft() { - return std::littleEndianToNative(this->m_left); + return std::bigEndianAdapt(this->m_left); } template void FileStore
::Inode::setRight(typename Header::FsSize_t right) { - this->m_right = std::toLittleEndian(right); + this->m_right = std::bigEndianAdapt(right); } template typename Header::FsSize_t FileStore
::Inode::getRight() { - return std::littleEndianToNative(this->m_right); + return std::bigEndianAdapt(this->m_right); } template diff --git a/src/ox/std/byteswap.hpp b/src/ox/std/byteswap.hpp index 7ddd3a742..cbe5e8068 100644 --- a/src/ox/std/byteswap.hpp +++ b/src/ox/std/byteswap.hpp @@ -38,16 +38,16 @@ inline uint64_t byteSwap(uint64_t i) { /** - * Takes a little endian int and byte swaps if the platform is big endian. + * Takes an int and byte swaps if the platform is big endian. */ -inline uint8_t littleEndianToNative(uint8_t i) { +inline uint8_t bigEndianAdapt(uint8_t i) { return i; } /** - * Takes a little endian int and byte swaps if the platform is big endian. + * Takes an int and byte swaps if the platform is big endian. */ -inline uint16_t littleEndianToNative(uint16_t i) { +inline uint16_t bigEndianAdapt(uint16_t i) { #ifdef __BIG_ENDIAN__ return byteSwap(i); #else @@ -56,9 +56,9 @@ inline uint16_t littleEndianToNative(uint16_t i) { } /** - * Takes a little endian int and byte swaps if the platform is big endian. + * Takes an int and byte swaps if the platform is big endian. */ -inline uint32_t littleEndianToNative(uint32_t i) { +inline uint32_t bigEndianAdapt(uint32_t i) { #ifdef __BIG_ENDIAN__ return byteSwap(i); #else @@ -67,9 +67,9 @@ inline uint32_t littleEndianToNative(uint32_t i) { } /** - * Takes a little endian int and byte swaps if the platform is big endian. + * Takes an int and byte swaps if the platform is big endian. */ -inline uint64_t littleEndianToNative(uint64_t i) { +inline uint64_t bigEndianAdapt(uint64_t i) { #ifdef __BIG_ENDIAN__ return byteSwap(i); #else @@ -78,33 +78,5 @@ inline uint64_t littleEndianToNative(uint64_t i) { } -inline uint8_t toLittleEndian(uint8_t i) { - return i; -} - -inline uint16_t toLittleEndian(uint16_t i) { -#ifdef __BIG_ENDIAN__ - return byteSwap(i); -#else - return i; -#endif -} - -inline uint32_t toLittleEndian(uint32_t i) { -#ifdef __BIG_ENDIAN__ - return byteSwap(i); -#else - return i; -#endif -} - -inline uint64_t toLittleEndian(uint64_t i) { -#ifdef __BIG_ENDIAN__ - return byteSwap(i); -#else - return i; -#endif -} - } } diff --git a/src/ox/std/test/CMakeLists.txt b/src/ox/std/test/CMakeLists.txt index bdcefc14d..82f23987c 100644 --- a/src/ox/std/test/CMakeLists.txt +++ b/src/ox/std/test/CMakeLists.txt @@ -40,19 +40,19 @@ add_executable( target_link_libraries(ByteSwapTest OxStd) -add_test("Test\\ littleEndianToNative\\ 0x00ff" ByteSwapTest littleEndianToNative 0x00ff) -add_test("Test\\ littleEndianToNative\\ 0xff00" ByteSwapTest littleEndianToNative 0xff00) +add_test("Test\\ bigEndianAdapt\\ 0x00ff" ByteSwapTest bigEndianAdapt 0x00ff) +add_test("Test\\ bigEndianAdapt\\ 0xff00" ByteSwapTest bigEndianAdapt 0xff00) -add_test("Test\\ littleEndianToNative\\ 0x000000ff" ByteSwapTest littleEndianToNative 0x000000ff) -add_test("Test\\ littleEndianToNative\\ 0x0000ff00" ByteSwapTest littleEndianToNative 0x0000ff00) -add_test("Test\\ littleEndianToNative\\ 0x00ff0000" ByteSwapTest littleEndianToNative 0x00ff0000) -add_test("Test\\ littleEndianToNative\\ 0xff000000" ByteSwapTest littleEndianToNative 0xff000000) +add_test("Test\\ bigEndianAdapt\\ 0x000000ff" ByteSwapTest bigEndianAdapt 0x000000ff) +add_test("Test\\ bigEndianAdapt\\ 0x0000ff00" ByteSwapTest bigEndianAdapt 0x0000ff00) +add_test("Test\\ bigEndianAdapt\\ 0x00ff0000" ByteSwapTest bigEndianAdapt 0x00ff0000) +add_test("Test\\ bigEndianAdapt\\ 0xff000000" ByteSwapTest bigEndianAdapt 0xff000000) -add_test("Test\\ littleEndianToNative\\ 0x00000000000000ff" ByteSwapTest littleEndianToNative 0x00000000000000ff) -add_test("Test\\ littleEndianToNative\\ 0x000000000000ff00" ByteSwapTest littleEndianToNative 0x000000000000ff00) -add_test("Test\\ littleEndianToNative\\ 0x0000000000ff0000" ByteSwapTest littleEndianToNative 0x0000000000ff0000) -add_test("Test\\ littleEndianToNative\\ 0x00000000ff000000" ByteSwapTest littleEndianToNative 0x00000000ff000000) -add_test("Test\\ littleEndianToNative\\ 0x000000ff00000000" ByteSwapTest littleEndianToNative 0x000000ff00000000) -add_test("Test\\ littleEndianToNative\\ 0x0000ff0000000000" ByteSwapTest littleEndianToNative 0x0000ff0000000000) -add_test("Test\\ littleEndianToNative\\ 0x00ff000000000000" ByteSwapTest littleEndianToNative 0x00ff000000000000) -add_test("Test\\ littleEndianToNative\\ 0xff00000000000000" ByteSwapTest littleEndianToNative 0xff00000000000000) +add_test("Test\\ bigEndianAdapt\\ 0x00000000000000ff" ByteSwapTest bigEndianAdapt 0x00000000000000ff) +add_test("Test\\ bigEndianAdapt\\ 0x000000000000ff00" ByteSwapTest bigEndianAdapt 0x000000000000ff00) +add_test("Test\\ bigEndianAdapt\\ 0x0000000000ff0000" ByteSwapTest bigEndianAdapt 0x0000000000ff0000) +add_test("Test\\ bigEndianAdapt\\ 0x00000000ff000000" ByteSwapTest bigEndianAdapt 0x00000000ff000000) +add_test("Test\\ bigEndianAdapt\\ 0x000000ff00000000" ByteSwapTest bigEndianAdapt 0x000000ff00000000) +add_test("Test\\ bigEndianAdapt\\ 0x0000ff0000000000" ByteSwapTest bigEndianAdapt 0x0000ff0000000000) +add_test("Test\\ bigEndianAdapt\\ 0x00ff000000000000" ByteSwapTest bigEndianAdapt 0x00ff000000000000) +add_test("Test\\ bigEndianAdapt\\ 0xff00000000000000" ByteSwapTest bigEndianAdapt 0xff00000000000000) diff --git a/src/ox/std/test/byteswap_test.cpp b/src/ox/std/test/byteswap_test.cpp index 9f6cb8573..fc679c800 100644 --- a/src/ox/std/test/byteswap_test.cpp +++ b/src/ox/std/test/byteswap_test.cpp @@ -14,16 +14,16 @@ using namespace std; using namespace ox::std; template -int testLittleEndianToNative(string str) { +int testBigEndianAdapt(string str) { auto i = (T) stoul(str, nullptr, 16); - return !(littleEndianToNative(littleEndianToNative(i)) == i); + return !(bigEndianAdapt(bigEndianAdapt(i)) == i); } map> tests = { { - { "littleEndianToNative", testLittleEndianToNative }, - { "littleEndianToNative", testLittleEndianToNative }, - { "littleEndianToNative", testLittleEndianToNative }, + { "bigEndianAdapt", testBigEndianAdapt }, + { "bigEndianAdapt", testBigEndianAdapt }, + { "bigEndianAdapt", testBigEndianAdapt }, }, };