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

d2r2: .debug_loclists parsing, DWARF expression -> RDI location info; first pass at baking frame base into var locations to match simpler PDB behavior; fixes to high-pc address evaluation (based on form kind)

Browse Source
This commit is contained in:
Ryan Fleury
2026-04-29 12:40:43 -07:00
parent 242f4e9cbd
commit 9a923e9bf9
16 changed files with 1280 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dwarf/dwarf.c
+25 -18
View File
@@ -134,40 +134,47 @@ dw_attrib_class_from_attrib(DW_Version ver, DW_Ext ext, DW_AttribKind k)
internal DW_AttribClass
dw_attrib_class_from_form_kind(DW_Version ver, DW_FormKind k)
{
#define X(_N,_C) case DW_Form_##_N: return _C;
switch (k) {
DW_AttribClass result = DW_AttribClass_Null;
#define X(_N,_C) case DW_Form_##_N:{result = _C;}break;
switch(k)
{
DW_Form_AttribClass_GNU_XList
}
switch (ver) {
case DW_Version_5: {
switch (k) {
switch(ver)
{
case DW_Version_5:
{
switch (k)
{
DW_Form_AttribClass_V5_XList
}
}break;
case DW_Version_4: {
switch (k) {
case DW_Version_4:
{
switch (k)
{
DW_Form_AttribClass_V4_XList
}
}break;
case DW_Version_3: {
switch (k) {
case DW_Version_3:
{
switch (k)
{
DW_Form_AttribClass_V2_XList
}
}break;
case DW_Version_2: {
switch (k) {
case DW_Version_2:
{
switch(k)
{
DW_Form_AttribClass_V2_XList
}
}break;
case DW_Version_1: {
} break;
case DW_Version_Null: break;
case DW_Version_1:{} break;
case DW_Version_Null:{}break;
}
#undef X
return DW_AttribClass_Null;
return result;
}
internal B32
src/dwarf/dwarf.h
+3 -2
View File
@@ -1432,7 +1432,7 @@ typedef enum DW_CFA_Enum
////////////////////////////////
// Expression Opcodes
typedef enum
typedef enum DW_ExprOperandType
{
DW_ExprOperandType_Null,
DW_ExprOperandType_U8,
@@ -1448,7 +1448,8 @@ typedef enum
DW_ExprOperandType_Addr,
DW_ExprOperandType_Block,
DW_ExprOperandType_DwarfUInt,
} DW_ExprOperandType;
}
DW_ExprOperandType;
// (opcode name, opcode id, operand count, pop count, push count, operand0 type, operand1 type)
#define DW_Expr_V3_XList \
src/dwarf/dwarf_parse_2.c
+266
View File
@@ -425,6 +425,24 @@ dw2_read_form_val(DW2_ParseCtx *ctx, String8 data, U64 off, DW_FormKind form_kin
}break;
}
}
//- rjf: in some cases, resolve base numeric values -> addresses
{
switch(form_kind)
{
default:{val.addr = val.u128.u64[0];}break;
case DW_Form_Addrx:
case DW_Form_Addrx1:
case DW_Form_Addrx2:
case DW_Form_Addrx3:
case DW_Form_Addrx4:
if(ctx->addr_table != 0)
{
U64 addr_idx = val.u128.u64[0];
dw2_try_offset_from_table_idx(ctx->addr_table, addr_idx, &val.addr);
}break;
}
}
}
*out = val;
U64 bytes_read = (off - start_off);
@@ -962,6 +980,10 @@ dw2_rnglist_from_form_val(Arena *arena, DW2_ParseCtx *ctx, DW_Raw *raw, DW2_Form
{
rng1u64_list_push(arena, &result, r1u64(base_addr + range_min, base_addr + range_opl));
}
if(off == start_off)
{
break;
}
}
}break;
@@ -1017,10 +1039,30 @@ dw2_rnglist_from_form_val(Arena *arena, DW2_ParseCtx *ctx, DW_Raw *raw, DW2_Form
U64 new_base_addr = 0;
if(dw2_try_offset_from_table_idx(ctx->addr_table, addr_idx, &new_base_addr))
{
good_range = 1;
base_addr = new_base_addr;
}
}
}break;
case DW_RLE_StartxEndx:
{
good_range = 0;
U64 start_idx = 0;
U64 end_idx = 0;
off += str8_deserial_read_uleb128(data, off, &start_idx);
off += str8_deserial_read_uleb128(data, off, &end_idx);
if(ctx->addr_table != 0)
{
U64 start = 0;
U64 end = 0;
if(dw2_try_offset_from_table_idx(ctx->addr_table, start_idx, &start) &&
dw2_try_offset_from_table_idx(ctx->addr_table, end_idx, &end))
{
good_range = 1;
range = r1u64(start, end);
}
}
}break;
case DW_RLE_StartxLength:
{
good_range = 0;
@@ -1086,3 +1128,227 @@ dw2_rnglist_from_form_val(Arena *arena, DW2_ParseCtx *ctx, DW_Raw *raw, DW2_Form
}
return result;
}
////////////////////////////////
//~ rjf: Location List Parsing (.debug_loclists)
internal DW2_LocList
dw2_loclist_from_form_val(Arena *arena, DW2_ParseCtx *ctx, DW_Raw *raw, DW2_FormVal form_val)
{
DW2_LocList result = {0};
switch((DW_VersionEnum)ctx->version)
{
case DW_Version_Null:{}break;
//- rjf: pre-dwarf5
case DW_Version_1:
case DW_Version_2:
case DW_Version_3:
case DW_Version_4:
{
String8 data = raw->sec[DW_Section_Loc].data;
U64 locs_off = locs_off = form_val.u128.u64[0];
U64 base_addr = ctx->unit_base_addr;
U64 sentinel = (ctx->addr_size == 4 ? max_U32 : max_U64);
for(U64 off = locs_off; off < data.size;)
{
U64 start_off = off;
U64 range_min = 0;
U64 range_opl = 0;
off += str8_deserial_read(data, off, &range_min, ctx->addr_size, ctx->addr_size);
off += str8_deserial_read(data, off, &range_opl, ctx->addr_size, ctx->addr_size);
//
// NOTE(rjf): interpreting tuples:
// [0, 0) -> ending range list
// [max_U32/U64, depending on addr size, X) -> set new base address to X
// [N, M) -> new [base + N, base + M) range
//
if(range_min == 0 && range_opl == 0)
{
break;
}
else if(range_min == sentinel)
{
base_addr = range_opl;
}
else if(off == start_off)
{
break;
}
else
{
U16 expr_size = 0;
off += str8_deserial_read_struct(data, off, &expr_size);
DW2_LocNode *n = push_array(arena, DW2_LocNode, 1);
n->v.range = r1u64(range_min + base_addr, range_opl + base_addr);
n->v.expr = str8_substr(data, r1u64(off, off+expr_size));
SLLQueuePush(result.first, result.last, n);
result.count += 1;
off += expr_size;
}
if(off == start_off)
{
break;
}
}
}break;
//- rjf: @dwarf5
case DW_Version_5:
{
String8 data = raw->sec[DW_Section_LocLists].data;
// rjf: determine section offset - sometimes this is encoded directly,
// other times it is relative, based on the form kind - more variability
// in this awful format
U64 loclist_off = 0;
switch(form_val.kind)
{
default:{}break;
case DW_Form_SecOffset:
{
loclist_off = form_val.u128.u64[0];
}break;
case DW_Form_LocListx:
if(ctx->rnglists_table != 0)
{
U64 loclist_off_idx = form_val.u128.u64[0];
dw2_try_offset_from_table_idx(ctx->loclists_table, loclist_off_idx, &loclist_off);
}break;
}
// rjf: in a HIGHLY UNEXPECTED TURN OF EVENTS, we now have to decode ANOTHER
// OPCODE STREAM to unpack the actual list of locations!!!
U64 rle_sentinel = (ctx->addr_size == 4 ? max_U32 : max_U64);
U64 base_addr = ctx->unit_base_addr;
for(U64 off = loclist_off; off < data.size;)
{
U64 start_off = off;
// rjf: decode op kind
DW_LLE lle_kind = DW_LLE_EndOfList;
off += str8_deserial_read_struct(data, off, &lle_kind);
// rjf: obtain range from op
B32 good_loc = 1;
Rng1U64 range = {0};
switch(lle_kind)
{
default:{good_loc = 0;}break;
case DW_LLE_BaseAddressx:
{
good_loc = 0;
U64 addr_idx = 0;
off += str8_deserial_read_uleb128(data, off, &addr_idx);
if(ctx->addr_table != 0)
{
U64 new_base_addr = 0;
if(dw2_try_offset_from_table_idx(ctx->addr_table, addr_idx, &new_base_addr))
{
good_loc = 1;
base_addr = new_base_addr;
}
}
}break;
case DW_LLE_StartxEndx:
{
good_loc = 0;
U64 start_idx = 0;
U64 end_idx = 0;
off += str8_deserial_read_uleb128(data, off, &start_idx);
off += str8_deserial_read_uleb128(data, off, &end_idx);
if(ctx->addr_table != 0)
{
U64 start = 0;
U64 end = 0;
if(dw2_try_offset_from_table_idx(ctx->addr_table, start_idx, &start) &&
dw2_try_offset_from_table_idx(ctx->addr_table, end_idx, &end))
{
good_loc = 1;
range = r1u64(start, end);
}
}
}break;
case DW_LLE_StartxLength:
{
good_loc = 0;
U64 start_idx = 0;
U64 length = 0;
off += str8_deserial_read_uleb128(data, off, &start_idx);
off += str8_deserial_read_uleb128(data, off, &length);
if(ctx->addr_table != 0)
{
U64 start = 0;
if(dw2_try_offset_from_table_idx(ctx->addr_table, start_idx, &start))
{
good_loc = 1;
range = r1u64(start, start+length);
}
}
}break;
case DW_LLE_OffsetPair:
{
U64 range_off_start = 0;
U64 range_off_end = 0;
off += str8_deserial_read_uleb128(data, off, &range_off_start);
off += str8_deserial_read_uleb128(data, off, &range_off_end);
range = r1u64(base_addr + range_off_start, base_addr + range_off_end);
}break;
case DW_LLE_DefaultLocation:
{
range = r1u64(0, max_U64);
}break;
case DW_LLE_BaseAddress:
{
U64 new_base_addr = 0;
off += str8_deserial_read(data, off, &new_base_addr, ctx->addr_size, ctx->addr_size);
base_addr = new_base_addr;
}break;
case DW_LLE_StartEnd:
{
U64 start = 0;
U64 end = 0;
off += str8_deserial_read(data, off, &start, ctx->addr_size, ctx->addr_size);
off += str8_deserial_read(data, off, &end, ctx->addr_size, ctx->addr_size);
range = r1u64(start, end);
}break;
case DW_LLE_StartLength:
{
U64 start = 0;
U64 length = 0;
off += str8_deserial_read(data, off, &start, ctx->addr_size, ctx->addr_size);
off += str8_deserial_read_uleb128(data, off, &length);
range = r1u64(start, start + length);
}break;
}
// rjf: read expression
String8 expr = {0};
if(good_loc && lle_kind != DW_LLE_BaseAddress && lle_kind != DW_LLE_BaseAddressx)
{
U64 expr_size = 0;
off += str8_deserial_read_uleb128(data, off, &expr_size);
expr = str8_substr(data, r1u64(off, off+expr_size));
off += expr_size;
}
// rjf: add range
if(good_loc)
{
DW2_LocNode *n = push_array(arena, DW2_LocNode, 1);
n->v.range = range;
n->v.expr = expr;
SLLQueuePush(result.first, result.last, n);
result.count += 1;
}
// rjf: end if no movement or end-of-list code
if(off == start_off || lle_kind == DW_LLE_EndOfList)
{
break;
}
}
}break;
}
return result;
}
src/dwarf/dwarf_parse_2.h
+33 -1
View File
@@ -67,6 +67,7 @@ struct DW2_ParseCtx
DW2_OffsetTable *rnglists_table;
DW2_OffsetTable *str_offsets_table;
DW2_OffsetTable *addr_table;
DW2_OffsetTable *loclists_table;
String8 unit_dir;
String8 unit_file;
};
@@ -78,8 +79,9 @@ typedef struct DW2_FormVal DW2_FormVal;
struct DW2_FormVal
{
DW_FormKind kind;
String8 string;
U128 u128;
String8 string;
U64 addr;
};
typedef struct DW2_Attrib DW2_Attrib;
@@ -197,6 +199,31 @@ struct DW2_LineVMRegs
U64 discriminator;
};
////////////////////////////////
//~ rjf: Location Lists
typedef struct DW2_Loc DW2_Loc;
struct DW2_Loc
{
Rng1U64 range;
String8 expr;
};
typedef struct DW2_LocNode DW2_LocNode;
struct DW2_LocNode
{
DW2_LocNode *next;
DW2_Loc v;
};
typedef struct DW2_LocList DW2_LocList;
struct DW2_LocList
{
DW2_LocNode *first;
DW2_LocNode *last;
U64 count;
};
////////////////////////////////
//~ rjf: Globals
@@ -246,4 +273,9 @@ internal B32 dw2_try_offset_from_table_idx(DW2_OffsetTable *tbl, U64 idx, U64 *o
internal Rng1U64List dw2_rnglist_from_form_val(Arena *arena, DW2_ParseCtx *ctx, DW_Raw *raw, DW2_FormVal form_val);
////////////////////////////////
//~ rjf: Location List Parsing (.debug_loclists)
internal DW2_LocList dw2_loclist_from_form_val(Arena *arena, DW2_ParseCtx *ctx, DW_Raw *raw, DW2_FormVal form_val);
#endif // DWARF_PARSE_2_H
src/eval/eval_core.c
+4 -4
View File
@@ -684,17 +684,17 @@ e_oplist_from_location(Arena *arena, RDI_Parsed *rdi, RDI_Location loc)
}break;
//- rjf: reg + off
case RDI_LocationKind_AddrRegPlusU16: goto reg_plus_off;
case RDI_LocationKind_AddrAddrRegPlusU16: need_extra_memread = 1; goto reg_plus_off;
case RDI_LocationKind_AddrRegPlusOff: goto reg_plus_off;
case RDI_LocationKind_AddrAddrRegPlusOff: need_extra_memread = 1; goto reg_plus_off;
reg_plus_off:;
{
RDI_TopLevelInfo *tli = rdi_element_from_name_idx(rdi, TopLevelInfo, 0);
Arch arch = arch_from_rdi_arch(tli->arch);
U64 arch_addr_bytesize = byte_size_from_arch(arch);
RDI_RegCode regcode = rdi_regcode_from_location(loc);
U64 reg_off = rdi_regoff_from_location(loc);
S64 reg_off = rdi_regoff_from_location(loc);
e_oplist_push_op(arena, &result, RDI_EvalOp_RegRead, e_value_u64(RDI_EncodeRegReadParam(regcode, arch_addr_bytesize, 0)));
e_oplist_push_uconst(arena, &result, reg_off);
e_oplist_push_sconst(arena, &result, reg_off);
e_oplist_push_op(arena, &result, RDI_EvalOp_Add, e_value_u64(0));
if(need_extra_memread)
{
src/eval/eval_interpret.c
+10 -21
View File
@@ -936,31 +936,20 @@ e_interpret(String8 bytecode)
}
}break;
case RDI_EvalOp_CallSiteValue:
{
NotImplemented;
}break;
case RDI_EvalOp_PartialValue:
{
NotImplemented;
}break;
case RDI_EvalOp_PartialValueBit:
{
NotImplemented;
}break;
case RDI_EvalOp_Swap:
{
// TODO: add support for pushing multiple values onto the stack
NotImplemented;
}break;
case RDI_EvalOp_PushCfa:
{
nval.u64 = e_interpret_ctx->cfa;
}break;
case RDI_EvalOp_CallSiteValue:
case RDI_EvalOp_PartialValue:
case RDI_EvalOp_PartialValueBit:
case RDI_EvalOp_Swap:
{
// TODO(rjf)
result.code = E_InterpretationCode_BadOp;
goto done;
}break;
}
// rjf: push
src/eval/eval_ir.c
+2 -2
View File
@@ -2108,8 +2108,8 @@ e_push_irtree_and_type_from_expr(Arena *arena, E_IRTreeAndType *root_parent, E_I
mapped_bytecode_mode = E_Mode_Value;
}break;
case RDI_LocationKind_AddrBytecodeStream:
case RDI_LocationKind_AddrRegPlusU16:
case RDI_LocationKind_AddrAddrRegPlusU16:
case RDI_LocationKind_AddrRegPlusOff:
case RDI_LocationKind_AddrAddrRegPlusOff:
{
mapped_bytecode_mode = E_Mode_Offset;
}break;
src/lib_rdi/rdi.h
+6 -6
View File
@@ -404,8 +404,8 @@ typedef enum RDI_LocationKindEnum
RDI_LocationKind_NULL = 0x0,
RDI_LocationKind_AddrBytecodeStream = 0x1,
RDI_LocationKind_ValBytecodeStream = 0x2,
RDI_LocationKind_AddrRegPlusU16 = 0x3,
RDI_LocationKind_AddrAddrRegPlusU16 = 0x4,
RDI_LocationKind_AddrRegPlusOff = 0x3,
RDI_LocationKind_AddrAddrRegPlusOff = 0x4,
RDI_LocationKind_ValReg = 0x5,
RDI_LocationKind_ModuleOff = 0x6,
RDI_LocationKind_TLSOff = 0x7,
@@ -887,8 +887,8 @@ X($(a.name != COUNT -> a.name))\
X(NULL)\
X(AddrBytecodeStream)\
X(ValBytecodeStream)\
X(AddrRegPlusU16)\
X(AddrAddrRegPlusU16)\
X(AddrRegPlusOff)\
X(AddrAddrRegPlusOff)\
X(ValReg)\
X(ModuleOff)\
X(TLSOff)\
@@ -1120,8 +1120,8 @@ typedef RDI_U64 RDI_Location;
#define RDI_Location_RegOffMask 0x0000ffff00000000ull
#define RDI_Location_RegOffShift 32
#define rdi_kind_from_location(l) ((((l) & RDI_Location_KindMask) >> RDI_Location_KindShift))
#define rdi_regcode_from_location(l) ((rdi_kind_from_location(l) == RDI_LocationKind_AddrRegPlusU16 || rdi_kind_from_location(l) == RDI_LocationKind_AddrAddrRegPlusU16 || rdi_kind_from_location(l) == RDI_LocationKind_ValReg) ? (((l) & RDI_Location_RegCodeMask) >> RDI_Location_RegCodeShift) : 0)
#define rdi_regoff_from_location(l) ((rdi_kind_from_location(l) == RDI_LocationKind_AddrRegPlusU16 || rdi_kind_from_location(l) == RDI_LocationKind_AddrAddrRegPlusU16) ? (((l) & RDI_Location_RegOffMask) >> RDI_Location_RegOffShift) : 0)
#define rdi_regcode_from_location(l) ((rdi_kind_from_location(l) == RDI_LocationKind_AddrRegPlusOff || rdi_kind_from_location(l) == RDI_LocationKind_AddrAddrRegPlusOff || rdi_kind_from_location(l) == RDI_LocationKind_ValReg) ? (((l) & RDI_Location_RegCodeMask) >> RDI_Location_RegCodeShift) : 0)
#define rdi_regoff_from_location(l) (RDI_S64)((rdi_kind_from_location(l) == RDI_LocationKind_AddrRegPlusOff || rdi_kind_from_location(l) == RDI_LocationKind_AddrAddrRegPlusOff) ? (((l) & RDI_Location_RegOffMask) >> RDI_Location_RegOffShift) : 0)
#define rdi_voff_from_location(l) (rdi_kind_from_location(l) == RDI_LocationKind_ModuleOff ? (((l) & RDI_Location_OffMask) >> RDI_Location_OffShift) : 0)
#define rdi_toff_from_location(l) (rdi_kind_from_location(l) == RDI_LocationKind_TLSOff ? (((l) & RDI_Location_OffMask) >> RDI_Location_OffShift) : 0)
#define rdi_constant_data_off_from_location(l) (rdi_kind_from_location(l) == RDI_LocationKind_ConstantDataOff ? (((l) & RDI_Location_OffMask) >> RDI_Location_OffShift) : 0)
src/linker/rdi/rdi_builder.c
+8 -8
View File
@@ -913,7 +913,7 @@ rdib_make_location_addr_reg_plus_u16(Rng1U64List ranges, RDI_RegCode reg_code, R
{
RDIB_Location loc = {0};
loc.ranges = ranges;
loc.kind = RDI_LocationKind_AddrRegPlusU16;
loc.kind = RDI_LocationKind_AddrRegPlusOff;
loc.reg_code = reg_code;
loc.offset = offset;
return loc;
@@ -923,7 +923,7 @@ internal RDIB_Location
rdib_make_location_addr_addr_reg_plus_u16(Rng1U64List ranges, RDI_RegCode reg_code, RDI_U16 offset)
{
RDIB_Location loc = {0};
loc.kind = RDI_LocationKind_AddrAddrRegPlusU16;
loc.kind = RDI_LocationKind_AddrAddrRegPlusOff;
loc.ranges = ranges;
loc.reg_code = reg_code;
loc.offset = offset;
@@ -4086,8 +4086,8 @@ THREAD_POOL_TASK_FUNC(rdib_count_scopes_task)
case RDI_LocationKind_ValReg: {
//task->loc_data_sizes[task_id] += sizeof(RDI_LocationReg);
} break;
case RDI_LocationKind_AddrRegPlusU16:
case RDI_LocationKind_AddrAddrRegPlusU16: {
case RDI_LocationKind_AddrRegPlusOff:
case RDI_LocationKind_AddrAddrRegPlusOff: {
//task->loc_data_sizes[task_id] += sizeof(RDI_LocationRegPlusU16);
} break;
default: InvalidPath;
@@ -4192,10 +4192,10 @@ THREAD_POOL_TASK_FUNC(rdib_build_scopes_task)
loc_data[loc_data_cursor] = 0;
loc_data_cursor += 1;
} break;
case RDI_LocationKind_AddrRegPlusU16:
case RDI_LocationKind_AddrAddrRegPlusU16: {
Assert(loc_data_cursor + sizeof(RDI_LocationRegPlusU16) <= loc_data_max);
RDI_LocationRegPlusU16 *dst = (RDI_LocationRegPlusU16 *) (loc_data + loc_data_cursor);
case RDI_LocationKind_AddrRegPlusOff:
case RDI_LocationKind_AddrAddrRegPlusOff: {
Assert(loc_data_cursor + sizeof(RDI_LocationRegPlusOff) <= loc_data_max);
RDI_LocationRegPlusU16 *dst = (RDI_LocationRegPlusOff *) (loc_data + loc_data_cursor);
dst->kind = loc->kind;
dst->reg_code = loc->reg_code;
dst->offset = loc->offset;
src/radbin/radbin.c
+2 -2
View File
@@ -956,8 +956,8 @@ rb_thread_entry_point(void *p)
{
bake_params = push_array(arena, RDIM_BakeParams, 1);
rdim_bake_params_concat_in_place(bake_params, &pdb_bake_params);
// rdim_bake_params_concat_in_place(bake_params, &dwarf_bake_params);
rdim_bake_params_concat_in_place(bake_params, &dwarf_bake_params_2);
rdim_bake_params_concat_in_place(bake_params, &dwarf_bake_params);
// rdim_bake_params_concat_in_place(bake_params, &dwarf_bake_params_2);
for EachNode(n, RDIM_BakeParamsNode, first_rdi_bake_params)
{
rdim_bake_params_concat_in_place(bake_params, &n->v);
src/rdi/rdi.mdesk
+4 -4
View File
@@ -1007,8 +1007,8 @@ RDI_LocationKindTable:
{NULL 0x0}
{AddrBytecodeStream 0x1}
{ValBytecodeStream 0x2}
{AddrRegPlusU16 0x3}
{AddrAddrRegPlusU16 0x4}
{AddrRegPlusOff 0x3}
{AddrAddrRegPlusOff 0x4}
{ValReg 0x5}
{ModuleOff 0x6}
{TLSOff 0x7}
@@ -1115,8 +1115,8 @@ RDI_LocationSetElementMemberTable:
`#define RDI_Location_RegOffMask 0x0000ffff00000000ull`;
`#define RDI_Location_RegOffShift 32`;
`#define rdi_kind_from_location(l) ((((l) & RDI_Location_KindMask) >> RDI_Location_KindShift))`;
`#define rdi_regcode_from_location(l) ((rdi_kind_from_location(l) == RDI_LocationKind_AddrRegPlusU16 || rdi_kind_from_location(l) == RDI_LocationKind_AddrAddrRegPlusU16 || rdi_kind_from_location(l) == RDI_LocationKind_ValReg) ? (((l) & RDI_Location_RegCodeMask) >> RDI_Location_RegCodeShift) : 0)`;
`#define rdi_regoff_from_location(l) ((rdi_kind_from_location(l) == RDI_LocationKind_AddrRegPlusU16 || rdi_kind_from_location(l) == RDI_LocationKind_AddrAddrRegPlusU16) ? (((l) & RDI_Location_RegOffMask) >> RDI_Location_RegOffShift) : 0)`;
`#define rdi_regcode_from_location(l) ((rdi_kind_from_location(l) == RDI_LocationKind_AddrRegPlusOff || rdi_kind_from_location(l) == RDI_LocationKind_AddrAddrRegPlusOff || rdi_kind_from_location(l) == RDI_LocationKind_ValReg) ? (((l) & RDI_Location_RegCodeMask) >> RDI_Location_RegCodeShift) : 0)`;
`#define rdi_regoff_from_location(l) (RDI_S64)((rdi_kind_from_location(l) == RDI_LocationKind_AddrRegPlusOff || rdi_kind_from_location(l) == RDI_LocationKind_AddrAddrRegPlusOff) ? (((l) & RDI_Location_RegOffMask) >> RDI_Location_RegOffShift) : 0)`;
`#define rdi_voff_from_location(l) (rdi_kind_from_location(l) == RDI_LocationKind_ModuleOff ? (((l) & RDI_Location_OffMask) >> RDI_Location_OffShift) : 0)`;
`#define rdi_toff_from_location(l) (rdi_kind_from_location(l) == RDI_LocationKind_TLSOff ? (((l) & RDI_Location_OffMask) >> RDI_Location_OffShift) : 0)`;
`#define rdi_constant_data_off_from_location(l) (rdi_kind_from_location(l) == RDI_LocationKind_ConstantDataOff ? (((l) & RDI_Location_OffMask) >> RDI_Location_OffShift) : 0)`;
src/rdi/rdi_local.c
+3 -3
View File
@@ -1066,11 +1066,11 @@ lane_sync(); if(flags & (1ull<<(kind))) ProfScope(rdi_name_title_from_dump_subse
String8 bytecode_stringification = rdi_string_from_bytecode(scratch.arena, tli->arch, bytecode);
dumpf(" bytecode: { %S }\n", bytecode_stringification);
}break;
case RDI_LocationKind_AddrRegPlusU16:
case RDI_LocationKind_AddrAddrRegPlusU16:
case RDI_LocationKind_AddrRegPlusOff:
case RDI_LocationKind_AddrAddrRegPlusOff:
{
RDI_RegCode reg_code = rdi_regcode_from_location(location);
U64 reg_off = rdi_regoff_from_location(location);
S64 reg_off = rdi_regoff_from_location(location);
String8 reg_code_string = rdi_string_from_reg_code(scratch.arena, tli->arch, reg_code);
dumpf(" reg: %S\n", reg_code_string);
dumpf(" reg_off: 0x%I64x\n", reg_off);
src/rdi_from_dwarf/rdi_from_dwarf_2.c
+899 -9
View File
File diff suppressed because it is too large Load Diff
src/rdi_from_pdb/rdi_from_pdb.c
+2 -2
View File
@@ -325,13 +325,13 @@ p2r_location_from_addr_reg_off(Arena *arena, RDI_Arch arch, RDI_RegCode reg_code
{
if(extra_indirection)
{
result.kind = RDI_LocationKind_AddrAddrRegPlusU16;
result.kind = RDI_LocationKind_AddrAddrRegPlusOff;
result.reg_code = reg_code;
result.offset = offset;
}
else
{
result.kind = RDI_LocationKind_AddrRegPlusU16;
result.kind = RDI_LocationKind_AddrRegPlusOff;
result.reg_code = reg_code;
result.offset = offset;
}
src/rdi_make/rdi_make_local.c
+2 -2
View File
@@ -3380,8 +3380,8 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params)
switch(src_loc->kind)
{
default:{}break;
case RDI_LocationKind_AddrRegPlusU16:
case RDI_LocationKind_AddrAddrRegPlusU16:
case RDI_LocationKind_AddrRegPlusOff:
case RDI_LocationKind_AddrAddrRegPlusOff:
{
dst_loc[0] |= ((U64)src_loc->reg_code << RDI_Location_RegCodeShift) & RDI_Location_RegCodeMask;
dst_loc[0] |= ((U64)src_loc->offset << RDI_Location_RegOffShift) & RDI_Location_RegOffMask;