public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
From: cagney@sourceware.org
To: frysk-cvs@sourceware.org
Subject: [SCM]  master: Replace DwflDieBias with DwflDie <is-a> DwarfDie.
Date: Thu, 05 Jun 2008 18:31:00 -0000	[thread overview]
Message-ID: <20080605183137.20890.qmail@sourceware.org> (raw)

The branch, master has been updated
       via  6c5c57e7c1e887ccedbab85f9da5074e691d44a1 (commit)
      from  300ce92e79941af2698563a87dc82a8c03e296db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 6c5c57e7c1e887ccedbab85f9da5074e691d44a1
Author: Andrew Cagney <cagney@redhat.com>
Date:   Thu Jun 5 14:26:58 2008 -0400

    Replace DwflDieBias with DwflDie <is-a> DwarfDie.
    
    This eliminates the redundant bias field in DwflDieBias - the Die
    has-a DwflModule and that has-a bias.
    
    frysk-core/frysk/debuginfo/ChangeLog
    2008-06-05  Andrew Cagney  <cagney@redhat.com>
    
    	* DebugInfoFrame.java: Use DwflDie.
    	* gen-type-expect-tests.py: Ditto.
    	* TestFrameDebugInfo.java: Ditto.
    	* DebugInfo.java: Ditto.
    
    frysk-core/frysk/expr/ChangeLog
    2008-06-05  Andrew Cagney  <cagney@redhat.com>
    
    	* ExprSearchEngine.java: Use DwflDie.
    
    frysk-core/frysk/rt/ChangeLog
    2008-06-05  Andrew Cagney  <cagney@redhat.com>
    
    	* FunctionBreakpoint.java: Use DwflDie.
    
    frysk-core/frysk/scopes/ChangeLog
    2008-06-05  Andrew Cagney  <cagney@redhat.com>
    
    	* TestDie.java: Use DwflDie.
    	* TestScopeFactory.java: Ditto.
    
    frysk-core/frysk/symtab/ChangeLog
    2008-06-05  Andrew Cagney  <cagney@redhat.com>
    
    	* DwflSymbol.java: Use DwflDie.
    	* SymbolFactory.java: Ditto.
    
    frysk-sys/lib/dwfl/ChangeLog
    2008-06-05  Andrew Cagney  <cagney@redhat.com>
    
    	* DwflDie.java: Replace DwflDieBias.java; extends DwarfDie.
    	* DwarfDieFactory.java (makeDwflDie(long,DwflModule)): New.
    	* DwarfDie.java: Simplify.
    	* Dwfl.java: Update.
    	* TestDwarfDie.java: Update.
    	* TestDwfl.java: Update.
    	* jni/DwflModule.cxx: Update.
    	* cni/DwflModule.cxx: Update.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/debuginfo/ChangeLog               |    7 ++++
 frysk-core/frysk/debuginfo/DebugInfo.java          |    8 ++--
 frysk-core/frysk/debuginfo/DebugInfoFrame.java     |   10 +++---
 frysk-core/frysk/debuginfo/TestFrameDebugInfo.java |   10 +++---
 .../frysk/debuginfo/gen-type-expect-tests.py       |    8 ++--
 frysk-core/frysk/expr/ChangeLog                    |    4 ++
 frysk-core/frysk/expr/ExprSearchEngine.java        |   10 +++---
 frysk-core/frysk/rt/ChangeLog                      |    4 ++
 frysk-core/frysk/rt/FunctionBreakpoint.java        |   14 ++++----
 frysk-core/frysk/scopes/ChangeLog                  |    5 +++
 frysk-core/frysk/scopes/TestDie.java               |   10 +++---
 frysk-core/frysk/scopes/TestScopeFactory.java      |   10 +++---
 frysk-core/frysk/symtab/ChangeLog                  |    5 +++
 frysk-core/frysk/symtab/DwflSymbol.java            |   10 +++---
 frysk-core/frysk/symtab/SymbolFactory.java         |   16 +++++-----
 frysk-sys/lib/dwfl/ChangeLog                       |    9 ++++++
 frysk-sys/lib/dwfl/DwarfDie.java                   |    8 ++--
 frysk-sys/lib/dwfl/DwarfDieFactory.java            |    5 ++-
 frysk-sys/lib/dwfl/Dwfl.java                       |    2 +-
 .../lib/dwfl/{DwflDieBias.java => DwflDie.java}    |   31 ++++++++++---------
 frysk-sys/lib/dwfl/DwflModule.java                 |    6 +--
 frysk-sys/lib/dwfl/TestDwarfDie.java               |   24 ++++++---------
 frysk-sys/lib/dwfl/TestDwfl.java                   |   12 ++-----
 frysk-sys/lib/dwfl/cni/DwflModule.cxx              |    6 ++--
 frysk-sys/lib/dwfl/jni/DwflModule.cxx              |   11 ++----
 25 files changed, 134 insertions(+), 111 deletions(-)
 rename frysk-sys/lib/dwfl/{DwflDieBias.java => DwflDie.java} (79%)

