From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19000 invoked by alias); 14 Jan 2005 06:12:55 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 18957 invoked from network); 14 Jan 2005 06:12:40 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 14 Jan 2005 06:12:40 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id j0E6CdSa008014 for ; Fri, 14 Jan 2005 01:12:39 -0500 Received: from potter.sfbay.redhat.com (potter.sfbay.redhat.com [172.16.27.15]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id j0E6Cdr01493; Fri, 14 Jan 2005 01:12:39 -0500 Received: from redhat.com (dhcp-172-16-25-137.sfbay.redhat.com [172.16.25.137]) by potter.sfbay.redhat.com (8.12.8/8.12.8) with ESMTP id j0E6CbAY003301; Fri, 14 Jan 2005 01:12:37 -0500 Message-ID: <41E762D5.2080509@redhat.com> Date: Fri, 14 Jan 2005 06:12:00 -0000 From: Michael Snyder Organization: Red Hat, Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4.3) Gecko/20040924 MIME-Version: 1.0 To: Daniel Jacobowitz , gdb-patches@sources.redhat.com Subject: [RFA] mips-linux-tdep whitespace tweaks Content-Type: multipart/mixed; boundary="------------020005080901060604080006" X-SW-Source: 2005-01/txt/msg00148.txt.bz2 This is a multi-part message in MIME format. --------------020005080901060604080006 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 13 Daniel, OK? --------------020005080901060604080006 Content-Type: text/plain; name="d43" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="d43" Content-length: 23913 2005-01-13 Michael Snyder * mips-linux-tdep.c: Whitespace tweaks. Index: mips-linux-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/mips-linux-tdep.c,v retrieving revision 1.35 diff -p -r1.35 mips-linux-tdep.c *** mips-linux-tdep.c 14 Nov 2004 19:29:27 -0000 1.35 --- mips-linux-tdep.c 14 Jan 2005 06:10:52 -0000 *************** typedef elf_fpreg_t elf_fpregset_t[ELF_N *** 64,72 **** #define EF_SIZE 180 /* Figure out where the longjmp will land. ! We expect the first arg to be a pointer to the jmp_buf structure from ! which we extract the pc (MIPS_LINUX_JB_PC) that we will land at. The pc ! is copied into PC. This routine returns 1 on success. */ #define MIPS_LINUX_JB_ELEMENT_SIZE 4 #define MIPS_LINUX_JB_PC 0 --- 64,73 ---- #define EF_SIZE 180 /* Figure out where the longjmp will land. ! We expect the first arg to be a pointer to the jmp_buf structure ! from which we extract the pc (MIPS_LINUX_JB_PC) that we will land ! at. The pc is copied into PC. This routine returns 1 on ! success. */ #define MIPS_LINUX_JB_ELEMENT_SIZE 4 #define MIPS_LINUX_JB_PC 0 *************** supply_gregset (elf_gregset_t *gregsetp) *** 131,137 **** /* Fill inaccessible registers with zero. */ regcache_raw_supply (current_regcache, MIPS_UNUSED_REGNUM, zerobuf); ! for (regi = MIPS_FIRST_EMBED_REGNUM; regi < MIPS_LAST_EMBED_REGNUM; regi++) regcache_raw_supply (current_regcache, regi, zerobuf); } --- 132,140 ---- /* Fill inaccessible registers with zero. */ regcache_raw_supply (current_regcache, MIPS_UNUSED_REGNUM, zerobuf); ! for (regi = MIPS_FIRST_EMBED_REGNUM; ! regi < MIPS_LAST_EMBED_REGNUM; ! regi++) regcache_raw_supply (current_regcache, regi, zerobuf); } *************** supply_fpregset (elf_fpregset_t *fpregse *** 206,212 **** mips_regnum (current_gdbarch)->fp_control_status, (char *)(*fpregsetp + 32)); ! /* FIXME: how can we supply FCRIR? The ABI doesn't tell us. */ regcache_raw_supply (current_regcache, mips_regnum (current_gdbarch)->fp_implementation_revision, zerobuf); --- 209,215 ---- mips_regnum (current_gdbarch)->fp_control_status, (char *)(*fpregsetp + 32)); ! /* FIXME: how can we supply FCRIR? The ABI doesn't tell us. */ regcache_raw_supply (current_regcache, mips_regnum (current_gdbarch)->fp_implementation_revision, zerobuf); *************** fill_fpregset (elf_fpregset_t *fpregsetp *** 236,242 **** for (regi = 0; regi < 32; regi++) fill_fpregset (fpregsetp, FP0_REGNUM + regi); ! fill_fpregset(fpregsetp, mips_regnum (current_gdbarch)->fp_control_status); } } --- 239,246 ---- for (regi = 0; regi < 32; regi++) fill_fpregset (fpregsetp, FP0_REGNUM + regi); ! fill_fpregset (fpregsetp, ! mips_regnum (current_gdbarch)->fp_control_status); } } *************** mips_linux_register_addr (int regno, COR *** 278,297 **** /* Fetch (and possibly build) an appropriate link_map_offsets ! structure for native GNU/Linux MIPS targets using the struct offsets ! defined in link.h (but without actual reference to that file). ! ! This makes it possible to access GNU/Linux MIPS shared libraries from a ! GDB that was built on a different host platform (for cross debugging). */ static struct link_map_offsets * mips_linux_svr4_fetch_link_map_offsets (void) ! { static struct link_map_offsets lmo; static struct link_map_offsets *lmp = NULL; if (lmp == NULL) ! { lmp = &lmo; lmo.r_debug_size = 8; /* The actual size is 20 bytes, but --- 282,303 ---- /* Fetch (and possibly build) an appropriate link_map_offsets ! structure for native GNU/Linux MIPS targets using the struct ! offsets defined in link.h (but without actual reference to that ! file). ! ! This makes it possible to access GNU/Linux MIPS shared libraries ! from a GDB that was built on a different host platform (for cross ! debugging). */ static struct link_map_offsets * mips_linux_svr4_fetch_link_map_offsets (void) ! { static struct link_map_offsets lmo; static struct link_map_offsets *lmp = NULL; if (lmp == NULL) ! { lmp = &lmo; lmo.r_debug_size = 8; /* The actual size is 20 bytes, but *************** typedef mips64_elf_fpreg_t mips64_elf_fp *** 351,359 **** #define MIPS64_EF_SIZE 304 /* Figure out where the longjmp will land. ! We expect the first arg to be a pointer to the jmp_buf structure from ! which we extract the pc (MIPS_LINUX_JB_PC) that we will land at. The pc ! is copied into PC. This routine returns 1 on success. */ /* Details about jmp_buf. */ --- 357,366 ---- #define MIPS64_EF_SIZE 304 /* Figure out where the longjmp will land. ! We expect the first arg to be a pointer to the jmp_buf structure ! from which we extract the pc (MIPS_LINUX_JB_PC) that we will land ! at. The pc is copied into PC. This routine returns 1 on ! success. */ /* Details about jmp_buf. */ *************** mips64_supply_gregset (mips64_elf_gregse *** 392,414 **** regcache_raw_supply (current_regcache, (regi - MIPS64_EF_REG0), (char *)(regp + regi)); ! regcache_raw_supply (current_regcache, mips_regnum (current_gdbarch)->lo, ! (char *)(regp + MIPS64_EF_LO)); ! regcache_raw_supply (current_regcache, mips_regnum (current_gdbarch)->hi, ! (char *)(regp + MIPS64_EF_HI)); ! ! regcache_raw_supply (current_regcache, mips_regnum (current_gdbarch)->pc, ! (char *)(regp + MIPS64_EF_CP0_EPC)); ! regcache_raw_supply (current_regcache, mips_regnum (current_gdbarch)->badvaddr, ! (char *)(regp + MIPS64_EF_CP0_BADVADDR)); regcache_raw_supply (current_regcache, MIPS_PS_REGNUM, ! (char *)(regp + MIPS64_EF_CP0_STATUS)); ! regcache_raw_supply (current_regcache, mips_regnum (current_gdbarch)->cause, ! (char *)(regp + MIPS64_EF_CP0_CAUSE)); /* Fill inaccessible registers with zero. */ regcache_raw_supply (current_regcache, MIPS_UNUSED_REGNUM, zerobuf); ! for (regi = MIPS_FIRST_EMBED_REGNUM; regi < MIPS_LAST_EMBED_REGNUM; regi++) regcache_raw_supply (current_regcache, regi, zerobuf); } --- 399,428 ---- regcache_raw_supply (current_regcache, (regi - MIPS64_EF_REG0), (char *)(regp + regi)); ! regcache_raw_supply (current_regcache, ! mips_regnum (current_gdbarch)->lo, ! (char *) (regp + MIPS64_EF_LO)); ! regcache_raw_supply (current_regcache, ! mips_regnum (current_gdbarch)->hi, ! (char *) (regp + MIPS64_EF_HI)); ! ! regcache_raw_supply (current_regcache, ! mips_regnum (current_gdbarch)->pc, ! (char *) (regp + MIPS64_EF_CP0_EPC)); ! regcache_raw_supply (current_regcache, ! mips_regnum (current_gdbarch)->badvaddr, ! (char *) (regp + MIPS64_EF_CP0_BADVADDR)); regcache_raw_supply (current_regcache, MIPS_PS_REGNUM, ! (char *) (regp + MIPS64_EF_CP0_STATUS)); ! regcache_raw_supply (current_regcache, ! mips_regnum (current_gdbarch)->cause, ! (char *) (regp + MIPS64_EF_CP0_CAUSE)); /* Fill inaccessible registers with zero. */ regcache_raw_supply (current_regcache, MIPS_UNUSED_REGNUM, zerobuf); ! for (regi = MIPS_FIRST_EMBED_REGNUM; ! regi < MIPS_LAST_EMBED_REGNUM; ! regi++) regcache_raw_supply (current_regcache, regi, zerobuf); } *************** mips64_fill_gregset (mips64_elf_gregset_ *** 429,437 **** mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->lo); mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->hi); mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->pc); ! mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->badvaddr); mips64_fill_gregset (gregsetp, MIPS_PS_REGNUM); ! mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->cause); return; } --- 443,453 ---- mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->lo); mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->hi); mips64_fill_gregset (gregsetp, mips_regnum (current_gdbarch)->pc); ! mips64_fill_gregset (gregsetp, ! mips_regnum (current_gdbarch)->badvaddr); mips64_fill_gregset (gregsetp, MIPS_PS_REGNUM); ! mips64_fill_gregset (gregsetp, ! mips_regnum (current_gdbarch)->cause); return; } *************** mips64_supply_fpregset (mips64_elf_fpreg *** 483,489 **** mips_regnum (current_gdbarch)->fp_control_status, (char *)(*fpregsetp + 32)); ! /* FIXME: how can we supply FCRIR? The ABI doesn't tell us. */ regcache_raw_supply (current_regcache, mips_regnum (current_gdbarch)->fp_implementation_revision, zerobuf); --- 499,505 ---- mips_regnum (current_gdbarch)->fp_control_status, (char *)(*fpregsetp + 32)); ! /* FIXME: how can we supply FCRIR? The ABI doesn't tell us. */ regcache_raw_supply (current_regcache, mips_regnum (current_gdbarch)->fp_implementation_revision, zerobuf); *************** fetch_core_registers (char *core_reg_sec *** 593,599 **** } else if (core_reg_size == sizeof (fpregset64)) { ! memcpy ((char *) &fpregset64, core_reg_sect, sizeof (fpregset64)); mips64_supply_fpregset (&fpregset64); } else --- 609,616 ---- } else if (core_reg_size == sizeof (fpregset64)) { ! memcpy ((char *) &fpregset64, core_reg_sect, ! sizeof (fpregset64)); mips64_supply_fpregset (&fpregset64); } else *************** static struct core_fns regset_core_fns = *** 616,635 **** }; /* Fetch (and possibly build) an appropriate link_map_offsets ! structure for native GNU/Linux MIPS targets using the struct offsets ! defined in link.h (but without actual reference to that file). ! ! This makes it possible to access GNU/Linux MIPS shared libraries from a ! GDB that was built on a different host platform (for cross debugging). */ static struct link_map_offsets * mips64_linux_svr4_fetch_link_map_offsets (void) ! { static struct link_map_offsets lmo; static struct link_map_offsets *lmp = NULL; if (lmp == NULL) ! { lmp = &lmo; lmo.r_debug_size = 16; /* The actual size is 40 bytes, but --- 633,654 ---- }; /* Fetch (and possibly build) an appropriate link_map_offsets ! structure for native GNU/Linux MIPS targets using the struct ! offsets defined in link.h (but without actual reference to that ! file). ! ! This makes it possible to access GNU/Linux MIPS shared libraries ! from a GDB that was built on a different host platform (for cross ! debugging). */ static struct link_map_offsets * mips64_linux_svr4_fetch_link_map_offsets (void) ! { static struct link_map_offsets lmo; static struct link_map_offsets *lmp = NULL; if (lmp == NULL) ! { lmp = &lmo; lmo.r_debug_size = 16; /* The actual size is 40 bytes, but *************** mips64_linux_svr4_fetch_link_map_offsets *** 655,662 **** return lmp; } ! /* Handle for obtaining pointer to the current register_addr() function ! for a given architecture. */ static struct gdbarch_data *register_addr_data; CORE_ADDR --- 674,681 ---- return lmp; } ! /* Handle for obtaining pointer to the current register_addr() ! function for a given architecture. */ static struct gdbarch_data *register_addr_data; CORE_ADDR *************** register_addr (int regno, CORE_ADDR bloc *** 672,680 **** static void set_mips_linux_register_addr (struct gdbarch *gdbarch, ! CORE_ADDR (*register_addr_ptr) (int, CORE_ADDR)) { ! deprecated_set_gdbarch_data (gdbarch, register_addr_data, register_addr_ptr); } static void * --- 691,701 ---- static void set_mips_linux_register_addr (struct gdbarch *gdbarch, ! CORE_ADDR (*register_addr_ptr) (int, ! CORE_ADDR)) { ! deprecated_set_gdbarch_data (gdbarch, register_addr_data, ! register_addr_ptr); } static void * *************** init_register_addr_data (struct gdbarch *** 683,699 **** return 0; } ! /* Check the code at PC for a dynamic linker lazy resolution stub. Because ! they aren't in the .plt section, we pattern-match on the code generated ! by GNU ld. They look like this: lw t9,0x8010(gp) addu t7,ra jalr t9,ra addiu t8,zero,INDEX ! (with the appropriate doubleword instructions for N64). Also return the ! dynamic symbol index used in the last instruction. */ static int mips_linux_in_dynsym_stub (CORE_ADDR pc, char *name) --- 704,720 ---- return 0; } ! /* Check the code at PC for a dynamic linker lazy resolution stub. ! Because they aren't in the .plt section, we pattern-match on the ! code generated by GNU ld. They look like this: lw t9,0x8010(gp) addu t7,ra jalr t9,ra addiu t8,zero,INDEX ! (with the appropriate doubleword instructions for N64). Also ! return the dynamic symbol index used in the last instruction. */ static int mips_linux_in_dynsym_stub (CORE_ADDR pc, char *name) *************** mips_linux_in_dynsym_stub (CORE_ADDR pc, *** 739,745 **** if (insn != 0x03e07821) return 0; } ! insn = extract_unsigned_integer (p + 8, 4); /* jalr t9,ra */ if (insn != 0x0320f809) --- 760,766 ---- if (insn != 0x03e07821) return 0; } ! insn = extract_unsigned_integer (p + 8, 4); /* jalr t9,ra */ if (insn != 0x0320f809) *************** mips_linux_in_dynsym_stub (CORE_ADDR pc, *** 762,780 **** return (insn & 0xffff); } ! /* Return non-zero iff PC belongs to the dynamic linker resolution code ! or to a stub. */ int mips_linux_in_dynsym_resolve_code (CORE_ADDR pc) { ! /* Check whether PC is in the dynamic linker. This also checks whether ! it is in the .plt section, which MIPS does not use. */ if (in_solib_dynsym_resolve_code (pc)) return 1; ! /* Pattern match for the stub. It would be nice if there were a more ! efficient way to avoid this check. */ if (mips_linux_in_dynsym_stub (pc, NULL)) return 1; --- 783,801 ---- return (insn & 0xffff); } ! /* Return non-zero iff PC belongs to the dynamic linker resolution ! code or to a stub. */ int mips_linux_in_dynsym_resolve_code (CORE_ADDR pc) { ! /* Check whether PC is in the dynamic linker. This also checks ! whether it is in the .plt section, which MIPS does not use. */ if (in_solib_dynsym_resolve_code (pc)) return 1; ! /* Pattern match for the stub. It would be nice if there were a ! more efficient way to avoid this check. */ if (mips_linux_in_dynsym_stub (pc, NULL)) return 1; *************** mips_linux_skip_resolver (struct gdbarch *** 798,807 **** resolver = lookup_minimal_symbol ("__dl_runtime_resolve", NULL, NULL); if (resolver && SYMBOL_VALUE_ADDRESS (resolver) == pc) ! return frame_pc_unwind (get_current_frame ()); return 0; ! } /* Signal trampoline support. There are four supported layouts for a signal frame: o32 sigframe, o32 rt_sigframe, n32 rt_sigframe, and --- 819,828 ---- resolver = lookup_minimal_symbol ("__dl_runtime_resolve", NULL, NULL); if (resolver && SYMBOL_VALUE_ADDRESS (resolver) == pc) ! return frame_pc_unwind (get_current_frame ()); return 0; ! } /* Signal trampoline support. There are four supported layouts for a signal frame: o32 sigframe, o32 rt_sigframe, n32 rt_sigframe, and *************** static const struct tramp_frame mips_lin *** 868,874 **** static const struct tramp_frame mips_linux_n64_rt_sigframe = { SIGTRAMP_FRAME, 4, ! { MIPS_INST_LI_V0_N64_RT_SIGRETURN, MIPS_INST_SYSCALL, TRAMP_SENTINEL_INSN }, mips_linux_n32n64_sigframe_init }; --- 889,897 ---- static const struct tramp_frame mips_linux_n64_rt_sigframe = { SIGTRAMP_FRAME, 4, ! { MIPS_INST_LI_V0_N64_RT_SIGRETURN, ! MIPS_INST_SYSCALL, ! TRAMP_SENTINEL_INSN }, mips_linux_n32n64_sigframe_init }; *************** mips_linux_o32_sigframe_init (const stru *** 958,968 **** sigcontext_base += SIGFRAME_SIGCONTEXT_OFFSET; else sigcontext_base += RTSIGFRAME_SIGCONTEXT_OFFSET; ! ! /* I'm not proud of this hack. Eventually we will have the infrastructure ! to indicate the size of saved registers on a per-frame basis, but ! right now we don't; the kernel saves eight bytes but we only want ! four. */ if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) sigcontext_base += 4; --- 981,991 ---- sigcontext_base += SIGFRAME_SIGCONTEXT_OFFSET; else sigcontext_base += RTSIGFRAME_SIGCONTEXT_OFFSET; ! ! /* I'm not proud of this hack. Eventually we will have the ! infrastructure to indicate the size of saved registers on a ! per-frame basis, but right now we don't; the kernel saves eight ! bytes but we only want four. */ if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) sigcontext_base += 4; *************** mips_linux_o32_sigframe_init (const stru *** 972,978 **** #endif for (ireg = 1; ireg < 32; ireg++) ! trad_frame_set_reg_addr (this_cache, ireg + MIPS_ZERO_REGNUM + NUM_REGS, sigcontext_base + SIGCONTEXT_REGS + ireg * SIGCONTEXT_REG_SIZE); --- 995,1002 ---- #endif for (ireg = 1; ireg < 32; ireg++) ! trad_frame_set_reg_addr (this_cache, ! ireg + MIPS_ZERO_REGNUM + NUM_REGS, sigcontext_base + SIGCONTEXT_REGS + ireg * SIGCONTEXT_REG_SIZE); *************** mips_linux_o32_sigframe_init (const stru *** 984,990 **** trad_frame_set_reg_addr (this_cache, regs->pc + NUM_REGS, sigcontext_base + SIGCONTEXT_PC); ! trad_frame_set_reg_addr (this_cache, regs->fp_control_status + NUM_REGS, sigcontext_base + SIGCONTEXT_FPCSR); trad_frame_set_reg_addr (this_cache, regs->hi + NUM_REGS, sigcontext_base + SIGCONTEXT_HI); --- 1008,1015 ---- trad_frame_set_reg_addr (this_cache, regs->pc + NUM_REGS, sigcontext_base + SIGCONTEXT_PC); ! trad_frame_set_reg_addr (this_cache, ! regs->fp_control_status + NUM_REGS, sigcontext_base + SIGCONTEXT_FPCSR); trad_frame_set_reg_addr (this_cache, regs->hi + NUM_REGS, sigcontext_base + SIGCONTEXT_HI); *************** mips_linux_o32_sigframe_init (const stru *** 997,1003 **** /* Choice of the bottom of the sigframe is somewhat arbitrary. */ trad_frame_set_id (this_cache, ! frame_id_build (func - SIGFRAME_CODE_OFFSET, func)); } /* *INDENT-OFF* */ --- 1022,1029 ---- /* Choice of the bottom of the sigframe is somewhat arbitrary. */ trad_frame_set_id (this_cache, ! frame_id_build (func - SIGFRAME_CODE_OFFSET, ! func)); } /* *INDENT-OFF* */ *************** mips_linux_o32_sigframe_init (const stru *** 1017,1023 **** struct sigcontext uc_mcontext; sigset_t uc_sigmask; [ mask last for extensibility ] }; ! struct rt_sigframe_n32 { u32 rs_ass[4]; [ argument save space for o32 ] u32 rs_code[2]; [ signal trampoline ] --- 1043,1049 ---- struct sigcontext uc_mcontext; sigset_t uc_sigmask; [ mask last for extensibility ] }; ! struct rt_sigframe_n32 { u32 rs_ass[4]; [ argument save space for o32 ] u32 rs_code[2]; [ signal trampoline ] *************** mips_linux_o32_sigframe_init (const stru *** 1072,1078 **** #define N64_SIGCONTEXT_BADVADDR (67 * 8 + 5 * 4) #define N64_SIGCONTEXT_REG_SIZE 8 ! static void mips_linux_n32n64_sigframe_init (const struct tramp_frame *self, struct frame_info *next_frame, --- 1098,1104 ---- #define N64_SIGCONTEXT_BADVADDR (67 * 8 + 5 * 4) #define N64_SIGCONTEXT_REG_SIZE 8 ! static void mips_linux_n32n64_sigframe_init (const struct tramp_frame *self, struct frame_info *next_frame, *************** mips_linux_n32n64_sigframe_init (const s *** 1087,1100 **** sigcontext_base += N32_SIGFRAME_SIGCONTEXT_OFFSET; else sigcontext_base += N64_SIGFRAME_SIGCONTEXT_OFFSET; ! #if 0 trad_frame_set_reg_addr (this_cache, ORIG_ZERO_REGNUM + NUM_REGS, sigcontext_base + N64_SIGCONTEXT_REGS); #endif for (ireg = 1; ireg < 32; ireg++) ! trad_frame_set_reg_addr (this_cache, ireg + MIPS_ZERO_REGNUM + NUM_REGS, sigcontext_base + N64_SIGCONTEXT_REGS + ireg * N64_SIGCONTEXT_REG_SIZE); --- 1113,1127 ---- sigcontext_base += N32_SIGFRAME_SIGCONTEXT_OFFSET; else sigcontext_base += N64_SIGFRAME_SIGCONTEXT_OFFSET; ! #if 0 trad_frame_set_reg_addr (this_cache, ORIG_ZERO_REGNUM + NUM_REGS, sigcontext_base + N64_SIGCONTEXT_REGS); #endif for (ireg = 1; ireg < 32; ireg++) ! trad_frame_set_reg_addr (this_cache, ! ireg + MIPS_ZERO_REGNUM + NUM_REGS, sigcontext_base + N64_SIGCONTEXT_REGS + ireg * N64_SIGCONTEXT_REG_SIZE); *************** mips_linux_n32n64_sigframe_init (const s *** 1106,1112 **** trad_frame_set_reg_addr (this_cache, regs->pc + NUM_REGS, sigcontext_base + N64_SIGCONTEXT_PC); ! trad_frame_set_reg_addr (this_cache, regs->fp_control_status + NUM_REGS, sigcontext_base + N64_SIGCONTEXT_FPCSR); trad_frame_set_reg_addr (this_cache, regs->hi + NUM_REGS, sigcontext_base + N64_SIGCONTEXT_HI); --- 1133,1140 ---- trad_frame_set_reg_addr (this_cache, regs->pc + NUM_REGS, sigcontext_base + N64_SIGCONTEXT_PC); ! trad_frame_set_reg_addr (this_cache, ! regs->fp_control_status + NUM_REGS, sigcontext_base + N64_SIGCONTEXT_FPCSR); trad_frame_set_reg_addr (this_cache, regs->hi + NUM_REGS, sigcontext_base + N64_SIGCONTEXT_HI); *************** mips_linux_n32n64_sigframe_init (const s *** 1119,1131 **** /* Choice of the bottom of the sigframe is somewhat arbitrary. */ trad_frame_set_id (this_cache, ! frame_id_build (func - SIGFRAME_CODE_OFFSET, func)); } /* Initialize one of the GNU/Linux OS ABIs. */ static void ! mips_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); enum mips_abi abi = mips_abi (gdbarch); --- 1147,1161 ---- /* Choice of the bottom of the sigframe is somewhat arbitrary. */ trad_frame_set_id (this_cache, ! frame_id_build (func - SIGFRAME_CODE_OFFSET, ! func)); } /* Initialize one of the GNU/Linux OS ABIs. */ static void ! mips_linux_init_abi (struct gdbarch_info info, ! struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); enum mips_abi abi = mips_abi (gdbarch); *************** _initialize_mips_linux_tdep (void) *** 1179,1185 **** arch_info != NULL; arch_info = arch_info->next) { ! gdbarch_register_osabi (bfd_arch_mips, arch_info->mach, GDB_OSABI_LINUX, mips_linux_init_abi); } --- 1209,1216 ---- arch_info != NULL; arch_info = arch_info->next) { ! gdbarch_register_osabi (bfd_arch_mips, arch_info->mach, ! GDB_OSABI_LINUX, mips_linux_init_abi); } --------------020005080901060604080006--