ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue"

Browse source 
* commit '2e5157fa05dca31b2d409c185a6ca5230182503d':
  Fix build with gcc-4.8 and array boundaries issue
This commit is contained in:
Elliott Hughes 2013-08-27 10:13:52 -07:00 • committed by Android Git Automerger
commit bfe8e68a25
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libcorkscrew/arch-x86/backtrace-x86.c
View file

@ -380,7 +380,7 @@ static bool execute_dwarf(const memory_t* memory, uintptr_t ptr, cie_info_t* cie
case DW_CFA_offset_extended: // probably we don't have it on x86. case DW_CFA_offset_extended: // probably we don't have it on x86.
if (!try_get_uleb128(memory, ptr, &reg, cursor)) return false; if (!try_get_uleb128(memory, ptr, &reg, cursor)) return false;
if (!try_get_uleb128(memory, ptr, &offset, cursor)) return false; if (!try_get_uleb128(memory, ptr, &offset, cursor)) return false;
if (reg > DWARF_REGISTERS) { if (reg >= DWARF_REGISTERS) {
ALOGE("DW_CFA_offset_extended: r%d exceeds supported number of registers (%d)", reg, DWARF_REGISTERS); ALOGE("DW_CFA_offset_extended: r%d exceeds supported number of registers (%d)", reg, DWARF_REGISTERS);
return false; return false;
} }
@ -390,39 +390,39 @@ static bool execute_dwarf(const memory_t* memory, uintptr_t ptr, cie_info_t* cie
break; break;
case DW_CFA_restore_extended: // probably we don't have it on x86. case DW_CFA_restore_extended: // probably we don't have it on x86.
if (!try_get_uleb128(memory, ptr, &reg, cursor)) return false; if (!try_get_uleb128(memory, ptr, &reg, cursor)) return false;
dstate->regs[reg].rule = stack->regs[reg].rule; if (reg >= DWARF_REGISTERS) {
dstate->regs[reg].value = stack->regs[reg].value;
if (reg > DWARF_REGISTERS) {
ALOGE("DW_CFA_restore_extended: r%d exceeds supported number of registers (%d)", reg, DWARF_REGISTERS); ALOGE("DW_CFA_restore_extended: r%d exceeds supported number of registers (%d)", reg, DWARF_REGISTERS);
return false; return false;
} }
dstate->regs[reg].rule = stack->regs[reg].rule;
dstate->regs[reg].value = stack->regs[reg].value;
ALOGV("DW_CFA_restore: r%d = %c(%d)", reg, dstate->regs[reg].rule, dstate->regs[reg].value); ALOGV("DW_CFA_restore: r%d = %c(%d)", reg, dstate->regs[reg].rule, dstate->regs[reg].value);
break; break;
case DW_CFA_undefined: // probably we don't have it on x86. case DW_CFA_undefined: // probably we don't have it on x86.
if (!try_get_uleb128(memory, ptr, &reg, cursor)) return false; if (!try_get_uleb128(memory, ptr, &reg, cursor)) return false;
dstate->regs[reg].rule = 'u'; if (reg >= DWARF_REGISTERS) {
dstate->regs[reg].value = 0;
if (reg > DWARF_REGISTERS) {
ALOGE("DW_CFA_undefined: r%d exceeds supported number of registers (%d)", reg, DWARF_REGISTERS); ALOGE("DW_CFA_undefined: r%d exceeds supported number of registers (%d)", reg, DWARF_REGISTERS);
return false; return false;
} }
dstate->regs[reg].rule = 'u';
dstate->regs[reg].value = 0;
ALOGV("DW_CFA_undefined: r%d", reg); ALOGV("DW_CFA_undefined: r%d", reg);
break; break;
case DW_CFA_same_value: // probably we don't have it on x86. case DW_CFA_same_value: // probably we don't have it on x86.
if (!try_get_uleb128(memory, ptr, &reg, cursor)) return false; if (!try_get_uleb128(memory, ptr, &reg, cursor)) return false;
dstate->regs[reg].rule = 's'; if (reg >= DWARF_REGISTERS) {
dstate->regs[reg].value = 0;
if (reg > DWARF_REGISTERS) {
ALOGE("DW_CFA_undefined: r%d exceeds supported number of registers (%d)", reg, DWARF_REGISTERS); ALOGE("DW_CFA_undefined: r%d exceeds supported number of registers (%d)", reg, DWARF_REGISTERS);
return false; return false;
} }
dstate->regs[reg].rule = 's';
dstate->regs[reg].value = 0;
ALOGV("DW_CFA_same_value: r%d", reg); ALOGV("DW_CFA_same_value: r%d", reg);
break; break;
case DW_CFA_register: // probably we don't have it on x86. case DW_CFA_register: // probably we don't have it on x86.
if (!try_get_uleb128(memory, ptr, &reg, cursor)) return false; if (!try_get_uleb128(memory, ptr, &reg, cursor)) return false;
/* that's new register actually, not offset */ /* that's new register actually, not offset */
if (!try_get_uleb128(memory, ptr, &offset, cursor)) return false; if (!try_get_uleb128(memory, ptr, &offset, cursor)) return false;
if (reg > DWARF_REGISTERS || offset > DWARF_REGISTERS) { if (reg >= DWARF_REGISTERS || offset >= DWARF_REGISTERS) {
ALOGE("DW_CFA_register: r%d or r%d exceeds supported number of registers (%d)", reg, offset, DWARF_REGISTERS); ALOGE("DW_CFA_register: r%d or r%d exceeds supported number of registers (%d)", reg, offset, DWARF_REGISTERS);
return false; return false;
} }
@ -520,7 +520,7 @@ static bool get_old_register_value(const memory_t* memory, uint32_t cfa,
/* Updaing state based on dwarf state. */ /* Updaing state based on dwarf state. */
static bool update_state(const memory_t* memory, unwind_state_t* state, static bool update_state(const memory_t* memory, unwind_state_t* state,
dwarf_state_t* dstate, cie_info_t* cie_info) { dwarf_state_t* dstate) {
unwind_state_t newstate; unwind_state_t newstate;
/* We can restore more registers here if we need them. Meanwile doing minimal work here. */ /* We can restore more registers here if we need them. Meanwile doing minimal work here. */
/* Getting CFA. */ /* Getting CFA. */
@ -550,7 +550,6 @@ static bool update_state(const memory_t* memory, unwind_state_t* state,
/* Execute CIE and FDE instructions for FDE found with find_fde. */ /* Execute CIE and FDE instructions for FDE found with find_fde. */
static bool execute_fde(const memory_t* memory, static bool execute_fde(const memory_t* memory,
const map_info_t* map_info_list,
uintptr_t fde, uintptr_t fde,
unwind_state_t* state) { unwind_state_t* state) {
uint32_t fde_length = 0; uint32_t fde_length = 0;
@ -753,7 +752,7 @@ static bool execute_fde(const memory_t* memory,
ALOGV("IP: %x, LOC: %x", state->reg[DWARF_EIP], dstate->loc); ALOGV("IP: %x, LOC: %x", state->reg[DWARF_EIP], dstate->loc);
} }
return update_state(memory, state, dstate, cie_info); return update_state(memory, state, dstate);
} }
static ssize_t unwind_backtrace_common(const memory_t* memory, static ssize_t unwind_backtrace_common(const memory_t* memory,
@ -805,7 +804,7 @@ static ssize_t unwind_backtrace_common(const memory_t* memory,
uint32_t stack_top = state->reg[DWARF_ESP]; uint32_t stack_top = state->reg[DWARF_ESP];
if (!execute_fde(memory, map_info_list, fde, state)) break; if (!execute_fde(memory, fde, state)) break;
if (frame) { if (frame) {
frame->stack_top = stack_top; frame->stack_top = stack_top;