be much more careful about sending values backwards...

[model-checker.git] / librace.cc

diff --git a/librace.cc b/librace.cc
index 42ed9c194d8134abc3980ac7651b81be3098669c..bdd6093a6b6d4ea1f8c9665219a660dc23d1a813 100644 (file)
--- a/librace.cc
+++ b/librace.cc
@@ -3,47 +3,100 @@
 
 #include "librace.h"
 #include "common.h"
+#include "datarace.h"
+#include "model.h"
+#include "threads.h"
 
 void store_8(void *addr, uint8_t val)
 {
        DEBUG("addr = %p, val = %" PRIu8 "\n", addr, val);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckWrite(tid, addr, cv);
+       (*(uint8_t *)addr) = val;
 }
 
 void store_16(void *addr, uint16_t val)
 {
        DEBUG("addr = %p, val = %" PRIu16 "\n", addr, val);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckWrite(tid, addr, cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+1), cv);
+       (*(uint16_t *)addr) = val;
 }
 
 void store_32(void *addr, uint32_t val)
 {
        DEBUG("addr = %p, val = %" PRIu32 "\n", addr, val);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckWrite(tid, addr, cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+1), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+2), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+3), cv);
+       (*(uint32_t *)addr) = val;
 }
 
 void store_64(void *addr, uint64_t val)
 {
        DEBUG("addr = %p, val = %" PRIu64 "\n", addr, val);
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckWrite(tid, addr, cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+1), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+2), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+3), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+4), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+5), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+6), cv);
+       raceCheckWrite(tid, (void *)(((uintptr_t)addr)+7), cv);
+       (*(uint64_t *)addr) = val;
 }
 
 uint8_t load_8(void *addr)
 {
        DEBUG("addr = %p\n", addr);
-       return 0;
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckRead(tid, addr, cv);
+       return *((uint8_t *)addr);
 }
 
 uint16_t load_16(void *addr)
 {
        DEBUG("addr = %p\n", addr);
-       return 0;
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckRead(tid, addr, cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+1), cv);
+       return *((uint16_t *)addr);
 }
 
 uint32_t load_32(void *addr)
 {
        DEBUG("addr = %p\n", addr);
-       return 0;
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckRead(tid, addr, cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+1), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+2), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+3), cv);
+       return *((uint32_t *)addr);
 }
 
 uint64_t load_64(void *addr)
 {
        DEBUG("addr = %p\n", addr);
-       return 0;
+       thread_id_t tid=thread_current()->get_id();
+       ClockVector * cv=model->get_cv(tid);
+       raceCheckRead(tid, addr, cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+1), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+2), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+3), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+4), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+5), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+6), cv);
+       raceCheckRead(tid, (void *)(((uintptr_t)addr)+7), cv);
+       return *((uint64_t *)addr);
 }