diff options
Diffstat (limited to 'include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h')
| -rw-r--r-- | include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h | 83 | 
1 files changed, 43 insertions, 40 deletions
diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h index cf419d33004c..acbc1682fa5d 100644 --- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h +++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h @@ -161,9 +161,9 @@ private:      IntVoidFnTy Fn =          reinterpret_cast<IntVoidFnTy>(static_cast<uintptr_t>(Addr)); -    DEBUG(dbgs() << "  Calling " << format("0x%016x", Addr) << "\n"); +    LLVM_DEBUG(dbgs() << "  Calling " << format("0x%016x", Addr) << "\n");      int Result = Fn(); -    DEBUG(dbgs() << "  Result = " << Result << "\n"); +    LLVM_DEBUG(dbgs() << "  Result = " << Result << "\n");      return Result;    } @@ -180,15 +180,13 @@ private:      for (auto &Arg : Args)        ArgV[Idx++] = Arg.c_str();      ArgV[ArgC] = 0; -    DEBUG( -      for (int Idx = 0; Idx < ArgC; ++Idx) { -        llvm::dbgs() << "Arg " << Idx << ": " << ArgV[Idx] << "\n"; -      } -    ); +    LLVM_DEBUG(for (int Idx = 0; Idx < ArgC; ++Idx) { +      llvm::dbgs() << "Arg " << Idx << ": " << ArgV[Idx] << "\n"; +    }); -    DEBUG(dbgs() << "  Calling " << format("0x%016x", Addr) << "\n"); +    LLVM_DEBUG(dbgs() << "  Calling " << format("0x%016x", Addr) << "\n");      int Result = Fn(ArgC, ArgV.get()); -    DEBUG(dbgs() << "  Result = " << Result << "\n"); +    LLVM_DEBUG(dbgs() << "  Result = " << Result << "\n");      return Result;    } @@ -199,9 +197,9 @@ private:      VoidVoidFnTy Fn =          reinterpret_cast<VoidVoidFnTy>(static_cast<uintptr_t>(Addr)); -    DEBUG(dbgs() << "  Calling " << format("0x%016x", Addr) << "\n"); +    LLVM_DEBUG(dbgs() << "  Calling " << format("0x%016x", Addr) << "\n");      Fn(); -    DEBUG(dbgs() << "  Complete.\n"); +    LLVM_DEBUG(dbgs() << "  Complete.\n");      return Error::success();    } @@ -211,7 +209,7 @@ private:      if (I != Allocators.end())        return errorCodeToError(                 orcError(OrcErrorCode::RemoteAllocatorIdAlreadyInUse)); -    DEBUG(dbgs() << "  Created allocator " << Id << "\n"); +    LLVM_DEBUG(dbgs() << "  Created allocator " << Id << "\n");      Allocators[Id] = Allocator();      return Error::success();    } @@ -221,15 +219,16 @@ private:      if (I != IndirectStubsOwners.end())        return errorCodeToError(                 orcError(OrcErrorCode::RemoteIndirectStubsOwnerIdAlreadyInUse)); -    DEBUG(dbgs() << "  Create indirect stubs owner " << Id << "\n"); +    LLVM_DEBUG(dbgs() << "  Create indirect stubs owner " << Id << "\n");      IndirectStubsOwners[Id] = ISBlockOwnerList();      return Error::success();    }    Error handleDeregisterEHFrames(JITTargetAddress TAddr, uint32_t Size) {      uint8_t *Addr = reinterpret_cast<uint8_t *>(static_cast<uintptr_t>(TAddr)); -    DEBUG(dbgs() << "  Registering EH frames at " << format("0x%016x", TAddr) -                 << ", Size = " << Size << " bytes\n"); +    LLVM_DEBUG(dbgs() << "  Registering EH frames at " +                      << format("0x%016x", TAddr) << ", Size = " << Size +                      << " bytes\n");      EHFramesDeregister(Addr, Size);      return Error::success();    } @@ -240,7 +239,7 @@ private:        return errorCodeToError(                 orcError(OrcErrorCode::RemoteAllocatorDoesNotExist));      Allocators.erase(I); -    DEBUG(dbgs() << "  Destroyed allocator " << Id << "\n"); +    LLVM_DEBUG(dbgs() << "  Destroyed allocator " << Id << "\n");      return Error::success();    } @@ -256,8 +255,8 @@ private:    Expected<std::tuple<JITTargetAddress, JITTargetAddress, uint32_t>>    handleEmitIndirectStubs(ResourceIdMgr::ResourceId Id,                            uint32_t NumStubsRequired) { -    DEBUG(dbgs() << "  ISMgr " << Id << " request " << NumStubsRequired -                 << " stubs.\n"); +    LLVM_DEBUG(dbgs() << "  ISMgr " << Id << " request " << NumStubsRequired +                      << " stubs.\n");      auto StubOwnerItr = IndirectStubsOwners.find(Id);      if (StubOwnerItr == IndirectStubsOwners.end()) @@ -328,8 +327,8 @@ private:    Expected<JITTargetAddress> handleGetSymbolAddress(const std::string &Name) {      JITTargetAddress Addr = SymbolLookup(Name); -    DEBUG(dbgs() << "  Symbol '" << Name << "' =  " << format("0x%016x", Addr) -                 << "\n"); +    LLVM_DEBUG(dbgs() << "  Symbol '" << Name +                      << "' =  " << format("0x%016x", Addr) << "\n");      return Addr;    } @@ -340,12 +339,13 @@ private:      uint32_t PageSize = sys::Process::getPageSize();      uint32_t TrampolineSize = TargetT::TrampolineSize;      uint32_t IndirectStubSize = TargetT::IndirectStubsInfo::StubSize; -    DEBUG(dbgs() << "  Remote info:\n" -                 << "    triple             = '" << ProcessTriple << "'\n" -                 << "    pointer size       = " << PointerSize << "\n" -                 << "    page size          = " << PageSize << "\n" -                 << "    trampoline size    = " << TrampolineSize << "\n" -                 << "    indirect stub size = " << IndirectStubSize << "\n"); +    LLVM_DEBUG(dbgs() << "  Remote info:\n" +                      << "    triple             = '" << ProcessTriple << "'\n" +                      << "    pointer size       = " << PointerSize << "\n" +                      << "    page size          = " << PageSize << "\n" +                      << "    trampoline size    = " << TrampolineSize << "\n" +                      << "    indirect stub size = " << IndirectStubSize +                      << "\n");      return std::make_tuple(ProcessTriple, PointerSize, PageSize, TrampolineSize,                             IndirectStubSize);    } @@ -354,8 +354,8 @@ private:                                                 uint64_t Size) {      uint8_t *Src = reinterpret_cast<uint8_t *>(static_cast<uintptr_t>(RSrc)); -    DEBUG(dbgs() << "  Reading " << Size << " bytes from " -                 << format("0x%016x", RSrc) << "\n"); +    LLVM_DEBUG(dbgs() << "  Reading " << Size << " bytes from " +                      << format("0x%016x", RSrc) << "\n");      std::vector<uint8_t> Buffer;      Buffer.resize(Size); @@ -367,8 +367,9 @@ private:    Error handleRegisterEHFrames(JITTargetAddress TAddr, uint32_t Size) {      uint8_t *Addr = reinterpret_cast<uint8_t *>(static_cast<uintptr_t>(TAddr)); -    DEBUG(dbgs() << "  Registering EH frames at " << format("0x%016x", TAddr) -                 << ", Size = " << Size << " bytes\n"); +    LLVM_DEBUG(dbgs() << "  Registering EH frames at " +                      << format("0x%016x", TAddr) << ", Size = " << Size +                      << " bytes\n");      EHFramesRegister(Addr, Size);      return Error::success();    } @@ -384,8 +385,9 @@ private:      if (auto Err = Allocator.allocate(LocalAllocAddr, Size, Align))        return std::move(Err); -    DEBUG(dbgs() << "  Allocator " << Id << " reserved " << LocalAllocAddr -                 << " (" << Size << " bytes, alignment " << Align << ")\n"); +    LLVM_DEBUG(dbgs() << "  Allocator " << Id << " reserved " << LocalAllocAddr +                      << " (" << Size << " bytes, alignment " << Align +                      << ")\n");      JITTargetAddress AllocAddr = static_cast<JITTargetAddress>(          reinterpret_cast<uintptr_t>(LocalAllocAddr)); @@ -401,10 +403,11 @@ private:                 orcError(OrcErrorCode::RemoteAllocatorDoesNotExist));      auto &Allocator = I->second;      void *LocalAddr = reinterpret_cast<void *>(static_cast<uintptr_t>(Addr)); -    DEBUG(dbgs() << "  Allocator " << Id << " set permissions on " << LocalAddr -                 << " to " << (Flags & sys::Memory::MF_READ ? 'R' : '-') -                 << (Flags & sys::Memory::MF_WRITE ? 'W' : '-') -                 << (Flags & sys::Memory::MF_EXEC ? 'X' : '-') << "\n"); +    LLVM_DEBUG(dbgs() << "  Allocator " << Id << " set permissions on " +                      << LocalAddr << " to " +                      << (Flags & sys::Memory::MF_READ ? 'R' : '-') +                      << (Flags & sys::Memory::MF_WRITE ? 'W' : '-') +                      << (Flags & sys::Memory::MF_EXEC ? 'X' : '-') << "\n");      return Allocator.setProtections(LocalAddr, Flags);    } @@ -414,14 +417,14 @@ private:    }    Error handleWriteMem(DirectBufferWriter DBW) { -    DEBUG(dbgs() << "  Writing " << DBW.getSize() << " bytes to " -                 << format("0x%016x", DBW.getDst()) << "\n"); +    LLVM_DEBUG(dbgs() << "  Writing " << DBW.getSize() << " bytes to " +                      << format("0x%016x", DBW.getDst()) << "\n");      return Error::success();    }    Error handleWritePtr(JITTargetAddress Addr, JITTargetAddress PtrVal) { -    DEBUG(dbgs() << "  Writing pointer *" << format("0x%016x", Addr) << " = " -                 << format("0x%016x", PtrVal) << "\n"); +    LLVM_DEBUG(dbgs() << "  Writing pointer *" << format("0x%016x", Addr) +                      << " = " << format("0x%016x", PtrVal) << "\n");      uintptr_t *Ptr =          reinterpret_cast<uintptr_t *>(static_cast<uintptr_t>(Addr));      *Ptr = static_cast<uintptr_t>(PtrVal);  | 
