Done with this

rshipp · Apr 23, 2016 · f663738 · f663738
1 parent 25c52fb
commit f663738
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/flag_parser/flag_parser.cpp b/src/flag_parser/flag_parser.cpp
@@ -58,7 +58,7 @@ bool parse_flags(int argc, char** argv, FlagOptions& flags) {
      switch (c) {
      case 'h':
          print_usage();
-         break;
+         exit(EXIT_SUCCESS);
 
      case 'v':
          flags.verbose = true;

diff --git a/src/main.cpp b/src/main.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <cstdlib>
+#include "flag_parser/flag_parser.h"
 
 using namespace std;
 
@@ -13,6 +14,11 @@ using namespace std;
  * The main entry point to the simulation.
  */
 int main(int argc, char** argv) {
-  // TODO: implement me
+  FlagOptions options;
+  if (parse_flags(argc, argv, options)) {
+
+  } else {
+    return EXIT_FAILURE;
+  }
   return EXIT_SUCCESS;
 }
diff --git a/src/simulation/simulation.h b/src/simulation/simulation.h
@@ -7,8 +7,10 @@
 
 #pragma once
 #include "process/process.h"
+#include "frame/frame.h"
 #include "virtual_address/virtual_address.h"
 #include <cstdlib>
+#include <vector>
 
 
 /**
@@ -50,4 +52,5 @@ class Simulation {
 // INSTANCE VARIABLES
 private:
 
+  std::vector<Frame*> memory;
 };