@@ -455,7 +455,7 @@ size_t UnwindAssemblyInstEmulation::WriteMemory(
455
455
case EmulateInstruction::eContextPushRegisterOnStack: {
456
456
uint32_t reg_num = LLDB_INVALID_REGNUM;
457
457
uint32_t generic_regnum = LLDB_INVALID_REGNUM;
458
- assert (context.info_type ==
458
+ assert (context.GetInfoType () ==
459
459
EmulateInstruction::eInfoTypeRegisterToRegisterPlusOffset &&
460
460
" unhandled case, add code to handle this!" );
461
461
const uint32_t unwind_reg_kind = m_unwind_plan_ptr->GetRegisterKind ();
@@ -574,7 +574,8 @@ bool UnwindAssemblyInstEmulation::WriteRegister(
574
574
// with the same amount.
575
575
lldb::RegisterKind kind = m_unwind_plan_ptr->GetRegisterKind ();
576
576
if (m_fp_is_cfa && reg_info->kinds [kind] == m_cfa_reg_info.kinds [kind] &&
577
- context.info_type == EmulateInstruction::eInfoTypeRegisterPlusOffset &&
577
+ context.GetInfoType () ==
578
+ EmulateInstruction::eInfoTypeRegisterPlusOffset &&
578
579
context.info .RegisterPlusOffset .reg .kinds [kind] ==
579
580
m_cfa_reg_info.kinds [kind]) {
580
581
const int64_t offset = context.info .RegisterPlusOffset .signed_offset ;
@@ -585,18 +586,19 @@ bool UnwindAssemblyInstEmulation::WriteRegister(
585
586
586
587
case EmulateInstruction::eContextAbsoluteBranchRegister:
587
588
case EmulateInstruction::eContextRelativeBranchImmediate: {
588
- if (context.info_type == EmulateInstruction::eInfoTypeISAAndImmediate &&
589
+ if (context.GetInfoType () == EmulateInstruction::eInfoTypeISAAndImmediate &&
589
590
context.info .ISAAndImmediate .unsigned_data32 > 0 ) {
590
591
m_forward_branch_offset =
591
592
context.info .ISAAndImmediateSigned .signed_data32 ;
592
- } else if (context.info_type ==
593
+ } else if (context.GetInfoType () ==
593
594
EmulateInstruction::eInfoTypeISAAndImmediateSigned &&
594
595
context.info .ISAAndImmediateSigned .signed_data32 > 0 ) {
595
596
m_forward_branch_offset = context.info .ISAAndImmediate .unsigned_data32 ;
596
- } else if (context.info_type == EmulateInstruction::eInfoTypeImmediate &&
597
+ } else if (context.GetInfoType () ==
598
+ EmulateInstruction::eInfoTypeImmediate &&
597
599
context.info .unsigned_immediate > 0 ) {
598
600
m_forward_branch_offset = context.info .unsigned_immediate ;
599
- } else if (context.info_type ==
601
+ } else if (context.GetInfoType () ==
600
602
EmulateInstruction::eInfoTypeImmediateSigned &&
601
603
context.info .signed_immediate > 0 ) {
602
604
m_forward_branch_offset = context.info .signed_immediate ;
@@ -609,7 +611,7 @@ bool UnwindAssemblyInstEmulation::WriteRegister(
609
611
const uint32_t generic_regnum = reg_info->kinds [eRegisterKindGeneric];
610
612
if (reg_num != LLDB_INVALID_REGNUM &&
611
613
generic_regnum != LLDB_REGNUM_GENERIC_SP) {
612
- switch (context.info_type ) {
614
+ switch (context.GetInfoType () ) {
613
615
case EmulateInstruction::eInfoTypeAddress:
614
616
if (m_pushed_regs.find (reg_num) != m_pushed_regs.end () &&
615
617
context.info .address == m_pushed_regs[reg_num]) {
0 commit comments