From: Eli Friedman Date: Tue, 26 Jul 2011 20:24:06 +0000 (+0000) Subject: Fix a couple minor mistakes pointed out by Bill in adding 'fence' instruction. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=be9a9afee58a1d62f528c6b30bf835c95e2b8bab;p=oota-llvm.git Fix a couple minor mistakes pointed out by Bill in adding 'fence' instruction. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136124 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm-c/Core.h b/include/llvm-c/Core.h index 9e20ed6f744..4288a3d0acd 100644 --- a/include/llvm-c/Core.h +++ b/include/llvm-c/Core.h @@ -155,35 +155,36 @@ typedef enum { LLVMLoad = 27, LLVMStore = 28, LLVMGetElementPtr = 29, + LLVMFence = 30, /* Cast Operators */ - LLVMTrunc = 30, - LLVMZExt = 31, - LLVMSExt = 32, - LLVMFPToUI = 33, - LLVMFPToSI = 34, - LLVMUIToFP = 35, - LLVMSIToFP = 36, - LLVMFPTrunc = 37, - LLVMFPExt = 38, - LLVMPtrToInt = 39, - LLVMIntToPtr = 40, - LLVMBitCast = 41, + LLVMTrunc = 33, + LLVMZExt = 34, + LLVMSExt = 35, + LLVMFPToUI = 36, + LLVMFPToSI = 37, + LLVMUIToFP = 38, + LLVMSIToFP = 39, + LLVMFPTrunc = 40, + LLVMFPExt = 41, + LLVMPtrToInt = 42, + LLVMIntToPtr = 43, + LLVMBitCast = 44, /* Other Operators */ - LLVMICmp = 42, - LLVMFCmp = 43, - LLVMPHI = 44, - LLVMCall = 45, - LLVMSelect = 46, + LLVMICmp = 45, + LLVMFCmp = 46, + LLVMPHI = 47, + LLVMCall = 48, + LLVMSelect = 49, /* UserOp1 */ /* UserOp2 */ - LLVMVAArg = 49, - LLVMExtractElement = 50, - LLVMInsertElement = 51, - LLVMShuffleVector = 52, - LLVMExtractValue = 53, - LLVMInsertValue = 54 + LLVMVAArg = 52, + LLVMExtractElement = 53, + LLVMInsertElement = 54, + LLVMShuffleVector = 55, + LLVMExtractValue = 56, + LLVMInsertValue = 57 } LLVMOpcode; typedef enum { diff --git a/include/llvm/Instruction.def b/include/llvm/Instruction.def index e418165afd4..81e306779ef 100644 --- a/include/llvm/Instruction.def +++ b/include/llvm/Instruction.def @@ -134,7 +134,7 @@ HANDLE_MEMORY_INST(27, Load , LoadInst ) // Memory manipulation instrs HANDLE_MEMORY_INST(28, Store , StoreInst ) HANDLE_MEMORY_INST(29, GetElementPtr, GetElementPtrInst) HANDLE_MEMORY_INST(30, Fence , FenceInst ) - LAST_MEMORY_INST(32) + LAST_MEMORY_INST(30) // Cast operators ... // NOTE: The order matters here because CastInst::isEliminableCastPair