ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert more defines to static constexpr.

This commit is contained in:
Stephen Anthony 2022-12-01 19:04:01 -03:30
parent a37c76071a
commit 58382db331
5 changed files with 71 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/FSNodeZIP.cxx
View File

@ -36,11 +36,11 @@ FSNodeZIP::FSNodeZIP(const string& p)
_zipFile = p.substr(0, pos+4);
// Expand '~' to the users 'home' directory
if (_zipFile[0] == '~')
if(_zipFile[0] == '~')
{
#if defined(BSPF_UNIX) || defined(BSPF_MACOS)
const char* const home = std::getenv("HOME"); // NOLINT (not thread safe)
if (home != nullptr)
if(home != nullptr)
_zipFile.replace(0, 1, home);
#elif defined(BSPF_WINDOWS)
_zipFile.replace(0, 1, HomeFinder::getHomePath());
@ -267,12 +267,24 @@ size_t FSNodeZIP::write(const stringstream& buffer) const
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AbstractFSNodePtr FSNodeZIP::getParent() const
{
cerr << "zip : " << _zipFile << endl
<< "vp : " << _virtualPath << endl
<< "path: " << _path << endl
<< "name: " << _name << endl;
if(_virtualPath.empty())
{
if(_realNode)
cerr << "parent: " << _realNode->getParent()->getPath();
else
cerr << "parent: nullptr";
cerr << "\n\n\n";
return _realNode ? _realNode->getParent() : nullptr;
}
const char* const start = _path.c_str();
const char* const end = lastPathComponent(_path);
cerr << "new zip: " << string(start, end - start - 1) << "\n\n\n";
return make_unique<FSNodeZIP>(string(start, end - start - 1));
}

105
src/common/ZipHandler.cxx
View File

@ -51,14 +51,7 @@ void ZipHandler::open(const string& filename)
// Open the file and initialize it
if(!ptr->open())
throw runtime_error(errorMessage(ZipError::FILE_ERROR));
try
{
ptr->initialize();
}
catch(...)
{
throw;
}
ptr->initialize();
myZip = std::move(ptr);
@ -100,7 +93,7 @@ std::tuple<string, size_t> ZipHandler::next()
{
if(hasNext())
{
const ZipHeader* header = myZip->nextFile();
const ZipHeader* const header = myZip->nextFile();
if(!header)
throw runtime_error(errorMessage(ZipError::FILE_CORRUPT));
else if(header->uncompressedLength == 0)
@ -207,8 +200,8 @@ void ZipHandler::addToCache()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ZipHandler::ZipFile::ZipFile(const string& filename)
: myFilename(filename),
myBuffer(make_unique<uInt8[]>(DECOMPRESS_BUFSIZE))
: myFilename{filename},
myBuffer{make_unique<uInt8[]>(DECOMPRESS_BUFSIZE)}
{
std::fill(myBuffer.get(), myBuffer.get() + DECOMPRESS_BUFSIZE, 0);
}
@ -233,33 +226,26 @@ bool ZipHandler::ZipFile::open()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ZipHandler::ZipFile::initialize()
{
try
{
// Read ecd data
readEcd();
// Read ecd data
readEcd();
// Verify that we can work with this zipfile (no disk spanning allowed)
if(myEcd.diskNumber != myEcd.cdStartDiskNumber ||
myEcd.cdDiskEntries != myEcd.cdTotalEntries)
throw runtime_error(errorMessage(ZipError::UNSUPPORTED));
// Verify that we can work with this zipfile (no disk spanning allowed)
if(myEcd.diskNumber != myEcd.cdStartDiskNumber ||
myEcd.cdDiskEntries != myEcd.cdTotalEntries)
throw runtime_error(errorMessage(ZipError::UNSUPPORTED));
// Allocate memory for the central directory
myCd = make_unique<uInt8[]>(myEcd.cdSize + 1);
if(myCd == nullptr)
throw runtime_error(errorMessage(ZipError::OUT_OF_MEMORY));
// Allocate memory for the central directory
myCd = make_unique<uInt8[]>(myEcd.cdSize + 1);
if(myCd == nullptr)
throw runtime_error(errorMessage(ZipError::OUT_OF_MEMORY));
// Read the central directory
uInt64 read_length = 0;
const bool success = readStream(myCd, myEcd.cdStartDiskOffset, myEcd.cdSize, read_length);
if(!success)
throw runtime_error(errorMessage(ZipError::FILE_ERROR));
else if(read_length != myEcd.cdSize)
throw runtime_error(errorMessage(ZipError::FILE_TRUNCATED));
}
catch(...)
{
throw;
}
// Read the central directory
uInt64 read_length = 0;
const bool success = readStream(myCd, myEcd.cdStartDiskOffset, myEcd.cdSize, read_length);
if(!success)
throw runtime_error(errorMessage(ZipError::FILE_ERROR));
else if(read_length != myEcd.cdSize)
throw runtime_error(errorMessage(ZipError::FILE_TRUNCATED));
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -306,7 +292,7 @@ void ZipHandler::ZipFile::readEcd()
if(offset >= 0)
{
// Extract ECD info
EcdReader const reader(buffer.get() + offset);
const EcdReader reader(buffer.get() + offset);
myEcd.diskNumber = reader.thisDiskNo();
myEcd.cdStartDiskNumber = reader.dirStartDisk();
myEcd.cdDiskEntries = reader.dirDiskEntries();
@ -348,7 +334,7 @@ const ZipHandler::ZipHeader* ZipHandler::ZipFile::nextFile()
{
// Make sure we have enough data
// If we're at or past the end, we're done
CentralDirEntryReader const reader(myCd.get() + myCdPos);
const CentralDirEntryReader reader(myCd.get() + myCdPos);
if(!reader.signatureCorrect() || ((myCdPos + reader.totalLength()) > myEcd.cdSize))
return nullptr;
@ -380,33 +366,26 @@ void ZipHandler::ZipFile::decompress(const ByteBuffer& out, uInt64 length)
if(myHeader.startDiskNumber != myEcd.diskNumber)
throw runtime_error(errorMessage(ZipError::UNSUPPORTED));
try
// Get the compressed data offset
const uInt64 offset = getCompressedDataOffset();
// Handle compression types
switch(myHeader.compression)
{
// Get the compressed data offset
const uInt64 offset = getCompressedDataOffset();
case 0:
decompressDataType0(offset, out, length);
break;
// Handle compression types
switch(myHeader.compression)
{
case 0:
decompressDataType0(offset, out, length);
break;
case 8:
decompressDataType8(offset, out, length);
break;
case 8:
decompressDataType8(offset, out, length);
break;
case 14:
// FIXME - LZMA format not yet supported
throw runtime_error(errorMessage(ZipError::LZMA_UNSUPPORTED));
case 14:
// FIXME - LZMA format not yet supported
throw runtime_error(errorMessage(ZipError::LZMA_UNSUPPORTED));
default:
throw runtime_error(errorMessage(ZipError::UNSUPPORTED));
}
}
catch(...)
{
throw;
default:
throw runtime_error(errorMessage(ZipError::UNSUPPORTED));
}
}
@ -414,7 +393,7 @@ void ZipHandler::ZipFile::decompress(const ByteBuffer& out, uInt64 length)
uInt64 ZipHandler::ZipFile::getCompressedDataOffset()
{
// Don't support a number of features
GeneralFlagReader const flags(myHeader.bitFlag);
const GeneralFlagReader flags(myHeader.bitFlag);
if(myHeader.startDiskNumber != myEcd.diskNumber ||
myHeader.versionNeeded > 63 || flags.patchData() ||
flags.encrypted() || flags.strongEncryption())
@ -462,7 +441,7 @@ void ZipHandler::ZipFile::decompressDataType8(
stream.opaque = Z_NULL;
stream.avail_in = 0;
stream.next_out = reinterpret_cast<Bytef *>(out.get());
stream.avail_out = static_cast<uInt32>(length); // TODO - use zip64
stream.avail_out = static_cast<uInt32>(length);
// Initialize the decompressor
int zerr = inflateInit2(&stream, -MAX_WBITS);
@ -492,7 +471,7 @@ void ZipHandler::ZipFile::decompressDataType8(
// Fill out the input data
stream.next_in = myBuffer.get();
stream.avail_in = static_cast<uInt32>(read_length); // TODO - use zip64
stream.avail_in = static_cast<uInt32>(read_length);
input_remaining -= read_length;
// Add a dummy byte at end of compressed data

2
src/common/ZipHandler.hxx
View File

@ -300,7 +300,7 @@ class ZipHandler
private:
static constexpr size_t DECOMPRESS_BUFSIZE = 128_KB;
static constexpr size_t CACHE_SIZE = 16; // number of open files to cache
static constexpr size_t CACHE_SIZE = 64; // number of open files to cache
ZipFilePtr myZip;
std::array<ZipFilePtr, CACHE_SIZE> myZipCache;

2
src/emucore/Thumbulator.cxx
View File

@ -274,7 +274,7 @@ void Thumbulator::dump_counters() const
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Thumbulator::dump_regs()
{
for (int cnt = 0; cnt <= 12; cnt++)
for(int cnt = 0; cnt <= 12; ++cnt)
{
statusMsg << "R" << std::dec << std::setfill(' ') << std::setw(2) << std::left << cnt
<< "= " << Base::HEX8 << reg_norm[cnt];

25
src/emucore/Thumbulator.hxx
View File

@ -34,17 +34,6 @@ class Cartridge;
#define UNSAFE_OPTIMIZATIONS
#endif
#define ROMADDMASK 0x7FFFF
#define RAMADDMASK 0x7FFF
#define ROMSIZE (ROMADDMASK+1) // 512KB
#define RAMSIZE (RAMADDMASK+1) // 32KB
#define CPSR_N (1u<<31)
#define CPSR_Z (1u<<30)
#define CPSR_C (1u<<29)
#define CPSR_V (1u<<28)
#ifdef DEBUGGER_SUPPORT
#define THUMB_CYCLE_COUNT
#define COUNT_OPS
@ -335,7 +324,19 @@ class Thumbulator
ConfigureFor configuration;
Cartridge* myCartridge;
Cartridge* myCartridge{nullptr};
static constexpr uInt32
ROMADDMASK = 0x7FFFF,
RAMADDMASK = 0x7FFF,
ROMSIZE = ROMADDMASK + 1, // 512KB
RAMSIZE = RAMADDMASK + 1, // 32KB
CPSR_N = 1u << 31,
CPSR_Z = 1u << 30,
CPSR_C = 1u << 29,
CPSR_V = 1u << 28;
private:
// Following constructors and assignment operators not supported