diff options
author | Jason Molenda <jmolenda@apple.com> | 1999-11-09 01:23:30 +0000 |
---|---|---|
committer | Jason Molenda <jmolenda@apple.com> | 1999-11-09 01:23:30 +0000 |
commit | 11cf87416416e13eff634a70b4954fe6a3912720 (patch) | |
tree | a6dc7a21bb3d45b89c3f95e4b5862ec9d2fab83b /gdb/tui | |
parent | 98007ce7b0dea06f0c04d833d39b5a9c9773a07a (diff) | |
download | gdb-11cf87416416e13eff634a70b4954fe6a3912720.zip gdb-11cf87416416e13eff634a70b4954fe6a3912720.tar.gz gdb-11cf87416416e13eff634a70b4954fe6a3912720.tar.bz2 |
import gdb-1999-11-08 snapshot
Diffstat (limited to 'gdb/tui')
-rw-r--r-- | gdb/tui/ChangeLog | 13 | ||||
-rw-r--r-- | gdb/tui/tuiDisassem.c | 19 | ||||
-rw-r--r-- | gdb/tui/tuiRegs.c | 6 |
3 files changed, 26 insertions, 12 deletions
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog index c2a7b58..2af1a8f 100644 --- a/gdb/tui/ChangeLog +++ b/gdb/tui/ChangeLog @@ -1,3 +1,16 @@ +Mon Nov 8 17:47:37 1999 Andrew Cagney <cagney@b1.cygnus.com> + + * tuiRegs.c (_tuiRegisterFormat), tuiDisassem.c + (tuiSetDisassemContent): Replace gdb_file_init_astring with + tui_sfileopen. Replace gdb_file_get_strbuf with + tui_file_get_strbuf. + +Mon Nov 8 16:54:51 1999 Andrew Cagney <cagney@b1.cygnus.com> + + * tuiRegs.c (_tuiRegisterFormat), tuiDisassem.c + (tuiSetDisassemContent): Repace gdb_file_deallocate with + gdb_file_delete. Replace gdb_file_init_astring with tui_sfileopen. + Fri Sep 17 19:34:38 1999 Andrew Cagney <cagney@b1.cygnus.com> * tuiSource.c: Include "source.h". diff --git a/gdb/tui/tuiDisassem.c b/gdb/tui/tuiDisassem.c index 1bc1b95..a39574b 100644 --- a/gdb/tui/tuiDisassem.c +++ b/gdb/tui/tuiDisassem.c @@ -66,7 +66,7 @@ tuiSetDisassemContent (s, startAddr) threshold = (lineWidth - 1) + offset; /* now init the gdb_file structure */ - gdb_dis_out = gdb_file_init_astring (threshold); + gdb_dis_out = tui_sfileopen (threshold); INIT_DISASSEMBLE_INFO_NO_ARCH (asmInfo, gdb_dis_out, (fprintf_ftype) fprintf_filtered); asmInfo.read_memory_func = dis_asm_read_memory; @@ -82,27 +82,27 @@ tuiSetDisassemContent (s, startAddr) print_address (pc, gdb_dis_out); - curLen = strlen (gdb_file_get_strbuf (gdb_dis_out)); + curLen = strlen (tui_file_get_strbuf (gdb_dis_out)); i = curLen - ((curLen / tab_len) * tab_len); /* adjust buffer length if necessary */ - gdb_file_adjust_strbuf ((tab_len - i > 0) ? (tab_len - i) : 0, gdb_dis_out); + tui_file_adjust_strbuf ((tab_len - i > 0) ? (tab_len - i) : 0, gdb_dis_out); /* Add spaces to make the instructions start onthe same column */ while (i < tab_len) { - gdb_file_get_strbuf (gdb_dis_out)[curLen] = ' '; + tui_file_get_strbuf (gdb_dis_out)[curLen] = ' '; i++; curLen++; } - gdb_file_get_strbuf (gdb_dis_out)[curLen] = '\0'; + tui_file_get_strbuf (gdb_dis_out)[curLen] = '\0'; newpc = pc + ((*tm_print_insn) (pc, &asmInfo)); /* Now copy the line taking the offset into account */ - if (strlen (gdb_file_get_strbuf (gdb_dis_out)) > offset) + if (strlen (tui_file_get_strbuf (gdb_dis_out)) > offset) strcpy (element->whichElement.source.line, - &(gdb_file_get_strbuf (gdb_dis_out)[offset])); + &(tui_file_get_strbuf (gdb_dis_out)[offset])); else element->whichElement.source.line[0] = '\0'; element->whichElement.source.lineOrAddr.addr = (Opaque) pc; @@ -116,9 +116,10 @@ tuiSetDisassemContent (s, startAddr) curLine++; pc = newpc; /* reset the buffer to empty */ - gdb_file_get_strbuf (gdb_dis_out)[0] = '\0'; + tui_file_get_strbuf (gdb_dis_out)[0] = '\0'; } - gdb_file_deallocate (&gdb_dis_out); + gdb_file_delete (gdb_dis_out); + gdb_dis_out = NULL; disassemWin->generic.contentSize = curLine; ret = TUI_SUCCESS; } diff --git a/gdb/tui/tuiRegs.c b/gdb/tui/tuiRegs.c index 92eec56..33d6079 100644 --- a/gdb/tui/tuiRegs.c +++ b/gdb/tui/tuiRegs.c @@ -671,10 +671,10 @@ _tuiRegisterFormat (buf, bufLen, regNum, dataElement, precision) char *fmt; GDB_FILE *stream; - stream = gdb_file_init_astring (bufLen); + stream = tui_sfileopen (bufLen); pa_do_strcat_registers_info (regNum, 0, stream, precision); - strcpy (buf, gdb_file_get_strbuf (stream)); - gdb_file_deallocate (&stream); + strcpy (buf, tui_file_get_strbuf (stream)); + gdb_file_delete (stream); return; } /* _tuiRegisterFormat */ |