X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fs390-tdep.c;h=b309524b69006310fd7fb451312a7b74284016ca;hb=55f960e1d2e58215a0c274e8d30e6036c96a2959;hp=f3810a8817bc1dff1d82b90f330fab3f6e964169;hpb=b46e02f67c909205abc6b82e963bfd46cabcea4f;p=binutils-gdb.git diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index f3810a8817b..b309524b690 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1,6 +1,7 @@ /* Target-dependent code for GDB, the GNU debugger. - Copyright 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Free Software Foundation, Inc. Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) for IBM Deutschland Entwicklung GmbH, IBM Corporation. @@ -9,7 +10,7 @@ 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 + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -18,12 +19,9 @@ 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. */ + along with this program. If not, see . */ -#define S390_TDEP /* for special macros in tm-s390.h */ -#include +#include "defs.h" #include "arch-utils.h" #include "frame.h" #include "inferior.h" @@ -31,1235 +29,1736 @@ #include "target.h" #include "gdbcore.h" #include "gdbcmd.h" -#include "symfile.h" #include "objfiles.h" -#include "tm.h" -#include "../bfd/bfd.h" #include "floatformat.h" #include "regcache.h" +#include "trad-frame.h" +#include "frame-base.h" +#include "frame-unwind.h" +#include "dwarf2-frame.h" +#include "reggroups.h" +#include "regset.h" #include "value.h" #include "gdb_assert.h" +#include "dis-asm.h" +#include "solib-svr4.h" +#include "prologue-value.h" +#include "s390-tdep.h" +/* The tdep structure. */ -/* Number of bytes of storage in the actual machine representation - for register N. */ -int -s390_register_raw_size (int reg_nr) +struct gdbarch_tdep { - if (S390_FP0_REGNUM <= reg_nr - && reg_nr < S390_FP0_REGNUM + S390_NUM_FPRS) - return S390_FPR_SIZE; - else - return 4; -} + /* ABI version. */ + enum { ABI_LINUX_S390, ABI_LINUX_ZSERIES } abi; -int -s390x_register_raw_size (int reg_nr) + /* Core file register sets. */ + const struct regset *gregset; + int sizeof_gregset; + + const struct regset *fpregset; + int sizeof_fpregset; +}; + + +/* Return the name of register REGNUM. */ +static const char * +s390_register_name (struct gdbarch *gdbarch, int regnum) { - return (reg_nr == S390_FPC_REGNUM) - || (reg_nr >= S390_FIRST_ACR && reg_nr <= S390_LAST_ACR) ? 4 : 8; + static const char *register_names[S390_NUM_TOTAL_REGS] = + { + /* Program Status Word. */ + "pswm", "pswa", + /* General Purpose Registers. */ + "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", + "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", + /* Access Registers. */ + "acr0", "acr1", "acr2", "acr3", "acr4", "acr5", "acr6", "acr7", + "acr8", "acr9", "acr10", "acr11", "acr12", "acr13", "acr14", "acr15", + /* Floating Point Control Word. */ + "fpc", + /* Floating Point Registers. */ + "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", + "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", + /* Pseudo registers. */ + "pc", "cc", + }; + + gdb_assert (regnum >= 0 && regnum < S390_NUM_TOTAL_REGS); + return register_names[regnum]; } -int -s390_cannot_fetch_register (int regno) +/* Return the GDB type object for the "standard" data type of data in + register REGNUM. */ +static struct type * +s390_register_type (struct gdbarch *gdbarch, int regnum) { - return (regno >= S390_FIRST_CR && regno < (S390_FIRST_CR + 9)) || - (regno >= (S390_FIRST_CR + 12) && regno <= S390_LAST_CR); + if (regnum == S390_PSWM_REGNUM || regnum == S390_PSWA_REGNUM) + return builtin_type (gdbarch)->builtin_long; + if (regnum >= S390_R0_REGNUM && regnum <= S390_R15_REGNUM) + return builtin_type (gdbarch)->builtin_long; + if (regnum >= S390_A0_REGNUM && regnum <= S390_A15_REGNUM) + return builtin_type (gdbarch)->builtin_int; + if (regnum == S390_FPC_REGNUM) + return builtin_type (gdbarch)->builtin_int; + if (regnum >= S390_F0_REGNUM && regnum <= S390_F15_REGNUM) + return builtin_type (gdbarch)->builtin_double; + if (regnum == S390_PC_REGNUM) + return builtin_type (gdbarch)->builtin_func_ptr; + if (regnum == S390_CC_REGNUM) + return builtin_type (gdbarch)->builtin_int; + + internal_error (__FILE__, __LINE__, _("invalid regnum")); } -int -s390_register_byte (int reg_nr) +/* DWARF Register Mapping. */ + +static int s390_dwarf_regmap[] = { - if (reg_nr <= S390_GP_LAST_REGNUM) - return reg_nr * S390_GPR_SIZE; - if (reg_nr <= S390_LAST_ACR) - return S390_ACR0_OFFSET + (((reg_nr) - S390_FIRST_ACR) * S390_ACR_SIZE); - if (reg_nr <= S390_LAST_CR) - return S390_CR0_OFFSET + (((reg_nr) - S390_FIRST_CR) * S390_CR_SIZE); - if (reg_nr == S390_FPC_REGNUM) - return S390_FPC_OFFSET; - else - return S390_FP0_OFFSET + (((reg_nr) - S390_FP0_REGNUM) * S390_FPR_SIZE); -} - -#ifndef GDBSERVER -#define S390_MAX_INSTR_SIZE (6) -#define S390_SYSCALL_OPCODE (0x0a) -#define S390_SYSCALL_SIZE (2) -#define S390_SIGCONTEXT_SREGS_OFFSET (8) -#define S390X_SIGCONTEXT_SREGS_OFFSET (8) -#define S390_SIGREGS_FP0_OFFSET (144) -#define S390X_SIGREGS_FP0_OFFSET (216) -#define S390_UC_MCONTEXT_OFFSET (256) -#define S390X_UC_MCONTEXT_OFFSET (344) -#define S390_STACK_FRAME_OVERHEAD (GDB_TARGET_IS_ESAME ? 160:96) -#define S390_SIGNAL_FRAMESIZE (GDB_TARGET_IS_ESAME ? 160:96) -#define s390_NR_sigreturn 119 -#define s390_NR_rt_sigreturn 173 - - - -struct frame_extra_info -{ - int initialised; - int good_prologue; - CORE_ADDR function_start; - CORE_ADDR skip_prologue_function_start; - CORE_ADDR saved_pc_valid; - CORE_ADDR saved_pc; - CORE_ADDR sig_fixed_saved_pc_valid; - CORE_ADDR sig_fixed_saved_pc; - CORE_ADDR frame_pointer_saved_pc; /* frame pointer needed for alloca */ - CORE_ADDR stack_bought; /* amount we decrement the stack pointer by */ - CORE_ADDR sigcontext; + /* General Purpose Registers. */ + S390_R0_REGNUM, S390_R1_REGNUM, S390_R2_REGNUM, S390_R3_REGNUM, + S390_R4_REGNUM, S390_R5_REGNUM, S390_R6_REGNUM, S390_R7_REGNUM, + S390_R8_REGNUM, S390_R9_REGNUM, S390_R10_REGNUM, S390_R11_REGNUM, + S390_R12_REGNUM, S390_R13_REGNUM, S390_R14_REGNUM, S390_R15_REGNUM, + + /* Floating Point Registers. */ + S390_F0_REGNUM, S390_F2_REGNUM, S390_F4_REGNUM, S390_F6_REGNUM, + S390_F1_REGNUM, S390_F3_REGNUM, S390_F5_REGNUM, S390_F7_REGNUM, + S390_F8_REGNUM, S390_F10_REGNUM, S390_F12_REGNUM, S390_F14_REGNUM, + S390_F9_REGNUM, S390_F11_REGNUM, S390_F13_REGNUM, S390_F15_REGNUM, + + /* Control Registers (not mapped). */ + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + + /* Access Registers. */ + S390_A0_REGNUM, S390_A1_REGNUM, S390_A2_REGNUM, S390_A3_REGNUM, + S390_A4_REGNUM, S390_A5_REGNUM, S390_A6_REGNUM, S390_A7_REGNUM, + S390_A8_REGNUM, S390_A9_REGNUM, S390_A10_REGNUM, S390_A11_REGNUM, + S390_A12_REGNUM, S390_A13_REGNUM, S390_A14_REGNUM, S390_A15_REGNUM, + + /* Program Status Word. */ + S390_PSWM_REGNUM, + S390_PSWA_REGNUM }; +/* Convert DWARF register number REG to the appropriate register + number used by GDB. */ +static int +s390_dwarf_reg_to_regnum (struct gdbarch *gdbarch, int reg) +{ + int regnum = -1; + + if (reg >= 0 && reg < ARRAY_SIZE (s390_dwarf_regmap)) + regnum = s390_dwarf_regmap[reg]; -static CORE_ADDR s390_frame_saved_pc_nofix (struct frame_info *fi); + if (regnum == -1) + warning (_("Unmapped DWARF Register #%d encountered."), reg); -int -s390_readinstruction (bfd_byte instr[], CORE_ADDR at, - struct disassemble_info *info) + return regnum; +} + +/* Pseudo registers - PC and condition code. */ + +static void +s390_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, + int regnum, gdb_byte *buf) { - int instrlen; + ULONGEST val; - static int s390_instrlen[] = { - 2, - 4, - 4, - 6 - }; - if ((*info->read_memory_func) (at, &instr[0], 2, info)) - return -1; - instrlen = s390_instrlen[instr[0] >> 6]; - if (instrlen > 2) + switch (regnum) { - if ((*info->read_memory_func) (at + 2, &instr[2], instrlen - 2, info)) - return -1; + case S390_PC_REGNUM: + regcache_raw_read_unsigned (regcache, S390_PSWA_REGNUM, &val); + store_unsigned_integer (buf, 4, val & 0x7fffffff); + break; + + case S390_CC_REGNUM: + regcache_raw_read_unsigned (regcache, S390_PSWM_REGNUM, &val); + store_unsigned_integer (buf, 4, (val >> 12) & 3); + break; + + default: + internal_error (__FILE__, __LINE__, _("invalid regnum")); } - return instrlen; } static void -s390_memset_extra_info (struct frame_extra_info *fextra_info) +s390_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, + int regnum, const gdb_byte *buf) { - memset (fextra_info, 0, sizeof (struct frame_extra_info)); -} + ULONGEST val, psw; + switch (regnum) + { + case S390_PC_REGNUM: + val = extract_unsigned_integer (buf, 4); + regcache_raw_read_unsigned (regcache, S390_PSWA_REGNUM, &psw); + psw = (psw & 0x80000000) | (val & 0x7fffffff); + regcache_raw_write_unsigned (regcache, S390_PSWA_REGNUM, psw); + break; + case S390_CC_REGNUM: + val = extract_unsigned_integer (buf, 4); + regcache_raw_read_unsigned (regcache, S390_PSWM_REGNUM, &psw); + psw = (psw & ~((ULONGEST)3 << 12)) | ((val & 3) << 12); + regcache_raw_write_unsigned (regcache, S390_PSWM_REGNUM, psw); + break; -const char * -s390_register_name (int reg_nr) + default: + internal_error (__FILE__, __LINE__, _("invalid regnum")); + } +} + +static void +s390x_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, + int regnum, gdb_byte *buf) { - static char *register_names[] = { - "pswm", "pswa", - "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", - "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", - "acr0", "acr1", "acr2", "acr3", "acr4", "acr5", "acr6", "acr7", - "acr8", "acr9", "acr10", "acr11", "acr12", "acr13", "acr14", "acr15", - "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7", - "cr8", "cr9", "cr10", "cr11", "cr12", "cr13", "cr14", "cr15", - "fpc", - "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", - "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15" - }; + ULONGEST val; - if (reg_nr <= S390_LAST_REGNUM) - return register_names[reg_nr]; - else - return NULL; + switch (regnum) + { + case S390_PC_REGNUM: + regcache_raw_read (regcache, S390_PSWA_REGNUM, buf); + break; + + case S390_CC_REGNUM: + regcache_raw_read_unsigned (regcache, S390_PSWM_REGNUM, &val); + store_unsigned_integer (buf, 4, (val >> 44) & 3); + break; + + default: + internal_error (__FILE__, __LINE__, _("invalid regnum")); + } } +static void +s390x_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, + int regnum, const gdb_byte *buf) +{ + ULONGEST val, psw; + switch (regnum) + { + case S390_PC_REGNUM: + regcache_raw_write (regcache, S390_PSWA_REGNUM, buf); + break; + case S390_CC_REGNUM: + val = extract_unsigned_integer (buf, 4); + regcache_raw_read_unsigned (regcache, S390_PSWM_REGNUM, &psw); + psw = (psw & ~((ULONGEST)3 << 44)) | ((val & 3) << 44); + regcache_raw_write_unsigned (regcache, S390_PSWM_REGNUM, psw); + break; -int -s390_stab_reg_to_regnum (int regno) + default: + internal_error (__FILE__, __LINE__, _("invalid regnum")); + } +} + +/* 'float' values are stored in the upper half of floating-point + registers, even though we are otherwise a big-endian platform. */ + +static struct value * +s390_value_from_register (struct type *type, int regnum, + struct frame_info *frame) { - return regno >= 64 ? S390_PSWM_REGNUM - 64 : - regno >= 48 ? S390_FIRST_ACR - 48 : - regno >= 32 ? S390_FIRST_CR - 32 : - regno <= 15 ? (regno + 2) : - S390_FP0_REGNUM + ((regno - 16) & 8) + (((regno - 16) & 3) << 1) + - (((regno - 16) & 4) >> 2); + struct value *value = default_value_from_register (type, regnum, frame); + int len = TYPE_LENGTH (type); + + if (regnum >= S390_F0_REGNUM && regnum <= S390_F15_REGNUM && len < 8) + set_value_offset (value, 0); + + return value; } +/* Register groups. */ -/* Return true if REGIDX is the number of a register used to pass - arguments, false otherwise. */ static int -is_arg_reg (int regidx) +s390_register_reggroup_p (struct gdbarch *gdbarch, int regnum, + struct reggroup *group) { - return 2 <= regidx && regidx <= 6; + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + /* Registers displayed via 'info regs'. */ + if (group == general_reggroup) + return (regnum >= S390_R0_REGNUM && regnum <= S390_R15_REGNUM) + || regnum == S390_PC_REGNUM + || regnum == S390_CC_REGNUM; + + /* Registers displayed via 'info float'. */ + if (group == float_reggroup) + return (regnum >= S390_F0_REGNUM && regnum <= S390_F15_REGNUM) + || regnum == S390_FPC_REGNUM; + + /* Registers that need to be saved/restored in order to + push or pop frames. */ + if (group == save_reggroup || group == restore_reggroup) + return regnum != S390_PSWM_REGNUM && regnum != S390_PSWA_REGNUM; + + return default_register_reggroup_p (gdbarch, regnum, group); } -/* s390_get_frame_info based on Hartmuts - prologue definition in - gcc-2.8.1/config/l390/linux.c +/* Core file register sets. */ - It reads one instruction at a time & based on whether - it looks like prologue code or not it makes a decision on - whether the prologue is over, there are various state machines - in the code to determine if the prologue code is possilby valid. - - This is done to hopefully allow the code survive minor revs of - calling conventions. - - */ - -int -s390_get_frame_info (CORE_ADDR pc, struct frame_extra_info *fextra_info, - struct frame_info *fi, int init_extra_info) -{ -#define CONST_POOL_REGIDX 13 -#define GOT_REGIDX 12 - bfd_byte instr[S390_MAX_INSTR_SIZE]; - CORE_ADDR test_pc = pc, test_pc2; - CORE_ADDR orig_sp = 0, save_reg_addr = 0, *saved_regs = NULL; - int valid_prologue, good_prologue = 0; - int gprs_saved[S390_NUM_GPRS]; - int fprs_saved[S390_NUM_FPRS]; - int regidx, instrlen; - int const_pool_state; - int varargs_state; - int loop_cnt, gdb_gpr_store, gdb_fpr_store; - int offset, expected_offset; - int err = 0; - disassemble_info info; - - /* Have we seen an instruction initializing the frame pointer yet? - If we've seen an `lr %r11, %r15', then frame_pointer_found is - non-zero, and frame_pointer_regidx == 11. Otherwise, - frame_pointer_found is zero and frame_pointer_regidx is 15, - indicating that we're using the stack pointer as our frame - pointer. */ - int frame_pointer_found = 0; - int frame_pointer_regidx = 0xf; - - /* What we've seen so far regarding saving the back chain link: - 0 -- nothing yet; sp still has the same value it had at the entry - point. Since not all functions allocate frames, this is a - valid state for the prologue to finish in. - 1 -- We've saved the original sp in some register other than the - frame pointer (hard-coded to be %r11, yuck). - save_link_regidx is the register we saved it in. - 2 -- We've seen the initial `bras' instruction of the sequence for - reserving more than 32k of stack: - bras %rX, .+8 - .long N - s %r15, 0(%rX) - where %rX is not the constant pool register. - subtract_sp_regidx is %rX, and fextra_info->stack_bought is N. - 3 -- We've reserved space for a new stack frame. This means we - either saw a simple `ahi %r15,-N' in state 1, or the final - `s %r15, ...' in state 2. - 4 -- The frame and link are now fully initialized. We've - reserved space for the new stack frame, and stored the old - stack pointer captured in the back chain pointer field. */ - int save_link_state = 0; - int save_link_regidx, subtract_sp_regidx; - - /* What we've seen so far regarding r12 --- the GOT (Global Offset - Table) pointer. We expect to see `l %r12, N(%r13)', which loads - r12 with the offset from the constant pool to the GOT, and then - an `ar %r12, %r13', which adds the constant pool address, - yielding the GOT's address. Here's what got_state means: - 0 -- seen nothing - 1 -- seen `l %r12, N(%r13)', but no `ar' - 2 -- seen load and add, so GOT pointer is totally initialized - When got_state is 1, then got_load_addr is the address of the - load instruction, and got_load_len is the length of that - instruction. */ - int got_state= 0; - CORE_ADDR got_load_addr = 0, got_load_len = 0; - - const_pool_state = varargs_state = 0; - - memset (gprs_saved, 0, sizeof (gprs_saved)); - memset (fprs_saved, 0, sizeof (fprs_saved)); - info.read_memory_func = deprecated_tm_print_insn_info.read_memory_func; - - save_link_regidx = subtract_sp_regidx = 0; - if (fextra_info) +int s390_regmap_gregset[S390_NUM_REGS] = +{ + /* Program Status Word. */ + 0x00, 0x04, + /* General Purpose Registers. */ + 0x08, 0x0c, 0x10, 0x14, + 0x18, 0x1c, 0x20, 0x24, + 0x28, 0x2c, 0x30, 0x34, + 0x38, 0x3c, 0x40, 0x44, + /* Access Registers. */ + 0x48, 0x4c, 0x50, 0x54, + 0x58, 0x5c, 0x60, 0x64, + 0x68, 0x6c, 0x70, 0x74, + 0x78, 0x7c, 0x80, 0x84, + /* Floating Point Control Word. */ + -1, + /* Floating Point Registers. */ + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, +}; + +int s390x_regmap_gregset[S390_NUM_REGS] = +{ + 0x00, 0x08, + /* General Purpose Registers. */ + 0x10, 0x18, 0x20, 0x28, + 0x30, 0x38, 0x40, 0x48, + 0x50, 0x58, 0x60, 0x68, + 0x70, 0x78, 0x80, 0x88, + /* Access Registers. */ + 0x90, 0x94, 0x98, 0x9c, + 0xa0, 0xa4, 0xa8, 0xac, + 0xb0, 0xb4, 0xb8, 0xbc, + 0xc0, 0xc4, 0xc8, 0xcc, + /* Floating Point Control Word. */ + -1, + /* Floating Point Registers. */ + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, +}; + +int s390_regmap_fpregset[S390_NUM_REGS] = +{ + /* Program Status Word. */ + -1, -1, + /* General Purpose Registers. */ + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + /* Access Registers. */ + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + /* Floating Point Control Word. */ + 0x00, + /* Floating Point Registers. */ + 0x08, 0x10, 0x18, 0x20, + 0x28, 0x30, 0x38, 0x40, + 0x48, 0x50, 0x58, 0x60, + 0x68, 0x70, 0x78, 0x80, +}; + +/* Supply register REGNUM from the register set REGSET to register cache + REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */ +static void +s390_supply_regset (const struct regset *regset, struct regcache *regcache, + int regnum, const void *regs, size_t len) +{ + const int *offset = regset->descr; + int i; + + for (i = 0; i < S390_NUM_REGS; i++) { - if (fi && get_frame_base (fi)) - { - orig_sp = get_frame_base (fi); - if (! init_extra_info && fextra_info->initialised) - orig_sp += fextra_info->stack_bought; - saved_regs = get_frame_saved_regs (fi); - } - if (init_extra_info || !fextra_info->initialised) - { - s390_memset_extra_info (fextra_info); - fextra_info->function_start = pc; - fextra_info->initialised = 1; - } + if ((regnum == i || regnum == -1) && offset[i] != -1) + regcache_raw_supply (regcache, i, (const char *)regs + offset[i]); } - instrlen = 0; - do +} + +/* Collect register REGNUM from the register cache REGCACHE and store + it in the buffer specified by REGS and LEN as described by the + general-purpose register set REGSET. If REGNUM is -1, do this for + all registers in REGSET. */ +static void +s390_collect_regset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *regs, size_t len) +{ + const int *offset = regset->descr; + int i; + + for (i = 0; i < S390_NUM_REGS; i++) { - valid_prologue = 0; - test_pc += instrlen; - /* add the previous instruction len */ - instrlen = s390_readinstruction (instr, test_pc, &info); - if (instrlen < 0) - { - good_prologue = 0; - err = -1; - break; - } - /* We probably are in a glibc syscall */ - if (instr[0] == S390_SYSCALL_OPCODE && test_pc == pc) - { - good_prologue = 1; - if (saved_regs && fextra_info && get_next_frame (fi) - && get_frame_extra_info (get_next_frame (fi)) - && get_frame_extra_info (get_next_frame (fi))->sigcontext) - { - /* We are backtracing from a signal handler */ - save_reg_addr = get_frame_extra_info (get_next_frame (fi))->sigcontext + - REGISTER_BYTE (S390_GP0_REGNUM); - for (regidx = 0; regidx < S390_NUM_GPRS; regidx++) - { - saved_regs[S390_GP0_REGNUM + regidx] = save_reg_addr; - save_reg_addr += S390_GPR_SIZE; - } - save_reg_addr = get_frame_extra_info (get_next_frame (fi))->sigcontext + - (GDB_TARGET_IS_ESAME ? S390X_SIGREGS_FP0_OFFSET : - S390_SIGREGS_FP0_OFFSET); - for (regidx = 0; regidx < S390_NUM_FPRS; regidx++) - { - saved_regs[S390_FP0_REGNUM + regidx] = save_reg_addr; - save_reg_addr += S390_FPR_SIZE; - } - } - break; - } - if (save_link_state == 0) - { - /* check for a stack relative STMG or STM */ - if (((GDB_TARGET_IS_ESAME && - ((instr[0] == 0xeb) && (instr[5] == 0x24))) || - (instr[0] == 0x90)) && ((instr[2] >> 4) == 0xf)) - { - regidx = (instr[1] >> 4); - if (regidx < 6) - varargs_state = 1; - offset = ((instr[2] & 0xf) << 8) + instr[3]; - expected_offset = - S390_GPR6_STACK_OFFSET + (S390_GPR_SIZE * (regidx - 6)); - if (offset != expected_offset) - { - good_prologue = 0; - break; - } - if (saved_regs) - save_reg_addr = orig_sp + offset; - for (; regidx <= (instr[1] & 0xf); regidx++) - { - if (gprs_saved[regidx]) - { - good_prologue = 0; - break; - } - good_prologue = 1; - gprs_saved[regidx] = 1; - if (saved_regs) - { - saved_regs[S390_GP0_REGNUM + regidx] = save_reg_addr; - save_reg_addr += S390_GPR_SIZE; - } - } - valid_prologue = 1; - continue; - } - } - /* check for a stack relative STG or ST */ - if ((save_link_state == 0 || save_link_state == 3) && - ((GDB_TARGET_IS_ESAME && - ((instr[0] == 0xe3) && (instr[5] == 0x24))) || - (instr[0] == 0x50)) && ((instr[2] >> 4) == 0xf)) - { - regidx = instr[1] >> 4; - offset = ((instr[2] & 0xf) << 8) + instr[3]; - if (offset == 0) - { - if (save_link_state == 3 && regidx == save_link_regidx) - { - save_link_state = 4; - valid_prologue = 1; - continue; - } - else - break; - } - if (regidx < 6) - varargs_state = 1; - expected_offset = - S390_GPR6_STACK_OFFSET + (S390_GPR_SIZE * (regidx - 6)); - if (offset != expected_offset) - { - good_prologue = 0; - break; - } - if (gprs_saved[regidx]) - { - good_prologue = 0; - break; - } - good_prologue = 1; - gprs_saved[regidx] = 1; - if (saved_regs) - { - save_reg_addr = orig_sp + offset; - saved_regs[S390_GP0_REGNUM + regidx] = save_reg_addr; - } - valid_prologue = 1; - continue; - } + if ((regnum == i || regnum == -1) && offset[i] != -1) + regcache_raw_collect (regcache, i, (char *)regs + offset[i]); + } +} - /* Check for an fp-relative STG, ST, or STM. This is probably - spilling an argument from a register out into a stack slot. - This could be a user instruction, but if we haven't included - any other suspicious instructions in the prologue, this - could only be an initializing store, which isn't too bad to - skip. The consequences of not including arg-to-stack spills - are more serious, though --- you don't see the proper values - of the arguments. */ - if ((save_link_state == 3 || save_link_state == 4) - && ((instr[0] == 0x50 /* st %rA, D(%rX,%rB) */ - && (instr[1] & 0xf) == 0 /* %rX is zero, no index reg */ - && is_arg_reg ((instr[1] >> 4) & 0xf) - && ((instr[2] >> 4) & 0xf) == frame_pointer_regidx) - || (instr[0] == 0x90 /* stm %rA, %rB, D(%rC) */ - && is_arg_reg ((instr[1] >> 4) & 0xf) - && is_arg_reg (instr[1] & 0xf) - && ((instr[2] >> 4) & 0xf) == frame_pointer_regidx))) - { - valid_prologue = 1; - continue; - } +static const struct regset s390_gregset = { + s390_regmap_gregset, + s390_supply_regset, + s390_collect_regset +}; - /* check for STD */ - if (instr[0] == 0x60 && (instr[2] >> 4) == 0xf) - { - regidx = instr[1] >> 4; - if (regidx == 0 || regidx == 2) - varargs_state = 1; - if (fprs_saved[regidx]) - { - good_prologue = 0; - break; - } - fprs_saved[regidx] = 1; - if (saved_regs) - { - save_reg_addr = orig_sp + (((instr[2] & 0xf) << 8) + instr[3]); - saved_regs[S390_FP0_REGNUM + regidx] = save_reg_addr; - } - valid_prologue = 1; - continue; - } +static const struct regset s390x_gregset = { + s390x_regmap_gregset, + s390_supply_regset, + s390_collect_regset +}; +static const struct regset s390_fpregset = { + s390_regmap_fpregset, + s390_supply_regset, + s390_collect_regset +}; - if (const_pool_state == 0) - { +/* Return the appropriate register set for the core section identified + by SECT_NAME and SECT_SIZE. */ +static const struct regset * +s390_regset_from_core_section (struct gdbarch *gdbarch, + const char *sect_name, size_t sect_size) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - if (GDB_TARGET_IS_ESAME) - { - /* Check for larl CONST_POOL_REGIDX,offset on ESAME */ - if ((instr[0] == 0xc0) - && (instr[1] == (CONST_POOL_REGIDX << 4))) - { - const_pool_state = 2; - valid_prologue = 1; - continue; - } - } - else - { - /* Check for BASR gpr13,gpr0 used to load constant pool pointer to r13 in old compiler */ - if (instr[0] == 0xd && (instr[1] & 0xf) == 0 - && ((instr[1] >> 4) == CONST_POOL_REGIDX)) - { - const_pool_state = 1; - valid_prologue = 1; - continue; - } - } - /* Check for new fangled bras %r13,newpc to load new constant pool */ - /* embedded in code, older pre abi compilers also emitted this stuff. */ - if ((instr[0] == 0xa7) && ((instr[1] & 0xf) == 0x5) && - ((instr[1] >> 4) == CONST_POOL_REGIDX) - && ((instr[2] & 0x80) == 0)) - { - const_pool_state = 2; - test_pc += - (((((instr[2] & 0xf) << 8) + instr[3]) << 1) - instrlen); - valid_prologue = 1; - continue; - } - } - /* Check for AGHI or AHI CONST_POOL_REGIDX,val */ - if (const_pool_state == 1 && (instr[0] == 0xa7) && - ((GDB_TARGET_IS_ESAME && - (instr[1] == ((CONST_POOL_REGIDX << 4) | 0xb))) || - (instr[1] == ((CONST_POOL_REGIDX << 4) | 0xa)))) - { - const_pool_state = 2; - valid_prologue = 1; - continue; - } - /* Check for LGR or LR gprx,15 */ - if ((GDB_TARGET_IS_ESAME && - instr[0] == 0xb9 && instr[1] == 0x04 && (instr[3] & 0xf) == 0xf) || - (instr[0] == 0x18 && (instr[1] & 0xf) == 0xf)) - { - if (GDB_TARGET_IS_ESAME) - regidx = instr[3] >> 4; - else - regidx = instr[1] >> 4; - if (save_link_state == 0 && regidx != 0xb) - { - /* Almost defintely code for - decrementing the stack pointer - ( i.e. a non leaf function - or else leaf with locals ) */ - save_link_regidx = regidx; - save_link_state = 1; - valid_prologue = 1; - continue; - } - /* We use this frame pointer for alloca - unfortunately we need to assume its gpr11 - otherwise we would need a smarter prologue - walker. */ - if (!frame_pointer_found && regidx == 0xb) - { - frame_pointer_regidx = 0xb; - frame_pointer_found = 1; - if (fextra_info) - fextra_info->frame_pointer_saved_pc = test_pc; - valid_prologue = 1; - continue; - } - } - /* Check for AHI or AGHI gpr15,val */ - if (save_link_state == 1 && (instr[0] == 0xa7) && - ((GDB_TARGET_IS_ESAME && (instr[1] == 0xfb)) || (instr[1] == 0xfa))) - { - if (fextra_info) - fextra_info->stack_bought = - -extract_signed_integer (&instr[2], 2); - save_link_state = 3; - valid_prologue = 1; - continue; - } - /* Alternatively check for the complex construction for - buying more than 32k of stack - BRAS gprx,.+8 - long val - s %r15,0(%gprx) gprx currently r1 */ - if ((save_link_state == 1) && (instr[0] == 0xa7) - && ((instr[1] & 0xf) == 0x5) && (instr[2] == 0) - && (instr[3] == 0x4) && ((instr[1] >> 4) != CONST_POOL_REGIDX)) - { - subtract_sp_regidx = instr[1] >> 4; - save_link_state = 2; - if (fextra_info) - target_read_memory (test_pc + instrlen, - (char *) &fextra_info->stack_bought, - sizeof (fextra_info->stack_bought)); - test_pc += 4; - valid_prologue = 1; - continue; - } - if (save_link_state == 2 && instr[0] == 0x5b - && instr[1] == 0xf0 && - instr[2] == (subtract_sp_regidx << 4) && instr[3] == 0) - { - save_link_state = 3; - valid_prologue = 1; - continue; - } - /* check for LA gprx,offset(15) used for varargs */ - if ((instr[0] == 0x41) && ((instr[2] >> 4) == 0xf) && - ((instr[1] & 0xf) == 0)) - { - /* some code uses gpr7 to point to outgoing args */ - if (((instr[1] >> 4) == 7) && (save_link_state == 0) && - ((instr[2] & 0xf) == 0) - && (instr[3] == S390_STACK_FRAME_OVERHEAD)) - { - valid_prologue = 1; - continue; - } - if (varargs_state == 1) - { - varargs_state = 2; - valid_prologue = 1; - continue; - } - } - /* Check for a GOT load */ + if (strcmp (sect_name, ".reg") == 0 && sect_size >= tdep->sizeof_gregset) + return tdep->gregset; - if (GDB_TARGET_IS_ESAME) - { - /* Check for larl GOT_REGIDX, on ESAME */ - if ((got_state == 0) && (instr[0] == 0xc0) - && (instr[1] == (GOT_REGIDX << 4))) - { - got_state = 2; - valid_prologue = 1; - continue; - } - } - else - { - /* check for l GOT_REGIDX,x(CONST_POOL_REGIDX) */ - if (got_state == 0 && const_pool_state == 2 && instr[0] == 0x58 - && (instr[2] == (CONST_POOL_REGIDX << 4)) - && ((instr[1] >> 4) == GOT_REGIDX)) - { - got_state = 1; - got_load_addr = test_pc; - got_load_len = instrlen; - valid_prologue = 1; - continue; - } - /* Check for subsequent ar got_regidx,basr_regidx */ - if (got_state == 1 && instr[0] == 0x1a && - instr[1] == ((GOT_REGIDX << 4) | CONST_POOL_REGIDX)) - { - got_state = 2; - valid_prologue = 1; - continue; - } - } - } - while (valid_prologue && good_prologue); - if (good_prologue) + if (strcmp (sect_name, ".reg2") == 0 && sect_size >= tdep->sizeof_fpregset) + return tdep->fpregset; + + return NULL; +} + + +/* Decoding S/390 instructions. */ + +/* Named opcode values for the S/390 instructions we recognize. Some + instructions have their opcode split across two fields; those are the + op1_* and op2_* enums. */ +enum + { + op1_lhi = 0xa7, op2_lhi = 0x08, + op1_lghi = 0xa7, op2_lghi = 0x09, + op1_lgfi = 0xc0, op2_lgfi = 0x01, + op_lr = 0x18, + op_lgr = 0xb904, + op_l = 0x58, + op1_ly = 0xe3, op2_ly = 0x58, + op1_lg = 0xe3, op2_lg = 0x04, + op_lm = 0x98, + op1_lmy = 0xeb, op2_lmy = 0x98, + op1_lmg = 0xeb, op2_lmg = 0x04, + op_st = 0x50, + op1_sty = 0xe3, op2_sty = 0x50, + op1_stg = 0xe3, op2_stg = 0x24, + op_std = 0x60, + op_stm = 0x90, + op1_stmy = 0xeb, op2_stmy = 0x90, + op1_stmg = 0xeb, op2_stmg = 0x24, + op1_aghi = 0xa7, op2_aghi = 0x0b, + op1_ahi = 0xa7, op2_ahi = 0x0a, + op1_agfi = 0xc2, op2_agfi = 0x08, + op1_afi = 0xc2, op2_afi = 0x09, + op1_algfi= 0xc2, op2_algfi= 0x0a, + op1_alfi = 0xc2, op2_alfi = 0x0b, + op_ar = 0x1a, + op_agr = 0xb908, + op_a = 0x5a, + op1_ay = 0xe3, op2_ay = 0x5a, + op1_ag = 0xe3, op2_ag = 0x08, + op1_slgfi= 0xc2, op2_slgfi= 0x04, + op1_slfi = 0xc2, op2_slfi = 0x05, + op_sr = 0x1b, + op_sgr = 0xb909, + op_s = 0x5b, + op1_sy = 0xe3, op2_sy = 0x5b, + op1_sg = 0xe3, op2_sg = 0x09, + op_nr = 0x14, + op_ngr = 0xb980, + op_la = 0x41, + op1_lay = 0xe3, op2_lay = 0x71, + op1_larl = 0xc0, op2_larl = 0x00, + op_basr = 0x0d, + op_bas = 0x4d, + op_bcr = 0x07, + op_bc = 0x0d, + op1_bras = 0xa7, op2_bras = 0x05, + op1_brasl= 0xc0, op2_brasl= 0x05, + op1_brc = 0xa7, op2_brc = 0x04, + op1_brcl = 0xc0, op2_brcl = 0x04, + }; + + +/* Read a single instruction from address AT. */ + +#define S390_MAX_INSTR_SIZE 6 +static int +s390_readinstruction (bfd_byte instr[], CORE_ADDR at) +{ + static int s390_instrlen[] = { 2, 4, 4, 6 }; + int instrlen; + + if (target_read_memory (at, &instr[0], 2)) + return -1; + instrlen = s390_instrlen[instr[0] >> 6]; + if (instrlen > 2) { - /* If this function doesn't reference the global offset table, - then the compiler may use r12 for other things. If the last - instruction we saw was a load of r12 from the constant pool, - with no subsequent add to make the address PC-relative, then - the load was probably a genuine body instruction; don't treat - it as part of the prologue. */ - if (got_state == 1 - && got_load_addr + got_load_len == test_pc) - { - test_pc = got_load_addr; - instrlen = got_load_len; - } - - good_prologue = (((const_pool_state == 0) || (const_pool_state == 2)) && - ((save_link_state == 0) || (save_link_state == 4)) && - ((varargs_state == 0) || (varargs_state == 2))); + if (target_read_memory (at + 2, &instr[2], instrlen - 2)) + return -1; } - if (fextra_info) + return instrlen; +} + + +/* The functions below are for recognizing and decoding S/390 + instructions of various formats. Each of them checks whether INSN + is an instruction of the given format, with the specified opcodes. + If it is, it sets the remaining arguments to the values of the + instruction's fields, and returns a non-zero value; otherwise, it + returns zero. + + These functions' arguments appear in the order they appear in the + instruction, not in the machine-language form. So, opcodes always + come first, even though they're sometimes scattered around the + instructions. And displacements appear before base and extension + registers, as they do in the assembly syntax, not at the end, as + they do in the machine language. */ +static int +is_ri (bfd_byte *insn, int op1, int op2, unsigned int *r1, int *i2) +{ + if (insn[0] == op1 && (insn[1] & 0xf) == op2) { - fextra_info->good_prologue = good_prologue; - fextra_info->skip_prologue_function_start = - (good_prologue ? test_pc : pc); + *r1 = (insn[1] >> 4) & 0xf; + /* i2 is a 16-bit signed quantity. */ + *i2 = (((insn[2] << 8) | insn[3]) ^ 0x8000) - 0x8000; + return 1; } - if (saved_regs) - /* The SP's element of the saved_regs array holds the old SP, - not the address at which it is saved. */ - saved_regs[S390_SP_REGNUM] = orig_sp; - return err; + else + return 0; } -int -s390_check_function_end (CORE_ADDR pc) +static int +is_ril (bfd_byte *insn, int op1, int op2, + unsigned int *r1, int *i2) { - bfd_byte instr[S390_MAX_INSTR_SIZE]; - disassemble_info info; - int regidx, instrlen; - - info.read_memory_func = deprecated_tm_print_insn_info.read_memory_func; - instrlen = s390_readinstruction (instr, pc, &info); - if (instrlen < 0) - return -1; - /* check for BR */ - if (instrlen != 2 || instr[0] != 07 || (instr[1] >> 4) != 0xf) + if (insn[0] == op1 && (insn[1] & 0xf) == op2) + { + *r1 = (insn[1] >> 4) & 0xf; + /* i2 is a signed quantity. If the host 'int' is 32 bits long, + no sign extension is necessary, but we don't want to assume + that. */ + *i2 = (((insn[2] << 24) + | (insn[3] << 16) + | (insn[4] << 8) + | (insn[5])) ^ 0x80000000) - 0x80000000; + return 1; + } + else return 0; - regidx = instr[1] & 0xf; - /* Check for LMG or LG */ - instrlen = - s390_readinstruction (instr, pc - (GDB_TARGET_IS_ESAME ? 6 : 4), &info); - if (instrlen < 0) - return -1; - if (GDB_TARGET_IS_ESAME) +} + + +static int +is_rr (bfd_byte *insn, int op, unsigned int *r1, unsigned int *r2) +{ + if (insn[0] == op) { + *r1 = (insn[1] >> 4) & 0xf; + *r2 = insn[1] & 0xf; + return 1; + } + else + return 0; +} - if (instrlen != 6 || instr[0] != 0xeb || instr[5] != 0x4) - return 0; + +static int +is_rre (bfd_byte *insn, int op, unsigned int *r1, unsigned int *r2) +{ + if (((insn[0] << 8) | insn[1]) == op) + { + /* Yes, insn[3]. insn[2] is unused in RRE format. */ + *r1 = (insn[3] >> 4) & 0xf; + *r2 = insn[3] & 0xf; + return 1; } - else if (instrlen != 4 || instr[0] != 0x98) + else + return 0; +} + + +static int +is_rs (bfd_byte *insn, int op, + unsigned int *r1, unsigned int *r3, unsigned int *d2, unsigned int *b2) +{ + if (insn[0] == op) { - return 0; + *r1 = (insn[1] >> 4) & 0xf; + *r3 = insn[1] & 0xf; + *b2 = (insn[2] >> 4) & 0xf; + *d2 = ((insn[2] & 0xf) << 8) | insn[3]; + return 1; } - if ((instr[2] >> 4) != 0xf) + else return 0; - if (regidx == 14) - return 1; - instrlen = s390_readinstruction (instr, pc - (GDB_TARGET_IS_ESAME ? 12 : 8), - &info); - if (instrlen < 0) - return -1; - if (GDB_TARGET_IS_ESAME) +} + + +static int +is_rsy (bfd_byte *insn, int op1, int op2, + unsigned int *r1, unsigned int *r3, unsigned int *d2, unsigned int *b2) +{ + if (insn[0] == op1 + && insn[5] == op2) { - /* Check for LG */ - if (instrlen != 6 || instr[0] != 0xe3 || instr[5] != 0x4) - return 0; + *r1 = (insn[1] >> 4) & 0xf; + *r3 = insn[1] & 0xf; + *b2 = (insn[2] >> 4) & 0xf; + /* The 'long displacement' is a 20-bit signed integer. */ + *d2 = ((((insn[2] & 0xf) << 8) | insn[3] | (insn[4] << 12)) + ^ 0x80000) - 0x80000; + return 1; } else + return 0; +} + + +static int +is_rx (bfd_byte *insn, int op, + unsigned int *r1, unsigned int *d2, unsigned int *x2, unsigned int *b2) +{ + if (insn[0] == op) { - /* Check for L */ - if (instrlen != 4 || instr[0] != 0x58) - return 0; + *r1 = (insn[1] >> 4) & 0xf; + *x2 = insn[1] & 0xf; + *b2 = (insn[2] >> 4) & 0xf; + *d2 = ((insn[2] & 0xf) << 8) | insn[3]; + return 1; } - if (instr[2] >> 4 != 0xf) + else return 0; - if (instr[1] >> 4 != regidx) +} + + +static int +is_rxy (bfd_byte *insn, int op1, int op2, + unsigned int *r1, unsigned int *d2, unsigned int *x2, unsigned int *b2) +{ + if (insn[0] == op1 + && insn[5] == op2) + { + *r1 = (insn[1] >> 4) & 0xf; + *x2 = insn[1] & 0xf; + *b2 = (insn[2] >> 4) & 0xf; + /* The 'long displacement' is a 20-bit signed integer. */ + *d2 = ((((insn[2] & 0xf) << 8) | insn[3] | (insn[4] << 12)) + ^ 0x80000) - 0x80000; + return 1; + } + else return 0; - return 1; } -static CORE_ADDR -s390_sniff_pc_function_start (CORE_ADDR pc, struct frame_info *fi) + +/* Prologue analysis. */ + +#define S390_NUM_GPRS 16 +#define S390_NUM_FPRS 16 + +struct s390_prologue_data { + + /* The stack. */ + struct pv_area *stack; + + /* The size of a GPR or FPR. */ + int gpr_size; + int fpr_size; + + /* The general-purpose registers. */ + pv_t gpr[S390_NUM_GPRS]; + + /* The floating-point registers. */ + pv_t fpr[S390_NUM_FPRS]; + + /* The offset relative to the CFA where the incoming GPR N was saved + by the function prologue. 0 if not saved or unknown. */ + int gpr_slot[S390_NUM_GPRS]; + + /* Likewise for FPRs. */ + int fpr_slot[S390_NUM_FPRS]; + + /* Nonzero if the backchain was saved. This is assumed to be the + case when the incoming SP is saved at the current SP location. */ + int back_chain_saved_p; +}; + +/* Return the effective address for an X-style instruction, like: + + L R1, D2(X2, B2) + + Here, X2 and B2 are registers, and D2 is a signed 20-bit + constant; the effective address is the sum of all three. If either + X2 or B2 are zero, then it doesn't contribute to the sum --- this + means that r0 can't be used as either X2 or B2. */ +static pv_t +s390_addr (struct s390_prologue_data *data, + int d2, unsigned int x2, unsigned int b2) { - CORE_ADDR function_start, test_function_start; - int loop_cnt, err, function_end; - struct frame_extra_info fextra_info; - function_start = get_pc_function_start (pc); + pv_t result; + + result = pv_constant (d2); + if (x2) + result = pv_add (result, data->gpr[x2]); + if (b2) + result = pv_add (result, data->gpr[b2]); + + return result; +} - if (function_start == 0) +/* Do a SIZE-byte store of VALUE to D2(X2,B2). */ +static void +s390_store (struct s390_prologue_data *data, + int d2, unsigned int x2, unsigned int b2, CORE_ADDR size, + pv_t value) +{ + pv_t addr = s390_addr (data, d2, x2, b2); + pv_t offset; + + /* Check whether we are storing the backchain. */ + offset = pv_subtract (data->gpr[S390_SP_REGNUM - S390_R0_REGNUM], addr); + + if (pv_is_constant (offset) && offset.k == 0) + if (size == data->gpr_size + && pv_is_register_k (value, S390_SP_REGNUM, 0)) + { + data->back_chain_saved_p = 1; + return; + } + + + /* Check whether we are storing a register into the stack. */ + if (!pv_area_store_would_trash (data->stack, addr)) + pv_area_store (data->stack, addr, size, value); + + + /* Note: If this is some store we cannot identify, you might think we + should forget our cached values, as any of those might have been hit. + + However, we make the assumption that the register save areas are only + ever stored to once in any given function, and we do recognize these + stores. Thus every store we cannot recognize does not hit our data. */ +} + +/* Do a SIZE-byte load from D2(X2,B2). */ +static pv_t +s390_load (struct s390_prologue_data *data, + int d2, unsigned int x2, unsigned int b2, CORE_ADDR size) + +{ + pv_t addr = s390_addr (data, d2, x2, b2); + pv_t offset; + + /* If it's a load from an in-line constant pool, then we can + simulate that, under the assumption that the code isn't + going to change between the time the processor actually + executed it creating the current frame, and the time when + we're analyzing the code to unwind past that frame. */ + if (pv_is_constant (addr)) { - test_function_start = pc; - if (test_function_start & 1) - return 0; /* This has to be bogus */ - loop_cnt = 0; - do + struct target_section *secp; + secp = target_section_by_addr (¤t_target, addr.k); + if (secp != NULL + && (bfd_get_section_flags (secp->bfd, secp->the_bfd_section) + & SEC_READONLY)) + return pv_constant (read_memory_integer (addr.k, size)); + } + + /* Check whether we are accessing one of our save slots. */ + return pv_area_fetch (data->stack, addr, size); +} + +/* Function for finding saved registers in a 'struct pv_area'; we pass + this to pv_area_scan. + + If VALUE is a saved register, ADDR says it was saved at a constant + offset from the frame base, and SIZE indicates that the whole + register was saved, record its offset in the reg_offset table in + PROLOGUE_UNTYPED. */ +static void +s390_check_for_saved (void *data_untyped, pv_t addr, CORE_ADDR size, pv_t value) +{ + struct s390_prologue_data *data = data_untyped; + int i, offset; + + if (!pv_is_register (addr, S390_SP_REGNUM)) + return; + + offset = 16 * data->gpr_size + 32 - addr.k; + + /* If we are storing the original value of a register, we want to + record the CFA offset. If the same register is stored multiple + times, the stack slot with the highest address counts. */ + + for (i = 0; i < S390_NUM_GPRS; i++) + if (size == data->gpr_size + && pv_is_register_k (value, S390_R0_REGNUM + i, 0)) + if (data->gpr_slot[i] == 0 + || data->gpr_slot[i] > offset) { + data->gpr_slot[i] = offset; + return; + } - err = - s390_get_frame_info (test_function_start, &fextra_info, fi, 1); - loop_cnt++; - test_function_start -= 2; - function_end = s390_check_function_end (test_function_start); + for (i = 0; i < S390_NUM_FPRS; i++) + if (size == data->fpr_size + && pv_is_register_k (value, S390_F0_REGNUM + i, 0)) + if (data->fpr_slot[i] == 0 + || data->fpr_slot[i] > offset) + { + data->fpr_slot[i] = offset; + return; } - while (!(function_end == 1 || err || loop_cnt >= 4096 || - (fextra_info.good_prologue))); - if (fextra_info.good_prologue) - function_start = fextra_info.function_start; - else if (function_end == 1) - function_start = test_function_start; - } - return function_start; } +/* Analyze the prologue of the function starting at START_PC, + continuing at most until CURRENT_PC. Initialize DATA to + hold all information we find out about the state of the registers + and stack slots. Return the address of the instruction after + the last one that changed the SP, FP, or back chain; or zero + on error. */ +static CORE_ADDR +s390_analyze_prologue (struct gdbarch *gdbarch, + CORE_ADDR start_pc, + CORE_ADDR current_pc, + struct s390_prologue_data *data) +{ + int word_size = gdbarch_ptr_bit (gdbarch) / 8; + + /* Our return value: + The address of the instruction after the last one that changed + the SP, FP, or back chain; zero if we got an error trying to + read memory. */ + CORE_ADDR result = start_pc; + + /* The current PC for our abstract interpretation. */ + CORE_ADDR pc; + + /* The address of the next instruction after that. */ + CORE_ADDR next_pc; + + /* Set up everything's initial value. */ + { + int i; + + data->stack = make_pv_area (S390_SP_REGNUM, gdbarch_addr_bit (gdbarch)); + + /* For the purpose of prologue tracking, we consider the GPR size to + be equal to the ABI word size, even if it is actually larger + (i.e. when running a 32-bit binary under a 64-bit kernel). */ + data->gpr_size = word_size; + data->fpr_size = 8; + + for (i = 0; i < S390_NUM_GPRS; i++) + data->gpr[i] = pv_register (S390_R0_REGNUM + i, 0); + + for (i = 0; i < S390_NUM_FPRS; i++) + data->fpr[i] = pv_register (S390_F0_REGNUM + i, 0); + + for (i = 0; i < S390_NUM_GPRS; i++) + data->gpr_slot[i] = 0; + + for (i = 0; i < S390_NUM_FPRS; i++) + data->fpr_slot[i] = 0; + + data->back_chain_saved_p = 0; + } + + /* Start interpreting instructions, until we hit the frame's + current PC or the first branch instruction. */ + for (pc = start_pc; pc > 0 && pc < current_pc; pc = next_pc) + { + bfd_byte insn[S390_MAX_INSTR_SIZE]; + int insn_len = s390_readinstruction (insn, pc); + + bfd_byte dummy[S390_MAX_INSTR_SIZE] = { 0 }; + bfd_byte *insn32 = word_size == 4 ? insn : dummy; + bfd_byte *insn64 = word_size == 8 ? insn : dummy; + + /* Fields for various kinds of instructions. */ + unsigned int b2, r1, r2, x2, r3; + int i2, d2; + + /* The values of SP and FP before this instruction, + for detecting instructions that change them. */ + pv_t pre_insn_sp, pre_insn_fp; + /* Likewise for the flag whether the back chain was saved. */ + int pre_insn_back_chain_saved_p; + + /* If we got an error trying to read the instruction, report it. */ + if (insn_len < 0) + { + result = 0; + break; + } + + next_pc = pc + insn_len; + + pre_insn_sp = data->gpr[S390_SP_REGNUM - S390_R0_REGNUM]; + pre_insn_fp = data->gpr[S390_FRAME_REGNUM - S390_R0_REGNUM]; + pre_insn_back_chain_saved_p = data->back_chain_saved_p; + + + /* LHI r1, i2 --- load halfword immediate. */ + /* LGHI r1, i2 --- load halfword immediate (64-bit version). */ + /* LGFI r1, i2 --- load fullword immediate. */ + if (is_ri (insn32, op1_lhi, op2_lhi, &r1, &i2) + || is_ri (insn64, op1_lghi, op2_lghi, &r1, &i2) + || is_ril (insn, op1_lgfi, op2_lgfi, &r1, &i2)) + data->gpr[r1] = pv_constant (i2); + + /* LR r1, r2 --- load from register. */ + /* LGR r1, r2 --- load from register (64-bit version). */ + else if (is_rr (insn32, op_lr, &r1, &r2) + || is_rre (insn64, op_lgr, &r1, &r2)) + data->gpr[r1] = data->gpr[r2]; + + /* L r1, d2(x2, b2) --- load. */ + /* LY r1, d2(x2, b2) --- load (long-displacement version). */ + /* LG r1, d2(x2, b2) --- load (64-bit version). */ + else if (is_rx (insn32, op_l, &r1, &d2, &x2, &b2) + || is_rxy (insn32, op1_ly, op2_ly, &r1, &d2, &x2, &b2) + || is_rxy (insn64, op1_lg, op2_lg, &r1, &d2, &x2, &b2)) + data->gpr[r1] = s390_load (data, d2, x2, b2, data->gpr_size); + + /* ST r1, d2(x2, b2) --- store. */ + /* STY r1, d2(x2, b2) --- store (long-displacement version). */ + /* STG r1, d2(x2, b2) --- store (64-bit version). */ + else if (is_rx (insn32, op_st, &r1, &d2, &x2, &b2) + || is_rxy (insn32, op1_sty, op2_sty, &r1, &d2, &x2, &b2) + || is_rxy (insn64, op1_stg, op2_stg, &r1, &d2, &x2, &b2)) + s390_store (data, d2, x2, b2, data->gpr_size, data->gpr[r1]); + + /* STD r1, d2(x2,b2) --- store floating-point register. */ + else if (is_rx (insn, op_std, &r1, &d2, &x2, &b2)) + s390_store (data, d2, x2, b2, data->fpr_size, data->fpr[r1]); + + /* STM r1, r3, d2(b2) --- store multiple. */ + /* STMY r1, r3, d2(b2) --- store multiple (long-displacement version). */ + /* STMG r1, r3, d2(b2) --- store multiple (64-bit version). */ + else if (is_rs (insn32, op_stm, &r1, &r3, &d2, &b2) + || is_rsy (insn32, op1_stmy, op2_stmy, &r1, &r3, &d2, &b2) + || is_rsy (insn64, op1_stmg, op2_stmg, &r1, &r3, &d2, &b2)) + { + for (; r1 <= r3; r1++, d2 += data->gpr_size) + s390_store (data, d2, 0, b2, data->gpr_size, data->gpr[r1]); + } + + /* AHI r1, i2 --- add halfword immediate. */ + /* AGHI r1, i2 --- add halfword immediate (64-bit version). */ + /* AFI r1, i2 --- add fullword immediate. */ + /* AGFI r1, i2 --- add fullword immediate (64-bit version). */ + else if (is_ri (insn32, op1_ahi, op2_ahi, &r1, &i2) + || is_ri (insn64, op1_aghi, op2_aghi, &r1, &i2) + || is_ril (insn32, op1_afi, op2_afi, &r1, &i2) + || is_ril (insn64, op1_agfi, op2_agfi, &r1, &i2)) + data->gpr[r1] = pv_add_constant (data->gpr[r1], i2); + + /* ALFI r1, i2 --- add logical immediate. */ + /* ALGFI r1, i2 --- add logical immediate (64-bit version). */ + else if (is_ril (insn32, op1_alfi, op2_alfi, &r1, &i2) + || is_ril (insn64, op1_algfi, op2_algfi, &r1, &i2)) + data->gpr[r1] = pv_add_constant (data->gpr[r1], + (CORE_ADDR)i2 & 0xffffffff); + + /* AR r1, r2 -- add register. */ + /* AGR r1, r2 -- add register (64-bit version). */ + else if (is_rr (insn32, op_ar, &r1, &r2) + || is_rre (insn64, op_agr, &r1, &r2)) + data->gpr[r1] = pv_add (data->gpr[r1], data->gpr[r2]); + + /* A r1, d2(x2, b2) -- add. */ + /* AY r1, d2(x2, b2) -- add (long-displacement version). */ + /* AG r1, d2(x2, b2) -- add (64-bit version). */ + else if (is_rx (insn32, op_a, &r1, &d2, &x2, &b2) + || is_rxy (insn32, op1_ay, op2_ay, &r1, &d2, &x2, &b2) + || is_rxy (insn64, op1_ag, op2_ag, &r1, &d2, &x2, &b2)) + data->gpr[r1] = pv_add (data->gpr[r1], + s390_load (data, d2, x2, b2, data->gpr_size)); + + /* SLFI r1, i2 --- subtract logical immediate. */ + /* SLGFI r1, i2 --- subtract logical immediate (64-bit version). */ + else if (is_ril (insn32, op1_slfi, op2_slfi, &r1, &i2) + || is_ril (insn64, op1_slgfi, op2_slgfi, &r1, &i2)) + data->gpr[r1] = pv_add_constant (data->gpr[r1], + -((CORE_ADDR)i2 & 0xffffffff)); + + /* SR r1, r2 -- subtract register. */ + /* SGR r1, r2 -- subtract register (64-bit version). */ + else if (is_rr (insn32, op_sr, &r1, &r2) + || is_rre (insn64, op_sgr, &r1, &r2)) + data->gpr[r1] = pv_subtract (data->gpr[r1], data->gpr[r2]); + + /* S r1, d2(x2, b2) -- subtract. */ + /* SY r1, d2(x2, b2) -- subtract (long-displacement version). */ + /* SG r1, d2(x2, b2) -- subtract (64-bit version). */ + else if (is_rx (insn32, op_s, &r1, &d2, &x2, &b2) + || is_rxy (insn32, op1_sy, op2_sy, &r1, &d2, &x2, &b2) + || is_rxy (insn64, op1_sg, op2_sg, &r1, &d2, &x2, &b2)) + data->gpr[r1] = pv_subtract (data->gpr[r1], + s390_load (data, d2, x2, b2, data->gpr_size)); + + /* LA r1, d2(x2, b2) --- load address. */ + /* LAY r1, d2(x2, b2) --- load address (long-displacement version). */ + else if (is_rx (insn, op_la, &r1, &d2, &x2, &b2) + || is_rxy (insn, op1_lay, op2_lay, &r1, &d2, &x2, &b2)) + data->gpr[r1] = s390_addr (data, d2, x2, b2); + + /* LARL r1, i2 --- load address relative long. */ + else if (is_ril (insn, op1_larl, op2_larl, &r1, &i2)) + data->gpr[r1] = pv_constant (pc + i2 * 2); + + /* BASR r1, 0 --- branch and save. + Since r2 is zero, this saves the PC in r1, but doesn't branch. */ + else if (is_rr (insn, op_basr, &r1, &r2) + && r2 == 0) + data->gpr[r1] = pv_constant (next_pc); + + /* BRAS r1, i2 --- branch relative and save. */ + else if (is_ri (insn, op1_bras, op2_bras, &r1, &i2)) + { + data->gpr[r1] = pv_constant (next_pc); + next_pc = pc + i2 * 2; + + /* We'd better not interpret any backward branches. We'll + never terminate. */ + if (next_pc <= pc) + break; + } + + /* Terminate search when hitting any other branch instruction. */ + else if (is_rr (insn, op_basr, &r1, &r2) + || is_rx (insn, op_bas, &r1, &d2, &x2, &b2) + || is_rr (insn, op_bcr, &r1, &r2) + || is_rx (insn, op_bc, &r1, &d2, &x2, &b2) + || is_ri (insn, op1_brc, op2_brc, &r1, &i2) + || is_ril (insn, op1_brcl, op2_brcl, &r1, &i2) + || is_ril (insn, op1_brasl, op2_brasl, &r2, &i2)) + break; + + else + /* An instruction we don't know how to simulate. The only + safe thing to do would be to set every value we're tracking + to 'unknown'. Instead, we'll be optimistic: we assume that + we *can* interpret every instruction that the compiler uses + to manipulate any of the data we're interested in here -- + then we can just ignore anything else. */ + ; + + /* Record the address after the last instruction that changed + the FP, SP, or backlink. Ignore instructions that changed + them back to their original values --- those are probably + restore instructions. (The back chain is never restored, + just popped.) */ + { + pv_t sp = data->gpr[S390_SP_REGNUM - S390_R0_REGNUM]; + pv_t fp = data->gpr[S390_FRAME_REGNUM - S390_R0_REGNUM]; + + if ((! pv_is_identical (pre_insn_sp, sp) + && ! pv_is_register_k (sp, S390_SP_REGNUM, 0) + && sp.kind != pvk_unknown) + || (! pv_is_identical (pre_insn_fp, fp) + && ! pv_is_register_k (fp, S390_FRAME_REGNUM, 0) + && fp.kind != pvk_unknown) + || pre_insn_back_chain_saved_p != data->back_chain_saved_p) + result = next_pc; + } + } + + /* Record where all the registers were saved. */ + pv_area_scan (data->stack, s390_check_for_saved, data); + free_pv_area (data->stack); + data->stack = NULL; -CORE_ADDR -s390_function_start (struct frame_info *fi) + return result; +} + +/* Advance PC across any function entry prologue instructions to reach + some "real" code. */ +static CORE_ADDR +s390_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) +{ + struct s390_prologue_data data; + CORE_ADDR skip_pc; + skip_pc = s390_analyze_prologue (gdbarch, pc, (CORE_ADDR)-1, &data); + return skip_pc ? skip_pc : pc; +} + +/* Return true if we are in the functin's epilogue, i.e. after the + instruction that destroyed the function's stack frame. */ +static int +s390_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc) { - CORE_ADDR function_start = 0; + int word_size = gdbarch_ptr_bit (gdbarch) / 8; + + /* In frameless functions, there's not frame to destroy and thus + we don't care about the epilogue. + + In functions with frame, the epilogue sequence is a pair of + a LM-type instruction that restores (amongst others) the + return register %r14 and the stack pointer %r15, followed + by a branch 'br %r14' --or equivalent-- that effects the + actual return. + + In that situation, this function needs to return 'true' in + exactly one case: when pc points to that branch instruction. + + Thus we try to disassemble the one instructions immediately + preceeding pc and check whether it is an LM-type instruction + modifying the stack pointer. + + Note that disassembling backwards is not reliable, so there + is a slight chance of false positives here ... */ - if (get_frame_extra_info (fi) && get_frame_extra_info (fi)->initialised) - function_start = get_frame_extra_info (fi)->function_start; - else if (get_frame_pc (fi)) - function_start = get_frame_func (fi); - return function_start; + bfd_byte insn[6]; + unsigned int r1, r3, b2; + int d2; + + if (word_size == 4 + && !target_read_memory (pc - 4, insn, 4) + && is_rs (insn, op_lm, &r1, &r3, &d2, &b2) + && r3 == S390_SP_REGNUM - S390_R0_REGNUM) + return 1; + + if (word_size == 4 + && !target_read_memory (pc - 6, insn, 6) + && is_rsy (insn, op1_lmy, op2_lmy, &r1, &r3, &d2, &b2) + && r3 == S390_SP_REGNUM - S390_R0_REGNUM) + return 1; + + if (word_size == 8 + && !target_read_memory (pc - 6, insn, 6) + && is_rsy (insn, op1_lmg, op2_lmg, &r1, &r3, &d2, &b2) + && r3 == S390_SP_REGNUM - S390_R0_REGNUM) + return 1; + + return 0; } +/* Normal stack frames. */ + +struct s390_unwind_cache { + + CORE_ADDR func; + CORE_ADDR frame_base; + CORE_ADDR local_base; + + struct trad_frame_saved_reg *saved_regs; +}; + +static int +s390_prologue_frame_unwind_cache (struct frame_info *this_frame, + struct s390_unwind_cache *info) +{ + struct gdbarch *gdbarch = get_frame_arch (this_frame); + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + int word_size = gdbarch_ptr_bit (gdbarch) / 8; + struct s390_prologue_data data; + pv_t *fp = &data.gpr[S390_FRAME_REGNUM - S390_R0_REGNUM]; + pv_t *sp = &data.gpr[S390_SP_REGNUM - S390_R0_REGNUM]; + int i; + CORE_ADDR cfa; + CORE_ADDR func; + CORE_ADDR result; + ULONGEST reg; + CORE_ADDR prev_sp; + int frame_pointer; + int size; + + /* Try to find the function start address. If we can't find it, we don't + bother searching for it -- with modern compilers this would be mostly + pointless anyway. Trust that we'll either have valid DWARF-2 CFI data + or else a valid backchain ... */ + func = get_frame_func (this_frame); + if (!func) + return 0; + + /* Try to analyze the prologue. */ + result = s390_analyze_prologue (gdbarch, func, + get_frame_pc (this_frame), &data); + if (!result) + return 0; + + /* If this was successful, we should have found the instruction that + sets the stack pointer register to the previous value of the stack + pointer minus the frame size. */ + if (!pv_is_register (*sp, S390_SP_REGNUM)) + return 0; + + /* A frame size of zero at this point can mean either a real + frameless function, or else a failure to find the prologue. + Perform some sanity checks to verify we really have a + frameless function. */ + if (sp->k == 0) + { + /* If the next frame is a NORMAL_FRAME, this frame *cannot* have frame + size zero. This is only possible if the next frame is a sentinel + frame, a dummy frame, or a signal trampoline frame. */ + /* FIXME: cagney/2004-05-01: This sanity check shouldn't be + needed, instead the code should simpliy rely on its + analysis. */ + if (get_next_frame (this_frame) + && get_frame_type (get_next_frame (this_frame)) == NORMAL_FRAME) + return 0; + + /* If we really have a frameless function, %r14 must be valid + -- in particular, it must point to a different function. */ + reg = get_frame_register_unsigned (this_frame, S390_RETADDR_REGNUM); + reg = gdbarch_addr_bits_remove (gdbarch, reg) - 1; + if (get_pc_function_start (reg) == func) + { + /* However, there is one case where it *is* valid for %r14 + to point to the same function -- if this is a recursive + call, and we have stopped in the prologue *before* the + stack frame was allocated. + + Recognize this case by looking ahead a bit ... */ + + struct s390_prologue_data data2; + pv_t *sp = &data2.gpr[S390_SP_REGNUM - S390_R0_REGNUM]; + + if (!(s390_analyze_prologue (gdbarch, func, (CORE_ADDR)-1, &data2) + && pv_is_register (*sp, S390_SP_REGNUM) + && sp->k != 0)) + return 0; + } + } + + + /* OK, we've found valid prologue data. */ + size = -sp->k; + + /* If the frame pointer originally also holds the same value + as the stack pointer, we're probably using it. If it holds + some other value -- even a constant offset -- it is most + likely used as temp register. */ + if (pv_is_identical (*sp, *fp)) + frame_pointer = S390_FRAME_REGNUM; + else + frame_pointer = S390_SP_REGNUM; + + /* If we've detected a function with stack frame, we'll still have to + treat it as frameless if we're currently within the function epilog + code at a point where the frame pointer has already been restored. + This can only happen in an innermost frame. */ + /* FIXME: cagney/2004-05-01: This sanity check shouldn't be needed, + instead the code should simpliy rely on its analysis. */ + if (size > 0 + && (!get_next_frame (this_frame) + || get_frame_type (get_next_frame (this_frame)) != NORMAL_FRAME)) + { + /* See the comment in s390_in_function_epilogue_p on why this is + not completely reliable ... */ + if (s390_in_function_epilogue_p (gdbarch, get_frame_pc (this_frame))) + { + memset (&data, 0, sizeof (data)); + size = 0; + frame_pointer = S390_SP_REGNUM; + } + } + + /* Once we know the frame register and the frame size, we can unwind + the current value of the frame register from the next frame, and + add back the frame size to arrive that the previous frame's + stack pointer value. */ + prev_sp = get_frame_register_unsigned (this_frame, frame_pointer) + size; + cfa = prev_sp + 16*word_size + 32; + + /* Record the addresses of all register spill slots the prologue parser + has recognized. Consider only registers defined as call-saved by the + ABI; for call-clobbered registers the parser may have recognized + spurious stores. */ + + for (i = 6; i <= 15; i++) + if (data.gpr_slot[i] != 0) + info->saved_regs[S390_R0_REGNUM + i].addr = cfa - data.gpr_slot[i]; + + switch (tdep->abi) + { + case ABI_LINUX_S390: + if (data.fpr_slot[4] != 0) + info->saved_regs[S390_F4_REGNUM].addr = cfa - data.fpr_slot[4]; + if (data.fpr_slot[6] != 0) + info->saved_regs[S390_F6_REGNUM].addr = cfa - data.fpr_slot[6]; + break; + + case ABI_LINUX_ZSERIES: + for (i = 8; i <= 15; i++) + if (data.fpr_slot[i] != 0) + info->saved_regs[S390_F0_REGNUM + i].addr = cfa - data.fpr_slot[i]; + break; + } + + /* Function return will set PC to %r14. */ + info->saved_regs[S390_PC_REGNUM] = info->saved_regs[S390_RETADDR_REGNUM]; + /* In frameless functions, we unwind simply by moving the return + address to the PC. However, if we actually stored to the + save area, use that -- we might only think the function frameless + because we're in the middle of the prologue ... */ + if (size == 0 + && !trad_frame_addr_p (info->saved_regs, S390_PC_REGNUM)) + { + info->saved_regs[S390_PC_REGNUM].realreg = S390_RETADDR_REGNUM; + } -int -s390_frameless_function_invocation (struct frame_info *fi) -{ - struct frame_extra_info fextra_info, *fextra_info_ptr; - int frameless = 0; + /* Another sanity check: unless this is a frameless function, + we should have found spill slots for SP and PC. + If not, we cannot unwind further -- this happens e.g. in + libc's thread_start routine. */ + if (size > 0) + { + if (!trad_frame_addr_p (info->saved_regs, S390_SP_REGNUM) + || !trad_frame_addr_p (info->saved_regs, S390_PC_REGNUM)) + prev_sp = -1; + } - if (get_next_frame (fi) == NULL) /* no may be frameless */ + /* We use the current value of the frame register as local_base, + and the top of the register save area as frame_base. */ + if (prev_sp != -1) { - if (get_frame_extra_info (fi)) - fextra_info_ptr = get_frame_extra_info (fi); - else - { - fextra_info_ptr = &fextra_info; - s390_get_frame_info (s390_sniff_pc_function_start (get_frame_pc (fi), fi), - fextra_info_ptr, fi, 1); - } - frameless = ((fextra_info_ptr->stack_bought == 0)); + info->frame_base = prev_sp + 16*word_size + 32; + info->local_base = prev_sp - size; } - return frameless; + info->func = func; + return 1; } - -static int -s390_is_sigreturn (CORE_ADDR pc, struct frame_info *sighandler_fi, - CORE_ADDR *sregs, CORE_ADDR *sigcaller_pc) +static void +s390_backchain_frame_unwind_cache (struct frame_info *this_frame, + struct s390_unwind_cache *info) { - bfd_byte instr[S390_MAX_INSTR_SIZE]; - disassemble_info info; - int instrlen; - CORE_ADDR scontext; - int retval = 0; - CORE_ADDR orig_sp; - CORE_ADDR temp_sregs; - - scontext = temp_sregs = 0; - - info.read_memory_func = deprecated_tm_print_insn_info.read_memory_func; - instrlen = s390_readinstruction (instr, pc, &info); - if (sigcaller_pc) - *sigcaller_pc = 0; - if (((instrlen == S390_SYSCALL_SIZE) && - (instr[0] == S390_SYSCALL_OPCODE)) && - ((instr[1] == s390_NR_sigreturn) || (instr[1] == s390_NR_rt_sigreturn))) - { - if (sighandler_fi) - { - if (s390_frameless_function_invocation (sighandler_fi)) - orig_sp = get_frame_base (sighandler_fi); - else - orig_sp = ADDR_BITS_REMOVE ((CORE_ADDR) - read_memory_integer (get_frame_base (sighandler_fi), - S390_GPR_SIZE)); - if (orig_sp && sigcaller_pc) - { - scontext = orig_sp + S390_SIGNAL_FRAMESIZE; - if (pc == scontext && instr[1] == s390_NR_rt_sigreturn) - { - /* We got a new style rt_signal */ - /* get address of read ucontext->uc_mcontext */ - temp_sregs = orig_sp + (GDB_TARGET_IS_ESAME ? - S390X_UC_MCONTEXT_OFFSET : - S390_UC_MCONTEXT_OFFSET); - } - else - { - /* read sigcontext->sregs */ - temp_sregs = ADDR_BITS_REMOVE ((CORE_ADDR) - read_memory_integer (scontext - + - (GDB_TARGET_IS_ESAME - ? - S390X_SIGCONTEXT_SREGS_OFFSET - : - S390_SIGCONTEXT_SREGS_OFFSET), - S390_GPR_SIZE)); - - } - /* read sigregs->psw.addr */ - *sigcaller_pc = - ADDR_BITS_REMOVE ((CORE_ADDR) - read_memory_integer (temp_sregs + - REGISTER_BYTE - (S390_PC_REGNUM), - S390_PSW_ADDR_SIZE)); - } - } - retval = 1; - } - if (sregs) - *sregs = temp_sregs; - return retval; -} - -/* - We need to do something better here but this will keep us out of trouble - for the moment. - For some reason the blockframe.c calls us with fi->next->fromleaf - so this seems of little use to us. */ -CORE_ADDR -s390_init_frame_pc_first (int next_fromleaf, struct frame_info *fi) -{ - CORE_ADDR sigcaller_pc; - CORE_ADDR pc = 0; - if (next_fromleaf) - { - pc = ADDR_BITS_REMOVE (read_register (S390_RETADDR_REGNUM)); - /* fix signal handlers */ - } - else if (get_next_frame (fi) && get_frame_pc (get_next_frame (fi))) - pc = s390_frame_saved_pc_nofix (get_next_frame (fi)); - if (pc && get_next_frame (fi) && get_frame_base (get_next_frame (fi)) - && s390_is_sigreturn (pc, get_next_frame (fi), NULL, &sigcaller_pc)) + struct gdbarch *gdbarch = get_frame_arch (this_frame); + int word_size = gdbarch_ptr_bit (gdbarch) / 8; + CORE_ADDR backchain; + ULONGEST reg; + LONGEST sp; + + /* Get the backchain. */ + reg = get_frame_register_unsigned (this_frame, S390_SP_REGNUM); + backchain = read_memory_unsigned_integer (reg, word_size); + + /* A zero backchain terminates the frame chain. As additional + sanity check, let's verify that the spill slot for SP in the + save area pointed to by the backchain in fact links back to + the save area. */ + if (backchain != 0 + && safe_read_memory_integer (backchain + 15*word_size, word_size, &sp) + && (CORE_ADDR)sp == backchain) { - pc = sigcaller_pc; + /* We don't know which registers were saved, but it will have + to be at least %r14 and %r15. This will allow us to continue + unwinding, but other prev-frame registers may be incorrect ... */ + info->saved_regs[S390_SP_REGNUM].addr = backchain + 15*word_size; + info->saved_regs[S390_RETADDR_REGNUM].addr = backchain + 14*word_size; + + /* Function return will set PC to %r14. */ + info->saved_regs[S390_PC_REGNUM] = info->saved_regs[S390_RETADDR_REGNUM]; + + /* We use the current value of the frame register as local_base, + and the top of the register save area as frame_base. */ + info->frame_base = backchain + 16*word_size + 32; + info->local_base = reg; } - return pc; + + info->func = get_frame_pc (this_frame); } -void -s390_init_extra_frame_info (int fromleaf, struct frame_info *fi) +static struct s390_unwind_cache * +s390_frame_unwind_cache (struct frame_info *this_frame, + void **this_prologue_cache) { - frame_extra_info_zalloc (fi, sizeof (struct frame_extra_info)); - if (get_frame_pc (fi)) - s390_get_frame_info (s390_sniff_pc_function_start (get_frame_pc (fi), fi), - get_frame_extra_info (fi), fi, 1); - else - s390_memset_extra_info (get_frame_extra_info (fi)); + struct s390_unwind_cache *info; + if (*this_prologue_cache) + return *this_prologue_cache; + + info = FRAME_OBSTACK_ZALLOC (struct s390_unwind_cache); + *this_prologue_cache = info; + info->saved_regs = trad_frame_alloc_saved_regs (this_frame); + info->func = -1; + info->frame_base = -1; + info->local_base = -1; + + /* Try to use prologue analysis to fill the unwind cache. + If this fails, fall back to reading the stack backchain. */ + if (!s390_prologue_frame_unwind_cache (this_frame, info)) + s390_backchain_frame_unwind_cache (this_frame, info); + + return info; } -/* If saved registers of frame FI are not known yet, read and cache them. - &FEXTRA_INFOP contains struct frame_extra_info; TDATAP can be NULL, - in which case the framedata are read. */ - -void -s390_frame_init_saved_regs (struct frame_info *fi) +static void +s390_frame_this_id (struct frame_info *this_frame, + void **this_prologue_cache, + struct frame_id *this_id) { + struct s390_unwind_cache *info + = s390_frame_unwind_cache (this_frame, this_prologue_cache); - int quick; + if (info->frame_base == -1) + return; - if (get_frame_saved_regs (fi) == NULL) - { - /* zalloc memsets the saved regs */ - frame_saved_regs_zalloc (fi); - if (get_frame_pc (fi)) - { - quick = (get_frame_extra_info (fi) - && get_frame_extra_info (fi)->initialised - && get_frame_extra_info (fi)->good_prologue); - s390_get_frame_info (quick - ? get_frame_extra_info (fi)->function_start - : s390_sniff_pc_function_start (get_frame_pc (fi), fi), - get_frame_extra_info (fi), fi, !quick); - } - } + *this_id = frame_id_build (info->frame_base, info->func); } +static struct value * +s390_frame_prev_register (struct frame_info *this_frame, + void **this_prologue_cache, int regnum) +{ + struct s390_unwind_cache *info + = s390_frame_unwind_cache (this_frame, this_prologue_cache); + return trad_frame_get_prev_register (this_frame, info->saved_regs, regnum); +} +static const struct frame_unwind s390_frame_unwind = { + NORMAL_FRAME, + s390_frame_this_id, + s390_frame_prev_register, + NULL, + default_frame_sniffer +}; -CORE_ADDR -s390_frame_args_address (struct frame_info *fi) -{ - /* Apparently gdb already knows gdb_args_offset itself */ - return get_frame_base (fi); -} +/* Code stubs and their stack frames. For things like PLTs and NULL + function calls (where there is no true frame and the return address + is in the RETADDR register). */ +struct s390_stub_unwind_cache +{ + CORE_ADDR frame_base; + struct trad_frame_saved_reg *saved_regs; +}; -static CORE_ADDR -s390_frame_saved_pc_nofix (struct frame_info *fi) +static struct s390_stub_unwind_cache * +s390_stub_frame_unwind_cache (struct frame_info *this_frame, + void **this_prologue_cache) { - if (get_frame_extra_info (fi) && get_frame_extra_info (fi)->saved_pc_valid) - return get_frame_extra_info (fi)->saved_pc; + struct gdbarch *gdbarch = get_frame_arch (this_frame); + int word_size = gdbarch_ptr_bit (gdbarch) / 8; + struct s390_stub_unwind_cache *info; + ULONGEST reg; - if (deprecated_generic_find_dummy_frame (get_frame_pc (fi), - get_frame_base (fi))) - return deprecated_read_register_dummy (get_frame_pc (fi), - get_frame_base (fi), S390_PC_REGNUM); + if (*this_prologue_cache) + return *this_prologue_cache; - s390_frame_init_saved_regs (fi); - if (get_frame_extra_info (fi)) - { - get_frame_extra_info (fi)->saved_pc_valid = 1; - if (get_frame_extra_info (fi)->good_prologue - && get_frame_saved_regs (fi)[S390_RETADDR_REGNUM]) - get_frame_extra_info (fi)->saved_pc - = ADDR_BITS_REMOVE (read_memory_integer - (get_frame_saved_regs (fi)[S390_RETADDR_REGNUM], - S390_GPR_SIZE)); - else - get_frame_extra_info (fi)->saved_pc - = ADDR_BITS_REMOVE (read_register (S390_RETADDR_REGNUM)); - return get_frame_extra_info (fi)->saved_pc; - } - return 0; + info = FRAME_OBSTACK_ZALLOC (struct s390_stub_unwind_cache); + *this_prologue_cache = info; + info->saved_regs = trad_frame_alloc_saved_regs (this_frame); + + /* The return address is in register %r14. */ + info->saved_regs[S390_PC_REGNUM].realreg = S390_RETADDR_REGNUM; + + /* Retrieve stack pointer and determine our frame base. */ + reg = get_frame_register_unsigned (this_frame, S390_SP_REGNUM); + info->frame_base = reg + 16*word_size + 32; + + return info; } -CORE_ADDR -s390_frame_saved_pc (struct frame_info *fi) +static void +s390_stub_frame_this_id (struct frame_info *this_frame, + void **this_prologue_cache, + struct frame_id *this_id) { - CORE_ADDR saved_pc = 0, sig_pc; + struct s390_stub_unwind_cache *info + = s390_stub_frame_unwind_cache (this_frame, this_prologue_cache); + *this_id = frame_id_build (info->frame_base, get_frame_pc (this_frame)); +} - if (get_frame_extra_info (fi) - && get_frame_extra_info (fi)->sig_fixed_saved_pc_valid) - return get_frame_extra_info (fi)->sig_fixed_saved_pc; - saved_pc = s390_frame_saved_pc_nofix (fi); +static struct value * +s390_stub_frame_prev_register (struct frame_info *this_frame, + void **this_prologue_cache, int regnum) +{ + struct s390_stub_unwind_cache *info + = s390_stub_frame_unwind_cache (this_frame, this_prologue_cache); + return trad_frame_get_prev_register (this_frame, info->saved_regs, regnum); +} - if (get_frame_extra_info (fi)) - { - get_frame_extra_info (fi)->sig_fixed_saved_pc_valid = 1; - if (saved_pc) - { - if (s390_is_sigreturn (saved_pc, fi, NULL, &sig_pc)) - saved_pc = sig_pc; - } - get_frame_extra_info (fi)->sig_fixed_saved_pc = saved_pc; - } - return saved_pc; +static int +s390_stub_frame_sniffer (const struct frame_unwind *self, + struct frame_info *this_frame, + void **this_prologue_cache) +{ + CORE_ADDR addr_in_block; + bfd_byte insn[S390_MAX_INSTR_SIZE]; + + /* If the current PC points to non-readable memory, we assume we + have trapped due to an invalid function pointer call. We handle + the non-existing current function like a PLT stub. */ + addr_in_block = get_frame_address_in_block (this_frame); + if (in_plt_section (addr_in_block, NULL) + || s390_readinstruction (insn, get_frame_pc (this_frame)) < 0) + return 1; + return 0; } +static const struct frame_unwind s390_stub_frame_unwind = { + NORMAL_FRAME, + s390_stub_frame_this_id, + s390_stub_frame_prev_register, + NULL, + s390_stub_frame_sniffer +}; +/* Signal trampoline stack frames. */ -/* We want backtraces out of signal handlers so we don't set - (get_frame_type (thisframe) == SIGTRAMP_FRAME) to 1 */ +struct s390_sigtramp_unwind_cache { + CORE_ADDR frame_base; + struct trad_frame_saved_reg *saved_regs; +}; -CORE_ADDR -s390_frame_chain (struct frame_info *thisframe) +static struct s390_sigtramp_unwind_cache * +s390_sigtramp_frame_unwind_cache (struct frame_info *this_frame, + void **this_prologue_cache) { - CORE_ADDR prev_fp = 0; + struct gdbarch *gdbarch = get_frame_arch (this_frame); + int word_size = gdbarch_ptr_bit (gdbarch) / 8; + struct s390_sigtramp_unwind_cache *info; + ULONGEST this_sp, prev_sp; + CORE_ADDR next_ra, next_cfa, sigreg_ptr; + int i; - if (deprecated_generic_find_dummy_frame (get_frame_pc (thisframe), - get_frame_base (thisframe))) - return deprecated_read_register_dummy (get_frame_pc (thisframe), - get_frame_base (thisframe), - S390_SP_REGNUM); - else - { - int sigreturn = 0; - CORE_ADDR sregs = 0; - struct frame_extra_info prev_fextra_info; + if (*this_prologue_cache) + return *this_prologue_cache; - memset (&prev_fextra_info, 0, sizeof (prev_fextra_info)); - if (get_frame_pc (thisframe)) - { - CORE_ADDR saved_pc, sig_pc; + info = FRAME_OBSTACK_ZALLOC (struct s390_sigtramp_unwind_cache); + *this_prologue_cache = info; + info->saved_regs = trad_frame_alloc_saved_regs (this_frame); - saved_pc = s390_frame_saved_pc_nofix (thisframe); - if (saved_pc) - { - if ((sigreturn = - s390_is_sigreturn (saved_pc, thisframe, &sregs, &sig_pc))) - saved_pc = sig_pc; - s390_get_frame_info (s390_sniff_pc_function_start - (saved_pc, NULL), &prev_fextra_info, NULL, - 1); - } - } - if (sigreturn) - { - /* read sigregs,regs.gprs[11 or 15] */ - prev_fp = read_memory_integer (sregs + - REGISTER_BYTE (S390_GP0_REGNUM + - (prev_fextra_info. - frame_pointer_saved_pc - ? 11 : 15)), - S390_GPR_SIZE); - get_frame_extra_info (thisframe)->sigcontext = sregs; - } - else - { - if (get_frame_saved_regs (thisframe)) - { - int regno; - - if (prev_fextra_info.frame_pointer_saved_pc - && get_frame_saved_regs (thisframe)[S390_FRAME_REGNUM]) - regno = S390_FRAME_REGNUM; - else - regno = S390_SP_REGNUM; - - if (get_frame_saved_regs (thisframe)[regno]) - { - /* The SP's entry of `saved_regs' is special. */ - if (regno == S390_SP_REGNUM) - prev_fp = get_frame_saved_regs (thisframe)[regno]; - else - prev_fp = - read_memory_integer (get_frame_saved_regs (thisframe)[regno], - S390_GPR_SIZE); - } - } - } + this_sp = get_frame_register_unsigned (this_frame, S390_SP_REGNUM); + next_ra = get_frame_pc (this_frame); + next_cfa = this_sp + 16*word_size + 32; + + /* New-style RT frame: + retcode + alignment (8 bytes) + siginfo (128 bytes) + ucontext (contains sigregs at offset 5 words) */ + if (next_ra == next_cfa) + { + sigreg_ptr = next_cfa + 8 + 128 + align_up (5*word_size, 8); } - return ADDR_BITS_REMOVE (prev_fp); -} -/* - Whether struct frame_extra_info is actually needed I'll have to figure - out as our frames are similar to rs6000 there is a possibility - i386 dosen't need it. */ + /* Old-style RT frame and all non-RT frames: + old signal mask (8 bytes) + pointer to sigregs */ + else + { + sigreg_ptr = read_memory_unsigned_integer (next_cfa + 8, word_size); + } + /* The sigregs structure looks like this: + long psw_mask; + long psw_addr; + long gprs[16]; + int acrs[16]; + int fpc; + int __pad; + double fprs[16]; */ + /* Let's ignore the PSW mask, it will not be restored anyway. */ + sigreg_ptr += word_size; -/* a given return value in `regbuf' with a type `valtype', extract and copy its - value into `valbuf' */ -void -s390_extract_return_value (struct type *valtype, char *regbuf, char *valbuf) -{ - /* floats and doubles are returned in fpr0. fpr's have a size of 8 bytes. - We need to truncate the return value into float size (4 byte) if - necessary. */ - int len = TYPE_LENGTH (valtype); + /* Next comes the PSW address. */ + info->saved_regs[S390_PC_REGNUM].addr = sigreg_ptr; + sigreg_ptr += word_size; - if (TYPE_CODE (valtype) == TYPE_CODE_FLT) - memcpy (valbuf, ®buf[REGISTER_BYTE (S390_FP0_REGNUM)], len); - else + /* Then the GPRs. */ + for (i = 0; i < 16; i++) { - int offset = 0; - /* return value is copied starting from r2. */ - if (TYPE_LENGTH (valtype) < S390_GPR_SIZE) - offset = S390_GPR_SIZE - TYPE_LENGTH (valtype); - memcpy (valbuf, - regbuf + REGISTER_BYTE (S390_GP0_REGNUM + 2) + offset, - TYPE_LENGTH (valtype)); + info->saved_regs[S390_R0_REGNUM + i].addr = sigreg_ptr; + sigreg_ptr += word_size; } -} - - -static char * -s390_promote_integer_argument (struct type *valtype, char *valbuf, - char *reg_buff, int *arglen) -{ - char *value = valbuf; - int len = TYPE_LENGTH (valtype); - if (len < S390_GPR_SIZE) + /* Then the ACRs. */ + for (i = 0; i < 16; i++) { - /* We need to upgrade this value to a register to pass it correctly */ - int idx, diff = S390_GPR_SIZE - len, negative = - (!TYPE_UNSIGNED (valtype) && value[0] & 0x80); - for (idx = 0; idx < S390_GPR_SIZE; idx++) - { - reg_buff[idx] = (idx < diff ? (negative ? 0xff : 0x0) : - value[idx - diff]); - } - value = reg_buff; - *arglen = S390_GPR_SIZE; + info->saved_regs[S390_A0_REGNUM + i].addr = sigreg_ptr; + sigreg_ptr += 4; } - else + + /* The floating-point control word. */ + info->saved_regs[S390_FPC_REGNUM].addr = sigreg_ptr; + sigreg_ptr += 8; + + /* And finally the FPRs. */ + for (i = 0; i < 16; i++) { - if (len & (S390_GPR_SIZE - 1)) - { - fprintf_unfiltered (gdb_stderr, - "s390_promote_integer_argument detected an argument not " - "a multiple of S390_GPR_SIZE & greater than S390_GPR_SIZE " - "we might not deal with this correctly.\n"); - } - *arglen = len; + info->saved_regs[S390_F0_REGNUM + i].addr = sigreg_ptr; + sigreg_ptr += 8; } - return (value); + /* Restore the previous frame's SP. */ + prev_sp = read_memory_unsigned_integer ( + info->saved_regs[S390_SP_REGNUM].addr, + word_size); + + /* Determine our frame base. */ + info->frame_base = prev_sp + 16*word_size + 32; + + return info; } -void -s390_store_return_value (struct type *valtype, char *valbuf) +static void +s390_sigtramp_frame_this_id (struct frame_info *this_frame, + void **this_prologue_cache, + struct frame_id *this_id) { - int arglen; - char *reg_buff = alloca (max (S390_FPR_SIZE, DEPRECATED_REGISTER_SIZE)), *value; + struct s390_sigtramp_unwind_cache *info + = s390_sigtramp_frame_unwind_cache (this_frame, this_prologue_cache); + *this_id = frame_id_build (info->frame_base, get_frame_pc (this_frame)); +} - if (TYPE_CODE (valtype) == TYPE_CODE_FLT) - { - if (TYPE_LENGTH (valtype) == 4 - || TYPE_LENGTH (valtype) == 8) - deprecated_write_register_bytes (REGISTER_BYTE (S390_FP0_REGNUM), - valbuf, TYPE_LENGTH (valtype)); - else - error ("GDB is unable to return `long double' values " - "on this architecture."); - } - else - { - value = - s390_promote_integer_argument (valtype, valbuf, reg_buff, &arglen); - /* Everything else is returned in GPR2 and up. */ - deprecated_write_register_bytes (REGISTER_BYTE (S390_GP0_REGNUM + 2), - value, arglen); - } +static struct value * +s390_sigtramp_frame_prev_register (struct frame_info *this_frame, + void **this_prologue_cache, int regnum) +{ + struct s390_sigtramp_unwind_cache *info + = s390_sigtramp_frame_unwind_cache (this_frame, this_prologue_cache); + return trad_frame_get_prev_register (this_frame, info->saved_regs, regnum); } + static int -gdb_print_insn_s390 (bfd_vma memaddr, disassemble_info * info) +s390_sigtramp_frame_sniffer (const struct frame_unwind *self, + struct frame_info *this_frame, + void **this_prologue_cache) { - bfd_byte instrbuff[S390_MAX_INSTR_SIZE]; - int instrlen, cnt; + CORE_ADDR pc = get_frame_pc (this_frame); + bfd_byte sigreturn[2]; - instrlen = s390_readinstruction (instrbuff, (CORE_ADDR) memaddr, info); - if (instrlen < 0) - { - (*info->memory_error_func) (instrlen, memaddr, info); - return -1; - } - for (cnt = 0; cnt < instrlen; cnt++) - info->fprintf_func (info->stream, "%02X ", instrbuff[cnt]); - for (cnt = instrlen; cnt < S390_MAX_INSTR_SIZE; cnt++) - info->fprintf_func (info->stream, " "); - instrlen = print_insn_s390 (memaddr, info); - return instrlen; + if (target_read_memory (pc, sigreturn, 2)) + return 0; + + if (sigreturn[0] != 0x0a /* svc */) + return 0; + + if (sigreturn[1] != 119 /* sigreturn */ + && sigreturn[1] != 173 /* rt_sigreturn */) + return 0; + + return 1; } +static const struct frame_unwind s390_sigtramp_frame_unwind = { + SIGTRAMP_FRAME, + s390_sigtramp_frame_this_id, + s390_sigtramp_frame_prev_register, + NULL, + s390_sigtramp_frame_sniffer +}; + +/* Frame base handling. */ -/* Not the most efficent code in the world */ -int -s390_fp_regnum (void) +static CORE_ADDR +s390_frame_base_address (struct frame_info *this_frame, void **this_cache) +{ + struct s390_unwind_cache *info + = s390_frame_unwind_cache (this_frame, this_cache); + return info->frame_base; +} + +static CORE_ADDR +s390_local_base_address (struct frame_info *this_frame, void **this_cache) { - int regno = S390_SP_REGNUM; - struct frame_extra_info fextra_info; + struct s390_unwind_cache *info + = s390_frame_unwind_cache (this_frame, this_cache); + return info->local_base; +} - CORE_ADDR pc = ADDR_BITS_REMOVE (read_register (S390_PC_REGNUM)); +static const struct frame_base s390_frame_base = { + &s390_frame_unwind, + s390_frame_base_address, + s390_local_base_address, + s390_local_base_address +}; - s390_get_frame_info (s390_sniff_pc_function_start (pc, NULL), &fextra_info, - NULL, 1); - if (fextra_info.frame_pointer_saved_pc) - regno = S390_FRAME_REGNUM; - return regno; +static CORE_ADDR +s390_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) +{ + ULONGEST pc; + pc = frame_unwind_register_unsigned (next_frame, S390_PC_REGNUM); + return gdbarch_addr_bits_remove (gdbarch, pc); } -CORE_ADDR -s390_read_fp (void) +static CORE_ADDR +s390_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame) { - return read_register (s390_fp_regnum ()); + ULONGEST sp; + sp = frame_unwind_register_unsigned (next_frame, S390_SP_REGNUM); + return gdbarch_addr_bits_remove (gdbarch, sp); } +/* DWARF-2 frame support. */ + static void -s390_pop_frame_regular (struct frame_info *frame) +s390_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, + struct dwarf2_frame_state_reg *reg, + struct frame_info *this_frame) { - int regnum; - - write_register (S390_PC_REGNUM, DEPRECATED_FRAME_SAVED_PC (frame)); + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - /* Restore any saved registers. */ - if (get_frame_saved_regs (frame)) + switch (tdep->abi) { - for (regnum = 0; regnum < NUM_REGS; regnum++) - if (get_frame_saved_regs (frame)[regnum] != 0) - { - ULONGEST value; - - value = read_memory_unsigned_integer (get_frame_saved_regs (frame)[regnum], - REGISTER_RAW_SIZE (regnum)); - write_register (regnum, value); - } - - /* Actually cut back the stack. Remember that the SP's element of - saved_regs is the old SP itself, not the address at which it is - saved. */ - write_register (S390_SP_REGNUM, get_frame_saved_regs (frame)[S390_SP_REGNUM]); - } + case ABI_LINUX_S390: + /* Call-saved registers. */ + if ((regnum >= S390_R6_REGNUM && regnum <= S390_R15_REGNUM) + || regnum == S390_F4_REGNUM + || regnum == S390_F6_REGNUM) + reg->how = DWARF2_FRAME_REG_SAME_VALUE; + + /* Call-clobbered registers. */ + else if ((regnum >= S390_R0_REGNUM && regnum <= S390_R5_REGNUM) + || (regnum >= S390_F0_REGNUM && regnum <= S390_F15_REGNUM + && regnum != S390_F4_REGNUM && regnum != S390_F6_REGNUM)) + reg->how = DWARF2_FRAME_REG_UNDEFINED; + + /* The return address column. */ + else if (regnum == S390_PC_REGNUM) + reg->how = DWARF2_FRAME_REG_RA; + break; - /* Throw away any cached frame information. */ - flush_cached_frames (); -} + case ABI_LINUX_ZSERIES: + /* Call-saved registers. */ + if ((regnum >= S390_R6_REGNUM && regnum <= S390_R15_REGNUM) + || (regnum >= S390_F8_REGNUM && regnum <= S390_F15_REGNUM)) + reg->how = DWARF2_FRAME_REG_SAME_VALUE; + /* Call-clobbered registers. */ + else if ((regnum >= S390_R0_REGNUM && regnum <= S390_R5_REGNUM) + || (regnum >= S390_F0_REGNUM && regnum <= S390_F7_REGNUM)) + reg->how = DWARF2_FRAME_REG_UNDEFINED; -/* Destroy the innermost (Top-Of-Stack) stack frame, restoring the - machine state that was in effect before the frame was created. - Used in the contexts of the "return" command, and of - target function calls from the debugger. */ -void -s390_pop_frame (void) -{ - /* This function checks for and handles generic dummy frames, and - calls back to our function for ordinary frames. */ - generic_pop_current_frame (s390_pop_frame_regular); + /* The return address column. */ + else if (regnum == S390_PC_REGNUM) + reg->how = DWARF2_FRAME_REG_RA; + break; + } } +/* Dummy function calls. */ + /* Return non-zero if TYPE is an integer-like type, zero otherwise. "Integer-like" types are those that should be passed the way integers are: integers, enums, ranges, characters, and booleans. */ @@ -1275,7 +1774,6 @@ is_integer_like (struct type *type) || code == TYPE_CODE_BOOL); } - /* Return non-zero if TYPE is a pointer-like type, zero otherwise. "Pointer-like" types are those that should be passed the way pointers are: pointers and references. */ @@ -1302,17 +1800,22 @@ is_pointer_like (struct type *type) ... and so on. - WHY THE HECK DO WE CARE ABOUT THIS??? Well, it turns out that GCC - passes all float singletons and double singletons as if they were - simply floats or doubles. This is *not* what the ABI says it - should do. */ + All such structures are passed as if they were floats or doubles, + as the (revised) ABI says. */ static int is_float_singleton (struct type *type) { - return (TYPE_CODE (type) == TYPE_CODE_STRUCT - && TYPE_NFIELDS (type) == 1 - && (TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) == TYPE_CODE_FLT - || is_float_singleton (TYPE_FIELD_TYPE (type, 0)))); + if (TYPE_CODE (type) == TYPE_CODE_STRUCT && TYPE_NFIELDS (type) == 1) + { + struct type *singleton_type = TYPE_FIELD_TYPE (type, 0); + CHECK_TYPEDEF (singleton_type); + + return (TYPE_CODE (singleton_type) == TYPE_CODE_FLT + || TYPE_CODE (singleton_type) == TYPE_CODE_DECFLOAT + || is_float_singleton (singleton_type)); + } + + return 0; } @@ -1341,116 +1844,81 @@ is_struct_like (struct type *type) You'd think this would just be floats, doubles, long doubles, etc. But as an odd quirk, not mentioned in the ABI, GCC passes float and double singletons as if they were a plain float, double, etc. (The - corresponding union types are handled normally.) So we exclude + corresponding union types are handled normally.) So we include those types here. *shrug* */ static int is_float_like (struct type *type) { return (TYPE_CODE (type) == TYPE_CODE_FLT + || TYPE_CODE (type) == TYPE_CODE_DECFLOAT || is_float_singleton (type)); } -/* Return non-zero if TYPE is considered a `DOUBLE_OR_FLOAT', as - defined by the parameter passing conventions described in the - "GNU/Linux for S/390 ELF Application Binary Interface Supplement". - Otherwise, return zero. */ static int -is_double_or_float (struct type *type) +is_power_of_two (unsigned int n) { - return (is_float_like (type) - && (TYPE_LENGTH (type) == 4 - || TYPE_LENGTH (type) == 8)); + return ((n & (n - 1)) == 0); } - -/* Return non-zero if TYPE is considered a `SIMPLE_ARG', as defined by - the parameter passing conventions described in the "GNU/Linux for - S/390 ELF Application Binary Interface Supplement". Return zero - otherwise. */ +/* Return non-zero if TYPE should be passed as a pointer to a copy, + zero otherwise. */ static int -is_simple_arg (struct type *type) +s390_function_arg_pass_by_reference (struct type *type) { unsigned length = TYPE_LENGTH (type); + if (length > 8) + return 1; - /* This is almost a direct translation of the ABI's language, except - that we have to exclude 8-byte structs; those are DOUBLE_ARGs. */ - return ((is_integer_like (type) && length <= 4) - || is_pointer_like (type) - || (is_struct_like (type) && length != 8) - || (is_float_like (type) && length == 16)); + /* FIXME: All complex and vector types are also returned by reference. */ + return is_struct_like (type) && !is_power_of_two (length); } - -/* Return non-zero if TYPE should be passed as a pointer to a copy, - zero otherwise. TYPE must be a SIMPLE_ARG, as recognized by - `is_simple_arg'. */ +/* Return non-zero if TYPE should be passed in a float register + if possible. */ static int -pass_by_copy_ref (struct type *type) +s390_function_arg_float (struct type *type) { unsigned length = TYPE_LENGTH (type); + if (length > 8) + return 0; - return ((is_struct_like (type) && length != 1 && length != 2 && length != 4) - || (is_float_like (type) && length == 16)); + return is_float_like (type); } +/* Return non-zero if TYPE should be passed in an integer register + (or a pair of integer registers) if possible. */ +static int +s390_function_arg_integer (struct type *type) +{ + unsigned length = TYPE_LENGTH (type); + if (length > 8) + return 0; + + return is_integer_like (type) + || is_pointer_like (type) + || (is_struct_like (type) && is_power_of_two (length)); +} /* Return ARG, a `SIMPLE_ARG', sign-extended or zero-extended to a full word as required for the ABI. */ static LONGEST extend_simple_arg (struct value *arg) { - struct type *type = VALUE_TYPE (arg); + struct type *type = value_type (arg); /* Even structs get passed in the least significant bits of the register / memory word. It's not really right to extract them as an integer, but it does take care of the extension. */ if (TYPE_UNSIGNED (type)) - return extract_unsigned_integer (VALUE_CONTENTS (arg), + return extract_unsigned_integer (value_contents (arg), TYPE_LENGTH (type)); else - return extract_signed_integer (VALUE_CONTENTS (arg), + return extract_signed_integer (value_contents (arg), TYPE_LENGTH (type)); } -/* Return non-zero if TYPE is a `DOUBLE_ARG', as defined by the - parameter passing conventions described in the "GNU/Linux for S/390 - ELF Application Binary Interface Supplement". Return zero - otherwise. */ -static int -is_double_arg (struct type *type) -{ - unsigned length = TYPE_LENGTH (type); - - return ((is_integer_like (type) - || is_struct_like (type)) - && length == 8); -} - - -/* Round ADDR up to the next N-byte boundary. N must be a power of - two. */ -static CORE_ADDR -round_up (CORE_ADDR addr, int n) -{ - /* Check that N is really a power of two. */ - gdb_assert (n && (n & (n-1)) == 0); - return ((addr + n - 1) & -n); -} - - -/* Round ADDR down to the next N-byte boundary. N must be a power of - two. */ -static CORE_ADDR -round_down (CORE_ADDR addr, int n) -{ - /* Check that N is really a power of two. */ - gdb_assert (n && (n & (n-1)) == 0); - return (addr & -n); -} - - /* Return the alignment required by TYPE. */ static int alignment_of (struct type *type) @@ -1459,7 +1927,8 @@ alignment_of (struct type *type) if (is_integer_like (type) || is_pointer_like (type) - || TYPE_CODE (type) == TYPE_CODE_FLT) + || TYPE_CODE (type) == TYPE_CODE_FLT + || TYPE_CODE (type) == TYPE_CODE_DECFLOAT) alignment = TYPE_LENGTH (type); else if (TYPE_CODE (type) == TYPE_CODE_STRUCT || TYPE_CODE (type) == TYPE_CODE_UNION) @@ -1501,67 +1970,46 @@ alignment_of (struct type *type) Our caller has taken care of any type promotions needed to satisfy prototypes or the old K&R argument-passing rules. */ -CORE_ADDR -s390_push_arguments (int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_addr) +static CORE_ADDR +s390_push_dummy_call (struct gdbarch *gdbarch, struct value *function, + struct regcache *regcache, CORE_ADDR bp_addr, + int nargs, struct value **args, CORE_ADDR sp, + int struct_return, CORE_ADDR struct_addr) { + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + int word_size = gdbarch_ptr_bit (gdbarch) / 8; + ULONGEST orig_sp; int i; - int pointer_size = (TARGET_PTR_BIT / TARGET_CHAR_BIT); - - /* The number of arguments passed by reference-to-copy. */ - int num_copies; /* If the i'th argument is passed as a reference to a copy, then copy_addr[i] is the address of the copy we made. */ CORE_ADDR *copy_addr = alloca (nargs * sizeof (CORE_ADDR)); /* Build the reference-to-copy area. */ - num_copies = 0; for (i = 0; i < nargs; i++) { struct value *arg = args[i]; - struct type *type = VALUE_TYPE (arg); + struct type *type = value_type (arg); unsigned length = TYPE_LENGTH (type); - if (is_simple_arg (type) - && pass_by_copy_ref (type)) + if (s390_function_arg_pass_by_reference (type)) { sp -= length; - sp = round_down (sp, alignment_of (type)); - write_memory (sp, VALUE_CONTENTS (arg), length); + sp = align_down (sp, alignment_of (type)); + write_memory (sp, value_contents (arg), length); copy_addr[i] = sp; - num_copies++; } } /* Reserve space for the parameter area. As a conservative simplification, we assume that everything will be passed on the - stack. */ - { - int i; - - for (i = 0; i < nargs; i++) - { - struct value *arg = args[i]; - struct type *type = VALUE_TYPE (arg); - int length = TYPE_LENGTH (type); - - sp = round_down (sp, alignment_of (type)); - - /* SIMPLE_ARG values get extended to 32 bits. Assume every - argument is. */ - if (length < 4) length = 4; - sp -= length; - } - } + stack. Since every argument larger than 8 bytes will be + passed by reference, we use this simple upper bound. */ + sp -= nargs * 8; - /* Include space for any reference-to-copy pointers. */ - sp = round_down (sp, pointer_size); - sp -= num_copies * pointer_size; - /* After all that, make sure it's still aligned on an eight-byte boundary. */ - sp = round_down (sp, 8); + sp = align_down (sp, 8); /* Finally, place the actual parameters, working from SP towards higher addresses. The code above is supposed to reserve enough @@ -1571,98 +2019,126 @@ s390_push_arguments (int nargs, struct value **args, CORE_ADDR sp, int gr = 2; CORE_ADDR starg = sp; + /* A struct is returned using general register 2. */ + if (struct_return) + { + regcache_cooked_write_unsigned (regcache, S390_R0_REGNUM + gr, + struct_addr); + gr++; + } + for (i = 0; i < nargs; i++) { struct value *arg = args[i]; - struct type *type = VALUE_TYPE (arg); - - if (is_double_or_float (type) - && fr <= 2) - { - /* When we store a single-precision value in an FP register, - it occupies the leftmost bits. */ - deprecated_write_register_bytes (REGISTER_BYTE (S390_FP0_REGNUM + fr), - VALUE_CONTENTS (arg), - TYPE_LENGTH (type)); - fr += 2; - } - else if (is_simple_arg (type) - && gr <= 6) - { - /* Do we need to pass a pointer to our copy of this - argument? */ - if (pass_by_copy_ref (type)) - write_register (S390_GP0_REGNUM + gr, copy_addr[i]); - else - write_register (S390_GP0_REGNUM + gr, extend_simple_arg (arg)); - - gr++; - } - else if (is_double_arg (type) - && gr <= 5) - { - deprecated_write_register_gen (S390_GP0_REGNUM + gr, - VALUE_CONTENTS (arg)); - deprecated_write_register_gen (S390_GP0_REGNUM + gr + 1, - VALUE_CONTENTS (arg) + 4); - gr += 2; - } - else - { - /* The `OTHER' case. */ - enum type_code code = TYPE_CODE (type); - unsigned length = TYPE_LENGTH (type); - - /* If we skipped r6 because we couldn't fit a DOUBLE_ARG - in it, then don't go back and use it again later. */ - if (is_double_arg (type) && gr == 6) - gr = 7; - - if (is_simple_arg (type)) - { - /* Simple args are always either extended to 32 bits, - or pointers. */ - starg = round_up (starg, 4); - - /* Do we need to pass a pointer to our copy of this - argument? */ - if (pass_by_copy_ref (type)) - write_memory_signed_integer (starg, pointer_size, - copy_addr[i]); - else - /* Simple args are always extended to 32 bits. */ - write_memory_signed_integer (starg, 4, - extend_simple_arg (arg)); - starg += 4; - } - else - { - /* You'd think we should say: - starg = round_up (starg, alignment_of (type)); - Unfortunately, GCC seems to simply align the stack on - a four-byte boundary, even when passing doubles. */ - starg = round_up (starg, 4); - write_memory (starg, VALUE_CONTENTS (arg), length); - starg += length; - } - } + struct type *type = value_type (arg); + unsigned length = TYPE_LENGTH (type); + + if (s390_function_arg_pass_by_reference (type)) + { + if (gr <= 6) + { + regcache_cooked_write_unsigned (regcache, S390_R0_REGNUM + gr, + copy_addr[i]); + gr++; + } + else + { + write_memory_unsigned_integer (starg, word_size, copy_addr[i]); + starg += word_size; + } + } + else if (s390_function_arg_float (type)) + { + /* The GNU/Linux for S/390 ABI uses FPRs 0 and 2 to pass arguments, + the GNU/Linux for zSeries ABI uses 0, 2, 4, and 6. */ + if (fr <= (tdep->abi == ABI_LINUX_S390 ? 2 : 6)) + { + /* When we store a single-precision value in an FP register, + it occupies the leftmost bits. */ + regcache_cooked_write_part (regcache, S390_F0_REGNUM + fr, + 0, length, value_contents (arg)); + fr += 2; + } + else + { + /* When we store a single-precision value in a stack slot, + it occupies the rightmost bits. */ + starg = align_up (starg + length, word_size); + write_memory (starg - length, value_contents (arg), length); + } + } + else if (s390_function_arg_integer (type) && length <= word_size) + { + if (gr <= 6) + { + /* Integer arguments are always extended to word size. */ + regcache_cooked_write_signed (regcache, S390_R0_REGNUM + gr, + extend_simple_arg (arg)); + gr++; + } + else + { + /* Integer arguments are always extended to word size. */ + write_memory_signed_integer (starg, word_size, + extend_simple_arg (arg)); + starg += word_size; + } + } + else if (s390_function_arg_integer (type) && length == 2*word_size) + { + if (gr <= 5) + { + regcache_cooked_write (regcache, S390_R0_REGNUM + gr, + value_contents (arg)); + regcache_cooked_write (regcache, S390_R0_REGNUM + gr + 1, + value_contents (arg) + word_size); + gr += 2; + } + else + { + /* If we skipped r6 because we couldn't fit a DOUBLE_ARG + in it, then don't go back and use it again later. */ + gr = 7; + + write_memory (starg, value_contents (arg), length); + starg += length; + } + } + else + internal_error (__FILE__, __LINE__, _("unknown argument type")); } } /* Allocate the standard frame areas: the register save area, the word reserved for the compiler (which seems kind of meaningless), and the back chain pointer. */ - sp -= 96; + sp -= 16*word_size + 32; - /* Write the back chain pointer into the first word of the stack - frame. This will help us get backtraces from within functions - called from GDB. */ - write_memory_unsigned_integer (sp, (TARGET_PTR_BIT / TARGET_CHAR_BIT), - deprecated_read_fp ()); + /* Store return address. */ + regcache_cooked_write_unsigned (regcache, S390_RETADDR_REGNUM, bp_addr); + + /* Store updated stack pointer. */ + regcache_cooked_write_unsigned (regcache, S390_SP_REGNUM, sp); - return sp; + /* We need to return the 'stack part' of the frame ID, + which is actually the top of the register save area. */ + return sp + 16*word_size + 32; } +/* Assuming THIS_FRAME is a dummy, return the frame ID of that + dummy frame. The frame ID's base needs to match the TOS value + returned by push_dummy_call, and the PC match the dummy frame's + breakpoint. */ +static struct frame_id +s390_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame) +{ + int word_size = gdbarch_ptr_bit (gdbarch) / 8; + CORE_ADDR sp = get_frame_register_unsigned (this_frame, S390_SP_REGNUM); + sp = gdbarch_addr_bits_remove (gdbarch, sp); + + return frame_id_build (sp + 16*word_size + 32, + get_frame_pc (this_frame)); +} static CORE_ADDR s390_frame_align (struct gdbarch *gdbarch, CORE_ADDR addr) @@ -1673,95 +2149,136 @@ s390_frame_align (struct gdbarch *gdbarch, CORE_ADDR addr) } -static int -s390_use_struct_convention (int gcc_p, struct type *value_type) -{ - enum type_code code = TYPE_CODE (value_type); +/* Function return value access. */ - return (code == TYPE_CODE_STRUCT - || code == TYPE_CODE_UNION); -} +static enum return_value_convention +s390_return_value_convention (struct gdbarch *gdbarch, struct type *type) +{ + int length = TYPE_LENGTH (type); + if (length > 8) + return RETURN_VALUE_STRUCT_CONVENTION; + switch (TYPE_CODE (type)) + { + case TYPE_CODE_STRUCT: + case TYPE_CODE_UNION: + case TYPE_CODE_ARRAY: + return RETURN_VALUE_STRUCT_CONVENTION; -/* Return the GDB type object for the "standard" data type - of data in register N. */ -struct type * -s390_register_virtual_type (int regno) -{ - if (S390_FP0_REGNUM <= regno && regno < S390_FP0_REGNUM + S390_NUM_FPRS) - return builtin_type_double; - else - return builtin_type_int; + default: + return RETURN_VALUE_REGISTER_CONVENTION; + } } - -struct type * -s390x_register_virtual_type (int regno) +static enum return_value_convention +s390_return_value (struct gdbarch *gdbarch, struct type *func_type, + struct type *type, struct regcache *regcache, + gdb_byte *out, const gdb_byte *in) { - return (regno == S390_FPC_REGNUM) || - (regno >= S390_FIRST_ACR && regno <= S390_LAST_ACR) ? builtin_type_int : - (regno >= S390_FP0_REGNUM) ? builtin_type_double : builtin_type_long; -} + int word_size = gdbarch_ptr_bit (gdbarch) / 8; + int length = TYPE_LENGTH (type); + enum return_value_convention rvc = + s390_return_value_convention (gdbarch, type); + if (in) + { + switch (rvc) + { + case RETURN_VALUE_REGISTER_CONVENTION: + if (TYPE_CODE (type) == TYPE_CODE_FLT + || TYPE_CODE (type) == TYPE_CODE_DECFLOAT) + { + /* When we store a single-precision value in an FP register, + it occupies the leftmost bits. */ + regcache_cooked_write_part (regcache, S390_F0_REGNUM, + 0, length, in); + } + else if (length <= word_size) + { + /* Integer arguments are always extended to word size. */ + if (TYPE_UNSIGNED (type)) + regcache_cooked_write_unsigned (regcache, S390_R2_REGNUM, + extract_unsigned_integer (in, length)); + else + regcache_cooked_write_signed (regcache, S390_R2_REGNUM, + extract_signed_integer (in, length)); + } + else if (length == 2*word_size) + { + regcache_cooked_write (regcache, S390_R2_REGNUM, in); + regcache_cooked_write (regcache, S390_R3_REGNUM, in + word_size); + } + else + internal_error (__FILE__, __LINE__, _("invalid return type")); + break; + case RETURN_VALUE_STRUCT_CONVENTION: + error (_("Cannot set function return value.")); + break; + } + } + else if (out) + { + switch (rvc) + { + case RETURN_VALUE_REGISTER_CONVENTION: + if (TYPE_CODE (type) == TYPE_CODE_FLT + || TYPE_CODE (type) == TYPE_CODE_DECFLOAT) + { + /* When we store a single-precision value in an FP register, + it occupies the leftmost bits. */ + regcache_cooked_read_part (regcache, S390_F0_REGNUM, + 0, length, out); + } + else if (length <= word_size) + { + /* Integer arguments occupy the rightmost bits. */ + regcache_cooked_read_part (regcache, S390_R2_REGNUM, + word_size - length, length, out); + } + else if (length == 2*word_size) + { + regcache_cooked_read (regcache, S390_R2_REGNUM, out); + regcache_cooked_read (regcache, S390_R3_REGNUM, out + word_size); + } + else + internal_error (__FILE__, __LINE__, _("invalid return type")); + break; + case RETURN_VALUE_STRUCT_CONVENTION: + error (_("Function return value unknown.")); + break; + } + } -void -s390_store_struct_return (CORE_ADDR addr, CORE_ADDR sp) -{ - write_register (S390_GP0_REGNUM + 2, addr); + return rvc; } +/* Breakpoints. */ -const static unsigned char * -s390_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr) +static const gdb_byte * +s390_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr) { - static unsigned char breakpoint[] = { 0x0, 0x1 }; + static const gdb_byte breakpoint[] = { 0x0, 0x1 }; *lenptr = sizeof (breakpoint); return breakpoint; } -/* Advance PC across any function entry prologue instructions to reach some - "real" code. */ -CORE_ADDR -s390_skip_prologue (CORE_ADDR pc) -{ - struct frame_extra_info fextra_info; - - s390_get_frame_info (pc, &fextra_info, NULL, 1); - return fextra_info.skip_prologue_function_start; -} - -/* Immediately after a function call, return the saved pc. - Can't go through the frames for this because on some machines - the new frame is not set up until the new function executes - some instructions. */ -CORE_ADDR -s390_saved_pc_after_call (struct frame_info *frame) -{ - return ADDR_BITS_REMOVE (read_register (S390_RETADDR_REGNUM)); -} - -static CORE_ADDR -s390_addr_bits_remove (CORE_ADDR addr) -{ - return (addr) & 0x7fffffff; -} +/* Address handling. */ static CORE_ADDR -s390_push_return_address (CORE_ADDR pc, CORE_ADDR sp) +s390_addr_bits_remove (struct gdbarch *gdbarch, CORE_ADDR addr) { - write_register (S390_RETADDR_REGNUM, CALL_DUMMY_ADDRESS ()); - return sp; + return addr & 0x7fffffff; } static int s390_address_class_type_flags (int byte_size, int dwarf2_addr_class) { if (byte_size == 4) - return TYPE_FLAG_ADDRESS_CLASS_1; + return TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1; else return 0; } @@ -1769,32 +2286,32 @@ s390_address_class_type_flags (int byte_size, int dwarf2_addr_class) static const char * s390_address_class_type_flags_to_name (struct gdbarch *gdbarch, int type_flags) { - if (type_flags & TYPE_FLAG_ADDRESS_CLASS_1) + if (type_flags & TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1) return "mode32"; else return NULL; } -int +static int s390_address_class_name_to_type_flags (struct gdbarch *gdbarch, const char *name, int *type_flags_ptr) { if (strcmp (name, "mode32") == 0) { - *type_flags_ptr = TYPE_FLAG_ADDRESS_CLASS_1; + *type_flags_ptr = TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1; return 1; } else return 0; } -struct gdbarch * +/* Set up gdbarch struct. */ + +static struct gdbarch * s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { - static LONGEST s390_call_dummy_words[] = { 0 }; struct gdbarch *gdbarch; struct gdbarch_tdep *tdep; - int elf_flags; /* First see if there is already a gdbarch that can satisfy the request. */ arches = gdbarch_list_lookup_by_info (arches, &info); @@ -1806,101 +2323,91 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) return NULL; /* No; then it's not for us. */ /* Yes: create a new gdbarch for the specified machine type. */ - gdbarch = gdbarch_alloc (&info, NULL); - - /* NOTE: cagney/2002-12-06: This can be deleted when this arch is - ready to unwind the PC first (see frame.c:get_prev_frame()). */ - set_gdbarch_deprecated_init_frame_pc (gdbarch, init_frame_pc_default); + tdep = XCALLOC (1, struct gdbarch_tdep); + gdbarch = gdbarch_alloc (&info, tdep); set_gdbarch_believe_pcc_promotion (gdbarch, 0); set_gdbarch_char_signed (gdbarch, 0); - set_gdbarch_frame_args_skip (gdbarch, 0); - set_gdbarch_frame_args_address (gdbarch, s390_frame_args_address); - set_gdbarch_deprecated_frame_chain (gdbarch, s390_frame_chain); - set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, s390_frame_init_saved_regs); - set_gdbarch_frame_locals_address (gdbarch, s390_frame_args_address); - /* We can't do this */ - set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); - set_gdbarch_deprecated_store_struct_return (gdbarch, s390_store_struct_return); - set_gdbarch_deprecated_extract_return_value (gdbarch, s390_extract_return_value); - set_gdbarch_deprecated_store_return_value (gdbarch, s390_store_return_value); + /* S/390 GNU/Linux uses either 64-bit or 128-bit long doubles. + We can safely let them default to 128-bit, since the debug info + will give the size of type actually used in each case. */ + set_gdbarch_long_double_bit (gdbarch, 128); + set_gdbarch_long_double_format (gdbarch, floatformats_ia64_quad); + /* Amount PC must be decremented by after a breakpoint. This is - often the number of bytes returned by BREAKPOINT_FROM_PC but not + often the number of bytes returned by gdbarch_breakpoint_from_pc but not always. */ set_gdbarch_decr_pc_after_break (gdbarch, 2); - set_gdbarch_deprecated_pop_frame (gdbarch, s390_pop_frame); /* Stack grows downward. */ set_gdbarch_inner_than (gdbarch, core_addr_lessthan); - /* Offset from address of function to start of its code. - Zero on most machines. */ - set_gdbarch_function_start_offset (gdbarch, 0); - set_gdbarch_deprecated_max_register_raw_size (gdbarch, 8); - set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 8); set_gdbarch_breakpoint_from_pc (gdbarch, s390_breakpoint_from_pc); set_gdbarch_skip_prologue (gdbarch, s390_skip_prologue); - set_gdbarch_deprecated_init_extra_frame_info (gdbarch, s390_init_extra_frame_info); - set_gdbarch_deprecated_init_frame_pc_first (gdbarch, s390_init_frame_pc_first); - set_gdbarch_deprecated_target_read_fp (gdbarch, s390_read_fp); - /* This function that tells us whether the function invocation represented - by FI does not have a frame on the stack associated with it. If it - does not, FRAMELESS is set to 1, else 0. */ - set_gdbarch_frameless_function_invocation (gdbarch, - s390_frameless_function_invocation); - /* Return saved PC from a frame */ - set_gdbarch_deprecated_frame_saved_pc (gdbarch, s390_frame_saved_pc); - /* DEPRECATED_FRAME_CHAIN takes a frame's nominal address and - produces the frame's chain-pointer. */ - set_gdbarch_deprecated_frame_chain (gdbarch, s390_frame_chain); - set_gdbarch_deprecated_saved_pc_after_call (gdbarch, s390_saved_pc_after_call); - set_gdbarch_register_byte (gdbarch, s390_register_byte); + set_gdbarch_in_function_epilogue_p (gdbarch, s390_in_function_epilogue_p); + set_gdbarch_pc_regnum (gdbarch, S390_PC_REGNUM); set_gdbarch_sp_regnum (gdbarch, S390_SP_REGNUM); - set_gdbarch_deprecated_fp_regnum (gdbarch, S390_FP_REGNUM); - set_gdbarch_fp0_regnum (gdbarch, S390_FP0_REGNUM); + set_gdbarch_fp0_regnum (gdbarch, S390_F0_REGNUM); set_gdbarch_num_regs (gdbarch, S390_NUM_REGS); - set_gdbarch_cannot_fetch_register (gdbarch, s390_cannot_fetch_register); - set_gdbarch_cannot_store_register (gdbarch, s390_cannot_fetch_register); - set_gdbarch_use_struct_convention (gdbarch, s390_use_struct_convention); + set_gdbarch_num_pseudo_regs (gdbarch, S390_NUM_PSEUDO_REGS); set_gdbarch_register_name (gdbarch, s390_register_name); - set_gdbarch_stab_reg_to_regnum (gdbarch, s390_stab_reg_to_regnum); - set_gdbarch_dwarf_reg_to_regnum (gdbarch, s390_stab_reg_to_regnum); - set_gdbarch_dwarf2_reg_to_regnum (gdbarch, s390_stab_reg_to_regnum); - set_gdbarch_deprecated_extract_struct_value_address - (gdbarch, generic_cannot_extract_struct_value_address); - - /* Parameters for inferior function calls. */ - set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); + set_gdbarch_register_type (gdbarch, s390_register_type); + set_gdbarch_stab_reg_to_regnum (gdbarch, s390_dwarf_reg_to_regnum); + set_gdbarch_dwarf2_reg_to_regnum (gdbarch, s390_dwarf_reg_to_regnum); + set_gdbarch_value_from_register (gdbarch, s390_value_from_register); + set_gdbarch_register_reggroup_p (gdbarch, s390_register_reggroup_p); + set_gdbarch_regset_from_core_section (gdbarch, + s390_regset_from_core_section); + + /* Inferior function calls. */ + set_gdbarch_push_dummy_call (gdbarch, s390_push_dummy_call); + set_gdbarch_dummy_id (gdbarch, s390_dummy_id); set_gdbarch_frame_align (gdbarch, s390_frame_align); - set_gdbarch_deprecated_push_arguments (gdbarch, s390_push_arguments); - set_gdbarch_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos); - set_gdbarch_deprecated_push_return_address (gdbarch, - s390_push_return_address); - set_gdbarch_deprecated_sizeof_call_dummy_words (gdbarch, sizeof (s390_call_dummy_words)); - set_gdbarch_deprecated_call_dummy_words (gdbarch, s390_call_dummy_words); + set_gdbarch_return_value (gdbarch, s390_return_value); + + /* Frame handling. */ + dwarf2_frame_set_init_reg (gdbarch, s390_dwarf2_frame_init_reg); + dwarf2_append_unwinders (gdbarch); + frame_base_append_sniffer (gdbarch, dwarf2_frame_base_sniffer); + frame_unwind_append_unwinder (gdbarch, &s390_stub_frame_unwind); + frame_unwind_append_unwinder (gdbarch, &s390_sigtramp_frame_unwind); + frame_unwind_append_unwinder (gdbarch, &s390_frame_unwind); + frame_base_set_default (gdbarch, &s390_frame_base); + set_gdbarch_unwind_pc (gdbarch, s390_unwind_pc); + set_gdbarch_unwind_sp (gdbarch, s390_unwind_sp); switch (info.bfd_arch_info->mach) { case bfd_mach_s390_31: - set_gdbarch_deprecated_register_size (gdbarch, 4); - set_gdbarch_register_raw_size (gdbarch, s390_register_raw_size); - set_gdbarch_register_virtual_size (gdbarch, s390_register_raw_size); - set_gdbarch_register_virtual_type (gdbarch, s390_register_virtual_type); + tdep->abi = ABI_LINUX_S390; + + tdep->gregset = &s390_gregset; + tdep->sizeof_gregset = s390_sizeof_gregset; + tdep->fpregset = &s390_fpregset; + tdep->sizeof_fpregset = s390_sizeof_fpregset; set_gdbarch_addr_bits_remove (gdbarch, s390_addr_bits_remove); - set_gdbarch_deprecated_register_bytes (gdbarch, S390_REGISTER_BYTES); + set_gdbarch_pseudo_register_read (gdbarch, s390_pseudo_register_read); + set_gdbarch_pseudo_register_write (gdbarch, s390_pseudo_register_write); + set_solib_svr4_fetch_link_map_offsets + (gdbarch, svr4_ilp32_fetch_link_map_offsets); + break; case bfd_mach_s390_64: - set_gdbarch_deprecated_register_size (gdbarch, 8); - set_gdbarch_register_raw_size (gdbarch, s390x_register_raw_size); - set_gdbarch_register_virtual_size (gdbarch, s390x_register_raw_size); - set_gdbarch_register_virtual_type (gdbarch, - s390x_register_virtual_type); + tdep->abi = ABI_LINUX_ZSERIES; + + tdep->gregset = &s390x_gregset; + tdep->sizeof_gregset = s390x_sizeof_gregset; + tdep->fpregset = &s390_fpregset; + tdep->sizeof_fpregset = s390_sizeof_fpregset; set_gdbarch_long_bit (gdbarch, 64); set_gdbarch_long_long_bit (gdbarch, 64); set_gdbarch_ptr_bit (gdbarch, 64); - set_gdbarch_deprecated_register_bytes (gdbarch, S390X_REGISTER_BYTES); + set_gdbarch_pseudo_register_read (gdbarch, s390x_pseudo_register_read); + set_gdbarch_pseudo_register_write (gdbarch, s390x_pseudo_register_write); + set_solib_svr4_fetch_link_map_offsets + (gdbarch, svr4_lp64_fetch_link_map_offsets); set_gdbarch_address_class_type_flags (gdbarch, s390_address_class_type_flags); set_gdbarch_address_class_type_flags_to_name (gdbarch, @@ -1910,22 +2417,25 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) break; } - /* Should be using push_dummy_call. */ - set_gdbarch_deprecated_dummy_write_sp (gdbarch, deprecated_write_sp); + set_gdbarch_print_insn (gdbarch, print_insn_s390); + + set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); + + /* Enable TLS support. */ + set_gdbarch_fetch_tls_load_module_address (gdbarch, + svr4_fetch_objfile_link_map); return gdbarch; } +extern initialize_file_ftype _initialize_s390_tdep; /* -Wmissing-prototypes */ + void _initialize_s390_tdep (void) { /* Hook us into the gdbarch mechanism. */ register_gdbarch_init (bfd_arch_s390, s390_gdbarch_init); - if (!deprecated_tm_print_insn) /* Someone may have already set it */ - deprecated_tm_print_insn = gdb_print_insn_s390; } - -#endif /* GDBSERVER */