Chromium Code Reviews| Index: tools/pnacl-bcanalyzer/pnacl-bcanalyzer.cpp |
| diff --git a/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp b/tools/pnacl-bcanalyzer/pnacl-bcanalyzer.cpp |
| similarity index 63% |
| copy from tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp |
| copy to tools/pnacl-bcanalyzer/pnacl-bcanalyzer.cpp |
| index 99479a46a88bbd02d54a67b647c86227df1e773a..3a082fa129520da596d8772e627eb7548e4d9a66 100644 |
| --- a/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp |
| +++ b/tools/pnacl-bcanalyzer/pnacl-bcanalyzer.cpp |
| @@ -1,4 +1,4 @@ |
| -//===-- llvm-bcanalyzer.cpp - Bitcode Analyzer --------------------------===// |
| +//===-- pnacl-bcanalyzer.cpp - Bitcode Analyzer -------------------------===// |
| // |
| // The LLVM Compiler Infrastructure |
| // |
| @@ -8,8 +8,9 @@ |
| //===----------------------------------------------------------------------===// |
| // |
| // This tool may be invoked in the following manner: |
| -// llvm-bcanalyzer [options] - Read LLVM bitcode from stdin |
| -// llvm-bcanalyzer [options] x.bc - Read LLVM bitcode from the x.bc file |
| +// llvm-bcanalyzer [options] - Read frozen PNaCl bitcode from stdin |
|
jvoung (off chromium)
2013/05/06 21:43:22
llvm-bcanalyzer -> pnacl-bcanalyzer
Karl
2013/05/06 22:16:18
Fixed all (3) cases in file.
|
| +// llvm-bcanalyzer [options] x.bc - Read frozen PNaCl bitcode from the x.bc |
| +// file |
| // |
| // Options: |
| // --help - Output information about command line switches |
| @@ -29,9 +30,9 @@ |
| #include "llvm/ADT/OwningPtr.h" |
| #include "llvm/Analysis/Verifier.h" |
| -#include "llvm/Bitcode/BitstreamReader.h" |
| -#include "llvm/Bitcode/LLVMBitCodes.h" |
| -#include "llvm/Bitcode/ReaderWriter.h" |
| +#include "llvm/Bitcode/NaCl/NaClBitstreamReader.h" |
| +#include "llvm/Bitcode/NaCl/NaClLLVMBitCodes.h" |
| +#include "llvm/Bitcode/NaCl/NaClReaderWriter.h" |
| #include "llvm/Support/CommandLine.h" |
| #include "llvm/Support/Format.h" |
| #include "llvm/Support/ManagedStatic.h" |
| @@ -79,16 +80,16 @@ static CurStreamTypeType CurStreamType; |
| /// GetBlockName - Return a symbolic block name if known, otherwise return |
| /// null. |
| static const char *GetBlockName(unsigned BlockID, |
| - const BitstreamReader &StreamFile) { |
| + const NaClBitstreamReader &StreamFile) { |
| // Standard blocks for all bitcode files. |
| - if (BlockID < bitc::FIRST_APPLICATION_BLOCKID) { |
| - if (BlockID == bitc::BLOCKINFO_BLOCK_ID) |
| + if (BlockID < naclbitc::FIRST_APPLICATION_BLOCKID) { |
| + if (BlockID == naclbitc::BLOCKINFO_BLOCK_ID) |
| return "BLOCKINFO_BLOCK"; |
| return 0; |
| } |
| // Check to see if we have a blockinfo record for this block, with a name. |
| - if (const BitstreamReader::BlockInfo *Info = |
| + if (const NaClBitstreamReader::BlockInfo *Info = |
| StreamFile.getBlockInfo(BlockID)) { |
| if (!Info->Name.empty()) |
| return Info->Name.c_str(); |
| @@ -98,39 +99,39 @@ static const char *GetBlockName(unsigned BlockID, |
| if (CurStreamType != LLVMIRBitstream) return 0; |
| switch (BlockID) { |
| - default: return 0; |
| - case bitc::MODULE_BLOCK_ID: return "MODULE_BLOCK"; |
| - case bitc::PARAMATTR_BLOCK_ID: return "PARAMATTR_BLOCK"; |
| - case bitc::PARAMATTR_GROUP_BLOCK_ID: return "PARAMATTR_GROUP_BLOCK_ID"; |
| - case bitc::TYPE_BLOCK_ID_NEW: return "TYPE_BLOCK_ID"; |
| - case bitc::CONSTANTS_BLOCK_ID: return "CONSTANTS_BLOCK"; |
| - case bitc::FUNCTION_BLOCK_ID: return "FUNCTION_BLOCK"; |
| - case bitc::VALUE_SYMTAB_BLOCK_ID: return "VALUE_SYMTAB"; |
| - case bitc::METADATA_BLOCK_ID: return "METADATA_BLOCK"; |
| - case bitc::METADATA_ATTACHMENT_ID: return "METADATA_ATTACHMENT_BLOCK"; |
| - case bitc::USELIST_BLOCK_ID: return "USELIST_BLOCK_ID"; |
| + default: return 0; |
| + case naclbitc::MODULE_BLOCK_ID: return "MODULE_BLOCK"; |
| + case naclbitc::PARAMATTR_BLOCK_ID: return "PARAMATTR_BLOCK"; |
| + case naclbitc::PARAMATTR_GROUP_BLOCK_ID: return "PARAMATTR_GROUP_BLOCK_ID"; |
| + case naclbitc::TYPE_BLOCK_ID_NEW: return "TYPE_BLOCK_ID"; |
| + case naclbitc::CONSTANTS_BLOCK_ID: return "CONSTANTS_BLOCK"; |
| + case naclbitc::FUNCTION_BLOCK_ID: return "FUNCTION_BLOCK"; |
| + case naclbitc::VALUE_SYMTAB_BLOCK_ID: return "VALUE_SYMTAB"; |
| + case naclbitc::METADATA_BLOCK_ID: return "METADATA_BLOCK"; |
| + case naclbitc::METADATA_ATTACHMENT_ID: return "METADATA_ATTACHMENT_BLOCK"; |
| + case naclbitc::USELIST_BLOCK_ID: return "USELIST_BLOCK_ID"; |
| } |
| } |
| /// GetCodeName - Return a symbolic code name if known, otherwise return |
| /// null. |
| static const char *GetCodeName(unsigned CodeID, unsigned BlockID, |
| - const BitstreamReader &StreamFile) { |
| + const NaClBitstreamReader &StreamFile) { |
| // Standard blocks for all bitcode files. |
| - if (BlockID < bitc::FIRST_APPLICATION_BLOCKID) { |
| - if (BlockID == bitc::BLOCKINFO_BLOCK_ID) { |
| + if (BlockID < naclbitc::FIRST_APPLICATION_BLOCKID) { |
| + if (BlockID == naclbitc::BLOCKINFO_BLOCK_ID) { |
| switch (CodeID) { |
| default: return 0; |
| - case bitc::BLOCKINFO_CODE_SETBID: return "SETBID"; |
| - case bitc::BLOCKINFO_CODE_BLOCKNAME: return "BLOCKNAME"; |
| - case bitc::BLOCKINFO_CODE_SETRECORDNAME: return "SETRECORDNAME"; |
| + case naclbitc::BLOCKINFO_CODE_SETBID: return "SETBID"; |
| + case naclbitc::BLOCKINFO_CODE_BLOCKNAME: return "BLOCKNAME"; |
| + case naclbitc::BLOCKINFO_CODE_SETRECORDNAME: return "SETRECORDNAME"; |
| } |
| } |
| return 0; |
| } |
| // Check to see if we have a blockinfo record for this record, with a name. |
| - if (const BitstreamReader::BlockInfo *Info = |
| + if (const NaClBitstreamReader::BlockInfo *Info = |
| StreamFile.getBlockInfo(BlockID)) { |
| for (unsigned i = 0, e = Info->RecordNames.size(); i != e; ++i) |
| if (Info->RecordNames[i].first == CodeID) |
| @@ -142,136 +143,136 @@ static const char *GetCodeName(unsigned CodeID, unsigned BlockID, |
| switch (BlockID) { |
| default: return 0; |
| - case bitc::MODULE_BLOCK_ID: |
| + case naclbitc::MODULE_BLOCK_ID: |
| switch (CodeID) { |
| default: return 0; |
| - case bitc::MODULE_CODE_VERSION: return "VERSION"; |
| - case bitc::MODULE_CODE_TRIPLE: return "TRIPLE"; |
| - case bitc::MODULE_CODE_DATALAYOUT: return "DATALAYOUT"; |
| - case bitc::MODULE_CODE_ASM: return "ASM"; |
| - case bitc::MODULE_CODE_SECTIONNAME: return "SECTIONNAME"; |
| - case bitc::MODULE_CODE_DEPLIB: return "DEPLIB"; // FIXME: Remove in 4.0 |
| - case bitc::MODULE_CODE_GLOBALVAR: return "GLOBALVAR"; |
| - case bitc::MODULE_CODE_FUNCTION: return "FUNCTION"; |
| - case bitc::MODULE_CODE_ALIAS: return "ALIAS"; |
| - case bitc::MODULE_CODE_PURGEVALS: return "PURGEVALS"; |
| - case bitc::MODULE_CODE_GCNAME: return "GCNAME"; |
| + case naclbitc::MODULE_CODE_VERSION: return "VERSION"; |
| + case naclbitc::MODULE_CODE_TRIPLE: return "TRIPLE"; |
| + case naclbitc::MODULE_CODE_DATALAYOUT: return "DATALAYOUT"; |
| + case naclbitc::MODULE_CODE_ASM: return "ASM"; |
| + case naclbitc::MODULE_CODE_SECTIONNAME: return "SECTIONNAME"; |
| + case naclbitc::MODULE_CODE_DEPLIB: return "DEPLIB"; // FIXME: Remove in 4.0 |
| + case naclbitc::MODULE_CODE_GLOBALVAR: return "GLOBALVAR"; |
| + case naclbitc::MODULE_CODE_FUNCTION: return "FUNCTION"; |
| + case naclbitc::MODULE_CODE_ALIAS: return "ALIAS"; |
| + case naclbitc::MODULE_CODE_PURGEVALS: return "PURGEVALS"; |
| + case naclbitc::MODULE_CODE_GCNAME: return "GCNAME"; |
| } |
| - case bitc::PARAMATTR_BLOCK_ID: |
| + case naclbitc::PARAMATTR_BLOCK_ID: |
| switch (CodeID) { |
| default: return 0; |
| - case bitc::PARAMATTR_CODE_ENTRY_OLD: return "ENTRY"; |
| - case bitc::PARAMATTR_CODE_ENTRY: return "ENTRY"; |
| - case bitc::PARAMATTR_GRP_CODE_ENTRY: return "ENTRY"; |
| + case naclbitc::PARAMATTR_CODE_ENTRY_OLD: return "ENTRY"; |
| + case naclbitc::PARAMATTR_CODE_ENTRY: return "ENTRY"; |
| + case naclbitc::PARAMATTR_GRP_CODE_ENTRY: return "ENTRY"; |
| } |
| - case bitc::TYPE_BLOCK_ID_NEW: |
| + case naclbitc::TYPE_BLOCK_ID_NEW: |
| switch (CodeID) { |
| default: return 0; |
| - case bitc::TYPE_CODE_NUMENTRY: return "NUMENTRY"; |
| - case bitc::TYPE_CODE_VOID: return "VOID"; |
| - case bitc::TYPE_CODE_FLOAT: return "FLOAT"; |
| - case bitc::TYPE_CODE_DOUBLE: return "DOUBLE"; |
| - case bitc::TYPE_CODE_LABEL: return "LABEL"; |
| - case bitc::TYPE_CODE_OPAQUE: return "OPAQUE"; |
| - case bitc::TYPE_CODE_INTEGER: return "INTEGER"; |
| - case bitc::TYPE_CODE_POINTER: return "POINTER"; |
| - case bitc::TYPE_CODE_ARRAY: return "ARRAY"; |
| - case bitc::TYPE_CODE_VECTOR: return "VECTOR"; |
| - case bitc::TYPE_CODE_X86_FP80: return "X86_FP80"; |
| - case bitc::TYPE_CODE_FP128: return "FP128"; |
| - case bitc::TYPE_CODE_PPC_FP128: return "PPC_FP128"; |
| - case bitc::TYPE_CODE_METADATA: return "METADATA"; |
| - case bitc::TYPE_CODE_STRUCT_ANON: return "STRUCT_ANON"; |
| - case bitc::TYPE_CODE_STRUCT_NAME: return "STRUCT_NAME"; |
| - case bitc::TYPE_CODE_STRUCT_NAMED: return "STRUCT_NAMED"; |
| - case bitc::TYPE_CODE_FUNCTION: return "FUNCTION"; |
| + case naclbitc::TYPE_CODE_NUMENTRY: return "NUMENTRY"; |
| + case naclbitc::TYPE_CODE_VOID: return "VOID"; |
| + case naclbitc::TYPE_CODE_FLOAT: return "FLOAT"; |
| + case naclbitc::TYPE_CODE_DOUBLE: return "DOUBLE"; |
| + case naclbitc::TYPE_CODE_LABEL: return "LABEL"; |
| + case naclbitc::TYPE_CODE_OPAQUE: return "OPAQUE"; |
| + case naclbitc::TYPE_CODE_INTEGER: return "INTEGER"; |
| + case naclbitc::TYPE_CODE_POINTER: return "POINTER"; |
| + case naclbitc::TYPE_CODE_ARRAY: return "ARRAY"; |
| + case naclbitc::TYPE_CODE_VECTOR: return "VECTOR"; |
| + case naclbitc::TYPE_CODE_X86_FP80: return "X86_FP80"; |
| + case naclbitc::TYPE_CODE_FP128: return "FP128"; |
| + case naclbitc::TYPE_CODE_PPC_FP128: return "PPC_FP128"; |
| + case naclbitc::TYPE_CODE_METADATA: return "METADATA"; |
| + case naclbitc::TYPE_CODE_STRUCT_ANON: return "STRUCT_ANON"; |
| + case naclbitc::TYPE_CODE_STRUCT_NAME: return "STRUCT_NAME"; |
| + case naclbitc::TYPE_CODE_STRUCT_NAMED: return "STRUCT_NAMED"; |
| + case naclbitc::TYPE_CODE_FUNCTION: return "FUNCTION"; |
| } |
| - case bitc::CONSTANTS_BLOCK_ID: |
| + case naclbitc::CONSTANTS_BLOCK_ID: |
| switch (CodeID) { |
| default: return 0; |
| - case bitc::CST_CODE_SETTYPE: return "SETTYPE"; |
| - case bitc::CST_CODE_NULL: return "NULL"; |
| - case bitc::CST_CODE_UNDEF: return "UNDEF"; |
| - case bitc::CST_CODE_INTEGER: return "INTEGER"; |
| - case bitc::CST_CODE_WIDE_INTEGER: return "WIDE_INTEGER"; |
| - case bitc::CST_CODE_FLOAT: return "FLOAT"; |
| - case bitc::CST_CODE_AGGREGATE: return "AGGREGATE"; |
| - case bitc::CST_CODE_STRING: return "STRING"; |
| - case bitc::CST_CODE_CSTRING: return "CSTRING"; |
| - case bitc::CST_CODE_CE_BINOP: return "CE_BINOP"; |
| - case bitc::CST_CODE_CE_CAST: return "CE_CAST"; |
| - case bitc::CST_CODE_CE_GEP: return "CE_GEP"; |
| - case bitc::CST_CODE_CE_INBOUNDS_GEP: return "CE_INBOUNDS_GEP"; |
| - case bitc::CST_CODE_CE_SELECT: return "CE_SELECT"; |
| - case bitc::CST_CODE_CE_EXTRACTELT: return "CE_EXTRACTELT"; |
| - case bitc::CST_CODE_CE_INSERTELT: return "CE_INSERTELT"; |
| - case bitc::CST_CODE_CE_SHUFFLEVEC: return "CE_SHUFFLEVEC"; |
| - case bitc::CST_CODE_CE_CMP: return "CE_CMP"; |
| - case bitc::CST_CODE_INLINEASM: return "INLINEASM"; |
| - case bitc::CST_CODE_CE_SHUFVEC_EX: return "CE_SHUFVEC_EX"; |
| - case bitc::CST_CODE_BLOCKADDRESS: return "CST_CODE_BLOCKADDRESS"; |
| - case bitc::CST_CODE_DATA: return "DATA"; |
| + case naclbitc::CST_CODE_SETTYPE: return "SETTYPE"; |
| + case naclbitc::CST_CODE_NULL: return "NULL"; |
| + case naclbitc::CST_CODE_UNDEF: return "UNDEF"; |
| + case naclbitc::CST_CODE_INTEGER: return "INTEGER"; |
| + case naclbitc::CST_CODE_WIDE_INTEGER: return "WIDE_INTEGER"; |
| + case naclbitc::CST_CODE_FLOAT: return "FLOAT"; |
| + case naclbitc::CST_CODE_AGGREGATE: return "AGGREGATE"; |
| + case naclbitc::CST_CODE_STRING: return "STRING"; |
| + case naclbitc::CST_CODE_CSTRING: return "CSTRING"; |
| + case naclbitc::CST_CODE_CE_BINOP: return "CE_BINOP"; |
| + case naclbitc::CST_CODE_CE_CAST: return "CE_CAST"; |
| + case naclbitc::CST_CODE_CE_GEP: return "CE_GEP"; |
| + case naclbitc::CST_CODE_CE_INBOUNDS_GEP: return "CE_INBOUNDS_GEP"; |
| + case naclbitc::CST_CODE_CE_SELECT: return "CE_SELECT"; |
| + case naclbitc::CST_CODE_CE_EXTRACTELT: return "CE_EXTRACTELT"; |
| + case naclbitc::CST_CODE_CE_INSERTELT: return "CE_INSERTELT"; |
| + case naclbitc::CST_CODE_CE_SHUFFLEVEC: return "CE_SHUFFLEVEC"; |
| + case naclbitc::CST_CODE_CE_CMP: return "CE_CMP"; |
| + case naclbitc::CST_CODE_INLINEASM: return "INLINEASM"; |
| + case naclbitc::CST_CODE_CE_SHUFVEC_EX: return "CE_SHUFVEC_EX"; |
| + case naclbitc::CST_CODE_BLOCKADDRESS: return "CST_CODE_BLOCKADDRESS"; |
| + case naclbitc::CST_CODE_DATA: return "DATA"; |
| } |
| - case bitc::FUNCTION_BLOCK_ID: |
| + case naclbitc::FUNCTION_BLOCK_ID: |
| switch (CodeID) { |
| default: return 0; |
| - case bitc::FUNC_CODE_DECLAREBLOCKS: return "DECLAREBLOCKS"; |
| - |
| - case bitc::FUNC_CODE_INST_BINOP: return "INST_BINOP"; |
| - case bitc::FUNC_CODE_INST_CAST: return "INST_CAST"; |
| - case bitc::FUNC_CODE_INST_GEP: return "INST_GEP"; |
| - case bitc::FUNC_CODE_INST_INBOUNDS_GEP: return "INST_INBOUNDS_GEP"; |
| - case bitc::FUNC_CODE_INST_SELECT: return "INST_SELECT"; |
| - case bitc::FUNC_CODE_INST_EXTRACTELT: return "INST_EXTRACTELT"; |
| - case bitc::FUNC_CODE_INST_INSERTELT: return "INST_INSERTELT"; |
| - case bitc::FUNC_CODE_INST_SHUFFLEVEC: return "INST_SHUFFLEVEC"; |
| - case bitc::FUNC_CODE_INST_CMP: return "INST_CMP"; |
| - |
| - case bitc::FUNC_CODE_INST_RET: return "INST_RET"; |
| - case bitc::FUNC_CODE_INST_BR: return "INST_BR"; |
| - case bitc::FUNC_CODE_INST_SWITCH: return "INST_SWITCH"; |
| - case bitc::FUNC_CODE_INST_INVOKE: return "INST_INVOKE"; |
| - case bitc::FUNC_CODE_INST_UNREACHABLE: return "INST_UNREACHABLE"; |
| - |
| - case bitc::FUNC_CODE_INST_PHI: return "INST_PHI"; |
| - case bitc::FUNC_CODE_INST_ALLOCA: return "INST_ALLOCA"; |
| - case bitc::FUNC_CODE_INST_LOAD: return "INST_LOAD"; |
| - case bitc::FUNC_CODE_INST_VAARG: return "INST_VAARG"; |
| - case bitc::FUNC_CODE_INST_STORE: return "INST_STORE"; |
| - case bitc::FUNC_CODE_INST_EXTRACTVAL: return "INST_EXTRACTVAL"; |
| - case bitc::FUNC_CODE_INST_INSERTVAL: return "INST_INSERTVAL"; |
| - case bitc::FUNC_CODE_INST_CMP2: return "INST_CMP2"; |
| - case bitc::FUNC_CODE_INST_VSELECT: return "INST_VSELECT"; |
| - case bitc::FUNC_CODE_DEBUG_LOC_AGAIN: return "DEBUG_LOC_AGAIN"; |
| - case bitc::FUNC_CODE_INST_CALL: return "INST_CALL"; |
| - case bitc::FUNC_CODE_DEBUG_LOC: return "DEBUG_LOC"; |
| + case naclbitc::FUNC_CODE_DECLAREBLOCKS: return "DECLAREBLOCKS"; |
| + |
| + case naclbitc::FUNC_CODE_INST_BINOP: return "INST_BINOP"; |
| + case naclbitc::FUNC_CODE_INST_CAST: return "INST_CAST"; |
| + case naclbitc::FUNC_CODE_INST_GEP: return "INST_GEP"; |
| + case naclbitc::FUNC_CODE_INST_INBOUNDS_GEP: return "INST_INBOUNDS_GEP"; |
| + case naclbitc::FUNC_CODE_INST_SELECT: return "INST_SELECT"; |
| + case naclbitc::FUNC_CODE_INST_EXTRACTELT: return "INST_EXTRACTELT"; |
| + case naclbitc::FUNC_CODE_INST_INSERTELT: return "INST_INSERTELT"; |
| + case naclbitc::FUNC_CODE_INST_SHUFFLEVEC: return "INST_SHUFFLEVEC"; |
| + case naclbitc::FUNC_CODE_INST_CMP: return "INST_CMP"; |
| + |
| + case naclbitc::FUNC_CODE_INST_RET: return "INST_RET"; |
| + case naclbitc::FUNC_CODE_INST_BR: return "INST_BR"; |
| + case naclbitc::FUNC_CODE_INST_SWITCH: return "INST_SWITCH"; |
| + case naclbitc::FUNC_CODE_INST_INVOKE: return "INST_INVOKE"; |
| + case naclbitc::FUNC_CODE_INST_UNREACHABLE: return "INST_UNREACHABLE"; |
| + |
| + case naclbitc::FUNC_CODE_INST_PHI: return "INST_PHI"; |
| + case naclbitc::FUNC_CODE_INST_ALLOCA: return "INST_ALLOCA"; |
| + case naclbitc::FUNC_CODE_INST_LOAD: return "INST_LOAD"; |
| + case naclbitc::FUNC_CODE_INST_VAARG: return "INST_VAARG"; |
| + case naclbitc::FUNC_CODE_INST_STORE: return "INST_STORE"; |
| + case naclbitc::FUNC_CODE_INST_EXTRACTVAL: return "INST_EXTRACTVAL"; |
| + case naclbitc::FUNC_CODE_INST_INSERTVAL: return "INST_INSERTVAL"; |
| + case naclbitc::FUNC_CODE_INST_CMP2: return "INST_CMP2"; |
| + case naclbitc::FUNC_CODE_INST_VSELECT: return "INST_VSELECT"; |
| + case naclbitc::FUNC_CODE_DEBUG_LOC_AGAIN: return "DEBUG_LOC_AGAIN"; |
| + case naclbitc::FUNC_CODE_INST_CALL: return "INST_CALL"; |
| + case naclbitc::FUNC_CODE_DEBUG_LOC: return "DEBUG_LOC"; |
| } |
| - case bitc::VALUE_SYMTAB_BLOCK_ID: |
| + case naclbitc::VALUE_SYMTAB_BLOCK_ID: |
| switch (CodeID) { |
| default: return 0; |
| - case bitc::VST_CODE_ENTRY: return "ENTRY"; |
| - case bitc::VST_CODE_BBENTRY: return "BBENTRY"; |
| + case naclbitc::VST_CODE_ENTRY: return "ENTRY"; |
| + case naclbitc::VST_CODE_BBENTRY: return "BBENTRY"; |
| } |
| - case bitc::METADATA_ATTACHMENT_ID: |
| + case naclbitc::METADATA_ATTACHMENT_ID: |
| switch(CodeID) { |
| default:return 0; |
| - case bitc::METADATA_ATTACHMENT: return "METADATA_ATTACHMENT"; |
| + case naclbitc::METADATA_ATTACHMENT: return "METADATA_ATTACHMENT"; |
| } |
| - case bitc::METADATA_BLOCK_ID: |
| + case naclbitc::METADATA_BLOCK_ID: |
| switch(CodeID) { |
| default:return 0; |
| - case bitc::METADATA_STRING: return "METADATA_STRING"; |
| - case bitc::METADATA_NAME: return "METADATA_NAME"; |
| - case bitc::METADATA_KIND: return "METADATA_KIND"; |
| - case bitc::METADATA_NODE: return "METADATA_NODE"; |
| - case bitc::METADATA_FN_NODE: return "METADATA_FN_NODE"; |
| - case bitc::METADATA_NAMED_NODE: return "METADATA_NAMED_NODE"; |
| + case naclbitc::METADATA_STRING: return "METADATA_STRING"; |
| + case naclbitc::METADATA_NAME: return "METADATA_NAME"; |
| + case naclbitc::METADATA_KIND: return "METADATA_KIND"; |
| + case naclbitc::METADATA_NODE: return "METADATA_NODE"; |
| + case naclbitc::METADATA_FN_NODE: return "METADATA_FN_NODE"; |
| + case naclbitc::METADATA_NAMED_NODE: return "METADATA_NAMED_NODE"; |
| } |
| - case bitc::USELIST_BLOCK_ID: |
| + case naclbitc::USELIST_BLOCK_ID: |
| switch(CodeID) { |
| default:return 0; |
| - case bitc::USELIST_CODE_ENTRY: return "USELIST_CODE_ENTRY"; |
| + case naclbitc::USELIST_CODE_ENTRY: return "USELIST_CODE_ENTRY"; |
| } |
| } |
| } |
| @@ -321,7 +322,7 @@ static bool Error(const std::string &Err) { |
| } |
| /// ParseBlock - Read a block, updating statistics, etc. |
| -static bool ParseBlock(BitstreamCursor &Stream, unsigned BlockID, |
| +static bool ParseBlock(NaClBitstreamCursor &Stream, unsigned BlockID, |
| unsigned IndentLevel) { |
| std::string Indent(IndentLevel*2, ' '); |
| uint64_t BlockBitStart = Stream.GetCurrentBitNo(); |
| @@ -332,7 +333,7 @@ static bool ParseBlock(BitstreamCursor &Stream, unsigned BlockID, |
| BlockStats.NumInstances++; |
| // BLOCKINFO is a special part of the stream. |
| - if (BlockID == bitc::BLOCKINFO_BLOCK_ID) { |
| + if (BlockID == naclbitc::BLOCKINFO_BLOCK_ID) { |
| if (Dump) outs() << Indent << "<BLOCKINFO_BLOCK/>\n"; |
| if (Stream.ReadBlockInfoBlock()) |
| return Error("Malformed BlockInfoBlock"); |
| @@ -369,13 +370,13 @@ static bool ParseBlock(BitstreamCursor &Stream, unsigned BlockID, |
| uint64_t RecordStartBit = Stream.GetCurrentBitNo(); |
| - BitstreamEntry Entry = |
| - Stream.advance(BitstreamCursor::AF_DontAutoprocessAbbrevs); |
| + NaClBitstreamEntry Entry = |
| + Stream.advance(NaClBitstreamCursor::AF_DontAutoprocessAbbrevs); |
| switch (Entry.Kind) { |
| - case BitstreamEntry::Error: |
| + case NaClBitstreamEntry::Error: |
| return Error("malformed bitcode file"); |
| - case BitstreamEntry::EndBlock: { |
| + case NaClBitstreamEntry::EndBlock: { |
| uint64_t BlockBitEnd = Stream.GetCurrentBitNo(); |
| BlockStats.NumBits += BlockBitEnd-BlockBitStart; |
| if (Dump) { |
| @@ -388,7 +389,7 @@ static bool ParseBlock(BitstreamCursor &Stream, unsigned BlockID, |
| return false; |
| } |
| - case BitstreamEntry::SubBlock: { |
| + case NaClBitstreamEntry::SubBlock: { |
| uint64_t SubBlockBitStart = Stream.GetCurrentBitNo(); |
| if (ParseBlock(Stream, Entry.ID, IndentLevel+1)) |
| return true; |
| @@ -399,12 +400,12 @@ static bool ParseBlock(BitstreamCursor &Stream, unsigned BlockID, |
| BlockBitStart += SubBlockBitEnd-SubBlockBitStart; |
| continue; |
| } |
| - case BitstreamEntry::Record: |
| + case NaClBitstreamEntry::Record: |
| // The interesting case. |
| break; |
| } |
| - if (Entry.ID == bitc::DEFINE_ABBREV) { |
| + if (Entry.ID == naclbitc::DEFINE_ABBREV) { |
| Stream.ReadAbbrevRecord(); |
| ++BlockStats.NumAbbrevs; |
| continue; |
| @@ -423,7 +424,7 @@ static bool ParseBlock(BitstreamCursor &Stream, unsigned BlockID, |
| BlockStats.CodeFreq[Code].NumInstances++; |
| BlockStats.CodeFreq[Code].TotalBits += |
| Stream.GetCurrentBitNo()-RecordStartBit; |
| - if (Entry.ID != bitc::UNABBREV_RECORD) { |
| + if (Entry.ID != naclbitc::UNABBREV_RECORD) { |
| BlockStats.CodeFreq[Code].NumAbbrev++; |
| ++BlockStats.NumAbbreviatedRecords; |
| } |
| @@ -438,7 +439,7 @@ static bool ParseBlock(BitstreamCursor &Stream, unsigned BlockID, |
| if (NonSymbolic && |
| GetCodeName(Code, BlockID, *Stream.getBitStreamReader())) |
| outs() << " codeid=" << Code; |
| - if (Entry.ID != bitc::UNABBREV_RECORD) |
| + if (Entry.ID != naclbitc::UNABBREV_RECORD) |
| outs() << " abbrevid=" << Entry.ID; |
| for (unsigned i = 0, e = Record.size(); i != e; ++i) |
| @@ -492,12 +493,12 @@ static int AnalyzeBitcode() { |
| // If we have a wrapper header, parse it and ignore the non-bc file contents. |
| // The magic number is 0x0B17C0DE stored in little endian. |
| - if (isBitcodeWrapper(BufPtr, EndBufPtr)) |
| - if (SkipBitcodeWrapperHeader(BufPtr, EndBufPtr, true)) |
| + if (isNaClBitcodeWrapper(BufPtr, EndBufPtr)) |
| + if (SkipNaClBitcodeWrapperHeader(BufPtr, EndBufPtr, true)) |
| return Error("Invalid bitcode wrapper header"); |
| - BitstreamReader StreamFile(BufPtr, EndBufPtr); |
| - BitstreamCursor Stream(StreamFile); |
| + NaClBitstreamReader StreamFile(BufPtr, EndBufPtr); |
| + NaClBitstreamCursor Stream(StreamFile); |
| StreamFile.CollectBlockInfoNames(); |
| // Read the stream signature. |
| @@ -521,7 +522,7 @@ static int AnalyzeBitcode() { |
| // Parse the top-level structure. We only allow blocks at the top-level. |
| while (!Stream.AtEndOfStream()) { |
| unsigned Code = Stream.ReadCode(); |
| - if (Code != bitc::ENTER_SUBBLOCK) |
| + if (Code != naclbitc::ENTER_SUBBLOCK) |
| return Error("Invalid record at top-level"); |
| unsigned BlockID = Stream.ReadSubBlockID(); |