[SCM] master: Update; Add PPC support and make it simpler.

[SCM] master: Update; Add PPC support and make it simpler.

[pzhao]

The branch, master has been updated
       via  5faccbd2210692c1128d3c6e9ba5e604861e5933 (commit)
      from  595237560666bb84b03dd7453107106e66beb7f6 (commit)

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

- Log -----------------------------------------------------------------
commit 5faccbd2210692c1128d3c6e9ba5e604861e5933
Author: Zhao Shujing <pearly.zhao@oracle.com>
Date:   Thu Nov 29 04:48:32 2007 +0800

    Update; Add PPC support and make it simpler.

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

Summary of changes:
 frysk-core/frysk/proc/live/ChangeLog           |    5 +++
 frysk-core/frysk/proc/live/TestByteBuffer.java |   39 +++++++++++------------
 2 files changed, 24 insertions(+), 20 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index db4c938..05f1824 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-28  Zhao Shujing  <pearly.zhao@oracle.com>
+
+	* TestByteBuffer.java (testMemoryBufferCapacity()): Update; Add PPC
+	support and make it simpler.
+
 2007-11-22  Zhao shujing  <pearly.zhao@oracle.com>
 
 	* TestByteBuffer.java (testMemoryBufferCapacity()): Fix bug 5394.
diff --git a/frysk-core/frysk/proc/live/TestByteBuffer.java b/frysk-core/frysk/proc/live/TestByteBuffer.java
index e99d920..e4510c9 100644
--- a/frysk-core/frysk/proc/live/TestByteBuffer.java
+++ b/frysk-core/frysk/proc/live/TestByteBuffer.java
@@ -40,14 +40,11 @@
 package frysk.proc.live;
 
 import inua.eio.ByteBuffer;
-import frysk.isa.ISA;
 import frysk.junit.TestCase;
 import frysk.proc.Task;
 import frysk.testbed.AttachedSelf;
-import frysk.testbed.ExecCommand;
-import frysk.testbed.ExecOffspring;
+import frysk.testbed.DaemonBlockedAtEntry;
 import frysk.testbed.LocalMemory;
-import frysk.testbed.TearDownFile;
 import frysk.sys.Ptrace.RegisterSet;
 import frysk.sys.Ptrace.AddressSpace;
 import frysk.proc.Manager;
@@ -270,22 +267,6 @@ public class TestByteBuffer
 	  verifyPeeks(registerBuffers[i], addr, origBytes);
 	}
     }
-    public void testMemoryBufferCapacity() {
-	TearDownFile tmpFile = TearDownFile.create();
-	ExecOffspring child
-		= new ExecOffspring(new ExecCommand (new String[] {
-						 "/bin/rm",
-						 tmpFile.toString()
-					     }));
-	Task task = child.findTaskUsingRefresh(true);
-	if (task.getISA() == ISA.IA32)
-		assertEquals("Memory Buffer Capacity: ", 0xffffffffL,
-		     task.getMemory().capacity());
-	if (task.getISA() == ISA.X8664)
-		assertEquals("Memory Buffer Capacity: ", 0xffffffffffffffffL,
-                     task.getMemory().capacity());
-    }
-
     private class AsyncPeeks
 	implements Runnable
     {
@@ -378,4 +359,22 @@ public class TestByteBuffer
 		    LocalMemory.getCodeBytes().length);
   }
 
+  public void testMemoryBufferCapacity() 
+  {
+    Task task = new DaemonBlockedAtEntry("funit-slave").getMainTask();
+    switch(task.getISA().wordSize()){
+	case 4:
+		assertEquals("Memory Buffer Capacity: ", 0xffffffffL,
+		     task.getMemory().capacity());
+		break;
+	case 8:
+		assertEquals("Memory Buffer Capacity: ", 0xffffffffffffffffL,
+                     task.getMemory().capacity());
+		break;
+	default:
+		fail("unknown word size");
+	}
+    }
+
+
 }


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