[SCM] master: Merge branch 'master' of ssh://sources.redhat.com/git/frysk

[pmuldoon@sourceware.org]

The branch, master has been updated
       via  716f3e0e9bc0a9c6225e630b5848f7e01336da31 (commit)
       via  eda9aa443a4ff3ef9fe890978d2213295ffaf943 (commit)
      from  168572cc6fd3eb7cefd56f110bdafe8348c253e2 (commit)

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

- Log -----------------------------------------------------------------
commit 716f3e0e9bc0a9c6225e630b5848f7e01336da31
Merge: eda9aa443a4ff3ef9fe890978d2213295ffaf943 168572cc6fd3eb7cefd56f110bdafe8348c253e2
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Thu Jan 3 16:55:21 2008 +0000

    Merge branch 'master' of ssh://sources.redhat.com/git/frysk

commit eda9aa443a4ff3ef9fe890978d2213295ffaf943
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Thu Jan 3 16:54:36 2008 +0000

    Tweak BankRegisters in preperation for corefile FP usage
    
    2008-01-03  Phil Muldoon  <pmuldoon@redhat.com>
    
            * LinuxIA32RegisterBanks.java (FPREGS): Made X87Register.DP offset
            14 instead of 18.
            * BankRegister.java (access): Add write condition logic.
            Made public.
            (getRegister): Made public.
            * RegisterMap.java(entryIterator): Made public.

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

Summary of changes:
 frysk-core/frysk/bank/BankRegister.java           |   13 ++++++++-----
 frysk-core/frysk/bank/ChangeLog                   |    9 +++++++++
 frysk-core/frysk/bank/LinuxIA32RegisterBanks.java |    2 +-
 frysk-core/frysk/bank/RegisterMap.java            |    2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/bank/BankRegister.java b/frysk-core/frysk/bank/BankRegister.java
index 471fc82..8dd87db 100644
--- a/frysk-core/frysk/bank/BankRegister.java
+++ b/frysk-core/frysk/bank/BankRegister.java
@@ -58,7 +58,7 @@ public class BankRegister {
 	this.register = register;
     }
 
-    Register getRegister() {
+    public Register getRegister() {
 	return register;
     }
 
@@ -92,11 +92,14 @@ public class BankRegister {
 	return offset;
     }
 
-    void access(ByteBuffer byteBuffer, long offset, long size,
+    public void access(ByteBuffer byteBuffer, long offset, long size,
 		       byte[] bytes, int start, boolean write) {
-	if (write)
-	    // XXX: Should be directly supported by ByteBuffer.
-	    throw new RuntimeException("write not implemented");
+	if (write){
+		long position = byteBuffer.position();
+		byteBuffer.position(getOffset() + offset);
+		byteBuffer.put(bytes, (int)start, getLength());
+		byteBuffer.position(position);
+	}
 	else
 	    byteBuffer.get(this.offset + offset, bytes, start, (int) size);
     }
diff --git a/frysk-core/frysk/bank/ChangeLog b/frysk-core/frysk/bank/ChangeLog
index f3e43c9..d23ff81 100644
--- a/frysk-core/frysk/bank/ChangeLog
+++ b/frysk-core/frysk/bank/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-03  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* LinuxIA32RegisterBanks.java (FPREGS): Made X87Register.DP offset
+	14 instead of 18.
+	* BankRegister.java (access): Add write condition logic.
+	Made public.
+	(getRegister): Made public.
+	* RegisterMap.java(entryIterator): Made public. 
+
 2007-12-21  Andrew Cagney  <cagney@redhat.com>
 
 	* BankRegister.java (BankRegister(int,int,String)): Delete.
diff --git a/frysk-core/frysk/bank/LinuxIA32RegisterBanks.java b/frysk-core/frysk/bank/LinuxIA32RegisterBanks.java
index b6ff6bb..7481cb5 100644
--- a/frysk-core/frysk/bank/LinuxIA32RegisterBanks.java
+++ b/frysk-core/frysk/bank/LinuxIA32RegisterBanks.java
@@ -73,7 +73,7 @@ public class LinuxIA32RegisterBanks {
 	.add(new BankRegister(0x0c, 4, X87Registers.EIP))
 	.add(new BankRegister(0x10, 2, X87Registers.CS))
 	.add(new BankRegister(0x12, 2, X87Registers.FOP))
-	.add(new BankRegister(0x18, 4, X87Registers.DP))
+	.add(new BankRegister(0x14, 4, X87Registers.DP))
 	.add(new BankRegister(0x18, 2, X87Registers.DS))
 	.add(new BankRegister(0x1c, 10, X87Registers.ST0))
 	.add(new BankRegister(0x26, 10, X87Registers.ST1))
diff --git a/frysk-core/frysk/bank/RegisterMap.java b/frysk-core/frysk/bank/RegisterMap.java
index 0e5dbe1..6246903 100644
--- a/frysk-core/frysk/bank/RegisterMap.java
+++ b/frysk-core/frysk/bank/RegisterMap.java
@@ -55,7 +55,7 @@ class RegisterMap {
     /**
      * Return an iterator over all BankRegisters in the map.
      */
-    Iterator entryIterator() {
+    public Iterator entryIterator() {
 	// XXX: Uses nameToEntry as that contains more registers than
 	// registerToEntry.
 	return nameToEntry.values().iterator();


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