From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7991 invoked by alias); 20 May 2008 17:19:26 -0000 Received: (qmail 7964 invoked by uid 9561); 20 May 2008 17:19:25 -0000 Date: Tue, 20 May 2008 17:19:00 -0000 Message-ID: <20080520171925.7949.qmail@sourceware.org> From: swagiaal@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: frysk-core/frysk/debuginfo/ChangeLog X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 1f4adac698d83a3e1f35b2272afc3a0dd34cc956 X-Git-Newrev: 73d257dda14d543954b156e4b5ecbb20312cc0b0 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00254.txt.bz2 The branch, master has been updated via 73d257dda14d543954b156e4b5ecbb20312cc0b0 (commit) from 1f4adac698d83a3e1f35b2272afc3a0dd34cc956 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 73d257dda14d543954b156e4b5ecbb20312cc0b0 Author: Sami Wagiaalla Date: Fri May 16 11:31:33 2008 -0400 frysk-core/frysk/debuginfo/ChangeLog +2008-05-16 Sami Wagiaalla + + * ObjectDeclarationSearchEngine.java (getObjectInScope): Added + frame requirement. + * TestGccClass.java: Updated. + * TestAddress.java: Updated. + * TestGccInterface.java: Updated. + * TestObjectDeclarationSearchEngine.java: Updated. + frysk-core/frysk/expr/ChangeLog +2008-05-16 Sami Wagiaalla + + Added frame requirement to + ObjectDeclarationSearchEngine.getObjectInScope() + * ExprSymTab.java: Updated. + * ScratchSymTab.java: Updated. + * TestbedSymTab.java: Updated. + frysk-core/frysk/scopes/ChangeLog +2008-05-16 Sami Wagiaalla + + Added frame requirement to + ObjectDeclarationSearchEngine.getObjectInScope() + * TestDie.java: Updated. + ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/debuginfo/ChangeLog | 9 +++++++++ .../debuginfo/ObjectDeclarationSearchEngine.java | 4 ++-- frysk-core/frysk/debuginfo/TestAddress.java | 4 ++-- frysk-core/frysk/debuginfo/TestGccClass.java | 2 +- frysk-core/frysk/debuginfo/TestGccInterface.java | 2 +- .../TestObjectDeclarationSearchEngine.java | 10 +++++----- frysk-core/frysk/expr/ChangeLog | 8 ++++++++ frysk-core/frysk/expr/ExprSymTab.java | 3 ++- frysk-core/frysk/expr/ScratchSymTab.java | 3 ++- frysk-core/frysk/expr/TestbedSymTab.java | 3 ++- frysk-core/frysk/scopes/ChangeLog | 6 ++++++ frysk-core/frysk/scopes/TestDie.java | 2 +- 12 files changed, 41 insertions(+), 15 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog index 93715b6..b7b84ed 100644 --- a/frysk-core/frysk/debuginfo/ChangeLog +++ b/frysk-core/frysk/debuginfo/ChangeLog @@ -1,3 +1,12 @@ +2008-05-16 Sami Wagiaalla + + * ObjectDeclarationSearchEngine.java (getObjectInScope): Added + frame requirement. + * TestGccClass.java: Updated. + * TestAddress.java: Updated. + * TestGccInterface.java: Updated. + * TestObjectDeclarationSearchEngine.java: Updated. + 2008-05-15 Sami Wagiaalla * TestObjectDeclarationSearchEngine.java diff --git a/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java b/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java index 73833d1..c868648 100644 --- a/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java +++ b/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java @@ -152,7 +152,7 @@ public class ObjectDeclarationSearchEngine implements ExprSymTab{ * in scope. The scope is decided by the current frame * object. */ - public ObjectDeclaration getObjectInScope(String name){ + public ObjectDeclaration getObjectInScope(DebugInfoFrame frame, String name){ ObjectDeclaration declaredObject = null; Scope scope = frame.getScopes(); @@ -223,7 +223,7 @@ public class ObjectDeclarationSearchEngine implements ExprSymTab{ return new Value(reg.getType(), new PieceLocation(pieces)); } - ObjectDeclaration objectDeclaration = this.getObjectInScope(s); + ObjectDeclaration objectDeclaration = this.getObjectInScope(frame, s); return objectDeclaration.getValue(frame); } diff --git a/frysk-core/frysk/debuginfo/TestAddress.java b/frysk-core/frysk/debuginfo/TestAddress.java index 426c1b1..fa58830 100644 --- a/frysk-core/frysk/debuginfo/TestAddress.java +++ b/frysk-core/frysk/debuginfo/TestAddress.java @@ -83,7 +83,7 @@ public class TestAddress /* Evaluate the location of the variable. */ - Variable var = (Variable) declarationSearchEngine.getObjectInScope(variable); + Variable var = (Variable) declarationSearchEngine.getObjectInScope(frame, variable); DwarfDie varDie = var.getVariableDie(); List ops = varDie.getFormData(frame.getAdjustedAddress()); LocationExpression locExpr = new LocationExpression(varDie); @@ -92,7 +92,7 @@ public class TestAddress /* Get the value of the address. */ - Variable addr = (Variable) declarationSearchEngine.getObjectInScope(address); + Variable addr = (Variable) declarationSearchEngine.getObjectInScope(frame, address); DwarfDie addrDie = addr.getVariableDie(); List opsAddr = addrDie.getFormData(frame.getAdjustedAddress()); LocationExpression locExprAddr = new LocationExpression( diff --git a/frysk-core/frysk/debuginfo/TestGccClass.java b/frysk-core/frysk/debuginfo/TestGccClass.java index d50add4..dbdbb16 100644 --- a/frysk-core/frysk/debuginfo/TestGccClass.java +++ b/frysk-core/frysk/debuginfo/TestGccClass.java @@ -68,7 +68,7 @@ public class TestGccClass extends TestCase { log.log(this, "Got search engine: ", objectDeclarationSearchEngine); Variable variable = (Variable) objectDeclarationSearchEngine - .getObjectInScope(variableName); + .getObjectInScope(frame, variableName); assertNotNull("Variable found", variable); diff --git a/frysk-core/frysk/debuginfo/TestGccInterface.java b/frysk-core/frysk/debuginfo/TestGccInterface.java index 27f8f1a..63348c7 100644 --- a/frysk-core/frysk/debuginfo/TestGccInterface.java +++ b/frysk-core/frysk/debuginfo/TestGccInterface.java @@ -59,7 +59,7 @@ public class TestGccInterface extends TestLib { frame); Variable variable = (Variable) objectDeclarationSearchEngine - .getObjectInScope(variableName); + .getObjectInScope(frame, variableName); assertNotNull("Variable found", variable); diff --git a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java index bd08e49..0678bbc 100644 --- a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java +++ b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java @@ -125,7 +125,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{ DebugInfoFrame frame = DebugInfoStackFactory.createVirtualStackTrace(task); objectDeclarationSearchEngine = new ObjectDeclarationSearchEngine(frame); - ObjectDeclaration declaredObject = objectDeclarationSearchEngine.getObjectInScope(variableName); + ObjectDeclaration declaredObject = objectDeclarationSearchEngine.getObjectInScope(frame, variableName); assertEquals("Object has the correct name", declaredObject.getName(), variableName); @@ -188,7 +188,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{ Task task = (new DaemonBlockedAtSignal(fileName)).getMainTask(); DebugInfoFrame frame = DebugInfoStackFactory.createVirtualStackTrace(task); objectDeclarationSearchEngine = new ObjectDeclarationSearchEngine(frame); - ObjectDeclaration objectDeclaration = (ObjectDeclaration) objectDeclarationSearchEngine.getObjectInScope(variableName); + ObjectDeclaration objectDeclaration = (ObjectDeclaration) objectDeclarationSearchEngine.getObjectInScope(frame, variableName); assertNotNull("Variable found", objectDeclaration); assertEquals("Correct name", variableName, objectDeclaration.getName() ); @@ -196,7 +196,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{ //Negative test: try { - objectDeclaration = (Variable) objectDeclarationSearchEngine.getObjectInScope("NOT"+variableName); + objectDeclaration = (Variable) objectDeclarationSearchEngine.getObjectInScope(frame, "NOT"+variableName); assertTrue("Exception was not thrown", false); } catch (ObjectDeclarationNotFoundException e) { // exception was thrown @@ -232,7 +232,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{ DebugInfoFrame frame = DebugInfoStackFactory.createVirtualStackTrace(task); assertNotNull("frame object created", frame); objectDeclarationSearchEngine = new ObjectDeclarationSearchEngine(frame); - ObjectDeclaration objectDeclaration = (ObjectDeclaration) objectDeclarationSearchEngine.getObjectInScope(variableName); + ObjectDeclaration objectDeclaration = (ObjectDeclaration) objectDeclarationSearchEngine.getObjectInScope(frame, variableName); assertNotNull("Variable found", objectDeclaration); assertEquals("Correct name", variableName, objectDeclaration.getName() ); @@ -240,7 +240,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{ //Negative test: try { - objectDeclaration = (Variable) objectDeclarationSearchEngine.getObjectInScope("NOT"+variableName); + objectDeclaration = (Variable) objectDeclarationSearchEngine.getObjectInScope(frame, "NOT"+variableName); assertTrue("Exception was not thrown", false); } catch (ObjectDeclarationNotFoundException e) { // exception was thrown diff --git a/frysk-core/frysk/expr/ChangeLog b/frysk-core/frysk/expr/ChangeLog index 5f29d65..a0c6a2e 100644 --- a/frysk-core/frysk/expr/ChangeLog +++ b/frysk-core/frysk/expr/ChangeLog @@ -1,3 +1,11 @@ +2008-05-16 Sami Wagiaalla + + Added frame requirement to + ObjectDeclarationSearchEngine.getObjectInScope() + * ExprSymTab.java: Updated. + * ScratchSymTab.java: Updated. + * TestbedSymTab.java: Updated. + 2008-04-24 Stan Cox * package.html: New file. diff --git a/frysk-core/frysk/expr/ExprSymTab.java b/frysk-core/frysk/expr/ExprSymTab.java index adfa122..cd97770 100644 --- a/frysk-core/frysk/expr/ExprSymTab.java +++ b/frysk-core/frysk/expr/ExprSymTab.java @@ -44,6 +44,7 @@ import inua.eio.ByteOrder; import java.util.List; +import frysk.debuginfo.DebugInfoFrame; import frysk.value.ObjectDeclaration; import frysk.value.Value; @@ -56,7 +57,7 @@ public interface ExprSymTab /** * Lookup S, assuming S is a variable. */ - ObjectDeclaration getObjectInScope(String s); + ObjectDeclaration getObjectInScope(DebugInfoFrame frame, String s); /** * The byte order to use when creating new values. */ diff --git a/frysk-core/frysk/expr/ScratchSymTab.java b/frysk-core/frysk/expr/ScratchSymTab.java index 876a053..6d69620 100644 --- a/frysk-core/frysk/expr/ScratchSymTab.java +++ b/frysk-core/frysk/expr/ScratchSymTab.java @@ -43,6 +43,7 @@ import inua.eio.ByteBuffer; import inua.eio.ByteOrder; import java.util.List; import frysk.config.Host; +import frysk.debuginfo.DebugInfoFrame; import frysk.value.ObjectDeclaration; import frysk.value.Type; import frysk.value.Value; @@ -58,7 +59,7 @@ public class ScratchSymTab implements ExprSymTab { /** * Lookup S, assuming S is a variable. */ - public ObjectDeclaration getObjectInScope(String s) { + public ObjectDeclaration getObjectInScope(DebugInfoFrame frame, String s) { throw new RuntimeException("no variables"); } /** diff --git a/frysk-core/frysk/expr/TestbedSymTab.java b/frysk-core/frysk/expr/TestbedSymTab.java index 9453aef..b01806b 100644 --- a/frysk-core/frysk/expr/TestbedSymTab.java +++ b/frysk-core/frysk/expr/TestbedSymTab.java @@ -46,6 +46,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import frysk.config.Host; +import frysk.debuginfo.DebugInfoFrame; import frysk.scopes.SourceLocation; import frysk.value.ClassType; import frysk.value.ObjectDeclaration; @@ -94,7 +95,7 @@ class TestbedSymTab implements ExprSymTab { /** * Lookup S, assuming S is a variable. */ - public ObjectDeclaration getObjectInScope(String s) { + public ObjectDeclaration getObjectInScope(DebugInfoFrame frame, String s) { throw new RuntimeException("no variables"); } /** diff --git a/frysk-core/frysk/scopes/ChangeLog b/frysk-core/frysk/scopes/ChangeLog index 2cfcdfb..8e08b46 100644 --- a/frysk-core/frysk/scopes/ChangeLog +++ b/frysk-core/frysk/scopes/ChangeLog @@ -1,3 +1,9 @@ +2008-05-16 Sami Wagiaalla + + Added frame requirement to + ObjectDeclarationSearchEngine.getObjectInScope() + * TestDie.java: Updated. + 2008-05-09 Sami Wagiaalla * Scope.java (getDeclaredObjectByNameRecursive): Added diff --git a/frysk-core/frysk/scopes/TestDie.java b/frysk-core/frysk/scopes/TestDie.java index 8d44f0b..00bf1f0 100644 --- a/frysk-core/frysk/scopes/TestDie.java +++ b/frysk-core/frysk/scopes/TestDie.java @@ -70,7 +70,7 @@ public class TestDie DebugInfoFrame frame = DebugInfoStackFactory.createDebugInfoStackTrace(task); ObjectDeclarationSearchEngine objectDeclarationSearchEngine = new ObjectDeclarationSearchEngine(frame); - Variable variable = (Variable) objectDeclarationSearchEngine.getObjectInScope("first"); + Variable variable = (Variable) objectDeclarationSearchEngine.getObjectInScope(frame, "first"); assertNotNull("Variable found", variable); hooks/post-receive -- frysk system monitor/debugger