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

added buffer-copying subclass to MemoryReader/Writer

Browse Source
This commit is contained in:
Jack Andersen
2015-07-07 20:03:08 -10:00
parent 8a397a1622
commit ec38ba088e
19 changed files with 159 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Athena/MCFileReader.cpp
View File

@@ -39,7 +39,7 @@ MCFile* MCFileReader::readFile()
base::m_position = 0;
if (isScrambled)
MCFile::unscramble(base::m_data, base::m_length);
MCFile::unscramble(base::m_dataCopy.get(), base::m_length);
return nullptr;
}

49
src/Athena/MemoryReader.cpp
View File

@@ -19,7 +19,8 @@ namespace Athena
namespace io
{
MemoryReader::MemoryReader(const atUint8* data, atUint64 length)
: m_length(length),
: m_data(data),
m_length(length),
m_position(0)
{
if (!data)
@@ -27,24 +28,20 @@ MemoryReader::MemoryReader(const atUint8* data, atUint64 length)
if (length == 0)
THROW_INVALID_OPERATION_EXCEPTION("length cannot be 0");
m_data = new atUint8[m_length];
memcpy(m_data, data, m_length);
}
MemoryReader::MemoryReader(const std::string& filename)
: m_data(NULL),
m_length(0),
m_filepath(filename),
m_position(0)
MemoryCopyReader::MemoryCopyReader(const atUint8* data, atUint64 length)
: MemoryReader(data, length)
{
loadData();
}
if (!data)
THROW_INVALID_DATA_EXCEPTION("data cannot be NULL");
MemoryReader::~MemoryReader()
{
delete[] m_data;
m_data = NULL;
if (length == 0)
THROW_INVALID_OPERATION_EXCEPTION("length cannot be 0");
m_dataCopy.reset(new atUint8[m_length]);
m_data = m_dataCopy.get();
memcpy(m_dataCopy.get(), data, m_length);
}
void MemoryReader::seek(atInt64 position, SeekOrigin origin)
@@ -76,14 +73,20 @@ void MemoryReader::seek(atInt64 position, SeekOrigin origin)
void MemoryReader::setData(const atUint8* data, atUint64 length)
{
if (m_data)
delete[] m_data;
m_data = (atUint8*)data;
m_length = length;
m_position = 0;
}
void MemoryCopyReader::setData(const atUint8* data, atUint64 length)
{
m_dataCopy.reset(new atUint8[length]);
m_data = m_dataCopy.get();
memcpy(m_dataCopy.get(), data, length);
m_length = length;
m_position = 0;
}
atUint8* MemoryReader::data() const
{
atUint8* ret = new atUint8[m_length];
@@ -94,9 +97,6 @@ atUint8* MemoryReader::data() const
atUint64 MemoryReader::readUBytesToBuf(void* buf, atUint64 length)
{
if (!m_data)
loadData();
if (m_position + length > m_length)
THROW_IO_EXCEPTION_RETURN(0, "Position %0.8X outside stream bounds ", m_position);
@@ -105,7 +105,7 @@ atUint64 MemoryReader::readUBytesToBuf(void* buf, atUint64 length)
return length;
}
void MemoryReader::loadData()
void MemoryCopyReader::loadData()
{
FILE* in;
atUint64 length;
@@ -117,7 +117,8 @@ void MemoryReader::loadData()
rewind(in);
length = utility::fileSize(m_filepath);
m_data = new atUint8[length];
m_dataCopy.reset(new atUint8[length]);
m_data = m_dataCopy.get();
atUint64 done = 0;
atUint64 blocksize = BLOCKSZ;
@@ -127,7 +128,7 @@ void MemoryReader::loadData()
if (blocksize > length - done)
blocksize = length - done;
atInt64 ret = fread(m_data + done, 1, blocksize, in);
atInt64 ret = fread(m_dataCopy.get() + done, 1, blocksize, in);
if (ret < 0)
THROW_IO_EXCEPTION("Error reading data from disk");

52
src/Athena/MemoryWriter.cpp
View File

@@ -23,18 +23,33 @@ MemoryWriter::MemoryWriter(atUint8* data, atUint64 length)
m_length(length),
m_position(0)
{
if (!m_data && m_length > 0)
m_data = new atUint8[m_length];
if (!data)
THROW_INVALID_DATA_EXCEPTION("data cannot be NULL");
if (length == 0)
THROW_INVALID_OPERATION_EXCEPTION("length cannot be 0");
}
MemoryWriter::MemoryWriter(const std::string& filename, std::function<void(int)> progressFun)
: m_length(0),
m_filepath(filename),
m_position(0)
MemoryCopyWriter::MemoryCopyWriter(atUint8* data, atUint64 length)
: MemoryWriter(data, length)
{
if (length == 0)
THROW_INVALID_OPERATION_EXCEPTION("length cannot be 0");
m_dataCopy.reset(new atUint8[length]);
m_data = m_dataCopy.get();
if (data)
memcpy(m_data, data, length);
}
MemoryCopyWriter::MemoryCopyWriter(const std::string& filename)
: MemoryWriter(NULL, 0)
{
m_filepath = filename;
m_length = 0x10;
m_position = 0;
m_data = new atUint8[m_length];
m_dataCopy.reset(new atUint8[m_length]);
m_data = m_dataCopy.get();
if (!m_data)
THROW_IO_EXCEPTION("Could not allocate memory!");
@@ -42,12 +57,6 @@ MemoryWriter::MemoryWriter(const std::string& filename, std::function<void(int)>
memset(m_data, 0, m_length);
}
MemoryWriter::~MemoryWriter()
{
delete[] m_data;
m_data = nullptr;
}
void MemoryWriter::seek(atInt64 position, SeekOrigin origin)
{
switch (origin)
@@ -84,16 +93,22 @@ void MemoryWriter::seek(atInt64 position, SeekOrigin origin)
}
}
void MemoryWriter::setData(const atUint8* data, atUint64 length)
void MemoryWriter::setData(atUint8* data, atUint64 length)
{
if (m_data)
delete[] m_data;
m_data = (atUint8*)data;
m_length = length;
m_position = 0;
}
void MemoryCopyWriter::setData(const atUint8* data, atUint64 length)
{
m_dataCopy.reset(new atUint8[length]);
m_data = m_dataCopy.get();
memcpy(m_data, data, length);
m_length = length;
m_position = 0;
}
atUint8* MemoryWriter::data() const
{
atUint8* ret = new atUint8[m_length];
@@ -105,9 +120,6 @@ atUint8* MemoryWriter::data() const
void MemoryWriter::save(const std::string& filename)
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for writing");
if (filename.empty() && m_filepath.empty())
THROW_INVALID_OPERATION_EXCEPTION("No file specified, cannot save.");

2
src/LZ77/LZType10.cpp
View File

@@ -16,7 +16,7 @@ atUint32 LZType10::compress(const atUint8* src, atUint8** dstBuf, atUint32 srcLe
atUint32 encodeSize = (srcLength << 8) | (0x10);
encodeSize = Athena::utility::LittleUint32(encodeSize); //File size needs to be written as little endian always
Athena::io::MemoryWriter outbuf("tmp");
Athena::io::MemoryCopyWriter outbuf("tmp");
outbuf.writeUint32(encodeSize);
atUint8* ptrStart = (atUint8*)src;

2
src/LZ77/LZType11.cpp
View File

@@ -13,7 +13,7 @@ LZType11::LZType11(atInt32 minimumOffset, atInt32 slidingWindow, atInt32 minimum
atUint32 LZType11::compress(const atUint8* src, atUint8** dst, atUint32 srcLength)
{
Athena::io::MemoryWriter outbuff("tmp");
Athena::io::MemoryCopyWriter outbuff("tmp");
if (srcLength > 0xFFFFFF) // If length is greater than 24 bits or 16 Megs
{