Mercurial > projects > ldc
changeset 1585:29b0f2d11c92
Updated C binding to be more up to date with LLVM.
| author | tomas@localhost.localdomain |
|---|---|
| date | Thu, 22 Oct 2009 13:30:30 +0200 |
| parents | f4c56ed32238 |
| children | 7f728c52e63c |
| files | tools/binding/llvm/c/BitReader.d tools/binding/llvm/c/Core.d tools/binding/llvm/c/Target.d tools/binding/llvm/c/transforms/IPO.d tools/binding/llvm/c/transforms/Scalar.d |
| diffstat | 5 files changed, 237 insertions(+), 70 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/binding/llvm/c/BitReader.d Wed Oct 21 05:46:56 2009 +0200 +++ b/tools/binding/llvm/c/BitReader.d Thu Oct 22 13:30:30 2009 +0200 @@ -26,13 +26,13 @@ /* Builds a module from the bitcode in the specified memory buffer, returning a reference to the module via the OutModule parameter. Returns 0 on success. - Optionally returns a human-readable error message via OutMessage. */ + Optionally returns a human-readable error message via OutMessage. */ int LLVMParseBitcode(LLVMMemoryBufferRef MemBuf, LLVMModuleRef *OutModule, char **OutMessage); /* Reads a module from the specified path, returning via the OutMP parameter a module provider which performs lazy deserialization. Returns 0 on success. - Optionally returns a human-readable error message via OutMessage. */ + Optionally returns a human-readable error message via OutMessage. */ int LLVMGetBitcodeModuleProvider(LLVMMemoryBufferRef MemBuf, LLVMModuleProviderRef *OutMP, char **OutMessage);
--- a/tools/binding/llvm/c/Core.d Wed Oct 21 05:46:56 2009 +0200 +++ b/tools/binding/llvm/c/Core.d Thu Oct 22 13:30:30 2009 +0200 @@ -36,58 +36,43 @@ extern(C): -/* Opaque types. */ - -private -{ - struct LLVM_OpaqueModule {} - struct LLVM_OpaqueType {} - struct LLVM_OpaqueTypeHandle {} - struct LLVM_OpaqueValue {} - struct LLVM_OpaqueBasicBlock {} - struct LLVM_OpaqueBuilder {} - struct LLVM_OpaqueModuleProvider {} - struct LLVM_OpaqueMemoryBuffer {} - struct LLVM_OpaquePassManager {} -} - /** * The top-level container for all other LLVM Intermediate Representation (IR) * objects. See the llvm::Module class. */ -typedef LLVM_OpaqueModule* LLVMModuleRef; +typedef void* LLVMModuleRef; /** * Each value in the LLVM IR has a type, an instance of [lltype]. See the * llvm::Type class. */ -typedef LLVM_OpaqueType* LLVMTypeRef; +typedef void* LLVMTypeRef; /** * When building recursive types using [refine_type], [lltype] values may become * invalid; use [lltypehandle] to resolve this problem. See the - * llvm::AbstractTypeHolder] class. + * llvm::AbstractTypeHolder] class. */ -typedef LLVM_OpaqueTypeHandle* LLVMTypeHandleRef; +typedef void* LLVMTypeHandleRef; -typedef LLVM_OpaqueValue* LLVMValueRef; -typedef LLVM_OpaqueBasicBlock* LLVMBasicBlockRef; -typedef LLVM_OpaqueBuilder* LLVMBuilderRef; +typedef void* LLVMValueRef; +typedef void* LLVMBasicBlockRef; +typedef void* LLVMBuilderRef; /* Used to provide a module to JIT or interpreter. * See the llvm::ModuleProvider class. */ -typedef LLVM_OpaqueModuleProvider* LLVMModuleProviderRef; +typedef void* LLVMModuleProviderRef; /* Used to provide a module to JIT or interpreter. * See the llvm::MemoryBuffer class. */ -typedef LLVM_OpaqueMemoryBuffer* LLVMMemoryBufferRef; +typedef void* LLVMMemoryBufferRef; /** See the llvm::PassManagerBase class. */ -typedef LLVM_OpaquePassManager* LLVMPassManagerRef; +typedef void* LLVMPassManagerRef; -enum LLVMParamAttr { +enum LLVMAttribute { ZExt = 1<<0, SExt = 1<<1, NoReturn = 1<<2, @@ -98,36 +83,56 @@ ByVal = 1<<7, Nest = 1<<8, ReadNone = 1<<9, - ReadOnly = 1<<10 + ReadOnly = 1<<10, + NoInline = 1<<11, + AlwaysInline = 1<<12, + OptimizeForSize = 1<<13, + StackProtect = 1<<14, + StackProtectReq = 1<<15, + NoCapture = 1<<21, + NoRedZone = 1<<22, + NoImplicitFloat = 1<<23, + Naked = 1<<24 } enum LLVMTypeKind { - Void, /**< type with no size */ - Float, /**< 32 bit floating point type */ - Double, /**< 64 bit floating point type */ - X86_FP80, /**< 80 bit floating point type (X87) */ - FP128, /**< 128 bit floating point type (112-bit mantissa)*/ - PPC_FP128, /**< 128 bit floating point type (two 64-bits) */ - Label, /**< Labels */ - Integer, /**< Arbitrary bit width integers */ - Function, /**< Functions */ - Struct, /**< Structures */ - Array, /**< Arrays */ - Pointer, /**< Pointers */ - Opaque, /**< Opaque: type with unknown structure */ - Vector /**< SIMD 'packed' format, or other vector type */ + Void, /**< type with no size */ + Float, /**< 32 bit floating point type */ + Double, /**< 64 bit floating point type */ + X86_FP80, /**< 80 bit floating point type (X87) */ + FP128, /**< 128 bit floating point type (112-bit mantissa)*/ + PPC_FP128, /**< 128 bit floating point type (two 64-bits) */ + Label, /**< Labels */ + Integer, /**< Arbitrary bit width integers */ + Function, /**< Functions */ + Struct, /**< Structures */ + Array, /**< Arrays */ + Pointer, /**< Pointers */ + Opaque, /**< Opaque: type with unknown structure */ + Vector, /**< SIMD 'packed' format, or other vector type */ + Metadata /**< Metadata */ } enum LLVMLinkage { - External, /**< Externally visible function */ - LinkOnce, /**< Keep one copy of function when linking (inline)*/ - Weak, /**< Keep one copy of function when linking (weak) */ - Appending, /**< Special purpose, only applies to global arrays */ - Internal, /**< Rename collisions when linking (static functions) */ - DLLImport, /**< Function to be imported from DLL */ - DLLExport, /**< Function to be accessible from DLL */ - ExternalWeak,/**< ExternalWeak linkage description */ - Ghost /**< Stand-in functions for streaming fns from bitcode */ + External, /**< Externally visible function */ + AvailableExternally, + LinkOnceAny, /**< Keep one copy of function when linking (inline)*/ + LinkOnceODR, /**< Same, but only replaced by something + equivalent. */ + WeakAny, /**< Keep one copy of function when linking (weak) */ + WeakODR, /**< Same, but only replaced by something + equivalent. */ + Appending, /**< Special purpose, only applies to global arrays */ + Internal, /**< Rename collisions when linking (static + functions) */ + Private, /**< Like Internal, but omit from symbol table */ + DLLImport, /**< Function to be imported from DLL */ + DLLExport, /**< Function to be accessible from DLL */ + ExternalWeak,/**< ExternalWeak linkage description */ + Ghost, /**< Stand-in functions for streaming fns from + bitcode */ + Common, /**< Tentative definitions */ + LinkerPrivate /**< Like Private, but linker removes. */ } enum LLVMVisibility { @@ -184,7 +189,7 @@ /*===-- Modules -----------------------------------------------------------===*/ /* Create and destroy modules. */ -/** See llvm::Module::Module. */ +/** See llvm::Module::Module. */ LLVMModuleRef LLVMModuleCreateWithName(/*const*/ char *ModuleID); /** See llvm::Module::~Module. */ @@ -192,7 +197,7 @@ /** Data layout. See Module::getDataLayout. */ /*const*/ char *LLVMGetDataLayout(LLVMModuleRef M); -void LLVMSetDataLayout(LLVMModuleRef M, /*const*/ char *Triple); +void LLVMSetDataLayout(LLVMModuleRef M, /*const*/ char *DataLayout); /** Target triple. See Module::getTargetTriple. */ /*const*/ char *LLVMGetTarget(LLVMModuleRef M); @@ -208,7 +213,7 @@ /*===-- Types -------------------------------------------------------------===*/ /* LLVM types conform to the following hierarchy: - * + * * types: * integer type * real type @@ -282,7 +287,7 @@ /* The bulk of LLVM's object model consists of values, which comprise a very * rich type hierarchy. - * + * * values: * constants: * scalar constants @@ -311,8 +316,14 @@ /* Operations on scalar constants */ LLVMValueRef LLVMConstInt(LLVMTypeRef IntTy, ulong N, int SignExtend); +LLVMValueRef LLVMConstIntOfString(LLVMTypeRef IntTy, /*const*/ char *Text, + ubyte Radix); +LLVMValueRef LLVMConstIntOfStringAndSize(LLVMTypeRef IntTy, /*const*/ char *Text, + uint SLen, ubyte Radix); LLVMValueRef LLVMConstReal(LLVMTypeRef RealTy, double N); LLVMValueRef LLVMConstRealOfString(LLVMTypeRef RealTy, /*const*/ char *Text); +LLVMValueRef LLVMConstRealOfStringAndSize(LLVMTypeRef RealTy, /*const*/ char *Text, + uint SLen); /* Operations on composite constants */ LLVMValueRef LLVMConstString(/*const*/ char *Str, uint Length, @@ -418,6 +429,8 @@ void LLVMSetFunctionCallConv(LLVMValueRef Fn, uint CC); /*const*/ char *LLVMGetGC(LLVMValueRef Fn); void LLVMSetGC(LLVMValueRef Fn, /*const*/ char *Name); +void LLVMAddFunctionAttr(LLVMValueRef Fn, LLVMAttribute PA); +void LLVMRemoveFunctionAttr(LLVMValueRef Fn, LLVMAttribute PA); /* Operations on parameters */ uint LLVMCountParams(LLVMValueRef Fn); @@ -428,8 +441,8 @@ LLVMValueRef LLVMGetLastParam(LLVMValueRef Fn); LLVMValueRef LLVMGetNextParam(LLVMValueRef Arg); LLVMValueRef LLVMGetPreviousParam(LLVMValueRef Arg); -void LLVMAddParamAttr(LLVMValueRef Arg, LLVMParamAttr PA); -void LLVMRemoveParamAttr(LLVMValueRef Arg, LLVMParamAttr PA); +void LLVMAddAttribute(LLVMValueRef Arg, LLVMAttribute PA); +void LLVMRemoveAttribute(LLVMValueRef Arg, LLVMAttribute PA); void LLVMSetParamAlignment(LLVMValueRef Arg, uint alignm); @@ -460,12 +473,13 @@ /* Operations on call sites */ void LLVMSetInstructionCallConv(LLVMValueRef Instr, uint CC); uint LLVMGetInstructionCallConv(LLVMValueRef Instr); -void LLVMAddInstrParamAttr(LLVMValueRef Instr, uint index, LLVMParamAttr); -void LLVMRemoveInstrParamAttr(LLVMValueRef Instr, uint index, - LLVMParamAttr); -void LLVMSetInstrParamAlignment(LLVMValueRef Instr, uint index, - uint alignm); +void LLVMAddInstrAttribute(LLVMValueRef Instr, uint index, LLVMAttribute); +void LLVMRemoveInstrAttribute(LLVMValueRef Instr, uint index, LLVMAttribute); +void LLVMSetInstrParamAlignment(LLVMValueRef Instr, uint index, uint alignm); +/* Operations on call instructions (only) */ +int LLVMIsTailCall(LLVMValueRef CallInst); +void LLVMSetTailCall(LLVMValueRef CallInst, int IsTailCall); /* Operations on phi nodes */ void LLVMAddIncoming(LLVMValueRef PhiNode, LLVMValueRef *IncomingValues, @@ -555,6 +569,9 @@ LLVMValueRef LLVMBuildGEP(LLVMBuilderRef B, LLVMValueRef Pointer, LLVMValueRef *Indices, uint NumIndices, /*const*/ char *Name); +LLVMValueRef LLVMBuildInBoundsGEP(LLVMBuilderRef B, LLVMValueRef Pointer, + LLVMValueRef *Indices, uint NumIndices, + /*const*/ char *Name); /* Casts */ LLVMValueRef LLVMBuildTrunc(LLVMBuilderRef, LLVMValueRef Val,
--- a/tools/binding/llvm/c/Target.d Wed Oct 21 05:46:56 2009 +0200 +++ b/tools/binding/llvm/c/Target.d Thu Oct 22 13:30:30 2009 +0200 @@ -27,13 +27,8 @@ enum { LLVMBigEndian, LLVMLittleEndian }; alias int LLVMByteOrdering; -private -{ - struct LLVM_OpaqueTargetData {} - struct LLVM_OpaqueStructLayout {} -} -typedef LLVM_OpaqueTargetData* LLVMTargetDataRef; -typedef LLVM_OpaqueStructLayout* LLVMStructLayoutRef; +typedef void* LLVMTargetDataRef; +typedef void* LLVMStructLayoutRef; /*===-- Target Data -------------------------------------------------------===*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/binding/llvm/c/transforms/IPO.d Thu Oct 22 13:30:30 2009 +0200 @@ -0,0 +1,62 @@ +// Converted to the D programming language by Tomas Lindquist Olsen 2009 + +/*===-- IPO.h - Interprocedural Transformations C Interface -----*- C++ -*-===*\ +|* *| +|* The LLVM Compiler Infrastructure *| +|* *| +|* This file is distributed under the University of Illinois Open Source *| +|* License. See LICENSE.TXT for details. *| +|* *| +|*===----------------------------------------------------------------------===*| +|* *| +|* This header declares the C interface to libLLVMIPO.a, which implements *| +|* various interprocedural transformations of the LLVM IR. *| +|* *| +\*===----------------------------------------------------------------------===*/ +module llvm.c.transforms.IPO; + +import llvm.c.Core; + +extern(C): + +/** See llvm::createArgumentPromotionPass function. */ +void LLVMAddArgumentPromotionPass(LLVMPassManagerRef PM); + +/** See llvm::createConstantMergePass function. */ +void LLVMAddConstantMergePass(LLVMPassManagerRef PM); + +/** See llvm::createDeadArgEliminationPass function. */ +void LLVMAddDeadArgEliminationPass(LLVMPassManagerRef PM); + +/** See llvm::createDeadTypeEliminationPass function. */ +void LLVMAddDeadTypeEliminationPass(LLVMPassManagerRef PM); + +/** See llvm::createFunctionAttrsPass function. */ +void LLVMAddFunctionAttrsPass(LLVMPassManagerRef PM); + +/** See llvm::createFunctionInliningPass function. */ +void LLVMAddFunctionInliningPass(LLVMPassManagerRef PM); + +/** See llvm::createGlobalDCEPass function. */ +void LLVMAddGlobalDCEPass(LLVMPassManagerRef PM); + +/** See llvm::createGlobalOptimizerPass function. */ +void LLVMAddGlobalOptimizerPass(LLVMPassManagerRef PM); + +/** See llvm::createIPConstantPropagationPass function. */ +void LLVMAddIPConstantPropagationPass(LLVMPassManagerRef PM); + +/** See llvm::createLowerSetJmpPass function. */ +void LLVMAddLowerSetJmpPass(LLVMPassManagerRef PM); + +/** See llvm::createPruneEHPass function. */ +void LLVMAddPruneEHPass(LLVMPassManagerRef PM); + +/** See llvm::createRaiseAllocationsPass function. */ +void LLVMAddRaiseAllocationsPass(LLVMPassManagerRef PM); + +/** See llvm::createStripDeadPrototypesPass function. */ +void LLVMAddStripDeadPrototypesPass(LLVMPassManagerRef PM); + +/** See llvm::createStripSymbolsPass function. */ +void LLVMAddStripSymbolsPass(LLVMPassManagerRef PM);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/binding/llvm/c/transforms/Scalar.d Thu Oct 22 13:30:30 2009 +0200 @@ -0,0 +1,93 @@ +// Converted to the D programming language by Tomas Lindquist Olsen 2009 + +/*===-- Scalar.h - Scalar Transformation Library C Interface ----*- C++ -*-===*\ +|* *| +|* The LLVM Compiler Infrastructure *| +|* *| +|* This file is distributed under the University of Illinois Open Source *| +|* License. See LICENSE.TXT for details. *| +|* *| +|*===----------------------------------------------------------------------===*| +|* *| +|* This header declares the C interface to libLLVMScalarOpts.a, which *| +|* implements various scalar transformations of the LLVM IR. *| +|* *| +|* Many exotic languages can interoperate with C code but have a harder time *| +|* with C++ due to name mangling. So in addition to C, this interface enables *| +|* tools written in such languages. *| +|* *| +\*===----------------------------------------------------------------------===*/ +module llvm.c.transforms.Scalar; + +import llvm.c.Core; + +extern(C): + +/** See llvm::createAggressiveDCEPass function. */ +void LLVMAddAggressiveDCEPass(LLVMPassManagerRef PM); + +/** See llvm::createCFGSimplificationPass function. */ +void LLVMAddCFGSimplificationPass(LLVMPassManagerRef PM); + +/** See llvm::createCondPropagationPass function. */ +void LLVMAddCondPropagationPass(LLVMPassManagerRef PM); + +/** See llvm::createDeadStoreEliminationPass function. */ +void LLVMAddDeadStoreEliminationPass(LLVMPassManagerRef PM); + +/** See llvm::createGVNPass function. */ +void LLVMAddGVNPass(LLVMPassManagerRef PM); + +/** See llvm::createIndVarSimplifyPass function. */ +void LLVMAddIndVarSimplifyPass(LLVMPassManagerRef PM); + +/** See llvm::createInstructionCombiningPass function. */ +void LLVMAddInstructionCombiningPass(LLVMPassManagerRef PM); + +/** See llvm::createJumpThreadingPass function. */ +void LLVMAddJumpThreadingPass(LLVMPassManagerRef PM); + +/** See llvm::createLICMPass function. */ +void LLVMAddLICMPass(LLVMPassManagerRef PM); + +/** See llvm::createLoopDeletionPass function. */ +void LLVMAddLoopDeletionPass(LLVMPassManagerRef PM); + +/** See llvm::createLoopIndexSplitPass function. */ +void LLVMAddLoopIndexSplitPass(LLVMPassManagerRef PM); + +/** See llvm::createLoopRotatePass function. */ +void LLVMAddLoopRotatePass(LLVMPassManagerRef PM); + +/** See llvm::createLoopUnrollPass function. */ +void LLVMAddLoopUnrollPass(LLVMPassManagerRef PM); + +/** See llvm::createLoopUnswitchPass function. */ +void LLVMAddLoopUnswitchPass(LLVMPassManagerRef PM); + +/** See llvm::createMemCpyOptPass function. */ +void LLVMAddMemCpyOptPass(LLVMPassManagerRef PM); + +/** See llvm::createPromoteMemoryToRegisterPass function. */ +void LLVMAddPromoteMemoryToRegisterPass(LLVMPassManagerRef PM); + +/** See llvm::createReassociatePass function. */ +void LLVMAddReassociatePass(LLVMPassManagerRef PM); + +/** See llvm::createSCCPPass function. */ +void LLVMAddSCCPPass(LLVMPassManagerRef PM); + +/** See llvm::createScalarReplAggregatesPass function. */ +void LLVMAddScalarReplAggregatesPass(LLVMPassManagerRef PM); + +/** See llvm::createSimplifyLibCallsPass function. */ +void LLVMAddSimplifyLibCallsPass(LLVMPassManagerRef PM); + +/** See llvm::createTailCallEliminationPass function. */ +void LLVMAddTailCallEliminationPass(LLVMPassManagerRef PM); + +/** See llvm::createConstantPropagationPass function. */ +void LLVMAddConstantPropagationPass(LLVMPassManagerRef PM); + +/** See llvm::demotePromoteMemoryToRegisterPass function. */ +void LLVMAddDemoteMemoryToRegisterPass(LLVMPassManagerRef PM);