From bd30d0a275ece60f7d21a809fcc79938d6c7f53a Mon Sep 17 00:00:00 2001 From: Jonathon Reinhart Date: Mon, 7 Sep 2015 13:22:26 -0400 Subject: [PATCH] regress: remove (uint8_t*) casts to mem API calls These casts are now unnecessary. --- regress/mem_exec.c | 8 ++++---- regress/mem_protect.c | 14 +++++++------- regress/mem_unmap.c | 14 +++++++------- regress/rep_movsb.c | 4 ++-- regress/timeout_segfault.c | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/regress/mem_exec.c b/regress/mem_exec.c index dc0dfdec..28f7d7a0 100644 --- a/regress/mem_exec.c +++ b/regress/mem_exec.c @@ -183,14 +183,14 @@ int main(int argc, char **argv, char **envp) } // fill in sections that shouldn't get touched - if (uc_mem_write(uc, 0x1ff000, (uint8_t*)buf1, 4096)) { + if (uc_mem_write(uc, 0x1ff000, buf1, sizeof(buf1))) { printf("not ok %d - Failed to write random buffer 1 to memory, quit!\n", log_num++); return 3; } else { printf("ok %d - Random buffer 1 written to memory\n", log_num++); } - if (uc_mem_write(uc, 0x301000, (uint8_t*)buf2, 4096)) { + if (uc_mem_write(uc, 0x301000, buf2, sizeof(buf2))) { printf("not ok %d - Failed to write random buffer 2 to memory, quit!\n", log_num++); return 4; } else { @@ -248,7 +248,7 @@ int main(int argc, char **argv, char **envp) //make sure that random blocks didn't get nuked // fill in sections that shouldn't get touched - if (uc_mem_read(uc, 0x1ff000, (uint8_t*)readbuf, 4096)) { + if (uc_mem_read(uc, 0x1ff000, readbuf, sizeof(readbuf))) { printf("not ok %d - Failed to read random buffer 1 from memory\n", log_num++); } else { printf("ok %d - Random buffer 1 read from memory\n", log_num++); @@ -259,7 +259,7 @@ int main(int argc, char **argv, char **envp) } } - if (uc_mem_read(uc, 0x301000, (uint8_t*)readbuf, 4096)) { + if (uc_mem_read(uc, 0x301000, readbuf, sizeof(readbuf))) { printf("not ok %d - Failed to read random buffer 2 from memory\n", log_num++); } else { printf("ok %d - Random buffer 2 read from memory\n", log_num++); diff --git a/regress/mem_protect.c b/regress/mem_protect.c index 072c9819..a9dcce9d 100644 --- a/regress/mem_protect.c +++ b/regress/mem_protect.c @@ -88,7 +88,7 @@ static void hook_code(uc_engine *uc, uint64_t addr, uint32_t size, void *user_da switch (opcode) { case 0x90: //nop printf("# Handling NOP\n"); - if (uc_mem_read(uc, 0x200000 + test_num * 0x100000, (uint8_t*)&testval, sizeof(testval)) != UC_ERR_OK) { + if (uc_mem_read(uc, 0x200000 + test_num * 0x100000, &testval, sizeof(testval)) != UC_ERR_OK) { printf("not ok %d - uc_mem_read fail for address: 0x%x\n", log_num++, 0x200000 + test_num * 0x100000); } else { printf("ok %d - good uc_mem_read for address: 0x%x\n", log_num++, 0x200000 + test_num * 0x100000); @@ -143,7 +143,7 @@ static bool hook_mem_invalid(uc_engine *uc, uc_mem_type type, case UC_MEM_WRITE_PROT: printf("# write to non-writeable memory at 0x%"PRIx64 ", data size = %u, data value = 0x%"PRIx64 "\n", addr, size, value); - if (uc_mem_read(uc, addr, (uint8_t*)&testval, sizeof(testval)) != UC_ERR_OK) { + if (uc_mem_read(uc, addr, &testval, sizeof(testval)) != UC_ERR_OK) { printf("not ok %d - uc_mem_read fail for address: 0x%" PRIx64 "\n", log_num++, addr); } else { printf("ok %d - uc_mem_read success after mem_protect at test %d\n", log_num++, test_num - 1); @@ -191,14 +191,14 @@ int main(int argc, char **argv, char **envp) uc_mem_map(uc, 0x3ff000, 0x3000, UC_PROT_READ | UC_PROT_WRITE); // fill in sections that shouldn't get touched - if (uc_mem_write(uc, 0x3ff000, (uint8_t*)buf1, 4096)) { + if (uc_mem_write(uc, 0x3ff000, buf1, sizeof(buf1))) { printf("not ok %d - Failed to write random buffer 1 to memory, quit!\n", log_num++); return 2; } else { printf("ok %d - Random buffer 1 written to memory\n", log_num++); } - if (uc_mem_write(uc, 0x401000, (uint8_t*)buf2, 4096)) { + if (uc_mem_write(uc, 0x401000, buf2, sizeof(buf2))) { printf("not ok %d - Failed to write random buffer 2 to memory, quit!\n", log_num++); return 3; } else { @@ -251,7 +251,7 @@ int main(int argc, char **argv, char **envp) testval = 0x42424242; for (addr = 0x200000; addr <= 0x400000; addr += 0x100000) { uint32_t val; - if (uc_mem_read(uc, addr, (uint8_t*)&val, sizeof(val)) != UC_ERR_OK) { + if (uc_mem_read(uc, addr, &val, sizeof(val)) != UC_ERR_OK) { printf("not ok %d - Failed uc_mem_read for address 0x%x\n", log_num++, addr); } else { printf("ok %d - Good uc_mem_read from 0x%x\n", log_num++, addr); @@ -270,7 +270,7 @@ int main(int argc, char **argv, char **envp) //make sure that random blocks didn't get nuked // fill in sections that shouldn't get touched - if (uc_mem_read(uc, 0x3ff000, (uint8_t*)readbuf, 4096)) { + if (uc_mem_read(uc, 0x3ff000, readbuf, sizeof(readbuf))) { printf("not ok %d - Failed to read random buffer 1 from memory\n", log_num++); } else { printf("ok %d - Random buffer 1 read from memory\n", log_num++); @@ -281,7 +281,7 @@ int main(int argc, char **argv, char **envp) } } - if (uc_mem_read(uc, 0x401000, (uint8_t*)readbuf, 4096)) { + if (uc_mem_read(uc, 0x401000, readbuf, sizeof(readbuf))) { printf("not ok %d - Failed to read random buffer 2 from memory\n", log_num++); } else { printf("ok %d - Random buffer 2 read from memory\n", log_num++); diff --git a/regress/mem_unmap.c b/regress/mem_unmap.c index a2dc33c9..435d4665 100644 --- a/regress/mem_unmap.c +++ b/regress/mem_unmap.c @@ -83,7 +83,7 @@ static void hook_code(uc_engine *uc, uint64_t addr, uint32_t size, void *user_da switch (opcode) { case 0x90: //nop printf("# Handling NOP\n"); - if (uc_mem_read(uc, 0x200000 + test_num * 0x100000, (uint8_t*)&testval, sizeof(testval)) != UC_ERR_OK) { + if (uc_mem_read(uc, 0x200000 + test_num * 0x100000, &testval, sizeof(testval)) != UC_ERR_OK) { printf("not ok %d - uc_mem_read fail for address: 0x%x\n", log_num++, 0x200000 + test_num * 0x100000); } else { printf("ok %d - good uc_mem_read for address: 0x%x\n", log_num++, 0x200000 + test_num * 0x100000); @@ -138,7 +138,7 @@ static bool hook_mem_invalid(uc_engine *uc, uc_mem_type type, case UC_MEM_WRITE: printf("# write to invalid memory at 0x%"PRIx64 ", data size = %u, data value = 0x%"PRIx64 "\n", addr, size, value); - if (uc_mem_read(uc, addr, (uint8_t*)&testval, sizeof(testval)) != UC_ERR_OK) { + if (uc_mem_read(uc, addr, &testval, sizeof(testval)) != UC_ERR_OK) { printf("ok %d - uc_mem_read fail for address: 0x%" PRIx64 "\n", log_num++, addr); } else { printf("not ok %d - uc_mem_read success after unmap at test %d\n", log_num++, test_num - 1); @@ -186,14 +186,14 @@ int main(int argc, char **argv, char **envp) uc_mem_map(uc, 0x3ff000, 0x3000, UC_PROT_READ | UC_PROT_WRITE); // fill in sections that shouldn't get touched - if (uc_mem_write(uc, 0x3ff000, (uint8_t*)buf1, 4096)) { + if (uc_mem_write(uc, 0x3ff000, buf1, sizeof(buf1))) { printf("not ok %d - Failed to write random buffer 1 to memory, quit!\n", log_num++); return 2; } else { printf("ok %d - Random buffer 1 written to memory\n", log_num++); } - if (uc_mem_write(uc, 0x401000, (uint8_t*)buf2, 4096)) { + if (uc_mem_write(uc, 0x401000, buf2, sizeof(buf1))) { printf("not ok %d - Failed to write random buffer 2 to memory, quit!\n", log_num++); return 3; } else { @@ -246,7 +246,7 @@ int main(int argc, char **argv, char **envp) testval = 0x42424242; for (addr = 0x200000; addr <= 0x400000; addr += 0x100000) { uint32_t val; - if (uc_mem_read(uc, addr, (uint8_t*)&val, sizeof(val)) != UC_ERR_OK) { + if (uc_mem_read(uc, addr, &val, sizeof(val)) != UC_ERR_OK) { printf("not ok %d - Failed uc_mem_read for address 0x%x\n", log_num++, addr); } else { printf("ok %d - Good uc_mem_read from 0x%x\n", log_num++, addr); @@ -261,7 +261,7 @@ int main(int argc, char **argv, char **envp) //make sure that random blocks didn't get nuked // fill in sections that shouldn't get touched - if (uc_mem_read(uc, 0x3ff000, (uint8_t*)readbuf, 4096)) { + if (uc_mem_read(uc, 0x3ff000, readbuf, sizeof(readbuf))) { printf("not ok %d - Failed to read random buffer 1 from memory\n", log_num++); } else { printf("ok %d - Random buffer 1 read from memory\n", log_num++); @@ -272,7 +272,7 @@ int main(int argc, char **argv, char **envp) } } - if (uc_mem_read(uc, 0x401000, (uint8_t*)readbuf, 4096)) { + if (uc_mem_read(uc, 0x401000, readbuf, sizeof(readbuf))) { printf("not ok %d - Failed to read random buffer 2 from memory\n", log_num++); } else { printf("ok %d - Random buffer 2 read from memory\n", log_num++); diff --git a/regress/rep_movsb.c b/regress/rep_movsb.c index d6632a33..17b22641 100644 --- a/regress/rep_movsb.c +++ b/regress/rep_movsb.c @@ -112,7 +112,7 @@ int main(int argc, char **argv, char **envp) uc_mem_map(uc, 0x200000, 0x2000, UC_PROT_READ | UC_PROT_WRITE); // fill in the data that we want to copy - if (uc_mem_write(uc, 0x200000, (uint8_t*)buf1, 20)) { + if (uc_mem_write(uc, 0x200000, buf1, 20)) { printf("not ok %d - Failed to write read buffer to memory, quit!\n", log_num++); return 2; } @@ -160,7 +160,7 @@ int main(int argc, char **argv, char **envp) //make sure that data got copied // fill in sections that shouldn't get touched - if (uc_mem_read(uc, 0x201000, (uint8_t*)readbuf, 20)) { + if (uc_mem_read(uc, 0x201000, readbuf, 20)) { printf("not ok %d - Failed to read random buffer 1 from memory\n", log_num++); } else { diff --git a/regress/timeout_segfault.c b/regress/timeout_segfault.c index de5b8761..49d9a370 100644 --- a/regress/timeout_segfault.c +++ b/regress/timeout_segfault.c @@ -59,7 +59,7 @@ static void test_arm(void) uc_mem_map(uc, ADDRESS, 2 * 1024 * 1024, UC_PROT_ALL); // write machine code to be emulated to memory - uc_mem_write(uc, ADDRESS, (uint8_t *)ARM_CODE, sizeof(ARM_CODE) - 1); + uc_mem_write(uc, ADDRESS, ARM_CODE, sizeof(ARM_CODE) - 1); // initialize machine registers uc_reg_write(uc, UC_ARM_REG_R0, &r0); @@ -112,7 +112,7 @@ static void test_thumb(void) uc_mem_map(uc, ADDRESS, 2 * 1024 * 1024, UC_PROT_ALL); // write machine code to be emulated to memory - uc_mem_write(uc, ADDRESS, (uint8_t *)THUMB_CODE, sizeof(THUMB_CODE) - 1); + uc_mem_write(uc, ADDRESS, THUMB_CODE, sizeof(THUMB_CODE) - 1); // initialize machine registers uc_reg_write(uc, UC_ARM_REG_SP, &sp);