Mercurial > hg > graal-jvmci-8
comparison src/share/vm/shark/sharkMemoryManager.hpp @ 14726:92aa6797d639
Backed out merge changeset: b51e29501f30
Backed out merge revision to its first parent (8f483e200405)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 24 Mar 2014 21:30:43 +0100 |
parents | 81ccf2c854c7 |
children |
comparison
equal
deleted
inserted
replaced
14719:0bdd0d157040 | 14726:92aa6797d639 |
---|---|
67 unsigned char* startFunctionBody(const llvm::Function* F, | 67 unsigned char* startFunctionBody(const llvm::Function* F, |
68 uintptr_t& ActualSize); | 68 uintptr_t& ActualSize); |
69 void endFunctionBody(const llvm::Function* F, | 69 void endFunctionBody(const llvm::Function* F, |
70 unsigned char* FunctionStart, | 70 unsigned char* FunctionStart, |
71 unsigned char* FunctionEnd); | 71 unsigned char* FunctionEnd); |
72 | 72 unsigned char* startExceptionTable(const llvm::Function* F, |
73 uintptr_t& ActualSize); | |
74 void endExceptionTable(const llvm::Function* F, | |
75 unsigned char* TableStart, | |
76 unsigned char* TableEnd, | |
77 unsigned char* FrameRegister); | |
73 void *getPointerToNamedFunction(const std::string &Name, bool AbortOnFailure = true); | 78 void *getPointerToNamedFunction(const std::string &Name, bool AbortOnFailure = true); |
79 uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, unsigned SectionID); | |
80 uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, unsigned SectionID); | |
74 void setPoisonMemory(bool); | 81 void setPoisonMemory(bool); |
75 uint8_t* allocateGlobal(uintptr_t, unsigned int); | 82 uint8_t* allocateGlobal(uintptr_t, unsigned int); |
76 void setMemoryWritable(); | 83 void setMemoryWritable(); |
77 void setMemoryExecutable(); | 84 void setMemoryExecutable(); |
85 void deallocateExceptionTable(void *ptr); | |
78 void deallocateFunctionBody(void *ptr); | 86 void deallocateFunctionBody(void *ptr); |
79 unsigned char *allocateSpace(intptr_t Size, | 87 unsigned char *allocateSpace(intptr_t Size, |
80 unsigned int Alignment); | 88 unsigned int Alignment); |
81 | |
82 #if SHARK_LLVM_VERSION <= 32 | |
83 uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, unsigned SectionID); | |
84 uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, unsigned SectionID); | |
85 unsigned char* startExceptionTable(const llvm::Function* F, | |
86 uintptr_t& ActualSize); | |
87 void deallocateExceptionTable(void *ptr); | |
88 void endExceptionTable(const llvm::Function* F, | |
89 unsigned char* TableStart, | |
90 unsigned char* TableEnd, | |
91 unsigned char* FrameRegister); | |
92 #else | |
93 uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, unsigned SectionID, llvm::StringRef SectionName); | |
94 uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, unsigned SectionID, llvm::StringRef SectionName, bool IsReadOnly); | |
95 bool finalizeMemory(std::string *ErrMsg = 0); | |
96 #endif | |
97 | |
98 }; | 89 }; |
99 | 90 |
100 #endif // SHARE_VM_SHARK_SHARKMEMORYMANAGER_HPP | 91 #endif // SHARE_VM_SHARK_SHARKMEMORYMANAGER_HPP |