Skip to content

Commit 4b961a8

Browse files
committed
Apply fix for big endian hosts per unicorn-engine#1710
1 parent 98980c9 commit 4b961a8

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

tests/unit/test_arm.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ static void test_arm_thumb_ite(void)
164164
OK(uc_reg_write(uc, UC_ARM_REG_R3, &r_r3));
165165

166166
OK(uc_mem_map(uc, r_sp, 0x1000, UC_PROT_ALL));
167-
r_r2 = 0x68;
167+
r_r2 = LEINT32(0x68);
168168
OK(uc_mem_write(uc, r_sp, &r_r2, 4));
169-
r_r2 = 0x4d;
169+
r_r2 = LEINT32(0x4d);
170170
OK(uc_mem_write(uc, r_sp + 4, &r_r2, 4));
171171

172172
OK(uc_hook_add(uc, &hook, UC_HOOK_CODE, test_arm_thumb_ite_count_callback,
@@ -396,7 +396,7 @@ static void test_arm_v8(void)
396396
{
397397
char code[] = "\xd0\xe8\xff\x17"; // LDAEXD.W R1, [R0]
398398
uc_engine *uc;
399-
uint32_t r_r1 = 0xdeadbeef;
399+
uint32_t r_r1 = LEINT32(0xdeadbeef);
400400
uint32_t r_r0;
401401

402402
uc_common_setup(&uc, UC_ARCH_ARM, UC_MODE_THUMB, code, sizeof(code) - 1,

tests/unit/test_arm64.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static void test_arm64_v8_pac(void)
137137

138138
OK(uc_mem_read(uc, 0x40000, (void *)&mem, 8));
139139

140-
TEST_CHECK(mem == r_x8);
140+
TEST_CHECK(LEINT64(mem) == r_x8);
141141

142142
OK(uc_close(uc));
143143
}

tests/unit/test_mem.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static void test_mem_protect(void)
5555
OK(uc_emu_start(qc, 0x1000, 0x1000 + sizeof(code) - 1, 0, 1));
5656
OK(uc_mem_read(qc, 0x2000 + 4, &mem, 4));
5757

58-
TEST_CHECK(mem == 0xdeadbeef);
58+
TEST_CHECK(LEINT32(mem) == 0xdeadbeef);
5959

6060
OK(uc_close(qc));
6161
}
@@ -92,7 +92,7 @@ static void test_splitting_mmio_unmap(void)
9292
// mov ebx, [0x4004] <-- mmio read
9393
char code[] = "\x8b\x0d\x04\x30\x00\x00\x8b\x1d\x04\x40\x00\x00";
9494
int r_ecx, r_ebx;
95-
int bytes = 0xdeadbeef;
95+
int bytes = LEINT32(0xdeadbeef);
9696

9797
OK(uc_open(UC_ARCH_X86, UC_MODE_32, &uc));
9898

tests/unit/test_mips.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static void test_mips_lwx_exception_issue_1314(void)
112112
reg = 0;
113113
OK(uc_reg_write(uc, UC_MIPS_REG_1, &reg));
114114
OK(uc_reg_write(uc, UC_MIPS_REG_T9, &reg));
115-
reg = 0xdeadbeef;
115+
reg = LEINT32(0xdeadbeef);
116116
OK(uc_mem_write(uc, 0x10000, &reg, 4));
117117
reg = 0x10000;
118118
OK(uc_reg_write(uc, UC_MIPS_REG_S3, &reg));

tests/unit/test_x86.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ static void test_x86_x87_fnstenv(void)
422422

423423
OK(uc_mem_read(uc, base, fnstenv, sizeof(fnstenv)));
424424
// But update FCS:FIP for fld.
425-
TEST_CHECK(fnstenv[3] == last_eip);
425+
TEST_CHECK(LEINT32(fnstenv[3]) == last_eip);
426426

427427
OK(uc_close(uc));
428428
}
@@ -530,7 +530,7 @@ static void test_x86_smc_xor(void)
530530

531531
OK(uc_mem_read(uc, code_start + 3, (void *)&result, 4));
532532

533-
TEST_CHECK(result == (0x3ea98b13 ^ 0xbc4177e6));
533+
TEST_CHECK(LEINT32(result) == (0x3ea98b13 ^ 0xbc4177e6));
534534

535535
OK(uc_close(uc));
536536
}
@@ -562,7 +562,7 @@ static void test_x86_mmio_uc_mem_rw_write_callback(uc_engine *uc,
562562
static void test_x86_mmio_uc_mem_rw(void)
563563
{
564564
uc_engine *uc;
565-
int data = 0xdeadbeef;
565+
int data = LEINT32(0xdeadbeef);
566566

567567
OK(uc_open(UC_ARCH_X86, UC_MODE_32, &uc));
568568

@@ -572,7 +572,7 @@ static void test_x86_mmio_uc_mem_rw(void)
572572
OK(uc_mem_write(uc, 0x20004, (void *)&data, 4));
573573
OK(uc_mem_read(uc, 0x20008, (void *)&data, 4));
574574

575-
TEST_CHECK(data == 0x19260817);
575+
TEST_CHECK(LEINT32(data) == 0x19260817);
576576

577577
OK(uc_close(uc));
578578
}

0 commit comments

Comments
 (0)