more allocation fixes (use snapshotting)

diff --git a/model.cc b/model.cc
index 28880dd266ead573229604e03a2d3370b89d4057..62be08746db8ad95fe4aa09283c2f2034250a750 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -31,7 +31,7 @@ ModelChecker::ModelChecker()
 
 ModelChecker::~ModelChecker()
 {
-       std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< int, class Thread * > > >::iterator it;
+       std::map<int, class Thread *>::iterator it;
        for (it = thread_map.begin(); it != thread_map.end(); it++)
                delete (*it).second;
        thread_map.clear();

diff --git a/threads.cc b/threads.cc
index d00e21228295b0f9bc7f86902a2a9bfcc2577947..bdeea6a0e0c34c573df705d3874f8c81b8e8316b 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -9,12 +9,12 @@
 
 static void * stack_allocate(size_t size)
 {
-       return userMalloc(size);
+       return MYMALLOC(size);
 }
 
 static void stack_free(void *stack)
 {
-       userFree(stack);
+       MYFREE(stack);
 }
 
 Thread * thread_current(void)