Fix RISCV test_riscv32_fp_move test

RISCV FP registers are 64-bit in size, even in 32-bit mode, because they can
hold doubles. The test even uses the double-precision instruction fmv.d. Thus,
the reads should be reading 64-bit registers.
This commit is contained in:
Robert Xiao 2023-05-11 23:39:15 -07:00
parent 30d202b89e
commit b041345a73

View File

@ -222,8 +222,8 @@ static void test_riscv32_fp_move(void)
uc_engine *uc; uc_engine *uc;
char code[] = "\xd3\x81\x10\x22"; // fmv.d f3, f1 char code[] = "\xd3\x81\x10\x22"; // fmv.d f3, f1
uint32_t r_f1 = 0x1234; uint64_t r_f1 = 0x123456781a2b3c4dULL;
uint32_t r_f3 = 0x5678; uint64_t r_f3 = 0x56780246aaaabbbbULL;
uc_common_setup(&uc, UC_ARCH_RISCV, UC_MODE_RISCV32, code, uc_common_setup(&uc, UC_ARCH_RISCV, UC_MODE_RISCV32, code,
sizeof(code) - 1); sizeof(code) - 1);
@ -238,8 +238,8 @@ static void test_riscv32_fp_move(void)
OK(uc_reg_read(uc, UC_RISCV_REG_F1, &r_f1)); OK(uc_reg_read(uc, UC_RISCV_REG_F1, &r_f1));
OK(uc_reg_read(uc, UC_RISCV_REG_F3, &r_f3)); OK(uc_reg_read(uc, UC_RISCV_REG_F3, &r_f3));
TEST_CHECK(r_f1 == 0x1234); TEST_CHECK(r_f1 == 0x123456781a2b3c4dULL);
TEST_CHECK(r_f3 == 0x1234); TEST_CHECK(r_f3 == 0x123456781a2b3c4dULL);
uc_close(uc); uc_close(uc);
} }
@ -249,8 +249,8 @@ static void test_riscv64_fp_move(void)
uc_engine *uc; uc_engine *uc;
char code[] = "\xd3\x81\x10\x22"; // fmv.d f3, f1 char code[] = "\xd3\x81\x10\x22"; // fmv.d f3, f1
uint64_t r_f1 = 0x12341234; uint64_t r_f1 = 0x123456781a2b3c4dULL;
uint64_t r_f3 = 0x56785678; uint64_t r_f3 = 0x56780246aaaabbbbULL;
uc_common_setup(&uc, UC_ARCH_RISCV, UC_MODE_RISCV64, code, uc_common_setup(&uc, UC_ARCH_RISCV, UC_MODE_RISCV64, code,
sizeof(code) - 1); sizeof(code) - 1);
@ -265,8 +265,8 @@ static void test_riscv64_fp_move(void)
OK(uc_reg_read(uc, UC_RISCV_REG_F1, &r_f1)); OK(uc_reg_read(uc, UC_RISCV_REG_F1, &r_f1));
OK(uc_reg_read(uc, UC_RISCV_REG_F3, &r_f3)); OK(uc_reg_read(uc, UC_RISCV_REG_F3, &r_f3));
TEST_CHECK(r_f1 == 0x12341234); TEST_CHECK(r_f1 == 0x123456781a2b3c4dULL);
TEST_CHECK(r_f3 == 0x12341234); TEST_CHECK(r_f3 == 0x123456781a2b3c4dULL);
uc_close(uc); uc_close(uc);
} }