X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fm32r-linux-nat.c;h=05f338809dd7a4124527ddea870f2589e1c947fc;hb=405e54e9944dcdcea88518f8d9bdbeff6752d78f;hp=bfe6435b3d416011244de99265e3f5b1d282ed94;hpb=197e01b6dcd118b70ed3621b62b2ff3fa929d50f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/m32r-linux-nat.c b/gdb/m32r-linux-nat.c index bfe6435b3d..05f338809d 100644 --- a/gdb/m32r-linux-nat.c +++ b/gdb/m32r-linux-nat.c @@ -1,12 +1,13 @@ /* Native-dependent code for GNU/Linux m32r. - Copyright (C) 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. This file is part of GDB. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + 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, @@ -15,9 +16,7 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "inferior.h" @@ -57,8 +56,9 @@ static int regmap[] = { #define SPU_REGMAP 23 #define SPI_REGMAP 26 -/* Doee apply to the corresponding SET requests as well. */ -#define GETREGS_SUPPLIES(regno) (0 <= (regno) && (regno) <= M32R_LINUX_NUM_REGS) +/* Doee (??) apply to the corresponding SET requests as well. */ +#define GETREGS_SUPPLIES(regno) (0 <= (regno) \ + && (regno) <= M32R_LINUX_NUM_REGS) @@ -69,9 +69,9 @@ static int regmap[] = { in *GREGSETP. */ void -supply_gregset (elf_gregset_t * gregsetp) +supply_gregset (struct regcache *regcache, const elf_gregset_t * gregsetp) { - elf_greg_t *regp = (elf_greg_t *) gregsetp; + const elf_greg_t *regp = (const elf_greg_t *) gregsetp; int i; unsigned long psw, bbpsw; @@ -80,23 +80,27 @@ supply_gregset (elf_gregset_t * gregsetp) for (i = 0; i < M32R_LINUX_NUM_REGS; i++) { + elf_greg_t regval; + switch (i) { case PSW_REGNUM: - *(regp + regmap[i]) = - ((0x00c1 & bbpsw) << 8) | ((0xc100 & psw) >> 8); + regval = ((0x00c1 & bbpsw) << 8) | ((0xc100 & psw) >> 8); break; case CBR_REGNUM: - *(regp + regmap[i]) = ((psw >> 8) & 1); + regval = ((psw >> 8) & 1); + break; + default: + regval = *(regp + regmap[i]); break; } if (i != M32R_SP_REGNUM) - regcache_raw_supply (current_regcache, i, regp + regmap[i]); + regcache_raw_supply (regcache, i, ®val); else if (psw & 0x8000) - regcache_raw_supply (current_regcache, i, regp + SPU_REGMAP); + regcache_raw_supply (regcache, i, regp + SPU_REGMAP); else - regcache_raw_supply (current_regcache, i, regp + SPI_REGMAP); + regcache_raw_supply (regcache, i, regp + SPI_REGMAP); } } @@ -104,14 +108,14 @@ supply_gregset (elf_gregset_t * gregsetp) store their values in GDB's register array. */ static void -fetch_regs (int tid) +fetch_regs (struct regcache *regcache, int tid) { elf_gregset_t regs; if (ptrace (PTRACE_GETREGS, tid, 0, (int) ®s) < 0) perror_with_name (_("Couldn't get registers")); - supply_gregset (®s); + supply_gregset (regcache, (const elf_gregset_t *) ®s); } /* Fill register REGNO (if it is a general-purpose register) in @@ -119,7 +123,8 @@ fetch_regs (int tid) do this for all registers. */ void -fill_gregset (elf_gregset_t * gregsetp, int regno) +fill_gregset (const struct regcache *regcache, + elf_gregset_t * gregsetp, int regno) { elf_greg_t *regp = (elf_greg_t *) gregsetp; int i; @@ -140,11 +145,11 @@ fill_gregset (elf_gregset_t * gregsetp, int regno) continue; if (i != M32R_SP_REGNUM) - regcache_raw_collect (current_regcache, i, regp + regmap[i]); + regcache_raw_collect (regcache, i, regp + regmap[i]); else if (psw & 0x8000) - regcache_raw_collect (current_regcache, i, regp + SPU_REGMAP); + regcache_raw_collect (regcache, i, regp + SPU_REGMAP); else - regcache_raw_collect (current_regcache, i, regp + SPI_REGMAP); + regcache_raw_collect (regcache, i, regp + SPI_REGMAP); } } @@ -152,14 +157,14 @@ fill_gregset (elf_gregset_t * gregsetp, int regno) into the process/thread specified by TID. */ static void -store_regs (int tid, int regno) +store_regs (const struct regcache *regcache, int tid, int regno) { elf_gregset_t regs; if (ptrace (PTRACE_GETREGS, tid, 0, (int) ®s) < 0) perror_with_name (_("Couldn't get registers")); - fill_gregset (®s, regno); + fill_gregset (regcache, ®s, regno); if (ptrace (PTRACE_SETREGS, tid, 0, (int) ®s) < 0) perror_with_name (_("Couldn't write registers")); @@ -171,12 +176,13 @@ store_regs (int tid, int regno) Since M32R has no floating-point registers, these functions do nothing. */ void -supply_fpregset (gdb_fpregset_t *fpregs) +supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregs) { } void -fill_fpregset (gdb_fpregset_t *fpregs, int regno) +fill_fpregset (const struct regcache *regcache, + gdb_fpregset_t *fpregs, int regno) { } @@ -189,7 +195,8 @@ fill_fpregset (gdb_fpregset_t *fpregs, int regno) registers). */ static void -m32r_linux_fetch_inferior_registers (int regno) +m32r_linux_fetch_inferior_registers (struct target_ops *ops, + struct regcache *regcache, int regno) { int tid; @@ -203,7 +210,7 @@ m32r_linux_fetch_inferior_registers (int regno) results. */ if (regno == -1 || GETREGS_SUPPLIES (regno)) { - fetch_regs (tid); + fetch_regs (regcache, tid); return; } @@ -215,7 +222,8 @@ m32r_linux_fetch_inferior_registers (int regno) do this for all registers (including the floating point and SSE registers). */ static void -m32r_linux_store_inferior_registers (int regno) +m32r_linux_store_inferior_registers (struct target_ops *ops, + struct regcache *regcache, int regno) { int tid; @@ -227,7 +235,7 @@ m32r_linux_store_inferior_registers (int regno) transfers more registers in one system call. */ if (regno == -1 || GETREGS_SUPPLIES (regno)) { - store_regs (tid, regno); + store_regs (regcache, tid, regno); return; } @@ -250,5 +258,5 @@ _initialize_m32r_linux_nat (void) t->to_store_registers = m32r_linux_store_inferior_registers; /* Register the target. */ - add_target (t); + linux_nat_add_target (t); }