From 2ce7e579d2f28cad7c390f37553cf1c6c2fecadb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 23 Nov 2018 21:48:53 -0500 Subject: [PATCH] dynarmic_tests: Remove inconsistent spacing Makes the changed code more consistent with the surrounding code. --- tests/A32/fuzz_arm.cpp | 90 +++++++++++++-------------- tests/A32/test_thumb_instructions.cpp | 48 +++++++------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/tests/A32/fuzz_arm.cpp b/tests/A32/fuzz_arm.cpp index 3efccf2e..433f7b70 100644 --- a/tests/A32/fuzz_arm.cpp +++ b/tests/A32/fuzz_arm.cpp @@ -272,23 +272,23 @@ TEST_CASE( "arm: Optimization Failure (Randomized test case)", "[arm][A32]" ) { test_env.ticks_left = 6; jit.Run(); - REQUIRE( jit.Regs()[0] == 0x00000af1 ); - REQUIRE( jit.Regs()[1] == 0x267ea626 ); - REQUIRE( jit.Regs()[2] == 0x69debf49 ); - REQUIRE( jit.Regs()[3] == 0x8f976895 ); - REQUIRE( jit.Regs()[4] == 0xcf8a42c8 ); - REQUIRE( jit.Regs()[5] == 0xcf89b8c7 ); - REQUIRE( jit.Regs()[6] == 0xb6713f85 ); - REQUIRE( jit.Regs()[7] == 0x015e2aa5 ); - REQUIRE( jit.Regs()[8] == 0xcd14336a ); - REQUIRE( jit.Regs()[9] == 0xafca0f3e ); - REQUIRE( jit.Regs()[10] == 0xace2efd9 ); - REQUIRE( jit.Regs()[11] == 0x68fb82cd ); - REQUIRE( jit.Regs()[12] == 0x775447c0 ); - REQUIRE( jit.Regs()[13] == 0xc9e1f8cd ); - REQUIRE( jit.Regs()[14] == 0xebe0e626 ); - REQUIRE( jit.Regs()[15] == 0x00000014 ); - REQUIRE( jit.Cpsr() == 0x200001d0 ); + REQUIRE(jit.Regs()[0] == 0x00000af1); + REQUIRE(jit.Regs()[1] == 0x267ea626); + REQUIRE(jit.Regs()[2] == 0x69debf49); + REQUIRE(jit.Regs()[3] == 0x8f976895); + REQUIRE(jit.Regs()[4] == 0xcf8a42c8); + REQUIRE(jit.Regs()[5] == 0xcf89b8c7); + REQUIRE(jit.Regs()[6] == 0xb6713f85); + REQUIRE(jit.Regs()[7] == 0x015e2aa5); + REQUIRE(jit.Regs()[8] == 0xcd14336a); + REQUIRE(jit.Regs()[9] == 0xafca0f3e); + REQUIRE(jit.Regs()[10] == 0xace2efd9); + REQUIRE(jit.Regs()[11] == 0x68fb82cd); + REQUIRE(jit.Regs()[12] == 0x775447c0); + REQUIRE(jit.Regs()[13] == 0xc9e1f8cd); + REQUIRE(jit.Regs()[14] == 0xebe0e626); + REQUIRE(jit.Regs()[15] == 0x00000014); + REQUIRE(jit.Cpsr() == 0x200001d0); } TEST_CASE( "arm: shsax r11, sp, r9 (Edge-case)", "[arm][A32]" ) { @@ -312,23 +312,23 @@ TEST_CASE( "arm: shsax r11, sp, r9 (Edge-case)", "[arm][A32]" ) { test_env.ticks_left = 2; jit.Run(); - REQUIRE( jit.Regs()[0] == 0x3a3b8b18 ); - REQUIRE( jit.Regs()[1] == 0x96156555 ); - REQUIRE( jit.Regs()[2] == 0xffef039f ); - REQUIRE( jit.Regs()[3] == 0xafb946f2 ); - REQUIRE( jit.Regs()[4] == 0x2030a69a ); - REQUIRE( jit.Regs()[5] == 0xafe09b2a ); - REQUIRE( jit.Regs()[6] == 0x896823c8 ); - REQUIRE( jit.Regs()[7] == 0xabde0ded ); - REQUIRE( jit.Regs()[8] == 0x9825d6a6 ); - REQUIRE( jit.Regs()[9] == 0x17498000 ); - REQUIRE( jit.Regs()[10] == 0x999d2c95 ); - REQUIRE( jit.Regs()[11] == 0x57bfe48e ); - REQUIRE( jit.Regs()[12] == 0x209bdb58 ); - REQUIRE( jit.Regs()[13] == 0x2f7fb1d4 ); - REQUIRE( jit.Regs()[14] == 0x0f378107 ); - REQUIRE( jit.Regs()[15] == 0x00000004 ); - REQUIRE( jit.Cpsr() == 0x000001d0 ); + REQUIRE(jit.Regs()[0] == 0x3a3b8b18); + REQUIRE(jit.Regs()[1] == 0x96156555); + REQUIRE(jit.Regs()[2] == 0xffef039f); + REQUIRE(jit.Regs()[3] == 0xafb946f2); + REQUIRE(jit.Regs()[4] == 0x2030a69a); + REQUIRE(jit.Regs()[5] == 0xafe09b2a); + REQUIRE(jit.Regs()[6] == 0x896823c8); + REQUIRE(jit.Regs()[7] == 0xabde0ded); + REQUIRE(jit.Regs()[8] == 0x9825d6a6); + REQUIRE(jit.Regs()[9] == 0x17498000); + REQUIRE(jit.Regs()[10] == 0x999d2c95); + REQUIRE(jit.Regs()[11] == 0x57bfe48e); + REQUIRE(jit.Regs()[12] == 0x209bdb58); + REQUIRE(jit.Regs()[13] == 0x2f7fb1d4); + REQUIRE(jit.Regs()[14] == 0x0f378107); + REQUIRE(jit.Regs()[15] == 0x00000004); + REQUIRE(jit.Cpsr() == 0x000001d0); } TEST_CASE( "arm: uasx (Edge-case)", "[arm][A32]" ) { @@ -350,11 +350,11 @@ TEST_CASE( "arm: uasx (Edge-case)", "[arm][A32]" ) { test_env.ticks_left = 2; jit.Run(); - REQUIRE( jit.Regs()[4] == 0x8ed38f4c ); - REQUIRE( jit.Regs()[5] == 0x0000261d ); - REQUIRE( jit.Regs()[9] == 0xb4f08f4c ); - REQUIRE( jit.Regs()[15] == 0x00000004 ); - REQUIRE( jit.Cpsr() == 0x000301d0 ); + REQUIRE(jit.Regs()[4] == 0x8ed38f4c); + REQUIRE(jit.Regs()[5] == 0x0000261d); + REQUIRE(jit.Regs()[9] == 0xb4f08f4c); + REQUIRE(jit.Regs()[15] == 0x00000004); + REQUIRE(jit.Cpsr() == 0x000301d0); } struct VfpTest { @@ -396,12 +396,12 @@ static void RunVfpTests(u32 instr, std::vector tests) { } }; - REQUIRE( jit.Regs()[15] == 4 ); - REQUIRE( jit.Cpsr() == 0x000001d0 ); - check( jit.ExtRegs()[2] == test.result ); - check( jit.ExtRegs()[4] == test.a ); - check( jit.ExtRegs()[6] == test.b ); - //check( jit.Fpscr() == test.final_fpscr ); + REQUIRE(jit.Regs()[15] == 4); + REQUIRE(jit.Cpsr() == 0x000001d0); + check(jit.ExtRegs()[2] == test.result); + check(jit.ExtRegs()[4] == test.a); + check(jit.ExtRegs()[6] == test.b); + //check(jit.Fpscr() == test.final_fpscr); } } diff --git a/tests/A32/test_thumb_instructions.cpp b/tests/A32/test_thumb_instructions.cpp index 012e678b..446f94ea 100644 --- a/tests/A32/test_thumb_instructions.cpp +++ b/tests/A32/test_thumb_instructions.cpp @@ -34,10 +34,10 @@ TEST_CASE( "thumb: lsls r0, r1, #2", "[thumb]" ) { test_env.ticks_left = 1; jit.Run(); - REQUIRE( jit.Regs()[0] == 8 ); - REQUIRE( jit.Regs()[1] == 2 ); - REQUIRE( jit.Regs()[15] == 2 ); - REQUIRE( jit.Cpsr() == 0x00000030 ); + REQUIRE(jit.Regs()[0] == 8); + REQUIRE(jit.Regs()[1] == 2); + REQUIRE(jit.Regs()[15] == 2); + REQUIRE(jit.Cpsr() == 0x00000030); } TEST_CASE( "thumb: lsls r0, r1, #31", "[thumb]" ) { @@ -55,10 +55,10 @@ TEST_CASE( "thumb: lsls r0, r1, #31", "[thumb]" ) { test_env.ticks_left = 1; jit.Run(); - REQUIRE( jit.Regs()[0] == 0x80000000 ); - REQUIRE( jit.Regs()[1] == 0xffffffff ); - REQUIRE( jit.Regs()[15] == 2 ); - REQUIRE( jit.Cpsr() == 0xA0000030 ); // N, C flags, Thumb, User-mode + REQUIRE(jit.Regs()[0] == 0x80000000); + REQUIRE(jit.Regs()[1] == 0xffffffff); + REQUIRE(jit.Regs()[15] == 2); + REQUIRE(jit.Cpsr() == 0xA0000030); // N, C flags, Thumb, User-mode } TEST_CASE( "thumb: revsh r4, r3", "[thumb]" ) { @@ -75,10 +75,10 @@ TEST_CASE( "thumb: revsh r4, r3", "[thumb]" ) { test_env.ticks_left = 1; jit.Run(); - REQUIRE( jit.Regs()[3] == 0x12345678 ); - REQUIRE( jit.Regs()[4] == 0x00007856 ); - REQUIRE( jit.Regs()[15] == 2 ); - REQUIRE( jit.Cpsr() == 0x00000030 ); // Thumb, User-mode + REQUIRE(jit.Regs()[3] == 0x12345678); + REQUIRE(jit.Regs()[4] == 0x00007856); + REQUIRE(jit.Regs()[15] == 2); + REQUIRE(jit.Cpsr() == 0x00000030); // Thumb, User-mode } TEST_CASE( "thumb: ldr r3, [r3, #28]", "[thumb]" ) { @@ -95,9 +95,9 @@ TEST_CASE( "thumb: ldr r3, [r3, #28]", "[thumb]" ) { test_env.ticks_left = 1; jit.Run(); - REQUIRE( jit.Regs()[3] == 0x97969594 ); // Memory location 0x12345694 - REQUIRE( jit.Regs()[15] == 2 ); - REQUIRE( jit.Cpsr() == 0x00000030 ); // Thumb, User-mode + REQUIRE(jit.Regs()[3] == 0x97969594); // Memory location 0x12345694 + REQUIRE(jit.Regs()[15] == 2); + REQUIRE(jit.Cpsr() == 0x00000030); // Thumb, User-mode } TEST_CASE( "thumb: blx +#67712", "[thumb]" ) { @@ -113,9 +113,9 @@ TEST_CASE( "thumb: blx +#67712", "[thumb]" ) { test_env.ticks_left = 1; jit.Run(); - REQUIRE( jit.Regs()[14] == (0x4 | 1) ); - REQUIRE( jit.Regs()[15] == 0x10880 ); - REQUIRE( jit.Cpsr() == 0x00000010 ); // User-mode + REQUIRE(jit.Regs()[14] == (0x4 | 1)); + REQUIRE(jit.Regs()[15] == 0x10880); + REQUIRE(jit.Cpsr() == 0x00000010); // User-mode } TEST_CASE( "thumb: bl +#234584", "[thumb]" ) { @@ -131,9 +131,9 @@ TEST_CASE( "thumb: bl +#234584", "[thumb]" ) { test_env.ticks_left = 1; jit.Run(); - REQUIRE( jit.Regs()[14] == (0x4 | 1) ); - REQUIRE( jit.Regs()[15] == 0x39458 ); - REQUIRE( jit.Cpsr() == 0x00000030 ); // Thumb, User-mode + REQUIRE(jit.Regs()[14] == (0x4 | 1)); + REQUIRE(jit.Regs()[15] == 0x39458); + REQUIRE(jit.Cpsr() == 0x00000030); // Thumb, User-mode } TEST_CASE( "thumb: bl -#42", "[thumb]" ) { @@ -149,7 +149,7 @@ TEST_CASE( "thumb: bl -#42", "[thumb]" ) { test_env.ticks_left = 1; jit.Run(); - REQUIRE( jit.Regs()[14] == (0x4 | 1) ); - REQUIRE( jit.Regs()[15] == 0xFFFFFFD6 ); - REQUIRE( jit.Cpsr() == 0x00000030 ); // Thumb, User-mode + REQUIRE(jit.Regs()[14] == (0x4 | 1)); + REQUIRE(jit.Regs()[15] == 0xFFFFFFD6); + REQUIRE(jit.Cpsr() == 0x00000030); // Thumb, User-mode }