Attachment 294299 Details for Bug 431962 – ListCommand.java patch

[patch] ListCommand.java patch

list.patch (text/plain), 2.10 KB, created by Stan Cox on 2008-02-08 03:17:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stan Cox

Created: 2008-02-08 03:17:48 UTC

Size: 2.10 KB

patch

obsolete

>--- /tmp/ListCommand.java	2008-02-07 21:25:10.000000000 -0500
>+++ /tmp/ListCommand.new.java	2008-02-07 21:20:50.000000000 -0500
>@@ -81,6 +81,7 @@ class ListCommand extends ParameterizedC
> 	return new Options();
>     }
> 
>+    private DebugInfoFrame currentFrame = null;
>     private File file = null;
>     private int line;
>     private int exec_line = 0;
>@@ -110,7 +111,7 @@ class ListCommand extends ParameterizedC
>                 }
>                 catch (NumberFormatException ignore) {
>                     if ((cmd.parameter(0)).compareTo("$EXEC") == 0)
>-                        line = frame.getLine().getLine() - 10;
>+		      line = frame.getLine().getLine() - (windowSize / 2);
>                     else {
>                         DwarfDie funcDie = null;
> 			DebugInfo debugInfo = cli.getTaskDebugInfo(task);
>@@ -146,10 +147,10 @@ class ListCommand extends ParameterizedC
>             else if (frame.getLine().getLine() != exec_line) {
>                 // list around pc.
>                 exec_line = frame.getLine().getLine();
>-                line = exec_line - 10;
>+                line = exec_line - (windowSize / 2);
>             }
>  
>-            if (file == null) {
>+            if (file == null || frame != currentFrame) {
>                 if (frame.getLine() != SourceLocation.UNKNOWN) {
>                     file = (frame.getLine()).getFile();
> 		    String sysRoot = DbgVariables.getStringValue("SYSROOT");
>@@ -162,7 +163,8 @@ class ListCommand extends ParameterizedC
>                                        Message.TYPE_NORMAL);
>                         return;
>                     }
>-                    line = (frame.getLine()).getLine() - 10;
>+                    line = (frame.getLine()).getLine() - (windowSize / 2);
>+		    currentFrame = frame;
> 		    if (exec_line == 0)
> 			exec_line = line;
>                 }
>@@ -206,8 +208,6 @@ class ListCommand extends ParameterizedC
>                         flag = "";
>                     }
>                 }
>-                if (str != null && windowSize > 0)
>-                    line += windowSize;
>                 lr.close();
>             }
>             catch (IOException e) {

Actions: View | Diff

Attachments on bug 431962: 294299 | 294302