First 500 lines of diff:
diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
index b6a1ad5..7102c0c 100644
--- a/frysk-core/frysk/debuginfo/ChangeLog
+++ b/frysk-core/frysk/debuginfo/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-05  Andrew Cagney  <cagney@redhat.com>
+
+	* DebugInfoFrame.java: Use DwflDie.
+	* gen-type-expect-tests.py: Ditto.
+	* TestFrameDebugInfo.java: Ditto.
+	* DebugInfo.java: Ditto.
+
 2008-06-02  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	* TestFrameDebugInfo.java (testVirtualStackTraceWithLocals): New test.
diff --git a/frysk-core/frysk/debuginfo/DebugInfo.java b/frysk-core/frysk/debuginfo/DebugInfo.java
index adff272..6233314 100644
--- a/frysk-core/frysk/debuginfo/DebugInfo.java
+++ b/frysk-core/frysk/debuginfo/DebugInfo.java
@@ -52,7 +52,7 @@ import lib.dwfl.DwarfException;
 import lib.dwfl.Dwfl;
 import lib.dwfl.DwTag;
 import lib.dwfl.DwAt;
-import lib.dwfl.DwflDieBias;
+import lib.dwfl.DwflDie;
 import lib.dwfl.Elf;
 import lib.dwfl.ElfCommand;
 import java.io.File;
