From 43fcc214901f384197c24c1accdce3520b730516 Mon Sep 17 00:00:00 2001 From: Nikita Smith Date: Fri, 10 Oct 2025 10:19:47 -0700 Subject: [PATCH] clang build fixes --- src/dwarf/dwarf.h | 2 +- src/dwarf/dwarf_unwind.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dwarf/dwarf.h b/src/dwarf/dwarf.h index 4e844e75..7f9e9c61 100644 --- a/src/dwarf/dwarf.h +++ b/src/dwarf/dwarf.h @@ -1816,6 +1816,6 @@ internal String8 dw_string_from_loc_list_entry_kind(Arena *arena, DW_LLE kind); internal String8 dw_string_from_section_kind(Arena *arena, DW_SectionKind kind); internal String8 dw_string_from_rng_list_entry_kind(Arena *arena, DW_RLE kind); internal String8 dw_string_from_register(Arena *arena, Arch arch, U64 reg_id); -internal String8 dw_string_from_cfa_opcode(DW_CFA_Opcodecfa_opcode); +internal String8 dw_string_from_cfa_opcode(DW_CFA_Opcode opcode); #endif // DWARF_H diff --git a/src/dwarf/dwarf_unwind.c b/src/dwarf/dwarf_unwind.c index 6946d114..e899d676 100644 --- a/src/dwarf/dwarf_unwind.c +++ b/src/dwarf/dwarf_unwind.c @@ -202,7 +202,7 @@ dw_cfi_apply_register_rules(DW_CFI_Unwind *uw, // TODO: report error (invalid register read) U64 cfa_reg_value = 0; U64 reg_size = dw_reg_size_from_code(uw->arch, row->cfa.reg); - AssertAlawys(reg_size <= sizeof(cfa_reg_value)); + AssertAlways(reg_size <= sizeof(cfa_reg_value)); unwind_status = reg_read_func(row->cfa.reg, &cfa_reg_value, reg_size, reg_read_ud); if (unwind_status != DW_UnwindStatus_Ok) { goto exit; } cfa = cfa_reg_value + row->cfa.off; @@ -212,7 +212,7 @@ dw_cfi_apply_register_rules(DW_CFI_Unwind *uw, } break; } - U64 max_reg_size = dw_max_reg_size_from_arch(uw->arch); + U64 max_reg_size = dw_reg_max_size_from_arch(uw->arch); void *reg_buffer = push_array(scratch.arena, U8, max_reg_size); for EachIndex(reg_idx, uw->reg_count) { @@ -231,7 +231,7 @@ dw_cfi_apply_register_rules(DW_CFI_Unwind *uw, if (unwind_status != DW_UnwindStatus_Ok) { goto exit; } // write register value to the thread context - unwind_status = reg_write(reg_idx, reg_buffer, reg_size, reg_write_ud); + unwind_status = reg_write_func(reg_idx, reg_buffer, reg_size, reg_write_ud); if (unwind_status != DW_UnwindStatus_Ok) { goto exit; } } break; case DW_CFI_RegisterRule_ValOffset: { @@ -240,17 +240,17 @@ dw_cfi_apply_register_rules(DW_CFI_Unwind *uw, // write register value to the thread context U64 reg_size = dw_reg_size_from_code(uw->arch, reg_idx); - unwind_status = reg_write(reg_idx, ®_value, reg_size, reg_write_ud); + unwind_status = reg_write_func(reg_idx, ®_value, reg_size, reg_write_ud); if (unwind_status != DW_UnwindStatus_Ok) { goto exit; } } break; case DW_CFI_RegisterRule_Register: { // read register value from another register U64 reg_size = dw_reg_size_from_code(uw->arch, reg_idx); - unwind_status = reg_read(reg->n, reg_buffer, reg_size, reg_read_ud); + unwind_status = reg_read_func(reg->n, reg_buffer, reg_size, reg_read_ud); if (unwind_status != DW_UnwindStatus_Ok) { goto exit; } // write register value to the thread context - unwind_status = reg_write(reg_idx, reg_buffer, reg_size, reg_write_ud); + unwind_status = reg_write_func(reg_idx, reg_buffer, reg_size, reg_write_ud); if (unwind_status != DW_UnwindStatus_Ok) { goto exit; } } break; case DW_CFI_RegisterRule_Expression: {