add debuginfo for MacOS

Author: esytnik

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/ObjectFile.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -529,7 +529,11 @@ public Section newUserDefinedSection(String name, ElementImpl impl) {
     }
 
     public Section newDebugSection(String name, ElementImpl impl) {
-        final Segment segment = getOrCreateSegment(null, name, false, false);
+        return newDebugSection(null, name, impl);
+    }
+
+    public Section newDebugSection(String segmentName, String name, ElementImpl impl) {
+        final Segment segment = getOrCreateSegment(segmentName, name, false, false);
         final int alignment = 1; // debugging information is mostly unaligned; padding can result in
                                  // corrupted data when the linker merges multiple debugging
                                  // sections from different inputs
@@ -1172,6 +1176,10 @@ public void installDebugInfo(@SuppressWarnings("unused") DebugInfoProvider debug
         // do nothing by default
     }
 
+    public List<String> getDebugSectionNames() {
+        return Collections.emptyList();
+    }
+
     protected static Iterable<LayoutDecision> allDecisions(final Map<Element, LayoutDecisionMap> decisions) {
         return () -> StreamSupport.stream(decisions.values().spliterator(), false)
                         .flatMap(layoutDecisionMap -> StreamSupport.stream(layoutDecisionMap.spliterator(), false)).iterator();
@@ -1294,6 +1302,10 @@ public Element getOffsetBootstrapElement() {
     private final Map<Element, List<BuildDependency>> dependenciesByDependingElement = new IdentityHashMap<>();
     private final Map<Element, List<BuildDependency>> dependenciesByDependedOnElement = new IdentityHashMap<>();
 
+    protected Object getLayoutDecisionValue(Element e, LayoutDecision.Kind k) {
+        return decisionsTaken.get(e).getDecidedValue(k);
+    }
+
     public void write(DebugContext context, Path outputFile) throws IOException {
         try (FileChannel channel = FileChannel.open(outputFile, StandardOpenOption.WRITE, StandardOpenOption.READ, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE)) {
             withDebugContext(context, "ObjectFile.write", () -> {
@@ -1303,7 +1315,7 @@ public void write(DebugContext context, Path outputFile) throws IOException {
     }
 
     @SuppressWarnings("try")
-    public final void write(FileChannel outputChannel) {
+    public List<Element> write(FileChannel outputChannel) {
         List<Element> sortedObjectFileElements = new ArrayList<>();
         int totalSize = bake(sortedObjectFileElements);
         try {
@@ -1317,6 +1329,7 @@ public final void write(FileChannel outputChannel) {
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
+        return sortedObjectFileElements;
     }
 
     /*
@@ -1861,4 +1874,8 @@ public void debugContext(String scopeName, Consumer<DebugContext> action) {
             throw debugContext.handle(e);
         }
     }
+
+    public long getCodeBaseAddress() {
+        return 0;
+    }
 }

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/DebugInfoBase.java

@@ -47,7 +47,6 @@
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugLocalValueInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugLocationInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo.DebugTypeKind;
-import com.oracle.objectfile.dwarf.DwarfDebugInfo;
 
 import jdk.vm.ci.meta.ResolvedJavaType;
 
@@ -88,6 +87,11 @@
  * units.
  */
 public abstract class DebugInfoBase {
+    /*
+     * The name of the type for header field hub which needs special case processing to remove tag
+     * bits
+     */
+    public static final String HUB_TYPE_NAME = "java.lang.Class";
     protected ByteOrder byteOrder;
     /**
      * A table listing all known strings, some of which may be marked for insertion into the
@@ -223,13 +227,17 @@ public int compiledCodeMax() {
         return compiledCodeMax;
     }
 
+    public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
+        installDebugInfo(debugInfoProvider, 0);
+    }
+
     /**
      * Entry point allowing ELFObjectFile to pass on information about types, code and heap data.
      *
      * @param debugInfoProvider provider instance passed by ObjectFile client.
      */
     @SuppressWarnings("try")
-    public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
+    public void installDebugInfo(DebugInfoProvider debugInfoProvider, long debugAddressOffset) {
         /*
          * This will be needed once we add support for type info:
          *
@@ -332,7 +340,7 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
             /* Search for a method defining this primary range. */
             ClassEntry classEntry = lookupClassEntry(ownerType);
             MethodEntry methodEntry = classEntry.ensureMethodEntryForDebugRangeInfo(debugCodeInfo, this, debugContext);
-            PrimaryRange primaryRange = Range.createPrimary(methodEntry, lo, hi, primaryLine);
+            PrimaryRange primaryRange = Range.createPrimary(methodEntry, lo + debugAddressOffset, hi + debugAddressOffset, primaryLine);
             if (debugContext.isLogEnabled(DebugContext.INFO_LEVEL)) {
                 debugContext.log(DebugContext.INFO_LEVEL, "PrimaryRange %s.%s %s %s:%d [0x%x, 0x%x]", ownerType.toJavaName(), methodName, filePath, fileName, primaryLine, lo, hi);
             }
@@ -369,7 +377,7 @@ private TypeEntry createTypeEntry(String typeName, String fileName, Path filePat
             case INSTANCE: {
                 FileEntry fileEntry = addFileEntry(fileName, filePath);
                 typeEntry = new ClassEntry(typeName, fileEntry, size);
-                if (typeEntry.getTypeName().equals(DwarfDebugInfo.HUB_TYPE_NAME)) {
+                if (typeEntry.getTypeName().equals(HUB_TYPE_NAME)) {
                     hubClassEntry = (ClassEntry) typeEntry;
                 }
                 break;
@@ -735,7 +743,7 @@ public String getCachePath() {
     }
 
     public boolean isHubClassEntry(ClassEntry classEntry) {
-        return classEntry.getTypeName().equals(DwarfDebugInfo.HUB_TYPE_NAME);
+        return classEntry.getTypeName().equals(HUB_TYPE_NAME);
     }
 
     public ClassEntry getHubClassEntry() {
@@ -780,7 +788,7 @@ private static void collectFilesAndDirs(ClassEntry classEntry) {
     /**
      * Ensure the supplied file entry and associated directory entry are included, but only once, in
      * a class entry's file and dir list.
-     * 
+     *
      * @param classEntry the class entry whose file and dir list may need to be updated
      * @param fileEntry a file entry which may need to be added to the class entry's file list or
      *            whose dir may need adding to the class entry's dir list

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

@@ -28,16 +28,15 @@
 
 import java.util.Map;
 
-import com.oracle.objectfile.debugentry.ClassEntry;
-import com.oracle.objectfile.dwarf.constants.DwarfSectionName;
-import com.oracle.objectfile.dwarf.constants.DwarfVersion;
 import jdk.graal.compiler.debug.DebugContext;
 
+import com.oracle.objectfile.debugentry.ClassEntry;
+import com.oracle.objectfile.debugentry.CompiledMethodEntry;
+import com.oracle.objectfile.debugentry.range.Range;
+import com.oracle.objectfile.dwarf.constants.DwarfVersion;
 import com.oracle.objectfile.LayoutDecision;
 import com.oracle.objectfile.LayoutDecisionMap;
 import com.oracle.objectfile.ObjectFile;
-import com.oracle.objectfile.debugentry.CompiledMethodEntry;
-import com.oracle.objectfile.debugentry.range.Range;
 
 /**
  * Section generator for debug_aranges section.
@@ -47,8 +46,8 @@ public class DwarfARangesSectionImpl extends DwarfSectionImpl {
     private static final int AR_HEADER_SIZE = 12;
     private static final int AR_HEADER_PAD_SIZE = 4;
 
-    public DwarfARangesSectionImpl(DwarfDebugInfo dwarfSections) {
-        super(dwarfSections, DwarfSectionName.DW_ARANGES_SECTION, DwarfSectionName.DW_FRAME_SECTION);
+    public DwarfARangesSectionImpl(DwarfDebugInfoBase dwarfSections) {
+        super(dwarfSections, dwarfSections.arangesSectionName(), dwarfSections.frameSectionName());
     }
 
     @Override
@@ -113,7 +112,7 @@ private static int entrySize(int methodCount) {
 
     @Override
     public byte[] getOrDecideContent(Map<ObjectFile.Element, LayoutDecisionMap> alreadyDecided, byte[] contentHint) {
-        ObjectFile.Element textElement = getElement().getOwner().elementForName(".text");
+        ObjectFile.Element textElement = getElement().getOwner().elementForName(dwarfSections.textSectionName().value());
         LayoutDecisionMap decisionMap = alreadyDecided.get(textElement);
         if (decisionMap != null) {
             Object valueObj = decisionMap.getDecidedValue(LayoutDecision.Kind.VADDR);

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

@@ -26,13 +26,12 @@
 
 package com.oracle.objectfile.dwarf;
 
+import com.oracle.objectfile.dwarf.constants.DwarfAttribute;
 import com.oracle.objectfile.dwarf.constants.DwarfForm;
-import com.oracle.objectfile.dwarf.constants.DwarfHasChildren;
-import com.oracle.objectfile.dwarf.constants.DwarfSectionName;
 import com.oracle.objectfile.dwarf.constants.DwarfTag;
-import com.oracle.objectfile.dwarf.constants.DwarfAttribute;
+import com.oracle.objectfile.dwarf.constants.DwarfHasChildren;
+import com.oracle.objectfile.dwarf.DwarfDebugInfoBase.AbbrevCode;
 import jdk.graal.compiler.debug.DebugContext;
-import com.oracle.objectfile.dwarf.DwarfDebugInfo.AbbrevCode;
 
 /**
  * Section generator for <code>debug_abbrev</code> section. That section defines the layout of the
@@ -832,9 +831,9 @@
  */
 public class DwarfAbbrevSectionImpl extends DwarfSectionImpl {
 
-    public DwarfAbbrevSectionImpl(DwarfDebugInfo dwarfSections) {
+    public DwarfAbbrevSectionImpl(DwarfDebugInfoBase dwarfSections) {
         // abbrev section depends on ranges section
-        super(dwarfSections, DwarfSectionName.DW_ABBREV_SECTION, DwarfSectionName.DW_RANGES_SECTION);
+        super(dwarfSections, dwarfSections.abbrevSectionName(), dwarfSections.rangesSectionName());
     }
 
     @Override