projects
/
satcheck.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small edits
[satcheck.git]
/
include
/
libinterface.h
diff --git
a/include/libinterface.h
b/include/libinterface.h
index ed73198ced588d01334e1044121ae8191819c998..673b6922defb510ee234123d137db44368b28ecd 100644
(file)
--- a/
include/libinterface.h
+++ b/
include/libinterface.h
@@
-88,8
+88,8
@@
extern "C" {
void MC2_nextOpThrd_join(MCID jointhrd);
/** Tells MC2 that we hit the merge point of a conditional
void MC2_nextOpThrd_join(MCID jointhrd);
/** Tells MC2 that we hit the merge point of a conditional
- * branch. branchid is the MCID
for the condition variable of the
- * branch that just merged. */
+ * branch. branchid is the MCID
returned by the corresponding
+ *
MC2_branchUsesID function for the
branch that just merged. */
void MC2_merge(MCID branchid);
/** Tells MC2 that we just computed something that MC2 should treat
void MC2_merge(MCID branchid);
/** Tells MC2 that we just computed something that MC2 should treat
@@
-128,7
+128,7
@@
extern "C" {
* } else {
* y=1;
* }
* } else {
* y=1;
* }
- * // must put here: MC2_merge(_
m_x
);
+ * // must put here: MC2_merge(_
branch_id
);
* // MC2_phi(_m_y);
*/
* // MC2_phi(_m_y);
*/