Re: [SCM] master: Untangle read_only and source variables.

Re: [SCM] master: Untangle read_only and source variables.

[Phil Muldoon]

This commit untangles the read only, and write funit-watchpoint.S 
operations so it will   not affect other tests. Also actually read the 
value in read_only. Because the operations are untangled, the Continue 
test should only be  hit once.

Regards

Phil

pmuldoon@sourceware.org wrote:
> The branch, master has been updated
>        via  31ece4d92880db8625f44f94f09688bb2704e449 (commit)
>       from  f456c6b56d21b6d9b2f6921103ee6b0515b2cd15 (commit)
>
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email.
>
> - Log -----------------------------------------------------------------
> commit 31ece4d92880db8625f44f94f09688bb2704e449
> Author: Phil Muldoon <pmuldoon@redhat.com>
> Date:   Tue Apr 15 17:00:07 2008 +0100
>
>     Untangle read_only and source variables.
>     
>     2008-04-15  Phil Muldoon  <pmuldoon@redhat.com>
>     
>     	* TestTaskObserverWatchpoint.java (testWatchpointActionContinue): Reset
>     	expected hit count to 1.
>     
>     2008-04-15  Phil Muldoon  <pmuldoon@redhat.com>
>     
>     	* funit-watchpoint.S: Don't add read_only to
>     	source.
>
> -----------------------------------------------------------------------
>
> Summary of changes:
>  frysk-core/frysk/pkglibdir/ChangeLog               |    5 +++++
>  frysk-core/frysk/pkglibdir/funit-watchpoint.S      |    5 ++---
>  frysk-core/frysk/proc/ChangeLog                    |    5 +++++
>  .../frysk/proc/TestTaskObserverWatchpoint.java     |    2 +-
>  4 files changed, 13 insertions(+), 4 deletions(-)
>
> First 500 lines of diff:
> diff --git a/frysk-core/frysk/pkglibdir/ChangeLog b/frysk-core/frysk/pkglibdir/ChangeLog
> index d0090ce..c01e980 100644
> --- a/frysk-core/frysk/pkglibdir/ChangeLog
> +++ b/frysk-core/frysk/pkglibdir/ChangeLog
> @@ -1,3 +1,8 @@
> +2008-04-15  Phil Muldoon  <pmuldoon@redhat.com>
> +
> +	* funit-watchpoint.S: Don't add read_only to
> +	source.
> +
>  2008-04-14  Phil Muldoon  <pmuldoon@redhat.com>
>  
>  	* funit-watchpoint.S: Add new read_only WORD
> diff --git a/frysk-core/frysk/pkglibdir/funit-watchpoint.S b/frysk-core/frysk/pkglibdir/funit-watchpoint.S
> index cfb0f39..a8b39ee 100644
> --- a/frysk-core/frysk/pkglibdir/funit-watchpoint.S
> +++ b/frysk-core/frysk/pkglibdir/funit-watchpoint.S
> @@ -64,10 +64,9 @@ NOP
>  STORE_WORD(REG3, REG1)
>  NOP
>  
> -NOP
> -// Read read_only memory, and copy it to source
> +// Read read_only memory.
>  LOAD_IMMED_WORD(REG3, read_only)
> -STORE_WORD(REG3, REG1)
> +LOAD_WORD(REG3, REG3)
>  NOP
>  
>  
> diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
> index a671460..ce16160 100644
> --- a/frysk-core/frysk/proc/ChangeLog
> +++ b/frysk-core/frysk/proc/ChangeLog
> @@ -1,3 +1,8 @@
> +2008-04-15  Phil Muldoon  <pmuldoon@redhat.com>
> +
> +	* TestTaskObserverWatchpoint.java (testWatchpointActionContinue): Reset
> +	expected hit count to 1.
> +
>  2008-04-14  Phil Muldoon  <pmuldoon@redhat.com>
>  
>  	* TestTaskObserverWatchpoint.java (testRunningAndReadOnlyWatchpoint): New.
> diff --git a/frysk-core/frysk/proc/TestTaskObserverWatchpoint.java b/frysk-core/frysk/proc/TestTaskObserverWatchpoint.java
> index 6650fe3..2fde8c2 100644
> --- a/frysk-core/frysk/proc/TestTaskObserverWatchpoint.java
> +++ b/frysk-core/frysk/proc/TestTaskObserverWatchpoint.java
> @@ -346,7 +346,7 @@ extends TestLib
>  
>  	// Make sure it triggered.
>  	assertTrue("added", watch.added);
> -	assertEquals("hit code", 2, watch.hit);
> +	assertEquals("hit code", 1, watch.hit);
>  	assertEquals("Task terminated", 1, to.hit);
>      }
>  
>
>
> hooks/post-receive
> --
> frysk system monitor/debugger
>