From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4148 invoked by alias); 1 Apr 2008 20:17:27 -0000 Received: (qmail 3992 invoked by uid 367); 1 Apr 2008 20:17:21 -0000 Date: Tue, 01 Apr 2008 20:17:00 -0000 Message-ID: <20080401201721.3974.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Move frysk.value.Variable to frysk.scopes.Variable. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4c1d1937456e7b84679d5cbef12f8698b027dec4 X-Git-Newrev: b927d6c13dcc27d155895895fcb958b4c32fb595 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/msg00011.txt.bz2 The branch, master has been updated via b927d6c13dcc27d155895895fcb958b4c32fb595 (commit) from 4c1d1937456e7b84679d5cbef12f8698b027dec4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit b927d6c13dcc27d155895895fcb958b4c32fb595 Author: Andrew Cagney Date: Tue Apr 1 16:16:08 2008 -0400 Move frysk.value.Variable to frysk.scopes.Variable. frysk-core/frysk/debuginfo/ChangeLog 2008-04-01 Andrew Cagney * TestGccInterface.java: Move from frysk.vale.TestInterface. * TestGccClass.java: Move from frysk.value.TestClass. * ObjectDeclarationSearchEngine.java: Update; Variable moved. * TestFrameDebugInfo.java: Ditto. * TestAddress.java: Ditto. * TestObjectDeclarationSearchEngine.java: Ditto. frysk-core/frysk/expr/ChangeLog 2008-04-01 Andrew Cagney * ExprSymTab.java: Update; Variable moved. * TestbedSymTab.java: Ditto. * ScratchSymTab.java: Ditto. frysk-core/frysk/scopes/ChangeLog 2008-04-01 Andrew Cagney * Variable.java: Move to here from frysk.value.Variable. * TestDie.java: Update. * Subprogram.java: Update. * Scope.java: Update. * Enumerator.java: Update. frysk-core/frysk/value/ChangeLog 2008-04-01 Andrew Cagney * TestInterface.java: Move to frysk.debuginfo.TestGccInterface. * CompositeType.java (getPrefix()): Make public. * TestClass.java: Move to frysk.debuginfo.TestGccClass. * Variable.java: Move to frysk.scopes.Variable. * ClassType.java: Update. * GccStructOrClassType.java: Update. * InterfaceType.java: Update. * StructType.java: Update. * UnionType.java: Update. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/debuginfo/ChangeLog | 8 ++++++++ .../debuginfo/ObjectDeclarationSearchEngine.java | 2 +- frysk-core/frysk/debuginfo/TestAddress.java | 2 +- frysk-core/frysk/debuginfo/TestFrameDebugInfo.java | 2 +- .../TestClass.java => debuginfo/TestGccClass.java} | 12 ++++++------ .../TestGccInterface.java} | 11 ++++++----- .../TestObjectDeclarationSearchEngine.java | 2 +- frysk-core/frysk/expr/ChangeLog | 6 ++++++ frysk-core/frysk/expr/ExprSymTab.java | 2 +- frysk-core/frysk/expr/ScratchSymTab.java | 2 +- frysk-core/frysk/expr/TestbedSymTab.java | 2 +- frysk-core/frysk/scopes/ChangeLog | 8 ++++++++ frysk-core/frysk/scopes/Enumerator.java | 1 - frysk-core/frysk/scopes/Scope.java | 1 - frysk-core/frysk/scopes/Subprogram.java | 1 - frysk-core/frysk/scopes/TestDie.java | 1 - frysk-core/frysk/{value => scopes}/Variable.java | 10 ++++++---- frysk-core/frysk/value/ChangeLog | 12 ++++++++++++ frysk-core/frysk/value/ClassType.java | 2 +- frysk-core/frysk/value/CompositeType.java | 2 +- frysk-core/frysk/value/GccStructOrClassType.java | 2 +- frysk-core/frysk/value/InterfaceType.java | 2 +- frysk-core/frysk/value/StructType.java | 2 +- frysk-core/frysk/value/UnionType.java | 6 ++---- 24 files changed, 66 insertions(+), 35 deletions(-) rename frysk-core/frysk/{value/TestClass.java => debuginfo/TestGccClass.java} (94%) rename frysk-core/frysk/{value/TestInterface.java => debuginfo/TestGccInterface.java} (94%) rename frysk-core/frysk/{value => scopes}/Variable.java (96%) First 500 lines of diff: diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog index 8305c5d..ed7eb76 100644 --- a/frysk-core/frysk/debuginfo/ChangeLog +++ b/frysk-core/frysk/debuginfo/ChangeLog @@ -1,5 +1,13 @@ 2008-04-01 Andrew Cagney + * TestGccInterface.java: Move from frysk.vale.TestInterface. + * TestGccClass.java: Move from frysk.value.TestClass. + + * ObjectDeclarationSearchEngine.java: Update; Variable moved. + * TestFrameDebugInfo.java: Ditto. + * TestAddress.java: Ditto. + * TestObjectDeclarationSearchEngine.java: Ditto. + * PrintStackOptions.java (printLocals(), setPrintLocals(boolean)): Replace printScopes() and setPrintScopes(boolean). (printInlineFunctions(), setPrintInlineFunctions(boolean)): diff --git a/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java b/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java index 5ab57c8..e10c231 100644 --- a/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java +++ b/frysk-core/frysk/debuginfo/ObjectDeclarationSearchEngine.java @@ -58,7 +58,7 @@ import frysk.scopes.Scope; import frysk.value.ObjectDeclaration; import frysk.value.Type; import frysk.value.Value; -import frysk.value.Variable; +import frysk.scopes.Variable; /** * This engine implements the c++ scoping rules and uses when searching for diff --git a/frysk-core/frysk/debuginfo/TestAddress.java b/frysk-core/frysk/debuginfo/TestAddress.java index cca5ef8..c05d112 100644 --- a/frysk-core/frysk/debuginfo/TestAddress.java +++ b/frysk-core/frysk/debuginfo/TestAddress.java @@ -48,7 +48,7 @@ import frysk.proc.Task; import frysk.testbed.DaemonBlockedAtSignal; import frysk.testbed.TestLib; import frysk.value.Value; -import frysk.value.Variable; +import frysk.scopes.Variable; public class TestAddress extends TestLib diff --git a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java index b9b17c2..dcd2471 100644 --- a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java +++ b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java @@ -58,7 +58,7 @@ import frysk.stack.Frame; import frysk.stack.StackFactory; import frysk.testbed.DaemonBlockedAtSignal; import frysk.testbed.TestLib; -import frysk.value.Variable; +import frysk.scopes.Variable; public class TestFrameDebugInfo extends TestLib { diff --git a/frysk-core/frysk/value/TestClass.java b/frysk-core/frysk/debuginfo/TestGccClass.java similarity index 94% rename from frysk-core/frysk/value/TestClass.java rename to frysk-core/frysk/debuginfo/TestGccClass.java index 95eee2f..8b7797a 100644 --- a/frysk-core/frysk/value/TestClass.java +++ b/frysk-core/frysk/debuginfo/TestGccClass.java @@ -37,20 +37,20 @@ // version and license this file solely under the GPL without // exception. -package frysk.value; +package frysk.debuginfo; -import frysk.debuginfo.DebugInfoFrame; -import frysk.debuginfo.DebugInfoStackFactory; -import frysk.debuginfo.ObjectDeclarationSearchEngine; import frysk.junit.TestCase; import frysk.proc.Task; import frysk.rsl.Log; import frysk.testbed.DaemonBlockedAtSignal; import frysk.config.BuildCompiler; +import frysk.value.CompositeType; +import frysk.value.Type; +import frysk.scopes.Variable; -public class TestClass extends TestCase { +public class TestGccClass extends TestCase { - private static Log log = Log.fine(TestClass.class); + private static Log log = Log.fine(TestGccClass.class); private CompositeType getType(String program, String variableName) { Task task = (new DaemonBlockedAtSignal(program)).getMainTask(); diff --git a/frysk-core/frysk/value/TestInterface.java b/frysk-core/frysk/debuginfo/TestGccInterface.java similarity index 94% rename from frysk-core/frysk/value/TestInterface.java rename to frysk-core/frysk/debuginfo/TestGccInterface.java index bacdfa7..9a75ce6 100644 --- a/frysk-core/frysk/value/TestInterface.java +++ b/frysk-core/frysk/debuginfo/TestGccInterface.java @@ -37,17 +37,18 @@ // version and license this file solely under the GPL without // exception. -package frysk.value; +package frysk.debuginfo; -import frysk.debuginfo.DebugInfoFrame; -import frysk.debuginfo.DebugInfoStackFactory; -import frysk.debuginfo.ObjectDeclarationSearchEngine; import frysk.testbed.TestLib; import frysk.proc.Task; import frysk.testbed.DaemonBlockedAtSignal; import frysk.config.BuildCompiler; +import frysk.value.Type; +import frysk.scopes.Variable; +import frysk.value.CompositeType; +import frysk.value.PointerType; -public class TestInterface extends TestLib { +public class TestGccInterface extends TestLib { private CompositeType getType(String program, String variableName) { Task task = (new DaemonBlockedAtSignal(program)).getMainTask(); diff --git a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java index cfcc4e7..a5cdf43 100644 --- a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java +++ b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java @@ -47,7 +47,7 @@ import frysk.testbed.DaemonBlockedAtSignal; import frysk.testbed.TestLib; import frysk.testbed.TestfileTokenScanner; import frysk.value.ObjectDeclaration; -import frysk.value.Variable; +import frysk.scopes.Variable; /** * Tests @link CppVariableSearchEngine. diff --git a/frysk-core/frysk/expr/ChangeLog b/frysk-core/frysk/expr/ChangeLog index 66b4dcc..da120d8 100644 --- a/frysk-core/frysk/expr/ChangeLog +++ b/frysk-core/frysk/expr/ChangeLog @@ -1,3 +1,9 @@ +2008-04-01 Andrew Cagney + + * ExprSymTab.java: Update; Variable moved. + * TestbedSymTab.java: Ditto. + * ScratchSymTab.java: Ditto. + 2008-03-31 Teresa Thomas * CTypeEvaluator.g: New file. diff --git a/frysk-core/frysk/expr/ExprSymTab.java b/frysk-core/frysk/expr/ExprSymTab.java index eb8e5c2..0af6cc9 100644 --- a/frysk-core/frysk/expr/ExprSymTab.java +++ b/frysk-core/frysk/expr/ExprSymTab.java @@ -45,7 +45,7 @@ import java.util.List; import frysk.value.ObjectDeclaration; import frysk.value.Type; import frysk.value.Value; -import frysk.value.Variable; +import frysk.scopes.Variable; public interface ExprSymTab { diff --git a/frysk-core/frysk/expr/ScratchSymTab.java b/frysk-core/frysk/expr/ScratchSymTab.java index ae3a640..3ca680b 100644 --- a/frysk-core/frysk/expr/ScratchSymTab.java +++ b/frysk-core/frysk/expr/ScratchSymTab.java @@ -46,7 +46,7 @@ import frysk.config.Config; import frysk.value.ObjectDeclaration; import frysk.value.Type; import frysk.value.Value; -import frysk.value.Variable; +import frysk.scopes.Variable; public class ScratchSymTab implements ExprSymTab { /** diff --git a/frysk-core/frysk/expr/TestbedSymTab.java b/frysk-core/frysk/expr/TestbedSymTab.java index 556c653..51ee12e 100644 --- a/frysk-core/frysk/expr/TestbedSymTab.java +++ b/frysk-core/frysk/expr/TestbedSymTab.java @@ -54,7 +54,7 @@ import frysk.value.ScratchLocation; import frysk.value.StandardTypes; import frysk.value.Type; import frysk.value.Value; -import frysk.value.Variable; +import frysk.scopes.Variable; class TestbedSymTab implements ExprSymTab { private final SourceLocation scratchSourceLocation = SourceLocation.UNKNOWN; diff --git a/frysk-core/frysk/scopes/ChangeLog b/frysk-core/frysk/scopes/ChangeLog index a7d9002..aa6748f 100644 --- a/frysk-core/frysk/scopes/ChangeLog +++ b/frysk-core/frysk/scopes/ChangeLog @@ -1,3 +1,11 @@ +2008-04-01 Andrew Cagney + + * Variable.java: Move to here from frysk.value.Variable. + * TestDie.java: Update. + * Subprogram.java: Update. + * Scope.java: Update. + * Enumerator.java: Update. + 2008-03-15 Andrew Cagney * ScopeFactory.java: Update; TypeEntry -> TypeFactory. diff --git a/frysk-core/frysk/scopes/Enumerator.java b/frysk-core/frysk/scopes/Enumerator.java index 6284082..ea17b46 100644 --- a/frysk-core/frysk/scopes/Enumerator.java +++ b/frysk-core/frysk/scopes/Enumerator.java @@ -45,7 +45,6 @@ import frysk.value.ArithmeticType; import frysk.value.StandardTypes; import frysk.value.Type; import frysk.value.Value; -import frysk.value.Variable; import frysk.debuginfo.DebugInfoFrame; import frysk.isa.ISA; diff --git a/frysk-core/frysk/scopes/Scope.java b/frysk-core/frysk/scopes/Scope.java index 1a3e510..b9fff92 100644 --- a/frysk-core/frysk/scopes/Scope.java +++ b/frysk-core/frysk/scopes/Scope.java @@ -48,7 +48,6 @@ import lib.dwfl.DwarfDie; import frysk.debuginfo.DebugInfoFrame; import frysk.debuginfo.TypeFactory; import frysk.value.ObjectDeclaration; -import frysk.value.Variable; /** * A class to represent a Scope. diff --git a/frysk-core/frysk/scopes/Subprogram.java b/frysk-core/frysk/scopes/Subprogram.java index 9c7e6a6..f2c9ef5 100644 --- a/frysk-core/frysk/scopes/Subprogram.java +++ b/frysk-core/frysk/scopes/Subprogram.java @@ -54,7 +54,6 @@ import frysk.debuginfo.DebugInfoFrame; import frysk.debuginfo.TypeFactory; import frysk.value.ObjectDeclaration; import frysk.value.FunctionType; -import frysk.value.Variable; /** * A Subprogram refers to a concrete (not inlined) instance of a function. diff --git a/frysk-core/frysk/scopes/TestDie.java b/frysk-core/frysk/scopes/TestDie.java index 2d7ad64..58e2c23 100644 --- a/frysk-core/frysk/scopes/TestDie.java +++ b/frysk-core/frysk/scopes/TestDie.java @@ -59,7 +59,6 @@ import frysk.stack.StackFactory; import frysk.testbed.DaemonBlockedAtSignal; import frysk.testbed.TestLib; import frysk.testbed.TestfileTokenScanner; -import frysk.value.Variable; public class TestDie extends TestLib diff --git a/frysk-core/frysk/value/Variable.java b/frysk-core/frysk/scopes/Variable.java similarity index 96% rename from frysk-core/frysk/value/Variable.java rename to frysk-core/frysk/scopes/Variable.java index ba36a56..2593645 100644 --- a/frysk-core/frysk/value/Variable.java +++ b/frysk-core/frysk/scopes/Variable.java @@ -37,10 +37,9 @@ // version and license this file solely under the GPL without // exception. -package frysk.value; +package frysk.scopes; import java.io.PrintWriter; - import lib.dwfl.DwAttributeNotFoundException; import lib.dwfl.DwException; import lib.dwfl.DwarfDie; @@ -53,7 +52,10 @@ import frysk.debuginfo.VariableOptimizedOutException; import frysk.isa.ISA; import frysk.rsl.Log; import frysk.rsl.LogFactory; -import frysk.scopes.SourceLocation; +import frysk.value.ObjectDeclaration; +import frysk.value.Type; +import frysk.value.Value; +import frysk.value.Format; /** * This class contains the static information corresponding to a @@ -61,7 +63,7 @@ import frysk.scopes.SourceLocation; * corresponding to this Variable */ -public class Variable extends ObjectDeclaration{ +public class Variable extends ObjectDeclaration { private static Log fine = LogFactory.fine(Variable.class); private static Log finest = LogFactory.finest(Variable.class); diff --git a/frysk-core/frysk/value/ChangeLog b/frysk-core/frysk/value/ChangeLog index 16d0ca2..cf38318 100644 --- a/frysk-core/frysk/value/ChangeLog +++ b/frysk-core/frysk/value/ChangeLog @@ -1,3 +1,15 @@ +2008-04-01 Andrew Cagney + + * TestInterface.java: Move to frysk.debuginfo.TestGccInterface. + * CompositeType.java (getPrefix()): Make public. + * TestClass.java: Move to frysk.debuginfo.TestGccClass. + * Variable.java: Move to frysk.scopes.Variable. + * ClassType.java: Update. + * GccStructOrClassType.java: Update. + * InterfaceType.java: Update. + * StructType.java: Update. + * UnionType.java: Update. + 2008-03-31 Teresa Thomas * CompositeType.java (getMemberType): New. diff --git a/frysk-core/frysk/value/ClassType.java b/frysk-core/frysk/value/ClassType.java index b75f63b..69c009f 100644 --- a/frysk-core/frysk/value/ClassType.java +++ b/frysk-core/frysk/value/ClassType.java @@ -45,7 +45,7 @@ package frysk.value; public class ClassType extends CompositeType { - protected String getPrefix() { + public String getPrefix() { return "class"; } public ClassType(String name, int size) { diff --git a/frysk-core/frysk/value/CompositeType.java b/frysk-core/frysk/value/CompositeType.java index a3fcd28..528edae 100644 --- a/frysk-core/frysk/value/CompositeType.java +++ b/frysk-core/frysk/value/CompositeType.java @@ -190,7 +190,7 @@ public abstract class CompositeType /** * Return the prefix (class, union, struct), or null. */ - abstract protected String getPrefix(); + public abstract String getPrefix(); /** * Dump the contents of this object. diff --git a/frysk-core/frysk/value/GccStructOrClassType.java b/frysk-core/frysk/value/GccStructOrClassType.java index 8b3d75f..4940b2b 100644 --- a/frysk-core/frysk/value/GccStructOrClassType.java +++ b/frysk-core/frysk/value/GccStructOrClassType.java @@ -67,7 +67,7 @@ public class GccStructOrClassType } private String prefix = null; - protected String getPrefix() { + public String getPrefix() { if (prefix == null) { if (isClassLike()) prefix = "class"; diff --git a/frysk-core/frysk/value/InterfaceType.java b/frysk-core/frysk/value/InterfaceType.java index 62909e5..3c575a0 100644 --- a/frysk-core/frysk/value/InterfaceType.java +++ b/frysk-core/frysk/value/InterfaceType.java @@ -41,7 +41,7 @@ package frysk.value; public class InterfaceType extends CompositeType { - protected String getPrefix() { + public String getPrefix() { return "interface"; } public InterfaceType(String name, int size) { diff --git a/frysk-core/frysk/value/StructType.java b/frysk-core/frysk/value/StructType.java index 25a6168..393514d 100644 --- a/frysk-core/frysk/value/StructType.java +++ b/frysk-core/frysk/value/StructType.java @@ -45,7 +45,7 @@ package frysk.value; public class StructType extends CompositeType { - protected String getPrefix() { + public String getPrefix() { return "struct"; } public StructType(String name, int size) { diff --git a/frysk-core/frysk/value/UnionType.java b/frysk-core/frysk/value/UnionType.java index 196986c..de9413c 100644 --- a/frysk-core/frysk/value/UnionType.java +++ b/frysk-core/frysk/value/UnionType.java @@ -42,10 +42,8 @@ package frysk.value; /** * Type for a union */ -public class UnionType - extends CompositeType -{ - protected String getPrefix() { +public class UnionType extends CompositeType { + public String getPrefix() { return "union"; } public UnionType(String name, int size) { hooks/post-receive -- frysk system monitor/debugger