little fixes

diff --git a/Makefile b/Makefile
index a1d0d27a4a43dbacb1f7e5f856b59ce116689752..26d4629791ff210ee9ff3b7a5dedd4dab7ef8792 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ OBJECTS := libthreads.o schedule.o model.o threads.o librace.o action.o \
           datarace.o impatomic.o cmodelint.o \
           snapshot.o malloc.o mymemory.o common.o mutex.o conditionvariable.o \
           context.o execution.o libannotate.o plugins.o pthread.o futex.o fuzzer.o \
-          sleeps.o history.o funcnode.o funcinst.o printf.o
+          sleeps.o history.o funcnode.o funcinst.o predicate.o printf.o
 
 CPPFLAGS += -Iinclude -I.
 LDFLAGS := -ldl -lrt -rdynamic -lpthread

diff --git a/cmodelint.cc b/cmodelint.cc
index fdac33aa1324d5735cd96f09ab2b712a9a53119f..3c59fa01a68277cdbb74fc0a6af55698530b1b9a 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -10,7 +10,7 @@
 #include "threads-model.h"
 #include "datarace.h"
 
-memory_order orders[8] = {
+memory_order orders[7] = {
        memory_order_relaxed, memory_order_consume, memory_order_acquire,
        memory_order_release, memory_order_acq_rel, memory_order_seq_cst,
 };

diff --git a/predicate.cc b/predicate.cc
index 00eaaa0259642aa0b590b67e999638107dd2f0f8..c4724ef9da7232a8bd4870a9256d0896dff5ae57 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -5,7 +5,7 @@ Predicate::Predicate(FuncInst * func_inst) :
 {}
 
 unsigned int pred_expr_hash(struct pred_expr * expr) {
-        return (unsigned int)((uintptr_t)hash);
+        return (unsigned int)((uintptr_t)expr);
 }
 
 bool pred_expr_equal(struct pred_expr * p1, struct pred_expr * p2)
@@ -21,6 +21,6 @@ bool pred_expr_equal(struct pred_expr * p1, struct pred_expr * p2)
 
 void Predicate::add_predicate(token_t token, void * location, bool value)
 {
-       struct pred_expr = {token, location, value};
+       struct pred_expr predicate = {token, location, value};
        predicates.add(&predicate);
 }

diff --git a/predicate.h b/predicate.h
index 3849e2d88e0e4b2c519c4bd61717597a0d53f2e3..6cdce9123a46b49b2c8be987d70a6d264ffedbaf 100644 (file)
--- a/predicate.h
+++ b/predicate.h
@@ -2,6 +2,7 @@
 #define __PREDICATE_H__
 
 #include "funcinst.h"
+#include "hashset.h"
 
 unsigned int pred_expr_hash (struct pred_expr *);
 bool pred_expr_equal(struct pred_expr *, struct pred_expr *);