#include "arch/arm-linux.h"
#include "arch/arm-get-next-pcs.h"
#include "linux-aarch32-low.h"
+#include "linux-aarch32-tdesc.h"
+#include "linux-arm-tdesc.h"
#include <sys/uio.h>
/* Don't include elf.h if linux/elf.h got included by gdb_proc_service.h.
#include <signal.h>
#include <sys/syscall.h>
-/* Defined in auto-generated files. */
-void init_registers_arm (void);
-extern const struct target_desc *tdesc_arm;
-
-void init_registers_arm_with_iwmmxt (void);
-extern const struct target_desc *tdesc_arm_with_iwmmxt;
-
-void init_registers_arm_with_vfpv2 (void);
-extern const struct target_desc *tdesc_arm_with_vfpv2;
-
-void init_registers_arm_with_vfpv3 (void);
-extern const struct target_desc *tdesc_arm_with_vfpv3;
-
#ifndef PTRACE_GET_THREAD_AREA
#define PTRACE_GET_THREAD_AREA 22
#endif
static void
arm_fill_wmmxregset (struct regcache *regcache, void *buf)
{
- if (regcache->tdesc != tdesc_arm_with_iwmmxt)
+ if (arm_linux_get_tdesc_fp_type (regcache->tdesc) != ARM_FP_TYPE_IWMMXT)
return;
for (int i = 0; i < 16; i++)
static void
arm_store_wmmxregset (struct regcache *regcache, const void *buf)
{
- if (regcache->tdesc != tdesc_arm_with_iwmmxt)
+ if (arm_linux_get_tdesc_fp_type (regcache->tdesc) != ARM_FP_TYPE_IWMMXT)
return;
for (int i = 0; i < 16; i++)
{
int num;
- if (regcache->tdesc == tdesc_arm_with_neon
- || regcache->tdesc == tdesc_arm_with_vfpv3)
+ if (is_aarch32_linux_description (regcache->tdesc))
num = 32;
- else if (regcache->tdesc == tdesc_arm_with_vfpv2)
- num = 16;
else
- return;
+ {
+ arm_fp_type fp_type = arm_linux_get_tdesc_fp_type (regcache->tdesc);
+
+ if (fp_type == ARM_FP_TYPE_VFPV3)
+ num = 32;
+ else if (fp_type == ARM_FP_TYPE_VFPV2)
+ num = 16;
+ else
+ return;
+ }
arm_fill_vfpregset_num (regcache, buf, num);
}
{
int num;
- if (regcache->tdesc == tdesc_arm_with_neon
- || regcache->tdesc == tdesc_arm_with_vfpv3)
+ if (is_aarch32_linux_description (regcache->tdesc))
num = 32;
- else if (regcache->tdesc == tdesc_arm_with_vfpv2)
- num = 16;
else
- return;
+ {
+ arm_fp_type fp_type = arm_linux_get_tdesc_fp_type (regcache->tdesc);
+
+ if (fp_type == ARM_FP_TYPE_VFPV3)
+ num = 32;
+ else if (fp_type == ARM_FP_TYPE_VFPV2)
+ num = 16;
+ else
+ return;
+ }
arm_store_vfpregset_num (regcache, buf, num);
}
unsigned long arm_hwcap = linux_get_hwcap (4);
if (arm_hwcap & HWCAP_IWMMXT)
- return tdesc_arm_with_iwmmxt;
+ return arm_linux_read_description (ARM_FP_TYPE_IWMMXT);
if (arm_hwcap & HWCAP_VFP)
{
errno = 0;
char *buf = (char *) alloca (ARM_VFP3_REGS_SIZE);
if (ptrace (PTRACE_GETVFPREGS, pid, 0, buf) < 0 && errno == EIO)
- return tdesc_arm;
+ return arm_linux_read_description (ARM_FP_TYPE_NONE);
/* NEON implies either no VFP, or VFPv3-D32. We only support
it with VFP. */
if (arm_hwcap & HWCAP_NEON)
- return tdesc_arm_with_neon;
+ return aarch32_linux_read_description ();
else if ((arm_hwcap & (HWCAP_VFPv3 | HWCAP_VFPv3D16)) == HWCAP_VFPv3)
- return tdesc_arm_with_vfpv3;
+ return arm_linux_read_description (ARM_FP_TYPE_VFPV3);
else
- return tdesc_arm_with_vfpv2;
+ return arm_linux_read_description (ARM_FP_TYPE_VFPV2);
}
/* The default configuration uses legacy FPA registers, probably
simulated. */
- return tdesc_arm;
+ return arm_linux_read_description (ARM_FP_TYPE_NONE);
}
static void
const struct target_desc *tdesc = current_process ()->tdesc;
if (have_ptrace_getregset == 1
- && (tdesc == tdesc_arm_with_neon || tdesc == tdesc_arm_with_vfpv3))
+ && (is_aarch32_linux_description (tdesc)
+ || arm_linux_get_tdesc_fp_type (tdesc) == ARM_FP_TYPE_VFPV3))
return ®s_info_aarch32;
- else
- return ®s_info_arm;
+
+ return ®s_info_arm;
}
struct linux_target_ops the_low_target = {
void
initialize_low_arch (void)
{
- /* Initialize the Linux target descriptions. */
- init_registers_arm ();
- init_registers_arm_with_iwmmxt ();
- init_registers_arm_with_vfpv2 ();
- init_registers_arm_with_vfpv3 ();
-
initialize_low_arch_aarch32 ();
-
initialize_regsets_info (&arm_regsets_info);
}