Re: frysk-core/frysk gui/ChangeLog stack/RemoteFra ...

[Mark Wielaard <mark@klomp.org>]

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

Hi,

On Mon, 2007-08-13 at 22:11 +0000, npremji@sourceware.org wrote:
> 	* RemoteFrame.java (getRegisterValue): Check for floating point registers.
> 	Don't throw a null pointer if register can't be located.

This is the patch that broke a couple of tests on x86_64. Reverting it
makes the tests in frysk.debuginfo.TestFrameDebugInfo and
frysk.rt.TestUpdatingDisplayValue that throw NullPointerExceptions PASS
again.

I suspect that the test for whether or not this is a floating point
register fails on x86_64. Could you take a look?

Thanks,

Mark

[-- Attachment #2: RemoteFrame-nullpointer.diff --]
[-- Type: text/x-patch, Size: 1649 bytes --]

Index: frysk-core/frysk/stack/RemoteFrame.java
===================================================================
RCS file: /cvs/frysk/frysk-core/frysk/stack/RemoteFrame.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- frysk-core/frysk/stack/RemoteFrame.java	1 Aug 2007 18:50:15 -0000	1.10
+++ frysk-core/frysk/stack/RemoteFrame.java	13 Aug 2007 22:11:41 -0000	1.11
@@ -54,6 +54,7 @@
 import frysk.symtab.Symbol;
 import frysk.symtab.SymbolFactory;
 
+import frysk.value.StandardTypes;
 import frysk.value.Value;
 
 class RemoteFrame extends Frame
@@ -144,15 +145,24 @@
   }
   
   public Value getRegisterValue(Register register) {
-	logger.log(Level.FINE, "{0}: getRegisterValue register: {1}",
+	logger.log(Level.FINE, "{0}: getRegisterValue register: {1}\n",
 		new Object[] { this, register });
 	Isa isa = task.getIsa();
 	byte[] word = new byte[register.type.getSize()];
 	RegisterMap map = UnwindRegisterMapFactory.getRegisterMap(isa);
 
-	if (cursor.getRegister(map.getRegisterNumber(register), word) < 0)
+	try {
+	    if (register.type == StandardTypes.getIntType(isa)) {
+		if (cursor.getRegister(map.getRegisterNumber(register), word) < 0)
+		    return null;
+	    } else {
+		if (cursor.getFPRegister(map.getRegisterNumber(register), word) < 0)
+		    return null;
+	    }
+	} catch (NullPointerException exception) {
+	    logger.log(Level.WARNING, "{0}: couldn't get register: {1}\n", new Object[] {this, register});
 	    return null;
-
+	}
 	ArrayByteBuffer buffer = new ArrayByteBuffer(word);
 	buffer.order(register.type.getEndian());
 	return new Value(register.type, register.name, buffer);