minor cleanups. Add provisions for a new standard BLOCKINFO_BLOCK

[oota-llvm.git] / include / llvm / Bitcode / LLVMBitCodes.h

diff --git a/include/llvm/Bitcode/LLVMBitCodes.h b/include/llvm/Bitcode/LLVMBitCodes.h
index 5316e4e7e3600229c0063f20d620d29393253ffb..1ce411b0c0ad3e12db57841a1bf2d6951aa4811a 100644 (file)
--- a/include/llvm/Bitcode/LLVMBitCodes.h
+++ b/include/llvm/Bitcode/LLVMBitCodes.h
@@ -25,15 +25,15 @@ namespace bitc {
   // The only top-level block type defined is for a module.
   enum BlockIDs {
     // Blocks
-    MODULE_BLOCK_ID          = 0,
+    MODULE_BLOCK_ID          = FIRST_APPLICATION_BLOCKID,
   
-    // Module sub-block id's
-    PARAMATTR_BLOCK_ID       = 1,
-    TYPE_BLOCK_ID            = 2,
-    CONSTANTS_BLOCK_ID       = 3,
-    FUNCTION_BLOCK_ID        = 4,
-    TYPE_SYMTAB_BLOCK_ID     = 5,
-    VALUE_SYMTAB_BLOCK_ID    = 6
+    // Module sub-block id's.
+    PARAMATTR_BLOCK_ID,
+    TYPE_BLOCK_ID,
+    CONSTANTS_BLOCK_ID,
+    FUNCTION_BLOCK_ID,
+    TYPE_SYMTAB_BLOCK_ID,
+    VALUE_SYMTAB_BLOCK_ID
   };
   
   
@@ -68,21 +68,20 @@ namespace bitc {
   
   /// TYPE blocks have codes for each type primitive they use.
   enum TypeCodes {
-    TYPE_CODE_NUMENTRY =  1,   // TYPE_CODE_NUMENTRY: [numentries]
-    TYPE_CODE_META     =  2,   // TYPE_CODE_META: [metacode]... - Future use
+    TYPE_CODE_NUMENTRY =  1,   // NUMENTRY: [numentries]
     
     // Type Codes
-    TYPE_CODE_VOID     =  3,   // VOID
-    TYPE_CODE_FLOAT    =  4,   // FLOAT
-    TYPE_CODE_DOUBLE   =  5,   // DOUBLE
-    TYPE_CODE_LABEL    =  6,   // LABEL
-    TYPE_CODE_OPAQUE   =  7,   // OPAQUE
-    TYPE_CODE_INTEGER  =  8,   // INTEGER: [width]
-    TYPE_CODE_POINTER  =  9,   // POINTER: [pointee type]
-    TYPE_CODE_FUNCTION = 10,   // FUNCTION: [vararg, retty, #pararms, paramty N]
-    TYPE_CODE_STRUCT   = 11,   // STRUCT: [ispacked, #elts, eltty x N]
-    TYPE_CODE_ARRAY    = 12,   // ARRAY: [numelts, eltty]
-    TYPE_CODE_VECTOR   = 13    // VECTOR: [numelts, eltty]
+    TYPE_CODE_VOID     =  2,   // VOID
+    TYPE_CODE_FLOAT    =  3,   // FLOAT
+    TYPE_CODE_DOUBLE   =  4,   // DOUBLE
+    TYPE_CODE_LABEL    =  5,   // LABEL
+    TYPE_CODE_OPAQUE   =  6,   // OPAQUE
+    TYPE_CODE_INTEGER  =  7,   // INTEGER: [width]
+    TYPE_CODE_POINTER  =  8,   // POINTER: [pointee type]
+    TYPE_CODE_FUNCTION =  9,   // FUNCTION: [vararg, retty, #pararms, paramty N]
+    TYPE_CODE_STRUCT   = 10,   // STRUCT: [ispacked, #elts, eltty x N]
+    TYPE_CODE_ARRAY    = 11,   // ARRAY: [numelts, eltty]
+    TYPE_CODE_VECTOR   = 12    // VECTOR: [numelts, eltty]
     // Any other type code is assumed to be an unknown type.
   };