Now lists dwarf_lname_version.c

	modified:   src/lib/libdwarf/CMakeLists.txt
	modified:   src/lib/libdwarf/Makefile.am

Deleted the code for DW_LNAME stuff, it is
now in dwarf_lname_version.c as generated code.
	modified:   src/lib/libdwarf/dwarf_query.c

Added dwarf_lname_version.c
	modified:   src/lib/libdwarf/meson.build

The test code now looks in dwarf_lname_version.c
in libdwarf to check its LNAME items in the switch.
	modified:   test/test_lname.c

Author: davea42

src/lib/libdwarf/CMakeLists.txt

@@ -20,6 +20,7 @@ dwarf_line.c dwarf_loc.c
 dwarf_loclists.c
 dwarf_locationop_read.c
 dwarf_local_malloc.c
+dwarf_lname_version.c
 dwarf_lvn_name.c
 dwarf_machoread.c dwarf_64machoread.c dwarf_macro.c dwarf_macro5.c
 dwarf_memcpy_swap.c

src/lib/libdwarf/Makefile.am

@@ -64,6 +64,7 @@ dwarf_leb.c \
 dwarf_line.c \
 dwarf_line.h \
 dwarf_line_table_reader_common.h \
+dwarf_lname_version.c \
 dwarf_loc.c \
 dwarf_loc.h \
 dwarf_loclists.h \

src/lib/libdwarf/dwarf_query.c

@@ -2302,121 +2302,6 @@ dwarf_machine_architecture(Dwarf_Debug dbg,
         dw_ub_offset, dw_ub_count,
         dw_ub_index,  dw_comdat_groupnumber);
 }
-/*
-
-    DWARF6 DW_LNAME values are referenced
-    by using dwarf_language_version_data()
-    (these are permitted in DWARF5, see
-    www.dwarfstd.org  )
-
-    For DWARF5 DW_LANG values, call dwarf_srclang()
-    instead.
-
-*/
-
-int dwarf_language_version_data(
-    Dwarf_Unsigned dw_lang_name,
-    int          *dw_default_lower_bound,
-    const char   **dw_version_scheme)
-{
-    const char *lname = 0;
-    int res = 0;
-    unsigned int ui = 0;
-    unsigned int unreasonable_name = 65535;
-
-    if (dw_lang_name >= unreasonable_name) {
-        /*  Want to deal with improper code calling here,
-            not just trim off upper bits in the cast.  */
-        return DW_DLV_NO_ENTRY;
-    }
-    ui = (unsigned int)dw_lang_name;
-    res = dwarf_get_LNAME_name(ui,&lname);
-    if (res == DW_DLV_NO_ENTRY) {
-        return res;
-    }
-    switch(dw_lang_name) {
-    case DW_LNAME_Ada:
-    case DW_LNAME_Cobol:
-    case DW_LNAME_Fortran:
-    case DW_LNAME_Pascal:
-    case DW_LNAME_Algol68:
-        *dw_default_lower_bound = 1;
-        *dw_version_scheme = "YYYY";
-        break;
-    case DW_LNAME_BLISS:
-    case DW_LNAME_Crystal:
-    case DW_LNAME_D :
-    case DW_LNAME_Dylan:
-    case DW_LNAME_Go :
-    case DW_LNAME_Haskell:
-    case DW_LNAME_Java:
-    case DW_LNAME_Kotlin:
-    case DW_LNAME_OCaml:
-    case DW_LNAME_OpenCL_C:
-    case DW_LNAME_Python:
-    case DW_LNAME_RenderScript:
-    case DW_LNAME_Rust:
-    case DW_LNAME_UPC:
-    case DW_LNAME_Zig:
-    case DW_LNAME_Assembly:
-    case DW_LNAME_C_sharp:
-    case DW_LNAME_Mojo:
-    case DW_LNAME_Hylo:
-    case DW_LNAME_HIP:
-        *dw_default_lower_bound = 0;
-        *dw_version_scheme = 0;
-        break;
-    case DW_LNAME_C:
-    case DW_LNAME_C_plus_plus:
-    case DW_LNAME_ObjC:
-    case DW_LNAME_ObjC_plus_plus:
-    case DW_LNAME_Move:
-    case DW_LNAME_Odin:
-        *dw_default_lower_bound = 0;
-        *dw_version_scheme = "YYYYMM";
-        break;
-    case DW_LNAME_Julia:
-    case DW_LNAME_Modula2:
-    case DW_LNAME_Modula3:
-    case DW_LNAME_PLI:
-        *dw_default_lower_bound = 1;
-        *dw_version_scheme = 0;
-        break;
-    case DW_LNAME_Swift:
-    case DW_LNAME_OpenCL_CPP:
-    case DW_LNAME_CPP_for_OpenCL:
-        *dw_default_lower_bound = 0;
-        *dw_version_scheme = "VVMM";
-        break;
-    case DW_LNAME_GLSL :
-    case DW_LNAME_GLSL_ES:
-    case DW_LNAME_Ruby:
-    case DW_LNAME_P4:
-    case DW_LNAME_Metal:
-    case DW_LNAME_V:
-    case DW_LNAME_Nim:
-    case DW_LNAME_Gleam:
-        *dw_default_lower_bound = 0;
-        *dw_version_scheme = "VVMMPP";
-        break;
-    case DW_LNAME_Erlang:
-    case DW_LNAME_Elixir:
-        *dw_default_lower_bound = 1;
-        *dw_version_scheme = "VVMMPP";
-        break;
-    case DW_LNAME_HLSL:
-        *dw_default_lower_bound = 0;
-        *dw_version_scheme = "YYYY";
-        break;
-    case DW_LNAME_SYCL:
-        *dw_default_lower_bound = 0;
-        *dw_version_scheme = "YYYYRR";
-        break;
-    default:
-        return DW_DLV_NO_ENTRY;
-    }
-    return DW_DLV_OK;
-}
 /*  OBSOLETE NAME:  Do not use dwarf_language_version_string(). */
 int dwarf_language_version_string(
     Dwarf_Unsigned dw_lang_name,

src/lib/libdwarf/meson.build

@@ -37,6 +37,7 @@ libdwarf_src = [
   'dwarf_locationop_read.c',
   'dwarf_local_malloc.c',
   'dwarf_loclists.c',
+  'dwarf_lname_version.c',
   'dwarf_lvn_name.c',
   'dwarf_machoread.c',
   'dwarf_64machoread.c',

test/test_lname.c

@@ -377,7 +377,7 @@ main(int argc, char **argv)
     char        *path    = 0;
     size_t       len     = 0;
     const char  *libpath="/src/lib/libdwarf/dwarf.h";
-    const char  *srchdr="/src/lib/libdwarf/dwarf_query.c";
+    const char  *srchdr="/src/lib/libdwarf/dwarf_lname_version.c";
     int argn = 0;
 
     if (argc > 1) {