From 52a638e84693fff528defbcbd24ecb58216baaba Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Tue, 30 Nov 2010 02:15:16 -0800 Subject: integrate changes (makes code more modular, i would argue) [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 8179] --- src/cuda-sim/cuda-sim.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/cuda-sim/cuda-sim.h') diff --git a/src/cuda-sim/cuda-sim.h b/src/cuda-sim/cuda-sim.h index 0e97b97..e7c1965 100644 --- a/src/cuda-sim/cuda-sim.h +++ b/src/cuda-sim/cuda-sim.h @@ -47,7 +47,10 @@ const warp_inst_t *ptx_fetch_inst( address_type pc ); const struct gpgpu_ptx_sim_kernel_info* ptx_sim_kernel_info(const class function_info *kernel); void ptx_print_insn( address_type pc, FILE *fp ); void set_param_gpgpu_num_shaders(int num_shaders); -unsigned int get_converge_point(unsigned int pc, void *thd); + +#define RECONVERGE_RETURN_PC ((address_type)-2) +#define NO_BRANCH_DIVERGENCE ((address_type)-1) +address_type get_return_pc( void *thd ); const char *get_ptxinfo_kname(); void print_ptxinfo(); void clear_ptxinfo(); -- cgit v1.3