diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-02-26 04:01:37 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-02-26 04:01:37 +0000 |
| commit | bd04c44f48acaec94c10b439ad81cad1e936a656 (patch) | |
| tree | 3a8ca408fd560ea8bbcfa79befa9ea8b5efc719b | |
| parent | fb9015ddaaa182a6aa4ecaa175be4d89b364cb53 (diff) | |
| download | bcm5719-llvm-bd04c44f48acaec94c10b439ad81cad1e936a656.tar.gz bcm5719-llvm-bd04c44f48acaec94c10b439ad81cad1e936a656.zip | |
Unwind: clean up some GCC warnings
This cleans up a set of -Wsign-conversion, -Wint-conversion, and -Wformat
warnings from GCC 4.9.2 on Linux. NFC.
llvm-svn: 230606
| -rw-r--r-- | libcxxabi/src/Unwind/DwarfInstructions.hpp | 14 | ||||
| -rw-r--r-- | libcxxabi/src/Unwind/libunwind.cpp | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/libcxxabi/src/Unwind/DwarfInstructions.hpp b/libcxxabi/src/Unwind/DwarfInstructions.hpp index 4fbd53c66eb..99737e0b66c 100644 --- a/libcxxabi/src/Unwind/DwarfInstructions.hpp +++ b/libcxxabi/src/Unwind/DwarfInstructions.hpp @@ -605,7 +605,7 @@ DwarfInstructions<A, R>::evaluateExpression(pint_t expression, A &addressSpace, case DW_OP_lit29: case DW_OP_lit30: case DW_OP_lit31: - value = opcode - DW_OP_lit0; + value = static_cast<pint_t>(opcode - DW_OP_lit0); *(++sp) = value; if (log) fprintf(stderr, "push literal 0x%" PRIx64 "\n", (uint64_t)value); @@ -643,14 +643,14 @@ DwarfInstructions<A, R>::evaluateExpression(pint_t expression, A &addressSpace, case DW_OP_reg29: case DW_OP_reg30: case DW_OP_reg31: - reg = opcode - DW_OP_reg0; + reg = static_cast<uint32_t>(opcode - DW_OP_reg0); *(++sp) = registers.getRegister((int)reg); if (log) fprintf(stderr, "push reg %d\n", reg); break; case DW_OP_regx: - reg = (uint32_t)addressSpace.getULEB128(p, expressionEnd); + reg = static_cast<uint32_t>(addressSpace.getULEB128(p, expressionEnd)); *(++sp) = registers.getRegister((int)reg); if (log) fprintf(stderr, "push reg %d + 0x%" PRIx64 "\n", reg, (uint64_t)svalue); @@ -688,18 +688,18 @@ DwarfInstructions<A, R>::evaluateExpression(pint_t expression, A &addressSpace, case DW_OP_breg29: case DW_OP_breg30: case DW_OP_breg31: - reg = opcode - DW_OP_breg0; + reg = static_cast<uint32_t>(opcode - DW_OP_breg0); svalue = (sint_t)addressSpace.getSLEB128(p, expressionEnd); - svalue += registers.getRegister((int)reg); + svalue += static_cast<sint_t>(registers.getRegister((int)reg)); *(++sp) = (pint_t)(svalue); if (log) fprintf(stderr, "push reg %d + 0x%" PRIx64 "\n", reg, (uint64_t)svalue); break; case DW_OP_bregx: - reg = (uint32_t)addressSpace.getULEB128(p, expressionEnd); + reg = static_cast<uint32_t>(addressSpace.getULEB128(p, expressionEnd)); svalue = (sint_t)addressSpace.getSLEB128(p, expressionEnd); - svalue += registers.getRegister((int)reg); + svalue += static_cast<sint_t>(registers.getRegister((int)reg)); *(++sp) = (pint_t)(svalue); if (log) fprintf(stderr, "push reg %d + 0x%" PRIx64 "\n", reg, (uint64_t)svalue); diff --git a/libcxxabi/src/Unwind/libunwind.cpp b/libcxxabi/src/Unwind/libunwind.cpp index d5b18d8fc44..49f06cc2139 100644 --- a/libcxxabi/src/Unwind/libunwind.cpp +++ b/libcxxabi/src/Unwind/libunwind.cpp @@ -309,7 +309,8 @@ _LIBUNWIND_EXPORT void unw_save_vfp_as_X(unw_cursor_t *cursor) { /// SPI: walks cached dwarf entries _LIBUNWIND_EXPORT void unw_iterate_dwarf_unwind_cache(void (*func)( unw_word_t ip_start, unw_word_t ip_end, unw_word_t fde, unw_word_t mh)) { - _LIBUNWIND_TRACE_API("unw_iterate_dwarf_unwind_cache(func=%p)\n", func); + _LIBUNWIND_TRACE_API("unw_iterate_dwarf_unwind_cache(func=%p)\n", + reinterpret_cast<void *>(func)); DwarfFDECache<LocalAddressSpace>::iterateCacheEntries(func); } |
