New aarch32-linux-nat.c
This patch is to move all the code about transferring regcache <-> byte buffer for arm (aarch32) to a separate file aarch32-linux-nat.c. Then, in the following patch, aarch64 code can use it to do multi-arch debugging. This is a refactory patch. gdb: 2015-07-07 Yao Qi <yao.qi@linaro.org> * aarch32-linux-nat.c: New file. * aarch32-linux-nat.h: New file. * arm-linux-nat.c: Include aarch32-linux-nat.h. (fetch_regs): Move code to aarch32-linux-nat.c. Call aarch32_gp_regcache_supply. (store_regs): Move code to aarch32-linux-nat.c. Call aarch32_gp_regcache_collect. (fetch_vfp_regs): Move code to aarch32-linux-nat.c. Call aarch32_vfp_regcache_supply. (store_vfp_regs): Move code to aarch32-linux-nat.c. Call aarch32_vfp_regcache_collect. * config/arm/linux.mh (NATDEPFILES): Add aarch32-linux-nat.o.
This commit is contained in:
Yao Qi
parent
179bfe826b
commit
f1b6788884
|
|
@ -1,3 +1,18 @@
|
|||
2015-07-07 Yao Qi <yao.qi@linaro.org>
|
||||
|
||||
* aarch32-linux-nat.c: New file.
|
||||
* aarch32-linux-nat.h: New file.
|
||||
* arm-linux-nat.c: Include aarch32-linux-nat.h.
|
||||
(fetch_regs): Move code to aarch32-linux-nat.c. Call
|
||||
aarch32_gp_regcache_supply.
|
||||
(store_regs): Move code to aarch32-linux-nat.c. Call
|
||||
aarch32_gp_regcache_collect.
|
||||
(fetch_vfp_regs): Move code to aarch32-linux-nat.c. Call
|
||||
aarch32_vfp_regcache_supply.
|
||||
(store_vfp_regs): Move code to aarch32-linux-nat.c. Call
|
||||
aarch32_vfp_regcache_collect.
|
||||
* config/arm/linux.mh (NATDEPFILES): Add aarch32-linux-nat.o.
|
||||
|
||||
2015-07-07 Yao Qi <yao.qi@linaro.org>
|
||||
|
||||
* arm-linux-nat.c (store_fpregister): Remove.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,99 @@
|
|||
/* Copyright (C) 1999-2015 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 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
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, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include "defs.h"
|
||||
|
||||
#include "regcache.h"
|
||||
#include "arm-tdep.h"
|
||||
#include "arm-linux-tdep.h"
|
||||
|
||||
#include "aarch32-linux-nat.h"
|
||||
|
||||
/* Supply GP registers contents, stored in REGS, to REGCACHE. ARM_APCS_32
|
||||
is true if the 32-bit mode is in use, otherwise, it is false. */
|
||||
|
||||
void
|
||||
aarch32_gp_regcache_supply (struct regcache *regcache, uint32_t *regs,
|
||||
int arm_apcs_32)
|
||||
{
|
||||
int regno;
|
||||
|
||||
for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
|
||||
regcache_raw_supply (regcache, regno, ®s[regno]);
|
||||
|
||||
if (arm_apcs_32)
|
||||
regcache_raw_supply (regcache, ARM_PS_REGNUM, ®s[ARM_CPSR_GREGNUM]);
|
||||
else
|
||||
regcache_raw_supply (regcache, ARM_PS_REGNUM, ®s[ARM_PC_REGNUM]);
|
||||
|
||||
regs[ARM_PC_REGNUM] = gdbarch_addr_bits_remove
|
||||
(get_regcache_arch (regcache), regs[ARM_PC_REGNUM]);
|
||||
regcache_raw_supply (regcache, ARM_PC_REGNUM, ®s[ARM_PC_REGNUM]);
|
||||
}
|
||||
|
||||
/* Collect GP registers from REGCACHE to buffer REGS. ARM_APCS_32 is
|
||||
true if the 32-bit mode is in use, otherwise, it is false. */
|
||||
|
||||
void
|
||||
aarch32_gp_regcache_collect (const struct regcache *regcache, uint32_t *regs,
|
||||
int arm_apcs_32)
|
||||
{
|
||||
int regno;
|
||||
|
||||
for (regno = ARM_A1_REGNUM; regno <= ARM_PC_REGNUM; regno++)
|
||||
{
|
||||
if (REG_VALID == regcache_register_status (regcache, regno))
|
||||
regcache_raw_collect (regcache, regno, ®s[regno]);
|
||||
}
|
||||
|
||||
if (arm_apcs_32
|
||||
&& REG_VALID == regcache_register_status (regcache, ARM_PS_REGNUM))
|
||||
regcache_raw_collect (regcache, ARM_PS_REGNUM,
|
||||
®s[ARM_CPSR_GREGNUM]);
|
||||
}
|
||||
|
||||
/* Supply VFP registers contents, stored in REGS, to REGCACHE.
|
||||
VFP_REGISTER_COUNT is the number of VFP registers. */
|
||||
|
||||
void
|
||||
aarch32_vfp_regcache_supply (struct regcache *regcache, gdb_byte *regs,
|
||||
const int vfp_register_count)
|
||||
{
|
||||
int regno;
|
||||
|
||||
for (regno = 0; regno < vfp_register_count; regno++)
|
||||
regcache_raw_supply (regcache, regno + ARM_D0_REGNUM,
|
||||
regs + regno * 8);
|
||||
|
||||
regcache_raw_supply (regcache, ARM_FPSCR_REGNUM,
|
||||
regs + 32 * 8);
|
||||
}
|
||||
|
||||
/* Collect VFP registers from REGCACHE to buffer REGS.
|
||||
VFP_REGISTER_COUNT is the number VFP registers. */
|
||||
|
||||
void
|
||||
aarch32_vfp_regcache_collect (const struct regcache *regcache, gdb_byte *regs,
|
||||
const int vfp_register_count)
|
||||
{
|
||||
int regno;
|
||||
|
||||
for (regno = 0; regno < vfp_register_count; regno++)
|
||||
regcache_raw_collect (regcache, regno + ARM_D0_REGNUM, regs + regno * 8);
|
||||
|
||||
regcache_raw_collect (regcache, ARM_FPSCR_REGNUM, regs + 32 * 8);
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
/* Copyright (C) 1999-2015 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 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
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, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
void aarch32_gp_regcache_supply (struct regcache *regcache, uint32_t *regs,
|
||||
int arm_apcs_32);
|
||||
|
||||
void aarch32_gp_regcache_collect (const struct regcache *regcache,
|
||||
uint32_t *regs, int arm_apcs_32);
|
||||
|
||||
void aarch32_vfp_regcache_supply (struct regcache *regcache, gdb_byte *regs,
|
||||
const int vfp_register_count);
|
||||
|
||||
void aarch32_vfp_regcache_collect (const struct regcache *regcache,
|
||||
gdb_byte *regs,
|
||||
const int vfp_register_count);
|
||||
|
|
@ -29,6 +29,7 @@
|
|||
|
||||
#include "arm-tdep.h"
|
||||
#include "arm-linux-tdep.h"
|
||||
#include "aarch32-linux-nat.h"
|
||||
|
||||
#include <elf/common.h>
|
||||
#include <sys/user.h>
|
||||
|
|
@ -212,20 +213,7 @@ fetch_regs (struct regcache *regcache)
|
|||
return;
|
||||
}
|
||||
|
||||
for (regno = ARM_A1_REGNUM; regno < ARM_PC_REGNUM; regno++)
|
||||
regcache_raw_supply (regcache, regno, (char *) ®s[regno]);
|
||||
|
||||
if (arm_apcs_32)
|
||||
regcache_raw_supply (regcache, ARM_PS_REGNUM,
|
||||
(char *) ®s[ARM_CPSR_GREGNUM]);
|
||||
else
|
||||
regcache_raw_supply (regcache, ARM_PS_REGNUM,
|
||||
(char *) ®s[ARM_PC_REGNUM]);
|
||||
|
||||
regs[ARM_PC_REGNUM] = gdbarch_addr_bits_remove
|
||||
(get_regcache_arch (regcache), regs[ARM_PC_REGNUM]);
|
||||
regcache_raw_supply (regcache, ARM_PC_REGNUM,
|
||||
(char *) ®s[ARM_PC_REGNUM]);
|
||||
aarch32_gp_regcache_supply (regcache, (uint32_t *) regs, arm_apcs_32);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -256,15 +244,7 @@ store_regs (const struct regcache *regcache)
|
|||
return;
|
||||
}
|
||||
|
||||
for (regno = ARM_A1_REGNUM; regno <= ARM_PC_REGNUM; regno++)
|
||||
{
|
||||
if (REG_VALID == regcache_register_status (regcache, regno))
|
||||
regcache_raw_collect (regcache, regno, (char *) ®s[regno]);
|
||||
}
|
||||
|
||||
if (arm_apcs_32 && REG_VALID == regcache_register_status (regcache, ARM_PS_REGNUM))
|
||||
regcache_raw_collect (regcache, ARM_PS_REGNUM,
|
||||
(char *) ®s[ARM_CPSR_GREGNUM]);
|
||||
aarch32_gp_regcache_collect (regcache, (uint32_t *) regs, arm_apcs_32);
|
||||
|
||||
if (have_ptrace_getregset == TRIBOOL_TRUE)
|
||||
{
|
||||
|
|
@ -370,7 +350,7 @@ store_wmmx_regs (const struct regcache *regcache)
|
|||
static void
|
||||
fetch_vfp_regs (struct regcache *regcache)
|
||||
{
|
||||
char regbuf[VFP_REGS_SIZE];
|
||||
gdb_byte regbuf[VFP_REGS_SIZE];
|
||||
int ret, regno, tid;
|
||||
struct gdbarch *gdbarch = get_regcache_arch (regcache);
|
||||
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
||||
|
|
@ -395,18 +375,14 @@ fetch_vfp_regs (struct regcache *regcache)
|
|||
return;
|
||||
}
|
||||
|
||||
for (regno = 0; regno < tdep->vfp_register_count; regno++)
|
||||
regcache_raw_supply (regcache, regno + ARM_D0_REGNUM,
|
||||
(char *) regbuf + regno * 8);
|
||||
|
||||
regcache_raw_supply (regcache, ARM_FPSCR_REGNUM,
|
||||
(char *) regbuf + 32 * 8);
|
||||
aarch32_vfp_regcache_supply (regcache, regbuf,
|
||||
tdep->vfp_register_count);
|
||||
}
|
||||
|
||||
static void
|
||||
store_vfp_regs (const struct regcache *regcache)
|
||||
{
|
||||
char regbuf[VFP_REGS_SIZE];
|
||||
gdb_byte regbuf[VFP_REGS_SIZE];
|
||||
int ret, regno, tid;
|
||||
struct gdbarch *gdbarch = get_regcache_arch (regcache);
|
||||
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
||||
|
|
@ -431,12 +407,8 @@ store_vfp_regs (const struct regcache *regcache)
|
|||
return;
|
||||
}
|
||||
|
||||
for (regno = 0; regno < tdep->vfp_register_count; regno++)
|
||||
regcache_raw_collect (regcache, regno + ARM_D0_REGNUM,
|
||||
(char *) regbuf + regno * 8);
|
||||
|
||||
regcache_raw_collect (regcache, ARM_FPSCR_REGNUM,
|
||||
(char *) regbuf + 32 * 8);
|
||||
aarch32_vfp_regcache_collect (regcache, regbuf,
|
||||
tdep->vfp_register_count);
|
||||
|
||||
if (have_ptrace_getregset == TRIBOOL_TRUE)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
NAT_FILE= config/nm-linux.h
|
||||
NATDEPFILES= inf-ptrace.o fork-child.o arm-linux-nat.o \
|
||||
proc-service.o linux-thread-db.o \
|
||||
aarch32-linux-nat.o proc-service.o linux-thread-db.o \
|
||||
linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
|
||||
linux-waitpid.o linux-personality.o linux-namespaces.o
|
||||
NAT_CDEPS = $(srcdir)/proc-service.list
|
||||
|
|
|
|||
Loading…
Reference in New Issue