Updating CHANGES file to reflect changes I made in CL14001.

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

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index c5f7792..3527cbb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,8 @@ Version 3.1.1+edits (development branch) versus 3.1.1
 - Converted loading fat binaries to be done on demand basis
 - Added support for vote.ballot instruction. 
 - Added support for popc instruction. 
+- Changed SSY ptxplus intructions to have their own opcode but it still acts as a nop right now.
+- Added support for BRX instructions to cuobjdump_to_ptxplus and started work on getting it to work in gpgpusim
 - Bug Fixes:
     - Fixed a compile error that happens with newer gcc/g++ versions (4.7.1)
     - Fixed a bug with the association between cuobjdump output and cubin
@@ -31,6 +33,9 @@ Version 3.1.1+edits (development branch) versus 3.1.1
     - Added support for cudaReadModeNormalizedFloat (a texture read mode). 
     - Fixed texture fetching for 1D texture with non-normalized coordinates. 
     - Fixed mult-element texel fetching (e.g. texel with RGBA components).  
+    - fix bug where Global constants were not being declared in ptxplus.
+    - fixed bug with IADD.CARRY instruction conversion to addp.
+    - fixed bug with .half modifier showing up on the wrong instruction or not showing up at all. This should correct a bug where the addresses in ptxplus is different than sass. They need to be the same for BRX to work.
 
 Version 3.1.1 versus 3.1.0
 - Add checks to top level makefile to ensure setup_environment is run and checks to
diff --git a/version b/version
index ee29c39..7c80d8e 100644
--- a/version
+++ b/version
@@ -1,2 +1,2 @@
 const char *g_gpgpusim_version_string = "GPGPU-Sim Simulator Version 3.1.1+edits (development branch) ";
-const char *g_gpgpusim_build_string   =  "$Change$"; 
+const char *g_gpgpusim_build_string   = "$Change$";