Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/googletest
Submodule googletest updated 34 files
+2 −2 CMakeLists.txt
+2 −2 MODULE.bazel
+4 −7 README.md
+6 −5 WORKSPACE
+29 −47 ci/linux-presubmit.sh
+4 −7 ci/macos-presubmit.sh
+13 −25 ci/windows-presubmit.bat
+45 −45 docs/advanced.md
+1 −2 docs/reference/actions.md
+4 −5 docs/reference/matchers.md
+6 −23 googlemock/include/gmock/gmock-actions.h
+4 −7 googlemock/include/gmock/gmock-matchers.h
+5 −4 googlemock/include/gmock/gmock-more-actions.h
+5 −0 googlemock/include/gmock/internal/gmock-internal-utils.h
+3 −3 googlemock/test/gmock-actions_test.cc
+10 −39 googlemock/test/gmock-more-actions_test.cc
+4 −3 googlemock/test/gmock-spec-builders_test.cc
+1 −1 googletest/README.md
+1 −1 googletest/cmake/internal_utils.cmake
+0 −7 googletest/include/gtest/gtest-assertion-result.h
+34 −33 googletest/include/gtest/gtest-param-test.h
+65 −61 googletest/include/gtest/gtest-typed-test.h
+2 −2 googletest/include/gtest/gtest.h
+22 −26 googletest/include/gtest/internal/gtest-internal.h
+64 −2 googletest/include/gtest/internal/gtest-port.h
+27 −11 googletest/src/gtest.cc
+1 −0 googletest/test/BUILD.bazel
+17 −19 googletest/test/googletest-json-output-unittest.py
+1 −7 googletest/test/googletest-printers-test.cc
+2 −2 googletest/test/googletest-setuptestsuite-test_.cc
+4 −3 googletest/test/gtest_unittest.cc
+43 −45 googletest/test/gtest_xml_output_unittest.py
+1 −5 googletest/test/gtest_xml_output_unittest_.cc
+3 −3 googletest_deps.bzl
5 changes: 1 addition & 4 deletions src/Emulator/Core/CPU/CPU.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
#include "Logger/Logger.hpp"
#include <functional>

#include <Core/MemoryController/MemoryControllerMT.hpp>
#include <Core/MemoryController/MemoryControllerST.hpp>
#include <Core/CPU/Decoders/IDecoder.hpp>
#include <Core/CPU/Decoders/StdDecoder.hpp>
#include <Core/CPU/CPU.hpp>

HyperCPU::CPU::CPU(std::size_t core_count, std::size_t mem_size, char* binary, std::uint64_t binary_size) :
mem_controller(core_count == 1 ?
dynamic_cast<IMemoryController*>(new MemoryControllerST(mem_size, this)) :
dynamic_cast<IMemoryController*>(new MemoryControllerMT(mem_size, this))),
mem_controller(dynamic_cast<IMemoryController*>(new MemoryControllerST(mem_size, this))),
logger(LogLevel::ERROR),
core_count(core_count),
total_mem(mem_size),
Expand Down
1 change: 0 additions & 1 deletion src/Emulator/Core/CPU/CPU.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ namespace HyperCPU {
using write_operation_handler = std::function<void(std::uint8_t)>;

class MemoryControllerST;
class MemoryControllerMT;

class CPU {
private:
Expand Down
127 changes: 0 additions & 127 deletions src/Emulator/Core/MemoryController/MemoryControllerMT.hpp

This file was deleted.

227 changes: 0 additions & 227 deletions test/Modular/EmulatorCore/MemoryControllers/MT.cpp

This file was deleted.

Loading