From abef03ced210ea3903a003a9a1641733b225ecec Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Thu, 23 Sep 1993 17:20:44 +0000 Subject: [PATCH] * config/m88k/tm-m88k.h, m88k-tdep.c: Add call function stuff. --- gdb/ChangeLog | 2 +- gdb/m88k-tdep.c | 138 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 98 insertions(+), 42 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c27d9967c4c..6461cd53451 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -11,7 +11,7 @@ Thu Sep 23 10:49:37 1993 Jim Kingdon (kingdon@lioth.cygnus.com) z8k-tdep.c: Remove all references to ADDR_BITS_SET. * config/m88k/tm-m88k.h: Define TARGET_WRITE_PC. - * config/m88k/tm-m88k.h: Add definitions for calling functions. + * config/m88k/tm-m88k.h, m88k-tdep.c: Add call function stuff. Thu Sep 23 00:13:06 1993 Peter Schauer (pes@regent.e-technik.tu-muenchen.de) diff --git a/gdb/m88k-tdep.c b/gdb/m88k-tdep.c index 1ada4d97a09..3e0351dbd21 100644 --- a/gdb/m88k-tdep.c +++ b/gdb/m88k-tdep.c @@ -539,7 +539,8 @@ frame_saved_pc (frame) return read_next_frame_reg(frame, SRP_REGNUM); } - +#if 0 +/* I believe this is all obsolete call dummy stuff. */ static int pushed_size (prev_words, v) int prev_words; @@ -744,13 +745,6 @@ push_parameters (return_type, struct_conv, nargs, args) } } -void -pop_frame () -{ - error ("Feature not implemented for the m88k yet."); - return; -} - void collect_returned_value (rval, value_type, struct_return, nargs, args) value *rval; @@ -765,46 +759,108 @@ collect_returned_value (rval, value_type, struct_return, nargs, args) *rval = value_being_returned (value_type, retbuf, struct_return); return; } +#endif /* 0 */ -#if 0 -/* Now handled in a machine independent way with CALL_DUMMY_LOCATION. */ - /* Stuff a breakpoint instruction onto the stack (or elsewhere if the stack - is not a good place for it). Return the address at which the instruction - got stuffed, or zero if we were unable to stuff it anywhere. */ +/*start of lines added by kev*/ + +#define DUMMY_FRAME_SIZE 192 + +static void +write_word (sp, word) + CORE_ADDR sp; + REGISTER_TYPE word; +{ + register int len = sizeof (REGISTER_TYPE); + char buffer[MAX_REGISTER_RAW_SIZE]; + + store_unsigned_integer (buffer, len, word); + write_memory (sp, buffer, len); +} + +void +m88k_push_dummy_frame() +{ + register CORE_ADDR sp = read_register (SP_REGNUM); + register int rn; + int offset; + + sp -= DUMMY_FRAME_SIZE; /* allocate a bunch of space */ + + for (rn = 0, offset = 0; rn <= SP_REGNUM; rn++, offset+=4) + write_word (sp+offset, read_register(rn)); -CORE_ADDR -push_breakpoint () + write_word (sp+offset, read_register (SXIP_REGNUM)); + offset += 4; + + write_word (sp+offset, read_register (SNIP_REGNUM)); + offset += 4; + + write_word (sp+offset, read_register (SFIP_REGNUM)); + offset += 4; + + write_word (sp+offset, read_register (PSR_REGNUM)); + offset += 4; + + write_word (sp+offset, read_register (FPSR_REGNUM)); + offset += 4; + + write_word (sp+offset, read_register (FPCR_REGNUM)); + offset += 4; + + write_register (SP_REGNUM, sp); + write_register (ACTUAL_FP_REGNUM, sp); +} + +void +pop_frame () { - static char breakpoint_insn[] = BREAKPOINT; - extern CORE_ADDR text_end; /* of inferior */ - static char readback_buffer[] = BREAKPOINT; - int i; - - /* With a little bit of luck, we can just stash the breakpoint instruction - in the word just beyond the end of normal text space. For systems on - which the hardware will not allow us to execute out of the stack segment, - we have to hope that we *are* at least allowed to effectively extend the - text segment by one word. If the actual end of user's the text segment - happens to fall right at a page boundary this trick may fail. Note that - we check for this by reading after writing, and comparing in order to - be sure that the write worked. */ + register FRAME frame = get_current_frame (); + register CORE_ADDR fp; + register int regnum; + struct frame_saved_regs fsr; + struct frame_info *fi; + + fi = get_frame_info (frame); + fp = fi -> frame; + get_frame_saved_regs (fi, &fsr); + + if (PC_IN_CALL_DUMMY (read_pc(), read_register(SP_REGNUM), FRAME_FP(fi))) + { + /* FIXME: I think get_frame_saved_regs should be handling this so + that we can deal with the saved registers properly (e.g. frame + 1 is a call dummy, the user types "frame 2" and then "print $ps"). */ + register CORE_ADDR sp = read_register (ACTUAL_FP_REGNUM); + int offset; + + for (regnum = 0, offset = 0; regnum <= SP_REGNUM; regnum++, offset+=4) + (void) write_register (regnum, read_memory_integer (sp+offset, 4)); + + write_register (SXIP_REGNUM, read_memory_integer (sp+offset, 4)); + offset += 4; - write_memory (text_end, &breakpoint_insn, 4); + write_register (SNIP_REGNUM, read_memory_integer (sp+offset, 4)); + offset += 4; - /* Fill the readback buffer with some garbage which is certain to be - unequal to the breakpoint insn. That way we can tell if the - following read doesn't actually succeed. */ + write_register (SFIP_REGNUM, read_memory_integer (sp+offset, 4)); + offset += 4; - for (i = 0; i < sizeof (readback_buffer); i++) - readback_buffer[i] = ~ readback_buffer[i]; /* Invert the bits */ + write_register (PSR_REGNUM, read_memory_integer (sp+offset, 4)); + offset += 4; - /* Now check that the breakpoint insn was successfully installed. */ + write_register (FPSR_REGNUM, read_memory_integer (sp+offset, 4)); + offset += 4; - read_memory (text_end, readback_buffer, sizeof (readback_buffer)); - for (i = 0; i < sizeof (readback_buffer); i++) - if (readback_buffer[i] != breakpoint_insn[i]) - return 0; /* Failed to install! */ + write_register (FPCR_REGNUM, read_memory_integer (sp+offset, 4)); + offset += 4; - return text_end; + } + else + { + for (regnum = FP_REGNUM ; regnum > 0 ; regnum--) + if (fsr.regs[regnum]) + write_register (regnum, + read_memory_integer (fsr.regs[regnum], 4)); + write_pc(frame_saved_pc(frame)); + } + reinit_frame_cache (); } -#endif -- 2.30.2