From: Stephane Carrez Date: Sun, 25 Aug 2002 09:12:36 +0000 (+0000) Subject: * tuiRegs.c (tuiDisplayRegistersFrom): Remove unused locals. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bc77de56b690a880fc04d9ca99830fa69ae177e5;p=binutils-gdb.git * tuiRegs.c (tuiDisplayRegistersFrom): Remove unused locals. (_tuiRegisterFormat, _tuiSetSpecialRegsContent): Likewise. (_tuiSetGeneralAndSpecialRegsContent): Likewise. (_tuiSetFloatRegsContent): Likewise. (_tuiRegisterName): Return a const char*. * tuiData.h (_TuiDataElement): Use const char* for name. --- diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog index 619f6a04854..97c838f359c 100644 --- a/gdb/tui/ChangeLog +++ b/gdb/tui/ChangeLog @@ -1,3 +1,12 @@ +2002-08-25 Stephane Carrez + + * tuiRegs.c (tuiDisplayRegistersFrom): Remove unused locals. + (_tuiRegisterFormat, _tuiSetSpecialRegsContent): Likewise. + (_tuiSetGeneralAndSpecialRegsContent): Likewise. + (_tuiSetFloatRegsContent): Likewise. + (_tuiRegisterName): Return a const char*. + * tuiData.h (_TuiDataElement): Use const char* for name. + 2002-08-25 Stephane Carrez * tuiSourceWin.h (tuiEraseAllSourceContent): Don't declare. @@ -5,7 +14,7 @@ * tuiSourceWin.c (tuiEraseAllSourceContent): Remove. (tuiShowAllExecInfosContent): Remove. (tuiAllocSourceBuffer): Remove unused locals. - + 2002-08-25 Stephane Carrez * tuiStack.c (tui_update_command): Rename _tuiUpdateLocation_command diff --git a/gdb/tui/tuiData.h b/gdb/tui/tuiData.h index 9edf00046ea..89779b42e3b 100644 --- a/gdb/tui/tuiData.h +++ b/gdb/tui/tuiData.h @@ -170,7 +170,7 @@ TuiSourceElement, *TuiSourceElementPtr; /* Elements in the data display window content */ typedef struct _TuiDataElement { - char *name; + const char *name; int itemNo; /* the register number, or data display number */ TuiDataType type; Opaque value; diff --git a/gdb/tui/tuiRegs.c b/gdb/tui/tuiRegs.c index deb8efba79f..928eb416fd5 100644 --- a/gdb/tui/tuiRegs.c +++ b/gdb/tui/tuiRegs.c @@ -46,6 +46,7 @@ #include "gdbtypes.h" #include "gdbcmd.h" #include "frame.h" +#include "regcache.h" #include "inferior.h" #include "target.h" #include "tuiLayout.h" @@ -86,7 +87,7 @@ ******************************************/ static TuiStatus _tuiSetRegsContent (int, int, struct frame_info *, TuiRegisterDisplayType, int); -static char *_tuiRegisterName (int); +static const char *_tuiRegisterName (int); static TuiStatus _tuiGetRegisterRawValue (int, char *, struct frame_info *); static void _tuiSetRegisterElement (int, struct frame_info *, TuiDataElementPtr, int); @@ -311,7 +312,7 @@ tuiDisplayRegistersFrom (int startElementNo) dataWin->detail.dataDisplayInfo.regsContentCount > 0) { register int i = startElementNo; - int j, valueCharsWide, charsWide, itemWinWidth, curY, labelWidth; + int j, valueCharsWide, itemWinWidth, curY, labelWidth; enum precision_type precision; precision = (dataWin->detail.dataDisplayInfo.regsDisplayType @@ -435,8 +436,6 @@ tuiDisplayRegElementAtLine (int startElementNo, int startLineNo) int tuiDisplayRegistersFromLine (int lineNo, int forceDisplay) { - int elementNo; - if (dataWin->detail.dataDisplayInfo.regsContentCount > 0) { int line, elementNo; @@ -595,7 +594,7 @@ registers.\n", ** _tuiRegisterName(). ** Return the register name. */ -static char * +static const char * _tuiRegisterName (int regNum) { return REGISTER_NAME (regNum); @@ -622,7 +621,7 @@ _tuiRegisterFormat (char *buf, int bufLen, int regNum, { struct ui_file *stream; struct ui_file *old_stdout; - char *name; + const char *name; struct cleanup *cleanups; char *p; int pos; @@ -701,15 +700,9 @@ static TuiStatus _tuiSetSpecialRegsContent (int refreshValuesOnly) { TuiStatus ret = TUI_FAILURE; - int i, endRegNum; + int endRegNum; endRegNum = FP0_REGNUM - 1; -#if 0 - endRegNum = (-1); - for (i = START_SPECIAL_REGS; (i < NUM_REGS && endRegNum < 0); i++) - if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT) - endRegNum = i - 1; -#endif ret = _tuiSetRegsContent (START_SPECIAL_REGS, endRegNum, selected_frame, @@ -728,15 +721,9 @@ static TuiStatus _tuiSetGeneralAndSpecialRegsContent (int refreshValuesOnly) { TuiStatus ret = TUI_FAILURE; - int i, endRegNum = (-1); + int endRegNum = (-1); endRegNum = FP0_REGNUM - 1; -#if 0 - endRegNum = (-1); - for (i = 0; (i < NUM_REGS && endRegNum < 0); i++) - if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT) - endRegNum = i - 1; -#endif ret = _tuiSetRegsContent ( 0, endRegNum, selected_frame, TUI_SPECIAL_REGS, refreshValuesOnly); @@ -751,15 +738,9 @@ static TuiStatus _tuiSetFloatRegsContent (TuiRegisterDisplayType dpyType, int refreshValuesOnly) { TuiStatus ret = TUI_FAILURE; - int i, startRegNum; + int startRegNum; startRegNum = FP0_REGNUM; -#if 0 - startRegNum = (-1); - for (i = NUM_REGS - 1; (i >= 0 && startRegNum < 0); i--) - if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) != TYPE_CODE_FLT) - startRegNum = i + 1; -#endif ret = _tuiSetRegsContent (startRegNum, NUM_REGS - 1, selected_frame,