public inbox for frysk-cvs@sourceware.org help / color / mirror / Atom feed
From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Rename TypeEntry to more O-O TypeFactory. Date: Sat, 15 Mar 2008 16:15:00 -0000 [thread overview] Message-ID: <20080315161529.8908.qmail@sourceware.org> (raw) The branch, master has been updated via ccf9809f752b0a3b2d9b04717ffb12cce771b922 (commit) from 903d1a983673aaae8ec74df389194c23d374648a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit ccf9809f752b0a3b2d9b04717ffb12cce771b922 Author: Andrew Cagney <cagney@redhat.com> Date: Sat Mar 15 12:14:06 2008 -0400 Rename TypeEntry to more O-O TypeFactory. frysk-core/frysk/debuginfo/ChangeLog 2008-03-15 Andrew Cagney <cagney@redhat.com> * TypeFactory.java: Rename TypeEntry.java. * TestTypeFactory.java-sh: Rename TestTypeEntry.java-sh. * gen-type-expect-tests.py: Update. * DebugInfo.java: Update. * DebugInfoFrame.java: Update. frysk-core/frysk/scopes/ChangeLog 2008-03-15 Andrew Cagney <cagney@redhat.com> * ScopeFactory.java: Update; TypeEntry -> TypeFactory. * TestScopeFactory.java: Update. * Subroutine.java: Ditto. * LexicalBlock.java: Ditto. * Enumeration.java: Ditto. * Composite.java: Ditto. * Scope.java: Ditto. * Subprogram.java: Ditto. frysk-core/frysk/value/ChangeLog 2008-03-15 Andrew Cagney <cagney@redhat.com> * Variable.java: Update; TypeEntry -> TypeFactory. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/debuginfo/ChangeLog | 8 ++++++++ frysk-core/frysk/debuginfo/DebugInfo.java | 8 ++++---- frysk-core/frysk/debuginfo/DebugInfoFrame.java | 10 +++++----- frysk-core/frysk/debuginfo/TestTypeEntry.java-sh | 5 ----- .../frysk/debuginfo/TestTypeFactory.java-sh | 12 ++++-------- .../debuginfo/{TypeEntry.java => TypeFactory.java} | 12 ++++++------ .../frysk/debuginfo/gen-type-expect-tests.py | 10 +++++----- frysk-core/frysk/scopes/ChangeLog | 11 +++++++++++ frysk-core/frysk/scopes/Composite.java | 8 ++++---- frysk-core/frysk/scopes/Enumeration.java | 6 +++--- frysk-core/frysk/scopes/LexicalBlock.java | 14 +++++--------- frysk-core/frysk/scopes/Scope.java | 12 ++++++------ frysk-core/frysk/scopes/ScopeFactory.java | 16 ++++++++-------- frysk-core/frysk/scopes/Subprogram.java | 8 ++++---- frysk-core/frysk/scopes/Subroutine.java | 10 +++++----- frysk-core/frysk/scopes/TestScopeFactory.java | 16 ++++++++-------- frysk-core/frysk/value/ChangeLog | 4 ++++ frysk-core/frysk/value/Variable.java | 6 +++--- 18 files changed, 93 insertions(+), 83 deletions(-) delete mode 100644 frysk-core/frysk/debuginfo/TestTypeEntry.java-sh copy frysk-imports/cdtparser/configure.ac => frysk-core/frysk/debuginfo/TestTypeFactory.java-sh (91%) rename frysk-core/frysk/debuginfo/{TypeEntry.java => TypeFactory.java} (98%) First 500 lines of diff: diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog index d673d45..0ab6bef 100644 --- a/frysk-core/frysk/debuginfo/ChangeLog +++ b/frysk-core/frysk/debuginfo/ChangeLog @@ -1,3 +1,11 @@ +2008-03-15 Andrew Cagney <cagney@redhat.com> + + * TypeFactory.java: Rename TypeEntry.java. + * TestTypeFactory.java-sh: Rename TestTypeEntry.java-sh. + * gen-type-expect-tests.py: Update. + * DebugInfo.java: Update. + * DebugInfoFrame.java: Update. + 2008-03-13 Stan Cox <scox@redhat.com> * DebugInfoFrame.java (getLine): Use SysRoot. diff --git a/frysk-core/frysk/debuginfo/DebugInfo.java b/frysk-core/frysk/debuginfo/DebugInfo.java index 3f1a92f..314fda8 100644 --- a/frysk-core/frysk/debuginfo/DebugInfo.java +++ b/frysk-core/frysk/debuginfo/DebugInfo.java @@ -96,7 +96,7 @@ public class DebugInfo { long pc = frame.getAdjustedAddress(); Dwfl dwfl = DwflCache.getDwfl(frame.getTask()); DwflDieBias bias = dwfl.getCompilationUnit(pc); - TypeEntry typeEntry = new TypeEntry(frame.getTask().getISA()); + TypeFactory typeFactory = new TypeFactory(frame.getTask().getISA()); if (bias == null) throw new RuntimeException("No symbol table is available."); DwarfDie die = bias.die; @@ -112,13 +112,13 @@ public class DebugInfo { result.append("extern "); switch (varDie.getTag().hashCode()) { case DwTag.SUBPROGRAM_: { - Value value = typeEntry.getSubprogramValue(varDie); + Value value = typeFactory.getSubprogramValue(varDie); result.append(value.getType().toPrint()); break; } case DwTag.TYPEDEF_: case DwTag.STRUCTURE_TYPE_: { - Type type = typeEntry.getType(varDie.getType()); + Type type = typeFactory.getType(varDie.getType()); result.append(type.toPrint()); break; } @@ -126,7 +126,7 @@ public class DebugInfo { result.append(varDie + " " + varDie.getName()); } } else { - Type type = typeEntry.getType(varDie.getType()); + Type type = typeFactory.getType(varDie.getType()); if (varDie.getAttrBoolean(DwAt.EXTERNAL)) result.append("extern "); diff --git a/frysk-core/frysk/debuginfo/DebugInfoFrame.java b/frysk-core/frysk/debuginfo/DebugInfoFrame.java index 6136d6f..0881150 100644 --- a/frysk-core/frysk/debuginfo/DebugInfoFrame.java +++ b/frysk-core/frysk/debuginfo/DebugInfoFrame.java @@ -66,11 +66,11 @@ public class DebugInfoFrame extends FrameDecorator { private LinkedList inlinedSubprograms; - private final TypeEntry typeEntry; + private final TypeFactory typeFactory; protected DebugInfoFrame(FrameDecorator inner, Frame decorated) { super(inner, decorated); - this.typeEntry = new TypeEntry(getTask().getISA()); + this.typeFactory = new TypeFactory(getTask().getISA()); } public final Subprogram getSubprogram () @@ -101,7 +101,7 @@ public class DebugInfoFrame extends FrameDecorator { } scopes = scopes[0].getScopesDie(); - scope = ScopeFactory.theFactory.getScope(scopes[0], typeEntry); + scope = ScopeFactory.theFactory.getScope(scopes[0], typeFactory); Scope tempScope = scope; if (tempScope instanceof Subprogram && !(((Subprogram)tempScope).isInlined()) && subprogram == null) { @@ -110,7 +110,7 @@ public class DebugInfoFrame extends FrameDecorator { Scope outer = null; for (int i = 1; i < scopes.length; i++) { - outer = ScopeFactory.theFactory.getScope(scopes[i], typeEntry); + outer = ScopeFactory.theFactory.getScope(scopes[i], typeFactory); tempScope.setOuter(outer); tempScope = outer; @@ -149,7 +149,7 @@ public class DebugInfoFrame extends FrameDecorator { scopes = scopes[0].getScopesDie(); for (int i = 0; i < scopes.length; i++) { - Scope scope = ScopeFactory.theFactory.getScope(scopes[i], typeEntry); + Scope scope = ScopeFactory.theFactory.getScope(scopes[i], typeFactory); if(scope instanceof Subprogram && ((Subprogram)scope).isInlined()){ inlinedSubprograms.add(scope); } diff --git a/frysk-core/frysk/debuginfo/TestTypeEntry.java-sh b/frysk-core/frysk/debuginfo/TestTypeEntry.java-sh deleted file mode 100644 index 9549b7b..0000000 --- a/frysk-core/frysk/debuginfo/TestTypeEntry.java-sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -python $(dirname $0)/gen-type-expect-tests.py frysk/pkglibdir/funit-type-entry.c $(dirname $0)/../pkglibdir/funit-type-class.cxx - - diff --git a/frysk-imports/cdtparser/configure.ac b/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh similarity index 91% copy from frysk-imports/cdtparser/configure.ac copy to frysk-core/frysk/debuginfo/TestTypeFactory.java-sh index 8e3aa37..e07b682 100644 --- a/frysk-imports/cdtparser/configure.ac +++ b/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh @@ -1,6 +1,8 @@ +#!/bin/sh + # This file is part of the program FRYSK. # -# Copyright 2005, 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 @@ -37,10 +39,4 @@ # version and license this file solely under the GPL without # exception. -AC_PREREQ(2.59) -AC_INIT(cdtparser, 3.0.0) -AM_INIT_AUTOMAKE -AM_PROG_GCJ - -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT +python $(dirname $0)/gen-type-expect-tests.py frysk/pkglibdir/funit-type-entry.c $(dirname $0)/../pkglibdir/funit-type-class.cxx diff --git a/frysk-core/frysk/debuginfo/TypeEntry.java b/frysk-core/frysk/debuginfo/TypeFactory.java similarity index 98% rename from frysk-core/frysk/debuginfo/TypeEntry.java rename to frysk-core/frysk/debuginfo/TypeFactory.java index 9ae3f03..6911d40 100644 --- a/frysk-core/frysk/debuginfo/TypeEntry.java +++ b/frysk-core/frysk/debuginfo/TypeFactory.java @@ -78,17 +78,17 @@ import lib.dwfl.DwAttributeNotFoundException; import lib.dwfl.DwTag; import lib.dwfl.DwarfDie; -public class TypeEntry { - static protected Log fine = LogFactory.fine(TypeEntry.class); - static protected Log finest = LogFactory.finest(TypeEntry.class); +public class TypeFactory { + static protected Log fine = LogFactory.fine(TypeFactory.class); + static protected Log finest = LogFactory.finest(TypeFactory.class); private final ByteOrder byteorder; private final HashMap dieHash; - public TypeEntry(ISA isa) { - fine.log(this, "Creating TypeEntry, ISA: ", isa); + public TypeFactory(ISA isa) { + fine.log(this, "Creating TypeFactory, ISA: ", isa); this.byteorder = isa.order(); this.dieHash = new HashMap(); - finest.log(this, "Finished creating TypeEntry"); + finest.log(this, "Finished creating TypeFactory"); } private int getByteSize(DwarfDie die) { diff --git a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py index 9a5917c..0a36801 100644 --- a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py +++ b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py @@ -47,7 +47,7 @@ import os,sys class j: def open(self): - self.name = "TestTypeEntry" + self.name = "TestTypeFactory" def write(self,str): print str def prologue(self,): @@ -76,7 +76,7 @@ public class %s extends TestLib { Task task; DwarfDie die; DwarfDie[] allDies; - TypeEntry typeEntry; + TypeFactory typeFactory; String testName; TypeTestbed(String executable, String testName) { @@ -87,7 +87,7 @@ public class %s extends TestLib { DwflDieBias bias = dwfl.getCompilationUnit(pc); die = bias.die; allDies = die.getScopes(pc - bias.bias); - typeEntry = new TypeEntry(frame.getTask().getISA()); + typeFactory = new TypeFactory(frame.getTask().getISA()); this.testName = testName; } ''' % (self.name)) @@ -100,7 +100,7 @@ public class %s extends TestLib { if (varDie == null) System.out.println("Error: Cannot find " + symbol); assertNotNull(varDie); - varType = typeEntry.getType(varDie.getType()); + varType = typeFactory.getType(varDie.getType()); assertNotNull(varType); // System.out.println("Expect: " + symbol + "\\n'" + // expected + "'\\nGot:\\n'" + varType.toPrint()); @@ -175,7 +175,7 @@ if (len (sys.argv) == 1): usage() for t in sys.argv: if (t == "-help"): - print "Builds TestTypeEntry*.java from input files, using annotations" + print "Builds TestTypeFactory*.java from input files, using annotations" print "in the input files to describe the data type to be tested." print "e.g. Given:" print "static struct {" diff --git a/frysk-core/frysk/scopes/ChangeLog b/frysk-core/frysk/scopes/ChangeLog index ce72412..a7d9002 100644 --- a/frysk-core/frysk/scopes/ChangeLog +++ b/frysk-core/frysk/scopes/ChangeLog @@ -1,3 +1,14 @@ +2008-03-15 Andrew Cagney <cagney@redhat.com> + + * ScopeFactory.java: Update; TypeEntry -> TypeFactory. + * TestScopeFactory.java: Update. + * Subroutine.java: Ditto. + * LexicalBlock.java: Ditto. + * Enumeration.java: Ditto. + * Composite.java: Ditto. + * Scope.java: Ditto. + * Subprogram.java: Ditto. + 2008-03-03 Andrew Cagney <cagney@redhat.com> * TestDie.java: Use frysk.config. diff --git a/frysk-core/frysk/scopes/Composite.java b/frysk-core/frysk/scopes/Composite.java index 7c02cbd..31f250a 100644 --- a/frysk-core/frysk/scopes/Composite.java +++ b/frysk-core/frysk/scopes/Composite.java @@ -40,7 +40,7 @@ package frysk.scopes; import lib.dwfl.DwarfDie; -import frysk.debuginfo.TypeEntry; +import frysk.debuginfo.TypeFactory; import frysk.value.CompositeType; import frysk.value.ObjectDeclaration; import frysk.value.Type; @@ -54,9 +54,9 @@ public class Composite extends Scope { CompositeType compositeType; - public Composite(DwarfDie die, TypeEntry typeEntry) { - super(die, typeEntry); - this.compositeType = (CompositeType) typeEntry.getType(die); + public Composite(DwarfDie die, TypeFactory typeFactory) { + super(die, typeFactory); + this.compositeType = (CompositeType) typeFactory.getType(die); } public String getName(){ diff --git a/frysk-core/frysk/scopes/Enumeration.java b/frysk-core/frysk/scopes/Enumeration.java index 7613936..5d174e7 100644 --- a/frysk-core/frysk/scopes/Enumeration.java +++ b/frysk-core/frysk/scopes/Enumeration.java @@ -41,7 +41,7 @@ package frysk.scopes; import lib.dwfl.DwTag; import lib.dwfl.DwarfDie; -import frysk.debuginfo.TypeEntry; +import frysk.debuginfo.TypeFactory; import frysk.value.EnumType; import frysk.value.ObjectDeclaration; @@ -51,14 +51,14 @@ public class Enumeration { DwarfDie die; EnumType enumType; - Enumeration(DwarfDie die, TypeEntry typeEntry){ + Enumeration(DwarfDie die, TypeFactory typeFactory){ if(die.getTag() != DwTag.ENUMERATION_TYPE){ throw new RuntimeException("Given die is not of type ENUMERATION_TYPE"); } this.die = die; - this.enumType = (EnumType) typeEntry.getType(die); + this.enumType = (EnumType) typeFactory.getType(die); } diff --git a/frysk-core/frysk/scopes/LexicalBlock.java b/frysk-core/frysk/scopes/LexicalBlock.java index f4eed86..b5e5a49 100644 --- a/frysk-core/frysk/scopes/LexicalBlock.java +++ b/frysk-core/frysk/scopes/LexicalBlock.java @@ -43,16 +43,12 @@ package frysk.scopes; -import frysk.debuginfo.TypeEntry; +import frysk.debuginfo.TypeFactory; import lib.dwfl.DwarfDie; -public class LexicalBlock extends Scope -{ - - public LexicalBlock (DwarfDie die, TypeEntry typeEntry) - { - super(die, typeEntry); - } - +public class LexicalBlock extends Scope { + public LexicalBlock(DwarfDie die, TypeFactory typeFactory) { + super(die, typeFactory); + } } diff --git a/frysk-core/frysk/scopes/Scope.java b/frysk-core/frysk/scopes/Scope.java index d30d068..1a3e510 100644 --- a/frysk-core/frysk/scopes/Scope.java +++ b/frysk-core/frysk/scopes/Scope.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.LinkedList; import lib.dwfl.DwTag; import lib.dwfl.DwarfDie; import frysk.debuginfo.DebugInfoFrame; -import frysk.debuginfo.TypeEntry; +import frysk.debuginfo.TypeFactory; import frysk.value.ObjectDeclaration; import frysk.value.Variable; @@ -81,12 +81,12 @@ public class Scope LinkedList collections; - final TypeEntry typeEntry; + final TypeFactory typeFactory; - public Scope(DwarfDie die, TypeEntry typeEntry){ + public Scope(DwarfDie die, TypeFactory typeFactory){ this.die = die; this.scopes = new LinkedList(); - this.typeEntry = typeEntry; + this.typeFactory = typeFactory; } public Scope getOuter(){ @@ -135,7 +135,7 @@ public class Scope while(die != null){ if(die.getTag().equals(DwTag.ENUMERATION_TYPE)){ - this.collections.add(new Enumeration(die, typeEntry)); + this.collections.add(new Enumeration(die, typeFactory)); } die = die.getSibling(); diff --git a/frysk-core/frysk/scopes/ScopeFactory.java b/frysk-core/frysk/scopes/ScopeFactory.java index f6c4657..af3685f 100644 --- a/frysk-core/frysk/scopes/ScopeFactory.java +++ b/frysk-core/frysk/scopes/ScopeFactory.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 @@ -43,7 +43,7 @@ import java.util.HashMap; import lib.dwfl.DwTag; import lib.dwfl.DwarfDie; -import frysk.debuginfo.TypeEntry; +import frysk.debuginfo.TypeFactory; public class ScopeFactory { @@ -55,7 +55,7 @@ public class ScopeFactory { this.scopes = new HashMap(); } - public Scope getScope(DwarfDie die, TypeEntry typeEntry) { + public Scope getScope(DwarfDie die, TypeFactory typeFactory) { // this uses the object as a key so if // a second DwarfDie object is created that refers // to the same underlying die it will not match. @@ -66,22 +66,22 @@ public class ScopeFactory { Scope scope = (Scope) scopes.get(die); if (scope == null) { - scope = createScope(die, typeEntry); + scope = createScope(die, typeFactory); this.scopes.put(die, scope); } return scope; } - private Scope createScope(DwarfDie die, TypeEntry typeEntry) { + private Scope createScope(DwarfDie die, TypeFactory typeFactory) { switch (die.getTag().hashCode()) { case DwTag.INLINED_SUBROUTINE_: case DwTag.SUBPROGRAM_: - return new Subprogram(die, typeEntry); + return new Subprogram(die, typeFactory); case DwTag.LEXICAL_BLOCK_: - return new LexicalBlock(die, typeEntry); + return new LexicalBlock(die, typeFactory); case DwTag.COMPILE_UNIT_: case DwTag.MODULE_: case DwTag.WITH_STMT_: @@ -90,7 +90,7 @@ public class ScopeFactory { case DwTag.ENTRY_POINT_: case DwTag.NAMESPACE_: case DwTag.IMPORTED_UNIT_: - return new Scope(die, typeEntry); + return new Scope(die, typeFactory); default: throw new IllegalArgumentException("The given die ["+die + ": " + die.getTag()+"]is not a scope die"); } diff --git a/frysk-core/frysk/scopes/Subprogram.java b/frysk-core/frysk/scopes/Subprogram.java index d56ffb4..9c7e6a6 100644 --- a/frysk-core/frysk/scopes/Subprogram.java +++ b/frysk-core/frysk/scopes/Subprogram.java @@ -1,6 +1,6 @@ // This file is part of the program FRYSK. // -// Copyright 2005, Red Hat Inc. +// Copyright 2005, 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 @@ -51,7 +51,7 @@ import lib.dwfl.DwAt; import lib.dwfl.DwTag; import lib.dwfl.DwarfDie; import frysk.debuginfo.DebugInfoFrame; -import frysk.debuginfo.TypeEntry; +import frysk.debuginfo.TypeFactory; import frysk.value.ObjectDeclaration; import frysk.value.FunctionType; import frysk.value.Variable; @@ -67,8 +67,8 @@ public class Subprogram extends Subroutine private String name; - public Subprogram(DwarfDie die, TypeEntry typeEntry) { - super(die, typeEntry); + public Subprogram(DwarfDie die, TypeFactory typeFactory) { + super(die, typeFactory); this.name = die.getName(); parameters = new LinkedList(); diff --git a/frysk-core/frysk/scopes/Subroutine.java b/frysk-core/frysk/scopes/Subroutine.java index 3da1e9f..90f410e 100644 --- a/frysk-core/frysk/scopes/Subroutine.java +++ b/frysk-core/frysk/scopes/Subroutine.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 @@ -39,7 +39,7 @@ package frysk.scopes; -import frysk.debuginfo.TypeEntry; +import frysk.debuginfo.TypeFactory; import lib.dwfl.DwAt; import lib.dwfl.DwInl; import lib.dwfl.DwTag; @@ -53,8 +53,8 @@ public class Subroutine extends Scope { Composite struct; - public Subroutine(DwarfDie die, TypeEntry typeEntry) { - super(die, typeEntry); + public Subroutine(DwarfDie die, TypeFactory typeFactory) { + super(die, typeFactory); } /** @@ -73,7 +73,7 @@ public class Subroutine extends Scope { DwarfDie[] scopes = die.getScopesDie(); for (int i = 0; i < scopes.length; i++) { if (scopes[i].getTag().equals(DwTag.STRUCTURE_TYPE)) { hooks/post-receive -- frysk system monitor/debugger
reply other threads:[~2008-03-15 16:15 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=20080315161529.8908.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: linkBe 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).