X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fz8k-tdep.c;h=569605606abf3576fb41e3e3fa0d8194e0809a06;hb=d7cd1264695236f7bc59123655b9dc8f85e01cb1;hp=bd39d00c2a7a347127b4d9c7dcacd3db38bfb935;hpb=e4ebb8e5e6b5a8b618284247d0860845d074962f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/z8k-tdep.c b/gdb/z8k-tdep.c index bd39d00c2a..569605606a 100644 --- a/gdb/z8k-tdep.c +++ b/gdb/z8k-tdep.c @@ -1,5 +1,5 @@ /* Target-machine dependent code for Zilog Z8000, for GDB. - Copyright (C) 1992,1993 Free Software Foundation, Inc. + Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. This file is part of GDB. @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Contributed by Steve Chamberlain @@ -28,6 +28,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "symtab.h" #include "gdbcmd.h" #include "gdbtypes.h" +#include "dis-asm.h" +#include "gdbcore.h" /* Return the saved PC from this frame. @@ -36,9 +38,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ CORE_ADDR frame_saved_pc (frame) - FRAME frame; + struct frame_info *frame; { - return (read_memory_pointer (frame->frame + (BIG ? 4 : 2))); + return read_memory_pointer (frame->frame + (BIG ? 4 : 2)); } #define IS_PUSHL(x) (BIG ? ((x & 0xfff0) == 0x91e0):((x & 0xfff0) == 0x91F0)) @@ -88,50 +90,50 @@ examine_frame (pc, regs, sp) int regno; for (regno = 0; regno < NUM_REGS; regno++) - regs->regs[regno] = 0; + regs->regs[regno] = 0; while (IS_PUSHW (w) || IS_PUSHL (w)) - { - /* work out which register is being pushed to where */ - if (IS_PUSHL (w)) - { - regs->regs[w & 0xf] = offset; - regs->regs[(w & 0xf) + 1] = offset + 2; - offset += 4; - } - else { - regs->regs[w & 0xf] = offset; - offset += 2; + /* work out which register is being pushed to where */ + if (IS_PUSHL (w)) + { + regs->regs[w & 0xf] = offset; + regs->regs[(w & 0xf) + 1] = offset + 2; + offset += 4; + } + else + { + regs->regs[w & 0xf] = offset; + offset += 2; + } + pc += 2; + w = read_memory_short (pc); } - pc += 2; - w = read_memory_short (pc); - } if (IS_MOVE_FP (w)) - { - /* We know the fp */ + { + /* We know the fp */ - } + } else if (IS_SUB_SP (w)) - { - /* Subtracting a value from the sp, so were in a function + { + /* Subtracting a value from the sp, so were in a function which needs stack space for locals, but has no fp. We fake up the values as if we had an fp */ - regs->regs[FP_REGNUM] = sp; - } + regs->regs[FP_REGNUM] = sp; + } else - { - /* This one didn't have an fp, we'll fake it up */ - regs->regs[SP_REGNUM] = sp; - } + { + /* This one didn't have an fp, we'll fake it up */ + regs->regs[SP_REGNUM] = sp; + } /* stack pointer contains address of next frame */ /* regs->regs[fp_regnum()] = fp;*/ regs->regs[SP_REGNUM] = sp; return pc; } -CORE_ADDR +CORE_ADDR z8k_skip_prologue (start_pc) CORE_ADDR start_pc; { @@ -140,31 +142,31 @@ z8k_skip_prologue (start_pc) return examine_frame (start_pc, &dummy, 0); } -CORE_ADDR +CORE_ADDR addr_bits_remove (x) CORE_ADDR x; { return x & PTR_MASK; } +int read_memory_pointer (x) CORE_ADDR x; { - return read_memory_integer (ADDR_BITS_REMOVE (x), BIG ? 4 : 2); } -FRAME_ADDR +CORE_ADDR frame_chain (thisframe) - FRAME thisframe; + 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)) + if (!inside_entry_file (thisframe->pc)) { - return read_memory_pointer ((thisframe)->frame); + return read_memory_pointer (thisframe->frame); } return 0; } @@ -180,7 +182,7 @@ init_frame_pc () ways in the stack frame. sp is even more special: the address we return for it IS the sp for the next frame. */ -void +void get_frame_saved_regs (frame_info, frame_saved_regs) struct frame_info *frame_info; struct frame_saved_regs *frame_saved_regs; @@ -189,7 +191,7 @@ get_frame_saved_regs (frame_info, frame_saved_regs) CORE_ADDR pc; int w; - bzero (frame_saved_regs, sizeof (*frame_saved_regs)); + memset (frame_saved_regs, '\0', sizeof (*frame_saved_regs)); pc = get_pc_function_start (frame_info->pc); /* wander down the instruction stream */ @@ -197,28 +199,21 @@ get_frame_saved_regs (frame_info, frame_saved_regs) } -void +void z8k_push_dummy_frame () { abort (); } -int -print_insn (memaddr, stream) - CORE_ADDR memaddr; - FILE *stream; +int +gdb_print_insn_z8k (memaddr, info) + bfd_vma memaddr; + disassemble_info *info; { - char temp[20]; - - read_memory (memaddr, temp, 20); if (BIG) - { - return print_insn_z8001 (memaddr, temp, stream); - } + return print_insn_z8001 (memaddr, info); else - { - return print_insn_z8002 (memaddr, temp, stream); - } + return print_insn_z8002 (memaddr, info); } /* Fetch the instruction at ADDR, returning 0 if ADDR is beyond LIM or @@ -232,16 +227,15 @@ NEXT_PROLOGUE_INSN (addr, lim, pword1) CORE_ADDR lim; short *pword1; { + char buf[2]; if (addr < lim + 8) { - read_memory (addr, pword1, sizeof (*pword1)); - SWAP_TARGET_AND_HOST (pword1, sizeof (short)); + read_memory (addr, buf, 2); + *pword1 = extract_signed_integer (buf, 2); return addr + 2; } - return 0; - } /* Put here the code to store, into a struct frame_saved_regs, @@ -268,7 +262,7 @@ frame_find_saved_regs (fip, fsrp) pc = skip_adjust (get_pc_function_start (fip->pc), &locals); { - adr = fip->frame - locals; + adr = FRAME_FP (fip) - locals; for (i = 0; i < 8; i++) { int word = read_memory_short (pc); @@ -296,44 +290,78 @@ frame_find_saved_regs (fip, fsrp) } +int +saved_pc_after_call () +{ + return addr_bits_remove + (read_memory_integer (read_register (SP_REGNUM), PTR_SIZE)); +} + + +extract_return_value (type, regbuf, valbuf) + struct type *type; + char *regbuf; + char *valbuf; +{ + int b; + int len = TYPE_LENGTH (type); + + for (b = 0; b < len; b += 2) + { + int todo = len - b; + + if (todo > 2) + todo = 2; + memcpy (valbuf + b, regbuf + b, todo); + } +} + void -addr_bits_set () +write_return_value (type, valbuf) + struct type *type; + char *valbuf; { - abort (); + int reg; + int len; + + for (len = 0; len < TYPE_LENGTH (type); len += 2) + write_register_bytes (REGISTER_BYTE (len / 2 + 2), valbuf + len, 2); } -int -saved_pc_after_call () +void +store_struct_return (addr, sp) + CORE_ADDR addr; + CORE_ADDR sp; { - return addr_bits_remove (read_memory_integer (read_register (SP_REGNUM), PTR_SIZE)); + write_register (2, addr); } + void print_register_hook (regno) int regno; { - if ((regno & 1) == 0 && regno < 16) { unsigned short l[2]; read_relative_register_raw_bytes (regno, (char *) (l + 0)); read_relative_register_raw_bytes (regno + 1, (char *) (l + 1)); - printf ("\t"); - printf ("%04x%04x", l[0], l[1]); + printf_unfiltered ("\t"); + printf_unfiltered ("%04x%04x", l[0], l[1]); } if ((regno & 3) == 0 && regno < 16) { unsigned short l[4]; - read_relative_register_raw_bytes (regno, l + 0); - read_relative_register_raw_bytes (regno + 1, l + 1); - read_relative_register_raw_bytes (regno + 2, l + 2); - read_relative_register_raw_bytes (regno + 3, l + 3); + 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)); - printf ("\t"); - printf ("%04x%04x%04x%04x", l[0], l[1], l[2], l[3]); + printf_unfiltered ("\t"); + printf_unfiltered ("%04x%04x%04x%04x", l[0], l[1], l[2], l[3]); } if (regno == 15) { @@ -342,45 +370,23 @@ print_register_hook (regno) read_relative_register_raw_bytes (regno, (char *) (&rval)); - printf ("\n"); + printf_unfiltered ("\n"); for (i = 0; i < 10; i += 2) { - printf ("(sp+%d=%04x)", i, read_memory_short (rval + i)); + printf_unfiltered ("(sp+%d=%04x)", i, read_memory_short (rval + i)); } } } void -register_convert_to_virtual (regnum, from, to) - unsigned char *from; - unsigned char *to; -{ - to[0] = from[0]; - to[1] = from[1]; - to[2] = from[2]; - to[3] = from[3]; -} - -void -register_convert_to_raw (regnum, to, from) - char *to; - char *from; -{ - to[0] = from[0]; - to[1] = from[1]; - to[2] = from[2]; - to[3] = from[3]; -} - -void z8k_pop_frame () { } struct cmd_list_element *setmemorylist; -void +void z8k_set_pointer_size (newsize) int newsize; { @@ -388,7 +394,7 @@ z8k_set_pointer_size (newsize) if (oldsize != newsize) { - printf ("pointer size set to %d bits\n", newsize); + printf_unfiltered ("pointer size set to %d bits\n", newsize); oldsize = newsize; if (newsize == 32) { @@ -407,7 +413,7 @@ segmented_command (args, from_tty) char *args; int from_tty; { - z8k_set_pointer_size (16); + z8k_set_pointer_size (32); } static void @@ -416,7 +422,6 @@ unsegmented_command (args, from_tty) int from_tty; { z8k_set_pointer_size (16); - } static void @@ -424,12 +429,15 @@ set_memory (args, from_tty) char *args; int from_tty; { - printf ("\"set memory\" must be followed by the name of a memory subcommand.\n"); - help_list (setmemorylist, "set memory ", -1, stdout); + 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 () { + tm_print_insn = gdb_print_insn_z8k; + add_prefix_cmd ("memory", no_class, set_memory, "set the memory model", &setmemorylist, "set memory ", 0, &setlist);