This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[commit] cleanup tui-disasm.h
- From: Andrew Cagney <cagney at gnu dot org>
- To: gdb-patches at sources dot redhat dot com
- Date: Tue, 20 Jan 2004 16:56:58 -0500
- Subject: [commit] cleanup tui-disasm.h
FYI,
Committed,
Andrew
2004-01-20 Andrew Cagney <cagney@redhat.com>
* tui/tui-disasm.h: Update copyright. Include "tui.h" and
"tui-data.h".
(tui_set_disassem_content): Rename tuiSetDisassemContent.
(tui_show_disassem): Rename tuiShowDisassem.
(tui_show_disassem_and_update_source): Rename
tuiVerticalDisassemScroll.
(tui_vertical_disassem_scroll): Rename tuiVerticalDisassemScroll.
(tui_get_begin_asm_address): Rename tuiGetBeginAsmAddress.
* tui/tui.h: Update copyright.
(enum tui_status): Define.
* tui/tui-data.h (enum tui_scroll_direction): Define.
* tui/tui-disasm.c: Update copyright. Update references.
* tui/tui-winsource.c: Update copyright. Update references.
* tui/tui-win.c: Update references.
* tui/tui-layout.c: Update references.
Index: tui/tui-data.h
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui-data.h,v
retrieving revision 1.2
diff -u -r1.2 tui-data.h
--- tui/tui-data.h 19 Jan 2004 16:06:04 -0000 1.2
+++ tui/tui-data.h 20 Jan 2004 21:51:53 -0000
@@ -96,7 +96,7 @@
#define TUI_GENERAL_SPECIAL_REGS_NAME_LOWER "$regs"
/* Scroll direction enum */
-typedef enum
+typedef enum tui_scroll_direction
{
FORWARD_SCROLL,
BACKWARD_SCROLL,
Index: tui/tui-disasm.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui-disasm.c,v
retrieving revision 1.1
diff -u -r1.1 tui-disasm.c
--- tui/tui-disasm.c 19 Jan 2004 04:31:50 -0000 1.1
+++ tui/tui-disasm.c 20 Jan 2004 21:51:53 -0000
@@ -1,7 +1,7 @@
/* Disassembly display.
- Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
- Inc.
+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+ Foundation, Inc.
Contributed by Hewlett-Packard Company.
@@ -172,8 +172,8 @@
}
/* Function to set the disassembly window's content. */
-TuiStatus
-tuiSetDisassemContent (CORE_ADDR pc)
+enum tui_status
+tui_set_disassem_content (CORE_ADDR pc)
{
TuiStatus ret = TUI_FAILURE;
register int i;
@@ -270,12 +270,9 @@
}
-/*
- ** tuiShowDisassem().
- ** Function to display the disassembly window with disassembled code.
- */
+/* Function to display the disassembly window with disassembled code. */
void
-tuiShowDisassem (CORE_ADDR startAddr)
+tui_show_disassem (CORE_ADDR startAddr)
{
struct symtab *s = find_pc_symtab (startAddr);
TuiWinInfoPtr winWithFocus = tuiWinWithFocus ();
@@ -292,19 +289,16 @@
tuiSetWinFocusTo (disassemWin);
return;
-} /* tuiShowDisassem */
+}
-/*
- ** tuiShowDisassemAndUpdateSource().
- ** Function to display the disassembly window.
- */
+/* Function to display the disassembly window. */
void
-tuiShowDisassemAndUpdateSource (CORE_ADDR startAddr)
+tui_show_disassem_and_update_source (CORE_ADDR startAddr)
{
struct symtab_and_line sal;
- tuiShowDisassem (startAddr);
+ tui_show_disassem (startAddr);
if (currentLayout () == SRC_DISASSEM_COMMAND)
{
TuiLineOrAddress val;
@@ -326,13 +320,10 @@
}
return;
-} /* tuiShowDisassemAndUpdateSource */
+}
-/*
- ** tuiGetBeginAsmAddress().
- */
CORE_ADDR
-tuiGetBeginAsmAddress (void)
+tui_get_begin_asm_address (void)
{
TuiGenWinInfoPtr locator;
TuiLocatorElementPtr element;
@@ -361,7 +352,7 @@
addr = element->addr;
return addr;
-} /* tuiGetBeginAsmAddress */
+}
/* Determine what the low address will be to display in the TUI's
disassembly window. This may or may not be the same as the
@@ -381,13 +372,10 @@
return pc;
}
-/*
- ** tuiVerticalDisassemScroll().
- ** Scroll the disassembly forward or backward vertically
- */
+/* Scroll the disassembly forward or backward vertically. */
void
-tuiVerticalDisassemScroll (TuiScrollDirection scrollDirection,
- int numToScroll)
+tui_vertical_disassem_scroll (enum tui_scroll_direction scrollDirection,
+ int numToScroll)
{
if (disassemWin->generic.content != (OpaquePtr) NULL)
{
Index: tui/tui-disasm.h
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui-disasm.h,v
retrieving revision 1.1
diff -u -r1.1 tui-disasm.h
--- tui/tui-disasm.h 19 Jan 2004 04:31:50 -0000 1.1
+++ tui/tui-disasm.h 20 Jan 2004 21:51:53 -0000
@@ -1,5 +1,8 @@
/* Disassembly display.
- Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ Copyright 1998, 1999, 2000, 2001, 2004 Free Software Foundation,
+ Inc.
+
Contributed by Hewlett-Packard Company.
This file is part of GDB.
@@ -19,23 +22,16 @@
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _TUI_DISASSEM_H
-#define _TUI_DISASSEM_H
-
-/*****************************************
-** TYPE DEFINITIONS **
-******************************************/
-
+#ifndef TUI_DISASM_H
+#define TUI_DISASM_H
+#include "tui/tui.h" /* For enum tui_status. */
+#include "tui/tui-data.h" /* For enum tui_scroll_direction. */
-/*****************************************
-** PUBLIC FUNCTION EXTERNAL DECLS **
-******************************************/
-extern TuiStatus tuiSetDisassemContent (CORE_ADDR);
-extern void tuiShowDisassem (CORE_ADDR);
-extern void tuiShowDisassemAndUpdateSource (CORE_ADDR);
-extern void tuiVerticalDisassemScroll (TuiScrollDirection, int);
-extern CORE_ADDR tuiGetBeginAsmAddress (void);
+extern enum tui_status tui_set_disassem_content (CORE_ADDR);
+extern void tui_show_disassem (CORE_ADDR);
+extern void tui_show_disassem_and_update_source (CORE_ADDR);
+extern void tui_vertical_disassem_scroll (enum tui_scroll_direction, int);
+extern CORE_ADDR tui_get_begin_asm_address (void);
#endif
-/*_TUI_DISASSEM_H*/
Index: tui/tui-layout.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui-layout.c,v
retrieving revision 1.2
diff -u -r1.2 tui-layout.c
--- tui/tui-layout.c 19 Jan 2004 16:06:04 -0000 1.2
+++ tui/tui-layout.c 20 Jan 2004 21:51:53 -0000
@@ -193,7 +193,7 @@
** 2. if target was compiled without -g
** We still want to show the assembly though!
*/
- addr = tuiGetBeginAsmAddress ();
+ addr = tui_get_begin_asm_address ();
tuiSetWinFocusTo (disassemWin);
layoutDef->displayMode = DISASSEM_WIN;
layoutDef->split = FALSE;
@@ -206,7 +206,7 @@
** 2. if target was compiled without -g
** We still want to show the assembly though!
*/
- addr = tuiGetBeginAsmAddress ();
+ addr = tui_get_begin_asm_address ();
if (winWithFocus == srcWin)
tuiSetWinFocusTo (srcWin);
else
@@ -229,7 +229,7 @@
** 2. if target was compiled without -g
** We still want to show the assembly though!
*/
- addr = tuiGetBeginAsmAddress ();
+ addr = tui_get_begin_asm_address ();
if (winWithFocus != dataWin)
tuiSetWinFocusTo (disassemWin);
else
Index: tui/tui-win.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui-win.c,v
retrieving revision 1.2
diff -u -r1.2 tui-win.c
--- tui/tui-win.c 19 Jan 2004 16:06:04 -0000 1.2
+++ tui/tui-win.c 20 Jan 2004 21:51:53 -0000
@@ -467,7 +467,7 @@
if (winToScroll == srcWin)
tuiVerticalSourceScroll (FORWARD_SCROLL, _numToScroll);
else if (winToScroll == disassemWin)
- tuiVerticalDisassemScroll (FORWARD_SCROLL, _numToScroll);
+ tui_vertical_disassem_scroll (FORWARD_SCROLL, _numToScroll);
else if (winToScroll == dataWin)
tuiVerticalDataScroll (FORWARD_SCROLL, _numToScroll);
}
@@ -497,7 +497,7 @@
if (winToScroll == srcWin)
tuiVerticalSourceScroll (BACKWARD_SCROLL, _numToScroll);
else if (winToScroll == disassemWin)
- tuiVerticalDisassemScroll (BACKWARD_SCROLL, _numToScroll);
+ tui_vertical_disassem_scroll (BACKWARD_SCROLL, _numToScroll);
else if (winToScroll == dataWin)
tuiVerticalDataScroll (BACKWARD_SCROLL, _numToScroll);
}
Index: tui/tui-winsource.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui-winsource.c,v
retrieving revision 1.1
diff -u -r1.1 tui-winsource.c
--- tui/tui-winsource.c 19 Jan 2004 04:31:51 -0000 1.1
+++ tui/tui-winsource.c 20 Jan 2004 21:51:53 -0000
@@ -1,7 +1,7 @@
/* TUI display source/assembly window.
- Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
- Inc.
+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+ Foundation, Inc.
Contributed by Hewlett-Packard Company.
@@ -55,7 +55,7 @@
{
CORE_ADDR addr;
- addr = tuiGetBeginAsmAddress ();
+ addr = tui_get_begin_asm_address ();
if (addr != (CORE_ADDR) 0)
{
struct symtab_and_line sal;
@@ -102,7 +102,7 @@
if (winInfo->generic.type == SRC_WIN)
ret = tuiSetSourceContent (s, lineOrAddr.lineNo, noerror);
else
- ret = tuiSetDisassemContent (lineOrAddr.addr);
+ ret = tui_set_disassem_content (lineOrAddr.addr);
if (ret == TUI_FAILURE)
{
@@ -154,10 +154,10 @@
{
case DISASSEM_COMMAND:
case DISASSEM_DATA_COMMAND:
- tuiShowDisassem (addr);
+ tui_show_disassem (addr);
break;
case SRC_DISASSEM_COMMAND:
- tuiShowDisassemAndUpdateSource (addr);
+ tui_show_disassem_and_update_source (addr);
break;
default:
sal = find_pc_line (addr, 0);
@@ -206,7 +206,7 @@
if (currentLayout () == SRC_DISASSEM_COMMAND)
{
find_line_pc (s, line, &pc);
- tuiShowDisassem (pc);
+ tui_show_disassem (pc);
}
break;
}
Index: tui/tui.h
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui.h,v
retrieving revision 1.17
diff -u -r1.17 tui.h
--- tui/tui.h 14 Sep 2003 02:04:44 -0000 1.17
+++ tui/tui.h 20 Jan 2004 21:51:53 -0000
@@ -1,5 +1,8 @@
/* External/Public TUI Header File.
- Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ Copyright 1998, 1999, 2000, 2001, 2004 Free Software Foundation,
+ Inc.
+
Contributed by Hewlett-Packard Company.
This file is part of GDB.
@@ -53,7 +56,7 @@
extern void strcat_to_buf (char *, int, const char *);
/* Types of error returns */
- typedef enum
+ typedef enum tui_status
{
TUI_SUCCESS,
TUI_FAILURE