From 6eb2c84753d4538ef6ee6ee27802bff9adbbefab Mon Sep 17 00:00:00 2001
From: Tor Aamodt <aamodt@ece.ubc.ca>
Date: Mon, 9 Aug 2010 00:36:06 -0800
Subject: refactor: remove extern decl up to gpgpusim_entrypoint.cc

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7178]
---
 src/cuda-sim/cuda-sim.cc | 15 ++-------------
 src/cuda-sim/ptx_sim.h   | 14 ++++++--------
 2 files changed, 8 insertions(+), 21 deletions(-)

(limited to 'src/cuda-sim')

diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc
index a55fb79..9d62a59 100644
--- a/src/cuda-sim/cuda-sim.cc
+++ b/src/cuda-sim/cuda-sim.cc
@@ -80,20 +80,17 @@
 #include "ptx_loader.h"
 #include "ptx_parser.h"
 #include "../gpgpu-sim/gpu-sim.h"
-
-extern bool g_interactive_debugger_enabled;
+#include "ptx_sim.h"
+#include "../gpgpusim_entrypoint.h"
 
 int gpgpu_ptx_instruction_classification=0;
 void ** g_inst_classification_stat = NULL;
 void ** g_inst_op_classification_stat= NULL;
 int g_ptx_kernel_count = -1; // used for classification stat collection purposes 
-
 int g_debug_execution = 0;
 int g_debug_thread_uid = 0;
 addr_t g_debug_pc = 0xBEEF1518;
-
 unsigned g_ptx_sim_num_insn = 0;
-
 std::map<const struct textureReference*,const struct cudaArray*> TextureToArrayMap; // texture bindings
 std::map<const struct textureReference*, const struct textureInfo*> TextureToInfoMap;
 std::map<std::string, const struct textureReference*> NameToTextureMap;
@@ -1115,7 +1112,6 @@ void init_inst_classification_stat() {
 
 std::map<std::string,function_info*> *g_kernel_name_to_function_lookup=NULL;
 std::map<const void*,std::string> *g_host_to_kernel_entrypoint_name_lookup=NULL;
-extern unsigned g_ptx_thread_info_uid_next;
 
 void gpgpu_cuda_ptx_sim_init_grid( const char *kernel_key, struct gpgpu_ptx_sim_arg* args,
                                          struct dim3 gridDim, struct dim3 blockDim ) 
@@ -1388,13 +1384,6 @@ void read_sim_environment_variables()
    }
 }
 
-
-
-
-
-
-extern time_t g_simulation_starttime;
-
 ptx_cta_info *g_func_cta_info = NULL;
 
 #define MAX(a,b) (((a)>(b))?(a):(b))
diff --git a/src/cuda-sim/ptx_sim.h b/src/cuda-sim/ptx_sim.h
index 0379686..e9270be 100644
--- a/src/cuda-sim/ptx_sim.h
+++ b/src/cuda-sim/ptx_sim.h
@@ -90,13 +90,11 @@ struct gpgpu_ptx_sim_kernel_info {
 #include <assert.h>
 #include "opcodes.h"
 
-#ifdef __cplusplus
-
-   #include <string>
-   #include <map>
-   #include <set>
-   #include <list>
-   #include <unordered_map>
+#include <string>
+#include <map>
+#include <set>
+#include <list>
+#include <unordered_map>
 
 #include "memory.h"
 
@@ -484,6 +482,6 @@ bool isspace_shared( unsigned smid, addr_t addr );
 bool isspace_global( addr_t addr );
 memory_space_t whichspace( addr_t addr );
 
-#endif
+extern unsigned g_ptx_thread_info_uid_next;
 
 #endif
-- 
cgit v1.3