X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fh8300-tdep.c;h=e335fdb4d5db15494d3b540df1b75fe7d9a94872;hb=3a42e9d0622736d6ad84c37a2d4f4f54a0c30469;hp=3fbe9e1bb28628971fbf431a294a8867db2cee1b;hpb=7363ff9083bcd53b539c1688704d186f7aff53b1;p=binutils-gdb.git diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index 3fbe9e1bb28..e335fdb4d5d 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -1,25 +1,27 @@ /* Target-machine dependent code for Hitachi H8/300, for GDB. - Copyright (C) 1988, 1990, 1991 Free Software Foundation, Inc. + Copyright 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, + 2000, 2001 Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* - Contributed by Steve Chamberlain - sac@cygnus.com + Contributed by Steve Chamberlain + sac@cygnus.com */ #include "defs.h" @@ -32,6 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "gdbcore.h" #include "gdb_string.h" #include "value.h" +#include "regcache.h" extern int h8300hmode, h8300smode; @@ -57,8 +60,8 @@ extern int h8300hmode, h8300smode; static char *original_register_names[] = REGISTER_NAMES; static char *h8300h_register_names[] = - {"er0", "er1", "er2", "er3", "er4", "er5", "er6", - "sp", "ccr","pc","cycles","tick","inst" }; +{"er0", "er1", "er2", "er3", "er4", "er5", "er6", + "sp", "ccr", "pc", "cycles", "tick", "inst"}; char **h8300_register_names = original_register_names; @@ -66,13 +69,10 @@ char **h8300_register_names = original_register_names; /* Local function declarations. */ static CORE_ADDR examine_prologue (); -static void set_machine_hook PARAMS ((char *filename)); +static void set_machine_hook (char *filename); -void h8300_frame_find_saved_regs (); - -CORE_ADDR -h8300_skip_prologue (start_pc) - CORE_ADDR start_pc; +CORE_ADDR +h8300_skip_prologue (CORE_ADDR start_pc) { short int w; int adjust = 0; @@ -142,9 +142,7 @@ h8300_skip_prologue (start_pc) } int -gdb_print_insn_h8300 (memaddr, info) - bfd_vma memaddr; - disassemble_info *info; +gdb_print_insn_h8300 (bfd_vma memaddr, disassemble_info *info) { if (h8300smode) return print_insn_h8300s (memaddr, info); @@ -162,13 +160,12 @@ gdb_print_insn_h8300 (memaddr, info) the function prologue to determine the caller's sp value, and return it. */ CORE_ADDR -h8300_frame_chain (thisframe) - struct frame_info *thisframe; +h8300_frame_chain (struct frame_info *thisframe) { - if (PC_IN_CALL_DUMMY(thisframe->pc, thisframe->frame, thisframe->frame)) - { /* initialize the from_pc now */ + if (PC_IN_CALL_DUMMY (thisframe->pc, thisframe->frame, thisframe->frame)) + { /* initialize the from_pc now */ thisframe->from_pc = generic_read_register_dummy (thisframe->pc, - thisframe->frame, + thisframe->frame, PC_REGNUM); return thisframe->frame; } @@ -186,9 +183,8 @@ h8300_frame_chain (thisframe) fairly expensive. */ void -h8300_frame_find_saved_regs (fi, fsr) - struct frame_info *fi; - struct frame_saved_regs *fsr; +h8300_frame_find_saved_regs (struct frame_info *fi, + struct frame_saved_regs *fsr) { register struct frame_saved_regs *cache_fsr; CORE_ADDR ip; @@ -203,15 +199,15 @@ h8300_frame_find_saved_regs (fi, fsr) fi->fsr = cache_fsr; - if (PC_IN_CALL_DUMMY(fi->pc, fi->frame, fi->frame)) - { /* no more to do. */ + if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame)) + { /* no more to do. */ if (fsr) *fsr = *fi->fsr; return; } /* Find the start and end of the function prologue. If the PC - is in the function prologue, we only consider the part that - has executed already. */ + is in the function prologue, we only consider the part that + has executed already. */ ip = get_pc_function_start (fi->pc); sal = find_pc_line (ip, 0); @@ -228,13 +224,10 @@ h8300_frame_find_saved_regs (fi, fsr) /* Fetch the instruction at ADDR, returning 0 if ADDR is beyond LIM or is not the address of a valid instruction, the address of the next instruction beyond ADDR otherwise. *PWORD1 receives the first word - of the instruction.*/ + of the instruction. */ CORE_ADDR -NEXT_PROLOGUE_INSN (addr, lim, pword1) - CORE_ADDR addr; - CORE_ADDR lim; - INSN_WORD *pword1; +NEXT_PROLOGUE_INSN (CORE_ADDR addr, CORE_ADDR lim, INSN_WORD *pword1) { char buf[2]; if (addr < lim + 8) @@ -257,12 +250,9 @@ NEXT_PROLOGUE_INSN (addr, lim, pword1) to reflect the offsets of the arg pointer and the locals pointer. */ static CORE_ADDR -examine_prologue (ip, limit, after_prolog_fp, fsr, fi) - register CORE_ADDR ip; - register CORE_ADDR limit; - CORE_ADDR after_prolog_fp; - struct frame_saved_regs *fsr; - struct frame_info *fi; +examine_prologue (register CORE_ADDR ip, register CORE_ADDR limit, + CORE_ADDR after_prolog_fp, struct frame_saved_regs *fsr, + struct frame_info *fi) { register CORE_ADDR next_ip; int r; @@ -404,7 +394,7 @@ examine_prologue (ip, limit, after_prolog_fp, fsr, fi) /* Rememeber any others too */ in_frame[PC_REGNUM] = 0; - + if (have_fp) /* We keep the old FP in the SP spot */ fsr->regs[SP_REGNUM] = read_memory_unsigned_integer (fsr->regs[6], BINWORD); @@ -415,16 +405,14 @@ examine_prologue (ip, limit, after_prolog_fp, fsr, fi) } void -h8300_init_extra_frame_info (fromleaf, fi) - int fromleaf; - struct frame_info *fi; +h8300_init_extra_frame_info (int fromleaf, struct frame_info *fi) { fi->fsr = 0; /* Not yet allocated */ fi->args_pointer = 0; /* Unknown */ fi->locals_pointer = 0; /* Unknown */ fi->from_pc = 0; - if (PC_IN_CALL_DUMMY(fi->pc, fi->frame, fi->frame)) - { /* anything special to do? */ + if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame)) + { /* anything special to do? */ return; } } @@ -435,20 +423,18 @@ h8300_init_extra_frame_info (fromleaf, fi) just use the register SRP_REGNUM itself. */ CORE_ADDR -h8300_frame_saved_pc (frame) - struct frame_info *frame; +h8300_frame_saved_pc (struct frame_info *frame) { - if (PC_IN_CALL_DUMMY(frame->pc, frame->frame, frame->frame)) + if (PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame)) return generic_read_register_dummy (frame->pc, frame->frame, PC_REGNUM); else return frame->from_pc; } CORE_ADDR -frame_locals_address (fi) - struct frame_info *fi; +h8300_frame_locals_address (struct frame_info *fi) { - if (PC_IN_CALL_DUMMY(fi->pc, fi->frame, fi->frame)) + if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame)) return (CORE_ADDR) 0; /* Not sure what else to do... */ if (!fi->locals_pointer) { @@ -464,10 +450,9 @@ frame_locals_address (fi) described by FI. Returns 0 if the address is unknown. */ CORE_ADDR -frame_args_address (fi) - struct frame_info *fi; +h8300_frame_args_address (struct frame_info *fi) { - if (PC_IN_CALL_DUMMY(fi->pc, fi->frame, fi->frame)) + if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame)) return (CORE_ADDR) 0; /* Not sure what else to do... */ if (!fi->args_pointer) { @@ -510,7 +495,7 @@ frame_args_address (fi) optimization. I suspect this is a compiler bug. Arguments of these odd sizes are left-justified within the word (as opposed to arguments smaller than WORDSIZE bytes, which are right-justified). - + If the function is to return an aggregate type such as a struct, the caller must allocate space into which the callee will copy the return value. In this case, a pointer to the return value location @@ -518,12 +503,8 @@ frame_args_address (fi) the other arguments passed in via registers R0 to R2. */ CORE_ADDR -h8300_push_arguments(nargs, args, sp, struct_return, struct_addr) - int nargs; - struct value **args; - CORE_ADDR sp; - unsigned char struct_return; - CORE_ADDR struct_addr; +h8300_push_arguments (int nargs, struct value **args, CORE_ADDR sp, + unsigned char struct_return, CORE_ADDR struct_addr) { int stack_align, stack_alloc, stack_offset; int wordsize; @@ -538,27 +519,27 @@ h8300_push_arguments(nargs, args, sp, struct_return, struct_addr) if (h8300hmode || h8300smode) { stack_align = 3; - wordsize = 4; + wordsize = 4; } else { stack_align = 1; - wordsize = 2; + wordsize = 2; } /* first force sp to a n-byte alignment */ sp = sp & ~stack_align; /* Now make sure there's space on the stack */ - for (argnum = 0, stack_alloc = 0; + for (argnum = 0, stack_alloc = 0; argnum < nargs; argnum++) - stack_alloc += ((TYPE_LENGTH(VALUE_TYPE(args[argnum])) + stack_align) + stack_alloc += ((TYPE_LENGTH (VALUE_TYPE (args[argnum])) + stack_align) & ~stack_align); - sp -= stack_alloc; /* make room on stack for args */ + sp -= stack_alloc; /* make room on stack for args */ /* we may over-allocate a little here, but that won't hurt anything */ - argreg = ARG0_REGNUM; - if (struct_return) /* "struct return" pointer takes up one argreg */ + argreg = ARG0_REGNUM; + if (struct_return) /* "struct return" pointer takes up one argreg */ { write_register (argreg++, struct_addr); } @@ -571,30 +552,30 @@ h8300_push_arguments(nargs, args, sp, struct_return, struct_addr) { type = VALUE_TYPE (args[argnum]); len = TYPE_LENGTH (type); - memset(valbuf, 0, sizeof(valbuf)); + memset (valbuf, 0, sizeof (valbuf)); if (len < wordsize) { /* the purpose of this is to right-justify the value within the word */ - memcpy(valbuf + (wordsize - len), - (char *) VALUE_CONTENTS (args[argnum]), len); + memcpy (valbuf + (wordsize - len), + (char *) VALUE_CONTENTS (args[argnum]), len); val = valbuf; } else val = (char *) VALUE_CONTENTS (args[argnum]); - if (len > (ARGLAST_REGNUM+1 - argreg) * REGISTER_RAW_SIZE(ARG0_REGNUM) || - (len > wordsize && (len & stack_align) != 0)) - { /* passed on the stack */ - write_memory (sp + stack_offset, val, + if (len > (ARGLAST_REGNUM + 1 - argreg) * REGISTER_RAW_SIZE (ARG0_REGNUM) || + (len > wordsize && (len & stack_align) != 0)) + { /* passed on the stack */ + write_memory (sp + stack_offset, val, len < wordsize ? wordsize : len); stack_offset += (len + stack_align) & ~stack_align; } /* NOTE WELL!!!!! This is not an "else if" clause!!! - That's because some *&^%$ things get passed on the stack - AND in the registers! */ - if (len <= (ARGLAST_REGNUM+1 - argreg) * REGISTER_RAW_SIZE(ARG0_REGNUM)) + That's because some *&^%$ things get passed on the stack + AND in the registers! */ + if (len <= (ARGLAST_REGNUM + 1 - argreg) * REGISTER_RAW_SIZE (ARG0_REGNUM)) while (len > 0) - { /* there's room in registers */ + { /* there's room in registers */ regval = extract_address (val, wordsize); write_register (argreg, regval); len -= wordsize; @@ -612,9 +593,7 @@ h8300_push_arguments(nargs, args, sp, struct_return, struct_addr) a JSR/BSR instruction. */ CORE_ADDR -h8300_push_return_address (pc, sp) - CORE_ADDR pc; - CORE_ADDR sp; +h8300_push_return_address (CORE_ADDR pc, CORE_ADDR sp) { unsigned char buf[4]; int wordsize; @@ -630,21 +609,21 @@ h8300_push_return_address (pc, sp) return sp; } -/* Function: pop_frame +/* Function: h8300_pop_frame Restore the machine to the state it had before the current frame was created. Usually used either by the "RETURN" command, or by call_function_by_hand after the dummy_frame is finished. */ -void -h8300_pop_frame () +void +h8300_pop_frame (void) { unsigned regnum; struct frame_saved_regs fsr; struct frame_info *frame = get_current_frame (); - if (PC_IN_CALL_DUMMY(frame->pc, frame->frame, frame->frame)) + if (PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame)) { - generic_pop_dummy_frame(); + generic_pop_dummy_frame (); } else { @@ -655,8 +634,8 @@ h8300_pop_frame () /* Don't forget SP_REGNUM is a frame_saved_regs struct is the actual value we want, not the address of the value we want. */ if (fsr.regs[regnum] && regnum != SP_REGNUM) - write_register (regnum, - read_memory_integer(fsr.regs[regnum], BINWORD)); + write_register (regnum, + read_memory_integer (fsr.regs[regnum], BINWORD)); else if (fsr.regs[regnum] && regnum == SP_REGNUM) write_register (regnum, frame->frame + 2 * BINWORD); } @@ -672,10 +651,7 @@ h8300_pop_frame () Copy that into VALBUF. Be sure to account for CPU type. */ void -h8300_extract_return_value (type, regbuf, valbuf) - struct type *type; - char *regbuf; - char *valbuf; +h8300_extract_return_value (struct type *type, char *regbuf, char *valbuf) { int wordsize, len; @@ -684,92 +660,76 @@ h8300_extract_return_value (type, regbuf, valbuf) else wordsize = 2; - len = TYPE_LENGTH(type); - - switch (len) { - case 1: /* (char) */ - case 2: /* (short), (int) */ - memcpy (valbuf, regbuf + REGISTER_BYTE(0) + (wordsize - len), len); - break; - case 4: /* (long), (float) */ - if (h8300smode || h8300hmode) - { - memcpy (valbuf, regbuf + REGISTER_BYTE(0), 4); - } - else - { - memcpy (valbuf, regbuf + REGISTER_BYTE(0), 2); - memcpy (valbuf+2, regbuf + REGISTER_BYTE(1), 2); - } - break; - case 8: /* (double) (doesn't seem to happen, which is good, - because this almost certainly isn't right. */ - error ("I don't know how a double is returned."); - break; - } + len = TYPE_LENGTH (type); + + switch (len) + { + case 1: /* (char) */ + case 2: /* (short), (int) */ + memcpy (valbuf, regbuf + REGISTER_BYTE (0) + (wordsize - len), len); + break; + case 4: /* (long), (float) */ + if (h8300smode || h8300hmode) + { + memcpy (valbuf, regbuf + REGISTER_BYTE (0), 4); + } + else + { + memcpy (valbuf, regbuf + REGISTER_BYTE (0), 2); + memcpy (valbuf + 2, regbuf + REGISTER_BYTE (1), 2); + } + break; + case 8: /* (double) (doesn't seem to happen, which is good, + because this almost certainly isn't right. */ + error ("I don't know how a double is returned."); + break; + } } /* Function: store_return_value Place the appropriate value in the appropriate registers. Primarily used by the RETURN command. */ -void -h8300_store_return_value (type, valbuf) - struct type *type; - char *valbuf; +void +h8300_store_return_value (struct type *type, char *valbuf) { int wordsize, len, regval; - + if (h8300hmode || h8300smode) wordsize = 4; else wordsize = 2; - len = TYPE_LENGTH(type); - switch (len) { - case 1: /* char */ - case 2: /* short, int */ - regval = extract_address(valbuf, len); - write_register (0, regval); - break; - case 4: /* long, float */ - regval = extract_address(valbuf, len); - if (h8300smode || h8300hmode) - { - write_register (0, regval); - } - else - { - write_register (0, regval >> 16); - write_register (1, regval & 0xffff); - } - break; - case 8: /* presumeably double, but doesn't seem to happen */ - error ("I don't know how to return a double."); - break; - } -} - -/* Function: get_saved_register - Just call the generic_get_saved_register function. */ - -void -get_saved_register (raw_buffer, optimized, addrp, frame, regnum, lval) - char *raw_buffer; - int *optimized; - CORE_ADDR *addrp; - struct frame_info *frame; - int regnum; - enum lval_type *lval; -{ - generic_get_saved_register (raw_buffer, optimized, addrp, - frame, regnum, lval); + len = TYPE_LENGTH (type); + switch (len) + { + case 1: /* char */ + case 2: /* short, int */ + regval = extract_address (valbuf, len); + write_register (0, regval); + break; + case 4: /* long, float */ + regval = extract_address (valbuf, len); + if (h8300smode || h8300hmode) + { + write_register (0, regval); + } + else + { + write_register (0, regval >> 16); + write_register (1, regval & 0xffff); + } + break; + case 8: /* presumeably double, but doesn't seem to happen */ + error ("I don't know how to return a double."); + break; + } } struct cmd_list_element *setmemorylist; static void -set_register_names () +set_register_names (void) { if (h8300hmode != 0) h8300_register_names = h8300h_register_names; @@ -778,7 +738,7 @@ set_register_names () } static void -h8300_command(args, from_tty) +h8300_command (char *args, int from_tty) { extern int h8300hmode; h8300hmode = 0; @@ -787,7 +747,7 @@ h8300_command(args, from_tty) } static void -h8300h_command(args, from_tty) +h8300h_command (char *args, int from_tty) { extern int h8300hmode; h8300hmode = 1; @@ -796,7 +756,7 @@ h8300h_command(args, from_tty) } static void -h8300s_command(args, from_tty) +h8300s_command (char *args, int from_tty) { extern int h8300smode; extern int h8300hmode; @@ -806,10 +766,8 @@ h8300s_command(args, from_tty) } -static void -set_machine (args, from_tty) - char *args; - int from_tty; +static void +set_machine (char *args, int from_tty) { printf_unfiltered ("\"set machine\" must be followed by h8300, h8300h"); printf_unfiltered ("or h8300s"); @@ -823,16 +781,14 @@ set_machine (args, from_tty) to be 16 or 32 bits as appropriate for the machine. */ static void -set_machine_hook (filename) - char *filename; +set_machine_hook (char *filename) { if (bfd_get_mach (exec_bfd) == bfd_mach_h8300s) { h8300smode = 1; h8300hmode = 1; } - else - if (bfd_get_mach (exec_bfd) == bfd_mach_h8300h) + else if (bfd_get_mach (exec_bfd) == bfd_mach_h8300h) { h8300smode = 0; h8300hmode = 1; @@ -846,10 +802,10 @@ set_machine_hook (filename) } void -_initialize_h8300m () +_initialize_h8300m (void) { add_prefix_cmd ("machine", no_class, set_machine, - "set the machine type", + "set the machine type", &setmemorylist, "set machine ", 0, &setlist); @@ -864,13 +820,13 @@ _initialize_h8300m () /* Add a hook to set the machine type when we're loading a file. */ - specify_exec_file_hook(set_machine_hook); + specify_exec_file_hook (set_machine_hook); } void -print_register_hook (regno) +h8300_print_register_hook (int regno) { if (regno == 8) { @@ -879,7 +835,7 @@ print_register_hook (regno) unsigned char b[4]; unsigned char l; read_relative_register_raw_bytes (regno, b); - l = b[REGISTER_VIRTUAL_SIZE(8) -1]; + l = b[REGISTER_VIRTUAL_SIZE (8) - 1]; printf_unfiltered ("\t"); printf_unfiltered ("I-%d - ", (l & 0x80) != 0); printf_unfiltered ("H-%d - ", (l & 0x20) != 0); @@ -915,7 +871,7 @@ print_register_hook (regno) } void -_initialize_h8300_tdep () +_initialize_h8300_tdep (void) { tm_print_insn = gdb_print_insn_h8300; }