Rename DW_VERSION_2 to DW_VERSION

Author: zakkak

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfARangesSectionImpl.java

@@ -39,7 +39,7 @@
 
 import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_ARANGES_SECTION_NAME;
 import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_INFO_SECTION_NAME;
-import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_VERSION_2;
+import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_VERSION;
 
 /**
  * Section generator for debug_aranges section.
@@ -184,7 +184,7 @@ public void writeContent(DebugContext context) {
             log(context, "  [0x%08x] %s CU %d length 0x%x", pos, classEntry.getFileName(), cuIndex, length);
             pos = putInt(length, buffer, pos);
             /* DWARF version is always 2. */
-            pos = putShort(DW_VERSION_2, buffer, pos);
+            pos = putShort(DW_VERSION, buffer, pos);
             pos = putInt(cuIndex, buffer, pos);
             /* Address size is always 8. */
             pos = putByte((byte) 8, buffer, pos);
@@ -237,7 +237,7 @@ public void writeContent(DebugContext context) {
                 log(context, "  [0x%08x] %s CU linkage stubs %d length 0x%x", pos, classEntry.getFileName(), cuIndex, length);
                 pos = putInt(length, buffer, pos);
                 /* DWARF version is always 2. */
-                pos = putShort(DW_VERSION_2, buffer, pos);
+                pos = putShort(DW_VERSION, buffer, pos);
                 pos = putInt(cuIndex, buffer, pos);
                 /* Address size is always 8. */
                 pos = putByte((byte) 8, buffer, pos);

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfDebugInfo.java

@@ -51,9 +51,9 @@ public class DwarfDebugInfo extends DebugInfoBase {
     public static final String DW_ARANGES_SECTION_NAME = ".debug_aranges";
 
     /**
-     * Currently generated debug info relies on DWARF spec vesion 2.
+     * Currently generated debug info relies on DWARF spec version 2.
      */
-    public static final short DW_VERSION_2 = 2;
+    public static final short DW_VERSION = 2;
 
     /*
      * Define all the abbrev section codes we need for our DIEs.

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java

@@ -41,7 +41,7 @@
 import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_FLAG_true;
 import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_INFO_SECTION_NAME;
 import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_LANG_Java;
-import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_VERSION_2;
+import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_VERSION;
 
 /**
  * Section generator for debug_info section.
@@ -196,7 +196,7 @@ private int writeCUHeader(byte[] buffer, int p) {
             /* CU length. */
             pos += putInt(0, scratch, 0);
             /* DWARF version. */
-            pos += putShort(DW_VERSION_2, scratch, 0);
+            pos += putShort(DW_VERSION, scratch, 0);
             /* Abbrev offset. */
             pos += putInt(0, scratch, 0);
             /* Address size. */
@@ -205,7 +205,7 @@ private int writeCUHeader(byte[] buffer, int p) {
             /* CU length. */
             pos = putInt(0, buffer, pos);
             /* DWARF version. */
-            pos = putShort(DW_VERSION_2, buffer, pos);
+            pos = putShort(DW_VERSION, buffer, pos);
             /* Abbrev offset. */
             pos = putInt(0, buffer, pos);
             /* Address size. */

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLineSectionImpl.java

@@ -41,7 +41,7 @@
 
 import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_LINE_SECTION_NAME;
 import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_STR_SECTION_NAME;
-import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_VERSION_2;
+import static com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.DW_VERSION;
 
 /**
  * Section generator for debug_line section.
@@ -317,7 +317,7 @@ private int writeHeader(ClassEntry classEntry, byte[] buffer, int p) {
         /*
          * 2 ubyte version is always 2.
          */
-        pos = putShort(DW_VERSION_2, buffer, pos);
+        pos = putShort(DW_VERSION, buffer, pos);
         /*
          * 4 ubyte prologue length includes rest of header and dir + file table section.
          */