Re: [SCM] master: Add -sysroot option to fhpd.

[Andrew Cagney <cagney@redhat.com>]

Stan,

A few things caught my eye:

scox@sourceware.org wrote:
> +frysk/pkglibdir/funit-addresses-stripped: frysk/pkglibdir/funit-addresses
> +	strip -o $@ frysk/pkglibdir/funit-addresses
> +	mkdir -p `pwd`/frysk/pkglibdir/test-sysroot/`pwd`/frysk/pkglibdir
> +	cp -r `pwd`/frysk/pkglibdir/funit-addresses `pwd`/frysk/pkglibdir/test-sysroot/`pwd`/frysk/pkglibdir
> +	mkdir -p `pwd`/frysk/pkglibdir/test-sysroot/$(realpath $(srcdir))/frysk/pkglibdir
> +	cp -r $(realpath $(srcdir))/frysk/pkglibdir/funit-addresses.c `pwd`/frysk/pkglibdir/test-sysroot/$(realpath $(srcdir))/frysk/pkglibdir
> +	mkdir -p `pwd`/frysk/pkglibdir/test-sysroot/usr/lib/debug/`pwd`/frysk/pkglibdir/
> +	eu-strip --remove-comment -f `pwd`/frysk/pkglibdir/test-sysroot/usr/lib/debug/`pwd`/frysk/pkglibdir/funit-addresses.debug \
> +	`pwd`/frysk/pkglibdir/test-sysroot/`pwd`/frysk/pkglibdir/funit-addresses
>   

Right on; it needs to construct what looks like an installed sysroot so 
that we're testing against how things will appear in a live system.  Two 
extra things to consider though: how to get this data installed; and now 
to have it also built 32-bit.

> diff --git a/frysk-core/frysk/debuginfo/DebugInfoFrame.java b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
> index 8f2229e..f1d8682 100644
> --- a/frysk-core/frysk/debuginfo/DebugInfoFrame.java
> +++ b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
> @@ -48,6 +48,7 @@ import lib.dwfl.Dwfl;
>  import lib.dwfl.DwflDieBias;
>  import lib.dwfl.DwflLine;
>  import frysk.dwfl.DwflCache;
> +import frysk.hpd.DbgVariables;
>  import frysk.rt.LineXXX;
>  import frysk.scopes.SourceLocation;
>  import frysk.scopes.Scope;
> @@ -183,6 +184,13 @@ public class DebugInfoFrame extends FrameDecorator {
>    		    File parent = new File(dwflLine.getCompilationDir());
>    		    f = new File(parent, dwflLine.getSourceFile());
>  		}
> +		else {
> +		    String sysroot = DbgVariables.getStringValue("SYSROOT");
> +		    if (sysroot.length() > 0) {
> +			File parent = new File(sysroot);
> +			f = new File(parent, dwflLine.getSourceFile());
> +		    }
> +		}
>   
I'm not so sure about DebugInfoFrame using hpd to obtain a sysroot; and 
can this be coded to just assume that there's a sysroot ("/" by default)?

Given that the underlying Dwfl knows its sysroot, would it be both 
simpler and more consistent to use that, and to do so internally?  It 
would also remove the need to constantly need to remember to add code 
like the below:

> diff --git a/frysk-core/frysk/hpd/ListCommand.java b/frysk-core/frysk/hpd/ListCommand.java
> index 7b9c4ce..0161144 100644
> --- a/frysk-core/frysk/hpd/ListCommand.java
> +++ b/frysk-core/frysk/hpd/ListCommand.java
> @@ -120,7 +120,13 @@ class ListCommand extends ParameterizedCommand {
>                          }
>  			if (funcDie.getTag().hashCode() == DwTag.SUBPROGRAM_) {
>  			    line = (int)funcDie.getDeclLine();
> -			    file = funcDie.getDeclFile();
> +			    String sysRoot = DbgVariables.getStringValue("SYSROOT");
> +			    if (sysRoot.length() > 0) {
> +				File parent = new File(sysRoot);
> +				file = new File(parent, funcDie.getDeclFile().getName());
> +			    }
> +			    else
> +				file = funcDie.getDeclFile();
>  			}
>  			else {
>  			    cli.addMessage("function " + cmd.parameter(0) + " not found.",
>   

and

> @@ -146,6 +152,11 @@ class ListCommand extends ParameterizedCommand {
>              if (file == null) {
>                  if (frame.getLine() != SourceLocation.UNKNOWN) {
>                      file = (frame.getLine()).getFile();
> +		    String sysRoot = DbgVariables.getStringValue("SYSROOT");
> +		    if (sysRoot.length() > 0) {
> +		      File parent = new File(sysRoot);
> +		      file = new File(parent, file.getAbsolutePath());
> +		    }
>                      if (file == null) {
>                          cli.addMessage("No symbol table is available.",
>                                         Message.TYPE_NORMAL);
>   

where ever a source-file is needed.

Andrew