From ad5a3cf3480e3fa302382122af21278c881595d6 Mon Sep 17 00:00:00 2001
From: Ahmed El-Shafiey <a.shafiey@aucegypt.edu>
Date: Wed, 6 Aug 2014 20:08:15 -0800
Subject: This should fix 2.3 regression and may fix others as well.

Remove redudant definition for some tokens which confuses the parser

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 18462]
---
 src/cuda-sim/cuda-sim.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/cuda-sim/cuda-sim.cc')

diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc
index 1ccc156..ab54121 100644
--- a/src/cuda-sim/cuda-sim.cc
+++ b/src/cuda-sim/cuda-sim.cc
@@ -556,14 +556,14 @@ void ptx_instruction::set_bar_type()
 		   		   break;
 		   	   case RED_OPTION:
 		   		   bar_type = RED;
-		   		   switch(m_reduction_op){
-		   		   	   case POPC_REDUCTION:
+		   		   switch(m_atomic_spec){
+		   		   	   case ATOMIC_POPC:
 				   		   red_type = POPC_RED;
 				   		   break;
-		   		   	   case AND_REDUCTION:
+		   		   	   case ATOMIC_AND:
 				   		   red_type = AND_RED;
 				   		   break;
-		   		   	   case OR_REDUCTION:
+		   		   	   case ATOMIC_OR:
 				   		   red_type = OR_RED;
 				   		   break;
 		   		   }
-- 
cgit v1.3