Use enums for DWARF constants instead of interfaces

Author: adinn

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

@@ -29,7 +29,6 @@
 import java.util.Map;
 
 import com.oracle.objectfile.debugentry.ClassEntry;
-import com.oracle.objectfile.elf.dwarf.constants.DwarfSectionNames;
 import org.graalvm.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.LayoutDecision;
@@ -38,6 +37,11 @@
 import com.oracle.objectfile.debugentry.CompiledMethodEntry;
 import com.oracle.objectfile.debugentry.range.Range;
 
+import static com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName.DW_ARANGES_SECTION;
+import static com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName.DW_FRAME_SECTION;
+
+import static com.oracle.objectfile.elf.dwarf.constants.DwarfVersion.DW_VERSION_2;
+
 /**
  * Section generator for debug_aranges section.
  */
@@ -47,12 +51,7 @@ public class DwarfARangesSectionImpl extends DwarfSectionImpl {
     private static final int AR_HEADER_PAD_SIZE = 4;
 
     public DwarfARangesSectionImpl(DwarfDebugInfo dwarfSections) {
-        super(dwarfSections);
-    }
-
-    @Override
-    public String getSectionName() {
-        return DwarfSectionNames.DW_ARANGES_SECTION_NAME;
+        super(dwarfSections, DW_ARANGES_SECTION, DW_FRAME_SECTION);
     }
 
     @Override
@@ -162,7 +161,7 @@ private int writeHeader(int cuIndex, byte[] buffer, int p) {
         // write dummy length for now
         pos = writeInt(0, buffer, pos);
         /* DWARF version is always 2. */
-        pos = writeShort(DW_VERSION_2, buffer, pos);
+        pos = writeDwarfVersion(DW_VERSION_2, buffer, pos);
         pos = writeInfoSectionOffset(cuIndex, buffer, pos);
         /* Address size is always 8. */
         pos = writeByte((byte) 8, buffer, pos);
@@ -186,24 +185,4 @@ int writeARange(DebugContext context, CompiledMethodEntry compiledMethod, byte[]
         pos = writeLong(primary.getHi() - primary.getLo(), buffer, pos);
         return pos;
     }
-
-    /*
-     * The debug_aranges section depends on debug_frame section.
-     */
-    private static final String TARGET_SECTION_NAME = DwarfSectionNames.DW_FRAME_SECTION_NAME;
-
-    @Override
-    public String targetSectionName() {
-        return TARGET_SECTION_NAME;
-    }
-
-    private final LayoutDecision.Kind[] targetSectionKinds = {
-                    LayoutDecision.Kind.CONTENT,
-                    LayoutDecision.Kind.SIZE
-    };
-
-    @Override
-    public LayoutDecision.Kind[] targetSectionKinds() {
-        return targetSectionKinds;
-    }
 }

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

@@ -37,16 +37,15 @@
 import com.oracle.objectfile.debugentry.TypeEntry;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugLocalInfo;
 import com.oracle.objectfile.elf.ELFMachine;
-import com.oracle.objectfile.elf.dwarf.constants.DwarfAttributeValues;
-import com.oracle.objectfile.elf.dwarf.constants.DwarfConstants;
+import com.oracle.objectfile.elf.dwarf.constants.DwarfLanguage;
 import org.graalvm.collections.EconomicMap;
 
 /**
  * A class that models the debug info in an organization that facilitates generation of the required
  * DWARF sections. It groups common data and behaviours for use by the various subclasses of class
  * DwarfSectionImpl that take responsibility for generating content for a specific section type.
  */
-public class DwarfDebugInfo extends DebugInfoBase implements DwarfConstants {
+public class DwarfDebugInfo extends DebugInfoBase {
 
     public static final String HEAP_BEGIN_NAME = "__svm_heap_begin";
 
@@ -113,7 +112,7 @@ enum AbbrevCode {
      * This field defines the value used for the DW_AT_language attribute of compile units.
      *
      */
-    public static final byte LANG_ENCODING = DwarfAttributeValues.DW_LANG_Java;
+    public static final DwarfLanguage LANG_ENCODING = DwarfLanguage.DW_LANG_Java;
 
     /* Register constants for AArch64. */
     public static final byte rheapbase_aarch64 = (byte) 27;

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

@@ -26,16 +26,17 @@
 
 package com.oracle.objectfile.elf.dwarf;
 
-import com.oracle.objectfile.LayoutDecision;
 import com.oracle.objectfile.debugentry.CompiledMethodEntry;
 import com.oracle.objectfile.debugentry.range.Range;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider;
-import com.oracle.objectfile.elf.dwarf.constants.DwarfFrameValues;
-import com.oracle.objectfile.elf.dwarf.constants.DwarfSectionNames;
+import com.oracle.objectfile.elf.dwarf.constants.DwarfFrameValue;
 import org.graalvm.compiler.debug.DebugContext;
 
 import java.util.List;
 
+import static com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName.DW_FRAME_SECTION;
+import static com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName.DW_LINE_SECTION;
+
 /**
  * Section generic generator for debug_frame section.
  */
@@ -46,12 +47,8 @@ public abstract class DwarfFrameSectionImpl extends DwarfSectionImpl {
     private static final int CFA_CIE_id_default = -1;
 
     public DwarfFrameSectionImpl(DwarfDebugInfo dwarfSections) {
-        super(dwarfSections);
-    }
-
-    @Override
-    public String getSectionName() {
-        return DwarfSectionNames.DW_FRAME_SECTION_NAME;
+        // debug_frame section depends on debug_line section
+        super(dwarfSections, DW_FRAME_SECTION, DW_LINE_SECTION);
     }
 
     @Override
@@ -124,7 +121,7 @@ private int writeCIE(byte[] buffer, int p) {
         int lengthPos = pos;
         pos = writeInt(0, buffer, pos);
         pos = writeInt(CFA_CIE_id_default, buffer, pos);
-        pos = writeByte(DwarfFrameValues.DW_CFA_CIE_version, buffer, pos);
+        pos = writeCIEVersion(buffer, pos);
         pos = writeByte((byte) 0, buffer, pos);
         pos = writeULEB(1, buffer, pos);
         pos = writeSLEB(-8, buffer, pos);
@@ -141,6 +138,10 @@ private int writeCIE(byte[] buffer, int p) {
         return pos;
     }
 
+    private int writeCIEVersion(byte[] buffer, int pos) {
+        return writeByte(DwarfFrameValue.DW_CFA_CIE_version.value(), buffer, pos);
+    }
+
     private int writeMethodFrame(CompiledMethodEntry compiledEntry, byte[] buffer, int p) {
         int pos = p;
         int lengthPos = pos;
@@ -198,21 +199,22 @@ private int writeFDEHeader(int lo, int hi, byte[] buffer, int p) {
     private int writePaddingNops(byte[] buffer, int p) {
         int pos = p;
         while ((pos & (PADDING_NOPS_ALIGNMENT - 1)) != 0) {
-            pos = writeByte(DwarfFrameValues.DW_CFA_nop, buffer, pos);
+            pos = writeByte(DwarfFrameValue.DW_CFA_nop.value(), buffer, pos);
         }
         return pos;
     }
 
     protected int writeDefCFA(int register, int offset, byte[] buffer, int p) {
         int pos = p;
-        pos = writeByte(DwarfFrameValues.DW_CFA_def_cfa, buffer, pos);
+        pos = writeByte(DwarfFrameValue.DW_CFA_def_cfa.value(), buffer, pos);
         pos = writeULEB(register, buffer, pos);
         return writeULEB(offset, buffer, pos);
     }
 
     protected int writeDefCFAOffset(int offset, byte[] buffer, int p) {
         int pos = p;
-        pos = writeByte(DwarfFrameValues.DW_CFA_def_cfa_offset, buffer, pos);
+        byte op = DwarfFrameValue.DW_CFA_def_cfa_offset.value();
+        pos = writeByte(op, buffer, pos);
         return writeULEB(offset, buffer, pos);
     }
 
@@ -235,20 +237,20 @@ protected int writeAdvanceLoc0(byte offset, byte[] buffer, int pos) {
 
     protected int writeAdvanceLoc1(byte offset, byte[] buffer, int p) {
         int pos = p;
-        byte op = DwarfFrameValues.DW_CFA_advance_loc1;
+        byte op = DwarfFrameValue.DW_CFA_advance_loc1.value();
         pos = writeByte(op, buffer, pos);
         return writeByte(offset, buffer, pos);
     }
 
     protected int writeAdvanceLoc2(short offset, byte[] buffer, int p) {
-        byte op = DwarfFrameValues.DW_CFA_advance_loc2;
+        byte op = DwarfFrameValue.DW_CFA_advance_loc2.value();
         int pos = p;
         pos = writeByte(op, buffer, pos);
         return writeShort(offset, buffer, pos);
     }
 
     protected int writeAdvanceLoc4(int offset, byte[] buffer, int p) {
-        byte op = DwarfFrameValues.DW_CFA_advance_loc4;
+        byte op = DwarfFrameValue.DW_CFA_advance_loc4.value();
         int pos = p;
         pos = writeByte(op, buffer, pos);
         return writeInt(offset, buffer, pos);
@@ -270,7 +272,8 @@ protected int writeRestore(int register, byte[] buffer, int p) {
     @SuppressWarnings("unused")
     protected int writeRegister(int savedReg, int savedToReg, byte[] buffer, int p) {
         int pos = p;
-        pos = writeByte(DwarfFrameValues.DW_CFA_register, buffer, pos);
+        byte op = DwarfFrameValue.DW_CFA_register.value();
+        pos = writeByte(op, buffer, pos);
         pos = writeULEB(savedReg, buffer, pos);
         return writeULEB(savedToReg, buffer, pos);
     }
@@ -282,38 +285,23 @@ protected int writeRegister(int savedReg, int savedToReg, byte[] buffer, int p)
 
     protected abstract int writeInitialInstructions(byte[] buffer, int pos);
 
-    /**
-     * The debug_frame section depends on debug_line section.
-     */
-    private static final String TARGET_SECTION_NAME = DwarfSectionNames.DW_LINE_SECTION_NAME;
-
-    @Override
-    public String targetSectionName() {
-        return TARGET_SECTION_NAME;
-    }
-
-    private final LayoutDecision.Kind[] targetSectionKinds = {
-                    LayoutDecision.Kind.CONTENT,
-                    LayoutDecision.Kind.SIZE
-    };
-
-    @Override
-    public LayoutDecision.Kind[] targetSectionKinds() {
-        return targetSectionKinds;
-    }
-
     private static byte offsetOp(int register) {
-        assert (register >> 6) == 0;
-        return (byte) ((DwarfFrameValues.DW_CFA_offset << 6) | register);
+        byte op = DwarfFrameValue.DW_CFA_offset.value();
+        return encodeOp(op, register);
     }
 
     private static byte restoreOp(int register) {
-        assert (register >> 6) == 0;
-        return (byte) ((DwarfFrameValues.DW_CFA_restore << 6) | register);
+        byte op = DwarfFrameValue.DW_CFA_restore.value();
+        return encodeOp(op, register);
     }
 
     private static byte advanceLoc0Op(int offset) {
-        assert (offset >= 0 && offset <= 0x3f);
-        return (byte) ((DwarfFrameValues.DW_CFA_advance_loc << 6) | offset);
+        byte op = DwarfFrameValue.DW_CFA_advance_loc.value();
+        return encodeOp(op, offset);
+    }
+
+    private static byte encodeOp(byte op, int value) {
+        assert (value >> 6) == 0;
+        return (byte) ((op << 6) | value);
     }
 }