ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-14 17:28:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

parse "Signal Frame" aug flag and fill out augmentation data size

Browse Source
This commit is contained in:
Nikita Smith
2025-11-07 14:39:45 -08:00
committed by Ryan Fleury
parent 821af9b104
commit 1b6e9e9d7b
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dwarf/eh_frame.c
+13 -4
View File
@@ -133,13 +133,13 @@ eh_parse_aug_data(String8 aug_string, String8 aug_data, U64 pc, EH_PtrCtx *ptr_c
U64 cursor = 0; U64 cursor = 0;
U64 aug_data_size = 0;
EH_AugFlags aug_flags = 0; EH_AugFlags aug_flags = 0;
EH_PtrEnc lsda_encoding = EH_PtrEnc_Omit; EH_PtrEnc lsda_encoding = EH_PtrEnc_Omit;
EH_PtrEnc addr_encoding = EH_PtrEnc_UData8; EH_PtrEnc addr_encoding = EH_PtrEnc_UData8;
EH_PtrEnc handler_encoding = EH_PtrEnc_Omit; EH_PtrEnc handler_encoding = EH_PtrEnc_Omit;
U64 handler_ip = 0; U64 handler_ip = 0;
if (str8_match(str8_prefix(aug_string, 1), str8_lit("z"), 0)) { if (str8_match(str8_prefix(aug_string, 1), str8_lit("z"), 0)) {
U64 aug_data_size = 0;
cursor = str8_deserial_read_uleb128(aug_data, cursor, &aug_data_size); cursor = str8_deserial_read_uleb128(aug_data, cursor, &aug_data_size);
for (U8 *ptr = aug_string.str+1; ptr < (aug_string.str+aug_string.size); ptr += 1) { for (U8 *ptr = aug_string.str+1; ptr < (aug_string.str+aug_string.size); ptr += 1) {
@@ -157,6 +157,9 @@ eh_parse_aug_data(String8 aug_string, String8 aug_data, U64 pc, EH_PtrCtx *ptr_c
cursor += str8_deserial_read_struct(aug_data, cursor, &addr_encoding); cursor += str8_deserial_read_struct(aug_data, cursor, &addr_encoding);
aug_flags |= EH_AugFlag_HasAddrEnc; aug_flags |= EH_AugFlag_HasAddrEnc;
} break; } break;
case 'S': {
aug_flags |= EH_AugFlag_SignalFrame;
} break;
default: { Assert(!"failed to parse augmentation string"); goto exit; } break; default: { Assert(!"failed to parse augmentation string"); goto exit; } break;
} }
} }
@@ -168,6 +171,7 @@ eh_parse_aug_data(String8 aug_string, String8 aug_data, U64 pc, EH_PtrCtx *ptr_c
aug_out->lsda_encoding = handler_encoding; aug_out->lsda_encoding = handler_encoding;
aug_out->addr_encoding = addr_encoding; aug_out->addr_encoding = addr_encoding;
aug_out->flags = aug_flags; aug_out->flags = aug_flags;
aug_out->size = aug_data_size;
} }
exit:; exit:;
@@ -219,6 +223,7 @@ eh_parse_cie(String8 data, DW_Format format, Arch arch, U64 pc, EH_PtrCtx *ptr_c
cursor += version_size; cursor += version_size;
String8 aug_string = {0}; String8 aug_string = {0};
String8 aug_data = {0};
EH_Augmentation aug = {0}; EH_Augmentation aug = {0};
U64 code_align_factor = 0; U64 code_align_factor = 0;
S64 data_align_factor = 0; S64 data_align_factor = 0;
@@ -248,11 +253,15 @@ eh_parse_cie(String8 data, DW_Format format, Arch arch, U64 pc, EH_PtrCtx *ptr_c
cursor += ret_addr_reg_size; cursor += ret_addr_reg_size;
U64 aug_data_size = eh_parse_aug_data(aug_string, str8_skip(data, cursor), pc + cursor, ptr_ctx, &aug); U64 aug_data_size = eh_parse_aug_data(aug_string, str8_skip(data, cursor), pc + cursor, ptr_ctx, &aug);
aug_data = str8_substr(data, r1u64(cursor, cursor + aug.size));
cursor += aug_data_size; cursor += aug_data_size;
} else {
Assert(0 && "unexpected version");
} }
cie_out->insts = str8_skip(data, cursor); cie_out->insts = str8_skip(data, cursor);
cie_out->aug_string = aug_string; cie_out->aug_string = aug_string;
cie_out->aug_data = aug_data;
cie_out->code_align_factor = code_align_factor; cie_out->code_align_factor = code_align_factor;
cie_out->data_align_factor = data_align_factor; cie_out->data_align_factor = data_align_factor;
cie_out->ret_addr_reg = ret_addr_reg; cie_out->ret_addr_reg = ret_addr_reg;
src/dwarf/eh_frame.h
+5 -3
View File
@@ -53,9 +53,10 @@ typedef struct EH_PtrCtx
typedef U8 EH_AugFlags; typedef U8 EH_AugFlags;
enum enum
{ {
EH_AugFlag_HasLSDA = (1 << 0), EH_AugFlag_HasLSDA = (1 << 0),
EH_AugFlag_HasHandler = (1 << 1), EH_AugFlag_HasHandler = (1 << 1),
EH_AugFlag_HasAddrEnc = (1 << 2), EH_AugFlag_HasAddrEnc = (1 << 2),
EH_AugFlag_SignalFrame = (1 << 3),
}; };
typedef struct EH_Augmentation typedef struct EH_Augmentation
@@ -65,6 +66,7 @@ typedef struct EH_Augmentation
EH_PtrEnc handler_encoding; EH_PtrEnc handler_encoding;
EH_PtrEnc lsda_encoding; EH_PtrEnc lsda_encoding;
EH_PtrEnc addr_encoding; EH_PtrEnc addr_encoding;
U64 size;
} EH_Augmentation; } EH_Augmentation;
//////////////////////////////// ////////////////////////////////