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/abstract_hardware_model.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/abstract_hardware_model.h') diff --git a/src/abstract_hardware_model.h b/src/abstract_hardware_model.h index 3b197ab..c519be1 100644 --- a/src/abstract_hardware_model.h +++ b/src/abstract_hardware_model.h @@ -532,6 +532,7 @@ public: { m_decoded=false; pc=(address_type)-1; + reconvergence_pc=(address_type)-1; op=NO_OP; memset(out, 0, sizeof(unsigned)); memset(in, 0, sizeof(unsigned)); @@ -557,6 +558,8 @@ public: unsigned isize; // size of instruction in bytes op_type op; // opcode (uarch visible) _memory_op_t memory_op; // memory_op used by ptxplus + + address_type reconvergence_pc; // -1 => not a branch, -2 => use function return address unsigned out[4]; unsigned in[4]; -- cgit v1.3