From d3a28ecd166dbbb46804b1c73de139a0512b0d64 Mon Sep 17 00:00:00 2001 From: Tayler Hetherington Date: Fri, 5 Jun 2015 15:46:35 -0700 Subject: Fixing bug with local stats not being reset on call to update_stats. Added code to remove the trailing newline character from the C++ name de-mangling fix. Also, fixed small bug with previous commit --- src/cuda-sim/ptx_ir.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/cuda-sim') diff --git a/src/cuda-sim/ptx_ir.cc b/src/cuda-sim/ptx_ir.cc index fa37cc4..751b3f4 100644 --- a/src/cuda-sim/ptx_ir.cc +++ b/src/cuda-sim/ptx_ir.cc @@ -1258,10 +1258,13 @@ unsigned function_info::print_insn( unsigned pc, FILE * fp ) const char buffer[1024]; memset(command, 0, 1024); memset(buffer, 0, 1024); - snprintf(command,1024,"c++filt -p %s\n",m_name.c_str()); + snprintf(command,1024,"c++filt -p %s",m_name.c_str()); FILE *p = popen(command,"r"); buffer[0]=0; fgets(buffer, 1023, p); + // Remove trailing "\n" in buffer + char *c; + if ((c=strchr(buffer, '\n')) != NULL) *c = '\0'; fprintf(fp,"%s",buffer); if ( index >= m_instr_mem_size ) { fprintf(fp, "", m_start_PC + m_instr_mem_size - 1 ); -- cgit v1.3