projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a bug
[c11tester.git]
/
funcinst.h
diff --git
a/funcinst.h
b/funcinst.h
index 9aec00f6cc3ae74880c4fc3af6a47cec5df28dd3..6bbed2c88ca452c8af13ec31e72eb156f5c50e60 100644
(file)
--- a/
funcinst.h
+++ b/
funcinst.h
@@
-17,7
+17,7
@@
public:
void * get_location() const { return location; }
void set_location(void * loc) { location = loc; }
void * get_location() const { return location; }
void set_location(void * loc) { location = loc; }
- void
re
set_location() { location = NULL; }
+ void
un
set_location() { location = NULL; }
action_type get_type() const { return type; }
memory_order get_mo() const { return order; }
action_type get_type() const { return type; }
memory_order get_mo() const { return order; }
@@
-48,7
+48,11
@@
private:
* location only stores the memory location when this FuncInst was constructed.
*/
void * location;
* location only stores the memory location when this FuncInst was constructed.
*/
void * location;
+
+ /* NOTE: for rmw actions, func_inst and act may have different
+ * action types because of action type conversion in ModelExecution */
action_type type;
action_type type;
+
memory_order order;
FuncNode * func_node;
memory_order order;
FuncNode * func_node;
@@
-66,4
+70,3
@@
private:
};
#endif /* __FUNCINST_H__ */
};
#endif /* __FUNCINST_H__ */
-