diff options
Diffstat (limited to 'lib/binarytools')
| -rw-r--r-- | lib/binarytools/BinaryReader.cpp | 22 | ||||
| -rw-r--r-- | lib/binarytools/BinaryReader.h | 10 | ||||
| -rw-r--r-- | lib/binarytools/BinaryWriter.cpp | 18 | ||||
| -rw-r--r-- | lib/binarytools/BinaryWriter.h | 8 | ||||
| -rw-r--r-- | lib/binarytools/endianness.h | 9 |
5 files changed, 32 insertions, 35 deletions
diff --git a/lib/binarytools/BinaryReader.cpp b/lib/binarytools/BinaryReader.cpp index 4afeb17..622ed21 100644 --- a/lib/binarytools/BinaryReader.cpp +++ b/lib/binarytools/BinaryReader.cpp @@ -24,11 +24,11 @@ void LUS::BinaryReader::Close() { mStream->Close(); } -void LUS::BinaryReader::SetEndianness(Endianness endianness) { +void LUS::BinaryReader::SetEndianness(Torch::Endianness endianness) { this->mEndianness = endianness; } -LUS::Endianness LUS::BinaryReader::GetEndianness() const { +Torch::Endianness LUS::BinaryReader::GetEndianness() const { return mEndianness; } @@ -59,7 +59,7 @@ int8_t LUS::BinaryReader::ReadInt8() { int16_t LUS::BinaryReader::ReadInt16() { int16_t result = 0; mStream->Read((char*)&result, sizeof(int16_t)); - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { result = BSWAP16(result); } return result; @@ -70,7 +70,7 @@ int32_t LUS::BinaryReader::ReadInt32() { mStream->Read((char*)&result, sizeof(int32_t)); - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { result = BSWAP32(result); } @@ -86,7 +86,7 @@ uint16_t LUS::BinaryReader::ReadUInt16() { mStream->Read((char*)&result, sizeof(uint16_t)); - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { result = BSWAP16(result); } @@ -98,7 +98,7 @@ uint32_t LUS::BinaryReader::ReadUInt32() { mStream->Read((char*)&result, sizeof(uint32_t)); - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { result = BSWAP32(result); } @@ -110,7 +110,7 @@ uint64_t LUS::BinaryReader::ReadUInt64() { mStream->Read((char*)&result, sizeof(uint64_t)); - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { result = BSWAP64(result); } @@ -121,7 +121,7 @@ unsigned short LUS::BinaryReader::ReadUShort() { unsigned short result = 0; mStream->Read((char*)&result, sizeof(unsigned short)); - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { result = BSWAP16(result); } @@ -132,7 +132,7 @@ short LUS::BinaryReader::ReadShort() { short result = 0; mStream->Read((char*)&result, sizeof(short)); - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { result = BSWAP16(result); } @@ -144,7 +144,7 @@ float LUS::BinaryReader::ReadFloat() { mStream->Read((char*)&result, sizeof(float)); - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { float tmp; char* dst = (char*)&tmp; char* src = (char*)&result; @@ -167,7 +167,7 @@ double LUS::BinaryReader::ReadDouble() { mStream->Read((char*)&result, sizeof(double)); - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { double tmp; char* dst = (char*)&tmp; char* src = (char*)&result; diff --git a/lib/binarytools/BinaryReader.h b/lib/binarytools/BinaryReader.h index a98742f..304455d 100644 --- a/lib/binarytools/BinaryReader.h +++ b/lib/binarytools/BinaryReader.h @@ -3,8 +3,8 @@ #include <string> #include <memory> #include <vector> -#include "endianness.h" -#include "Stream.h" +#include "lib/binarytools/endianness.h" +#include "lib/binarytools/Stream.h" class BinaryReader; @@ -19,8 +19,8 @@ class BinaryReader { void Close(); - void SetEndianness(Endianness endianness); - Endianness GetEndianness() const; + void SetEndianness(Torch::Endianness endianness); + Torch::Endianness GetEndianness() const; void Seek(int32_t offset, SeekOffsetType seekType); uint32_t GetBaseAddress(); @@ -47,6 +47,6 @@ class BinaryReader { protected: std::shared_ptr<Stream> mStream; - Endianness mEndianness = Endianness::Native; + Torch::Endianness mEndianness = Torch::Endianness::Native; }; } // namespace LUS diff --git a/lib/binarytools/BinaryWriter.cpp b/lib/binarytools/BinaryWriter.cpp index 4d48a0e..9aa5d6f 100644 --- a/lib/binarytools/BinaryWriter.cpp +++ b/lib/binarytools/BinaryWriter.cpp @@ -14,7 +14,7 @@ LUS::BinaryWriter::BinaryWriter(std::shared_ptr<Stream> nStream) { mStream = nStream; } -void LUS::BinaryWriter::SetEndianness(Endianness endianness) { +void LUS::BinaryWriter::SetEndianness(Torch::Endianness endianness) { this->mEndianness = endianness; } @@ -47,7 +47,7 @@ void LUS::BinaryWriter::Write(uint8_t value) { } void LUS::BinaryWriter::Write(int16_t value) { - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { value = BSWAP16(value); } @@ -55,7 +55,7 @@ void LUS::BinaryWriter::Write(int16_t value) { } void LUS::BinaryWriter::Write(uint16_t value) { - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { value = BSWAP16(value); } @@ -63,7 +63,7 @@ void LUS::BinaryWriter::Write(uint16_t value) { } void LUS::BinaryWriter::Write(int32_t value) { - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { value = BSWAP32(value); } @@ -76,7 +76,7 @@ void LUS::BinaryWriter::Write(int32_t valueA, int32_t valueB) { } void LUS::BinaryWriter::Write(uint32_t value) { - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { value = BSWAP32(value); } @@ -84,7 +84,7 @@ void LUS::BinaryWriter::Write(uint32_t value) { } void LUS::BinaryWriter::Write(int64_t value) { - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { value = BSWAP64(value); } @@ -92,7 +92,7 @@ void LUS::BinaryWriter::Write(int64_t value) { } void LUS::BinaryWriter::Write(uint64_t value) { - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { value = BSWAP64(value); } @@ -100,7 +100,7 @@ void LUS::BinaryWriter::Write(uint64_t value) { } void LUS::BinaryWriter::Write(float value) { - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { float tmp; char* dst = (char*)&tmp; char* src = (char*)&value; @@ -115,7 +115,7 @@ void LUS::BinaryWriter::Write(float value) { } void LUS::BinaryWriter::Write(double value) { - if (mEndianness != Endianness::Native) { + if (mEndianness != Torch::Endianness::Native) { double tmp; char* dst = (char*)&tmp; char* src = (char*)&value; diff --git a/lib/binarytools/BinaryWriter.h b/lib/binarytools/BinaryWriter.h index 28fdd09..089a7f5 100644 --- a/lib/binarytools/BinaryWriter.h +++ b/lib/binarytools/BinaryWriter.h @@ -4,8 +4,8 @@ #include <memory> #include <string> #include <vector> -#include "endianness.h" -#include "Stream.h" +#include "lib/binarytools/endianness.h" +#include "lib/binarytools/Stream.h" namespace LUS { class BinaryWriter { @@ -14,7 +14,7 @@ class BinaryWriter { BinaryWriter(Stream* nStream); BinaryWriter(std::shared_ptr<Stream> nStream); - void SetEndianness(Endianness endianness); + void SetEndianness(Torch::Endianness endianness); std::shared_ptr<Stream> GetStream(); uint64_t GetBaseAddress(); @@ -43,7 +43,7 @@ class BinaryWriter { protected: std::shared_ptr<Stream> mStream; - Endianness mEndianness = Endianness::Native; + Torch::Endianness mEndianness = Torch::Endianness::Native; }; } // namespace LUS diff --git a/lib/binarytools/endianness.h b/lib/binarytools/endianness.h index d7a9baa..3a967bb 100644 --- a/lib/binarytools/endianness.h +++ b/lib/binarytools/endianness.h @@ -1,8 +1,7 @@ -#ifndef ENDIANESS_H -#define ENDIANESS_H +#pragma once #ifdef __cplusplus -namespace LUS { +namespace Torch { enum class Endianness { Little = 0, Big = 1, @@ -83,6 +82,4 @@ enum class Endianness { #define LE16SWAP_CONST(x) (x) #define LE32SWAP_CONST(x) (x) #define LE64SWAP_CONST(x) (x) -#endif - -#endif +#endif
\ No newline at end of file |
