[vmkit-commits] [vmkit] r197823 - don't use the jit event listeners anymore

[Gael Thomas]

Author: gthomas
Date: Fri Dec 20 12:06:40 2013
New Revision: 197823

URL: http://llvm.org/viewvc/llvm-project?rev=197823&view=rev
Log:
don't use the jit event listeners anymore

Modified:
    vmkit/branches/mcjit/include/vmkit/vmkit.h
    vmkit/branches/mcjit/lib/vmkit/compiler.cc
    vmkit/branches/mcjit/lib/vmkit/vmkit.cc

Modified: vmkit/branches/mcjit/include/vmkit/vmkit.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/vmkit/vmkit.h?rev=197823&r1=197822&r2=197823&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/vmkit/vmkit.h (original)
+++ vmkit/branches/mcjit/include/vmkit/vmkit.h Fri Dec 20 12:06:40 2013
@@ -4,8 +4,6 @@
 #include "vmkit/util.h"
 #include "vmkit/allocator.h"
 
-#include "llvm/ExecutionEngine/JITEventListener.h"
-
 namespace llvm {
 	class LLVMContext;
 	class Module;
@@ -27,7 +25,7 @@ namespace vmkit {
 		ExceptionDescriptor(const llvm::Function* llvmFunction, uintptr_t point, uintptr_t landingPad);
 	};
 
-	class VMKit : public llvm::JITEventListener {
+	class VMKit {
 		typedef std::map<const char*, llvm::GlobalValue*, Util::char_less_t, 
 										 StdAllocator<std::pair<const char*, llvm::GlobalValue*> > > MangleMap;
 
@@ -72,13 +70,6 @@ namespace vmkit {
 
 		static void internalError(const wchar_t* msg, ...) __attribute__((noreturn));		
 		static void throwException(void* obj) __attribute__((noreturn));
-
-		void NotifyFunctionEmitted(const llvm::Function &F,
-															 void *Code,
-															 size_t Size,
-															 const llvm::JITEventListener::EmittedFunctionDetails &Details);
-
-		void NotifyObjectEmitted(const llvm::ObjectImage &obj);
 	};
 };
 

Modified: vmkit/branches/mcjit/lib/vmkit/compiler.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/vmkit/compiler.cc?rev=197823&r1=197822&r2=197823&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/vmkit/compiler.cc (original)
+++ vmkit/branches/mcjit/lib/vmkit/compiler.cc Fri Dec 20 12:06:40 2013
@@ -42,7 +42,6 @@ CompilationUnit::CompilationUnit(BumpAll
 	if (!ee())
 		Thread::get()->vm()->internalError(L"Error while creating execution engine: %s\n", err.c_str());
 
-  ee()->RegisterJITEventListener(Thread::get()->vm());
 	ee()->finalizeObject();
 
 	_oldee = llvm::EngineBuilder(new llvm::Module("old ee", Thread::get()->vm()->llvmContext()))

Modified: vmkit/branches/mcjit/lib/vmkit/vmkit.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/vmkit/vmkit.cc?rev=197823&r1=197822&r2=197823&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/vmkit/vmkit.cc (original)
+++ vmkit/branches/mcjit/lib/vmkit/vmkit.cc Fri Dec 20 12:06:40 2013
@@ -131,59 +131,6 @@ llvm::Function* VMKit::getGCRoot(llvm::M
 	return llvm::Intrinsic::getDeclaration(mod, llvm::Intrinsic::gcroot);
 }
 
-void VMKit::NotifyObjectEmitted(const llvm::ObjectImage &obj) {
-	fprintf(stderr, "**** object jit event listener!\n");
-}
-
-void VMKit::NotifyFunctionEmitted(const llvm::Function &F,
-																	void *Code,
-																	size_t Size,
-																	const llvm::JITEventListener::EmittedFunctionDetails &Details) {
-
-	fprintf(stderr, "****  jit event listener!\n");
-#if 0
-	const llvm::MachineFunction*             mf = Details.MF;
-	const std::vector<llvm::LandingPadInfo>& landingPads = mf->getMMI().getLandingPads();
-	const llvm::MachineCodeEmitter*          mce = Details.MCE;
-
-	for(std::vector<llvm::LandingPadInfo>::const_iterator i=landingPads.begin(); i!=landingPads.end(); i++) {
-		uintptr_t dest = mce->getLabelAddress(i->LandingPadLabel);
-		
-		for(uint32_t j=0; j<i->BeginLabels.size(); j++) {
-			uintptr_t point = mce->getLabelAddress(i->EndLabels[j]);
-			ExceptionDescriptor* e = new ExceptionDescriptor(&F, point, dest);
-			exceptionTable[point] = e;
-			fprintf(stderr, "      exceptionpoint at 0x%lx goes to 0x%lx\n", point, dest);
-		}
-	}
-
-	if(F.hasGC()) {
-		llvm::GCFunctionInfo* gcInfo = &mf->getGMI()->getFunctionInfo(F);
-		uintptr_t start = (uintptr_t)Code;
-		uintptr_t end = start + Size;
-
-		for(llvm::GCFunctionInfo::iterator safepoint=gcInfo->begin(); safepoint!=gcInfo->end(); safepoint++) {
-			uint32_t kind = safepoint->Kind;
-			llvm::MCSymbol* label = safepoint->Label;
-			uintptr_t addr = mce->getLabelAddress(label);
-
-			if(addr < start || addr > end)
-				internalError(L"safe point is not inside the function (%p %p %p)", start, addr, end);
-
-			Safepoint* sf = Safepoint::create(&F, addr, gcInfo->live_size(safepoint));
-			uint32_t i=0;
-
-			//fprintf(stderr, "      safepoint at 0x%lx\n", addr);
-			for(llvm::GCFunctionInfo::live_iterator live=gcInfo->live_begin(safepoint); live!=gcInfo->live_end(safepoint); live++, i++) {
-				sf->setAt(i, live->StackOffset);
-				//fprintf(stderr, "       offset: %d\n", live->StackOffset); 
-			}
-			safepointMap[addr] = sf;
-		}
-	}
-#endif
-}
-
 void VMKit::log(const wchar_t* msg, ...) {
 	va_list va;
 	va_start(va, msg);