From 11b308e7363e937966b035b4891db32b4eece3bf Mon Sep 17 00:00:00 2001
From: Tor Aamodt <aamodt@ece.ubc.ca>
Date: Fri, 1 Oct 2010 08:55:28 -0800
Subject: 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]
---
 src/cuda-sim/opcodes.def | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/cuda-sim/opcodes.def')

diff --git a/src/cuda-sim/opcodes.def b/src/cuda-sim/opcodes.def
index c1217ee..5f9caaa 100644
--- a/src/cuda-sim/opcodes.def
+++ b/src/cuda-sim/opcodes.def
@@ -77,7 +77,7 @@ OP_DEF(ADD_OP,add_impl,"add",1,1)
 OP_DEF(ADDC_OP,addc_impl,"addc",1,1)
 OP_DEF(AND_OP,and_impl,"and",1,1)
 OP_DEF(ANDN_OP,andn_impl,"andn",1,1)
-OP_DEF(ATOM_OP,atom_impl,"atom",0,3)
+OP_DEF(ATOM_OP,atom_impl,"atom",1,3)
 OP_DEF(BAR_OP,bar_sync_impl,"bar.sync",1,3)
 OP_DEF(BFE_OP,bfe_impl,"bfe",1,1)
 OP_DEF(BFI_OP,bfi_impl,"bfi",1,1)
@@ -86,6 +86,7 @@ OP_DEF(BRA_OP,bra_impl,"bra",0,3)
 OP_DEF(BREV_OP,brev_impl,"brev",1,1)
 OP_DEF(BRKPT_OP,brkpt_impl,"brkpt",1,9)
 OP_DEF(CALL_OP,call_impl,"call",1,3)
+OP_DEF(CALLP_OP,callp_impl,"callp",1,3)
 OP_DEF(CLZ_OP,clz_impl,"clz",1,1)
 OP_DEF(CNOT_OP,cnot_impl,"cnot",1,1)
 OP_DEF(COS_OP,cos_impl,"cos",1,4)
@@ -122,6 +123,7 @@ OP_DEF(RCP_OP,rcp_impl,"rcp",1,4)
 OP_DEF(RED_OP,red_impl,"red",1,7)
 OP_DEF(REM_OP,rem_impl,"rem",1,1)
 OP_DEF(RET_OP,ret_impl,"ret",0,3)
+OP_DEF(RETP_OP,retp_impl,"retp",0,3)
 OP_DEF(RSQRT_OP,rsqrt_impl,"rsqrt",1,4)
 OP_DEF(SAD_OP,sad_impl,"sad",1,1)
 OP_DEF(SELP_OP,selp_impl,"selp",1,1)
-- 
cgit v1.3

