aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKarl Schimpf <kschimpf@google.com>2013-09-06 13:27:38 -0700
committerKarl Schimpf <kschimpf@google.com>2013-09-06 13:27:38 -0700
commit9b86d1e242fec1dce22eda36b8f2eb3d6f1cc380 (patch)
treea732249a07bdb6aacd4d783152d8032674a89768 /include
parent38a5426a06d06aa18de1cc332411c04c348b01e4 (diff)
Clean up vestigial code for constants in PNaCl bitcode files.
* Removes code that is no longer used because global variables are handled separately. * Removes CST_CODE_NULL. * Adds special abbreviations for constant integer 0, replacing most of what was lost when CST_CODE_NULL is removed. * Adds abbreviation for floating point constants. * Removes CST_CODE_AGGREGATE and CST_CODE_DATA, except for reading old PNaCl version 1 bitcode files. * Removes call to ParseConstants() in ParseModule() since the module block no longer contains a constants block (globals are handled separately). * Removes getConstantFwdRef() method, since it is no longer needed. * Remove ConstantPlaceHolder class, since it is no longer needed. * Remove ResolvedConstants and ResolveConstantForwardRefs() from the bitcode reader, since it is no longer needed. BUG= https://code.google.com/p/nativeclient/issues/detail?id=3668 R=mseaborn@chromium.org Review URL: https://codereview.chromium.org/23522024
Diffstat (limited to 'include')
-rw-r--r--include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h b/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h
index 2e3cd21652..cf1c98febf 100644
--- a/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h
+++ b/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h
@@ -153,12 +153,18 @@ namespace naclbitc {
// constant and maintains an implicit current type value.
enum NaClConstantsCodes {
CST_CODE_SETTYPE = 1, // SETTYPE: [typeid]
- CST_CODE_NULL = 2, // NULL
+ CST_CODE_NULL = 2, // PNaCl version 1 (early versions only).
+ // NULL
+ // Not used in PNaCl otherwise (i.e.
+ // PNaCl versions 1+).
CST_CODE_UNDEF = 3, // UNDEF
CST_CODE_INTEGER = 4, // INTEGER: [intval]
CST_CODE_WIDE_INTEGER = 5, // Not used in PNaCl.
CST_CODE_FLOAT = 6, // FLOAT: [fpval]
- CST_CODE_AGGREGATE = 7, // AGGREGATE: [n x value number]
+ CST_CODE_AGGREGATE = 7, // PNaCl version 1 (early versions only).
+ // AGGREGATE: [n x value number]
+ // Not used in PNaCl otherwise (i.e.
+ // PNaCl versions 1+).
CST_CODE_STRING = 8, // Not used in PNaCl.
CST_CODE_CSTRING = 9, // Not used in PNaCl.
CST_CODE_CE_BINOP = 10, // Not used in PNaCl.
@@ -173,7 +179,10 @@ namespace naclbitc {
CST_CODE_CE_SHUFVEC_EX = 19, // Not used in PNaCl.
CST_CODE_CE_INBOUNDS_GEP = 20,// Not used in PNaCl.
CST_CODE_BLOCKADDRESS = 21, // Not used in PNaCl.
- CST_CODE_DATA = 22, // DATA: [n x elements]
+ CST_CODE_DATA = 22, // PNaCl version 1 (early versions only).
+ // DATA: [n x elements]
+ // Not used in PNaCl otherwise (i.e.
+ // PNaCl versions 1+).
CST_CODE_INLINEASM = 23 // Not used in PNaCl.
};