summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lldb/source/Symbol/CompactUnwindInfo.cpp31
-rw-r--r--lldb/tools/compact-unwind/compact-unwind-dumper.c50
2 files changed, 69 insertions, 12 deletions
diff --git a/lldb/source/Symbol/CompactUnwindInfo.cpp b/lldb/source/Symbol/CompactUnwindInfo.cpp
index 8c6a2e7214c..54ea0d564d0 100644
--- a/lldb/source/Symbol/CompactUnwindInfo.cpp
+++ b/lldb/source/Symbol/CompactUnwindInfo.cpp
@@ -809,8 +809,16 @@ CompactUnwindInfo::CreateUnwindPlan_x86_64 (Target &target, FunctionInfo &functi
}
}
+ if (mode == UNWIND_X86_64_MODE_STACK_IND)
+ {
+ row->SetCFAOffset (stack_size);
+ }
+ else
+ {
+ row->SetCFAOffset (stack_size * wordsize);
+ }
+
row->SetCFARegister (x86_64_eh_regnum::rsp);
- row->SetCFAOffset (stack_size * wordsize);
row->SetOffset (0);
row->SetRegisterLocationToAtCFAPlusOffset (x86_64_eh_regnum::rip, wordsize * -1, true);
row->SetRegisterLocationToIsCFAPlusOffset (x86_64_eh_regnum::rsp, 0, true);
@@ -919,10 +927,10 @@ CompactUnwindInfo::CreateUnwindPlan_x86_64 (Target &target, FunctionInfo &functi
case UNWIND_X86_64_REG_R14:
case UNWIND_X86_64_REG_R15:
case UNWIND_X86_64_REG_RBP:
- row->SetRegisterLocationToAtCFAPlusOffset (translate_to_eh_frame_regnum_x86_64 (registers[i]), wordsize * -saved_registers_offset, true);
+ row->SetRegisterLocationToAtCFAPlusOffset (translate_to_eh_frame_regnum_x86_64 (registers[i]), wordsize * -saved_registers_offset, true);
+ saved_registers_offset++;
break;
}
- saved_registers_offset++;
}
}
unwind_plan.AppendRow (row);
@@ -1047,9 +1055,11 @@ CompactUnwindInfo::CreateUnwindPlan_i386 (Target &target, FunctionInfo &function
if (mode == UNWIND_X86_MODE_STACK_IND && function_info.valid_range_offset_start != 0)
{
uint32_t stack_adjust = EXTRACT_BITS (function_info.encoding, UNWIND_X86_FRAMELESS_STACK_ADJUST);
+printf("JSMDEBUG got stack_adjust %d from encoding 0x%x\n", stack_adjust, function_info.encoding);
// offset into the function instructions; 0 == beginning of first instruction
uint32_t offset_to_subl_insn = EXTRACT_BITS (function_info.encoding, UNWIND_X86_FRAMELESS_STACK_SIZE);
+printf("JSMDEBUG got offset to sub instruction %d\n", offset_to_subl_insn);
SectionList *sl = m_objfile.GetSectionList ();
if (sl)
@@ -1084,7 +1094,16 @@ CompactUnwindInfo::CreateUnwindPlan_i386 (Target &target, FunctionInfo &function
}
row->SetCFARegister (i386_eh_regnum::esp);
- row->SetCFAOffset (stack_size * wordsize);
+
+ if (mode == UNWIND_X86_MODE_STACK_IND)
+ {
+ row->SetCFAOffset (stack_size);
+ }
+ else
+ {
+ row->SetCFAOffset (stack_size * wordsize);
+ }
+
row->SetOffset (0);
row->SetRegisterLocationToAtCFAPlusOffset (i386_eh_regnum::eip, wordsize * -1, true);
row->SetRegisterLocationToIsCFAPlusOffset (i386_eh_regnum::esp, 0, true);
@@ -1193,10 +1212,10 @@ CompactUnwindInfo::CreateUnwindPlan_i386 (Target &target, FunctionInfo &function
case UNWIND_X86_REG_EDI:
case UNWIND_X86_REG_ESI:
case UNWIND_X86_REG_EBP:
- row->SetRegisterLocationToAtCFAPlusOffset (translate_to_eh_frame_regnum_i386 (registers[i]), wordsize * -saved_registers_offset, true);
+ row->SetRegisterLocationToAtCFAPlusOffset (translate_to_eh_frame_regnum_i386 (registers[i]), wordsize * -saved_registers_offset, true);
+ saved_registers_offset++;
break;
}
- saved_registers_offset++;
}
}
diff --git a/lldb/tools/compact-unwind/compact-unwind-dumper.c b/lldb/tools/compact-unwind/compact-unwind-dumper.c
index fd8ea216189..0f898dbc76b 100644
--- a/lldb/tools/compact-unwind/compact-unwind-dumper.c
+++ b/lldb/tools/compact-unwind/compact-unwind-dumper.c
@@ -495,7 +495,14 @@ print_encoding_x86_64 (struct baton baton, uint8_t *function_start, uint32_t enc
printf ("large stack ");
}
- printf ("frameless function: stack size %d, register count %d ", stack_size * 8, register_count);
+ if (mode == UNWIND_X86_64_MODE_STACK_IND)
+ {
+ printf ("frameless function: stack size %d, register count %d ", stack_size * 8, register_count);
+ }
+ else
+ {
+ printf ("frameless function: stack size %d, register count %d ", stack_size, register_count);
+ }
if (register_count == 0)
{
@@ -591,7 +598,14 @@ print_encoding_x86_64 (struct baton baton, uint8_t *function_start, uint32_t enc
}
- printf (" CFA is rsp+%d ", stack_size * 8);
+ if (mode == UNWIND_X86_64_MODE_STACK_IND)
+ {
+ printf (" CFA is rsp+%d ", stack_size);
+ }
+ else
+ {
+ printf (" CFA is rsp+%d ", stack_size * 8);
+ }
uint32_t saved_registers_offset = 1;
printf (" rip=[CFA-%d]", saved_registers_offset * 8);
@@ -605,24 +619,29 @@ print_encoding_x86_64 (struct baton baton, uint8_t *function_start, uint32_t enc
break;
case UNWIND_X86_64_REG_RBX:
printf (" rbx=[CFA-%d]", saved_registers_offset * 8);
+ saved_registers_offset++;
break;
case UNWIND_X86_64_REG_R12:
printf (" r12=[CFA-%d]", saved_registers_offset * 8);
+ saved_registers_offset++;
break;
case UNWIND_X86_64_REG_R13:
printf (" r13=[CFA-%d]", saved_registers_offset * 8);
+ saved_registers_offset++;
break;
case UNWIND_X86_64_REG_R14:
printf (" r14=[CFA-%d]", saved_registers_offset * 8);
+ saved_registers_offset++;
break;
case UNWIND_X86_64_REG_R15:
printf (" r15=[CFA-%d]", saved_registers_offset * 8);
+ saved_registers_offset++;
break;
case UNWIND_X86_64_REG_RBP:
printf (" rbp=[CFA-%d]", saved_registers_offset * 8);
+ saved_registers_offset++;
break;
}
- saved_registers_offset++;
}
}
@@ -712,7 +731,14 @@ print_encoding_i386 (struct baton baton, uint8_t *function_start, uint32_t encod
printf ("large stack ");
}
- printf ("frameless function: stack size %d, register count %d ", stack_size * 4, register_count);
+ if (mode == UNWIND_X86_MODE_STACK_IND)
+ {
+ printf ("frameless function: stack size %d, register count %d ", stack_size, register_count);
+ }
+ else
+ {
+ printf ("frameless function: stack size %d, register count %d ", stack_size * 4, register_count);
+ }
if (register_count == 0)
{
@@ -808,7 +834,14 @@ print_encoding_i386 (struct baton baton, uint8_t *function_start, uint32_t encod
}
- printf (" CFA is esp+%d ", stack_size * 4);
+ if (mode == UNWIND_X86_MODE_STACK_IND)
+ {
+ printf (" CFA is esp+%d ", stack_size);
+ }
+ else
+ {
+ printf (" CFA is esp+%d ", stack_size * 4);
+ }
uint32_t saved_registers_offset = 1;
printf (" eip=[CFA-%d]", saved_registers_offset * 4);
@@ -822,24 +855,29 @@ print_encoding_i386 (struct baton baton, uint8_t *function_start, uint32_t encod
break;
case UNWIND_X86_REG_EBX:
printf (" ebx=[CFA-%d]", saved_registers_offset * 4);
+ saved_registers_offset++;
break;
case UNWIND_X86_REG_ECX:
printf (" ecx=[CFA-%d]", saved_registers_offset * 4);
+ saved_registers_offset++;
break;
case UNWIND_X86_REG_EDX:
printf (" edx=[CFA-%d]", saved_registers_offset * 4);
+ saved_registers_offset++;
break;
case UNWIND_X86_REG_EDI:
printf (" edi=[CFA-%d]", saved_registers_offset * 4);
+ saved_registers_offset++;
break;
case UNWIND_X86_REG_ESI:
printf (" esi=[CFA-%d]", saved_registers_offset * 4);
+ saved_registers_offset++;
break;
case UNWIND_X86_REG_EBP:
printf (" ebp=[CFA-%d]", saved_registers_offset * 4);
+ saved_registers_offset++;
break;
}
- saved_registers_offset++;
}
}
OpenPOWER on IntegriCloud