collapse raddbgi_convert folder into just being separate from_pdb and from_dwarf layers

README.md

@@ -35,10 +35,10 @@ the format are:
 
 - `lib_raddbgi_cons`: The RADDBGI construction library, for making RADDBGI
 debug info.
-- `raddbgi_convert`: Our legacy-debug-info-to-RADDBGI converters. Right now
-this includes a working PDB-to-RADDBGI converter, and an in-progress DWARF-to-
-RADDBGI converter. These converters can be built both as helper codebase layers
-or with a command line interface frontend.
+- `raddbgi_from_pdb`: Our PDB-to-RADDBGI converter. Can be used as a helper
+codebase layer, or built as an executable with a command line interface
+frontend.
+- `raddbgi_from_dwarf`: Our in-progress DWARF-to-RADDBGI converter.
 - `raddbgi_dump`: Our RADDBGI textual dumping utility.
 
 ## Development Setup Instructions
@@ -156,7 +156,7 @@ abstraction API.
 is only an x64 PE unwinding implementation).
 - Creating a DWARF-to-RADDBGI converter (in the same way that we've built a
 PDB-to-RADDBGI converter). A partial implementation of this is in
-`src/raddbgi_convert/dwarf`.
+`src/raddbgi_from_dwarf`.
 - Porting the `src/render` layer to implement all of the rendering features the
 frontend needs on a Linux-compatible API (the backend used on Windows is D3D11).
 - Porting the `src/font_provider` layer to a Linux-compatible font
@@ -315,7 +315,8 @@ A list of the layers in the codebase and their associated namespaces is below:
 - `raddbg` (no namespace): The layer which ties everything together for the main
   graphical debugger. Not much "meat", just drives `df`, implements command line
   options, and so on.
-- `raddbgi_convert` (`P2R_`): Our implementation of PDB-to-RADDBGI and
+- `raddbgi_from_pdb` (`P2R_`): Our implementation of PDB-to-RADDBGI conversion.
+- `raddbgi_from_dwarf` (`D2R_`): Our in-progress implementation of
   DWARF-to-RADDBGI conversion.
 - `raddbgi_dump` (`RADDBGIDUMP_`): A dumper utility program for dumping
   textualizations of RADDBGI debug info files.

build.bat

@@ -99,8 +99,8 @@ if not "%no_meta%"=="1" (
 :: --- Build Everything (@build_targets) --------------------------------------
 pushd build
 if "%raddbg%"=="1"             %compile% %gfx%       ..\src\raddbg\raddbg_main.cpp                                %compile_link% %out%raddbg.exe || exit /b 1
-if "%raddbgi_from_pdb%"=="1"   %compile%             ..\src\raddbgi_convert\pdb\raddbgi_from_pdb_main.c           %compile_link% %out%raddbgi_from_pdb.exe || exit /b 1
-if "%raddbgi_from_dwarf%"=="1" %compile%             ..\src\raddbgi_convert\dwarf\raddbgi_from_dwarf.c            %compile_link% %out%raddbgi_from_dwarf.exe || exit /b 1
+if "%raddbgi_from_pdb%"=="1"   %compile%             ..\src\raddbgi_from_pdb\raddbgi_from_pdb_main.c              %compile_link% %out%raddbgi_from_pdb.exe || exit /b 1
+if "%raddbgi_from_dwarf%"=="1" %compile%             ..\src\raddbgi_from_dwarf\raddbgi_from_dwarf.c               %compile_link% %out%raddbgi_from_dwarf.exe || exit /b 1
 if "%raddbgi_dump%"=="1"       %compile%             ..\src\raddbgi_dump\raddbgi_dump.c                           %compile_link% %out%raddbgi_dump.exe || exit /b 1
 if "%ryan_scratch%"=="1"       %compile%             ..\src\scratch\ryan_scratch.c                                %compile_link% %out%ryan_scratch.exe || exit /b 1
 if "%cpp_tests%"=="1"          %compile%             ..\src\scratch\i_hate_c_plus_plus.cpp                        %compile_link% %out%cpp_tests.exe || exit /b 1

src/raddbg/raddbg_main.cpp

@@ -27,9 +27,9 @@
 #include "msf/msf.h"
 #include "pdb/pdb.h"
 #include "pdb/pdb_stringize.h"
-#include "raddbgi_convert/pdb/raddbgi_coff_conversion.h"
-#include "raddbgi_convert/pdb/raddbgi_codeview_conversion.h"
-#include "raddbgi_convert/pdb/raddbgi_from_pdb.h"
+#include "raddbgi_from_pdb/raddbgi_coff_conversion.h"
+#include "raddbgi_from_pdb/raddbgi_codeview_conversion.h"
+#include "raddbgi_from_pdb/raddbgi_from_pdb.h"
 #include "regs/regs.h"
 #include "regs/raddbgi/regs_raddbgi.h"
 #include "type_graph/type_graph.h"
@@ -66,9 +66,9 @@
 #include "msf/msf.c"
 #include "pdb/pdb.c"
 #include "pdb/pdb_stringize.c"
-#include "raddbgi_convert/pdb/raddbgi_coff_conversion.c"
-#include "raddbgi_convert/pdb/raddbgi_codeview_conversion.c"
-#include "raddbgi_convert/pdb/raddbgi_from_pdb.c"
+#include "raddbgi_from_pdb/raddbgi_coff_conversion.c"
+#include "raddbgi_from_pdb/raddbgi_codeview_conversion.c"
+#include "raddbgi_from_pdb/raddbgi_from_pdb.c"
 #include "regs/regs.c"
 #include "regs/raddbgi/regs_raddbgi.c"
 #include "type_graph/type_graph.c"