X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FBytecode%2FReader%2FReader.cpp;h=0b2e935ed4e56bf7f741fda6253e95f1d5688c74;hb=79df7c0aaa18129e55968c8783ef8346807bd4af;hp=e7e2b488c935c88afa370e37b3187823e17bbe66;hpb=3d3f289eac5e85f65e55ca2798d0f0f1b7218163;p=oota-llvm.git diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp index e7e2b488c93..0b2e935ed4e 100644 --- a/lib/Bytecode/Reader/Reader.cpp +++ b/lib/Bytecode/Reader/Reader.cpp @@ -1,4 +1,4 @@ -//===- Reader.cpp - Code to read bytecode files -----------------------------=== +//===- Reader.cpp - Code to read bytecode files ---------------------------===// // // This library implements the functionality defined in llvm/Bytecode/Reader.h // @@ -8,32 +8,44 @@ // TODO: Make error message outputs be configurable depending on an option? // TODO: Allow passing in an option to ignore the symbol table // -//===------------------------------------------------------------------------=== +//===----------------------------------------------------------------------===// +#include "ReaderInternals.h" #include "llvm/Bytecode/Reader.h" #include "llvm/Bytecode/Format.h" +#include "llvm/GlobalVariable.h" #include "llvm/Module.h" #include "llvm/BasicBlock.h" -#include "llvm/DerivedTypes.h" -#include "llvm/ConstPoolVals.h" +#include "llvm/ConstantVals.h" +#include "llvm/iPHINode.h" #include "llvm/iOther.h" -#include "ReaderInternals.h" #include -#include #include +#include #include #include #include +#include +using std::cerr; +using std::make_pair; bool BytecodeParser::getTypeSlot(const Type *Ty, unsigned &Slot) { if (Ty->isPrimitiveType()) { Slot = Ty->getPrimitiveID(); } else { - TypeMapType::iterator I = TypeMap.find(Ty); - if (I == TypeMap.end()) return failure(true); // Didn't find type! - Slot = I->second; + // Check the method level types first... + TypeValuesListTy::iterator I = find(MethodTypeValues.begin(), + MethodTypeValues.end(), Ty); + if (I != MethodTypeValues.end()) { + Slot = FirstDerivedTyID+ModuleTypeValues.size()+ + (&*I - &MethodTypeValues[0]); + } else { + I = find(ModuleTypeValues.begin(), ModuleTypeValues.end(), Ty); + if (I == ModuleTypeValues.end()) return true; // Didn't find type! + Slot = FirstDerivedTyID + (&*I - &ModuleTypeValues[0]); + } } - //cerr << "getTypeSlot '" << Ty->getName() << "' = " << Slot << endl; + //cerr << "getTypeSlot '" << Ty->getName() << "' = " << Slot << "\n"; return false; } @@ -41,39 +53,27 @@ const Type *BytecodeParser::getType(unsigned ID) { const Type *T = Type::getPrimitiveType((Type::PrimitiveID)ID); if (T) return T; - //cerr << "Looking up Type ID: " << ID << endl; + //cerr << "Looking up Type ID: " << ID << "\n"; const Value *D = getValue(Type::TypeTy, ID, false); if (D == 0) return failure(0); - assert(D->getType() == Type::TypeTy); - return ((const ConstPoolType*)D->castConstantAsserting())->getValue(); + return cast(D); } -bool BytecodeParser::insertValue(Value *Def, vector &ValueTab) { +int BytecodeParser::insertValue(Value *Val, std::vector &ValueTab) { unsigned type; - if (getTypeSlot(Def->getType(), type)) return failure(true); + if (getTypeSlot(Val->getType(), type)) return failure(-1); + assert(type != Type::TypeTyID && "Types should never be insertValue'd!"); if (ValueTab.size() <= type) ValueTab.resize(type+1, ValueList()); //cerr << "insertValue Values[" << type << "][" << ValueTab[type].size() - // << "] = " << Def << endl; - - if (type == Type::TypeTyID && Def->isConstant()) { - const Type *Ty = ((const ConstPoolType*)Def)->getValue(); - unsigned ValueOffset = FirstDerivedTyID; - - if (&ValueTab == &Values) // Take into consideration module level types - ValueOffset += ModuleValues[type].size(); - - if (TypeMap.find(Ty) == TypeMap.end()) - TypeMap[Ty] = ValueTab[type].size()+ValueOffset; - } + // << "] = " << Val << "\n"; + ValueTab[type].push_back(Val); - ValueTab[type].push_back(Def); - - return false; + return ValueTab[type].size()-1; } Value *BytecodeParser::getValue(const Type *Ty, unsigned oNum, bool Create) { @@ -83,15 +83,27 @@ Value *BytecodeParser::getValue(const Type *Ty, unsigned oNum, bool Create) { if (getTypeSlot(Ty, type)) return failure(0); // TODO: true if (type == Type::TypeTyID) { // The 'type' plane has implicit values + assert(Create == false); const Type *T = Type::getPrimitiveType((Type::PrimitiveID)Num); if (T) return (Value*)T; // Asked for a primitive type... // Otherwise, derived types need offset... Num -= FirstDerivedTyID; + + // Is it a module level type? + if (Num < ModuleTypeValues.size()) + return (Value*)ModuleTypeValues[Num].get(); + + // Nope, is it a method level type? + Num -= ModuleTypeValues.size(); + if (Num < MethodTypeValues.size()) + return (Value*)MethodTypeValues[Num].get(); + + return 0; } - if (ModuleValues.size() > type) { - if (ModuleValues[type].size() > Num) + if (type < ModuleValues.size()) { + if (Num < ModuleValues[type].size()) return ModuleValues[type][Num]; Num -= ModuleValues[type].size(); } @@ -106,15 +118,15 @@ Value *BytecodeParser::getValue(const Type *Ty, unsigned oNum, bool Create) { case Type::LabelTyID: d = new BBPHolder(Ty, oNum); break; case Type::MethodTyID: cerr << "Creating method pholder! : " << type << ":" << oNum << " " - << Ty->getName() << endl; + << Ty->getName() << "\n"; d = new MethPHolder(Ty, oNum); - insertValue(d, LateResolveModuleValues); + if (insertValue(d, LateResolveModuleValues) ==-1) return failure(0); return d; default: d = new DefPHolder(Ty, oNum); break; } assert(d != 0 && "How did we not make something?"); - if (insertValue(d, LateResolveValues)) return failure(0); + if (insertValue(d, LateResolveValues) == -1) return failure(0); return d; } @@ -132,8 +144,8 @@ bool BytecodeParser::postResolveValues(ValueTable &ValTab) { Value *NewDef = getValue(D->getType(), IDNumber, false); if (NewDef == 0) { Error = true; // Unresolved thinger - cerr << "Unresolvable reference found: <" << D->getType()->getName() - << ">:" << IDNumber << "!\n"; + cerr << "Unresolvable reference found: <" + << D->getType()->getDescription() << ">:" << IDNumber << "!\n"; } else { // Fixup all of the uses of this placeholder def... D->replaceAllUsesWith(NewDef); @@ -153,22 +165,25 @@ bool BytecodeParser::ParseBasicBlock(const uchar *&Buf, const uchar *EndBuf, BB = new BasicBlock(); while (Buf < EndBuf) { - Instruction *Def; - if (ParseInstruction(Buf, EndBuf, Def)) { + Instruction *Inst; + if (ParseInstruction(Buf, EndBuf, Inst)) { delete BB; return failure(true); } - if (Def == 0) { delete BB; return failure(true); } - if (insertValue(Def, Values)) { delete BB; return failure(true); } + if (Inst == 0) { delete BB; return failure(true); } + if (insertValue(Inst, Values) == -1) { delete BB; return failure(true); } + + BB->getInstList().push_back(Inst); - BB->getInstList().push_back(Def); + BCR_TRACE(4, Inst); } return false; } -bool BytecodeParser::ParseSymbolTable(const uchar *&Buf, const uchar *EndBuf) { +bool BytecodeParser::ParseSymbolTable(const uchar *&Buf, const uchar *EndBuf, + SymbolTable *ST) { while (Buf < EndBuf) { // Symtab block header: [num entries][type id number] unsigned NumEntries, Typ; @@ -177,17 +192,26 @@ bool BytecodeParser::ParseSymbolTable(const uchar *&Buf, const uchar *EndBuf) { const Type *Ty = getType(Typ); if (Ty == 0) return failure(true); + BCR_TRACE(3, "Plane Type: '" << Ty << "' with " << NumEntries << + " entries\n"); + for (unsigned i = 0; i < NumEntries; ++i) { // Symtab entry: [def slot #][name] unsigned slot; if (read_vbr(Buf, EndBuf, slot)) return failure(true); - string Name; + std::string Name; if (read(Buf, EndBuf, Name, false)) // Not aligned... return failure(true); Value *D = getValue(Ty, slot, false); // Find mapping... - if (D == 0) return failure(true); - D->setName(Name); + if (D == 0) { + BCR_TRACE(3, "FAILED LOOKUP: Slot #" << slot << "\n"); + return failure(true); + } + BCR_TRACE(4, "Map: '" << Name << "' to #" << slot << ":" << D; + if (!isa(D)) cerr << "\n"); + + D->setName(Name, ST); } } @@ -195,44 +219,96 @@ bool BytecodeParser::ParseSymbolTable(const uchar *&Buf, const uchar *EndBuf) { return false; } +// DeclareNewGlobalValue - Patch up forward references to global values in the +// form of ConstantPointerRef. +// +void BytecodeParser::DeclareNewGlobalValue(GlobalValue *GV, unsigned Slot) { + // Check to see if there is a forward reference to this global variable... + // if there is, eliminate it and patch the reference to use the new def'n. + GlobalRefsType::iterator I = GlobalRefs.find(make_pair(GV->getType(), Slot)); + + if (I != GlobalRefs.end()) { + GlobalVariable *OldGV = I->second; // Get the placeholder... + BCR_TRACE(3, "Mutating CPPR Forward Ref!\n"); + + // Loop over all of the uses of the GlobalValue. The only thing they are + // allowed to be at this point is ConstantPointerRef's. + assert(OldGV->use_size() == 1 && "Only one reference should exist!"); + while (!OldGV->use_empty()) { + User *U = OldGV->use_back(); // Must be a ConstantPointerRef... + ConstantPointerRef *CPPR = cast(U); + assert(CPPR->getValue() == OldGV && "Something isn't happy"); + + BCR_TRACE(4, "Mutating Forward Ref!\n"); + + // Change the const pool reference to point to the real global variable + // now. This should drop a use from the OldGV. + CPPR->mutateReference(GV); + } + + // Remove GV from the module... + GV->getParent()->getGlobalList().remove(OldGV); + delete OldGV; // Delete the old placeholder + + // Remove the map entry for the global now that it has been created... + GlobalRefs.erase(I); + } +} bool BytecodeParser::ParseMethod(const uchar *&Buf, const uchar *EndBuf, Module *C) { // Clear out the local values table... Values.clear(); - if (MethodSignatureList.empty()) return failure(true); // Unexpected method! + if (MethodSignatureList.empty()) { + Error = "Method found, but MethodSignatureList empty!"; + return failure(true); // Unexpected method! + } + + const PointerType *PMTy = MethodSignatureList.front().first; // PtrMeth + const MethodType *MTy = dyn_cast(PMTy->getElementType()); + if (MTy == 0) return failure(true); // Not ptr to method! + + unsigned isInternal; + if (read_vbr(Buf, EndBuf, isInternal)) return failure(true); - const MethodType *MTy = MethodSignatureList.front().first; unsigned MethSlot = MethodSignatureList.front().second; MethodSignatureList.pop_front(); - Method *M = new Method(MTy); + Method *M = new Method(MTy, isInternal != 0); + + BCR_TRACE(2, "METHOD TYPE: " << MTy << "\n"); const MethodType::ParamTypes &Params = MTy->getParamTypes(); for (MethodType::ParamTypes::const_iterator It = Params.begin(); It != Params.end(); ++It) { - MethodArgument *MA = new MethodArgument(*It); - if (insertValue(MA, Values)) { delete M; return failure(true); } - M->getArgumentList().push_back(MA); + FunctionArgument *FA = new FunctionArgument(*It); + if (insertValue(FA, Values) == -1) { + Error = "Error reading method arguments!\n"; + delete M; return failure(true); + } + M->getArgumentList().push_back(FA); } while (Buf < EndBuf) { unsigned Type, Size; const uchar *OldBuf = Buf; - if (readBlock(Buf, EndBuf, Type, Size)) { delete M; return failure(true); } + if (readBlock(Buf, EndBuf, Type, Size)) { + Error = "Error reading Method level block!"; + delete M; return failure(true); + } switch (Type) { case BytecodeFormat::ConstantPool: - if (ParseConstantPool(Buf, Buf+Size, M->getConstantPool(), Values)) { - cerr << "Error reading constant pool!\n"; + BCR_TRACE(2, "BLOCK BytecodeFormat::ConstantPool: {\n"); + if (ParseConstantPool(Buf, Buf+Size, Values, MethodTypeValues)) { delete M; return failure(true); } break; case BytecodeFormat::BasicBlock: { + BCR_TRACE(2, "BLOCK BytecodeFormat::BasicBlock: {\n"); BasicBlock *BB; if (ParseBasicBlock(Buf, Buf+Size, BB) || - insertValue(BB, Values)) { - cerr << "Error parsing basic block!\n"; + insertValue(BB, Values) == -1) { delete M; return failure(true); // Parse error... :( } @@ -241,18 +317,22 @@ bool BytecodeParser::ParseMethod(const uchar *&Buf, const uchar *EndBuf, } case BytecodeFormat::SymbolTable: - if (ParseSymbolTable(Buf, Buf+Size)) { - cerr << "Error reading method symbol table!\n"; + BCR_TRACE(2, "BLOCK BytecodeFormat::SymbolTable: {\n"); + if (ParseSymbolTable(Buf, Buf+Size, M->getSymbolTableSure())) { delete M; return failure(true); } break; default: + BCR_TRACE(2, "BLOCK :ignored! {\n"); Buf += Size; if (OldBuf > Buf) return failure(true); // Wrap around! break; } + BCR_TRACE(2, "} end block\n"); + if (align32(Buf, EndBuf)) { + Error = "Error aligning Method level block!"; delete M; // Malformed bc file, read past end of block. return failure(true); } @@ -260,36 +340,91 @@ bool BytecodeParser::ParseMethod(const uchar *&Buf, const uchar *EndBuf, if (postResolveValues(LateResolveValues) || postResolveValues(LateResolveModuleValues)) { + Error = "Error resolving method values!"; delete M; return failure(true); // Unresolvable references! } - Value *MethPHolder = getValue(MTy, MethSlot, false); + Value *MethPHolder = getValue(PMTy, MethSlot, false); assert(MethPHolder && "Something is broken no placeholder found!"); - assert(MethPHolder->isMethod() && "Not a method?"); + assert(isa(MethPHolder) && "Not a method?"); unsigned type; // Type slot assert(!getTypeSlot(MTy, type) && "How can meth type not exist?"); - getTypeSlot(MTy, type); + getTypeSlot(PMTy, type); - C->getMethodList().push_back(M); + C->getFunctionList().push_back(M); // Replace placeholder with the real method pointer... ModuleValues[type][MethSlot] = M; + // Clear out method level types... + MethodTypeValues.clear(); + // If anyone is using the placeholder make them use the real method instead MethPHolder->replaceAllUsesWith(M); // We don't need the placeholder anymore! delete MethPHolder; + // If the method is empty, we don't need the method argument entries... + if (M->isExternal()) + M->getArgumentList().delete_all(); + + DeclareNewGlobalValue(M, MethSlot); + return false; } bool BytecodeParser::ParseModuleGlobalInfo(const uchar *&Buf, const uchar *End, - Module *C) { - - if (!MethodSignatureList.empty()) + Module *Mod) { + if (!MethodSignatureList.empty()) { + Error = "Two ModuleGlobalInfo packets found!"; return failure(true); // Two ModuleGlobal blocks? + } + + // Read global variables... + unsigned VarType; + if (read_vbr(Buf, End, VarType)) return failure(true); + while (VarType != Type::VoidTyID) { // List is terminated by Void + // VarType Fields: bit0 = isConstant, bit1 = hasInitializer, + // bit2 = isInternal, bit3+ = slot# + const Type *Ty = getType(VarType >> 3); + if (!Ty || !Ty->isPointerType()) { + Error = "Global not pointer type! Ty = " + Ty->getDescription(); + return failure(true); + } + + const PointerType *PTy = cast(Ty); + const Type *ElTy = PTy->getElementType(); + + Constant *Initializer = 0; + if (VarType & 2) { // Does it have an initalizer? + // Do not improvise... values must have been stored in the constant pool, + // which should have been read before now. + // + unsigned InitSlot; + if (read_vbr(Buf, End, InitSlot)) return failure(true); + + Value *V = getValue(ElTy, InitSlot, false); + if (V == 0) return failure(true); + Initializer = cast(V); + } + + // Create the global variable... + GlobalVariable *GV = new GlobalVariable(ElTy, VarType & 1, VarType & 4, + Initializer); + int DestSlot = insertValue(GV, ModuleValues); + if (DestSlot == -1) return failure(true); + + Mod->getGlobalList().push_back(GV); + + DeclareNewGlobalValue(GV, unsigned(DestSlot)); + + BCR_TRACE(2, "Global Variable of type: " << PTy->getDescription() + << " into slot #" << DestSlot << "\n"); + + if (read_vbr(Buf, End, VarType)) return failure(true); + } // Read the method signatures for all of the methods that are coming, and // create fillers in the Value tables. @@ -297,32 +432,37 @@ bool BytecodeParser::ParseModuleGlobalInfo(const uchar *&Buf, const uchar *End, if (read_vbr(Buf, End, MethSignature)) return failure(true); while (MethSignature != Type::VoidTyID) { // List is terminated by Void const Type *Ty = getType(MethSignature); - if (!Ty || !Ty->isMethodType()) { - cerr << "Method not meth type! "; - if (Ty) cerr << Ty->getName(); else cerr << MethSignature; cerr << endl; + if (!Ty || !isa(Ty) || + !isa(cast(Ty)->getElementType())) { + Error = "Method not ptr to meth type! Ty = " + Ty->getDescription(); return failure(true); } + + // We create methods by passing the underlying MethodType to create... + Ty = cast(Ty)->getElementType(); - // When the ModuleGlobalInfo section is read, we load the type of each method - // and the 'ModuleValues' slot that it lands in. We then load a placeholder - // into its slot to reserve it. When the method is loaded, this placeholder - // is replaced. + // When the ModuleGlobalInfo section is read, we load the type of each + // method and the 'ModuleValues' slot that it lands in. We then load a + // placeholder into its slot to reserve it. When the method is loaded, this + // placeholder is replaced. // Insert the placeholder... - Value *Def = new MethPHolder(Ty, 0); - insertValue(Def, ModuleValues); + Value *Val = new MethPHolder(Ty, 0); + if (insertValue(Val, ModuleValues) == -1) return failure(true); // Figure out which entry of its typeslot it went into... unsigned TypeSlot; - if (getTypeSlot(Def->getType(), TypeSlot)) return failure(true); + if (getTypeSlot(Val->getType(), TypeSlot)) return failure(true); unsigned SlotNo = ModuleValues[TypeSlot].size()-1; // Keep track of this information in a linked list that is emptied as // methods are loaded... // - MethodSignatureList.push_back(make_pair((const MethodType*)Ty, SlotNo)); + MethodSignatureList.push_back( + make_pair(cast(Val->getType()), SlotNo)); if (read_vbr(Buf, End, MethSignature)) return failure(true); + BCR_TRACE(2, "Method of type: " << Ty << "\n"); } if (align32(Buf, End)) return failure(true); @@ -339,36 +479,41 @@ bool BytecodeParser::ParseModule(const uchar *Buf, const uchar *EndBuf, unsigned Type, Size; if (readBlock(Buf, EndBuf, Type, Size)) return failure(true); - if (Type != BytecodeFormat::Module || Buf+Size != EndBuf) + if (Type != BytecodeFormat::Module || Buf+Size != EndBuf) { + Error = "Expected Module packet!"; return failure(true); // Hrm, not a class? + } + BCR_TRACE(0, "BLOCK BytecodeFormat::Module: {\n"); MethodSignatureList.clear(); // Just in case... // Read into instance variables... if (read_vbr(Buf, EndBuf, FirstDerivedTyID)) return failure(true); if (align32(Buf, EndBuf)) return failure(true); + BCR_TRACE(1, "FirstDerivedTyID = " << FirstDerivedTyID << "\n"); - C = new Module(); - + TheModule = C = new Module(); while (Buf < EndBuf) { const uchar *OldBuf = Buf; if (readBlock(Buf, EndBuf, Type, Size)) { delete C; return failure(true); } switch (Type) { - case BytecodeFormat::ModuleGlobalInfo: - if (ParseModuleGlobalInfo(Buf, Buf+Size, C)) { - cerr << "Error reading class global info section!\n"; + case BytecodeFormat::ConstantPool: + BCR_TRACE(1, "BLOCK BytecodeFormat::ConstantPool: {\n"); + if (ParseConstantPool(Buf, Buf+Size, ModuleValues, ModuleTypeValues)) { delete C; return failure(true); } break; - case BytecodeFormat::ConstantPool: - if (ParseConstantPool(Buf, Buf+Size, C->getConstantPool(), ModuleValues)) { - cerr << "Error reading class constant pool!\n"; + case BytecodeFormat::ModuleGlobalInfo: + BCR_TRACE(1, "BLOCK BytecodeFormat::ModuleGlobalInfo: {\n"); + + if (ParseModuleGlobalInfo(Buf, Buf+Size, C)) { delete C; return failure(true); } break; case BytecodeFormat::Method: { + BCR_TRACE(1, "BLOCK BytecodeFormat::Method: {\n"); if (ParseMethod(Buf, Buf+Size, C)) { delete C; return failure(true); // Error parsing method } @@ -376,23 +521,28 @@ bool BytecodeParser::ParseModule(const uchar *Buf, const uchar *EndBuf, } case BytecodeFormat::SymbolTable: - if (ParseSymbolTable(Buf, Buf+Size)) { - cerr << "Error reading class symbol table!\n"; + BCR_TRACE(1, "BLOCK BytecodeFormat::SymbolTable: {\n"); + if (ParseSymbolTable(Buf, Buf+Size, C->getSymbolTableSure())) { delete C; return failure(true); } break; default: - cerr << "Unknown class block: " << Type << endl; + Error = "Expected Module Block!"; Buf += Size; if (OldBuf > Buf) return failure(true); // Wrap around! break; } + BCR_TRACE(1, "} end block\n"); if (align32(Buf, EndBuf)) { delete C; return failure(true); } } - if (!MethodSignatureList.empty()) // Expected more methods! + if (!MethodSignatureList.empty()) { // Expected more methods! + Error = "Method expected, but bytecode stream at end!"; return failure(true); + } + + BCR_TRACE(0, "} end block\n\n"); return false; } @@ -401,8 +551,10 @@ Module *BytecodeParser::ParseBytecode(const uchar *Buf, const uchar *EndBuf) { unsigned Sig; // Read and check signature... if (read(Buf, EndBuf, Sig) || - Sig != ('l' | ('l' << 8) | ('v' << 16) | 'm' << 24)) + Sig != ('l' | ('l' << 8) | ('v' << 16) | 'm' << 24)) { + Error = "Invalid bytecode signature!"; return failure(0); // Invalid signature! + } Module *Result; if (ParseModule(Buf, EndBuf, Result)) return 0; @@ -417,27 +569,37 @@ Module *ParseBytecodeBuffer(const uchar *Buffer, unsigned Length) { // Parse and return a class file... // -Module *ParseBytecodeFile(const string &Filename) { +Module *ParseBytecodeFile(const std::string &Filename, std::string *ErrorStr) { struct stat StatBuf; Module *Result = 0; - if (Filename != string("-")) { // Read from a file... + if (Filename != std::string("-")) { // Read from a file... int FD = open(Filename.c_str(), O_RDONLY); - if (FD == -1) return failure(0); + if (FD == -1) { + if (ErrorStr) *ErrorStr = "Error opening file!"; + return failure(0); + } if (fstat(FD, &StatBuf) == -1) { close(FD); return failure(0); } int Length = StatBuf.st_size; - if (Length == 0) { close(FD); return failure(0); } + if (Length == 0) { + if (ErrorStr) *ErrorStr = "Error stat'ing file!"; + close(FD); return failure(0); + } uchar *Buffer = (uchar*)mmap(0, Length, PROT_READ, MAP_PRIVATE, FD, 0); - if (Buffer == (uchar*)-1) { close(FD); return failure(0); } + if (Buffer == (uchar*)-1) { + if (ErrorStr) *ErrorStr = "Error mmapping file!"; + close(FD); return failure(0); + } BytecodeParser Parser; Result = Parser.ParseBytecode(Buffer, Buffer+Length); munmap((char*)Buffer, Length); close(FD); + if (ErrorStr) *ErrorStr = Parser.getError(); } else { // Read from stdin size_t FileSize = 0; int BlockSize; @@ -450,15 +612,18 @@ Module *ParseBytecodeFile(const string &Filename) { FileSize += BlockSize; } - if (FileSize == 0) { free(FileData); return failure(0); } + if (FileSize == 0) { + if (ErrorStr) *ErrorStr = "Standard Input empty!"; + free(FileData); return failure(0); + } #define ALIGN_PTRS 1 #if ALIGN_PTRS uchar *Buf = (uchar*)mmap(0, FileSize, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); assert((Buf != (uchar*)-1) && "mmap returned error!"); - free(FileData); memcpy(Buf, FileData, FileSize); + free(FileData); #else uchar *Buf = FileData; #endif @@ -471,6 +636,8 @@ Module *ParseBytecodeFile(const string &Filename) { #else free(FileData); // Free realloc'd block of memory #endif + + if (ErrorStr) *ErrorStr = Parser.getError(); } return Result;