Chromium Code Reviews| Index: test/cctest/test-disasm-mips64.cc |
| diff --git a/test/cctest/test-disasm-mips64.cc b/test/cctest/test-disasm-mips64.cc |
| index d8f5681c1336672efb67bffa3a62d715c09fa05b..7da601e01de63e53d910a8f346df55be64258938 100644 |
| --- a/test/cctest/test-disasm-mips64.cc |
| +++ b/test/cctest/test-disasm-mips64.cc |
| @@ -97,7 +97,6 @@ if (failure) { \ |
| V8_Fatal(__FILE__, __LINE__, "MIPS Disassembler tests failed.\n"); \ |
| } |
| - |
| #define COMPARE_PC_REL_COMPACT(asm_, compare_string, offset) \ |
| { \ |
| int pc_offset = assm.pc_offset(); \ |
| @@ -106,28 +105,28 @@ if (failure) { \ |
| prev_instr_compact_branch = assm.IsPrevInstrCompactBranch(); \ |
| if (prev_instr_compact_branch) { \ |
| snprintf(str_with_address, sizeof(str_with_address), "%s -> %p", \ |
| - compare_string, progcounter + 8 + (offset * 4)); \ |
| + compare_string, \ |
| + static_cast<void *>(progcounter + 8 + (offset * 4))); \ |
| } else { \ |
| snprintf(str_with_address, sizeof(str_with_address), "%s -> %p", \ |
| - compare_string, progcounter + 4 + (offset * 4)); \ |
| + compare_string, \ |
| + static_cast<void *>(progcounter + 4 + (offset * 4))); \ |
| } \ |
| assm.asm_; \ |
| if (!DisassembleAndCompare(progcounter, str_with_address)) failure = true; \ |
| } |
| - |
| #define COMPARE_PC_REL(asm_, compare_string, offset) \ |
| { \ |
| int pc_offset = assm.pc_offset(); \ |
| byte *progcounter = &buffer[pc_offset]; \ |
| char str_with_address[100]; \ |
| snprintf(str_with_address, sizeof(str_with_address), "%s -> %p", \ |
| - compare_string, progcounter + (offset * 4)); \ |
| + compare_string, static_cast<void *>(progcounter + (offset * 4))); \ |
| assm.asm_; \ |
| if (!DisassembleAndCompare(progcounter, str_with_address)) failure = true; \ |
| } |
| - |
| #define COMPARE_PC_JUMP(asm_, compare_string, target) \ |
| { \ |
| int pc_offset = assm.pc_offset(); \ |
| @@ -136,14 +135,13 @@ if (failure) { \ |
| int instr_index = (target >> 2) & kImm26Mask; \ |
| snprintf( \ |
| str_with_address, sizeof(str_with_address), "%s %p -> %p", \ |
| - compare_string, reinterpret_cast<byte *>(target), \ |
| - reinterpret_cast<byte *>(((uint64_t)(progcounter + 1) & ~0xfffffff) | \ |
| + compare_string, reinterpret_cast<void *>(target), \ |
| + reinterpret_cast<void *>(((uint64_t)(progcounter + 1) & ~0xfffffff) | \ |
|
Michael Achenbach
2016/05/23 14:56:43
Not sure if that should be rather changed to a sta
vogelheim
2016/05/24 06:52:23
Probably not. This converts integers to pointers;
|
| (instr_index << 2))); \ |
| assm.asm_; \ |
| if (!DisassembleAndCompare(progcounter, str_with_address)) failure = true; \ |
| } |
| - |
| #define GET_PC_REGION(pc_region) \ |
| { \ |
| int pc_offset = assm.pc_offset(); \ |