3

cache/Project1/Proj1-1/Proj1-1/src/main.cc

@@ -1,5 +1,3 @@
-
-#include "world.h"
 #include "cache.h"
 #include "public.h"
 
@@ -20,8 +18,18 @@ int main(int argc, char *argv[])
 		}
 
 		auto cache = new Cache(char *argv[]);
+
+		ifstream trace("../traces/" + p.TraceFile());
+		string line;
+		char op;
+		unsigned addr;
+		while(getline(trace, line) && (istringstream(line) >> op >> hex >> addr)) {
+        	cache->useCache(addr, op == 'w');
+    	}
+		trace.close();
 	}
-	catch (...)
+	catch (const char* e)
 	{
+		std::cerr << "Caught exception: " << e << std::endl;
 	}
 }