Merge pull request #24 from echoedit/dev

Dev

1 files changed, 8 insertions, 1 deletions

diff --git a/libcuda/gpgpu_context.h b/libcuda/gpgpu_context.h
index a2ae7b6..3c9f87c 100644
--- a/libcuda/gpgpu_context.h
+++ b/libcuda/gpgpu_context.h
@@ -5,6 +5,7 @@
 #include "../src/cuda-sim/ptx_parser.h"
 #include "../src/gpgpusim_entrypoint.h"
 #include "../src/cuda-sim/cuda-sim.h"
+#include "../src/cuda-sim/cuda_device_runtime.h"
 
 class gpgpu_context {
     public:
@@ -14,7 +15,10 @@ class gpgpu_context {
 	    ptxinfo = new ptxinfo_data(this);
 	    ptx_parser = new ptx_recognizer(this);
 	    the_gpgpusim = new GPGPUsim_ctx(this);
-	    func_sim = new cuda_sim();
+	    func_sim = new cuda_sim(this);
+#if (CUDART_VERSION >= 5000)
+	    device_runtime = new cuda_device_runtime(this);
+#endif
 	}
 	// global list
 	symbol_table *g_global_allfiles_symbol_table;
@@ -25,6 +29,9 @@ class gpgpu_context {
 	ptx_recognizer* ptx_parser;
 	GPGPUsim_ctx* the_gpgpusim;
 	cuda_sim* func_sim;
+#if (CUDART_VERSION >= 5000)
+	cuda_device_runtime* device_runtime;
+#endif
 	// member function list
 	void cuobjdumpParseBinary(unsigned int handle);
 	class symbol_table *gpgpu_ptx_sim_load_ptx_from_string( const char *p, unsigned source_num );