From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20739 invoked by alias); 12 Nov 2007 15:55:56 -0000 Received: (qmail 20689 invoked by uid 367); 12 Nov 2007 15:55:53 -0000 Date: Mon, 12 Nov 2007 15:55:00 -0000 Message-ID: <20071112155553.20674.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Create inline and non-inline(outline) versions of frysk-inlined.c X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ee1656cad8a1546e983eb80dc25cf09b6fb5f345 X-Git-Newrev: 90fa678ccd14e9266d81df04f888203f234f47d7 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: 2007-q4/txt/msg00345.txt.bz2 The branch, master has been updated via 90fa678ccd14e9266d81df04f888203f234f47d7 (commit) from ee1656cad8a1546e983eb80dc25cf09b6fb5f345 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 90fa678ccd14e9266d81df04f888203f234f47d7 Author: Andrew Cagney Date: Mon Nov 12 10:52:16 2007 -0500 Create inline and non-inline(outline) versions of frysk-inlined.c frysk-core/frysk/bindir/ChangeLog 2007-11-12 Andrew Cagney * TestFstack.java: Update; funit-inlined renamed to funit-stack-inlined. frysk-core/frysk/debuginfo/ChangeLog 2007-11-12 Andrew Cagney * TestFrameDebugInfo.java: Update; funit-inlined renamed to funit-stack-inlined. frysk-core/frysk/hpd/ChangeLog 2007-11-12 Andrew Cagney * TestWhereCommand.java: Update; funit-inlined renamed to funit-stack-inlined. frysk-core/frysk/pkglibdir/ChangeLog 2007-11-12 Andrew Cagney * funit-stack-inlined.c: Rename funit-inlined.c * funit-stack-outlined.c: New; Non-inline funit-stack-inlined.c. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/bindir/ChangeLog | 5 +++ frysk-core/frysk/bindir/TestFstack.java | 4 +- frysk-core/frysk/debuginfo/ChangeLog | 7 +++- frysk-core/frysk/debuginfo/TestFrameDebugInfo.java | 6 ++-- frysk-core/frysk/hpd/ChangeLog | 5 +++ frysk-core/frysk/hpd/TestWhereCommand.java | 8 ++-- frysk-core/frysk/pkglibdir/ChangeLog | 5 +++ frysk-core/frysk/pkglibdir/funit-inlined.c | 24 ------------- .../{funit-hello.c => funit-stack-inlined.c} | 35 ++++++++++++------- .../{funit-hello.c => funit-stack-outlined.c} | 34 ++++++++++++------- 10 files changed, 73 insertions(+), 60 deletions(-) delete mode 100644 frysk-core/frysk/pkglibdir/funit-inlined.c copy frysk-core/frysk/pkglibdir/{funit-hello.c => funit-stack-inlined.c} (83%) copy frysk-core/frysk/pkglibdir/{funit-hello.c => funit-stack-outlined.c} (84%) First 500 lines of diff: diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog index df7585f..e165a0a 100644 --- a/frysk-core/frysk/bindir/ChangeLog +++ b/frysk-core/frysk/bindir/ChangeLog @@ -1,3 +1,8 @@ +2007-11-12 Andrew Cagney + + * TestFstack.java: Update; funit-inlined renamed to + funit-stack-inlined. + 2007-11-09 Sami Wagiaalla Changed CoreFileAtSignal to return core File instead of core Proc. diff --git a/frysk-core/frysk/bindir/TestFstack.java b/frysk-core/frysk/bindir/TestFstack.java index c8d6f3c..0d73771 100644 --- a/frysk-core/frysk/bindir/TestFstack.java +++ b/frysk-core/frysk/bindir/TestFstack.java @@ -140,11 +140,11 @@ public class TestFstack public void testBackTraceWithDashV () { - File coreFile = CoreFileAtSignal.constructCore("funit-inlined"); + File coreFile = CoreFileAtSignal.constructCore("funit-stack-inlined"); e = new Expect (new String[] { Config.getBinFile("fstack").getAbsolutePath (), coreFile.getAbsolutePath(), - Config.getPkgLibFile("funit-inlined").getAbsolutePath(), + Config.getPkgLibFile("funit-stack-inlined").getAbsolutePath(), "-v", "-a" }); diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog index 843aaab..be11fec 100644 --- a/frysk-core/frysk/debuginfo/ChangeLog +++ b/frysk-core/frysk/debuginfo/ChangeLog @@ -1,7 +1,12 @@ +2007-11-12 Andrew Cagney + + * TestFrameDebugInfo.java: Update; funit-inlined renamed to + funit-stack-inlined. + 2007-11-12 Stan Cox * gen-type-expect-tests.py (j.start_test): Turn on TestTypeEntryValue. - + 2007-11-11 Stan Cox * gen-type-expect-tests.py (j.add_test): Escape \n for value. diff --git a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java index bee94f5..8342b3c 100644 --- a/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java +++ b/frysk-core/frysk/debuginfo/TestFrameDebugInfo.java @@ -173,7 +173,7 @@ public class TestFrameDebugInfo public void testGetInlinedSubroutines () { - Task task = (new DaemonBlockedAtSignal("funit-inlined")).getMainTask(); + Task task = (new DaemonBlockedAtSignal("funit-stack-inlined")).getMainTask(); DebugInfoFrame frame = DebugInfoStackFactory.createDebugInfoStackTrace(task); LinkedList inlinedSubprograms = frame.getInlinedSubprograms(); @@ -185,7 +185,7 @@ public class TestFrameDebugInfo public void testVirtualStackTrace () { - Task task = (new DaemonBlockedAtSignal("funit-inlined")).getMainTask(); + Task task = (new DaemonBlockedAtSignal("funit-stack-inlined")).getMainTask(); StringWriter stringWriter = new StringWriter(); DebugInfoStackFactory.printVirtualTaskStackTrace(new PrintWriter(stringWriter), task, true, true, true); @@ -203,7 +203,7 @@ public class TestFrameDebugInfo public void testInlinedFunctionDerailment () { - Task task = (new DaemonBlockedAtSignal("funit-inlined")).getMainTask(); + Task task = (new DaemonBlockedAtSignal("funit-stack-inlined")).getMainTask(); DebugInfoFrame frame = DebugInfoStackFactory.createVirtualStackTrace(task); Subprogram subprogram = null; diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index 0146871..5fdd4a2 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,3 +1,8 @@ +2007-11-12 Andrew Cagney + + * TestWhereCommand.java: Update; funit-inlined renamed to + funit-stack-inlined. + 2007-11-09 Andrew Cagney * UserHelp.java: Delete. diff --git a/frysk-core/frysk/hpd/TestWhereCommand.java b/frysk-core/frysk/hpd/TestWhereCommand.java index 5cd4b2d..1beb993 100644 --- a/frysk-core/frysk/hpd/TestWhereCommand.java +++ b/frysk-core/frysk/hpd/TestWhereCommand.java @@ -55,9 +55,9 @@ public class TestWhereCommand extends TestLib { public void testFhpdVirtualStackTrace () { File coreFile = CoreFileAtSignal - .constructCore("funit-inlined"); + .constructCore("funit-stack-inlined"); e = new HpdCoreFileTestbed(coreFile, - Config.getPkgLibFile("funit-inlined"), + Config.getPkgLibFile("funit-stack-inlined"), "Attached to core file.*"); e.send("where\n"); e.expect("\\#0 .*third[^\\r\\n]*\\[inline\\]"); @@ -70,9 +70,9 @@ public class TestWhereCommand extends TestLib { public void testFhpdVirtualStackTraceWithScopes () { File coreFile = CoreFileAtSignal - .constructCore("funit-inlined"); + .constructCore("funit-stack-inlined"); e = new HpdCoreFileTestbed(coreFile, - Config.getPkgLibFile("funit-inlined"), + Config.getPkgLibFile("funit-stack-inlined"), "Attached to core file.*"); e.send("where -scopes\n"); e.expect(".*var3"); diff --git a/frysk-core/frysk/pkglibdir/ChangeLog b/frysk-core/frysk/pkglibdir/ChangeLog index 251d540..891af0c 100644 --- a/frysk-core/frysk/pkglibdir/ChangeLog +++ b/frysk-core/frysk/pkglibdir/ChangeLog @@ -1,3 +1,8 @@ +2007-11-12 Andrew Cagney + + * funit-stack-inlined.c: Rename funit-inlined.c + * funit-stack-outlined.c: New; Non-inline funit-stack-inlined.c. + 2007-11-12 Stan Cox * gen-type-funit-tests.py (c.add_decl): Make variables external. diff --git a/frysk-core/frysk/pkglibdir/funit-inlined.c b/frysk-core/frysk/pkglibdir/funit-inlined.c deleted file mode 100644 index 0a7b19d..0000000 --- a/frysk-core/frysk/pkglibdir/funit-inlined.c +++ /dev/null @@ -1,24 +0,0 @@ -#include - -inline void third(int arg3){ - int var3 = arg3; - int* a = 0; - a[0] = var3; -} - -inline void second(int arg2){ - int var2 = arg2; - third(var2+1); -} - -inline void first(int arg1){ - int var1 = arg1; - second(var1+1); -} - -int main(){ - int some_int = 1; - first(some_int); - return 0; -} - diff --git a/frysk-core/frysk/pkglibdir/funit-hello.c b/frysk-core/frysk/pkglibdir/funit-stack-inlined.c similarity index 83% copy from frysk-core/frysk/pkglibdir/funit-hello.c copy to frysk-core/frysk/pkglibdir/funit-stack-inlined.c index c2c0e5d..ba9fbac 100644 --- a/frysk-core/frysk/pkglibdir/funit-hello.c +++ b/frysk-core/frysk/pkglibdir/funit-stack-inlined.c @@ -28,7 +28,7 @@ // resulting work to be covered by the GNU General Public // License. Only Red Hat, Inc. may make changes or additions to the // list of Approved Interfaces. You must obey the GNU General Public -// License in all respects for all of the FRYSK code and other code +// License in all respects for all o;f the FRYSK code and other code // used in conjunction with FRYSK except the Non-GPL Code covered by // this exception. If you modify this file, you may extend this // exception to your version of the file, but you are not obligated to @@ -37,20 +37,29 @@ // version and license this file solely under the GPL without // exception. -#include +#include -void -print(char *what) { - while (*what != '\0') { - write(1, what, 1); - what++; - } +// See also funit-stack-inlined.c + +inline void third(int arg3){ + int var3 = arg3; + int* a = 0; + a[0] = var3; +} + +inline void second(int arg2){ + int var2 = arg2; + third(var2+1); } -int -main(int argc, char** argv) { - // XXX: This forgets to check ARGC. - print(argv[1]); - print("\n"); +inline void first(int arg1){ + int var1 = arg1; + second(var1+1); +} + +int main(){ + int some_int = 1; + first(some_int); return 0; } + diff --git a/frysk-core/frysk/pkglibdir/funit-hello.c b/frysk-core/frysk/pkglibdir/funit-stack-outlined.c similarity index 84% copy from frysk-core/frysk/pkglibdir/funit-hello.c copy to frysk-core/frysk/pkglibdir/funit-stack-outlined.c index c2c0e5d..2ce2c93 100644 --- a/frysk-core/frysk/pkglibdir/funit-hello.c +++ b/frysk-core/frysk/pkglibdir/funit-stack-outlined.c @@ -28,7 +28,7 @@ // resulting work to be covered by the GNU General Public // License. Only Red Hat, Inc. may make changes or additions to the // list of Approved Interfaces. You must obey the GNU General Public -// License in all respects for all of the FRYSK code and other code +// License in all respects for all o;f the FRYSK code and other code // used in conjunction with FRYSK except the Non-GPL Code covered by // this exception. If you modify this file, you may extend this // exception to your version of the file, but you are not obligated to @@ -37,20 +37,28 @@ // version and license this file solely under the GPL without // exception. -#include +#include -void -print(char *what) { - while (*what != '\0') { - write(1, what, 1); - what++; - } +// See also funit-stack-inlined.c + +void third(int arg3){ + int var3 = arg3; + int* a = 0; + a[0] = var3; +} + +void second(int arg2){ + int var2 = arg2; + third(var2+1); +} + +void first(int arg1){ + int var1 = arg1; + second(var1+1); } -int -main(int argc, char** argv) { - // XXX: This forgets to check ARGC. - print(argv[1]); - print("\n"); +int main(){ + int some_int = 1; + first(some_int); return 0; } hooks/post-receive -- frysk system monitor/debugger