Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8247516: DSO.closestSymbolToPC() should use dbg.lookup() rather than …
…rely on java ELF file support

Reviewed-by: sspitsyn, ysuenaga
  • Loading branch information
plummercj committed Aug 4, 2020
1 parent 9ec75c9 commit 51a9431735a00d2a60dc817f99528d012697fc2c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 80 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2020, 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
@@ -44,5 +44,9 @@ protected long getAddressValue(Address addr) {
return dbg.getAddressValue(addr);
}

public ClosestSymbol closestSymbolToPC(Address pcAsAddr) throws DebuggerException {
return dbg.lookup(dbg.getAddressValue(pcAsAddr));
}

private BsdDebugger dbg;
}
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2020, 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
@@ -44,5 +44,9 @@ protected long getAddressValue(Address addr) {
return dbg.getAddressValue(addr);
}

public ClosestSymbol closestSymbolToPC(Address pcAsAddr) throws DebuggerException {
return dbg.lookup(dbg.getAddressValue(pcAsAddr));
}

private LinuxDebugger dbg;
}
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2020, 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
@@ -25,48 +25,20 @@

import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.debugger.cdbg.*;
import sun.jvm.hotspot.debugger.posix.elf.*;
import sun.jvm.hotspot.utilities.memo.*;

/** Provides a simple wrapper around the ELF library which handles
relocation. */
public abstract class DSO implements LoadObject {

private MemoizedObject file; // contains ELFFile
private String filename;
private Address addr;
private long size;
private IsDSO dso = new IsDSO();

class IsDSO extends MemoizedBoolean {
protected boolean computeValue() {
return getFile().getHeader().getFileType() == ELFHeader.FT_DYN;
}
};

class ELFFileByName extends MemoizedObject {
protected Object computeValue() {
return ELFFileParser.getParser().parse(DSO.this.filename);
}
};

class ELFFileByAddress extends MemoizedObject {
protected Object computeValue() {
return ELFFileParser.getParser().parse(new AddressDataSource(DSO.this.addr));
}
};

public DSO(String filename, long size, Address relocation) throws ELFException {
public DSO(String filename, long size, Address relocation) {
this.filename = filename;
this.size = size;
this.addr = relocation;
this.file = new ELFFileByName();
}

public DSO(long size, Address relocation) throws ELFException {
this.addr = relocation;
this.size = size;
this.file = new ELFFileByAddress();
}

public String getName() {
@@ -77,17 +49,6 @@ public Address getBase() {
return addr;
}

/** if this .so is unloaded and re-loaded in the same process at a different
base, change the base by calling this to avoid re-parsing the ELF. */
public void setBase(Address newBase) {
addr = newBase;
if (filename == null) {
// ELFFile was created by address. we have to re-parse it.
file = new ELFFileByAddress();
dso = new IsDSO();
}
}

public long getSize() {
return size;
}
@@ -102,39 +63,11 @@ public BlockSym debugInfoForPC(Address pc) throws DebuggerException {
return null;
}

public ClosestSymbol closestSymbolToPC(Address pcAsAddr) throws DebuggerException {
boolean dso = isDSO();
long offset = dso? pcAsAddr.minus(addr) : getAddressValue(pcAsAddr);
ELFSymbol sym = getFile().getHeader().getELFSymbol(offset);
return (sym != null)? createClosestSymbol(sym.getName(), offset - sym.getValue()) : null;
}

public LineNumberInfo lineNumberForPC(Address pc) throws DebuggerException {
// FIXME: after stabs parser
return null;
}

/** return true if file is a .so */
public boolean isDSO() {
return dso.getValue();
}

/** Look up a symbol; returns absolute address or null if symbol was
not found. */
public Address lookupSymbol(String symbol) throws ELFException {
ELFSymbol sym = getFile().getHeader().getELFSymbol(symbol);
if (sym == null) {
return null;
}

long value = sym.getValue();
if (isDSO()) {
return addr.addOffsetTo(value);
} else {
return newAddress(value);
}
}

public boolean equals(Object o) {
if (o == null || !(o instanceof DSO)) {
return false;
@@ -147,14 +80,6 @@ public int hashCode() {
return getBase().hashCode();
}

protected ELFFile getFile() {
return (ELFFile) file.getValue();
}

protected abstract Address newAddress(long addr);
protected abstract long getAddressValue(Address addr);

protected ClosestSymbol createClosestSymbol(String name, long diff) {
return new ClosestSymbol(name, diff);
}
}
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2020, 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
@@ -44,5 +44,9 @@ protected long getAddressValue(Address addr) {
return dbg.getAddressValue(addr);
}

public ClosestSymbol closestSymbolToPC(Address pcAsAddr) throws DebuggerException {
return dbg.lookup(dbg.getAddressValue(pcAsAddr));
}

private ProcDebugger dbg;
}

0 comments on commit 51a9431

Please sign in to comment.