lib_rdi_format -> lib_rdi

src/dwarf/dwarf_dump.h

@@ -51,6 +51,7 @@ read_only global String8 dw_name_title_from_dump_subset_table[] =
 #undef X
 };
 
+internal String8 dw_string_from_reg_off(Arena *arena, Arch arch, U64 reg_idx, S64 reg_off);
 internal String8List dw_string_list_from_expression  (Arena *arena, String8 raw_data, U64 cu_base, U64 address_size, Arch arch, DW_Version ver, DW_Ext ext, DW_Format format);
 internal String8     dw_format_expression_single_line(Arena *arena, String8 raw_data, U64 cu_base, U64 address_size, Arch arch, DW_Version ver, DW_Ext ext, DW_Format format);
 internal String8     dw_format_eh_ptr_enc            (Arena *arena, DW_EhPtrEnc enc);
@@ -71,7 +72,6 @@ internal void dw_print_debug_pubnames   (Arena *arena, String8List *out, String8
 internal void dw_print_debug_pubtypes   (Arena *arena, String8List *out, String8 indent, DW_Input *input);
 internal void dw_print_debug_line_str   (Arena *arena, String8List *out, String8 indent, DW_Input *input);
 internal void dw_print_debug_str_offsets(Arena *arena, String8List *out, String8 indent, DW_Input *input);
-internal void
+internal void dw_format(Arena *arena, String8List *out, String8 indent, DW_DumpSubsetFlags subset_flags, DW_Input *input, Arch arch, ExecutableImageKind image_type);
-dw_format(Arena *arena, String8List *out, String8 indent, DW_DumpSubsetFlags subset_flags, DW_Input *input, Arch arch, ExecutableImageKind image_type);
 
 #endif // DWARF_DUMP_H

src/lib_rdi/rdi.c

@@ -2,13 +2,13 @@
 // Licensed under the MIT license (https://opensource.org/license/mit/)
 
 ////////////////////////////////////////////////////////////////
-//~ RAD Debug Info, (R)AD(D)BG(I) Format Library
+//~ (R)AD (D)ebug (I)nfo Format Library
 //
 // Defines standard RDI debug information format types and
 // functions.
 
-#ifndef RDI_FORMAT_C
+#ifndef RDI_C
-#define RDI_FORMAT_C
+#define RDI_C
 
 RDI_U16 rdi_section_element_size_table[40] =
 {
@@ -357,4 +357,4 @@ rdi_explanation_string_from_eval_conversion_kind(RDI_EvalConversionKind kind, RD
   return rdi_eval_conversion_kind_message_string_table[kind].str;
 }
 
-#endif // RDI_FORMAT_C
+#endif // RDI_C

src/lib_rdi/rdi.h

@@ -2,13 +2,13 @@
 // Licensed under the MIT license (https://opensource.org/license/mit/)
 
 ////////////////////////////////////////////////////////////////
-//~ RAD Debug Info, (R)AD(D)BG(I) Format Library
+//~ (R)AD (D)ebug (I)nfo Format Library
 //
 // Defines standard RDI debug information format types and
 // functions.
 
-#ifndef RDI_FORMAT_H
+#ifndef RDI_H
-#define RDI_FORMAT_H
+#define RDI_H
 
 ////////////////////////////////////////////////////////////////
 //~ Overridable Procedure Decoration
@@ -1571,4 +1571,4 @@ extern RDI_U16 rdi_section_element_size_table[40];
 extern RDI_U8 rdi_section_is_required_table[40];
 extern RDI_U16 rdi_eval_op_ctrlbits_table[52];
 
-#endif // RDI_FORMAT_H
+#endif // RDI_H

src/lib_rdi/rdi_parse.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT license (https://opensource.org/license/mit/)
 
 ////////////////////////////////////////////////////////////////
-//~ RAD Debug Info, (R)AD(D)BG(I) Format Parsing Library
+//~ (R)AD (D)ebug (I)nfo Format Parsing Library
 //
 // Defines helper types and functions for extracting data from
 // RDI files.
@@ -38,8 +38,8 @@
 }
 #endif
 
-#ifndef RDI_FORMAT_PARSE_H
+#ifndef RDI_PARSE_H
-#define RDI_FORMAT_PARSE_H
+#define RDI_PARSE_H
 
 ////////////////////////////////////////////////////////////////
 //~ Parsed Information Types

src/linker/lnk.c

@@ -63,10 +63,8 @@
 // RDI
 
 #include "rdi/rdi_overrides.h"
-#include "lib_rdi_format/rdi_format.h"
+#include "lib_rdi/rdi.h"
-#include "rdi/rdi.h"
+#include "lib_rdi/rdi.c"
-#include "lib_rdi_format/rdi_format.c"
-#include "rdi/rdi.c"
 
 ////////////////////////////////
 // Code Base Extensions

src/linker/rdi/rdi.c

@@ -1 +0,0 @@
-

src/linker/rdi/rdi.h

@@ -1,4 +0,0 @@
-#pragma once
-
-
-

src/radbin/radbin_main.c

@@ -19,7 +19,7 @@
 #include "linker/hash_table.h"
 #include "os/os_inc.h"
 #include "async/async.h"
-#include "rdi_format/rdi_format_local.h"
+#include "rdi/rdi_local.h"
 #include "rdi_make/rdi_make_local.h"
 #include "coff/coff.h"
 #include "coff/coff_parse.h"
@@ -46,7 +46,7 @@
 #include "linker/hash_table.c"
 #include "os/os_inc.c"
 #include "async/async.c"
-#include "rdi_format/rdi_format_local.c"
+#include "rdi/rdi_local.c"
 #include "rdi_make/rdi_make_local.c"
 #include "coff/coff.c"
 #include "coff/coff_parse.c"

src/raddbg/raddbg_main.c

@@ -211,7 +211,7 @@
 #include "linker/hash_table.h"
 #include "os/os_inc.h"
 #include "async/async.h"
-#include "rdi_format/rdi_format_local.h"
+#include "rdi/rdi_local.h"
 #include "rdi_make/rdi_make_local.h"
 #include "mdesk/mdesk.h"
 #include "hash_store/hash_store.h"
@@ -264,7 +264,7 @@
 #include "linker/hash_table.c"
 #include "os/os_inc.c"
 #include "async/async.c"
-#include "rdi_format/rdi_format_local.c"
+#include "rdi/rdi_local.c"
 #include "rdi_make/rdi_make_local.c"
 #include "mdesk/mdesk.c"
 #include "hash_store/hash_store.c"

src/rdi/rdi.mdesk

@@ -5,20 +5,20 @@
 //~ rjf: Generated File Format
 
 @option library
-@gen_folder "lib_rdi_format"
+@gen_folder "lib_rdi"
-@h_name "rdi_format.h"
+@h_name "rdi.h"
-@c_name "rdi_format.c"
+@c_name "rdi.c"
 
 @h_header
 {
   "////////////////////////////////////////////////////////////////";
-  "//~ RAD Debug Info, (R)AD(D)BG(I) Format Library";
+  "//~ (R)AD (D)ebug (I)nfo Format Library";
   "//";
   "// Defines standard RDI debug information format types and";
   "// functions.";
   "";
-  "#ifndef RDI_FORMAT_H";
+  "#ifndef RDI_H";
-  "#define RDI_FORMAT_H";
+  "#define RDI_H";
   "";
   "////////////////////////////////////////////////////////////////";
   "//~ Overridable Procedure Decoration";
@@ -71,25 +71,25 @@
 
 @h_footer
 {
-  "#endif // RDI_FORMAT_H";
+  "#endif // RDI_H";
 }
 
 @c_header
 {
   "////////////////////////////////////////////////////////////////";
-  "//~ RAD Debug Info, (R)AD(D)BG(I) Format Library";
+  "//~ (R)AD (D)ebug (I)nfo Format Library";
   "//";
   "// Defines standard RDI debug information format types and";
   "// functions.";
   "";
-  "#ifndef RDI_FORMAT_C";
+  "#ifndef RDI_C";
-  "#define RDI_FORMAT_C";
+  "#define RDI_C";
   "";
 }
 
 @c_footer
 {
-  "#endif // RDI_FORMAT_C";
+  "#endif // RDI_C";
 }
 
 ////////////////////////////////

src/rdi/rdi_local.c

@@ -1,8 +1,8 @@
 // Copyright (c) Epic Games Tools
 // Licensed under the MIT license (https://opensource.org/license/mit/)
 
-#include "lib_rdi_format/rdi_format.c"
+#include "lib_rdi/rdi.c"
-#include "lib_rdi_format/rdi_format_parse.c"
+#include "lib_rdi/rdi_parse.c"
 
 ////////////////////////////////
 //~ rjf: RDI Decompression

src/rdi/rdi_local.h

@@ -4,8 +4,8 @@
 #ifndef RDI_FORMAT_LOCAL_H
 #define RDI_FORMAT_LOCAL_H
 
-#include "lib_rdi_format/rdi_format.h"
+#include "lib_rdi/rdi.h"
-#include "lib_rdi_format/rdi_format_parse.h"
+#include "lib_rdi/rdi_parse.h"
 
 ////////////////////////////////
 //~ rjf: RDI Dumping Flags