summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Aamodt <[email protected]>2013-02-18 07:39:19 -0800
committerAndrew Boktor <[email protected]>2014-08-14 13:50:05 -0700
commitb7fc118ef12b8706d2e951aa00101de7d4d56af1 (patch)
tree2dc34c634eafcd9209fe911df83e14a51970c931
parent789025599aabfb552d3689549d31329ee5ada722 (diff)
proposed fix for bug 42 (Alexander Samoilov)
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 15271]
-rw-r--r--CHANGES1
-rw-r--r--src/cuda-sim/ptx_ir.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index e09054f..7b80e58 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@ Version 3.2.0+edits (development branch) versus 3.2.0
- Fixed a number of warnings generated by gcc 4.7.x
- Fixed a delete [] problem.
- Fixed a potential issue memsetting *this to 0.
+ - Fix for Bug 42 - ptx parse failure on valid ptx file (Alexander Samoilov)
Version 3.2.0 versus 3.1.2
- Added GPUWattch GPGPU power model based on McPAT 0.8beta.
diff --git a/src/cuda-sim/ptx_ir.h b/src/cuda-sim/ptx_ir.h
index f4ad6f7..547372d 100644
--- a/src/cuda-sim/ptx_ir.h
+++ b/src/cuda-sim/ptx_ir.h
@@ -369,6 +369,8 @@ public:
m_type = symbolic_t;
} else if ( addr->is_func_addr() ) {
m_type = symbolic_t;
+ } else if ( !addr->is_reg() ) {
+ m_type = symbolic_t;
} else {
m_type = reg_t;
}