From bbe93c73920f314ded1fb0c01203b2b7608c93fa Mon Sep 17 00:00:00 2001 From: jdh8d <jdh8d@git.zephyr-software.com> Date: Fri, 17 Feb 2017 16:14:52 +0000 Subject: [PATCH] Former-commit-id: 93741898df955e58948a4fe47219f396ffa21c8b --- libIRDB/test/split_eh_frame.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libIRDB/test/split_eh_frame.cpp b/libIRDB/test/split_eh_frame.cpp index 0a825830a..eef004185 100644 --- a/libIRDB/test/split_eh_frame.cpp +++ b/libIRDB/test/split_eh_frame.cpp @@ -541,7 +541,7 @@ class eh_program_insn_t case DW_CFA_GNU_args_size: case DW_CFA_def_cfa_offset: { - uint64_t uleb=0; + auto uleb=uint64_t(0); if(eh_frame_util_t<ptrsize>::read_uleb128(uleb, pos, data, max)) return true; break; @@ -567,7 +567,8 @@ class eh_program_insn_t case DW_CFA_register: case DW_CFA_def_cfa: { - uint64_t uleb1=1, uleb2=0; + auto uleb1=uint64_t(1); + auto uleb2=uint64_t(0); if(eh_frame_util_t<ptrsize>::read_uleb128(uleb1, pos, data, max)) return true; if(eh_frame_util_t<ptrsize>::read_uleb128(uleb2, pos, data, max)) @@ -576,8 +577,8 @@ class eh_program_insn_t } case DW_CFA_def_cfa_sf: { - uint64_t leb1=0; - int64_t leb2=0; + auto leb1=uint64_t(0); + auto leb2=int64_t(0); if(eh_frame_util_t<ptrsize>::read_uleb128(leb1, pos, data, max)) return true; if(eh_frame_util_t<ptrsize>::read_sleb128(leb2, pos, data, max)) @@ -587,7 +588,7 @@ class eh_program_insn_t case DW_CFA_def_cfa_expression: { - uint64_t uleb=0; + auto uleb=uint64_t(0); if(eh_frame_util_t<ptrsize>::read_uleb128(uleb, pos, data, max)) return true; pos+=uleb; @@ -596,7 +597,8 @@ class eh_program_insn_t case DW_CFA_expression: case DW_CFA_val_expression: { - uint64_t uleb1=0, uleb2=0; + auto uleb1=uint64_t(0); + auto uleb2=uint64_t(0); if(eh_frame_util_t<ptrsize>::read_uleb128(uleb1, pos, data, max)) return true; if(eh_frame_util_t<ptrsize>::read_uleb128(uleb2, pos, data, max)) @@ -685,7 +687,7 @@ class eh_program_t auto pos=program_start_position; while(pos < max_program_pos) { - uint8_t opcode; + auto opcode=uint8_t(0); if(eh_frame_util_t<ptrsize>::read_type(opcode,pos,data,max)) return true; eh_program_insn_t<ptrsize> eh_insn; -- GitLab