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
@@ -528,15 +528,19 @@ public Section newUserDefinedSection(String name, ElementImpl impl) {
         return result;
     }
 
-    public Section newDebugSection(String name, ElementImpl impl) {
-        final Segment segment = getOrCreateSegment(null, name, false, false);
+    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
         final Section result = newUserDefinedSection(segment, name, alignment, impl);
         return result;
     }
 
+    public Section newDebugSection(String name, ElementImpl impl) {
+        return newDebugSection(null, name, impl);
+    }
+
     // Convenience that does not specify a segment name.
     public Section newProgbitsSection(String name, int alignment, boolean writable, boolean executable, ProgbitsSectionImpl impl) {
         assert impl != null;
@@ -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();
@@ -1289,7 +1297,7 @@ public Element getOffsetBootstrapElement() {
 
     private final HashSet<LayoutDecision> allDecisions = new HashSet<>();
     private final Map<Element, LayoutDecisionMap> decisionsByElement = new IdentityHashMap<>();
-    private final Map<Element, LayoutDecisionMap> decisionsTaken = new IdentityHashMap<>();
+    public final Map<Element, LayoutDecisionMap> decisionsTaken = new IdentityHashMap<>();
 
     private final Map<Element, List<BuildDependency>> dependenciesByDependingElement = new IdentityHashMap<>();
     private final Map<Element, List<BuildDependency>> dependenciesByDependedOnElement = new IdentityHashMap<>();
@@ -1303,7 +1311,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 +1325,7 @@ public final void write(FileChannel outputChannel) {
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
+        return sortedObjectFileElements;
     }
 
     /*
@@ -1861,4 +1870,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

@@ -223,13 +223,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 +336,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);
             }
@@ -780,7 +784,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/debuginfo/dwarf/DwarfDebugInfo.java

@@ -109,4 +109,14 @@ public byte getHeapbaseRegister() {
         return heapbaseRegister;
     }
 
+    @Override
+    public boolean isAarch64() {
+        return elfMachine == ELFMachine.AArch64;
+    }
+
+    @Override
+    public boolean isX86_64() {
+        return elfMachine == ELFMachine.X86_64;
+    }
+
 }

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/dwarf/DwarfDebugInfoBase.java

@@ -607,4 +607,7 @@ private DwarfTypeProperties addTypeProperties(TypeEntry typeEntry) {
 
     public abstract byte getHeapbaseRegister();
 
+    public abstract boolean isAarch64();
+    public abstract boolean isX86_64();
+
 }

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/dwarf/DwarfSectionImpl.java

@@ -48,7 +48,6 @@
 import com.oracle.objectfile.debuginfo.dwarf.constants.DwarfTag;
 import com.oracle.objectfile.debuginfo.dwarf.constants.DwarfVersion;
 import com.oracle.objectfile.debuginfo.dwarf.DwarfDebugInfoBase.AbbrevCode;
-import com.oracle.objectfile.elf.ELFMachine;
 import com.oracle.objectfile.elf.ELFObjectFile;
 import com.oracle.objectfile.debuginfo.dwarf.constants.DwarfExpressionOpcode;
 import com.oracle.objectfile.debuginfo.dwarf.constants.DwarfFlag;
@@ -135,7 +134,7 @@ public DwarfSectionImpl(DwarfDebugInfo dwarfSections, DwarfSectionName sectionNa
     }
 
     public boolean isAArch64() {
-        return dwarfSections.elfMachine == ELFMachine.AArch64;
+        return dwarfSections.isAarch64();
     }
 
     /**

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/dwarf/constants/DwarfSectionName.java

@@ -26,6 +26,12 @@
 
 package com.oracle.objectfile.debuginfo.dwarf.constants;
 
+import com.oracle.objectfile.macho.dsym.constants.DSYMSectionName;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * Various ELF sections created by GraalVM including all debug info sections. The enum sequence
  * starts with the text section (not defined in the DWARF spec and not created by debug info code).
@@ -50,4 +56,6 @@ public enum DwarfSectionName {
     public String value() {
         return value;
     }
+
+    public static final List<String> debugSections = Arrays.stream(DSYMSectionName.values()).filter(e -> e != DSYMSectionName.TEXT_SECTION).map(e -> e.value()).collect(Collectors.toList());
 }