diff options
Diffstat (limited to 'gdb/m-merlin.h')
| -rw-r--r-- | gdb/m-merlin.h | 51 |
1 files changed, 35 insertions, 16 deletions
diff --git a/gdb/m-merlin.h b/gdb/m-merlin.h index ec06135..196d734 100644 --- a/gdb/m-merlin.h +++ b/gdb/m-merlin.h @@ -94,6 +94,12 @@ anyone else from sharing it farther. Help stamp out software hoarding! #define NS32K_SVC_IMMED_OPERANDS +/* Largest integer type */ +#define LONGEST long + +/* Name of the builtin type for the LONGEST type above. */ +#define BUILTIN_TYPE_LONGEST builtin_type_long + /* Say how long (ordinary) registers are. */ #define REGISTER_TYPE long @@ -216,6 +222,14 @@ anyone else from sharing it farther. Help stamp out software hoarding! : builtin_type_float) \ : builtin_type_int) +/* Store the address of the place in which to copy the structure the + subroutine will return. This is called from call_function. + + On this machine this is a no-op, as gcc doesn't run on it yet. + This calling convention is not used. */ + +#define STORE_STRUCT_RETURN(ADDR, SP) + /* Extract from an array REGBUF containing the (raw) register state a function return value of type TYPE, and copy that, in virtual format, into VALBUF. */ @@ -251,21 +265,21 @@ anyone else from sharing it farther. Help stamp out software hoarding! /* In the case of the Merlin, the frame's nominal address is the FP value, and at that address is saved previous FP value as a 4-byte word. */ -#define FRAME_CHAIN(thisframe) (read_memory_integer (thisframe, 4)) +#define FRAME_CHAIN(thisframe) (read_memory_integer ((thisframe)->frame, 4)) #define FRAME_CHAIN_VALID(chain, thisframe) \ - (chain != 0 && (FRAME_SAVED_PC (thisframe,0) >= first_object_file_end)) + (chain != 0 && (FRAME_SAVED_PC (thisframe) >= first_object_file_end)) #define FRAME_CHAIN_COMBINE(chain, thisframe) (chain) /* Define other aspects of the stack frame. */ -#define FRAME_SAVED_PC(frame,ignore) (read_memory_integer (frame + 4, 4)) +#define FRAME_SAVED_PC(FRAME) (read_memory_integer ((FRAME)->frame + 4, 4)) /* compute base of arguments */ -#define FRAME_ARGS_ADDRESS(fi) ((fi).frame) +#define FRAME_ARGS_ADDRESS(fi) ((fi)->frame) -#define FRAME_LOCALS_ADDRESS(fi) ((fi).frame) +#define FRAME_LOCALS_ADDRESS(fi) ((fi)->frame) /* Return number of args passed to a frame. Can return -1, meaning no way to tell. */ @@ -276,7 +290,7 @@ anyone else from sharing it farther. Help stamp out software hoarding! int addr_mode; \ int width; \ \ - pc = FRAME_SAVED_PC (fi.frame,0); \ + pc = FRAME_SAVED_PC (fi); \ insn = read_memory_integer (pc,2); \ addr_mode = (insn >> 11) & 0x1f; \ insn = insn & 0x7ff; \ @@ -311,17 +325,17 @@ anyone else from sharing it farther. Help stamp out software hoarding! CORE_ADDR enter_addr; \ CORE_ADDR next_addr; \ \ - enter_addr = get_pc_function_start ((frame_info).pc); \ + enter_addr = get_pc_function_start ((frame_info)->pc); \ regmask = read_memory_integer (enter_addr+1, 1); \ localcount = ns32k_localcount (enter_addr); \ - next_addr = (frame_info).frame + localcount; \ + next_addr = (frame_info)->frame + localcount; \ for (regnum = 0; regnum < 8; regnum++, regmask >>= 1) \ (frame_saved_regs).regs[regnum] \ = (regmask & 1) ? (next_addr -= 4) : 0; \ - (frame_saved_regs).regs[SP_REGNUM] = (frame_info).frame + 4; \ - (frame_saved_regs).regs[PC_REGNUM] = (frame_info).frame + 4; \ + (frame_saved_regs).regs[SP_REGNUM] = (frame_info)->frame + 4; \ + (frame_saved_regs).regs[PC_REGNUM] = (frame_info)->frame + 4; \ (frame_saved_regs).regs[FP_REGNUM] \ - = read_memory_integer ((frame_info).frame, 4); } + = read_memory_integer ((frame_info)->frame, 4); } /* Compensate for lack of `vprintf' function. */ #define vprintf(format, ap) _doprnt (format, ap, stdout) @@ -344,18 +358,23 @@ anyone else from sharing it farther. Help stamp out software hoarding! /* Discard from the stack the innermost frame, restoring all registers. */ #define POP_FRAME \ -{ register CORE_ADDR fp = read_register (FP_REGNUM); \ +{ 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 (fp); \ - get_frame_saved_regs (&fi, &fsr); \ + struct frame_info *fi; \ + fi = get_frame_info (frame); \ + fp = fi->frame; \ + get_frame_saved_regs (fi, &fsr); \ for (regnum = 0; regnum < 8; regnum++) \ if (fsr.regs[regnum]) \ write_register (regnum, read_memory_integer (fsr.regs[regnum], 4)); \ write_register (FP_REGNUM, read_memory_integer (fp, 4)); \ write_register (PC_REGNUM, read_memory_integer (fp + 4, 4)); \ write_register (SP_REGNUM, fp + 8); \ + flush_cached_frames (); \ + set_current_frame (create_new_frame (read_register (FP_REGNUM),\ + read_pc ())); } /* This sequence of words is the instructions @@ -375,7 +394,7 @@ anyone else from sharing it farther. Help stamp out software hoarding! /* Insert the specified number of args and function address into a call sequence of the above form stored at DUMMYNAME. */ -#define FIX_CALL_DUMMY(dummyname, fun, nargs) \ +#define FIX_CALL_DUMMY(dummyname, pc, fun, nargs, type) \ { int flipped = fun | 0xc0000000; \ flip_bytes (&flipped, 4); \ *((int *) (((char *) dummyname)+CALL_DUMMY_ADDR)) = flipped; \ |