Feature test read to uninit mem (#15)

* Return 0 if memory uninitialized
* Fix segmentation fault in failed test cases

Author: AsaiYusuke

include/test/test.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "test/test_total_result.h"
 #include "test/test_result.h"
 #include "nlohmann/json.hpp"
 
@@ -10,6 +9,7 @@ using json = nlohmann::json;
 
 class args_parser;
 class emulation_devices;
+class test_total_result;
 class debug_info;
 
 class test
@@ -21,7 +21,7 @@ class test
     vector<json> test_scinarios;
 
     json read_json(string path);
-    void traverse(test_total_result &total_result, json test_target, json test_template, json testcase, string path);
+    void traverse(emulation_devices *device, test_total_result *total_result, json test_target, json test_template, json testcase, string path);
     test_result do_test(string id, json test_target, json test_template, json testcase);
     void print_call_stack();
 

include/test/test_total_result.h

@@ -9,15 +9,14 @@ class args_parser;
 class test_total_result
 {
 private:
-    emulation_devices *device;
     args_parser *args;
     int total;
     vector<test_result> results;
     map<test_result_type, int> test_result_map;
 
 public:
-    test_total_result(emulation_devices *_device, args_parser *_args);
-    void add_and_print_result(test_result result);
+    test_total_result(args_parser *_args);
+    void add_and_print_result(emulation_devices *device, test_result result);
     bool is_success();
     void set_total(int total);
     void print_summary();

src/emulation/memory_device.cpp

@@ -152,7 +152,7 @@ uint8_t memory_device::read(uint16_t address)
         }
     }
 
-    return ram[address];
+    return ram.count(address) == 0 ? 0 : ram[address];
 }
 
 uint8_t memory_device::read_raw(uint16_t address)

src/test/test.cpp

@@ -3,6 +3,7 @@
 #include <string>
 
 #include "test/test.h"
+#include "test/test_total_result.h"
 #include "test/test_result.h"
 #include "test/test_setup.h"
 #include "test/test_assert.h"
@@ -56,15 +57,16 @@ test::test(args_parser *_args)
 
 bool test::execute()
 {
-    test_total_result total_result{device, args};
+    test_total_result total_result{args};
     int num_cases = 0;
 
     for (auto test_scinario : test_scinarios)
     {
         num_cases += test_scinario["cases"].size();
         device = new emulation_devices(args, test_scinario["config"], debug);
         traverse(
-            total_result,
+            device,
+            &total_result,
             test_scinario["target"],
             test_scinario["definitions"]["templates"],
             test_scinario["cases"],
@@ -80,7 +82,7 @@ bool test::execute()
     return total_result.is_success();
 }
 
-void test::traverse(test_total_result &total_result, json test_target, json test_template, json test_case, string path)
+void test::traverse(emulation_devices *device, test_total_result *total_result, json test_target, json test_template, json test_case, string path)
 {
     for (auto &element : test_case.items())
     {
@@ -91,14 +93,15 @@ void test::traverse(test_total_result &total_result, json test_target, json test
 
         if (test_id_path.ends_with("/"))
         {
-            traverse(total_result, test_target, test_template, sub_test_case, test_id_path);
+            traverse(device, total_result, test_target, test_template, sub_test_case, test_id_path);
             continue;
         }
 
         if (!args->get_test_id().empty() && args->get_test_id() != test_id_path)
             continue;
 
-        total_result.add_and_print_result(
+        total_result->add_and_print_result(
+            device,
             do_test(test_id_path, test_target, test_template, sub_test_case));
     }
 }

src/test/test_total_result.cpp

@@ -1,13 +1,12 @@
 #include "test/test_total_result.h"
 #include "args_parser.h"
 
-test_total_result::test_total_result(emulation_devices *_device, args_parser *_args)
+test_total_result::test_total_result(args_parser *_args)
 {
-    device = _device;
     args = _args;
 }
 
-void test_total_result::add_and_print_result(test_result result)
+void test_total_result::add_and_print_result(emulation_devices *device, test_result result)
 {
     test_result_map[result.get_result_type()]++;