aboutsummaryrefslogtreecommitdiff
path: root/include/llvm
diff options
context:
space:
mode:
authorKarl Schimpf <kschimpf@google.com>2013-08-05 08:47:19 -0700
committerKarl Schimpf <kschimpf@google.com>2013-08-05 08:47:19 -0700
commitb6846e1a64c3a56be80f1b7bd2d5bf10cfabc36f (patch)
treeb734d0ec39b4cdf6beb905f31a7d6272089252b8 /include/llvm
parent39bd1f66ebd83185944cf08903d8abf80321c17d (diff)
Fix handling of the volatile bit of loads/stores in PNaCl bitcode files.
Fixes so that the volatile bit is no longer put into the bitcode file, since the volatile bit is not in the PNaCl ABI. BUG= https://code.google.com/p/nativeclient/issues/detail?id=3610 R=jvoung@chromium.org Review URL: https://codereview.chromium.org/21949006
Diffstat (limited to 'include/llvm')
-rw-r--r--include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h b/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h
index b83bb0f95b..30ec3e4df0 100644
--- a/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h
+++ b/include/llvm/Bitcode/NaCl/NaClLLVMBitCodes.h
@@ -289,11 +289,14 @@ namespace naclbitc {
FUNC_CODE_INST_LOAD = 20, // PNaCl version 1:
// LOAD: [op, align, vol]
// PNaCl version 2:
- // LOAD: [op, align, vol, ty]
+ // LOAD: [op, align, ty]
// 21 is unused.
// 22 is unused.
FUNC_CODE_INST_VAARG = 23, // Not used in PNaCl.
- FUNC_CODE_INST_STORE = 24, // STORE: [ptr, val, align, vol]
+ FUNC_CODE_INST_STORE = 24, // PNaCl version 1:
+ // STORE: [ptr, val, align, vol]
+ // PNaCl version 2:
+ // Store: [ptr, val, align]
// 25 is unused.
FUNC_CODE_INST_EXTRACTVAL = 26, // Not used in PNaCl.
FUNC_CODE_INST_INSERTVAL = 27, // Not used in PNaCl.