From cff3e48be70e018476521d0f62705c29f4112771 Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Mon, 13 Sep 1999 21:40:00 +0000 Subject: import gdb-1999-09-13 snapshot --- gdb/ChangeLog | 46 ++++++++++++- gdb/Makefile.in | 4 +- gdb/config/pa/tm-hppa64.h | 2 +- gdb/d10v-tdep.c | 14 ++-- gdb/event-loop.c | 37 +++++++---- gdb/event-loop.h | 7 +- gdb/gdbarch.sh | 123 +++++++++++++++++++++++++++++------ gdb/i387-tdep.c | 2 +- gdb/m32r-tdep.c | 4 +- gdb/remote.c | 4 +- gdb/testsuite/ChangeLog | 5 ++ gdb/testsuite/gdb.base/long_long.exp | 66 ++++++++++++++++--- 12 files changed, 252 insertions(+), 62 deletions(-) (limited to 'gdb') diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e3b0c40..4e5e353 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,45 @@ +Mon Sep 13 18:54:05 1999 Andrew Cagney + + * gdbarch.sh: Describe each of the fields. + +Mon Sep 13 17:51:28 1999 Andrew Cagney + + From 1999-09-12 Jim Blandy : + * gdbarch.sh (generating setters): Use sed to generate the proper + indentation, not tr; tr's behavior is notoriously unportable. + +1999-09-10 Jim Blandy + + * i387-tdep.c (print_387_control_bits): Don't print newline; the + callers take care of that. (Thanks to H.J. Lu.) + +1999-09-09 Stan Shebs + + * d10v-tdep.c (DMEM_START): Set to 0x2000000. + (itrace, iuntrace, info itrace, itdisassemble, itracedisplay, + itracesource): Add 'i' prefix to commands, so as not to conflict + with generic trace commands. + +1999-09-09 Fernando Nasser + + * remote.c (_initialize_remote): Fix the specification of the + "remote" prefix to set and show commands. + +1999-09-09 Elena Zannoni + + * event-loop.c (create_file_event): New function. Creates a gdb + event for a given fd. + (gdb_wait_for_event): Use create_file_event(). + * event-loop.h: export create_file_event(). + + * event-loop.c (delete_file_handler): Move the clearing of the + mask to later on in the function, because we need it in order to + deactivate the correct fd when using select(). + + * m32r-tdep.c (decode_prologue): Fix typo. Instructions starting + with 0xf are branch instructions. + (m32r_scan_prologue): Initialize framesize to 0. + 1999-09-07 J.T. Conklin * i386-stub.c (exceptionHook, oldExceptionHook): Removed. @@ -61,7 +103,7 @@ Fri Sep 3 22:29:39 1999 Kevin Buettner Fri Sep 3 00:47:44 1999 Kevin Buettner [Merged linux/x86 floating point code from Bill Metzenthen, - Jim Blandy, Anthony Green, H. J. Liu, and possibly others. The + Jim Blandy, Anthony Green, H. J. Lu, and possibly others. The following remarks are Jim Blandy's.] * findvar.c (extract_floating): Call TARGET_EXTRACT_FLOATING, if @@ -368,7 +410,7 @@ Wed Sep 1 09:22:50 1999 Andrew Cagney 1999-08-13 Jim Kingdon Threads code from gdb 4.18-codefusion-990706 - [Thanks to Eric Paire, H. J. Liu, Jim Blandy and others] + [Thanks to Eric Paire, H. J. Lu, Jim Blandy and others] * infrun.c (signal_stop_update, signal_print_update, signal_pass_update): new functions. * inferior.h: new prototypes for above functions. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 22edeb9..b1cd01e 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -229,7 +229,7 @@ CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \ ADD_FILES = $(REGEX) $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES) ADD_DEPS = $(REGEX1) $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES) -VERSION = 19990908 +VERSION = 19990913 DIST=gdb LINT=/usr/5bin/lint @@ -1197,7 +1197,7 @@ i386v-nat.o: i386v-nat.c $(floatformat_h) $(defs_h) $(gdbcore_h) \ $(inferior_h) language.h target.h i386-linux-nat.o: i386-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \ - $(symtab_h) $(frame_h) $(symfile_h) $(objfiles_h) + $(symtab_h) $(frame_h) symfile.h objfiles.h i386v4-nat.o: i386v4-nat.c $(defs_h) diff --git a/gdb/config/pa/tm-hppa64.h b/gdb/config/pa/tm-hppa64.h index 3b1ab44..99049fe 100644 --- a/gdb/config/pa/tm-hppa64.h +++ b/gdb/config/pa/tm-hppa64.h @@ -28,11 +28,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ gotten working yet. */ #define GDB_TARGET_IS_HPPA_20W -/* The low two bits of the IA are the privilege level of the instruction. */ #include "pa/tm-hppah.h" #define HPUX_1100 1 +/* The low two bits of the IA are the privilege level of the instruction. */ #define ADDR_BITS_REMOVE(addr) ((CORE_ADDR)addr & (CORE_ADDR)~3) /* Say how long (ordinary) registers are. This is used in diff --git a/gdb/d10v-tdep.c b/gdb/d10v-tdep.c index e545f21..3c93ea9 100644 --- a/gdb/d10v-tdep.c +++ b/gdb/d10v-tdep.c @@ -45,7 +45,7 @@ struct frame_extra_info /* these are the addresses the D10V-EVA board maps data */ /* and instruction memory to. */ -#define DMEM_START 0x0000000 +#define DMEM_START 0x2000000 #define IMEM_START 0x1000000 #define STACK_START 0x0007ffe @@ -1454,25 +1454,25 @@ _initialize_d10v_tdep () add_com ("regs", class_vars, show_regs, "Print all registers"); - add_com ("trace", class_support, trace_command, + add_com ("itrace", class_support, trace_command, "Enable tracing of instruction execution."); - add_com ("untrace", class_support, untrace_command, + add_com ("iuntrace", class_support, untrace_command, "Disable tracing of instruction execution."); - add_com ("tdisassemble", class_vars, tdisassemble_command, + add_com ("itdisassemble", class_vars, tdisassemble_command, "Disassemble the trace buffer.\n\ Two optional arguments specify a range of trace buffer entries\n\ as reported by info trace (NOT addresses!)."); - add_info ("trace", trace_info, + add_info ("itrace", trace_info, "Display info about the trace data buffer."); - add_show_from_set (add_set_cmd ("tracedisplay", no_class, + add_show_from_set (add_set_cmd ("itracedisplay", no_class, var_integer, (char *) &trace_display, "Set automatic display of trace.\n", &setlist), &showlist); - add_show_from_set (add_set_cmd ("tracesource", no_class, + add_show_from_set (add_set_cmd ("itracesource", no_class, var_integer, (char *) &default_trace_show_source, "Set display of source code with trace.\n", &setlist), &showlist); diff --git a/gdb/event-loop.c b/gdb/event-loop.c index 78ecb63..261c838 100644 --- a/gdb/event-loop.c +++ b/gdb/event-loop.c @@ -122,6 +122,7 @@ static int async_handler_ready = 0; static void create_file_handler PARAMS ((int, int, handler_func *, gdb_client_data)); static void invoke_async_signal_handler PARAMS ((void)); +static void handle_file_event PARAMS ((int)); static int gdb_wait_for_event PARAMS ((void)); static int gdb_do_one_event PARAMS ((void)); static int check_async_ready PARAMS ((void)); @@ -164,6 +165,22 @@ async_queue_event (event_ptr, position) } } +/* Create a file event, to be enqueued in the event queue for + processing. The procedure associated to this event is always + handle_file_event, which will in turn invoke the one that was + associated to FD when it was registered with the event loop. */ +gdb_event * +create_file_event (fd) + int fd; +{ + gdb_event *file_event_ptr; + + file_event_ptr = (gdb_event *) xmalloc (sizeof (gdb_event)); + file_event_ptr->proc = handle_file_event; + file_event_ptr->fd = fd; + return (file_event_ptr); +} + /* Process one event. The event can be the next one to be serviced in the event queue, or an asynchronous event handler can be invoked in response to @@ -439,11 +456,6 @@ delete_file_handler (fd) if (file_ptr == NULL) return; - /* Deactivate the file descriptor, by clearing its mask, - so that it will not fire again. */ - - file_ptr->mask = 0; - #ifdef HAVE_POLL /* Create a new poll_fds array by copying every fd's information but the one we want to get rid of. */ @@ -500,6 +512,11 @@ delete_file_handler (fd) } #endif /* HAVE_POLL */ + /* Deactivate the file descriptor, by clearing its mask, + so that it will not fire again. */ + + file_ptr->mask = 0; + /* Get rid of the file handler in the file handler list. */ if (file_ptr == gdb_notifier.first_file_handler) gdb_notifier.first_file_handler = file_ptr->next_file; @@ -634,10 +651,7 @@ gdb_wait_for_event () this fd. */ if (file_ptr->ready_mask == 0) { - file_event_ptr = - (gdb_event *) xmalloc (sizeof (gdb_event)); - file_event_ptr->proc = handle_file_event; - file_event_ptr->fd = file_ptr->fd; + file_event_ptr = create_file_event (file_ptr->fd); async_queue_event (file_event_ptr, TAIL); } } @@ -671,10 +685,7 @@ gdb_wait_for_event () if (file_ptr->ready_mask == 0) { - file_event_ptr = - (gdb_event *) xmalloc (sizeof (gdb_event)); - file_event_ptr->proc = handle_file_event; - file_event_ptr->fd = file_ptr->fd; + file_event_ptr = create_file_event (file_ptr->fd); async_queue_event (file_event_ptr, TAIL); } file_ptr->ready_mask = mask; diff --git a/gdb/event-loop.h b/gdb/event-loop.h index 9e046e0..baebccd 100644 --- a/gdb/event-loop.h +++ b/gdb/event-loop.h @@ -231,6 +231,7 @@ extern void mark_async_signal_handler PARAMS ((async_signal_handler *)); extern async_signal_handler * create_async_signal_handler PARAMS ((handler_func *, gdb_client_data)); extern void delete_async_signal_handler PARAMS ((async_signal_handler ** async_handler_ptr)); +extern gdb_event *create_file_event PARAMS ((int)); /* Exported functions from event-top.c. FIXME: these should really go into top.h. */ @@ -245,8 +246,10 @@ extern void handle_sigint PARAMS ((int)); extern void pop_prompt PARAMS ((void)); extern void push_prompt PARAMS ((char *, char *, char *)); extern void gdb_readline2 PARAMS ((void)); +extern void mark_async_signal_handler_wrapper (void *); +extern void async_request_quit (gdb_client_data); -/* Exported variables and functions from event-top.c. +/* Exported variables from event-top.c. FIXME: these should really go into top.h. */ extern int async_command_editing_p; @@ -257,5 +260,3 @@ extern struct prompts the_prompts; extern void (*call_readline) PARAMS ((void)); extern void (*input_handler) PARAMS ((char *)); extern int input_fd; -void mark_async_signal_handler_wrapper (void *); -void async_request_quit (gdb_client_data); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 5ad6b65..cf9650f 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -19,28 +19,111 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -IFS=: - read="class level macro returntype function formal actual attrib default init init_p fmt print print_p description" +# dump out/verify the doco +for field in ${read} +do + case ${field} in + + class ) : ;; + # # -> line disable + # f -> function + # hiding a function + # v -> variable + # hiding a variable + # i -> set from info + # hiding something from the ``struct info'' object + + level ) : ;; + + # See GDB_MULTI_ARCH description. Having GDB_MULTI_ARCH >= + # LEVEL is a predicate on checking that a given method is + # initialized (using INIT_P). + + macro ) : ;; + + # The name of the MACRO that this method is to be accessed by. + + returntype ) : ;; + + # For functions, the return type; for variables, the data type + + function ) : ;; + + # For functions, the member function name; for variables, the + # variable name. Member function names are always prefixed with + # ``gdbarch_'' for name-space purity. + + formal ) : ;; + + # The formal argument list. It is assumed that the formal + # argument list includes the actual name of each list element. + # A function with no arguments shall have ``void'' as the formal + # argument list. + + actual ) : ;; + + # The list of actual arguments. The arguments specified shall + # match the FORMAL list given above. Functions with out + # arguments leave this blank. + + attrib ) : ;; + + # Any GCC attributes that should be attached to the function + # declaration. At present this field is unused. + + default ) : ;; + + # To help with the GDB startup a default static gdbarch object + # is created. DEFAULT is the value to insert into that + # array. It defaults to ZERO. + + init ) : ;; + + # Any initial value to assign to the member after it is been + # MALLOCed. Defaults to zero. + + init_p ) : ;; + + # A predicate equation that tests to see if the code creating + # the new architecture has correctly updated this + # MEMBER. Default is to check that the value is no longer equal + # to INIT. + + fmt ) : ;; + + # printf style format string that can be used to print out the + # MEMBER. The default is to assume "%ld" is safe. Sometimes + # "%s" is useful. For functions, this is ignored and the + # function address is printed. + + print ) : ;; + + # An optional equation that converts the MEMBER into a value + # suitable for that FMT. By default it is assumed that the + # member's MACRO cast to long is safe. + + print_p ) : ;; + + # An optional indicator for any predicte to wrap around the + # print member code. + # # -> Wrap print up in ``#ifdef MACRO'' + # exp -> Wrap print up in ``if (${print_p}) ... + + description ) : ;; + + # Currently unused. + + *) exit 1;; + esac +done + +IFS=: + function_list () { - # category: - # # -> disable - # f -> function - # v -> variable - # i -> set from info - # macro-name - # return-type - # name - # formal argument list - # actual argument list - # attrib - # default exp - # init exp - # init_p exp - # print - # description + # See below (DOCO) for description of each field cat <printable_name:TARGET_ARCHITECTURE != NULL # @@ -983,7 +1066,7 @@ do echo "" echo "void" echo "set_gdbarch_${function} (struct gdbarch *gdbarch," - echo " `echo ${function} | tr '[0-9a-z_]' ' '` gdbarch_${function}_ftype ${function})" + echo " `echo ${function} | sed -e 's/./ /g'` gdbarch_${function}_ftype ${function})" echo "{" echo " gdbarch->${function} = ${function};" echo "}" @@ -1010,7 +1093,7 @@ do echo "" echo "void" echo "set_gdbarch_${function} (struct gdbarch *gdbarch," - echo " `echo ${function} | tr '[0-9a-z_]' ' '` ${returntype} ${function})" + echo " `echo ${function} | sed -e 's/./ /g'` ${returntype} ${function})" echo "{" echo " gdbarch->${function} = ${function};" echo "}" diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c index 0621bdf..a8fdba7 100644 --- a/gdb/i387-tdep.c +++ b/gdb/i387-tdep.c @@ -102,7 +102,7 @@ print_387_control_bits (control) puts_unfiltered (" LOS"); puts_unfiltered (";"); } - printf_unfiltered ("\n"); + if (control & 0xe080) warning ("\nreserved bits on: %s", local_hex_string (control & 0xe080)); diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c index a4a791b..cb5d9c3 100644 --- a/gdb/m32r-tdep.c +++ b/gdb/m32r-tdep.c @@ -250,7 +250,7 @@ decode_prologue (start_pc, scan_limit, /* End of prolog if any of these are branch instructions */ if ((op1 == 0x7000) || (op1 == 0xb000) - || (op1 == 0x7000)) + || (op1 == 0xf000)) { after_prologue = current_pc; insn_debug (("Done: branch\n")); @@ -350,7 +350,7 @@ m32r_scan_prologue (fi, fsr) { struct symtab_and_line sal; CORE_ADDR prologue_start, prologue_end, current_pc; - unsigned long framesize; + unsigned long framesize = 0; /* this code essentially duplicates skip_prologue, but we need the start address below. */ diff --git a/gdb/remote.c b/gdb/remote.c index 1275e51..56ce779 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -5149,13 +5149,13 @@ _initialize_remote () Remote protocol specific variables\n\ Configure various remote-protocol specific variables such as\n\ the packets being used", - &remote_set_cmdlist, "remote ", + &remote_set_cmdlist, "set remote ", 0/*allow-unknown*/, &setlist); add_prefix_cmd ("remote", class_maintenance, set_remote_cmd, "\ Remote protocol specific variables\n\ Configure various remote-protocol specific variables such as\n\ the packets being used", - &remote_show_cmdlist, "remote ", + &remote_show_cmdlist, "show remote ", 0/*allow-unknown*/, &showlist); add_cmd ("compare-sections", class_obscure, compare_sections_command, diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 15dd281..7198d6e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +1999-09-09 Stan Shebs + + * long_long.exp: Add variations of test cases that work for + targets with 16-bit ints and 32-bit doubles. + 1999-09-08 Stan Shebs * break.c (main): Compare a possibly-uninitialized argc with an diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp index b779434..651daff 100644 --- a/gdb/testsuite/gdb.base/long_long.exp +++ b/gdb/testsuite/gdb.base/long_long.exp @@ -69,6 +69,28 @@ gdb_expect { default { fail "(timeout) getting target endian" } } +# Detect targets with 2-byte integers. Yes, it's not general to assume +# that all others have 4-byte ints, but don't worry about it until one +# actually exists. + +set sizeof_int 4 +send_gdb "print sizeof(int)\n" +gdb_expect { + -re ".* = 2.*$gdb_prompt $" { set sizeof_int 2 } + -re ".*$gdb_prompt $" { } + default { } +} + +# Detect targets with 4-byte doubles. + +set sizeof_double 8 +send_gdb "print sizeof(double)\n" +gdb_expect { + -re ".* = 4.*$gdb_prompt $" { set sizeof_double 4 } + -re ".*$gdb_prompt $" { } + default { } +} + gdb_test "n 4" ".*38.*" "get to known place" # Check the hack for long long prints. @@ -96,17 +118,39 @@ gdb_test "p/o oct" ".*.*" gdb_test "p/t oct" ".*1010011100101110111001010011100101110111000001010011100101110111.*" gdb_test "p/a oct" ".*0x.*77053977.*" gdb_test "p/c oct" ".*'w'.*" -gdb_test "p/f oct" ".*-5.9822653797615723e-120.*" + +if { $sizeof_double == 8 } { + + gdb_test "p/f oct" ".*-5.9822653797615723e-120.*" + +} else { + + gdb_test "p/f oct" ".*-2.42716126e-15.*" +} if { $target_bigendian_p } { - gdb_test "p/d *(int *)&oct" ".*-1490098887.*" - gdb_test "p/u *(int *)&oct" ".*2804868409.*" - gdb_test "p/o *(int *)&oct" ".*024713562471.*" - gdb_test "p/t *(int *)&oct" ".*10100111001011101110010100111001.*" - gdb_test "p/a *(int *)&oct" ".*0xf*a72ee539.*" - gdb_test "p/c *(int *)&oct" ".*57 '9'.*" - gdb_test "p/f *(int *)&oct" ".*-2.42716126e-15.*" + if { $sizeof_int == 4 } { + + gdb_test "p/d *(int *)&oct" ".*-1490098887.*" + gdb_test "p/u *(int *)&oct" ".*2804868409.*" + gdb_test "p/o *(int *)&oct" ".*024713562471.*" + gdb_test "p/t *(int *)&oct" ".*10100111001011101110010100111001.*" + gdb_test "p/a *(int *)&oct" ".*0xf*a72ee539.*" + gdb_test "p/c *(int *)&oct" ".*57 '9'.*" + gdb_test "p/f *(int *)&oct" ".*-2.42716126e-15.*" + + } else { + + gdb_test "p/d *(int *)&oct" ".*-22738.*" + gdb_test "p/u *(int *)&oct" ".*42798.*" + gdb_test "p/o *(int *)&oct" ".*0123456.*" + gdb_test "p/t *(int *)&oct" ".*1010011100101110.*" + gdb_test "p/a *(int *)&oct" ".*0xffffa72e.*" + gdb_test "p/c *(int *)&oct" ".*46 '.'.*" + gdb_test "p/f *(int *)&oct" ".*-22738.*" + + } gdb_test "p/d *(short *)&oct" ".*-22738.*" gdb_test "p/u *(short *)&oct" ".*42798.*" @@ -126,7 +170,11 @@ if { $target_bigendian_p } { gdb_test "x/c &oct" ".*-89 .*" # FIXME GDB's output is correct, but this longer match fails. # gdb_test "x/c &oct" ".*-89 '\\\\247'.*" - gdb_test "x/f &oct" ".*-5.9822653797615723e-120.*" + if { $sizeof_double == 8 } { + gdb_test "x/f &oct" ".*-5.9822653797615723e-120.*" + } else { + gdb_test "x/f &oct" ".*-2.42716126e-15.*" + } # FIXME Fill in the results for all the following tests. (But be careful # about looking at locations with unspecified contents!) -- cgit v1.1