Skip to content

Commit

Permalink
[lldb] [Process/NetBSD] Correct DS/ES/FS/GS register sizes
Browse files Browse the repository at this point in the history
Fix DS/ES/FS/GS register sizes in getter/setter for NetBSD.  Apparently
only CS and SS registers are specified as 64/32-bit in LLDB, while
the others are specified as 16-bit.

Differential Revision: https://reviews.llvm.org/D91090
  • Loading branch information
mgorny committed Nov 9, 2020
1 parent f44ee0f commit ed3ac6c
Showing 1 changed file with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -539,19 +539,19 @@ NativeRegisterContextNetBSD_x86_64::ReadRegister(const RegisterInfo *reg_info,
reg_value = (uint64_t)m_gpr.regs[_REG_CS];
break;
case lldb_fs_x86_64:
reg_value = (uint64_t)m_gpr.regs[_REG_FS];
reg_value = (uint16_t)m_gpr.regs[_REG_FS];
break;
case lldb_gs_x86_64:
reg_value = (uint64_t)m_gpr.regs[_REG_GS];
reg_value = (uint16_t)m_gpr.regs[_REG_GS];
break;
case lldb_ss_x86_64:
reg_value = (uint64_t)m_gpr.regs[_REG_SS];
break;
case lldb_ds_x86_64:
reg_value = (uint64_t)m_gpr.regs[_REG_DS];
reg_value = (uint16_t)m_gpr.regs[_REG_DS];
break;
case lldb_es_x86_64:
reg_value = (uint64_t)m_gpr.regs[_REG_ES];
reg_value = (uint16_t)m_gpr.regs[_REG_ES];
break;
#else
case lldb_rax_x86_64:
Expand Down Expand Up @@ -588,19 +588,19 @@ NativeRegisterContextNetBSD_x86_64::ReadRegister(const RegisterInfo *reg_info,
reg_value = (uint32_t)m_gpr.r_cs;
break;
case lldb_fs_x86_64:
reg_value = (uint32_t)m_gpr.r_fs;
reg_value = (uint16_t)m_gpr.r_fs;
break;
case lldb_gs_x86_64:
reg_value = (uint32_t)m_gpr.r_gs;
reg_value = (uint16_t)m_gpr.r_gs;
break;
case lldb_ss_x86_64:
reg_value = (uint32_t)m_gpr.r_ss;
break;
case lldb_ds_x86_64:
reg_value = (uint32_t)m_gpr.r_ds;
reg_value = (uint16_t)m_gpr.r_ds;
break;
case lldb_es_x86_64:
reg_value = (uint32_t)m_gpr.r_es;
reg_value = (uint16_t)m_gpr.r_es;
break;
#endif
case lldb_fctrl_x86_64:
Expand Down Expand Up @@ -830,19 +830,19 @@ Status NativeRegisterContextNetBSD_x86_64::WriteRegister(
m_gpr.regs[_REG_CS] = reg_value.GetAsUInt64();
break;
case lldb_fs_x86_64:
m_gpr.regs[_REG_FS] = reg_value.GetAsUInt64();
m_gpr.regs[_REG_FS] = reg_value.GetAsUInt16();
break;
case lldb_gs_x86_64:
m_gpr.regs[_REG_GS] = reg_value.GetAsUInt64();
m_gpr.regs[_REG_GS] = reg_value.GetAsUInt16();
break;
case lldb_ss_x86_64:
m_gpr.regs[_REG_SS] = reg_value.GetAsUInt64();
break;
case lldb_ds_x86_64:
m_gpr.regs[_REG_DS] = reg_value.GetAsUInt64();
m_gpr.regs[_REG_DS] = reg_value.GetAsUInt16();
break;
case lldb_es_x86_64:
m_gpr.regs[_REG_ES] = reg_value.GetAsUInt64();
m_gpr.regs[_REG_ES] = reg_value.GetAsUInt16();
break;
#else
case lldb_rax_x86_64:
Expand Down Expand Up @@ -879,19 +879,19 @@ Status NativeRegisterContextNetBSD_x86_64::WriteRegister(
m_gpr.r_cs = reg_value.GetAsUInt32();
break;
case lldb_fs_x86_64:
m_gpr.r_fs = reg_value.GetAsUInt32();
m_gpr.r_fs = reg_value.GetAsUInt16();
break;
case lldb_gs_x86_64:
m_gpr.r_gs = reg_value.GetAsUInt32();
m_gpr.r_gs = reg_value.GetAsUInt16();
break;
case lldb_ss_x86_64:
m_gpr.r_ss = reg_value.GetAsUInt32();
break;
case lldb_ds_x86_64:
m_gpr.r_ds = reg_value.GetAsUInt32();
m_gpr.r_ds = reg_value.GetAsUInt16();
break;
case lldb_es_x86_64:
m_gpr.r_es = reg_value.GetAsUInt32();
m_gpr.r_es = reg_value.GetAsUInt16();
break;
#endif
case lldb_fctrl_x86_64:
Expand Down

0 comments on commit ed3ac6c

Please sign in to comment.