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 Task.getIsa() to Task.getIsaFIXME().
Date: Mon, 07 Jan 2008 20:11:00 -0000	[thread overview]
Message-ID: <20080107201119.500.qmail@sourceware.org> (raw)

The branch, master has been updated
       via  eb0b2795d7a587efa279c1b304414a045048b5dc (commit)
      from  1212e8f93ec13d8277497e9d9566f7a9d1398b02 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit eb0b2795d7a587efa279c1b304414a045048b5dc
Author: Andrew Cagney <cagney@redhat.com>
Date:   Mon Jan 7 15:09:08 2008 -0500

    Rename Task.getIsa() to Task.getIsaFIXME().
    
    frysk-core/frysk/proc/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* Task.java (getIsaFIXME()): New; replace getIsa().
    	(isa, sendrecIsa()): Delete.
    	(hasIsa()): Update.
    	* Breakpoint.java: Update.
    	* Proc.java: Update.
    	* TestIsa.java: Update.
    
    frysk-core/frysk/proc/dead/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxCoreTask.java (sendrecIsa()): Delete.
    	* LinuxExeTask.java (sendrecIsa()): Delete.
    	* LinuxExeProc.java (getIsa()): Delete.
    	* LinuxCoreProc.java (getIsa()): Delete.
    	* TestLinuxCore.java: Update.
    
    frysk-core/frysk/proc/dummy/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* DummyTask.java (sendrecIsa()): Delete.
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* LinuxPtraceTask.java (getIsaFIXME()): Rename sendrecIsa().
    	* LinuxPtraceTaskState.java: Update.
    
    frysk-gui/frysk/gui/ChangeLog
    2008-01-07  Andrew Cagney  <cagney@redhat.com>
    
    	* test/TestWindowFactorization.java: Delete Task.getIsa() call.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/proc/Breakpoint.java              |    4 +-
 frysk-core/frysk/proc/ChangeLog                    |    7 +++
 frysk-core/frysk/proc/Proc.java                    |    2 +-
 frysk-core/frysk/proc/Task.java                    |   21 ++-------
 frysk-core/frysk/proc/TestIsa.java                 |   42 +++++++------------
 frysk-core/frysk/proc/dead/ChangeLog               |    6 +++
 frysk-core/frysk/proc/dead/LinuxCoreProc.java      |   10 -----
 frysk-core/frysk/proc/dead/LinuxCoreTask.java      |    5 --
 frysk-core/frysk/proc/dead/LinuxExeProc.java       |   11 -----
 frysk-core/frysk/proc/dead/LinuxExeTask.java       |    5 --
 frysk-core/frysk/proc/dead/TestLinuxCore.java      |    2 +-
 frysk-core/frysk/proc/dummy/ChangeLog              |    2 +
 frysk-core/frysk/proc/dummy/DummyTask.java         |    4 --
 frysk-core/frysk/proc/live/ChangeLog               |    3 +
 frysk-core/frysk/proc/live/LinuxPtraceTask.java    |    7 +--
 .../frysk/proc/live/LinuxPtraceTaskState.java      |    4 +-
 frysk-gui/frysk/gui/ChangeLog                      |    2 +
 .../frysk/gui/test/TestWindowFactorization.java    |    3 -
 18 files changed, 50 insertions(+), 90 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/Breakpoint.java b/frysk-core/frysk/proc/Breakpoint.java
