X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fh8300-tdep.c;h=a0bea530d93117a450a67080416f59406ba1d94e;hb=feb129926a8d12656f1ca4b7a8bb10268d3af4fb;hp=df179bb377deea66dee85ef0eb2a8e289f844e86;hpb=dc1b349d39a95d3944428155d352ff04c3115963;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index df179bb377..a0bea530d9 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -1,25 +1,26 @@ /* Target-machine dependent code for Hitachi H8/300, for GDB. Copyright (C) 1988, 1990, 1991 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" @@ -50,6 +51,19 @@ extern int h8300hmode, h8300smode; #define IS_MOVK_R5(x) (x==0x7905) #define IS_SUB_R5SP(x) (x==0x1957) + +/* The register names change depending on whether the h8300h processor + type is selected. */ + +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"}; + +char **h8300_register_names = original_register_names; + + /* Local function declarations. */ static CORE_ADDR examine_prologue (); @@ -57,7 +71,7 @@ static void set_machine_hook PARAMS ((char *filename)); void h8300_frame_find_saved_regs (); -CORE_ADDR +CORE_ADDR h8300_skip_prologue (start_pc) CORE_ADDR start_pc; { @@ -152,10 +166,10 @@ CORE_ADDR h8300_frame_chain (thisframe) 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; } @@ -169,8 +183,8 @@ h8300_frame_chain (thisframe) ways in the stack frame. sp is even more special: the address we return for it IS the sp for the next frame. - We cache the result of doing this in the frame_cache_obstack, since - it is fairly expensive. */ + We cache the result of doing this in the frame_obstack, since it is + fairly expensive. */ void h8300_frame_find_saved_regs (fi, fsr) @@ -178,7 +192,6 @@ h8300_frame_find_saved_regs (fi, fsr) struct frame_saved_regs *fsr; { register struct frame_saved_regs *cache_fsr; - extern struct obstack frame_cache_obstack; CORE_ADDR ip; struct symtab_and_line sal; CORE_ADDR limit; @@ -186,21 +199,20 @@ h8300_frame_find_saved_regs (fi, fsr) if (!fi->fsr) { cache_fsr = (struct frame_saved_regs *) - obstack_alloc (&frame_cache_obstack, - sizeof (struct frame_saved_regs)); + frame_obstack_alloc (sizeof (struct frame_saved_regs)); memset (cache_fsr, '\0', sizeof (struct frame_saved_regs)); 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); @@ -217,7 +229,7 @@ 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) @@ -393,7 +405,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); @@ -412,8 +424,8 @@ h8300_init_extra_frame_info (fromleaf, fi) 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; } } @@ -427,7 +439,7 @@ CORE_ADDR h8300_frame_saved_pc (frame) 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; @@ -437,7 +449,7 @@ CORE_ADDR frame_locals_address (fi) 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) { @@ -456,7 +468,7 @@ CORE_ADDR frame_args_address (fi) 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) { @@ -499,7 +511,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 @@ -507,7 +519,7 @@ 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) +h8300_push_arguments (nargs, args, sp, struct_return, struct_addr) int nargs; struct value **args; CORE_ADDR sp; @@ -527,27 +539,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); } @@ -560,30 +572,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; @@ -613,13 +625,8 @@ h8300_push_return_address (pc, sp) else wordsize = 2; -#if CALL_DUMMY_LOCATION != AT_ENTRY_POINT - pc = pc - CALL_DUMMY_START_OFFSET + CALL_DUMMY_BREAKPOINT_OFFSET; -#else - pc = CALL_DUMMY_ADDRESS (); -#endif /* CALL_DUMMY_LOCATION */ sp -= wordsize; - store_unsigned_integer (buf, wordsize, pc); + store_unsigned_integer (buf, wordsize, CALL_DUMMY_ADDRESS ()); write_memory (sp, buf, wordsize); return sp; } @@ -629,16 +636,16 @@ h8300_push_return_address (pc, sp) was created. Usually used either by the "RETURN" command, or by call_function_by_hand after the dummy_frame is finished. */ -void +void h8300_pop_frame () { 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 { @@ -649,8 +656,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); } @@ -678,116 +685,115 @@ 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 +void h8300_store_return_value (type, valbuf) 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; - } + 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. */ +struct cmd_list_element *setmemorylist; -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; +static void +set_register_names () { - generic_get_saved_register (raw_buffer, optimized, addrp, - frame, regnum, lval); + if (h8300hmode != 0) + h8300_register_names = h8300h_register_names; + else + h8300_register_names = original_register_names; } -struct cmd_list_element *setmemorylist; - static void -h8300_command(args, from_tty) +h8300_command (args, from_tty) { extern int h8300hmode; h8300hmode = 0; h8300smode = 0; + set_register_names (); } static void -h8300h_command(args, from_tty) +h8300h_command (args, from_tty) { extern int h8300hmode; h8300hmode = 1; h8300smode = 0; + set_register_names (); } + static void -h8300s_command(args, from_tty) +h8300s_command (args, from_tty) { extern int h8300smode; extern int h8300hmode; h8300smode = 1; h8300hmode = 1; + set_register_names (); } -static void +static void set_machine (args, from_tty) char *args; int from_tty; @@ -812,8 +818,7 @@ set_machine_hook (filename) 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; @@ -823,13 +828,14 @@ set_machine_hook (filename) h8300smode = 0; h8300hmode = 0; } + set_register_names (); } void _initialize_h8300m () { add_prefix_cmd ("machine", no_class, set_machine, - "set the machine type", + "set the machine type", &setmemorylist, "set machine ", 0, &setlist); @@ -844,7 +850,7 @@ _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); } @@ -859,7 +865,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);