Re: frysk-core/frysk debuginfo/ChangeLog debuginfo ...

Re: frysk-core/frysk debuginfo/ChangeLog debuginfo ...

[Mark Wielaard]

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

Hi Andrew,

On Fri, 2007-10-12 at 21:53 +0000, cagney@sourceware.org wrote:
> 	Index: frysk-core/frysk/debuginfo/ChangeLog
> 	2007-10-12  Andrew Cagney  <cagney@redhat.com>
> 	
> 	* DebugInfo.java: Update; do not throw NameNotFoundException.  Do
> 	not use CExprAnnotator.
> 	* DebugInfoEvaluator.java: Ditto.

This breaks the build since frysk-gui still thinks that various methods
throw this exception and try to catch it. The following patch fixes the
build.

2007-09-13  Mark Wielaard  <mwielaard@redhat.com>

        * SourceView.java (clickedOnTextArea): Don't catch
        NameNotFoundException.
        * SourceBuffer.java (getVariable): Likewise.
        * InlineSourceView.java (mouseEvent): Likewise.
        * InlineBuffer.java (getVariable): Likewise.

A quick test run of FryskGui looks fine. But switching source buffers
(clicking on different frames in the stack associated with functions in
different source files) is super slow. I don't know if that was also
that way before and currently working over remote X which is naturally
slow. Maybe someone could double check that the error handling in these
code paths is sane.

Cheers,

Mark

[-- Attachment #2: gui-name-exception.patch --]
[-- Type: text/x-patch, Size: 4442 bytes --]

Index: frysk-gui/frysk/gui/srcwin/SourceView.java
===================================================================
RCS file: /cvs/frysk/frysk-gui/frysk/gui/srcwin/SourceView.java,v
retrieving revision 1.64
diff -u -r1.64 SourceView.java
--- frysk-gui/frysk/gui/srcwin/SourceView.java	30 Aug 2007 19:28:23 -0000	1.64
+++ frysk-gui/frysk/gui/srcwin/SourceView.java	13 Oct 2007 18:15:15 -0000
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2005, Red Hat Inc.
+// Copyright 2005, 2007 Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -43,8 +43,6 @@
 import java.util.HashMap;
 import java.util.List;
 
-import javax.naming.NameNotFoundException;
-
 import org.gnu.gdk.Color;
 import org.gnu.gdk.Cursor;
 import org.gnu.gdk.CursorType;
@@ -894,8 +892,6 @@
 		     
 		} catch (ParseException e) {
 		    System.out.println(e.getMessage());
-		} catch (NameNotFoundException n) {
-		    System.err.println(n.getMessage());
 		}
 		
 		valueItem = new MenuItem("Value of " + varText + ": "
Index: frysk-gui/frysk/gui/srcwin/SourceBuffer.java
===================================================================
RCS file: /cvs/frysk/frysk-gui/frysk/gui/srcwin/SourceBuffer.java,v
retrieving revision 1.139
diff -u -r1.139 SourceBuffer.java
--- frysk-gui/frysk/gui/srcwin/SourceBuffer.java	30 Aug 2007 19:28:23 -0000	1.139
+++ frysk-gui/frysk/gui/srcwin/SourceBuffer.java	13 Oct 2007 18:15:15 -0000
@@ -49,8 +49,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.naming.NameNotFoundException;
-
 import lib.opcodes.Disassembler;
 import lib.opcodes.Instruction;
 
@@ -651,9 +649,6 @@
 	} catch (ParseException e) {
 	    System.out.println(e.getMessage());
 	    return null;
-	} catch (NameNotFoundException n) {
-	    System.err.println(n.getMessage());
-	    return null;
 	}
 	
 	return getWordAtIter(iter);
@@ -682,9 +677,6 @@
 	} catch (ParseException e) {
 	    System.out.println(e.getMessage());
 	    return null;
-	} catch (NameNotFoundException n) {
-	    // n.printStackTrace();
-	    return null;
 	}
 
 	return var;
Index: frysk-gui/frysk/gui/srcwin/InlineSourceView.java
===================================================================
RCS file: /cvs/frysk/frysk-gui/frysk/gui/srcwin/InlineSourceView.java,v
retrieving revision 1.21
diff -u -r1.21 InlineSourceView.java
--- frysk-gui/frysk/gui/srcwin/InlineSourceView.java	30 Aug 2007 19:28:23 -0000	1.21
+++ frysk-gui/frysk/gui/srcwin/InlineSourceView.java	13 Oct 2007 18:15:15 -0000
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2005, Red Hat Inc.
+// Copyright 2005, 2007 Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -40,8 +40,6 @@
 
 import java.text.ParseException;
 
-import javax.naming.NameNotFoundException;
-
 import org.gnu.gdk.GC;
 import org.gnu.gdk.Point;
 import org.gnu.gdk.Window;
@@ -259,8 +257,6 @@
 		     
 		} catch (ParseException e) {
 		    System.out.println(e.getMessage());
-		} catch (NameNotFoundException n) {
-		    System.err.println(n.getMessage());
 		}
 		valueItem = new MenuItem("Value: " + var.toPrint(), true);
 		valueItem.setSensitive(false);
Index: frysk-gui/frysk/gui/srcwin/InlineBuffer.java
===================================================================
RCS file: /cvs/frysk/frysk-gui/frysk/gui/srcwin/InlineBuffer.java,v
retrieving revision 1.52
diff -u -r1.52 InlineBuffer.java
--- frysk-gui/frysk/gui/srcwin/InlineBuffer.java	30 Aug 2007 19:28:23 -0000	1.52
+++ frysk-gui/frysk/gui/srcwin/InlineBuffer.java	13 Oct 2007 18:15:15 -0000
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2005, Red Hat Inc.
+// Copyright 2005, 2007 Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -43,8 +43,6 @@
 import java.text.ParseException;
 import java.util.Iterator;
 
-import javax.naming.NameNotFoundException;
-
 import org.gnu.gtk.TextChildAnchor;
 import org.gnu.gtk.TextIter;
 import org.jdom.Element;
@@ -225,10 +223,6 @@
       {
         return null;
       }
-    catch (NameNotFoundException n)
-      {
-        return null;
-      }
     
     return getWordAtIter(iter);
   }

Re: frysk-core/frysk debuginfo/ChangeLog debuginfo ...

[Mark Wielaard]

Hi Andrew,

On Mon, 2007-08-13 at 23:42 +0000, cagney@sourceware.org wrote:
> 	2007-08-13  Andrew Cagney  <cagney@redhat.com>
> 	
> 	* Value.java (asLong): Replace longValue.
> 	(intValue): Delete.
> 	* ArithmeticType.java: Use asLong.
> 	* PointerType.java: Ditto.

Found one more place this needed replaced. Fixed as follows:

2007-08-14  Mark Wielaard  <mwielaard@redhat.com>

       * InlineSourceView.java (mouseEvent): Use asLong instead of
       longValue.

Cheers,

Mark

diff -u -r1.19 InlineSourceView.java
--- frysk-gui/frysk/gui/srcwin/InlineSourceView.java    31 Jul 2007 20:31:50 -0000      1.19
+++ frysk-gui/frysk/gui/srcwin/InlineSourceView.java    14 Aug 2007 09:39:00 -0000
@@ -240,7 +240,7 @@
             if (var != null)
               {
                 MenuItem valueItem;
-               valueItem = new MenuItem("Value: " + var.longValue(), true);
+               valueItem = new MenuItem("Value: " + var.asLong(), true);
                valueItem.setSensitive(false);
                m.append(valueItem);