From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23111 invoked by alias); 22 Apr 2008 14:59:40 -0000 Received: (qmail 23078 invoked by uid 9561); 22 Apr 2008 14:59:38 -0000 Date: Tue, 22 Apr 2008 14:59:00 -0000 Message-ID: <20080422145938.23063.qmail@sourceware.org> From: swagiaal@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: swagiaal: Renamed InlinedSubroutine to InlinedFunction. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 698d437d536d29ef47d59441c0dd88e8616e86a1 X-Git-Newrev: 227a64d1e88875e810e9e54f9fed3ff3778fc06f 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/msg00150.txt.bz2 The branch, master has been updated via 227a64d1e88875e810e9e54f9fed3ff3778fc06f (commit) from 698d437d536d29ef47d59441c0dd88e8616e86a1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 227a64d1e88875e810e9e54f9fed3ff3778fc06f Author: Sami Wagiaalla Date: Tue Apr 22 10:55:16 2008 -0400 swagiaal: Renamed InlinedSubroutine to InlinedFunction. frysk-core/frysk/rt/ChangeLog +2008-04-22 Sami Wagiaalla + + Renamed InlinedSubroutine to InlinedFunction. + * FunctionBreakpoint.java: Updated. + frysk-core/frysk/scopes/ChangeLog +2008-04-22 Sami Wagiaalla + + * InlinedSubroutine.java: Renamed this... + * InlinedFunction.java: ... to this. + * ConcreteInlinedFunction.java: Updated. + * ScopeFactory.java: Updated. + * TestScopeFactory.java: Updated. + ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/rt/ChangeLog | 5 +++++ frysk-core/frysk/rt/FunctionBreakpoint.java | 4 ++-- frysk-core/frysk/scopes/ChangeLog | 8 ++++++++ .../frysk/scopes/ConcreteInlinedFunction.java | 2 +- ...InlinedSubroutine.java => InlinedFunction.java} | 7 +++++-- frysk-core/frysk/scopes/ScopeFactory.java | 2 +- frysk-core/frysk/scopes/TestScopeFactory.java | 2 +- 7 files changed, 23 insertions(+), 7 deletions(-) rename frysk-core/frysk/scopes/{InlinedSubroutine.java => InlinedFunction.java} (94%) First 500 lines of diff: diff --git a/frysk-core/frysk/rt/ChangeLog b/frysk-core/frysk/rt/ChangeLog index fe65348..30216b9 100644 --- a/frysk-core/frysk/rt/ChangeLog +++ b/frysk-core/frysk/rt/ChangeLog @@ -1,3 +1,8 @@ +2008-04-22 Sami Wagiaalla + + Renamed InlinedSubroutine to InlinedFunction. + * FunctionBreakpoint.java: Updated. + 2008-04-21 Sami Wagiaalla * FunctionBreakpoint.java: Now uses ObjectDeclaration. diff --git a/frysk-core/frysk/rt/FunctionBreakpoint.java b/frysk-core/frysk/rt/FunctionBreakpoint.java index 84198a2..4a3ead8 100644 --- a/frysk-core/frysk/rt/FunctionBreakpoint.java +++ b/frysk-core/frysk/rt/FunctionBreakpoint.java @@ -89,8 +89,8 @@ public class FunctionBreakpoint return addrs; } - if (function instanceof frysk.scopes.InlinedSubroutine) { - LinkedList inlinedInstances = ((frysk.scopes.InlinedSubroutine)function).getInlinedInstances(); + if (function instanceof frysk.scopes.InlinedFunction) { + LinkedList inlinedInstances = ((frysk.scopes.InlinedFunction)function).getInlinedInstances(); Iterator iterator = inlinedInstances.iterator(); LinkedList addrs = new LinkedList(); while (iterator.hasNext()) { diff --git a/frysk-core/frysk/scopes/ChangeLog b/frysk-core/frysk/scopes/ChangeLog index 98d86cb..0389deb 100644 --- a/frysk-core/frysk/scopes/ChangeLog +++ b/frysk-core/frysk/scopes/ChangeLog @@ -1,3 +1,11 @@ +2008-04-22 Sami Wagiaalla + + * InlinedSubroutine.java: Renamed this... + * InlinedFunction.java: ... to this. + * ConcreteInlinedFunction.java: Updated. + * ScopeFactory.java: Updated. + * TestScopeFactory.java: Updated. + 2008-04-21 Sami Wagiaalla * ConcreteInlinedFunction.java: New class. diff --git a/frysk-core/frysk/scopes/ConcreteInlinedFunction.java b/frysk-core/frysk/scopes/ConcreteInlinedFunction.java index c3e350c..9467846 100644 --- a/frysk-core/frysk/scopes/ConcreteInlinedFunction.java +++ b/frysk-core/frysk/scopes/ConcreteInlinedFunction.java @@ -43,7 +43,7 @@ import lib.dwfl.DwarfDie; import frysk.debuginfo.TypeFactory; import frysk.value.BreakPointLocation; -public class ConcreteInlinedFunction extends InlinedSubroutine implements BreakPointLocation{ +public class ConcreteInlinedFunction extends InlinedFunction implements BreakPointLocation{ public ConcreteInlinedFunction(DwarfDie die, TypeFactory typeFactory) { super(die, typeFactory); diff --git a/frysk-core/frysk/scopes/InlinedSubroutine.java b/frysk-core/frysk/scopes/InlinedFunction.java similarity index 94% rename from frysk-core/frysk/scopes/InlinedSubroutine.java rename to frysk-core/frysk/scopes/InlinedFunction.java index 149af91..2e8cb2e 100644 --- a/frysk-core/frysk/scopes/InlinedSubroutine.java +++ b/frysk-core/frysk/scopes/InlinedFunction.java @@ -46,9 +46,12 @@ import java.util.LinkedList; import lib.dwfl.DwarfDie; import frysk.debuginfo.TypeFactory; -public class InlinedSubroutine extends Function{ +/** + * Abstract instance of an inlinable function. + */ +public class InlinedFunction extends Function{ - public InlinedSubroutine(DwarfDie die, TypeFactory typeFactory) { + public InlinedFunction(DwarfDie die, TypeFactory typeFactory) { super(die, typeFactory); } diff --git a/frysk-core/frysk/scopes/ScopeFactory.java b/frysk-core/frysk/scopes/ScopeFactory.java index b8750a2..9b87af7 100644 --- a/frysk-core/frysk/scopes/ScopeFactory.java +++ b/frysk-core/frysk/scopes/ScopeFactory.java @@ -82,7 +82,7 @@ public class ScopeFactory { case DwTag.SUBPROGRAM_: Function function = new Function(die, typeFactory); if(function.isInlined()){ - return new InlinedSubroutine(die,typeFactory); + return new InlinedFunction(die,typeFactory); } return new OutOfLineFunction(die,typeFactory); case DwTag.LEXICAL_BLOCK_: diff --git a/frysk-core/frysk/scopes/TestScopeFactory.java b/frysk-core/frysk/scopes/TestScopeFactory.java index ee62400..d10c374 100644 --- a/frysk-core/frysk/scopes/TestScopeFactory.java +++ b/frysk-core/frysk/scopes/TestScopeFactory.java @@ -87,7 +87,7 @@ public class TestScopeFactory assertTrue("lexical block scope" , scope1 instanceof LexicalBlock); assertTrue("ConcreteInlinedFunction scope" , scope2 instanceof ConcreteInlinedFunction); - assertTrue("Abstract Inlinable funciton" , scope9 instanceof InlinedSubroutine); + assertTrue("Abstract Inlinable funciton" , scope9 instanceof InlinedFunction); assertTrue("Subprogram scope" , scope7 instanceof Function && !((Function)scope7).isInlined()); assertTrue("File scope" , scope3 instanceof Scope); hooks/post-receive -- frysk system monitor/debugger