From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9460 invoked by alias); 7 Jan 2008 19:35:07 -0000 Received: (qmail 9435 invoked by uid 367); 7 Jan 2008 19:35:07 -0000 Date: Mon, 07 Jan 2008 19:35:00 -0000 Message-ID: <20080107193507.9420.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Delete Proc.getIsa. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9374e6ea92b30da95ee42d8629d29dbd92d01845 X-Git-Newrev: 1212e8f93ec13d8277497e9d9566f7a9d1398b02 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-q1/txt/msg00022.txt.bz2 The branch, master has been updated via 1212e8f93ec13d8277497e9d9566f7a9d1398b02 (commit) from 9374e6ea92b30da95ee42d8629d29dbd92d01845 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 1212e8f93ec13d8277497e9d9566f7a9d1398b02 Author: Andrew Cagney Date: Mon Jan 7 14:31:51 2008 -0500 Delete Proc.getIsa. frysk-core/frysk/proc/ChangeLog 2008-01-07 Andrew Cagney * Proc.java (getIsa()): Delete. frysk-core/frysk/proc/dead/ChangeLog 2008-01-07 Andrew Cagney * LinuxExeProc.java (getIsa()): Make package-private. (sendrecISA()): Make package-private. * LinuxCoreProc.java: Ditto. * LinuxExeTask.java: Update. * LinuxCoreTask.java: Update. frysk-core/frysk/proc/dummy/ChangeLog 2008-01-07 Andrew Cagney * DummyProc.java (getIsa()): Delete. frysk-core/frysk/proc/live/ChangeLog 2008-01-07 Andrew Cagney * LinuxPtraceProc.java (getIsa(), isaXXX): Delete. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/ChangeLog | 2 ++ frysk-core/frysk/proc/Proc.java | 8 +------- frysk-core/frysk/proc/dead/ChangeLog | 6 ++++++ frysk-core/frysk/proc/dead/LinuxCoreProc.java | 5 ++--- frysk-core/frysk/proc/dead/LinuxCoreTask.java | 2 +- frysk-core/frysk/proc/dead/LinuxExeProc.java | 4 ++-- frysk-core/frysk/proc/dead/LinuxExeTask.java | 2 +- frysk-core/frysk/proc/dummy/ChangeLog | 2 ++ frysk-core/frysk/proc/dummy/DummyProc.java | 4 ---- frysk-core/frysk/proc/live/ChangeLog | 2 ++ frysk-core/frysk/proc/live/LinuxPtraceProc.java | 12 ------------ 11 files changed, 19 insertions(+), 30 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog index a5a931a..a758040 100644 --- a/frysk-core/frysk/proc/ChangeLog +++ b/frysk-core/frysk/proc/ChangeLog @@ -1,5 +1,7 @@ 2008-01-07 Andrew Cagney + * Proc.java (getIsa()): Delete. + * Task.java (setPC(long), getPC()): Make abstract. (pcRegister, pcRegister()): Delete. diff --git a/frysk-core/frysk/proc/Proc.java b/frysk-core/frysk/proc/Proc.java index f0ffe0a..c7c17a1 100644 --- a/frysk-core/frysk/proc/Proc.java +++ b/frysk-core/frysk/proc/Proc.java @@ -167,7 +167,7 @@ public abstract class Proc { synchronized (outOfLineAddresses) { while (outOfLineAddresses.isEmpty()) { if (! requestedOutOfLineAddresses) { - Isa isa = getIsa(); + Isa isa = getMainTask().getIsa(); outOfLineAddresses.addAll(isa.getOutOfLineAddresses(this)); if (outOfLineAddresses.isEmpty()) throw new IllegalStateException("Isa.getOutOfLineAddresses" @@ -429,12 +429,6 @@ public abstract class Proc { public abstract Auxv[] getAuxv(); /** - * Get the Isa object associated with the process. Only use this - * when you don't have a Task object to interrogate. - */ - public abstract Isa getIsa(); - - /** * The process has transitioned to the attached state. XXX: Should * be made private and instead accessor methods added. Should more * formally define the observable and the event. diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog index ecb988a..931cc3d 100644 --- a/frysk-core/frysk/proc/dead/ChangeLog +++ b/frysk-core/frysk/proc/dead/ChangeLog @@ -1,5 +1,11 @@ 2008-01-07 Andrew Cagney + * LinuxExeProc.java (getIsa()): Make package-private. + (sendrecISA()): Make package-private. + * LinuxCoreProc.java: Ditto. + * LinuxExeTask.java: Update. + * LinuxCoreTask.java: Update. + * LinuxCoreTask.java (getPC()): New. * LinuxExeTask.java (getPC()): New. * DeadTask.java (setPC(long)): New. diff --git a/frysk-core/frysk/proc/dead/LinuxCoreProc.java b/frysk-core/frysk/proc/dead/LinuxCoreProc.java index 2104dcc..9c6c1b5 100644 --- a/frysk-core/frysk/proc/dead/LinuxCoreProc.java +++ b/frysk-core/frysk/proc/dead/LinuxCoreProc.java @@ -259,13 +259,12 @@ public class LinuxCoreProc extends DeadProc { return auxv; } - protected ISA sendrecISA() { + ISA sendrecISA() { ElfEHeader header = elfData.getParent().getEHeader(); return ElfMap.getISA(header); } - - public Isa getIsa() { + Isa getIsa() { logger.log(Level.FINE, "{0} sendrecIsa\n", this); ElfEHeader header = elfData.getParent().getEHeader(); IsaFactory factory = IsaFactory.getSingleton(); diff --git a/frysk-core/frysk/proc/dead/LinuxCoreTask.java b/frysk-core/frysk/proc/dead/LinuxCoreTask.java index 8a4f041..a8a39c8 100644 --- a/frysk-core/frysk/proc/dead/LinuxCoreTask.java +++ b/frysk-core/frysk/proc/dead/LinuxCoreTask.java @@ -141,7 +141,7 @@ public class LinuxCoreTask extends DeadTask { } protected Isa sendrecIsa() { - return getProc().getIsa(); + return ((LinuxCoreProc)getProc()).getIsa(); } public long getPC() { diff --git a/frysk-core/frysk/proc/dead/LinuxExeProc.java b/frysk-core/frysk/proc/dead/LinuxExeProc.java index 30cc970..5d3f1a6 100644 --- a/frysk-core/frysk/proc/dead/LinuxExeProc.java +++ b/frysk-core/frysk/proc/dead/LinuxExeProc.java @@ -100,12 +100,12 @@ public class LinuxExeProc extends DeadProc { return 0; } - protected ISA sendrecISA() { + ISA sendrecISA() { ElfEHeader header = elfData.getParent().getEHeader(); return ElfMap.getISA(header); } - public Isa getIsa() { + Isa getIsa() { logger.log(Level.FINE, "{0} sendrecIsa\n", this); ElfEHeader header = elfData.getParent().getEHeader(); IsaFactory factory = IsaFactory.getSingleton(); diff --git a/frysk-core/frysk/proc/dead/LinuxExeTask.java b/frysk-core/frysk/proc/dead/LinuxExeTask.java index 0d14acd..b5c8a84 100644 --- a/frysk-core/frysk/proc/dead/LinuxExeTask.java +++ b/frysk-core/frysk/proc/dead/LinuxExeTask.java @@ -84,7 +84,7 @@ public class LinuxExeTask extends DeadTask { } protected Isa sendrecIsa() { - return getProc().getIsa(); + return ((LinuxExeProc)getProc()).getIsa(); } protected ByteBuffer sendrecMemory () { diff --git a/frysk-core/frysk/proc/dummy/ChangeLog b/frysk-core/frysk/proc/dummy/ChangeLog index 1d7c444..d4d493c 100644 --- a/frysk-core/frysk/proc/dummy/ChangeLog +++ b/frysk-core/frysk/proc/dummy/ChangeLog @@ -1,5 +1,7 @@ 2008-01-07 Andrew Cagney + * DummyProc.java (getIsa()): Delete. + * DummyTask.java (getMod()): New. * DummyProc.java (getCommand()): Replace sendrecCommand(). diff --git a/frysk-core/frysk/proc/dummy/DummyProc.java b/frysk-core/frysk/proc/dummy/DummyProc.java index 593d671..cc08436 100644 --- a/frysk-core/frysk/proc/dummy/DummyProc.java +++ b/frysk-core/frysk/proc/dummy/DummyProc.java @@ -41,7 +41,6 @@ package frysk.proc.dummy; import frysk.proc.Auxv; import frysk.proc.ProcId; -import frysk.proc.Isa; import frysk.proc.MemoryMap; import frysk.proc.Proc; import frysk.proc.TaskObservation; @@ -74,9 +73,6 @@ public class DummyProc extends Proc { public Auxv[] getAuxv() { return null; } - public Isa getIsa() { - return null; - } protected String getStateFIXME() { return ""; } diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog index 581a410..fec8023 100644 --- a/frysk-core/frysk/proc/live/ChangeLog +++ b/frysk-core/frysk/proc/live/ChangeLog @@ -1,5 +1,7 @@ 2008-01-07 Andrew Cagney + * LinuxPtraceProc.java (getIsa(), isaXXX): Delete. + * LinuxPtraceTask.java (setPC(long), getPC()): New. (pcRegister, pcRegister()): New. diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProc.java b/frysk-core/frysk/proc/live/LinuxPtraceProc.java index 5fe1aaa..99f9eef 100644 --- a/frysk-core/frysk/proc/live/LinuxPtraceProc.java +++ b/frysk-core/frysk/proc/live/LinuxPtraceProc.java @@ -51,11 +51,9 @@ import frysk.proc.Auxv; import frysk.sys.proc.AuxvBuilder; import frysk.proc.MemoryMap; import java.util.ArrayList; -import frysk.proc.Isa; import frysk.sys.proc.CmdLineBuilder; import frysk.sys.proc.MapsBuilder; import frysk.sys.proc.Status; -import frysk.proc.IsaFactory; import java.util.logging.Level; import frysk.sys.proc.ProcBuilder; import java.util.Map; @@ -210,16 +208,6 @@ public class LinuxPtraceProc extends LiveProc { return exe; } - private Isa isaXXX; - public Isa getIsa() { - if (isaXXX == null) { - logger.log(Level.FINE, "{0} sendrecIsa\n", this); - IsaFactory factory = IsaFactory.getSingleton(); - this.isaXXX = factory.getIsa(getId().intValue()); - } - return isaXXX; - } - /** * If it hasn't already been read, read the stat structure. */ hooks/post-receive -- frysk system monitor/debugger