index 9a7f0fb..8fc7e29 100644
--- a/frysk-core/frysk/proc/Breakpoint.java
+++ b/frysk-core/frysk/proc/Breakpoint.java
@@ -146,7 +146,7 @@ public class Breakpoint implements Comparable
   private void set(Task task)
   {
     ByteBuffer buffer = task.getRawMemory();
-    Isa isa = task.getIsa();
+    Isa isa = task.getIsaFIXME();
     Instruction bpInstruction = isa.getBreakpointInstruction();
     
     origInstruction = isa.getInstruction(buffer, address);
@@ -180,7 +180,7 @@ public class Breakpoint implements Comparable
     ByteBuffer buffer = task.getRawMemory();
     buffer.position(address);
     
-    Isa isa = task.getIsa();
+    Isa isa = task.getIsaFIXME();
     Instruction bpInstruction = isa.getBreakpointInstruction();
     byte[] bp = bpInstruction.getBytes();
 
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index a758040..3a72a91 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,5 +1,12 @@
 2008-01-07  Andrew Cagney  <cagney@redhat.com>
 
+	* Task.java (getIsaFIXME()): New; replace getIsa().
+	(isa, sendrecIsa()): Delete.
+	(hasIsa()): Update.
+	* Breakpoint.java: Update.
+	* Proc.java: Update.
+	* TestIsa.java: Update.
+	
 	* Proc.java (getIsa()): Delete.
 
 	* Task.java (setPC(long), getPC()): Make abstract.
diff --git a/frysk-core/frysk/proc/Proc.java b/frysk-core/frysk/proc/Proc.java
index c7c17a1..591f0fd 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 = getMainTask().getIsa();
+		    Isa isa = getMainTask().getIsaFIXME();
 		    outOfLineAddresses.addAll(isa.getOutOfLineAddresses(this));
 		    if (outOfLineAddresses.isEmpty())
 			throw new IllegalStateException("Isa.getOutOfLineAddresses"
diff --git a/frysk-core/frysk/proc/Task.java b/frysk-core/frysk/proc/Task.java
index fa77578..4798f2a 100644
--- a/frysk-core/frysk/proc/Task.java
+++ b/frysk-core/frysk/proc/Task.java
@@ -107,27 +107,17 @@ public abstract class Task {
 
     /**
      * Returns this Task's Instruction Set Architecture.
+     *
+     * FIXME: Should instead be using ISA.
      */
-    public final Isa getIsa() {
-	if (isa == null)
-	    isa = sendrecIsa();
-	return isa;
+    public Isa getIsaFIXME() {
+	return null;
     }
 
     public final boolean hasIsa() {
-	return (null != isa);
+	return (currentISA != null);
     }
 
-    /**
-     * This Task's Instruction Set Architecture.
-     */
-    private Isa isa;
- 
-    /**
-     * Fetch this Task's Instruction Set Architecture.
-     */
-    protected abstract Isa sendrecIsa();
-
     private SyscallTable syscallTable;
     public final SyscallTable getSyscallTable() {
 	if (syscallTable == null)
@@ -459,7 +449,6 @@ public abstract class Task {
     public abstract int getMod();
  
     public void clearIsa() {
-	isa = null;
 	memory = null;
 	registerBanks = null;
 	syscallTable = null;
diff --git a/frysk-core/frysk/proc/TestIsa.java b/frysk-core/frysk/proc/TestIsa.java
index 1ecb4e3..406c7c3 100644
--- a/frysk-core/frysk/proc/TestIsa.java
+++ b/frysk-core/frysk/proc/TestIsa.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2005, 2006, 2007, Red Hat Inc.
+// Copyright 2005, 2006, 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,8 +39,8 @@
 
 package frysk.proc;
 
+import frysk.isa.ISA;
 import java.util.Observable;
-import lib.dwfl.ElfEMachine;
 import frysk.testbed.TestLib;
 import frysk.testbed.TaskObserverBase;
 import frysk.testbed.ExecOffspring;
@@ -57,7 +57,7 @@ public class TestIsa
   {
     public Action updateAttached (Task task)
     {
-	task.getIsa();
+	task.getISA();
       
       assertTrue("task isa initialized", task.hasIsa());
       Manager.eventLoop.requestStop();
@@ -127,10 +127,10 @@ public class TestIsa
     secondMain.requestAddAttachedObserver(attacher);
     assertRunUntilStop("attach to second task");
 
-    assertNotNull("first task has Isa", firstMain.getIsa());
-    assertNotNull("second task has Isa", secondMain.getIsa());
+    assertNotNull("first task has Isa", firstMain.getISA());
+    assertNotNull("second task has Isa", secondMain.getISA());
     
-    assertSame(firstMain.getIsa(), secondMain.getIsa());
+    assertSame(firstMain.getISA(), secondMain.getISA());
   }
 
   public void testAttachedCreateChild ()
@@ -138,7 +138,7 @@ public class TestIsa
     SlaveOffspring ackProc = SlaveOffspring.createAttachedChild();
     Proc proc = ackProc.assertFindProcAndTasks();
 
-    assertNotNull("child has an isa", proc.getMainTask().getIsa());
+    assertNotNull("child has an isa", proc.getMainTask().getISA());
 
     ackProc.assertSendAddForkWaitForAcks();
 
@@ -150,7 +150,7 @@ public class TestIsa
 
     assertRunUntilStop("attach to child process");
 
-    assertNotNull("child has an isa", child.getMainTask().getIsa());
+    assertNotNull("child has an isa", child.getMainTask().getISA());
   }
 
   public void testAttachedCreateAttachedChild ()
@@ -183,7 +183,7 @@ public class TestIsa
 
     Proc child = (Proc) proc.getChildren().iterator().next();
 
-    assertNotNull("Child has an isa", child.getMainTask().getIsa());
+    assertNotNull("Child has an isa", child.getMainTask().getISA());
   }
   
   public void testAttachedCreateAttachedClone()
@@ -216,7 +216,7 @@ public class TestIsa
 
     Task clone = ackProc.findTaskUsingRefresh(false);
 
-    assertNotNull("Clone has an isa", clone.getIsa());
+    assertNotNull("Clone has an isa", clone.getISA());
   }
 
   public void testAttachDetachAttachAgainDetachAgainAttachAgainAgain ()
@@ -232,7 +232,7 @@ public class TestIsa
     task.requestAddAttachedObserver(attacher);
     assertRunUntilStop("First attach");
 
-    assertNotNull("Proc has an isa", proc.getMainTask().getIsa());
+    assertNotNull("Proc has an isa", proc.getMainTask().getISA());
 
     Task.taskStateDetached.addObserver(new DetachedObserver(task));
 
@@ -277,25 +277,15 @@ public class TestIsa
       assertRunUntilStop("Attaching to main task");
       
       ackProc.assertRunExec("execing 64-bit");
-      Isa isa64 = task.getIsa();
+      ISA isa64 = task.getISA();
       assertNotNull("64 bit isa", isa64);
       
       ackProc.assertRunExec("64-bit execing 32-bit");
-      assertNotNull("32 bit isa", task.getIsa());
-      assertNotSame("32 bit and 64 bit isa", task.getIsa(), isa64);
+      assertNotNull("32 bit isa", task.getISA());
+      assertNotSame("32 bit and 64 bit isa", task.getISA(), isa64);
       
       ackProc.assertRunExec("32-bit execing 64-bit");
-      assertNotNull("64 bit isa", task.getIsa());
-      assertSame("64 bit isa is a singleton", task.getIsa(), isa64);
-  }
-
-  public void testArbitraryISAInstantiation ()
-  {
-    IsaFactory factory = IsaFactory.getSingleton();
-    assertSame("Arbitrary x86_64  ISA",factory.getIsaForCoreFile(ElfEMachine.EM_X86_64),LinuxX8664.isaSingleton());
-    assertSame("Arbitrary i386  ISA",factory.getIsaForCoreFile(ElfEMachine.EM_386),LinuxIa32.isaSingleton());
-    assertSame("Arbitrary PPC64 ISA",factory.getIsaForCoreFile(ElfEMachine.EM_PPC64),LinuxPPC64.isaSingleton());
-    assertSame("Arbitrary PPC32 ISA",factory.getIsaForCoreFile(ElfEMachine.EM_PPC),LinuxPPC32.isaSingleton());
-
+      assertNotNull("64 bit isa", task.getISA());
+      assertSame("64 bit isa is a singleton", task.getISA(), isa64);
   }
 }
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index 931cc3d..b51a8a9 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,5 +1,11 @@
 2008-01-07  Andrew Cagney  <cagney@redhat.com>
 
+	* LinuxCoreTask.java (sendrecIsa()): Delete.
+	* LinuxExeTask.java (sendrecIsa()): Delete.
+	* LinuxExeProc.java (getIsa()): Delete.
+	* LinuxCoreProc.java (getIsa()): Delete.
+	* TestLinuxCore.java: Update.
+	
 	* LinuxExeProc.java (getIsa()): Make package-private.
 	(sendrecISA()): Make package-private.
 	* LinuxCoreProc.java: Ditto.
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreProc.java b/frysk-core/frysk/proc/dead/LinuxCoreProc.java
index 9c6c1b5..ca66266 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreProc.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreProc.java
@@ -52,15 +52,12 @@ import lib.dwfl.ElfSection;
 import lib.dwfl.ElfPrFPRegSet;
 import lib.dwfl.ElfPrXFPRegSet;
 import frysk.sys.proc.AuxvBuilder;
-import java.util.logging.Level;
 import java.util.Iterator;
 import java.io.File;
 import java.util.ArrayList;
 import frysk.proc.ProcId;
 import frysk.proc.Task;
 import frysk.proc.Auxv;
-import frysk.proc.Isa;
-import frysk.proc.IsaFactory;
 import frysk.proc.MemoryMap;
 import frysk.isa.ISA;
 import frysk.isa.ElfMap;
@@ -264,13 +261,6 @@ public class LinuxCoreProc extends DeadProc {
 	return ElfMap.getISA(header);
     }
 
-    Isa getIsa() {
-	logger.log(Level.FINE, "{0} sendrecIsa\n", this);
-	ElfEHeader header = elfData.getParent().getEHeader();
-	IsaFactory factory = IsaFactory.getSingleton();
-	return factory.getIsaForCoreFile(header.machine);
-    }
-
     /**
      * XXX: Meta Data construction functions.
      * Not really part of the implementation of proc, but has a very
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreTask.java b/frysk-core/frysk/proc/dead/LinuxCoreTask.java
index a8a39c8..3eb1bb7 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreTask.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreTask.java
@@ -46,7 +46,6 @@ import inua.eio.ByteBuffer;
 import inua.eio.ArrayByteBuffer;
 import inua.eio.ByteOrder;
 import frysk.proc.TaskId;
-import frysk.proc.Isa;
 import frysk.isa.ISA;
 import frysk.bank.RegisterBanks;
 import frysk.isa.RegistersFactory;
@@ -140,10 +139,6 @@ public class LinuxCoreTask extends DeadTask {
     	return ((LinuxCoreProc)getProc()).sendrecISA();
     }
 
-    protected Isa sendrecIsa() {
-	return ((LinuxCoreProc)getProc()).getIsa();
-    }
-
     public long getPC() {
 	return getRegister(RegistersFactory
 			   .getRegisters(getISA())
diff --git a/frysk-core/frysk/proc/dead/LinuxExeProc.java b/frysk-core/frysk/proc/dead/LinuxExeProc.java
index 5d3f1a6..185c140 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeProc.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeProc.java
@@ -42,16 +42,12 @@ package frysk.proc.dead;
 import inua.eio.ByteBuffer;
 
 import java.util.ArrayList;
-import java.util.logging.Level;
-
 import lib.dwfl.ElfEHeader;
 import lib.dwfl.ElfData;
 
 import frysk.isa.ISA;
 import frysk.isa.ElfMap;
-import frysk.proc.IsaFactory;
 import frysk.proc.Auxv;
-import frysk.proc.Isa;
 import frysk.proc.MemoryMap;
 import frysk.proc.ProcId;
 import frysk.proc.TaskId;
@@ -105,13 +101,6 @@ public class LinuxExeProc extends DeadProc {
 	return ElfMap.getISA(header);
     }
 
-    Isa getIsa() {
-	logger.log(Level.FINE, "{0} sendrecIsa\n", this);
-	ElfEHeader header = elfData.getParent().getEHeader();
-	IsaFactory factory = IsaFactory.getSingleton();
-	return factory.getIsaForCoreFile(header.machine);
-    }
-
     public MemoryMap[] getMaps() {
 	return (MemoryMap[]) metaData.toArray(new MemoryMap[metaData.size()]);
     }
diff --git a/frysk-core/frysk/proc/dead/LinuxExeTask.java b/frysk-core/frysk/proc/dead/LinuxExeTask.java
index b5c8a84..7354842 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeTask.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeTask.java
@@ -42,7 +42,6 @@ package frysk.proc.dead;
 import inua.eio.ArrayByteBuffer;
 import inua.eio.ByteBuffer;
 import frysk.bank.RegisterBanks;
-import frysk.proc.Isa;
 import frysk.proc.TaskId;
 import frysk.isa.ISA;
 
@@ -83,10 +82,6 @@ public class LinuxExeTask extends DeadTask {
       return ((LinuxExeProc)getProc()).sendrecISA();
   }
 
-  protected Isa sendrecIsa() {
-      return ((LinuxExeProc)getProc()).getIsa();
-  }
-
   protected ByteBuffer sendrecMemory () {
     return this.proc.sendrecMemory();
   }
diff --git a/frysk-core/frysk/proc/dead/TestLinuxCore.java b/frysk-core/frysk/proc/dead/TestLinuxCore.java
index 08ee95c..fd6cf43 100644
--- a/frysk-core/frysk/proc/dead/TestLinuxCore.java
+++ b/frysk-core/frysk/proc/dead/TestLinuxCore.java
@@ -360,7 +360,7 @@ public class TestLinuxCore
 	assertEquals("Task ID",threadPid[i],tasks[i].getTaskId().id);
 	assertEquals("Task TID",threadPid[i], tasks[i].getTid());
 	assertEquals("Task TID",threadName[i],tasks[i].getName());
-	assertNotNull("Task ISA",tasks[i].getIsa());
+	assertNotNull("Task ISA",tasks[i].getISA());
 	assertSame("Task getParent",proc,tasks[i].getProc());
 
 	assertEquals("note: ebx", ebx[i], tasks[i].getRegister(IA32Registers.EBX));
diff --git a/frysk-core/frysk/proc/dummy/ChangeLog b/frysk-core/frysk/proc/dummy/ChangeLog
index d4d493c..9927090 100644
--- a/frysk-core/frysk/proc/dummy/ChangeLog
+++ b/frysk-core/frysk/proc/dummy/ChangeLog
@@ -1,5 +1,7 @@
 2008-01-07  Andrew Cagney  <cagney@redhat.com>
 
+	* DummyTask.java (sendrecIsa()): Delete.
+
 	* DummyProc.java (getIsa()): Delete.
 
 	* DummyTask.java (getMod()): New.
diff --git a/frysk-core/frysk/proc/dummy/DummyTask.java b/frysk-core/frysk/proc/dummy/DummyTask.java
index a0b9cc4..f142c4f 100644
--- a/frysk-core/frysk/proc/dummy/DummyTask.java
+++ b/frysk-core/frysk/proc/dummy/DummyTask.java
@@ -41,7 +41,6 @@ package frysk.proc.dummy;
 
 import inua.eio.ByteBuffer;
 import frysk.proc.TaskObserver;
-import frysk.proc.Isa;
 import frysk.proc.TaskObservation;
 import frysk.isa.ISA;
 import frysk.bank.RegisterBanks;
@@ -56,9 +55,6 @@ public class DummyTask extends Task {
     public String getStateString() {
 	return "Attached";
     }
-    protected Isa sendrecIsa() {
-	return null;
-    }
     protected ISA sendrecISA() {
 	return null;
     }
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index fec8023..2d16ceb 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,5 +1,8 @@
 2008-01-07  Andrew Cagney  <cagney@redhat.com>
 
+	* LinuxPtraceTask.java (getIsaFIXME()): Rename sendrecIsa().
+	* LinuxPtraceTaskState.java: Update.
+
 	* LinuxPtraceProc.java (getIsa(), isaXXX): Delete.
 
 	* LinuxPtraceTask.java (setPC(long), getPC()): New.
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTask.java b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
index d2253ca..6d461ed 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTask.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
@@ -155,8 +155,7 @@ public class LinuxPtraceTask extends LiveTask {
      * XXX: This code locally, and not the IsaFactory, and definitly
      * not via a PID should be determining the ISA of the process.
      */
-    protected Isa sendrecIsa ()
-    {
+    public Isa getIsaFIXME() {
 	logger.log(Level.FINE, "{0} sendrecIsa\n", this);
 	IsaFactory factory = IsaFactory.getSingleton();
 	return factory.getIsa(getTid());
@@ -290,7 +289,7 @@ public class LinuxPtraceTask extends LiveTask {
 	logger.log(Level.FINE, "{0} sendStepInstruction\n", this);
 	sigSendXXX = sig;
         incrementMod();
-	syscallSigretXXX = getIsa().isAtSyscallSigReturn(this);
+	syscallSigretXXX = getIsaFIXME().isAtSyscallSigReturn(this);
 	try
 	    {
 		Ptrace.singleStep(getTid(), sig);
@@ -558,7 +557,7 @@ public class LinuxPtraceTask extends LiveTask {
     int notifyAttached() {
 	logger.log(Level.FINE, "{0} notifyAttached\n", this);
 	//Fill isa on attach.
-	getIsa();
+	getIsaFIXME();
 	for (Iterator i = attachedObservers.iterator(); i.hasNext();) {
 	    TaskObserver.Attached observer = (TaskObserver.Attached) i.next();
 	    if (observer.updateAttached(this) == Action.BLOCK)
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
index ff5f3c7..61924c7 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
@@ -990,7 +990,7 @@ class LinuxPtraceTaskState extends State {
 	  logger.log (Level.FINE, "{0} handleTrappedEvent\n", task);
 	  
 	  Isa isa;
-	  isa = task.getIsa();
+	  isa = task.getIsaFIXME();
 
 	  // First see if this was just an indication the we stepped.
 	  // And see if we were stepping a breakpoint.  Or whether we
@@ -1126,7 +1126,7 @@ class LinuxPtraceTaskState extends State {
       logger.log (Level.FINE, "{0} handleTrappedEvent\n", task);
       
       Isa isa;
-      isa = task.getIsa();
+      isa = task.getIsaFIXME();
       
       // First see if this was just an indication the we stepped.
       // And see if we were stepping a breakpoint.  Or whether we
diff --git a/frysk-gui/frysk/gui/ChangeLog b/frysk-gui/frysk/gui/ChangeLog
index 787740a..52ffb60 100644
--- a/frysk-gui/frysk/gui/ChangeLog
+++ b/frysk-gui/frysk/gui/ChangeLog
@@ -1,5 +1,7 @@
 2008-01-07  Andrew Cagney  <cagney@redhat.com>
 
+	* test/TestWindowFactorization.java: Delete Task.getIsa() call.
+
 	* disassembler/DisassemblyWindow.java: Update; use Task.getPC().
 	* memory/MemoryWindow.java: Ditto.
 
diff --git a/frysk-gui/frysk/gui/test/TestWindowFactorization.java b/frysk-gui/frysk/gui/test/TestWindowFactorization.java
index a9b95fa..df82c7e 100644
--- a/frysk-gui/frysk/gui/test/TestWindowFactorization.java
+++ b/frysk-gui/frysk/gui/test/TestWindowFactorization.java
@@ -140,10 +140,7 @@ public class TestWindowFactorization
 
     try
       {
-        if (theTask.getIsa() != null)
           rw.setTask(theTask);
-//        else
-//          System.out.println("ISA is null");
       }
     catch (Exception e)
       {


hooks/post-receive
--
frysk system monitor/debugger


                 reply	other threads:[~2008-01-07 20:11 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=20080107201119.500.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: link
Be 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).