X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fz8k-tdep.c;h=e1aa8fa8d139f5381e8f84e7bc8de9d417d7de97;hb=9579e000174ef881b7c0db330757b7b69409e751;hp=b3f85bd0f82adde0db5a7e23b35a87ccf15167f6;hpb=30727aa6d12fb866494020c0b62ab265a2bdcdfe;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/z8k-tdep.c b/gdb/z8k-tdep.c index b3f85bd0f8..e1aa8fa8d1 100644 --- a/gdb/z8k-tdep.c +++ b/gdb/z8k-tdep.c @@ -1,5 +1,7 @@ /* Target-machine dependent code for Zilog Z8000, for GDB. - Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. + + Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + 2002 Free Software Foundation, Inc. This file is part of GDB. @@ -25,13 +27,17 @@ #include "defs.h" #include "frame.h" -#include "obstack.h" #include "symtab.h" #include "gdbcmd.h" #include "gdbtypes.h" #include "dis-asm.h" #include "gdbcore.h" +#include "regcache.h" + +#include "value.h" /* For read_register() */ + +static int read_memory_pointer (CORE_ADDR x); /* Return the saved PC from this frame. @@ -39,8 +45,7 @@ just use the register SRP_REGNUM itself. */ CORE_ADDR -frame_saved_pc (frame) - struct frame_info *frame; +z8k_frame_saved_pc (struct frame_info *frame) { return read_memory_pointer (frame->frame + (BIG ? 4 : 2)); } @@ -58,9 +63,7 @@ frame_saved_pc (frame) return the pc pointing to the first push */ static CORE_ADDR -skip_adjust (pc, size) - CORE_ADDR pc; - int *size; +skip_adjust (CORE_ADDR pc, int *size) { *size = 0; @@ -81,12 +84,9 @@ skip_adjust (pc, size) return pc; } -static CORE_ADDR examine_frame PARAMS ((CORE_ADDR, CORE_ADDR * regs, CORE_ADDR)); +static CORE_ADDR examine_frame (CORE_ADDR, CORE_ADDR * regs, CORE_ADDR); static CORE_ADDR -examine_frame (pc, regs, sp) - CORE_ADDR pc; - CORE_ADDR *regs; - CORE_ADDR sp; +examine_frame (CORE_ADDR pc, CORE_ADDR *regs, CORE_ADDR sp) { int w = read_memory_short (pc); int offset = 0; @@ -137,8 +137,7 @@ examine_frame (pc, regs, sp) } CORE_ADDR -z8k_skip_prologue (start_pc) - CORE_ADDR start_pc; +z8k_skip_prologue (CORE_ADDR start_pc) { CORE_ADDR dummy[NUM_REGS]; @@ -146,27 +145,20 @@ z8k_skip_prologue (start_pc) } CORE_ADDR -z8k_addr_bits_remove (addr) - CORE_ADDR addr; +z8k_addr_bits_remove (CORE_ADDR addr) { return (addr & PTR_MASK); } -int -read_memory_pointer (x) - CORE_ADDR x; +static int +read_memory_pointer (CORE_ADDR x) { return read_memory_integer (ADDR_BITS_REMOVE (x), BIG ? 4 : 2); } CORE_ADDR -frame_chain (thisframe) - struct frame_info *thisframe; +z8k_frame_chain (struct frame_info *thisframe) { - if (thisframe->prev == 0) - { - /* This is the top of the stack, let's get the sp for real */ - } if (!inside_entry_file (thisframe->pc)) { return read_memory_pointer (thisframe->frame); @@ -174,12 +166,6 @@ frame_chain (thisframe) return 0; } -void -init_frame_pc () -{ - abort (); -} - /* Put here the code to store, into a struct frame_saved_regs, the addresses of the saved registers of frame described by FRAME_INFO. This includes special registers such as pc and fp saved in special @@ -187,8 +173,7 @@ init_frame_pc () the address we return for it IS the sp for the next frame. */ void -z8k_frame_init_saved_regs (frame_info) - struct frame_info *frame_info; +z8k_frame_init_saved_regs (struct frame_info *frame_info) { CORE_ADDR pc; int w; @@ -202,15 +187,13 @@ z8k_frame_init_saved_regs (frame_info) } void -z8k_push_dummy_frame () +z8k_push_dummy_frame (void) { - abort (); + internal_error (__FILE__, __LINE__, "failed internal consistency check"); } int -gdb_print_insn_z8k (memaddr, info) - bfd_vma memaddr; - disassemble_info *info; +gdb_print_insn_z8k (bfd_vma memaddr, disassemble_info *info) { if (BIG) return print_insn_z8001 (memaddr, info); @@ -224,10 +207,7 @@ gdb_print_insn_z8k (memaddr, info) of the instruction. */ CORE_ADDR -NEXT_PROLOGUE_INSN (addr, lim, pword1) - CORE_ADDR addr; - CORE_ADDR lim; - short *pword1; +NEXT_PROLOGUE_INSN (CORE_ADDR addr, CORE_ADDR lim, short *pword1) { char buf[2]; if (addr < lim + 8) @@ -251,9 +231,7 @@ NEXT_PROLOGUE_INSN (addr, lim, pword1) it is fairly expensive. */ void -frame_find_saved_regs (fip, fsrp) - struct frame_info *fip; - struct frame_saved_regs *fsrp; +frame_find_saved_regs (struct frame_info *fip, struct frame_saved_regs *fsrp) { int locals; CORE_ADDR pc; @@ -265,7 +243,7 @@ frame_find_saved_regs (fip, fsrp) pc = skip_adjust (get_pc_function_start (fip->pc), &locals); { - adr = FRAME_FP (fip) - locals; + adr = get_frame_base (fip) - locals; for (i = 0; i < 8; i++) { int word = read_memory_short (pc); @@ -295,7 +273,7 @@ frame_find_saved_regs (fip, fsrp) #endif int -saved_pc_after_call () +z8k_saved_pc_after_call (struct frame_info *frame) { return ADDR_BITS_REMOVE (read_memory_integer (read_register (SP_REGNUM), PTR_SIZE)); @@ -303,10 +281,7 @@ saved_pc_after_call () void -extract_return_value (type, regbuf, valbuf) - struct type *type; - char *regbuf; - char *valbuf; +extract_return_value (struct type *type, char *regbuf, char *valbuf) { int b; int len = TYPE_LENGTH (type); @@ -322,78 +297,185 @@ extract_return_value (type, regbuf, valbuf) } void -write_return_value (type, valbuf) - struct type *type; - char *valbuf; +write_return_value (struct type *type, char *valbuf) { int reg; int len; for (len = 0; len < TYPE_LENGTH (type); len += 2) - write_register_bytes (REGISTER_BYTE (len / 2 + 2), valbuf + len, 2); + deprecated_write_register_bytes (REGISTER_BYTE (len / 2 + 2), + valbuf + len, 2); } void -store_struct_return (addr, sp) - CORE_ADDR addr; - CORE_ADDR sp; +store_struct_return (CORE_ADDR addr, CORE_ADDR sp) { write_register (2, addr); } -void -print_register_hook (regno) - int regno; +static void +z8k_print_register_hook (int regno) { if ((regno & 1) == 0 && regno < 16) { - unsigned short l[2]; + unsigned char l[4]; - read_relative_register_raw_bytes (regno, (char *) (l + 0)); - read_relative_register_raw_bytes (regno + 1, (char *) (l + 1)); + frame_register_read (deprecated_selected_frame, regno, l + 0); + frame_register_read (deprecated_selected_frame, regno + 1, l + 2); printf_unfiltered ("\t"); - printf_unfiltered ("%04x%04x", l[0], l[1]); + printf_unfiltered ("0x%02x%02x%02x%02x", l[0], l[1], l[2], l[3]); } if ((regno & 3) == 0 && regno < 16) { - unsigned short l[4]; + unsigned char l[8]; - read_relative_register_raw_bytes (regno, (char *) (l + 0)); - read_relative_register_raw_bytes (regno + 1, (char *) (l + 1)); - read_relative_register_raw_bytes (regno + 2, (char *) (l + 2)); - read_relative_register_raw_bytes (regno + 3, (char *) (l + 3)); + frame_register_read (deprecated_selected_frame, regno, l + 0); + frame_register_read (deprecated_selected_frame, regno + 1, l + 2); + frame_register_read (deprecated_selected_frame, regno + 2, l + 4); + frame_register_read (deprecated_selected_frame, regno + 3, l + 6); printf_unfiltered ("\t"); - printf_unfiltered ("%04x%04x%04x%04x", l[0], l[1], l[2], l[3]); + printf_unfiltered ("0x%02x%02x%02x%02x%02x%02x%02x%02x", + l[0], l[1], l[2], l[3], l[4], l[5], l[6], l[7]); } if (regno == 15) { unsigned short rval; int i; - read_relative_register_raw_bytes (regno, (char *) (&rval)); + frame_register_read (deprecated_selected_frame, regno, (char *) (&rval)); printf_unfiltered ("\n"); for (i = 0; i < 10; i += 2) { - printf_unfiltered ("(sp+%d=%04x)", i, read_memory_short (rval + i)); + printf_unfiltered ("(sp+%d=%04x)", i, + (unsigned int)read_memory_short (rval + i)); } } +} + +static void +z8k_print_registers_info (struct gdbarch *gdbarch, + struct ui_file *file, + struct frame_info *frame, + int regnum, int print_all) +{ + int i; + const int numregs = NUM_REGS + NUM_PSEUDO_REGS; + char *raw_buffer = alloca (MAX_REGISTER_RAW_SIZE); + char *virtual_buffer = alloca (MAX_REGISTER_VIRTUAL_SIZE); + + for (i = 0; i < numregs; i++) + { + /* Decide between printing all regs, non-float / vector regs, or + specific reg. */ + if (regnum == -1) + { + if (!print_all) + { + if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT) + continue; + if (TYPE_VECTOR (REGISTER_VIRTUAL_TYPE (i))) + continue; + } + } + else + { + if (i != regnum) + continue; + } + /* If the register name is empty, it is undefined for this + processor, so don't display anything. */ + if (REGISTER_NAME (i) == NULL || *(REGISTER_NAME (i)) == '\0') + continue; + + fputs_filtered (REGISTER_NAME (i), file); + print_spaces_filtered (15 - strlen (REGISTER_NAME (i)), file); + + /* Get the data in raw format. */ + if (! frame_register_read (frame, i, raw_buffer)) + { + fprintf_filtered (file, "*value not available*\n"); + continue; + } + + /* FIXME: cagney/2002-08-03: This code shouldn't be necessary. + The function frame_register_read() should have returned the + pre-cooked register so no conversion is necessary. */ + /* Convert raw data to virtual format if necessary. */ + if (REGISTER_CONVERTIBLE (i)) + { + REGISTER_CONVERT_TO_VIRTUAL (i, REGISTER_VIRTUAL_TYPE (i), + raw_buffer, virtual_buffer); + } + else + { + memcpy (virtual_buffer, raw_buffer, + REGISTER_VIRTUAL_SIZE (i)); + } + + /* If virtual format is floating, print it that way, and in raw + hex. */ + if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT) + { + int j; + + val_print (REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0, 0, + file, 0, 1, 0, Val_pretty_default); + + fprintf_filtered (file, "\t(raw 0x"); + for (j = 0; j < REGISTER_RAW_SIZE (i); j++) + { + int idx; + if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + idx = j; + else + idx = REGISTER_RAW_SIZE (i) - 1 - j; + fprintf_filtered (file, "%02x", (unsigned char) raw_buffer[idx]); + } + fprintf_filtered (file, ")"); + } + else + { + /* Print the register in hex. */ + val_print (REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0, 0, + file, 'x', 1, 0, Val_pretty_default); + /* If not a vector register, print it also according to its + natural format. */ + if (TYPE_VECTOR (REGISTER_VIRTUAL_TYPE (i)) == 0) + { + fprintf_filtered (file, "\t"); + val_print (REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0, 0, + file, 0, 1, 0, Val_pretty_default); + } + } + + /* Some z8k specific info. */ + z8k_print_register_hook (i); + + fprintf_filtered (file, "\n"); + } +} + +void +z8k_do_registers_info (int regnum, int all) +{ + z8k_print_registers_info (current_gdbarch, gdb_stdout, + deprecated_selected_frame, regnum, all); } void -z8k_pop_frame () +z8k_pop_frame (void) { } struct cmd_list_element *setmemorylist; void -z8k_set_pointer_size (newsize) - int newsize; +z8k_set_pointer_size (int newsize) { static int oldsize = 0; @@ -409,37 +491,36 @@ z8k_set_pointer_size (newsize) { BIG = 0; } + /* FIXME: This code should be using the GDBARCH framework to + handle changed type sizes. If this problem is ever fixed + (the direct reference to _initialize_gdbtypes() below + eliminated) then Makefile.in should be updated so that + z8k-tdep.c is again compiled with -Werror. */ _initialize_gdbtypes (); } } static void -segmented_command (args, from_tty) - char *args; - int from_tty; +segmented_command (char *args, int from_tty) { z8k_set_pointer_size (32); } static void -unsegmented_command (args, from_tty) - char *args; - int from_tty; +unsegmented_command (char *args, int from_tty) { z8k_set_pointer_size (16); } static void -set_memory (args, from_tty) - char *args; - int from_tty; +set_memory (char *args, int from_tty) { printf_unfiltered ("\"set memory\" must be followed by the name of a memory subcommand.\n"); help_list (setmemorylist, "set memory ", -1, gdb_stdout); } void -_initialize_z8ktdep () +_initialize_z8ktdep (void) { tm_print_insn = gdb_print_insn_z8k;