From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1861 invoked by alias); 28 Nov 2007 06:49:33 -0000 Received: (qmail 1811 invoked by uid 9714); 28 Nov 2007 06:49:32 -0000 Date: Wed, 28 Nov 2007 06:49:00 -0000 Message-ID: <20071128064932.1796.qmail@sourceware.org> From: pzhao@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Update; Add PPC support and make it simpler. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 595237560666bb84b03dd7453107106e66beb7f6 X-Git-Newrev: 5faccbd2210692c1128d3c6e9ba5e604861e5933 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/msg00475.txt.bz2 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 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 + + * TestByteBuffer.java (testMemoryBufferCapacity()): Update; Add PPC + support and make it simpler. + 2007-11-22 Zhao shujing * 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