integrating recent changes from fermi-test into fermi

(i'll use "fermi" for more disruptive changes to the pipeline model such
as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...)

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7805]

1 files changed, 2 insertions, 1 deletions

diff --git a/src/cuda-sim/ptx_parser.h b/src/cuda-sim/ptx_parser.h
index 4852e39..dba88ca 100644
--- a/src/cuda-sim/ptx_parser.h
+++ b/src/cuda-sim/ptx_parser.h
@@ -110,7 +110,7 @@ void set_return();
 void add_alignment_spec( int spec );
 void add_array_initializer();
 void add_file( unsigned num, const char *filename );
-void add_version_info( float ver );
+void add_version_info( float ver, unsigned ext);
 void *reset_symtab();
 void set_symtab(void*);
 void add_pragma( const char *str );
@@ -120,6 +120,7 @@ void func_header_info_int(char* a, int b);
 void add_constptr(const char* identifier1, const char* identifier2, int offset);
 void target_header(char* a);
 void target_header2(char* a, char* b);
+void target_header3(char* a, char* b, char* c);
 void add_double_operand( const char *d1, const char *d2 );
 void change_memory_addr_space( const char *identifier );
 void change_operand_lohi( int lohi );