Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/shark/sharkMemoryManager.cpp	Mon Nov 26 17:25:11 2012 -0800
     1.2 +++ b/src/share/vm/shark/sharkMemoryManager.cpp	Tue Nov 27 12:48:52 2012 -0800
     1.3 @@ -79,7 +79,6 @@
     1.4    mm()->setMemoryExecutable();
     1.5  }
     1.6  
     1.7 -#if SHARK_LLVM_VERSION >= 27
     1.8  void SharkMemoryManager::deallocateExceptionTable(void *ptr) {
     1.9    mm()->deallocateExceptionTable(ptr);
    1.10  }
    1.11 @@ -87,26 +86,23 @@
    1.12  void SharkMemoryManager::deallocateFunctionBody(void *ptr) {
    1.13    mm()->deallocateFunctionBody(ptr);
    1.14  }
    1.15 -#else
    1.16 -void SharkMemoryManager::deallocateMemForFunction(const Function* F) {
    1.17 -  return mm()->deallocateMemForFunction(F);
    1.18 -}
    1.19 -#endif
    1.20  
    1.21  uint8_t* SharkMemoryManager::allocateGlobal(uintptr_t Size,
    1.22                                              unsigned int Alignment) {
    1.23    return mm()->allocateGlobal(Size, Alignment);
    1.24  }
    1.25  
    1.26 -#if SHARK_LLVM_VERSION < 27
    1.27 -void* SharkMemoryManager::getDlsymTable() const {
    1.28 -  return mm()->getDlsymTable();
    1.29 +void* SharkMemoryManager::getPointerToNamedFunction(const std::string &Name, bool AbortOnFailure) {
    1.30 +  return mm()->getPointerToNamedFunction(Name, AbortOnFailure);
    1.31  }
    1.32  
    1.33 -void SharkMemoryManager::SetDlsymTable(void *ptr) {
    1.34 -  mm()->SetDlsymTable(ptr);
    1.35 +uint8_t* SharkMemoryManager::allocateCodeSection(uintptr_t Size, unsigned Alignment, unsigned SectionID) {
    1.36 +  return mm()->allocateCodeSection(Size, Alignment, SectionID);
    1.37  }
    1.38 -#endif
    1.39 +
    1.40 +uint8_t* SharkMemoryManager::allocateDataSection(uintptr_t Size, unsigned Alignment, unsigned SectionID) {
    1.41 +  return mm()->allocateDataSection(Size, Alignment, SectionID);
    1.42 +}
    1.43  
    1.44  void SharkMemoryManager::setPoisonMemory(bool poison) {
    1.45    mm()->setPoisonMemory(poison);