trivial - whitespace, debugging cleanup, etc.

diff --git a/model.cc b/model.cc
index c86a6f676718d3fab6122282483786dd85589cb0..726901b2c07fcf9bb9f44317ca644a565c6dc8d6 100644 (file)
--- 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 84d9dbc015f0d6d593f4e72da807042c8bc3e373..5d160e1a837da27677bf441efcdc956e8af8a687 100644 (file)
--- 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);