Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(328)

Unified Diff: src/liboslexec/opinteger.cpp

Issue 206045: Pre-review: run state overhaul (Closed) Base URL: http://openshadinglanguage.googlecode.com/svn/trunk/
Patch Set: Update patch set to sync with trunk Created 14 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/liboslexec/opinteger.cpp
===================================================================
--- src/liboslexec/opinteger.cpp (revision 583)
+++ src/liboslexec/opinteger.cpp (working copy)
@@ -126,8 +126,7 @@
ASSERT (Result.typespec().is_int() && A.typespec().is_int() &&
B.typespec().is_int());
- binary_op_guts<int,int,int,BitAnd> (Result, A, B, exec,
- runflags, beginpoint, endpoint);
+ binary_op_guts<int,int,int,BitAnd> (Result, A, B, exec);
}
@@ -150,8 +149,7 @@
ASSERT (Result.typespec().is_int() && A.typespec().is_int() &&
B.typespec().is_int());
- binary_op_guts<int,int,int,BitOr> (Result, A, B, exec,
- runflags, beginpoint, endpoint);
+ binary_op_guts<int,int,int,BitOr> (Result, A, B, exec);
}
@@ -174,8 +172,7 @@
ASSERT (Result.typespec().is_int() && A.typespec().is_int() &&
B.typespec().is_int());
- binary_op_guts<int,int,int,Xor> (Result, A, B, exec,
- runflags, beginpoint, endpoint);
+ binary_op_guts<int,int,int,Xor> (Result, A, B, exec);
}
@@ -198,8 +195,7 @@
ASSERT (Result.typespec().is_int() && A.typespec().is_int() &&
B.typespec().is_int());
- binary_op_guts<int,int,int,Shl> (Result, A, B, exec,
- runflags, beginpoint, endpoint);
+ binary_op_guts<int,int,int,Shl> (Result, A, B, exec);
}
@@ -222,8 +218,7 @@
ASSERT (Result.typespec().is_int() && A.typespec().is_int() &&
B.typespec().is_int());
- binary_op_guts<int,int,int,Shr> (Result, A, B, exec,
- runflags, beginpoint, endpoint);
+ binary_op_guts<int,int,int,Shr> (Result, A, B, exec);
}
@@ -231,10 +226,10 @@
DECLOP (OP_compl)
{
DASSERT (nargs == 2);
-#ifdef DEBUG
+//#ifdef DEBUG
Symbol &Result (exec->sym (args[0]));
Symbol &A (exec->sym (args[1]));
-#endif
+//#endif
DASSERT (! Result.typespec().is_closure() &&
! Result.typespec().is_structure() &&
! Result.typespec().is_array());
@@ -243,8 +238,9 @@
! A.typespec().is_array());
DASSERT (Result.typespec().is_int() && A.typespec().is_int());
- unary_op_noderivs<int,int,Compl> (exec, nargs, args,
- runflags, beginpoint, endpoint);
+// unary_op_noderivs<int,int,Compl> (exec, nargs, args,
+// runflags, beginpoint_, endpoint_);
Chris Foster 2010/02/23 06:01:51 Is the commented out stuff in OP_compl dead code?
+ unary_op_guts_noderivs<int,int,Compl> (Result, A, exec);
}
@@ -267,8 +263,7 @@
DASSERT (Result.typespec().is_int() && A.typespec().is_int() &&
B.typespec().is_int());
- binary_op_guts<int,int,int,LogicAnd> (Result, A, B, exec,
- runflags, beginpoint, endpoint);
+ binary_op_guts<int,int,int,LogicAnd> (Result, A, B, exec);
}
@@ -291,8 +286,7 @@
DASSERT (Result.typespec().is_int() && A.typespec().is_int() &&
B.typespec().is_int());
- binary_op_guts<int,int,int,LogicOr> (Result, A, B, exec,
- runflags, beginpoint, endpoint);
+ binary_op_guts<int,int,int,LogicOr> (Result, A, B, exec);
}

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b