X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=librace.cc;h=8ecf2afc1daa90db43fb692e76ed8c6c58a90210;hb=d49c09078cfbb85f565cc59b83ec727bc08b72bf;hp=1d1ebbfc49338b06e6a9980ecd08faf08c35e615;hpb=fbc13c8288d44ea54017153b1b09a7dadf5e9c48;p=c11tester.git diff --git a/librace.cc b/librace.cc index 1d1ebbfc..8ecf2afc 100644 --- a/librace.cc +++ b/librace.cc @@ -108,8 +108,6 @@ void cds_store8(void *addr) return; thread_id_t tid = thread_current()->get_id(); raceCheckWrite8(tid, addr); - -// raceCheckWrite(tid, addr); } void cds_store16(void *addr) @@ -119,9 +117,6 @@ void cds_store16(void *addr) return; thread_id_t tid = thread_current()->get_id(); raceCheckWrite16(tid, addr); - -// raceCheckWrite(tid, addr); -// raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1)); } void cds_store32(void *addr) @@ -131,13 +126,6 @@ void cds_store32(void *addr) return; thread_id_t tid = thread_current()->get_id(); raceCheckWrite32(tid, addr); - -/* - raceCheckWrite(tid, addr); - raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1)); - raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 2)); - raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 3)); -*/ } void cds_store64(void *addr) @@ -147,67 +135,32 @@ void cds_store64(void *addr) return; thread_id_t tid = thread_current()->get_id(); raceCheckWrite64(tid, addr); - -/* - raceCheckWrite(tid, addr); - raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 1)); - raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 2)); - raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 3)); - raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 4)); - raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 5)); - raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 6)); - raceCheckWrite(tid, (void *)(((uintptr_t)addr) + 7)); -*/ } void cds_load8(const void *addr) { if (!model) return; thread_id_t tid = thread_current()->get_id(); - raceCheckRead8(tid, addr); - -// raceCheckRead(tid, addr); } void cds_load16(const void *addr) { if (!model) return; thread_id_t tid = thread_current()->get_id(); - raceCheckRead16(tid, addr); -// raceCheckRead(tid, addr); -// raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1)); } void cds_load32(const void *addr) { if (!model) return; thread_id_t tid = thread_current()->get_id(); - raceCheckRead32(tid, addr); -/* - raceCheckRead(tid, addr); - raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1)); - raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 2)); - raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 3)); -*/ } void cds_load64(const void *addr) { if (!model) return; thread_id_t tid = thread_current()->get_id(); - raceCheckRead64(tid, addr); -/* - raceCheckRead(tid, addr); - raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 1)); - raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 2)); - raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 3)); - raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 4)); - raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 5)); - raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 6)); - raceCheckRead(tid, (const void *)(((uintptr_t)addr) + 7)); -*/ }