@@ -85,14 +85,14 @@ public class DebugInfo {
     public String what(DebugInfoFrame frame, String sInput) {
 	long pc = frame.getAdjustedAddress();
 	Dwfl dwfl = DwflCache.getDwfl(frame.getTask());
-	DwflDieBias bias = dwfl.getCompilationUnit(pc);
+	DwflDie bias = dwfl.getCompilationUnit(pc);
 	TypeFactory typeFactory = new TypeFactory(frame.getTask().getISA());
 	if (bias == null)
 	    throw new RuntimeException("No symbol table is available.");
-	DwarfDie die = bias.die;
+	DwarfDie die = bias;
 	StringBuffer result = new StringBuffer();
 
-	DwarfDie[] allDies = die.getScopes(pc - bias.bias);
+	DwarfDie[] allDies = die.getScopes(pc - bias.getBias());
 	DwarfDie varDie = die.getScopeVar(allDies, sInput);
 	if (varDie == null) {
 	    varDie = DwarfDie.getDecl(dwarf, sInput);
diff --git a/frysk-core/frysk/debuginfo/DebugInfoFrame.java b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
index 39305e6..02ecdca 100644
--- a/frysk-core/frysk/debuginfo/DebugInfoFrame.java
+++ b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
@@ -45,7 +45,7 @@ import java.util.LinkedList;
 
 import lib.dwfl.DwarfDie;
 import lib.dwfl.Dwfl;
-import lib.dwfl.DwflDieBias;
+import lib.dwfl.DwflDie;
 import frysk.dwfl.DwflCache;
 import frysk.rt.LineXXX;
 import frysk.scopes.Function;
@@ -87,11 +87,11 @@ public class DebugInfoFrame extends FrameDecorator {
 	
 	if (scope == null) {
 	    Dwfl dwfl = DwflCache.getDwfl(this.getTask());
-	    DwflDieBias bias = dwfl.getCompilationUnit(getAdjustedAddress());
+	    DwflDie bias = dwfl.getCompilationUnit(getAdjustedAddress());
 
 	    if (bias != null) {
 
-		DwarfDie[] scopes = bias.die.getScopes(getAdjustedAddress());
+		DwarfDie[] scopes = bias.getScopes(getAdjustedAddress());
 		
 		if (scopes.length == 0) {
 		    return null;
@@ -133,11 +133,11 @@ public class DebugInfoFrame extends FrameDecorator {
 	  this.inlinedSubprograms = new LinkedList();
 	  
         Dwfl dwfl = DwflCache.getDwfl(this.getTask());
-        DwflDieBias bias = dwfl.getCompilationUnit(getAdjustedAddress());
+        DwflDie bias = dwfl.getCompilationUnit(getAdjustedAddress());
 
         if (bias != null) {
 
-            DwarfDie[] scopes = bias.die.getScopes(getAdjustedAddress());
+            DwarfDie[] scopes = bias.getScopes(getAdjustedAddress());
             
             if(scopes.length == 0){
         	return inlinedSubprograms;
diff --git a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java
index 3764416..de6041f 100644
--- a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java
+++ b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java
@@ -49,7 +49,7 @@ import javax.naming.NameNotFoundException;
 import lib.dwfl.DwTag;
 import lib.dwfl.DwarfDie;
 import lib.dwfl.Dwfl;
-import lib.dwfl.DwflDieBias;
+import lib.dwfl.DwflDie;
 import frysk.dwfl.DwflCache;
 import frysk.proc.Task;
 import frysk.scopes.Function;
@@ -183,8 +183,8 @@ public class TestFrameDebugInfo extends TestLib {
     Frame frame = StackFactory.createFrame(task);
     
     Dwfl dwfl = DwflCache.getDwfl(task);
-    DwflDieBias bias = dwfl.getCompilationUnit(frame.getAdjustedAddress());
-    DwarfDie[] scopes = bias.die.getScopes(frame.getAdjustedAddress() - bias.bias);
+    DwflDie bias = dwfl.getCompilationUnit(frame.getAdjustedAddress());
+    DwarfDie[] scopes = bias.getScopes(frame.getAdjustedAddress() - bias.getBias());
     
     assertEquals("number of scopes", 3, scopes.length);
     
@@ -247,8 +247,8 @@ public class TestFrameDebugInfo extends TestLib {
     Frame frame = StackFactory.createFrame(task);
     
     Dwfl dwfl = DwflCache.getDwfl(task);
-    DwflDieBias bias = dwfl.getCompilationUnit(frame.getAdjustedAddress());
-    DwarfDie[] scopes = bias.die.getScopes(frame.getAdjustedAddress() - bias.bias);
+    DwflDie bias = dwfl.getCompilationUnit(frame.getAdjustedAddress());
+    DwarfDie[] scopes = bias.getScopes(frame.getAdjustedAddress() - bias.getBias());
     scopes = scopes[0].getScopesDie();
     
     assertEquals("number of scopes", 4, scopes.length);
diff --git a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py
index 0a36801..fcccf54 100644
--- a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py
+++ b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py
@@ -58,7 +58,7 @@ package frysk.debuginfo;
 import java.io.*;
 import lib.dwfl.DwarfDie;
 import lib.dwfl.Dwfl;
-import lib.dwfl.DwflDieBias;
+import lib.dwfl.DwflDie;
 import frysk.dwfl.DwflCache;
 import frysk.proc.Task;
 import frysk.testbed.DaemonBlockedAtSignal;
@@ -84,9 +84,9 @@ public class %s extends TestLib {
             frame = DebugInfoStackFactory.createDebugInfoStackTrace(task);
 	    long pc = frame.getAdjustedAddress();
 	    Dwfl dwfl = DwflCache.getDwfl(frame.getTask());
-	    DwflDieBias bias = dwfl.getCompilationUnit(pc);
-	    die = bias.die;
-	    allDies = die.getScopes(pc - bias.bias);
+	    DwflDie bias = dwfl.getCompilationUnit(pc);
+	    die = bias;
+	    allDies = die.getScopes(pc - bias.getBias());
 	    typeFactory = new TypeFactory(frame.getTask().getISA());
 	    this.testName = testName;
 	}
diff --git a/frysk-core/frysk/expr/ChangeLog b/frysk-core/frysk/expr/ChangeLog
index 097137a..05854e7 100644
--- a/frysk-core/frysk/expr/ChangeLog
+++ b/frysk-core/frysk/expr/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-05  Andrew Cagney  <cagney@redhat.com>
+
+	* ExprSearchEngine.java: Use DwflDie.
+
 2008-06-04  Petr Machata  <pmachata@redhat.com>
 
 	* FQIdentToken.java (processId, threadId, frameNumber): New fields.
diff --git a/frysk-core/frysk/expr/ExprSearchEngine.java b/frysk-core/frysk/expr/ExprSearchEngine.java
index 7be7f93..6431a34 100644
--- a/frysk-core/frysk/expr/ExprSearchEngine.java
+++ b/frysk-core/frysk/expr/ExprSearchEngine.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2007, Red Hat Inc.
+// Copyright 2007, 2008, Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ import java.util.List;
 
 import lib.dwfl.DwarfDie;
 import lib.dwfl.Dwfl;
-import lib.dwfl.DwflDieBias;
+import lib.dwfl.DwflDie;
 
 import frysk.debuginfo.DebugInfoFrame;
 import frysk.debuginfo.ObjectDeclarationSearchEngine;
@@ -106,9 +106,9 @@ public class ExprSearchEngine extends ObjectDeclarationSearchEngine implements E
     public void complete(String incomplete, List candidates) {
 	long pc = frame.getAdjustedAddress();
 	Dwfl dwfl = DwflCache.getDwfl(frame.getTask());
-	DwflDieBias bias = dwfl.getCompilationUnit(pc);
-	DwarfDie die = bias.die;
-	DwarfDie[] allDies = die.getScopes(pc - bias.bias);
+	DwflDie bias = dwfl.getCompilationUnit(pc);
+	DwarfDie die = bias;
+	DwarfDie[] allDies = die.getScopes(pc - bias.getBias());
 	List candidates_p = die.getScopeVarNames(allDies, incomplete);
 	for (Iterator i = candidates_p.iterator(); i.hasNext();) {
             String sNext = (String) i.next();
diff --git a/frysk-core/frysk/rt/ChangeLog b/frysk-core/frysk/rt/ChangeLog
index 0ff2215..206bab1 100644
--- a/frysk-core/frysk/rt/ChangeLog
+++ b/frysk-core/frysk/rt/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-05  Andrew Cagney  <cagney@redhat.com>
+
+	* FunctionBreakpoint.java: Use DwflDie.
+
 2008-06-03  Andrew Cagney  <cagney@redhat.com>
 
 	* FunctionBreakpoint.java: Do not use InlinedSubroutine.
diff --git a/frysk-core/frysk/rt/FunctionBreakpoint.java b/frysk-core/frysk/rt/FunctionBreakpoint.java
index 70af21d..b7141a5 100644
--- a/frysk-core/frysk/rt/FunctionBreakpoint.java
+++ b/frysk-core/frysk/rt/FunctionBreakpoint.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2007, Red Hat Inc.
+// Copyright 2007, 2008, Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.ListIterator;
 import lib.dwfl.DwarfDie;
-import lib.dwfl.DwflDieBias;
+import lib.dwfl.DwflDie;
 import frysk.proc.Task;
 import frysk.scopes.ConcreteInlinedFunction;
 import frysk.scopes.Function;
@@ -57,7 +57,7 @@ import frysk.value.ObjectDeclaration;
 public class FunctionBreakpoint
   extends SourceBreakpoint {
     protected final String name;
-    protected final DwflDieBias die;
+    protected final DwflDie die;
 
     private boolean containsInlineInstances = false;
     private Function function;
@@ -65,7 +65,7 @@ public class FunctionBreakpoint
     /**
      * Set a breakpoint based on a DwarfDie or just a name.
      */
-    public FunctionBreakpoint(int id, String name, DwflDieBias die) {
+    public FunctionBreakpoint(int id, String name, DwflDie die) {
         super(id);
         this.name = name;
         this.die = die;
@@ -105,10 +105,10 @@ public class FunctionBreakpoint
 	//XXX: this code should be removed
 	// die is not used any more
 	if (die != null) {
-	    ArrayList entryAddrs = die.getEntryBreakpoints();
+	    ArrayList entryAddrs = die.getBiasedEntryBreakpoints();
 	    ArrayList inlineDies = null;
-	    if (die.die.isInlineDeclaration()) {
-		inlineDies = die.die.getInlinedInstances();
+	    if (die.isInlineDeclaration()) {
+		inlineDies = die.getInlinedInstances();
 	    }
 	    LinkedList addrs;
 	    if (entryAddrs == null)
diff --git a/frysk-core/frysk/scopes/ChangeLog b/frysk-core/frysk/scopes/ChangeLog
index 74ffefd..cdf45a1 100644
--- a/frysk-core/frysk/scopes/ChangeLog
+++ b/frysk-core/frysk/scopes/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-05  Andrew Cagney  <cagney@redhat.com>
+
+	* TestDie.java: Use DwflDie.
+	* TestScopeFactory.java: Ditto.
+
 2008-06-02  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	* Function.java: Now explores referenced dies.
diff --git a/frysk-core/frysk/scopes/TestDie.java b/frysk-core/frysk/scopes/TestDie.java
index 775d5fb..44bf505 100644
--- a/frysk-core/frysk/scopes/TestDie.java
+++ b/frysk-core/frysk/scopes/TestDie.java
@@ -45,7 +45,7 @@ import lib.dwfl.DwAt;
 import lib.dwfl.DwTag;
 import lib.dwfl.DwarfDie;
 import lib.dwfl.Dwfl;
-import lib.dwfl.DwflDieBias;
+import lib.dwfl.DwflDie;
 import lib.dwfl.DwflModule;
 import frysk.config.Prefix;
 import frysk.debuginfo.DebugInfoFrame;
@@ -112,13 +112,13 @@ public class TestDie
 	
 	assertEquals("Size of pubnames ", 3, pubnames.size());
 	
-	DwarfDie die = ((DwflDieBias) iterator.next()).die;
+	DwarfDie die = (DwflDie) iterator.next();
 	assertEquals("Die name", "crash", die.getName());
 	
-	die = ((DwflDieBias) iterator.next()).die;
+	die = (DwflDie) iterator.next();
 	assertEquals("Die name", "main", die.getName());
 	
-	die = ((DwflDieBias) iterator.next()).die;
+	die = (DwflDie) iterator.next();
 	assertEquals("Die name", "static_i", die.getName());
     }
 
@@ -130,7 +130,7 @@ public class TestDie
 	long pc = frame.getAdjustedAddress();
 	
 	Dwfl dwfl = DwflCache.getDwfl(task);
-	DwarfDie cu = dwfl.getCompilationUnit(pc).die;
+	DwarfDie cu = dwfl.getCompilationUnit(pc);
 	DwarfDie[] scopes = cu.getScopes(pc);
 	DwarfDie die = null;
 	
diff --git a/frysk-core/frysk/scopes/TestScopeFactory.java b/frysk-core/frysk/scopes/TestScopeFactory.java
index d10c374..df34c16 100644
--- a/frysk-core/frysk/scopes/TestScopeFactory.java
+++ b/frysk-core/frysk/scopes/TestScopeFactory.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2007, Red Hat Inc.
+// Copyright 2007, 2008, Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ package frysk.scopes;
 
 import lib.dwfl.DwarfDie;
 import lib.dwfl.Dwfl;
-import lib.dwfl.DwflDieBias;
+import lib.dwfl.DwflDie;
 import frysk.debuginfo.TypeFactory;
 import frysk.dwfl.DwflCache;
 import frysk.proc.Task;
@@ -59,8 +59,8 @@ public class TestScopeFactory
       Frame frame = StackFactory.createFrame(task);
       
       Dwfl dwfl = DwflCache.getDwfl(task);
-      DwflDieBias bias = dwfl.getCompilationUnit(frame.getAdjustedAddress());
-      DwarfDie[] scopes = bias.die.getScopes(frame.getAdjustedAddress() - bias.bias);
+      DwflDie bias = dwfl.getCompilationUnit(frame.getAdjustedAddress());
+      DwarfDie[] scopes = bias.getScopes(frame.getAdjustedAddress() - bias.getBias());
 
       TypeFactory typeFactory = new TypeFactory(frame.getTask().getISA());
       
@@ -78,7 +78,7 @@ public class TestScopeFactory
 
       // test scopes from outer frame
       frame = frame.getOuter();
-      scopes = bias.die.getScopes(frame.getAdjustedAddress() - bias.bias);
+      scopes = bias.getScopes(frame.getAdjustedAddress() - bias.getBias());
 
       Scope scope7 = ScopeFactory.theFactory.getScope(scopes[0], typeFactory);
       Scope scope8 = ScopeFactory.theFactory.getScope(scopes[0], typeFactory);
diff --git a/frysk-core/frysk/symtab/ChangeLog b/frysk-core/frysk/symtab/ChangeLog
index 16ebe6f..ba96d4e 100644
--- a/frysk-core/frysk/symtab/ChangeLog
+++ b/frysk-core/frysk/symtab/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-05  Andrew Cagney  <cagney@redhat.com>
+
+	* DwflSymbol.java: Use DwflDie.
+	* SymbolFactory.java: Ditto.
+
 2008-05-07  Petr Machata  <pmachata@redhat.com>
 
 	* DwflSymbol.java: The symbol can now be defined or
diff --git a/frysk-core/frysk/symtab/DwflSymbol.java b/frysk-core/frysk/symtab/DwflSymbol.java
index c310862..e5931a4 100644
--- a/frysk-core/frysk/symtab/DwflSymbol.java
+++ b/frysk-core/frysk/symtab/DwflSymbol.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2007, Red Hat Inc.
+// Copyright 2007, 2008, Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -45,19 +45,19 @@ package frysk.symtab;
  */
 
 import lib.dwfl.ElfSymbolType;
-import lib.dwfl.DwflDieBias;
+import lib.dwfl.DwflDie;
 import lib.dwfl.DwflModule;
 
 public class DwflSymbol
     extends Symbol
 {
-    private final DwflDieBias dieBias;
+    private final DwflDie dieBias;
     private final DwflModule dwflModule;
     private final boolean defined;
 
     // package private constructor.
     DwflSymbol(long address, long size, String name,
-	       ElfSymbolType type, DwflDieBias dieBias, DwflModule module,
+	       ElfSymbolType type, DwflDie dieBias, DwflModule module,
 	       boolean defined)
     {
 	super (address, size, name, type);
@@ -70,7 +70,7 @@ public class DwflSymbol
 	return this.dwflModule;
     }
 
-    public DwflDieBias getDie() {
+    public DwflDie getDie() {
 	return this.dieBias;
     }
 
diff --git a/frysk-core/frysk/symtab/SymbolFactory.java b/frysk-core/frysk/symtab/SymbolFactory.java
index e335f3a..16d5f66 100644
--- a/frysk-core/frysk/symtab/SymbolFactory.java
+++ b/frysk-core/frysk/symtab/SymbolFactory.java
@@ -1,7 +1,7 @@
 // This file is part of the program FRYSK.
 //
+// Copyright 2007, 2008, Red Hat Inc.
 // Copyright 2007 Oracle Corporation.
-// Copyright 2007, Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@ import frysk.rsl.LogFactory;
 
 import lib.dwfl.DwarfDie;
 import lib.dwfl.Dwfl;
-import lib.dwfl.DwflDieBias;
+import lib.dwfl.DwflDie;
 import lib.dwfl.DwflModule;
 import lib.dwfl.SymbolBuilder;
 
@@ -118,8 +118,8 @@ public class SymbolFactory
     private static Map getPublicTable(final DwflModule module) {
 	final Map dwSymbols = new HashMap();
 	for (Iterator it = module.getPubNames().iterator(); it.hasNext(); ) {
-	    DwflDieBias dieBias = (DwflDieBias)it.next();
-	    dwSymbols.put(dieBias.die.getName(), dieBias);
+	    DwflDie dieBias = (DwflDie)it.next();
+	    dwSymbols.put(dieBias.getName(), dieBias);
 	}
 	return dwSymbols;
     }
@@ -136,8 +136,8 @@ public class SymbolFactory
 				   lib.dwfl.ElfSymbolVisibility visibility,
 				   boolean defined)
 		{
-		    DwflDieBias dieBias = publicTable == null ? null
-			: (DwflDieBias)publicTable.get(name);
+		    DwflDie dieBias = publicTable == null ? null
+			: (DwflDie)publicTable.get(name);
 		    int index;
 		    if ((index = name.indexOf('@')) != -1)
 			name = name.substring(0, index);
@@ -157,8 +157,8 @@ public class SymbolFactory
 	    Map.Entry entry = (Map.Entry)it.next();
 	    String name = (String)entry.getKey();
 	    if (!table.containsKey(name)) {
-		DwflDieBias dieBias = (DwflDieBias)entry.getValue();
-		DwarfDie die = dieBias.die;
+		DwflDie dieBias = (DwflDie)entry.getValue();
+		DwarfDie die = dieBias;
 		ArrayList entries = die.getEntryBreakpoints();
 		if (entries != null) {
 		    long addr = ((Long)entries.get(0)).longValue();
diff --git a/frysk-sys/lib/dwfl/ChangeLog b/frysk-sys/lib/dwfl/ChangeLog
index 4f85078..e6ff387 100644
--- a/frysk-sys/lib/dwfl/ChangeLog
+++ b/frysk-sys/lib/dwfl/ChangeLog
@@ -1,5 +1,14 @@
 2008-06-05  Andrew Cagney  <cagney@redhat.com>
 
+	* DwflDie.java: Replace DwflDieBias.java; extends DwarfDie.
+	* DwarfDieFactory.java (makeDwflDie(long,DwflModule)): New.
+	* DwarfDie.java: Simplify.
+	* Dwfl.java: Update.
+	* TestDwarfDie.java: Update.
+	* TestDwfl.java: Update.
+	* jni/DwflModule.cxx: Update.
+	* cni/DwflModule.cxx: Update.
+
 	* Dwarf.java (Dwarf(long)): Remember that the pointer isn't owned.
 	(finalize()): Check that the pointer is owned.
 	* Dwfl.java (dwfl_addrdie(long)): Delete.
diff --git a/frysk-sys/lib/dwfl/DwarfDie.java b/frysk-sys/lib/dwfl/DwarfDie.java
index 4fca5ea..a54556e 100644
--- a/frysk-sys/lib/dwfl/DwarfDie.java
+++ b/frysk-sys/lib/dwfl/DwarfDie.java
@@ -50,7 +50,8 @@ public class DwarfDie {
     private long pointer;
     private DwarfDie[] scopes;
     private int scopeIndex;
-    private DwflModule module;
+    // XXX: Belongs in DwflDie.
+    DwflModule module;
 
     protected boolean manageDie = false;
   
@@ -444,9 +445,8 @@ public class DwarfDie {
 	// try to find the definition 
 	// try using pubnames


hooks/post-receive
--
frysk system monitor/debugger


                 reply	other threads:[~2008-06-05 18:31 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080605183137.20890.qmail@sourceware.org \
    --to=cagney@sourceware.org \
    --cc=frysk-cvs@sourceware.org \
    --cc=frysk@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).