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

[pmuldoon at sourceware dot org]

The branch, master has been updated
       via  73c6fe8aca72acc92166db968b80e906a8af83a3 (commit)
       via  4072471e58e9fcf5149975ba6fb5c10b6cb15865 (commit)
      from  f409de5e8b941428f396bde156995f2e7acc4465 (commit)

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

- Log -----------------------------------------------------------------
commit 73c6fe8aca72acc92166db968b80e906a8af83a3
Merge: 4072471e58e9fcf5149975ba6fb5c10b6cb15865 f409de5e8b941428f396bde156995f2e7acc4465
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Wed Nov 28 13:08:21 2007 +0000

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

commit 4072471e58e9fcf5149975ba6fb5c10b6cb15865
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Wed Nov 28 13:07:57 2007 +0000

    Moved Corefile x8864 Register usage to Bank Register.
    
    2007-11-28  Phil Muldoon  <pmuldoon@redhat.com>
    
    	* X8664LinuxElfCorefile.java (writeNotePrstatus): Do not use
    	getRegisterByName(). Use static X8864 register constants, and
    	task.access()
    	(bytesToBigInteger): New temporary function, pending all arch
    	refactor.

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

Summary of changes:
 frysk-core/frysk/util/ChangeLog                  |    8 +++
 frysk-core/frysk/util/X8664LinuxElfCorefile.java |   66 +++++++++++++++++++---
 2 files changed, 66 insertions(+), 8 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/util/ChangeLog b/frysk-core/frysk/util/ChangeLog
index c5d7cc7..d1cda2f 100644
--- a/frysk-core/frysk/util/ChangeLog
+++ b/frysk-core/frysk/util/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-28  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* X8664LinuxElfCorefile.java (writeNotePrstatus): Do not use
+	getRegisterByName(). Use static X8864 register constants, and
+	task.access()
+	(bytesToBigInteger): New temporary function, pending all arch
+	refactor.
+
 2007-11-27  Tim Moore  <timoore@redhat.com>
 
 	* TestCountDownLatch.java (testCounters): Wrap await in while loop.
diff --git a/frysk-core/frysk/util/X8664LinuxElfCorefile.java b/frysk-core/frysk/util/X8664LinuxElfCorefile.java
index 02b474a..c2dab9d 100644
--- a/frysk-core/frysk/util/X8664LinuxElfCorefile.java
+++ b/frysk-core/frysk/util/X8664LinuxElfCorefile.java
@@ -39,9 +39,14 @@
 
 package frysk.util;
 
+import java.math.BigInteger;
+
+import frysk.isa.Register;
+import frysk.isa.X8664Registers;
 import frysk.proc.Proc;
 import frysk.proc.Task;
 import inua.eio.ByteBuffer;
+import inua.eio.ByteOrder;
 
 import lib.dwfl.ElfNhdr;
 import lib.dwfl.ElfNhdrType;
@@ -175,16 +180,43 @@ public class X8664LinuxElfCorefile extends LinuxElfCorefile {
 	// Order for these registers is found in /usr/include/asm/user.h
 	// This is not the same order that frysk iterators print out, nor
 	// are the names are the same. Create a string[] map to bridge
-	// gap between frysk and core file register order.
-	String regMap[] = { "r15", "r14", "r13", "r12", "rbp", "rbx", "r11",
-		"r10", "r9", "r8", "rax", "rcx", "rdx", "rsi",
-		"rdi", "orig_rax", "rip", "cs", "rflags", "rsp",
-		"ss", "fs_base", "gs_base", "ds", "es", "fs", "gs" };
-
+	// gap between frysk and core file register order.        
+	
+	Register[] ptraceRegisterMap = {
+	  X8664Registers.R15,
+	  X8664Registers.R14,
+	  X8664Registers.R13,
+	  X8664Registers.R12,
+	  X8664Registers.RBP,
+	  X8664Registers.RBX,
+	  X8664Registers.R11,
+	  X8664Registers.R10,
+	  X8664Registers.R9,
+	  X8664Registers.R8,
+	  X8664Registers.RAX,
+	  X8664Registers.RCX,
+	  X8664Registers.RDX,				      
+	  X8664Registers.RSI,
+	  X8664Registers.RDI,
+	  X8664Registers.ORIG_RAX,
+	  X8664Registers.RIP,
+	  X8664Registers.CS,
+	  X8664Registers.RFLAGS,
+	  X8664Registers.RSP,
+	  X8664Registers.SS,
+	  X8664Registers.FS_BASE,
+	  X8664Registers.GS_BASE,
+	  X8664Registers.DS,
+	  X8664Registers.ES,
+	  X8664Registers.FS,
+	  X8664Registers.GS};
 
 	// Set GP register info
-	for (int i = 0; i < regMap.length; i++) {
-	    prStatus.setPrGPReg(i, task.getBigIntegerRegisterFIXME(regMap[i]));
+	for (int i = 0; i < ptraceRegisterMap.length; i++) {
+	  int registerSize = ptraceRegisterMap[i].getType().getSize();
+	  byte[] byteOrderedRegister = new byte[registerSize];
+	  task.access(ptraceRegisterMap[i], 0, registerSize,	byteOrderedRegister, 0, false);
+	  prStatus.setPrGPReg(i,bytesToBigInteger(byteOrderedRegister));
 	}
 
 	// Write it
@@ -252,4 +284,22 @@ public class X8664LinuxElfCorefile extends LinuxElfCorefile {
     protected byte getElfMachineClass() {
 	return ElfEHeader.PHEADER_ELFCLASS64;
     }
+    
+    // XXX: Function to convert bytes[] to BigInteger. 
+    // Will disappear when all BankRegisters are present on all
+    // all architectures, and  we can call task.access() on all 
+    // registers, and not convert to BigInteger.
+    private BigInteger bytesToBigInteger(byte[] bytes)
+    {
+    	if (this.process.getMainTask().getISA().order() == ByteOrder.LITTLE_ENDIAN) {
+	    for (int left = 0; left < bytes.length / 2; left++) {
+		int right = bytes.length - 1 - left;
+		byte temp = bytes[left];
+		bytes[left] = bytes[right];
+		bytes[right] = temp;
+	    }
+	}
+	return new BigInteger(bytes);
+    }
+
 }


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