paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-05 14:29:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect dwarf entry count. Issue #39928 introduced in 1b6982107f

Browse Source
This commit is contained in:
Martin 2022-10-19 23:10:33 +02:00 committed by Jonas Maebe
parent 850685844b
commit dd0711a27e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/dbgdwarf.pas
View File

@ -3961,7 +3961,7 @@ implementation
{ to simplify things, we don't write a multidimensional array here } { to simplify things, we don't write a multidimensional array here }
append_entry(DW_TAG_subrange_type,false,[ append_entry(DW_TAG_subrange_type,false,[
DW_AT_lower_bound,DW_FORM_udata,0, DW_AT_lower_bound,DW_FORM_udata,0,
DW_AT_upper_bound,DW_FORM_block1,14 DW_AT_upper_bound,DW_FORM_block1,15
]); ]);
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_push_object_address))); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_push_object_address)));
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_deref))); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_deref)));
@ -4028,9 +4028,9 @@ implementation
if deref then if deref then
begin begin
if not (is_widestring(def) and (tf_winlikewidestring in target_info.flags)) then if not (is_widestring(def) and (tf_winlikewidestring in target_info.flags)) then
upperopcodes:=13 upperopcodes:=14
else else
upperopcodes:=16; upperopcodes:=17;
{ lower bound is always 1, upper bound (length) needs to be calculated } { lower bound is always 1, upper bound (length) needs to be calculated }
append_entry(DW_TAG_subrange_type,false,[ append_entry(DW_TAG_subrange_type,false,[
DW_AT_lower_bound,DW_FORM_udata,1, DW_AT_lower_bound,DW_FORM_udata,1,
@ -4047,19 +4047,19 @@ implementation
{ yes -> length = 0 } { yes -> length = 0 }
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_lit0))); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_lit0)));
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_skip))); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_skip)));
if upperopcodes=16 then if upperopcodes=17 then
{ skip the extra deref_size argument and the division by two of the length } { skip the extra deref_size argument and the division by two of the length }
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_16bit_unaligned(6)) current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_16bit_unaligned(6))
else else
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_16bit_unaligned(3)); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_16bit_unaligned(3));
{ no -> load length } { no -> load length }
if upperopcodes=16 then if upperopcodes=17 then
{ for Windows WideString the size is always a DWORD } { for Windows WideString the size is always a DWORD }
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_lit4))) current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_lit4)))
else else
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_lit0)+sizesinttype.size)); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_lit0)+sizesinttype.size));
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_minus))); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_minus)));
if upperopcodes=16 then if upperopcodes=17 then
begin begin
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_deref_size))); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_deref_size)));
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(4)); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(4));
@ -4068,7 +4068,7 @@ implementation
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_deref))); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_deref)));
{ for widestrings, the length is specified in bytes, so divide by two } { for widestrings, the length is specified in bytes, so divide by two }
if (upperopcodes=16) then if (upperopcodes=17) then
begin begin
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_lit1))); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_lit1)));
current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_shr))); current_asmdata.asmlists[al_dwarf_info].concat(tai_const.create_8bit(ord(DW_OP_shr)));