Additional clean ups on errors in bitcode parsing.

include/llvm/Bitcode/NaCl/NaClBitstreamReader.h

 //===- NaClBitstreamReader.h -----------------------------------*- C++ -*-===//
 //     Low-level bitstream reader interface
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This header defines the BitstreamReader class.  This class can be used to
 // read an arbitrary bitstream, regardless of its contents.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_BITCODE_NACL_NACLBITSTREAMREADER_H
 #define LLVM_BITCODE_NACL_NACLBITSTREAMREADER_H
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Bitcode/NaCl/NaClLLVMBitCodes.h"
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/StreamingMemoryObject.h"
 #include <climits>
 #include <vector>
 
 namespace llvm {
 
 class Deserializer;
 
+namespace naclbitc {
+
+/// Returns the Bit as a Byte:BitInByte string.
+std::string getBitAddress(uint64_t Bit);
+
+/// Severity levels for reporting errors.
+enum ErrorLevel {
+  Warning,
+  Error,
+  Fatal
+};
+
+// Basic printing routine to generate the beginning of an error
+// message. BitPosition is the bit position the error was found.
+// Level is the severity of the error.
+raw_ostream &ErrorAt(raw_ostream &Out, ErrorLevel Level,
+                     uint64_t BitPosition);
+
+} // End namespace naclbitc.
+
 /// This class is used to read from a NaCl bitcode wire format stream,
 /// maintaining information that is global to decoding the entire file.
 /// While a file is being read, multiple cursors can be independently
 /// advanced or skipped around within the file.  These are represented by
 /// the NaClBitstreamCursor class.
 class NaClBitstreamReader {
 public:
   /// This contains information emitted to BLOCKINFO_BLOCK blocks. These
   /// describe abbreviations that all blocks of the specified ID inherit.
   struct BlockInfo {
@@ skipping 41 matching lines @@
         Info.Abbrevs[i]->dropRef();
       BlockInfoRecords.pop_back();
     }
   }
 
   /// \brief Returns the initial address (after the header) of the input stream.
   size_t getInitialAddress() const {
     return InitialAddress;
   }
 
-  /// Returns the Bit as a Byte:BitInByte string. MinByteWidth is the
-  /// minimum number of characters to print out the Byte value (blank
-  /// fills).
-  static std::string getBitAddress(uint64_t Bit, unsigned MinByteWidth=1);
-
   //===--------------------------------------------------------------------===//
   // Block Manipulation
   //===--------------------------------------------------------------------===//
 
   /// Return true if we've already read and processed the block info block for
   /// this Bitstream. We only process it for the first cursor that walks over
   /// it.
   bool hasBlockInfoRecords() const { return !BlockInfoRecords.empty(); }
 
   /// If there is block info for the specified ID, return it, otherwise return
@@ skipping 214 matching lines @@
   }
 
   NaClBitstreamReader *getBitStreamReader() {
     return BitStream;
   }
   const NaClBitstreamReader *getBitStreamReader() const {
     return BitStream;
   }
 
   /// Returns the current bit address (string) of the bit cursor.
-  /// MinByteWidth is the minimum number of characters to print out
-  /// the Byte value (blank fills).
-  std::string getCurrentBitAddress(unsigned MinByteWidth=1) const {
-    return BitStream->getBitAddress(GetCurrentBitNo(), MinByteWidth);
+  std::string getCurrentBitAddress() const {
+    return naclbitc::getBitAddress(GetCurrentBitNo());
   }
 
   /// Flags that modify the behavior of advance().
   enum {
     /// If this flag is used, the advance() method does not automatically pop
     /// the block scope when the end of a block is reached.
     AF_DontPopBlockAtEnd = 1,
 
     /// If this flag is used, abbrev entries are returned just like normal
     /// records.
@@ skipping 294 matching lines @@
   // Skips over an abbreviation record. Duplicates code of ReadAbbrevRecord,
   // except that no abbreviation is built.
   void SkipAbbrevRecord();
   
   bool ReadBlockInfoBlock(NaClAbbrevListener *Listener);
 };
 
 } // End llvm namespace
 
 #endif