Commit b33a2af2 by Karl Schimpf

Update subzero bitcode parser to use new API for bitstream reading.

parent 90db6ae0
...@@ -2988,14 +2988,22 @@ void PNaClTranslator::translate(const std::string &IRFilename, ...@@ -2988,14 +2988,22 @@ void PNaClTranslator::translate(const std::string &IRFilename,
// Read header and verify it is good. // Read header and verify it is good.
NaClBitcodeHeader Header; NaClBitcodeHeader Header;
if (Header.Read(MemObj.get()) || !Header.IsSupported()) { if (Header.Read(MemObj.get())) {
errs() << "Invalid PNaCl bitcode header.\n"; errs() << "Invalid PNaCl bitcode header.\n";
ErrorStatus.assign(EC_Bitcode); ErrorStatus.assign(EC_Bitcode);
return; return;
} }
if (!Header.IsSupported()) {
errs() << Header.Unsupported();
if (!Header.IsReadable()) {
errs() << "Invalid PNaCl bitcode header.\n";
ErrorStatus.assign(EC_Bitcode);
return;
}
}
// Create a bitstream reader to read the bitcode file. // Create a bitstream reader to read the bitcode file.
NaClBitstreamReader InputStreamFile(MemObj.release(), Header.getHeaderSize()); NaClBitstreamReader InputStreamFile(MemObj.release(), Header);
NaClBitstreamCursor InputStream(InputStreamFile); NaClBitstreamCursor InputStream(InputStreamFile);
TopLevelParser Parser(*this, InputStream, ErrorStatus); TopLevelParser Parser(*this, InputStream, ErrorStatus);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment