From bb820c116764d7a1b8e071137d32b74e7f34dd2f Mon Sep 17 00:00:00 2001
From: Tor Aamodt <aamodt@ece.ubc.ca>
Date: Mon, 30 Aug 2010 11:05:15 -0800
Subject: integrating CL 7421-7434 from fermi-test this integrates the ptxplus
 functional model changes, but has only been verified with CUDA 3.1 PTX
 regressions (which pass) still need to verify ptxplus itself is working in
 this branch

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

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

diff --git a/src/cuda-sim/opcodes.def b/src/cuda-sim/opcodes.def
index 4566468..c1217ee 100644
--- a/src/cuda-sim/opcodes.def
+++ b/src/cuda-sim/opcodes.def
@@ -69,12 +69,14 @@ Control 3
 SFU 4
 Mem(except Tex) 5
 Tex 6
+Nop 7
 Other 10
 */
 OP_DEF(ABS_OP,abs_impl,"abs",1,1)
 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(BAR_OP,bar_sync_impl,"bar.sync",1,3)
 OP_DEF(BFE_OP,bfe_impl,"bfe",1,1)
@@ -106,8 +108,11 @@ OP_DEF(MOV_OP,mov_impl,"mov",1,1)
 OP_DEF(MUL24_OP,mul24_impl,"mul24",1,1)
 OP_DEF(MUL_OP,mul_impl,"mul",1,1)
 OP_DEF(NEG_OP,neg_impl,"neg",1,1)
+OP_DEF(NANDN_OP,nandn_impl,"nandn",1,1)
+OP_DEF(NORN_OP,norn_impl,"norn",1,1)
 OP_DEF(NOT_OP,not_impl,"not",1,1)
 OP_DEF(OR_OP,or_impl,"or",1,1)
+OP_DEF(ORN_OP,orn_impl,"orn",1,1)
 OP_DEF(PMEVENT_OP,pmevent_impl,"pmevent",1,10)
 OP_DEF(POPC_OP,popc_impl,"popc",1,1)
 OP_DEF(PREFETCH_OP,prefetch_impl,"prefetch",1,5)
@@ -147,3 +152,6 @@ OP_DEF(VSHR_OP,vshr_impl,"vshr",0,11)
 OP_DEF(VSUB_OP,vsub_impl,"vsub",0,11)
 OP_DEF(VOTE_OP,vote_impl,"vote",0,3)
 OP_DEF(XOR_OP,xor_impl,"xor",1,1)
+OP_DEF(NOP_OP,nop_impl,"nop",0,7)
+OP_DEF(BREAK_OP,break_impl,"break",0,3)
+OP_DEF(BREAKADDR_OP,breakaddr_impl,"breakaddr",0,3)
-- 
cgit v1.3

