From: Brian Norris Date: Wed, 1 Aug 2012 02:20:16 +0000 (-0700) Subject: trivial - whitespace, debugging cleanup, etc. X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=bf7f7645131e1143b7ece3a74a827ace0c7a7304 trivial - whitespace, debugging cleanup, etc. --- diff --git a/model.cc b/model.cc index c86a6f67..726901b2 100644 --- a/model.cc +++ b/model.cc @@ -531,7 +531,7 @@ void ModelChecker::build_reads_from_past(ModelAction *curr) /* TODO: need a more informative way of reporting errors */ printf("ERROR: may read from uninitialized atomic\n"); } - + if (DBG_ENABLED() || !initialized) { printf("Reached read action:\n"); curr->print(); @@ -539,7 +539,7 @@ void ModelChecker::build_reads_from_past(ModelAction *curr) curr->get_node()->print_may_read_from(); printf("End printing may_read_from\n"); } - + ASSERT(initialized); } @@ -595,10 +595,8 @@ void ModelChecker::remove_thread(Thread *t) */ int ModelChecker::switch_to_master(ModelAction *act) { - Thread *old; - DBG(); - old = thread_current(); + Thread * old = thread_current(); set_current_action(act); old->set_state(THREAD_READY); return Thread::swap(old, get_system_context()); diff --git a/snapshot-interface.cc b/snapshot-interface.cc index 84d9dbc0..5d160e1a 100644 --- a/snapshot-interface.cc +++ b/snapshot-interface.cc @@ -63,8 +63,6 @@ static void SnapshotGlobalSegments(){ size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE; if (len != 0) addMemoryRegionToSnapShot(begin, len); - DEBUG("%s\n", buf); - DEBUG("%45s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p); } } pclose(map);