X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FLoader.cpp;h=2403044ad20fb819a23fafc0b43c2ded125a317c;hb=8c8061a4f8b88410d6d93c039afe6affc4b69cf2;hp=a1183f790f2b0b98af6bc90dd0c9c092e7413380;hpb=0f30d8254ff8b9e63795960ec031577cf68fbf95;p=l2e.git diff --git a/src/loader/Loader.cpp b/src/loader/Loader.cpp index a1183f7..2403044 100644 --- a/src/loader/Loader.cpp +++ b/src/loader/Loader.cpp @@ -1,10 +1,3 @@ -/* - * Loader.cpp - * - * Created on: Sep 13, 2012 - * Author: holy - */ - #include "Loader.h" #include @@ -19,14 +12,10 @@ using std::vector; namespace loader { Loader::~Loader() { - for(map::const_iterator i(objectFiles.begin()), end(objectFiles.end()); i != end; ++i) { - if (i->second.surfaceCount) { - for (int j(0); j < i->second.surfaceCount; ++j) { - SDL_FreeSurface(i->second.surfaces[j]); - } - delete[] i->second.surfaces; - } - delete[] i->second.allocPtr; + for(map::const_iterator + i(objectFiles.begin()), end(objectFiles.end()); + i != end; ++i) { + delete[] i->second; } } @@ -37,73 +26,59 @@ void Loader::Load(const std::string &filePath) { int fileLength(file.tellg()); int length(fileLength + 15); - LoadedObjectFile &object(objectFiles[filePath]); - object.allocPtr = new char[length]; + char *block = new char[length]; + ObjectFileHeader *header = + reinterpret_cast(block); - if (reinterpret_cast(object.allocPtr) % 16) { - object.fileHeader = reinterpret_cast(object.allocPtr + (16 - (reinterpret_cast(object.allocPtr) % 16))); - } else { - object.fileHeader = reinterpret_cast(object.allocPtr); + unsigned long padding = + reinterpret_cast(block) % 16; + if (padding) { + header = reinterpret_cast( + block + (16 - padding)); } file.seekg(0, std::ios::beg); - file.read(reinterpret_cast(object.fileHeader), fileLength); - - if (object.fileHeader->versionId != FORMAT_ID) { - throw std::runtime_error("mismatched version id of file " + filePath); + file.read(reinterpret_cast(header), fileLength); + + try { + header->IntegrityCheck(fileLength); + + LoadExports(header->ident, + header->ExportsBegin(), + header->ExportsEnd()); + LoadExternals(header->ident, + header->ExternalsBegin(), + header->ExternalsEnd()); + LoadObjects(header->ident, + header->ObjectsBegin(), + header->ObjectsEnd()); + } catch (...) { + delete[] block; + throw; } - - LoadHeader(object); - LoadExports(object); - LoadImages(object); - LinkObjects(object); - LinkExternals(object); + objectFiles.insert(make_pair(filePath, block)); } -void Loader::LoadHeader(LoadedObjectFile &object) { - ObjectFileHeader *header(object.fileHeader); - char *charHeader(reinterpret_cast(header)); - - object.typeOffsetsBegin = reinterpret_cast(charHeader + sizeof(ObjectFileHeader)); - for (object.typeOffsetsEnd = object.typeOffsetsBegin; object.typeOffsetsEnd->begin != 0 && object.typeOffsetsEnd->end != 0; ++object.typeOffsetsEnd); - - object.exportsBegin = reinterpret_cast(charHeader + header->exportsBegin); - object.exportsEnd = reinterpret_cast(charHeader + header->exportsEnd); - - object.externalsBegin = reinterpret_cast(charHeader + header->externalsBegin); - object.externalsEnd = reinterpret_cast(charHeader + header->externalsEnd); - - object.exportStringsBegin = charHeader + header->exportStringsBegin; - object.exportStringsEnd = charHeader + header->exportStringsEnd; - - object.externalStringsBegin = charHeader + header->externalStringsBegin; - object.externalStringsEnd = charHeader + header->externalStringsEnd; - - object.imagesBegin = charHeader + header->imagesBegin; - object.imagesEnd = charHeader + header->imagesEnd; - - object.objectsBegin = charHeader + header->objectsBegin; - object.objectsEnd = charHeader + header->objectsEnd; -} - -void Loader::LoadExports(LoadedObjectFile &object) { - for (Export *i(object.exportsBegin); i != object.exportsEnd; ++i) { - string identifier(object.At(i->nameOffset)); +void Loader::LoadExports(char *src, Export *begin, Export *end) { + for (Export *i = begin; i < end; ++i) { + string identifier(src + i->nameOffset); LoadedExport &exp(exports[identifier]); exp.typeId = i->typeId; - exp.location = object.At(i->dataOffset); + exp.location = src + i->dataOffset; } } -void Loader::LinkExternals(LoadedObjectFile &object) { - for (External *i(object.externalsBegin); i != object.externalsEnd; ++i) { - string identifier(object.At(i->nameOffset)); - map::const_iterator exp(exports.find(identifier)); +void Loader::LoadExternals(char *src, External *begin, External *end) { + for (External *i = begin; i < end; ++i) { + string identifier(src + i->nameOffset); + map::const_iterator + exp(exports.find(identifier)); if (exp == exports.end()) { - throw std::runtime_error("undefined reference to " + identifier); + throw std::runtime_error("undefined reference to " + + identifier); } const TypeDescription &td(TypeDescription::Get(exp->second.typeId)); - char *dest(object.At(i->referenceOffset)); + char *dest = src + i->referenceOffset; if (i->inlined) { std::memcpy(dest, exp->second.location, td.Size()); } else { @@ -112,50 +87,28 @@ void Loader::LinkExternals(LoadedObjectFile &object) { } } -void Loader::LoadImages(LoadedObjectFile &object) { - for (char *i(object.imagesBegin); i != object.imagesEnd;) { - ImageProperties *props(reinterpret_cast(i)); - i += sizeof(ImageProperties) + props->width * props->height * (props->depth / CHAR_BIT + (props->depth % CHAR_BIT ? 1 : 0)); - ++object.surfaceCount; - } - if (object.surfaceCount == 0) return; - - object.surfaces = new SDL_Surface *[object.surfaceCount]; - int index(0); - for (char *i(object.imagesBegin); i != object.imagesEnd;) { - ImageProperties *props(reinterpret_cast(i)); - i += sizeof(ImageProperties); - SDL_Surface *image(SDL_CreateRGBSurfaceFrom( - i, - props->width, - props->height, - props->depth, - props->pitch, - props->rmask, - props->gmask, - props->bmask, - props->amask)); - i += props->width * props->height * (props->depth / CHAR_BIT + (props->depth % CHAR_BIT ? 1 : 0)); - object.surfaces[index] = image; - ++index; - } -} - -void Loader::LinkObjects(LoadedObjectFile &object) { - for (TypeOffset *type(object.typeOffsetsBegin); type != object.typeOffsetsEnd; ++type) { - const TypeDescription &td(TypeDescription::Get(type->typeId)); - for (int offset(type->begin); offset != type->end; offset += td.Size()) { - LinkObject(object, td, object.At(offset)); +void Loader::LoadObjects(char *src, Object *begin, Object *end) { + for (Object *i = begin; i < end; i = i->Next()) { + const TypeDescription &td = + TypeDescription::Get(i->typeId); + if (td.NeedsLinking()) { + LoadObject(src, i->RawObject(), td); } } } -void Loader::LinkObject(LoadedObjectFile &file, const TypeDescription &td, char *object) { - for (TypeDescription::FieldIterator i(td.FieldsBegin()), end(td.FieldsEnd()); i != end; ++i) { - const FieldDescription &field(i->second); - if (!field.IsReferenced()) continue; +void Loader::LoadObject(char *src, char *object, const TypeDescription &td) { + for (TypeDescription::FieldIterator + i(td.FieldsBegin()), end(td.FieldsEnd()); + i != end; ++i) { + const FieldDescription &field = i->second; + if (!field.IsReferenced() && !field.IsAggregate()) { + continue; + } char **dest(reinterpret_cast(object + field.Offset())); - *dest = file.At(*reinterpret_cast(*dest)); + if (*dest) { + *dest = src + *reinterpret_cast(dest); + } } }