static void *memory_top;
static RaceSet * raceset;
+#ifdef COLLECT_STAT
static unsigned int store8_count = 0;
static unsigned int store16_count = 0;
static unsigned int store32_count = 0;
static unsigned int load16_count = 0;
static unsigned int load32_count = 0;
static unsigned int load64_count = 0;
+#endif
static const ModelExecution * get_execution()
{
ASSERT(readThread >= 0);
record->thread[0] = readThread;
record->readClock[0] = readClock;
+ } else {
+ record->thread = NULL;
}
if (shadowval & ATOMICMASK)
record->isAtomic = 1;
if (clock_may_race(currClock, thread, readClock, readThread)) {
/* Still need this read in vector */
if (copytoindex != i) {
- ASSERT(record->thread[i] >= 0);
- record->readClock[copytoindex] = record->readClock[i];
- record->thread[copytoindex] = record->thread[i];
+ ASSERT(readThread >= 0);
+ record->readClock[copytoindex] = readClock;
+ record->thread[copytoindex] = readThread;
}
copytoindex++;
}
}
if (__builtin_popcount(copytoindex) <= 1) {
- if (copytoindex == 0) {
+ if (copytoindex == 0 && record->thread == NULL) {
int newCapacity = INITCAPACITY;
record->thread = (thread_id_t *)snapshot_malloc(sizeof(thread_id_t) * newCapacity);
record->readClock = (modelclock_t *)snapshot_malloc(sizeof(modelclock_t) * newCapacity);
raceCheckWrite_firstIt(thread, location, &old_shadowval, &new_shadowval);
}
+#ifdef COLLECT_STAT
void print_normal_accesses()
{
model_print("store 8 count: %u\n", store8_count);
model_print("load 32 count: %u\n", load32_count);
model_print("load 64 count: %u\n", load64_count);
}
+#endif