From dbc5076945d08959c0106ff580f42adf3f86d7d9 Mon Sep 17 00:00:00 2001
From: tgrogers <tgrogers@purdue.edu>
Date: Tue, 20 Nov 2018 15:34:03 -0500
Subject: Fixing the compile in gcc 4.4.x

---
 src/cuda-sim/cuda-sim.cc     | 2 +-
 src/cuda-sim/instructions.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc
index 3773f6f..ec68b5b 100644
--- a/src/cuda-sim/cuda-sim.cc
+++ b/src/cuda-sim/cuda-sim.cc
@@ -1308,7 +1308,7 @@ void function_info::list_param( FILE *fout ) const
 
 void function_info::ptx_jit_config(std::map<unsigned long long, size_t> mallocPtr_Size, memory_space *param_mem, gpgpu_t* gpu, dim3 gridDim, dim3 blockDim) 
 {
-    static unsigned long counter = 0;
+    static unsigned long long counter = 0;
     std::vector< std::pair<size_t, unsigned char*> > param_data;
     std::vector<unsigned> offsets;
     std::vector<bool> paramIsPointer;
diff --git a/src/cuda-sim/instructions.cc b/src/cuda-sim/instructions.cc
index 31a33c6..c85654c 100644
--- a/src/cuda-sim/instructions.cc
+++ b/src/cuda-sim/instructions.cc
@@ -195,7 +195,7 @@ void ptx_thread_info::print_reg_thread(char * fname)
   {  
   reg_map_t reg = m_regs.back();
   
-      typename reg_map_t::const_iterator it;
+      reg_map_t::const_iterator it;
       for (it = reg.begin(); it != reg.end(); ++it) 
         {
           const std::string &name = it->first->name();
-- 
cgit v1.3


From a98e7db0402054aee7332380f6679be8527fc844 Mon Sep 17 00:00:00 2001
From: Deval Shah <devalshah@localhost.localdomain>
Date: Wed, 30 Jan 2019 17:40:17 -0800
Subject: changes for Ubuntu 18.04 support

---
 libcuda/cuda_runtime_api.cc   | 39 +++++++++++++++++++++++++++++++++++++++
 src/abstract_hardware_model.h |  1 +
 2 files changed, 40 insertions(+)

(limited to 'src')

diff --git a/libcuda/cuda_runtime_api.cc b/libcuda/cuda_runtime_api.cc
index 95a3c24..042bebd 100644
--- a/libcuda/cuda_runtime_api.cc
+++ b/libcuda/cuda_runtime_api.cc
@@ -1199,6 +1199,35 @@ __host__ cudaError_t CUDARTAPI cudaGetDevice(int *device)
 	*device = g_active_device;
 	return g_last_cudaError = cudaSuccess;
 }
+__host__ cudaError_t CUDARTAPI cudaDeviceGetLimit ( size_t* pValue, cudaLimit limit )
+{
+	if(g_debug_execution >= 3){
+            announce_call(__my_func__);
+   	 }
+        cuda_not_implemented(__my_func__,__LINE__);
+        return g_last_cudaError = cudaSuccess;
+
+}
+
+__host__ cudaError_t CUDARTAPI cudaCreateTextureObject ( cudaTextureObject_t* pTexObject, const cudaResourceDesc* pResDesc, const cudaTextureDesc* pTexDesc, const cudaResourceViewDesc* pResViewDesc )
+{
+	 if(g_debug_execution >= 3){
+            announce_call(__my_func__);
+    	}
+        cuda_not_implemented(__my_func__,__LINE__);
+        return g_last_cudaError = cudaSuccess;
+
+}
+
+__host__ cudaError_t CUDARTAPI cudaStreamGetPriority ( cudaStream_t hStream, int* priority )
+{
+        if(g_debug_execution >= 3){
+            announce_call(__my_func__);
+   	 }
+        cuda_not_implemented(__my_func__,__LINE__);
+        return g_last_cudaError = cudaSuccess;
+
+}
 
 __host__ cudaError_t CUDARTAPI cudaDeviceGetPCIBusId (
 		char *pciBusId,
@@ -1235,6 +1264,16 @@ __host__ cudaError_t cudaIpcOpenMemHandle(
 	return g_last_cudaError = cudaErrorUnknown;
 }
 
+__host__ cudaError_t CUDARTAPI cudaDestroyTextureObject(cudaTextureObject_t texObject)
+{
+        if(g_debug_execution >= 3){
+            announce_call(__my_func__);
+   	 }
+        cuda_not_implemented(__my_func__,__LINE__);
+        return g_last_cudaError = cudaErrorUnknown;
+}
+
+
 /*******************************************************************************
  *                                                                              *
  *                                                                              *
diff --git a/src/abstract_hardware_model.h b/src/abstract_hardware_model.h
index 08aa88c..28a22e0 100644
--- a/src/abstract_hardware_model.h
+++ b/src/abstract_hardware_model.h
@@ -73,6 +73,7 @@ enum FuncCache
 #include <set>
 
 typedef unsigned long long new_addr_type;
+typedef unsigned long long cudaTextureObject_t;
 typedef unsigned address_type;
 typedef unsigned addr_t;
 
-- 
cgit v1.3