summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorGravatar Sebastian Valle2017-09-30 14:46:06 -0500
committerGravatar GitHub2017-09-30 14:46:06 -0500
commit5ba48c161053fa8cd05c443cb94d4f66fede4d15 (patch)
tree8728152f1726aeb775c2bba2ecc60bc67354e083 /src/tests
parentServices/UDS: Handle the rest of the connection sequence. (#2963) (diff)
parentMoved down_count to CoreTiming (diff)
downloadyuzu-5ba48c161053fa8cd05c443cb94d4f66fede4d15.tar.gz
yuzu-5ba48c161053fa8cd05c443cb94d4f66fede4d15.tar.xz
yuzu-5ba48c161053fa8cd05c443cb94d4f66fede4d15.zip
Merge pull request #2973 from huwpascoe/down_count
Moved down_count to CoreTiming
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/core/arm/dyncom/arm_dyncom_vfp_tests.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tests/core/arm/dyncom/arm_dyncom_vfp_tests.cpp b/src/tests/core/arm/dyncom/arm_dyncom_vfp_tests.cpp
index 86de41773..83719a58e 100644
--- a/src/tests/core/arm/dyncom/arm_dyncom_vfp_tests.cpp
+++ b/src/tests/core/arm/dyncom/arm_dyncom_vfp_tests.cpp
@@ -5,6 +5,7 @@
5#include <catch.hpp> 5#include <catch.hpp>
6 6
7#include "core/arm/dyncom/arm_dyncom.h" 7#include "core/arm/dyncom/arm_dyncom.h"
8#include "core/core_timing.h"
8#include "tests/core/arm/arm_test_common.h" 9#include "tests/core/arm/arm_test_common.h"
9 10
10namespace ArmTests { 11namespace ArmTests {
@@ -29,7 +30,6 @@ TEST_CASE("ARM_DynCom (vfp): vadd", "[arm_dyncom]") {
29 }}; 30 }};
30 31
31 for (const auto& test_case : test_cases) { 32 for (const auto& test_case : test_cases) {
32 dyncom.down_count = 1000; // Ensure that CoreTimeing will not be called.
33 dyncom.SetPC(0); 33 dyncom.SetPC(0);
34 dyncom.SetVFPSystemReg(VFP_FPSCR, test_case.initial_fpscr); 34 dyncom.SetVFPSystemReg(VFP_FPSCR, test_case.initial_fpscr);
35 dyncom.SetVFPReg(4, test_case.a); 35 dyncom.SetVFPReg(4, test_case.a);