* [Qemu-devel] [5459] Add GDB XML register description support.
@ 2008-10-11 17:55 Paul Brook
2008-10-11 18:16 ` Edgar E. Iglesias
2008-10-12 3:55 ` C.W. Betts
0 siblings, 2 replies; 3+ messages in thread
From: Paul Brook @ 2008-10-11 17:55 UTC (permalink / raw)
To: qemu-devel
Revision: 5459
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5459
Author: pbrook
Date: 2008-10-11 17:55:29 +0000 (Sat, 11 Oct 2008)
Log Message:
-----------
Add GDB XML register description support.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Modified Paths:
--------------
trunk/Makefile.target
trunk/configure
trunk/cpu-defs.h
trunk/gdbstub.c
trunk/gdbstub.h
trunk/target-arm/helper.c
trunk/target-m68k/helper.c
Added Paths:
-----------
trunk/gdb-xml/
trunk/gdb-xml/arm-core.xml
trunk/gdb-xml/arm-neon.xml
trunk/gdb-xml/arm-vfp.xml
trunk/gdb-xml/arm-vfp3.xml
trunk/gdb-xml/cf-core.xml
trunk/gdb-xml/cf-fp.xml
Modified: trunk/Makefile.target
===================================================================
--- trunk/Makefile.target 2008-10-11 17:37:25 UTC (rev 5458)
+++ trunk/Makefile.target 2008-10-11 17:55:29 UTC (rev 5459)
@@ -418,7 +418,7 @@
endif
ifdef CONFIG_GDBSTUB
-OBJS+=gdbstub.o
+OBJS+=gdbstub.o gdbstub-xml.o
endif
OBJS+= libqemu.a
@@ -456,7 +456,7 @@
OBJS+= libqemu.a
ifdef CONFIG_GDBSTUB
-OBJS+=gdbstub.o
+OBJS+=gdbstub.o gdbstub-xml.o
endif
# Note: this is a workaround. The real fix is to avoid compiling
@@ -626,7 +626,7 @@
OBJS+= m68k-semi.o dummy_m68k.o
endif
ifdef CONFIG_GDBSTUB
-OBJS+=gdbstub.o
+OBJS+=gdbstub.o gdbstub-xml.o
endif
ifdef CONFIG_COCOA
COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit
@@ -674,6 +674,14 @@
endif # !CONFIG_USER_ONLY
+gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh
+ rm -f $@
+ifeq ($(TARGET_XML_FILES),)
+ echo > $@
+else
+ $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)
+endif
+
%.o: %.c
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
Modified: trunk/configure
===================================================================
--- trunk/configure 2008-10-11 17:37:25 UTC (rev 5458)
+++ trunk/configure 2008-10-11 17:55:29 UTC (rev 5459)
@@ -1386,6 +1386,7 @@
target_nptl="no"
interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
+gdb_xml_files=""
case "$target_cpu" in
i386)
@@ -1425,6 +1426,7 @@
echo "#define TARGET_ARM 1" >> $config_h
bflt="yes"
target_nptl="yes"
+ gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"
;;
cris)
echo "TARGET_ARCH=cris" >> $config_mak
@@ -1436,6 +1438,7 @@
echo "#define TARGET_ARCH \"m68k\"" >> $config_h
echo "#define TARGET_M68K 1" >> $config_h
bflt="yes"
+ gdb_xml_files="cf-core.xml cf-fp.xml"
;;
mips|mipsel)
echo "TARGET_ARCH=mips" >> $config_mak
@@ -1545,6 +1548,13 @@
echo "CONFIG_DARWIN_USER=yes" >> $config_mak
echo "#define CONFIG_DARWIN_USER 1" >> $config_h
fi
+list=""
+if test ! -z "$gdb_xml_files" ; then
+ for x in $gdb_xml_files; do
+ list="$list $source_path/gdb-xml/$x"
+ done
+fi
+echo "TARGET_XML_FILES=$list" >> $config_mak
if test "$target_cpu" = "arm" \
-o "$target_cpu" = "armeb" \
Modified: trunk/cpu-defs.h
===================================================================
--- trunk/cpu-defs.h 2008-10-11 17:37:25 UTC (rev 5458)
+++ trunk/cpu-defs.h 2008-10-11 17:55:29 UTC (rev 5459)
@@ -185,6 +185,8 @@
int nb_watchpoints; \
int watchpoint_hit; \
\
+ struct GDBRegisterState *gdb_regs; \
+ \
/* Core interrupt code */ \
jmp_buf jmp_env; \
int exception_index; \
Added: trunk/gdb-xml/arm-core.xml
===================================================================
--- trunk/gdb-xml/arm-core.xml (rev 0)
+++ trunk/gdb-xml/arm-core.xml 2008-10-11 17:55:29 UTC (rev 5459)
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2008 Free Software Foundation, Inc.
+
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved. -->
+
+<!DOCTYPE feature SYSTEM "gdb-target.dtd">
+<feature name="org.gnu.gdb.arm.core">
+ <reg name="r0" bitsize="32"/>
+ <reg name="r1" bitsize="32"/>
+ <reg name="r2" bitsize="32"/>
+ <reg name="r3" bitsize="32"/>
+ <reg name="r4" bitsize="32"/>
+ <reg name="r5" bitsize="32"/>
+ <reg name="r6" bitsize="32"/>
+ <reg name="r7" bitsize="32"/>
+ <reg name="r8" bitsize="32"/>
+ <reg name="r9" bitsize="32"/>
+ <reg name="r10" bitsize="32"/>
+ <reg name="r11" bitsize="32"/>
+ <reg name="r12" bitsize="32"/>
+ <reg name="sp" bitsize="32" type="data_ptr"/>
+ <reg name="lr" bitsize="32"/>
+ <reg name="pc" bitsize="32" type="code_ptr"/>
+
+ <!-- The CPSR is register 25, rather than register 16, because
+ the FPA registers historically were placed between the PC
+ and the CPSR in the "g" packet. -->
+ <reg name="cpsr" bitsize="32" regnum="25"/>
+</feature>
Added: trunk/gdb-xml/arm-neon.xml
===================================================================
--- trunk/gdb-xml/arm-neon.xml (rev 0)
+++ trunk/gdb-xml/arm-neon.xml 2008-10-11 17:55:29 UTC (rev 5459)
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2008 Free Software Foundation, Inc.
+
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved. -->
+<!DOCTYPE feature SYSTEM "gdb-target.dtd">
+<feature name="org.gnu.gdb.arm.neon">
+ <vector id="neon_uint8x8" type="uint8" count="8"/>
+ <vector id="neon_uint16x4" type="uint16" count="4"/>
+ <vector id="neon_uint32x2" type="uint32" count="2"/>
+ <vector id="neon_float32x2" type="ieee_single" count="2"/>
+ <union id="neon_d">
+ <field name="u8" type="neon_uint8x8"/>
+ <field name="u16" type="neon_uint16x4"/>
+ <field name="u32" type="neon_uint32x2"/>
+ <field name="u64" type="uint64"/>
+ <field name="f32" type="neon_float32x2"/>
+ <field name="f64" type="ieee_double"/>
+ </union>
+ <vector id="neon_uint8x16" type="uint8" count="16"/>
+ <vector id="neon_uint16x8" type="uint16" count="8"/>
+ <vector id="neon_uint32x4" type="uint32" count="4"/>
+ <vector id="neon_uint64x2" type="uint64" count="2"/>
+ <vector id="neon_float32x4" type="ieee_single" count="4"/>
+ <vector id="neon_float64x2" type="ieee_double" count="2"/>
+ <union id="neon_q">
+ <field name="u8" type="neon_uint8x16"/>
+ <field name="u16" type="neon_uint16x8"/>
+ <field name="u32" type="neon_uint32x4"/>
+ <field name="u64" type="neon_uint64x2"/>
+ <field name="f32" type="neon_float32x4"/>
+ <field name="f64" type="neon_float64x2"/>
+ </union>
+ <reg name="d0" bitsize="64" type="neon_d"/>
+ <reg name="d1" bitsize="64" type="neon_d"/>
+ <reg name="d2" bitsize="64" type="neon_d"/>
+ <reg name="d3" bitsize="64" type="neon_d"/>
+ <reg name="d4" bitsize="64" type="neon_d"/>
+ <reg name="d5" bitsize="64" type="neon_d"/>
+ <reg name="d6" bitsize="64" type="neon_d"/>
+ <reg name="d7" bitsize="64" type="neon_d"/>
+ <reg name="d8" bitsize="64" type="neon_d"/>
+ <reg name="d9" bitsize="64" type="neon_d"/>
+ <reg name="d10" bitsize="64" type="neon_d"/>
+ <reg name="d11" bitsize="64" type="neon_d"/>
+ <reg name="d12" bitsize="64" type="neon_d"/>
+ <reg name="d13" bitsize="64" type="neon_d"/>
+ <reg name="d14" bitsize="64" type="neon_d"/>
+ <reg name="d15" bitsize="64" type="neon_d"/>
+ <reg name="d16" bitsize="64" type="neon_d"/>
+ <reg name="d17" bitsize="64" type="neon_d"/>
+ <reg name="d18" bitsize="64" type="neon_d"/>
+ <reg name="d19" bitsize="64" type="neon_d"/>
+ <reg name="d20" bitsize="64" type="neon_d"/>
+ <reg name="d21" bitsize="64" type="neon_d"/>
+ <reg name="d22" bitsize="64" type="neon_d"/>
+ <reg name="d23" bitsize="64" type="neon_d"/>
+ <reg name="d24" bitsize="64" type="neon_d"/>
+ <reg name="d25" bitsize="64" type="neon_d"/>
+ <reg name="d26" bitsize="64" type="neon_d"/>
+ <reg name="d27" bitsize="64" type="neon_d"/>
+ <reg name="d28" bitsize="64" type="neon_d"/>
+ <reg name="d29" bitsize="64" type="neon_d"/>
+ <reg name="d30" bitsize="64" type="neon_d"/>
+ <reg name="d31" bitsize="64" type="neon_d"/>
+
+ <reg name="q0" bitsize="128" type="neon_q"/>
+ <reg name="q1" bitsize="128" type="neon_q"/>
+ <reg name="q2" bitsize="128" type="neon_q"/>
+ <reg name="q3" bitsize="128" type="neon_q"/>
+ <reg name="q4" bitsize="128" type="neon_q"/>
+ <reg name="q5" bitsize="128" type="neon_q"/>
+ <reg name="q6" bitsize="128" type="neon_q"/>
+ <reg name="q7" bitsize="128" type="neon_q"/>
+ <reg name="q8" bitsize="128" type="neon_q"/>
+ <reg name="q9" bitsize="128" type="neon_q"/>
+ <reg name="q10" bitsize="128" type="neon_q"/>
+ <reg name="q10" bitsize="128" type="neon_q"/>
+ <reg name="q12" bitsize="128" type="neon_q"/>
+ <reg name="q13" bitsize="128" type="neon_q"/>
+ <reg name="q14" bitsize="128" type="neon_q"/>
+ <reg name="q15" bitsize="128" type="neon_q"/>
+
+ <reg name="fpsid" bitsize="32" type="int" group="float"/>
+ <reg name="fpscr" bitsize="32" type="int" group="float"/>
+ <reg name="fpexc" bitsize="32" type="int" group="float"/>
+</feature>
Added: trunk/gdb-xml/arm-vfp.xml
===================================================================
--- trunk/gdb-xml/arm-vfp.xml (rev 0)
+++ trunk/gdb-xml/arm-vfp.xml 2008-10-11 17:55:29 UTC (rev 5459)
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2008 Free Software Foundation, Inc.
+
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved. -->
+<!DOCTYPE feature SYSTEM "gdb-target.dtd">
+<feature name="org.gnu.gdb.arm.vfp">
+ <reg name="d0" bitsize="64" type="float"/>
+ <reg name="d1" bitsize="64" type="float"/>
+ <reg name="d2" bitsize="64" type="float"/>
+ <reg name="d3" bitsize="64" type="float"/>
+ <reg name="d4" bitsize="64" type="float"/>
+ <reg name="d5" bitsize="64" type="float"/>
+ <reg name="d6" bitsize="64" type="float"/>
+ <reg name="d7" bitsize="64" type="float"/>
+ <reg name="d8" bitsize="64" type="float"/>
+ <reg name="d9" bitsize="64" type="float"/>
+ <reg name="d10" bitsize="64" type="float"/>
+ <reg name="d11" bitsize="64" type="float"/>
+ <reg name="d12" bitsize="64" type="float"/>
+ <reg name="d13" bitsize="64" type="float"/>
+ <reg name="d14" bitsize="64" type="float"/>
+ <reg name="d15" bitsize="64" type="float"/>
+
+ <reg name="fpsid" bitsize="32" type="int" group="float"/>
+ <reg name="fpscr" bitsize="32" type="int" group="float"/>
+ <reg name="fpexc" bitsize="32" type="int" group="float"/>
+</feature>
Added: trunk/gdb-xml/arm-vfp3.xml
===================================================================
--- trunk/gdb-xml/arm-vfp3.xml (rev 0)
+++ trunk/gdb-xml/arm-vfp3.xml 2008-10-11 17:55:29 UTC (rev 5459)
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2008 Free Software Foundation, Inc.
+
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved. -->
+<!DOCTYPE feature SYSTEM "gdb-target.dtd">
+<feature name="org.gnu.gdb.arm.vfpv3">
+ <reg name="d0" bitsize="64" type="float"/>
+ <reg name="d1" bitsize="64" type="float"/>
+ <reg name="d2" bitsize="64" type="float"/>
+ <reg name="d3" bitsize="64" type="float"/>
+ <reg name="d4" bitsize="64" type="float"/>
+ <reg name="d5" bitsize="64" type="float"/>
+ <reg name="d6" bitsize="64" type="float"/>
+ <reg name="d7" bitsize="64" type="float"/>
+ <reg name="d8" bitsize="64" type="float"/>
+ <reg name="d9" bitsize="64" type="float"/>
+ <reg name="d10" bitsize="64" type="float"/>
+ <reg name="d11" bitsize="64" type="float"/>
+ <reg name="d12" bitsize="64" type="float"/>
+ <reg name="d13" bitsize="64" type="float"/>
+ <reg name="d14" bitsize="64" type="float"/>
+ <reg name="d15" bitsize="64" type="float"/>
+ <reg name="d16" bitsize="64" type="float"/>
+ <reg name="d17" bitsize="64" type="float"/>
+ <reg name="d18" bitsize="64" type="float"/>
+ <reg name="d19" bitsize="64" type="float"/>
+ <reg name="d20" bitsize="64" type="float"/>
+ <reg name="d21" bitsize="64" type="float"/>
+ <reg name="d22" bitsize="64" type="float"/>
+ <reg name="d23" bitsize="64" type="float"/>
+ <reg name="d24" bitsize="64" type="float"/>
+ <reg name="d25" bitsize="64" type="float"/>
+ <reg name="d26" bitsize="64" type="float"/>
+ <reg name="d27" bitsize="64" type="float"/>
+ <reg name="d28" bitsize="64" type="float"/>
+ <reg name="d29" bitsize="64" type="float"/>
+ <reg name="d30" bitsize="64" type="float"/>
+ <reg name="d31" bitsize="64" type="float"/>
+
+ <reg name="fpsid" bitsize="32" type="int" group="float"/>
+ <reg name="fpscr" bitsize="32" type="int" group="float"/>
+ <reg name="fpexc" bitsize="32" type="int" group="float"/>
+</feature>
Added: trunk/gdb-xml/cf-core.xml
===================================================================
--- trunk/gdb-xml/cf-core.xml (rev 0)
+++ trunk/gdb-xml/cf-core.xml 2008-10-11 17:55:29 UTC (rev 5459)
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2008 Free Software Foundation, Inc.
+
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved. -->
+<!DOCTYPE feature SYSTEM "gdb-target.dtd">
+<feature name="org.gnu.gdb.coldfire.core">
+ <reg name="d0" bitsize="32"/>
+ <reg name="d1" bitsize="32"/>
+ <reg name="d2" bitsize="32"/>
+ <reg name="d3" bitsize="32"/>
+ <reg name="d4" bitsize="32"/>
+ <reg name="d5" bitsize="32"/>
+ <reg name="d6" bitsize="32"/>
+ <reg name="d7" bitsize="32"/>
+ <reg name="a0" bitsize="32" type="data_ptr"/>
+ <reg name="a1" bitsize="32" type="data_ptr"/>
+ <reg name="a2" bitsize="32" type="data_ptr"/>
+ <reg name="a3" bitsize="32" type="data_ptr"/>
+ <reg name="a4" bitsize="32" type="data_ptr"/>
+ <reg name="a5" bitsize="32" type="data_ptr"/>
+ <reg name="fp" bitsize="32" type="data_ptr"/>
+ <reg name="sp" bitsize="32" type="data_ptr"/>
+
+ <reg name="ps" bitsize="32"/>
+ <reg name="pc" bitsize="32" type="code_ptr"/>
+
+</feature>
Added: trunk/gdb-xml/cf-fp.xml
===================================================================
--- trunk/gdb-xml/cf-fp.xml (rev 0)
+++ trunk/gdb-xml/cf-fp.xml 2008-10-11 17:55:29 UTC (rev 5459)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2008 Free Software Foundation, Inc.
+
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved. -->
+<!DOCTYPE feature SYSTEM "gdb-target.dtd">
+<feature name="org.gnu.gdb.coldfire.fp">
+ <reg name="fp0" bitsize="64" type="float" group="float"/>
+ <reg name="fp1" bitsize="64" type="float" group="float"/>
+ <reg name="fp2" bitsize="64" type="float" group="float"/>
+ <reg name="fp3" bitsize="64" type="float" group="float"/>
+ <reg name="fp4" bitsize="64" type="float" group="float"/>
+ <reg name="fp5" bitsize="64" type="float" group="float"/>
+ <reg name="fp6" bitsize="64" type="float" group="float"/>
+ <reg name="fp7" bitsize="64" type="float" group="float"/>
+
+
+ <reg name="fpcontrol" bitsize="32" group="float"/>
+ <reg name="fpstatus" bitsize="32" group="float"/>,
+ <reg name="fpiaddr" bitsize="32" type="code_ptr" group="float"/>
+</feature>
Modified: trunk/gdbstub.c
===================================================================
--- trunk/gdbstub.c 2008-10-11 17:37:25 UTC (rev 5458)
+++ trunk/gdbstub.c 2008-10-11 17:55:29 UTC (rev 5459)
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
+#include "qemu-common.h"
#ifdef CONFIG_USER_ONLY
#include <stdlib.h>
#include <stdio.h>
@@ -29,12 +30,13 @@
#include "qemu.h"
#else
-#include "qemu-common.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "gdbstub.h"
#endif
+#define MAX_PACKET_LENGTH 4096
+
#include "qemu_socket.h"
#ifdef _WIN32
/* XXX: these constants may be independent of the host ones even for Unix */
@@ -50,6 +52,15 @@
//#define DEBUG_GDB
+typedef struct GDBRegisterState {
+ int base_reg;
+ int num_regs;
+ gdb_reg_cb get_reg;
+ gdb_reg_cb set_reg;
+ const char *xml;
+ struct GDBRegisterState *next;
+} GDBRegisterState;
+
enum RSState {
RS_IDLE,
RS_GETLINE,
@@ -60,10 +71,10 @@
typedef struct GDBState {
CPUState *env; /* current CPU */
enum RSState state; /* parsing state */
- char line_buf[4096];
+ char line_buf[MAX_PACKET_LENGTH];
int line_buf_index;
int line_csum;
- uint8_t last_packet[4100];
+ uint8_t last_packet[MAX_PACKET_LENGTH + 4];
int last_packet_len;
int signal;
#ifdef CONFIG_USER_ONLY
@@ -79,6 +90,11 @@
*/
static int sstep_flags = SSTEP_ENABLE|SSTEP_NOIRQ|SSTEP_NOTIMER;
+/* This is an ugly hack to cope with both new and old gdb.
+ If gdb sends qXfer:features:read then assume we're talking to a newish
+ gdb that understands target descriptions. */
+static int gdb_has_xml;
+
#ifdef CONFIG_USER_ONLY
/* XXX: This is not thread safe. Do we care? */
static int gdbserver_fd = -1;
@@ -205,19 +221,14 @@
}
/* return -1 if error, 0 if OK */
-static int put_packet(GDBState *s, const char *buf)
+static int put_packet_binary(GDBState *s, const char *buf, int len)
{
- int len, csum, i;
+ int csum, i;
uint8_t *p;
-#ifdef DEBUG_GDB
- printf("reply='%s'\n", buf);
-#endif
-
for(;;) {
p = s->last_packet;
*(p++) = '$';
- len = strlen(buf);
memcpy(p, buf, len);
p += len;
csum = 0;
@@ -244,522 +255,539 @@
return 0;
}
+/* return -1 if error, 0 if OK */
+static int put_packet(GDBState *s, const char *buf)
+{
+#ifdef DEBUG_GDB
+ printf("reply='%s'\n", buf);
+#endif
+
+ return put_packet_binary(s, buf, strlen(buf));
+}
+
+/* The GDB remote protocol transfers values in target byte order. This means
+ we can use the raw memory access routines to access the value buffer.
+ Conveniently, these also handle the case where the buffer is mis-aligned.
+ */
+#define GET_REG8(val) do { \
+ stb_p(mem_buf, val); \
+ return 1; \
+ } while(0)
+#define GET_REG16(val) do { \
+ stw_p(mem_buf, val); \
+ return 2; \
+ } while(0)
+#define GET_REG32(val) do { \
+ stl_p(mem_buf, val); \
+ return 4; \
+ } while(0)
+#define GET_REG64(val) do { \
+ stq_p(mem_buf, val); \
+ return 8; \
+ } while(0)
+
+#if TARGET_LONG_BITS == 64
+#define GET_REGL(val) GET_REG64(val)
+#define ldtul_p(addr) ldq_p(addr)
+#else
+#define GET_REGL(val) GET_REG32(val)
+#define ldtul_p(addr) ldl_p(addr)
+#endif
+
#if defined(TARGET_I386)
#ifdef TARGET_X86_64
-static const uint8_t gdb_x86_64_regs[16] = {
+static const int gpr_map[16] = {
R_EAX, R_EBX, R_ECX, R_EDX, R_ESI, R_EDI, R_EBP, R_ESP,
- 8, 9, 10, 11, 12, 13, 14, 15,
+ 8, 9, 10, 11, 12, 13, 14, 15
};
+#else
+static const int gpr_map[8] = {0, 1, 2, 3, 4, 5, 6, 7};
#endif
-static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
+#define NUM_CORE_REGS (CPU_NB_REGS * 2 + 25)
+
+static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n)
{
- int i, fpus, nb_regs;
- uint8_t *p;
-
- p = mem_buf;
-#ifdef TARGET_X86_64
- if (env->hflags & HF_CS64_MASK) {
- nb_regs = 16;
- for(i = 0; i < 16; i++) {
- *(uint64_t *)p = tswap64(env->regs[gdb_x86_64_regs[i]]);
- p += 8;
- }
- *(uint64_t *)p = tswap64(env->eip);
- p += 8;
- } else
-#endif
- {
- nb_regs = 8;
- for(i = 0; i < 8; i++) {
- *(uint32_t *)p = tswap32(env->regs[i]);
- p += 4;
- }
- *(uint32_t *)p = tswap32(env->eip);
- p += 4;
- }
-
- *(uint32_t *)p = tswap32(env->eflags);
- p += 4;
- *(uint32_t *)p = tswap32(env->segs[R_CS].selector);
- p += 4;
- *(uint32_t *)p = tswap32(env->segs[R_SS].selector);
- p += 4;
- *(uint32_t *)p = tswap32(env->segs[R_DS].selector);
- p += 4;
- *(uint32_t *)p = tswap32(env->segs[R_ES].selector);
- p += 4;
- *(uint32_t *)p = tswap32(env->segs[R_FS].selector);
- p += 4;
- *(uint32_t *)p = tswap32(env->segs[R_GS].selector);
- p += 4;
- for(i = 0; i < 8; i++) {
- /* XXX: convert floats */
+ if (n < CPU_NB_REGS) {
+ GET_REGL(env->regs[gpr_map[n]]);
+ } else if (n >= CPU_NB_REGS + 8 && n < CPU_NB_REGS + 16) {
+ /* FIXME: byteswap float values. */
#ifdef USE_X86LDOUBLE
- memcpy(p, &env->fpregs[i], 10);
+ memcpy(mem_buf, &env->fpregs[n - (CPU_NB_REGS + 8)], 10);
#else
- memset(p, 0, 10);
+ memset(mem_buf, 0, 10);
#endif
- p += 10;
+ return 10;
+ } else if (n >= CPU_NB_REGS + 24) {
+ n -= CPU_NB_REGS + 24;
+ if (n < CPU_NB_REGS) {
+ stq_p(mem_buf, env->xmm_regs[n].XMM_Q(0));
+ stq_p(mem_buf + 8, env->xmm_regs[n].XMM_Q(1));
+ return 16;
+ } else if (n == CPU_NB_REGS) {
+ GET_REG32(env->mxcsr);
+ }
+ } else {
+ n -= CPU_NB_REGS;
+ switch (n) {
+ case 0: GET_REGL(env->eip);
+ case 1: GET_REG32(env->eflags);
+ case 2: GET_REG32(env->segs[R_CS].selector);
+ case 3: GET_REG32(env->segs[R_SS].selector);
+ case 4: GET_REG32(env->segs[R_DS].selector);
+ case 5: GET_REG32(env->segs[R_ES].selector);
+ case 6: GET_REG32(env->segs[R_FS].selector);
+ case 7: GET_REG32(env->segs[R_GS].selector);
+ /* 8...15 x87 regs. */
+ case 16: GET_REG32(env->fpuc);
+ case 17: GET_REG32((env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11);
+ case 18: GET_REG32(0); /* ftag */
+ case 19: GET_REG32(0); /* fiseg */
+ case 20: GET_REG32(0); /* fioff */
+ case 21: GET_REG32(0); /* foseg */
+ case 22: GET_REG32(0); /* fooff */
+ case 23: GET_REG32(0); /* fop */
+ /* 24+ xmm regs. */
+ }
}
- *(uint32_t *)p = tswap32(env->fpuc); /* fctrl */
- p += 4;
- fpus = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11;
- *(uint32_t *)p = tswap32(fpus); /* fstat */
- p += 4;
- *(uint32_t *)p = 0; /* ftag */
- p += 4;
- *(uint32_t *)p = 0; /* fiseg */
- p += 4;
- *(uint32_t *)p = 0; /* fioff */
- p += 4;
- *(uint32_t *)p = 0; /* foseg */
- p += 4;
- *(uint32_t *)p = 0; /* fooff */
- p += 4;
- *(uint32_t *)p = 0; /* fop */
- p += 4;
- for(i = 0; i < nb_regs; i++) {
- *(uint64_t *)p = tswap64(env->xmm_regs[i].XMM_Q(0));
- p += 8;
- *(uint64_t *)p = tswap64(env->xmm_regs[i].XMM_Q(1));
- p += 8;
- }
- *(uint32_t *)p = tswap32(env->mxcsr);
- p += 4;
- return p - mem_buf;
+ return 0;
}
-static inline void cpu_gdb_load_seg(CPUState *env, const uint8_t **pp,
- int sreg)
+static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int i)
{
- const uint8_t *p;
- uint32_t sel;
- p = *pp;
- sel = tswap32(*(uint32_t *)p);
- p += 4;
- if (sel != env->segs[sreg].selector) {
-#if defined(CONFIG_USER_ONLY)
- cpu_x86_load_seg(env, sreg, sel);
-#else
- /* XXX: do it with a debug function which does not raise an
- exception */
-#endif
- }
- *pp = p;
-}
+ uint32_t tmp;
-static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
-{
- const uint8_t *p = mem_buf;
- int i, nb_regs;
- uint16_t fpus;
-
-#ifdef TARGET_X86_64
- if (env->hflags & HF_CS64_MASK) {
- nb_regs = 16;
- for(i = 0; i < 16; i++) {
- env->regs[gdb_x86_64_regs[i]] = tswap64(*(uint64_t *)p);
- p += 8;
- }
- env->eip = tswap64(*(uint64_t *)p);
- p += 8;
- } else
+ if (i < CPU_NB_REGS) {
+ env->regs[gpr_map[i]] = ldtul_p(mem_buf);
+ return sizeof(target_ulong);
+ } else if (i >= CPU_NB_REGS + 8 && i < CPU_NB_REGS + 16) {
+ i -= CPU_NB_REGS + 8;
+#ifdef USE_X86LDOUBLE
+ memcpy(&env->fpregs[i], mem_buf, 10);
#endif
- {
- nb_regs = 8;
- for(i = 0; i < 8; i++) {
- env->regs[i] = tswap32(*(uint32_t *)p);
- p += 4;
+ return 10;
+ } else if (i >= CPU_NB_REGS + 24) {
+ i -= CPU_NB_REGS + 24;
+ if (i < CPU_NB_REGS) {
+ env->xmm_regs[i].XMM_Q(0) = ldq_p(mem_buf);
+ env->xmm_regs[i].XMM_Q(1) = ldq_p(mem_buf + 8);
+ return 16;
+ } else if (i == CPU_NB_REGS) {
+ env->mxcsr = ldl_p(mem_buf);
+ return 4;
}
- env->eip = tswap32(*(uint32_t *)p);
- p += 4;
- }
- env->eflags = tswap32(*(uint32_t *)p);
- p += 4;
- cpu_gdb_load_seg(env, &p, R_CS);
- cpu_gdb_load_seg(env, &p, R_SS);
- cpu_gdb_load_seg(env, &p, R_DS);
- cpu_gdb_load_seg(env, &p, R_ES);
- cpu_gdb_load_seg(env, &p, R_FS);
- cpu_gdb_load_seg(env, &p, R_GS);
-
- /* FPU state */
- for(i = 0; i < 8; i++) {
- /* XXX: convert floats */
-#ifdef USE_X86LDOUBLE
- memcpy(&env->fpregs[i], p, 10);
+ } else {
+ i -= CPU_NB_REGS;
+ switch (i) {
+ case 0: env->eip = ldtul_p(mem_buf); return sizeof(target_ulong);
+ case 1: env->eflags = ldl_p(mem_buf); return 4;
+#if defined(CONFIG_USER_ONLY)
+#define LOAD_SEG(index, sreg)\
+ tmp = ldl_p(mem_buf);\
+ if (tmp != env->segs[sreg].selector)\
+ cpu_x86_load_seg(env, sreg, tmp);
+#else
+/* FIXME: Honor segment registers. Needs to avoid raising an exception
+ when the selector is invalid. */
+#define LOAD_SEG(index, sreg) do {} while(0)
#endif
- p += 10;
- }
- env->fpuc = tswap32(*(uint32_t *)p); /* fctrl */
- p += 4;
- fpus = tswap32(*(uint32_t *)p);
- p += 4;
- env->fpstt = (fpus >> 11) & 7;
- env->fpus = fpus & ~0x3800;
- p += 4 * 6;
-
- if (size >= ((p - mem_buf) + 16 * nb_regs + 4)) {
- /* SSE state */
- for(i = 0; i < nb_regs; i++) {
- env->xmm_regs[i].XMM_Q(0) = tswap64(*(uint64_t *)p);
- p += 8;
- env->xmm_regs[i].XMM_Q(1) = tswap64(*(uint64_t *)p);
- p += 8;
+ case 2: LOAD_SEG(10, R_CS); return 4;
+ case 3: LOAD_SEG(11, R_SS); return 4;
+ case 4: LOAD_SEG(12, R_DS); return 4;
+ case 5: LOAD_SEG(13, R_ES); return 4;
+ case 6: LOAD_SEG(14, R_FS); return 4;
+ case 7: LOAD_SEG(15, R_GS); return 4;
+ /* 8...15 x87 regs. */
+ case 16: env->fpuc = ldl_p(mem_buf); return 4;
+ case 17:
+ tmp = ldl_p(mem_buf);
+ env->fpstt = (tmp >> 11) & 7;
+ env->fpus = tmp & ~0x3800;
+ return 4;
+ case 18: /* ftag */ return 4;
+ case 19: /* fiseg */ return 4;
+ case 20: /* fioff */ return 4;
+ case 21: /* foseg */ return 4;
+ case 22: /* fooff */ return 4;
+ case 23: /* fop */ return 4;
+ /* 24+ xmm regs. */
}
- env->mxcsr = tswap32(*(uint32_t *)p);
- p += 4;
}
+ /* Unrecognised register. */
+ return 0;
}
#elif defined (TARGET_PPC)
-static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
+
+#define NUM_CORE_REGS 71
+
+static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n)
{
- uint32_t *registers = (uint32_t *)mem_buf, tmp;
- int i;
-
- /* fill in gprs */
- for(i = 0; i < 32; i++) {
- registers[i] = tswapl(env->gpr[i]);
+ if (n < 32) {
+ /* gprs */
+ GET_REGL(env->gpr[n]);
+ } else if (n < 64) {
+ /* fprs */
+ stfq_p(mem_buf, env->fpr[n]);
+ return 8;
+ } else {
+ switch (n) {
+ case 64: GET_REGL(env->nip);
+ case 65: GET_REGL(env->msr);
+ case 66:
+ {
+ uint32_t cr = 0;
+ int i;
+ for (i = 0; i < 8; i++)
+ cr |= env->crf[i] << (32 - ((i + 1) * 4));
+ GET_REG32(cr);
+ }
+ case 67: GET_REGL(env->lr);
+ case 68: GET_REGL(env->ctr);
+ case 69: GET_REG32(ppc_load_xer(env));
+ case 70: GET_REG32(0); /* fpscr */
+ }
}
- /* fill in fprs */
- for (i = 0; i < 32; i++) {
- registers[(i * 2) + 32] = tswapl(*((uint32_t *)&env->fpr[i]));
- registers[(i * 2) + 33] = tswapl(*((uint32_t *)&env->fpr[i] + 1));
- }
- /* nip, msr, ccr, lnk, ctr, xer, mq */
- registers[96] = tswapl(env->nip);
- registers[97] = tswapl(env->msr);
- tmp = 0;
- for (i = 0; i < 8; i++)
- tmp |= env->crf[i] << (32 - ((i + 1) * 4));
- registers[98] = tswapl(tmp);
- registers[99] = tswapl(env->lr);
- registers[100] = tswapl(env->ctr);
- registers[101] = tswapl(ppc_load_xer(env));
- registers[102] = 0;
-
- return 103 * 4;
+ return 0;
}
-static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
+static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n)
{
- uint32_t *registers = (uint32_t *)mem_buf;
- int i;
-
- /* fill in gprs */
- for (i = 0; i < 32; i++) {
- env->gpr[i] = tswapl(registers[i]);
+ if (n < 32) {
+ /* gprs */
+ env->gpr[n] = ldtul_p(mem_buf);
+ return sizeof(target_ulong);
+ } else if (n < 64) {
+ /* fprs */
+ env->fpr[n] = ldfq_p(mem_buf);
+ return 8;
+ } else {
+ switch (n) {
+ case 64:
+ env->nip = ldtul_p(mem_buf);
+ return sizeof(target_ulong);
+ case 65:
+ ppc_store_msr(env, ldtul_p(mem_buf));
+ return sizeof(target_ulong);
+ case 66:
+ {
+ uint32_t cr = ldl_p(mem_buf);
+ int i;
+ for (i = 0; i < 8; i++)
+ env->crf[i] = (cr >> (32 - ((i + 1) * 4))) & 0xF;
+ return 4;
+ }
+ case 67:
+ env->lr = ldtul_p(mem_buf);
+ return sizeof(target_ulong);
+ case 68:
+ env->ctr = ldtul_p(mem_buf);
+ return sizeof(target_ulong);
+ case 69:
+ ppc_store_xer(env, ldl_p(mem_buf));
+ return 4;
+ case 70:
+ /* fpscr */
+ return 4;
+ }
}
- /* fill in fprs */
- for (i = 0; i < 32; i++) {
- *((uint32_t *)&env->fpr[i]) = tswapl(registers[(i * 2) + 32]);
- *((uint32_t *)&env->fpr[i] + 1) = tswapl(registers[(i * 2) + 33]);
- }
- /* nip, msr, ccr, lnk, ctr, xer, mq */
- env->nip = tswapl(registers[96]);
- ppc_store_msr(env, tswapl(registers[97]));
- registers[98] = tswapl(registers[98]);
- for (i = 0; i < 8; i++)
- env->crf[i] = (registers[98] >> (32 - ((i + 1) * 4))) & 0xF;
- env->lr = tswapl(registers[99]);
- env->ctr = tswapl(registers[100]);
- ppc_store_xer(env, tswapl(registers[101]));
+ return 0;
}
+
#elif defined (TARGET_SPARC)
-#ifdef TARGET_ABI32
-#define tswap_abi(val) tswap32(val &0xffffffff)
+
+#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
+#define NUM_CORE_REGS 86
#else
-#define tswap_abi(val) tswapl(val)
+#define NUM_CORE_REGS 73
#endif
-static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
-{
+
#ifdef TARGET_ABI32
- abi_ulong *registers = (abi_ulong *)mem_buf;
+#define GET_REGA(val) GET_REG32(val)
#else
- target_ulong *registers = (target_ulong *)mem_buf;
+#define GET_REGA(val) GET_REGL(val)
#endif
- int i;
- /* fill in g0..g7 */
- for(i = 0; i < 8; i++) {
- registers[i] = tswap_abi(env->gregs[i]);
+static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n)
+{
+ if (n < 8) {
+ /* g0..g7 */
+ GET_REGA(env->gregs[n]);
}
- /* fill in register window */
- for(i = 0; i < 24; i++) {
- registers[i + 8] = tswap_abi(env->regwptr[i]);
+ if (n < 32) {
+ /* register window */
+ GET_REGA(env->regwptr[n - 8]);
}
-#if !defined(TARGET_SPARC64) || defined(TARGET_ABI32)
- /* fill in fprs */
- for (i = 0; i < 32; i++) {
- registers[i + 32] = tswap_abi(*((uint32_t *)&env->fpr[i]));
+#if defined(TARGET_ABI32) || !defined(TARGET_SPARC64)
+ if (n < 64) {
+ /* fprs */
+ GET_REG32(*((uint32_t *)&env->fpr[n - 32]));
}
/* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
- registers[64] = tswap_abi(env->y);
- {
- uint32_t tmp;
-
- tmp = GET_PSR(env);
- registers[65] = tswap32(tmp);
+ switch (n) {
+ case 64: GET_REGA(env->y);
+ case 65: GET_REGA(GET_PSR(env));
+ case 66: GET_REGA(env->wim);
+ case 67: GET_REGA(env->tbr);
+ case 68: GET_REGA(env->pc);
+ case 69: GET_REGA(env->npc);
+ case 70: GET_REGA(env->fsr);
+ case 71: GET_REGA(0); /* csr */
+ case 72: GET_REGA(0);
}
- registers[66] = tswap_abi(env->wim);
- registers[67] = tswap_abi(env->tbr);
- registers[68] = tswap_abi(env->pc);
- registers[69] = tswap_abi(env->npc);
- registers[70] = tswap_abi(env->fsr);
- registers[71] = 0; /* csr */
- registers[72] = 0;
- return 73 * sizeof(uint32_t);
#else
- /* fill in fprs */
- for (i = 0; i < 64; i += 2) {
- uint64_t tmp;
+ if (n < 64) {
+ /* f0-f31 */
+ GET_REG32(*((uint32_t *)&env->fpr[n - 32]));
+ }
+ if (n < 80) {
+ /* f32-f62 (double width, even numbers only) */
+ uint64_t val;
- tmp = ((uint64_t)*(uint32_t *)&env->fpr[i]) << 32;
- tmp |= *(uint32_t *)&env->fpr[i + 1];
- registers[i / 2 + 32] = tswap64(tmp);
+ val = (uint64_t)*((uint32_t *)&env->fpr[(n - 64) * 2 + 32]) << 32;
+ val |= *((uint32_t *)&env->fpr[(n - 64) * 2 + 33]);
+ GET_REG64(val);
}
- registers[64] = tswapl(env->pc);
- registers[65] = tswapl(env->npc);
- registers[66] = tswapl(((uint64_t)GET_CCR(env) << 32) |
+ switch (n) {
+ case 80: GET_REGL(env->pc);
+ case 81: GET_REGL(env->npc);
+ case 82: GET_REGL(((uint64_t)GET_CCR(env) << 32) |
((env->asi & 0xff) << 24) |
((env->pstate & 0xfff) << 8) |
GET_CWP64(env));
- registers[67] = tswapl(env->fsr);
- registers[68] = tswapl(env->fprs);
- registers[69] = tswapl(env->y);
- return 70 * sizeof(target_ulong);
+ case 83: GET_REGL(env->fsr);
+ case 84: GET_REGL(env->fprs);
+ case 85: GET_REGL(env->y);
+ }
#endif
+ return 0;
}
-static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
+static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n)
{
-#ifdef TARGET_ABI32
- abi_ulong *registers = (abi_ulong *)mem_buf;
+#if defined(TARGET_ABI32)
+ abi_ulong tmp;
+
+ tmp = ldl_p(mem_buf);
#else
- target_ulong *registers = (target_ulong *)mem_buf;
+ target_ulong tmp;
+
+ tmp = ldtul_p(mem_buf);
#endif
- int i;
- /* fill in g0..g7 */
- for(i = 0; i < 7; i++) {
- env->gregs[i] = tswap_abi(registers[i]);
+ if (n < 8) {
+ /* g0..g7 */
+ env->gregs[n] = tmp;
+ } else if (n < 32) {
+ /* register window */
+ env->regwptr[n - 8] = tmp;
}
- /* fill in register window */
- for(i = 0; i < 24; i++) {
- env->regwptr[i] = tswap_abi(registers[i + 8]);
+#if defined(TARGET_ABI32) || !defined(TARGET_SPARC64)
+ else if (n < 64) {
+ /* fprs */
+ *((uint32_t *)&env->fpr[n - 32]) = tmp;
+ } else {
+ /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
+ switch (n) {
+ case 64: env->y = tmp; break;
+ case 65: PUT_PSR(env, tmp); break;
+ case 66: env->wim = tmp; break;
+ case 67: env->tbr = tmp; break;
+ case 68: env->pc = tmp; break;
+ case 69: env->npc = tmp; break;
+ case 70: env->fsr = tmp; break;
+ default: return 0;
+ }
}
-#if !defined(TARGET_SPARC64) || defined(TARGET_ABI32)
- /* fill in fprs */
- for (i = 0; i < 32; i++) {
- *((uint32_t *)&env->fpr[i]) = tswap_abi(registers[i + 32]);
- }
- /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
- env->y = tswap_abi(registers[64]);
- PUT_PSR(env, tswap_abi(registers[65]));
- env->wim = tswap_abi(registers[66]);
- env->tbr = tswap_abi(registers[67]);
- env->pc = tswap_abi(registers[68]);
- env->npc = tswap_abi(registers[69]);
- env->fsr = tswap_abi(registers[70]);
+ return 4;
#else
- for (i = 0; i < 64; i += 2) {
- uint64_t tmp;
+ else if (n < 64) {
+ /* f0-f31 */
+ uint32_t fpr;
- tmp = tswap64(registers[i / 2 + 32]);
- *((uint32_t *)&env->fpr[i]) = tmp >> 32;
- *((uint32_t *)&env->fpr[i + 1]) = tmp & 0xffffffff;
+ env->fpr[n] = ldfl_p(mem_buf);
+ return 4;
+ } else if (n < 80) {
+ /* f32-f62 (double width, even numbers only) */
+ *((uint32_t *)&env->fpr[(n - 64) * 2 + 32]) = tmp >> 32;
+ *((uint32_t *)&env->fpr[(n - 64) * 2 + 33]) = tmp;
+ } else {
+ switch (n) {
+ case 80: env->pc = tmp; break;
+ case 81: env->npc = tmp; break;
+ case 82:
+ PUT_CCR(env, tmp >> 32);
+ env->asi = (tmp >> 24) & 0xff;
+ env->pstate = (tmp >> 8) & 0xfff;
+ PUT_CWP64(env, tmp & 0xff);
+ break;
+ case 83: env->fsr = tmp; break;
+ case 84: env->fprs = tmp; break;
+ case 85: env->y = tmp; break;
+ default: return 0;
+ }
}
- env->pc = tswapl(registers[64]);
- env->npc = tswapl(registers[65]);
- {
- uint64_t tmp = tswapl(registers[66]);
-
- PUT_CCR(env, tmp >> 32);
- env->asi = (tmp >> 24) & 0xff;
- env->pstate = (tmp >> 8) & 0xfff;
- PUT_CWP64(env, tmp & 0xff);
- }
- env->fsr = tswapl(registers[67]);
- env->fprs = tswapl(registers[68]);
- env->y = tswapl(registers[69]);
+ return 8;
#endif
}
-#undef tswap_abi
#elif defined (TARGET_ARM)
-static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
-{
- int i;
- uint8_t *ptr;
- ptr = mem_buf;
- /* 16 core integer registers (4 bytes each). */
- for (i = 0; i < 16; i++)
- {
- *(uint32_t *)ptr = tswapl(env->regs[i]);
- ptr += 4;
- }
- /* 8 FPA registers (12 bytes each), FPS (4 bytes).
- Not yet implemented. */
- memset (ptr, 0, 8 * 12 + 4);
- ptr += 8 * 12 + 4;
- /* CPSR (4 bytes). */
- *(uint32_t *)ptr = tswapl (cpsr_read(env));
- ptr += 4;
+/* Old gdb always expect FPA registers. Newer (xml-aware) gdb only expect
+ whatever the target description contains. Due to a historical mishap
+ the FPA registers appear in between core integer regs and the CPSR.
+ We hack round this by giving the FPA regs zero size when talking to a
+ newer gdb. */
+#define NUM_CORE_REGS 26
+#define GDB_CORE_XML "arm-core.xml"
- return ptr - mem_buf;
-}
-
-static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
+static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n)
{
- int i;
- uint8_t *ptr;
-
- ptr = mem_buf;
- /* Core integer registers. */
- for (i = 0; i < 16; i++)
- {
- env->regs[i] = tswapl(*(uint32_t *)ptr);
- ptr += 4;
- }
- /* Ignore FPA regs and scr. */
- ptr += 8 * 12 + 4;
- cpsr_write (env, tswapl(*(uint32_t *)ptr), 0xffffffff);
-}
-#elif defined (TARGET_M68K)
-static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
-{
- int i;
- uint8_t *ptr;
- CPU_DoubleU u;
-
- ptr = mem_buf;
- /* D0-D7 */
- for (i = 0; i < 8; i++) {
- *(uint32_t *)ptr = tswapl(env->dregs[i]);
- ptr += 4;
+ if (n < 16) {
+ /* Core integer register. */
+ GET_REG32(env->regs[n]);
}
- /* A0-A7 */
- for (i = 0; i < 8; i++) {
- *(uint32_t *)ptr = tswapl(env->aregs[i]);
- ptr += 4;
+ if (n < 24) {
+ /* FPA registers. */
+ if (gdb_has_xml)
+ return 0;
+ memset(mem_buf, 0, 12);
+ return 12;
}
- *(uint32_t *)ptr = tswapl(env->sr);
- ptr += 4;
- *(uint32_t *)ptr = tswapl(env->pc);
- ptr += 4;
- /* F0-F7. The 68881/68040 have 12-bit extended precision registers.
- ColdFire has 8-bit double precision registers. */
- for (i = 0; i < 8; i++) {
- u.d = env->fregs[i];
- *(uint32_t *)ptr = tswap32(u.l.upper);
- *(uint32_t *)ptr = tswap32(u.l.lower);
+ switch (n) {
+ case 24:
+ /* FPA status register. */
+ if (gdb_has_xml)
+ return 0;
+ GET_REG32(0);
+ case 25:
+ /* CPSR */
+ GET_REG32(cpsr_read(env));
}
- /* FP control regs (not implemented). */
- memset (ptr, 0, 3 * 4);
- ptr += 3 * 4;
-
- return ptr - mem_buf;
+ /* Unknown register. */
+ return 0;
}
-static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
+static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n)
{
- int i;
- uint8_t *ptr;
- CPU_DoubleU u;
+ uint32_t tmp;
- ptr = mem_buf;
- /* D0-D7 */
- for (i = 0; i < 8; i++) {
- env->dregs[i] = tswapl(*(uint32_t *)ptr);
- ptr += 4;
+ tmp = ldl_p(mem_buf);
+
+ /* Mask out low bit of PC to workaround gdb bugs. This will probably
+ cause problems if we ever implement the Jazelle DBX extensions. */
+ if (n == 15)
+ tmp &= ~1;
+
+ if (n < 16) {
+ /* Core integer register. */
+ env->regs[n] = tmp;
+ return 4;
}
- /* A0-A7 */
- for (i = 0; i < 8; i++) {
- env->aregs[i] = tswapl(*(uint32_t *)ptr);
- ptr += 4;
+ if (n < 24) { /* 16-23 */
+ /* FPA registers (ignored). */
+ if (gdb_has_xml)
+ return 0;
+ return 12;
}
- env->sr = tswapl(*(uint32_t *)ptr);
- ptr += 4;
- env->pc = tswapl(*(uint32_t *)ptr);
- ptr += 4;
- /* F0-F7. The 68881/68040 have 12-bit extended precision registers.
- ColdFire has 8-bit double precision registers. */
- for (i = 0; i < 8; i++) {
- u.l.upper = tswap32(*(uint32_t *)ptr);
- u.l.lower = tswap32(*(uint32_t *)ptr);
- env->fregs[i] = u.d;
+ switch (n) {
+ case 24:
+ /* FPA status register (ignored). */
+ if (gdb_has_xml)
+ return 0;
+ return 4;
+ case 25:
+ /* CPSR */
+ cpsr_write (env, tmp, 0xffffffff);
+ return 4;
}
- /* FP control regs (not implemented). */
- ptr += 3 * 4;
+ /* Unknown register. */
+ return 0;
}
-#elif defined (TARGET_MIPS)
-static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
-{
- int i;
- uint8_t *ptr;
- ptr = mem_buf;
- for (i = 0; i < 32; i++)
- {
- *(target_ulong *)ptr = tswapl(env->active_tc.gpr[i]);
- ptr += sizeof(target_ulong);
- }
+#elif defined (TARGET_M68K)
- *(target_ulong *)ptr = (int32_t)tswap32(env->CP0_Status);
- ptr += sizeof(target_ulong);
+#define NUM_CORE_REGS 18
- *(target_ulong *)ptr = tswapl(env->active_tc.LO[0]);
- ptr += sizeof(target_ulong);
+#define GDB_CORE_XML "cf-core.xml"
- *(target_ulong *)ptr = tswapl(env->active_tc.HI[0]);
- ptr += sizeof(target_ulong);
+static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n)
+{
+ if (n < 8) {
+ /* D0-D7 */
+ GET_REG32(env->dregs[n]);
+ } else if (n < 16) {
+ /* A0-A7 */
+ GET_REG32(env->aregs[n - 8]);
+ } else {
+ switch (n) {
+ case 16: GET_REG32(env->sr);
+ case 17: GET_REG32(env->pc);
+ }
+ }
+ /* FP registers not included here because they vary between
+ ColdFire and m68k. Use XML bits for these. */
+ return 0;
+}
- *(target_ulong *)ptr = tswapl(env->CP0_BadVAddr);
- ptr += sizeof(target_ulong);
+static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n)
+{
+ uint32_t tmp;
- *(target_ulong *)ptr = (int32_t)tswap32(env->CP0_Cause);
- ptr += sizeof(target_ulong);
+ tmp = ldl_p(mem_buf);
- *(target_ulong *)ptr = tswapl(env->active_tc.PC);
- ptr += sizeof(target_ulong);
+ if (n < 8) {
+ /* D0-D7 */
+ env->dregs[n] = tmp;
+ } else if (n < 8) {
+ /* A0-A7 */
+ env->aregs[n - 8] = tmp;
+ } else {
+ switch (n) {
+ case 16: env->sr = tmp; break;
+ case 17: env->pc = tmp; break;
+ default: return 0;
+ }
+ }
+ return 4;
+}
+#elif defined (TARGET_MIPS)
- if (env->CP0_Config1 & (1 << CP0C1_FP))
- {
- for (i = 0; i < 32; i++)
- {
+#define NUM_CORE_REGS 73
+
+static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n)
+{
+ if (n < 32) {
+ GET_REGL(env->active_tc.gpr[n]);
+ }
+ if (env->CP0_Config1 & (1 << CP0C1_FP)) {
+ if (n >= 38 && n < 70) {
if (env->CP0_Status & (1 << CP0St_FR))
- *(target_ulong *)ptr = tswapl(env->active_fpu.fpr[i].d);
+ GET_REGL(env->active_fpu.fpr[n - 38].d);
else
- *(target_ulong *)ptr = tswap32(env->active_fpu.fpr[i].w[FP_ENDIAN_IDX]);
- ptr += sizeof(target_ulong);
- }
+ GET_REGL(env->active_fpu.fpr[n - 38].w[FP_ENDIAN_IDX]);
+ }
+ switch (n) {
+ case 70: GET_REGL((int32_t)env->active_fpu.fcr31);
+ case 71: GET_REGL((int32_t)env->active_fpu.fcr0);
+ }
+ }
+ switch (n) {
+ case 32: GET_REGL((int32_t)env->CP0_Status);
+ case 33: GET_REGL(env->active_tc.LO[0]);
+ case 34: GET_REGL(env->active_tc.HI[0]);
+ case 35: GET_REGL(env->CP0_BadVAddr);
+ case 36: GET_REGL((int32_t)env->CP0_Cause);
+ case 37: GET_REGL(env->active_tc.PC);
+ case 72: GET_REGL(0); /* fp */
+ case 89: GET_REGL((int32_t)env->CP0_PRid);
+ }
+ if (n >= 73 && n <= 88) {
+ /* 16 embedded regs. */
+ GET_REGL(0);
+ }
- *(target_ulong *)ptr = (int32_t)tswap32(env->active_fpu.fcr31);
- ptr += sizeof(target_ulong);
-
- *(target_ulong *)ptr = (int32_t)tswap32(env->active_fpu.fcr0);
- ptr += sizeof(target_ulong);
- }
-
- /* "fp", pseudo frame pointer. Not yet implemented in gdb. */
- *(target_ulong *)ptr = 0;
- ptr += sizeof(target_ulong);
-
- /* Registers for embedded use, we just pad them. */
- for (i = 0; i < 16; i++)
- {
- *(target_ulong *)ptr = 0;
- ptr += sizeof(target_ulong);
- }
-
- /* Processor ID. */
- *(target_ulong *)ptr = (int32_t)tswap32(env->CP0_PRid);
- ptr += sizeof(target_ulong);
-
- return ptr - mem_buf;
+ return 0;
}
/* convert MIPS rounding mode in FCR31 to IEEE library */
@@ -773,202 +801,355 @@
#define RESTORE_ROUNDING_MODE \
set_float_rounding_mode(ieee_rm[env->active_fpu.fcr31 & 3], &env->active_fpu.fp_status)
-static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
+static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n)
{
- int i;
- uint8_t *ptr;
+ target_ulong tmp;
- ptr = mem_buf;
- for (i = 0; i < 32; i++)
- {
- env->active_tc.gpr[i] = tswapl(*(target_ulong *)ptr);
- ptr += sizeof(target_ulong);
- }
+ tmp = ldtul_p(mem_buf);
- env->CP0_Status = tswapl(*(target_ulong *)ptr);
- ptr += sizeof(target_ulong);
+ if (n < 32) {
+ env->active_tc.gpr[n] = tmp;
+ return sizeof(target_ulong);
+ }
+ if (env->CP0_Config1 & (1 << CP0C1_FP)
+ && n >= 38 && n < 73) {
+ if (n < 70) {
+ if (env->CP0_Status & (1 << CP0St_FR))
+ env->active_fpu.fpr[n - 38].d = tmp;
+ else
+ env->active_fpu.fpr[n - 38].w[FP_ENDIAN_IDX] = tmp;
+ }
+ switch (n) {
+ case 70:
+ env->active_fpu.fcr31 = tmp & 0xFF83FFFF;
+ /* set rounding mode */
+ RESTORE_ROUNDING_MODE;
+#ifndef CONFIG_SOFTFLOAT
+ /* no floating point exception for native float */
+ SET_FP_ENABLE(env->active_fpu.fcr31, 0);
+#endif
+ break;
+ case 71: env->active_fpu.fcr0 = tmp; break;
+ }
+ return sizeof(target_ulong);
+ }
+ switch (n) {
+ case 32: env->CP0_Status = tmp; break;
+ case 33: env->active_tc.LO[0] = tmp; break;
+ case 34: env->active_tc.HI[0] = tmp; break;
+ case 35: env->CP0_BadVAddr = tmp; break;
+ case 36: env->CP0_Cause = tmp; break;
+ case 37: env->active_tc.PC = tmp; break;
+ case 72: /* fp, ignored */ break;
+ default:
+ if (n > 89)
+ return 0;
+ /* Other registers are readonly. Ignore writes. */
+ break;
+ }
- env->active_tc.LO[0] = tswapl(*(target_ulong *)ptr);
- ptr += sizeof(target_ulong);
+ return sizeof(target_ulong);
+}
+#elif defined (TARGET_SH4)
- env->active_tc.HI[0] = tswapl(*(target_ulong *)ptr);
- ptr += sizeof(target_ulong);
+/* Hint: Use "set architecture sh4" in GDB to see fpu registers */
+/* FIXME: We should use XML for this. */
- env->CP0_BadVAddr = tswapl(*(target_ulong *)ptr);
- ptr += sizeof(target_ulong);
+#define NUM_CORE_REGS 59
- env->CP0_Cause = tswapl(*(target_ulong *)ptr);
- ptr += sizeof(target_ulong);
+static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n)
+{
+ if (n < 8) {
+ if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
+ GET_REGL(env->gregs[n + 16]);
+ } else {
+ GET_REGL(env->gregs[n]);
+ }
+ } else if (n < 16) {
+ GET_REGL(env->gregs[n - 8]);
+ } else if (n >= 25 && n < 41) {
+ GET_REGL(env->fregs[(n - 25) + ((env->fpscr & FPSCR_FR) ? 16 : 0)]);
+ } else if (n >= 43 && n < 51) {
+ GET_REGL(env->gregs[n - 43]);
+ } else if (n >= 51 && n < 59) {
+ GET_REGL(env->gregs[n - (51 - 16)]);
+ }
+ switch (n) {
+ case 16: GET_REGL(env->pc);
+ case 17: GET_REGL(env->pr);
+ case 18: GET_REGL(env->gbr);
+ case 19: GET_REGL(env->vbr);
+ case 20: GET_REGL(env->mach);
+ case 21: GET_REGL(env->macl);
+ case 22: GET_REGL(env->sr);
+ case 23: GET_REGL(env->fpul);
+ case 24: GET_REGL(env->fpscr);
+ case 41: GET_REGL(env->ssr);
+ case 42: GET_REGL(env->spc);
+ }
- env->active_tc.PC = tswapl(*(target_ulong *)ptr);
- ptr += sizeof(target_ulong);
+ return 0;
+}
- if (env->CP0_Config1 & (1 << CP0C1_FP))
- {
- for (i = 0; i < 32; i++)
- {
- if (env->CP0_Status & (1 << CP0St_FR))
- env->active_fpu.fpr[i].d = tswapl(*(target_ulong *)ptr);
- else
- env->active_fpu.fpr[i].w[FP_ENDIAN_IDX] = tswapl(*(target_ulong *)ptr);
- ptr += sizeof(target_ulong);
- }
+static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n)
+{
+ uint32_t tmp;
- env->active_fpu.fcr31 = tswapl(*(target_ulong *)ptr) & 0xFF83FFFF;
- ptr += sizeof(target_ulong);
+ tmp = ldl_p(mem_buf);
- /* The remaining registers are assumed to be read-only. */
+ if (n < 8) {
+ if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
+ env->gregs[n + 16] = tmp;
+ } else {
+ env->gregs[n] = tmp;
+ }
+ return 4;
+ } else if (n < 16) {
+ env->gregs[n - 8] = tmp;
+ return 4;
+ } else if (n >= 25 && n < 41) {
+ env->fregs[(n - 25) + ((env->fpscr & FPSCR_FR) ? 16 : 0)] = tmp;
+ } else if (n >= 43 && n < 51) {
+ env->gregs[n - 43] = tmp;
+ return 4;
+ } else if (n >= 51 && n < 59) {
+ env->gregs[n - (51 - 16)] = tmp;
+ return 4;
+ }
+ switch (n) {
+ case 16: env->pc = tmp;
+ case 17: env->pr = tmp;
+ case 18: env->gbr = tmp;
+ case 19: env->vbr = tmp;
+ case 20: env->mach = tmp;
+ case 21: env->macl = tmp;
+ case 22: env->sr = tmp;
+ case 23: env->fpul = tmp;
+ case 24: env->fpscr = tmp;
+ case 41: env->ssr = tmp;
+ case 42: env->spc = tmp;
+ default: return 0;
+ }
- /* set rounding mode */
- RESTORE_ROUNDING_MODE;
-
-#ifndef CONFIG_SOFTFLOAT
- /* no floating point exception for native float */
- SET_FP_ENABLE(env->fcr31, 0);
-#endif
- }
+ return 4;
}
-#elif defined (TARGET_SH4)
+#elif defined (TARGET_CRIS)
-/* Hint: Use "set architecture sh4" in GDB to see fpu registers */
+#define NUM_CORE_REGS 49
-static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
+static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n)
{
- uint32_t *ptr = (uint32_t *)mem_buf;
- int i;
+ uint8_t srs;
-#define SAVE(x) *ptr++=tswapl(x)
- if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
- for (i = 0; i < 8; i++) SAVE(env->gregs[i + 16]);
- } else {
- for (i = 0; i < 8; i++) SAVE(env->gregs[i]);
- }
- for (i = 8; i < 16; i++) SAVE(env->gregs[i]);
- SAVE (env->pc);
- SAVE (env->pr);
- SAVE (env->gbr);
- SAVE (env->vbr);
- SAVE (env->mach);
- SAVE (env->macl);
- SAVE (env->sr);
- SAVE (env->fpul);
- SAVE (env->fpscr);
- for (i = 0; i < 16; i++)
- SAVE(env->fregs[i + ((env->fpscr & FPSCR_FR) ? 16 : 0)]);
- SAVE (env->ssr);
- SAVE (env->spc);
- for (i = 0; i < 8; i++) SAVE(env->gregs[i]);
- for (i = 0; i < 8; i++) SAVE(env->gregs[i + 16]);
- return ((uint8_t *)ptr - mem_buf);
+ srs = env->pregs[PR_SRS];
+ if (n < 16) {
+ GET_REG32(env->regs[n]);
+ }
+
+ if (n >= 21 && n < 32) {
+ GET_REG32(env->pregs[n - 16]);
+ }
+ if (n >= 33 && n < 49) {
+ GET_REG32(env->sregs[srs][n - 33]);
+ }
+ switch (n) {
+ case 16: GET_REG8(env->pregs[0]);
+ case 17: GET_REG8(env->pregs[1]);
+ case 18: GET_REG32(env->pregs[2]);
+ case 19: GET_REG8(srs);
+ case 20: GET_REG16(env->pregs[4]);
+ case 32: GET_REG32(env->pc);
+ }
+
+ return 0;
}
-static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
+static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n)
{
- uint32_t *ptr = (uint32_t *)mem_buf;
- int i;
+ uint32_t tmp;
-#define LOAD(x) (x)=*ptr++;
- if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
- for (i = 0; i < 8; i++) LOAD(env->gregs[i + 16]);
- } else {
- for (i = 0; i < 8; i++) LOAD(env->gregs[i]);
- }
- for (i = 8; i < 16; i++) LOAD(env->gregs[i]);
- LOAD (env->pc);
- LOAD (env->pr);
- LOAD (env->gbr);
- LOAD (env->vbr);
- LOAD (env->mach);
- LOAD (env->macl);
- LOAD (env->sr);
- LOAD (env->fpul);
- LOAD (env->fpscr);
- for (i = 0; i < 16; i++)
- LOAD(env->fregs[i + ((env->fpscr & FPSCR_FR) ? 16 : 0)]);
- LOAD (env->ssr);
- LOAD (env->spc);
- for (i = 0; i < 8; i++) LOAD(env->gregs[i]);
- for (i = 0; i < 8; i++) LOAD(env->gregs[i + 16]);
+ if (n > 49)
+ return 0;
+
+ tmp = ldl_p(mem_buf);
+
+ if (n < 16) {
+ env->regs[n] = tmp;
+ }
+
+ /* FIXME: Should other regs be writable? */
+ switch (n) {
+ case 16: return 1;
+ case 17: return 1;
+ case 18: return 4;
+ case 19: return 1;
+ case 20: return 2;
+ case 32: env->pc = tmp; break;
+ }
+
+ return 4;
}
-#elif defined (TARGET_CRIS)
+#else
-static int cris_save_32 (unsigned char *d, uint32_t value)
+#define NUM_CORE_REGS 0
+
+static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n)
{
- *d++ = (value);
- *d++ = (value >>= 8);
- *d++ = (value >>= 8);
- *d++ = (value >>= 8);
- return 4;
+ return 0;
}
-static int cris_save_16 (unsigned char *d, uint32_t value)
+
+static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n)
{
- *d++ = (value);
- *d++ = (value >>= 8);
- return 2;
+ return 0;
}
-static int cris_save_8 (unsigned char *d, uint32_t value)
+
+#endif
+
+static int num_g_regs = NUM_CORE_REGS;
+
+#ifdef GDB_CORE_XML
+/* Encode data using the encoding for 'x' packets. */
+static int memtox(char *buf, const char *mem, int len)
{
- *d++ = (value);
- return 1;
+ char *p = buf;
+ char c;
+
+ while (len--) {
+ c = *(mem++);
+ switch (c) {
+ case '#': case '$': case '*': case '}':
+ *(p++) = '}';
+ *(p++) = c ^ 0x20;
+ break;
+ default:
+ *(p++) = c;
+ break;
+ }
+ }
+ return p - buf;
}
-/* FIXME: this will bug on archs not supporting unaligned word accesses. */
-static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
+const char *get_feature_xml(CPUState *env, const char *p, const char **newp)
{
- uint8_t *ptr = mem_buf;
- uint8_t srs;
- int i;
+ extern const char *const xml_builtin[][2];
+ size_t len;
+ int i;
+ const char *name;
+ static char target_xml[1024];
- for (i = 0; i < 16; i++)
- ptr += cris_save_32 (ptr, env->regs[i]);
+ len = 0;
+ while (p[len] && p[len] != ':')
+ len++;
+ *newp = p + len;
- srs = env->pregs[PR_SRS];
+ name = NULL;
+ if (strncmp(p, "target.xml", len) == 0) {
+ /* Generate the XML description for this CPU. */
+ if (!target_xml[0]) {
+ GDBRegisterState *r;
- ptr += cris_save_8 (ptr, env->pregs[0]);
- ptr += cris_save_8 (ptr, env->pregs[1]);
- ptr += cris_save_32 (ptr, env->pregs[2]);
- ptr += cris_save_8 (ptr, srs);
- ptr += cris_save_16 (ptr, env->pregs[4]);
+ sprintf(target_xml,
+ "<?xml version=\"1.0\"?>"
+ "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">"
+ "<target>"
+ "<xi:include href=\"%s\"/>",
+ GDB_CORE_XML);
- for (i = 5; i < 16; i++)
- ptr += cris_save_32 (ptr, env->pregs[i]);
+ for (r = env->gdb_regs; r; r = r->next) {
+ strcat(target_xml, "<xi:include href=\"");
+ strcat(target_xml, r->xml);
+ strcat(target_xml, "\"/>");
+ }
+ strcat(target_xml, "</target>");
+ }
+ return target_xml;
+ }
+ for (i = 0; ; i++) {
+ name = xml_builtin[i][0];
+ if (!name || (strncmp(name, p, len) == 0 && strlen(name) == len))
+ break;
+ }
+ return name ? xml_builtin[i][1] : NULL;
+}
+#endif
- ptr += cris_save_32 (ptr, env->pc);
+static int gdb_read_register(CPUState *env, uint8_t *mem_buf, int reg)
+{
+ GDBRegisterState *r;
- for (i = 0; i < 16; i++)
- ptr += cris_save_32 (ptr, env->sregs[srs][i]);
+ if (reg < NUM_CORE_REGS)
+ return cpu_gdb_read_register(env, mem_buf, reg);
- return ((uint8_t *)ptr - mem_buf);
+ for (r = env->gdb_regs; r; r = r->next) {
+ if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) {
+ return r->get_reg(env, mem_buf, reg - r->base_reg);
+ }
+ }
+ return 0;
}
-static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
+static int gdb_write_register(CPUState *env, uint8_t *mem_buf, int reg)
{
- uint32_t *ptr = (uint32_t *)mem_buf;
- int i;
+ GDBRegisterState *r;
-#define LOAD(x) (x)=*ptr++;
- for (i = 0; i < 16; i++) LOAD(env->regs[i]);
- LOAD (env->pc);
-}
-#else
-static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
-{
+ if (reg < NUM_CORE_REGS)
+ return cpu_gdb_write_register(env, mem_buf, reg);
+
+ for (r = env->gdb_regs; r; r = r->next) {
+ if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) {
+ return r->set_reg(env, mem_buf, reg - r->base_reg);
+ }
+ }
return 0;
}
-static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
+/* Register a supplemental set of CPU registers. If g_pos is nonzero it
+ specifies the first register number and these registers are included in
+ a standard "g" packet. Direction is relative to gdb, i.e. get_reg is
+ gdb reading a CPU register, and set_reg is gdb modifying a CPU register.
+ */
+
+void gdb_register_coprocessor(CPUState * env,
+ gdb_reg_cb get_reg, gdb_reg_cb set_reg,
+ int num_regs, const char *xml, int g_pos)
{
+ GDBRegisterState *s;
+ GDBRegisterState **p;
+ static int last_reg = NUM_CORE_REGS;
+
+ s = (GDBRegisterState *)qemu_mallocz(sizeof(GDBRegisterState));
+ s->base_reg = last_reg;
+ s->num_regs = num_regs;
+ s->get_reg = get_reg;
+ s->set_reg = set_reg;
+ s->xml = xml;
+ p = &env->gdb_regs;
+ while (*p) {
+ /* Check for duplicates. */
+ if (strcmp((*p)->xml, xml) == 0)
+ return;
+ p = &(*p)->next;
+ }
+ /* Add to end of list. */
+ last_reg += num_regs;
+ *p = s;
+ if (g_pos) {
+ if (g_pos != s->base_reg) {
+ fprintf(stderr, "Error: Bad gdb register numbering for '%s'\n"
+ "Expected %d got %d\n", xml, g_pos, s->base_reg);
+ } else {
+ num_g_regs = last_reg;
+ }
+ }
}
-#endif
-
static int gdb_handle_packet(GDBState *s, CPUState *env, const char *line_buf)
{
const char *p;
int ch, reg_size, type;
- char buf[4096];
- uint8_t mem_buf[4096];
- uint32_t *registers;
+ char buf[MAX_PACKET_LENGTH];
+ uint8_t mem_buf[MAX_PACKET_LENGTH];
+ uint8_t *registers;
target_ulong addr, len;
#ifdef DEBUG_GDB
@@ -1073,15 +1254,23 @@
}
break;
case 'g':
- reg_size = cpu_gdb_read_registers(env, mem_buf);
- memtohex(buf, mem_buf, reg_size);
+ len = 0;
+ for (addr = 0; addr < num_g_regs; addr++) {
+ reg_size = gdb_read_register(env, mem_buf + len, addr);
+ len += reg_size;
+ }
+ memtohex(buf, mem_buf, len);
put_packet(s, buf);
break;
case 'G':
- registers = (void *)mem_buf;
+ registers = mem_buf;
len = strlen(p) / 2;
hextomem((uint8_t *)registers, p, len);
- cpu_gdb_write_registers(env, mem_buf, len);
+ for (addr = 0; addr < num_g_regs && len > 0; addr++) {
+ reg_size = gdb_write_register(env, registers, addr);
+ len -= reg_size;
+ registers += reg_size;
+ }
put_packet(s, "OK");
break;
case 'm':
@@ -1109,6 +1298,32 @@
else
put_packet(s, "OK");
break;
+ case 'p':
+ /* Older gdb are really dumb, and don't use 'g' if 'p' is avaialable.
+ This works, but can be very slow. Anything new enough to
+ understand XML also knows how to use this properly. */
+ if (!gdb_has_xml)
+ goto unknown_command;
+ addr = strtoull(p, (char **)&p, 16);
+ reg_size = gdb_read_register(env, mem_buf, addr);
+ if (reg_size) {
+ memtohex(buf, mem_buf, reg_size);
+ put_packet(s, buf);
+ } else {
+ put_packet(s, "E14");
+ }
+ break;
+ case 'P':
+ if (!gdb_has_xml)
+ goto unknown_command;
+ addr = strtoull(p, (char **)&p, 16);
+ if (*p == '=')
+ p++;
+ reg_size = strlen(p) / 2;
+ hextomem(mem_buf, p, reg_size);
+ gdb_write_register(env, mem_buf, addr);
+ put_packet(s, "OK");
+ break;
case 'Z':
type = strtoul(p, (char **)&p, 16);
if (*p == ',')
@@ -1208,8 +1423,59 @@
break;
}
#endif
- /* Fall through. */
+ if (strncmp(p, "Supported", 9) == 0) {
+ sprintf(buf, "PacketSize=%x", MAX_PACKET_LENGTH);
+#ifdef GDB_CORE_XML
+ strcat(buf, ";qXfer:features:read+");
+#endif
+ put_packet(s, buf);
+ break;
+ }
+#ifdef GDB_CORE_XML
+ if (strncmp(p, "Xfer:features:read:", 19) == 0) {
+ const char *xml;
+ target_ulong total_len;
+
+ gdb_has_xml = 1;
+ p += 19;
+ xml = get_feature_xml(env, p, &p);
+ if (!xml) {
+ sprintf(buf, "E00");
+ put_packet(s, buf);
+ break;
+ }
+
+ if (*p == ':')
+ p++;
+ addr = strtoul(p, (char **)&p, 16);
+ if (*p == ',')
+ p++;
+ len = strtoul(p, (char **)&p, 16);
+
+ total_len = strlen(xml);
+ if (addr > total_len) {
+ sprintf(buf, "E00");
+ put_packet(s, buf);
+ break;
+ }
+ if (len > (MAX_PACKET_LENGTH - 5) / 2)
+ len = (MAX_PACKET_LENGTH - 5) / 2;
+ if (len < total_len - addr) {
+ buf[0] = 'm';
+ len = memtox(buf + 1, xml + addr, len);
+ } else {
+ buf[0] = 'l';
+ len = memtox(buf + 1, xml + addr, total_len - addr);
+ }
+ put_packet_binary(s, buf, len + 1);
+ break;
+ }
+#endif
+ /* Unrecognised 'q' command. */
+ goto unknown_command;
+
default:
+ unknown_command:
/* put empty packet */
buf[0] = '\0';
put_packet(s, buf);
@@ -1487,6 +1753,7 @@
memset (s, 0, sizeof (GDBState));
s->env = first_cpu; /* XXX: allow to change CPU */
s->fd = fd;
+ gdb_has_xml = 0;
gdb_syscall_state = s;
@@ -1536,7 +1803,9 @@
#else
static int gdb_chr_can_receive(void *opaque)
{
- return 1;
+ /* We can handle an arbitrarily large amount of data.
+ Pick the maximum packet size, which is as good as anything. */
+ return MAX_PACKET_LENGTH;
}
static void gdb_chr_receive(void *opaque, const uint8_t *buf, int size)
@@ -1555,6 +1824,7 @@
case CHR_EVENT_RESET:
vm_stop(EXCP_INTERRUPT);
gdb_syscall_state = opaque;
+ gdb_has_xml = 0;
break;
default:
break;
Modified: trunk/gdbstub.h
===================================================================
--- trunk/gdbstub.h 2008-10-11 17:37:25 UTC (rev 5458)
+++ trunk/gdbstub.h 2008-10-11 17:55:29 UTC (rev 5459)
@@ -15,5 +15,10 @@
#else
int gdbserver_start(const char *port);
#endif
+/* Get or set a register. Returns the size of the register. */
+typedef int (*gdb_reg_cb)(CPUState *env, uint8_t *buf, int reg);
+void gdb_register_coprocessor(CPUState *env,
+ gdb_reg_cb get_reg, gdb_reg_cb set_reg,
+ int num_regs, const char *xml, int g_pos);
#endif
Modified: trunk/target-arm/helper.c
===================================================================
--- trunk/target-arm/helper.c 2008-10-11 17:37:25 UTC (rev 5458)
+++ trunk/target-arm/helper.c 2008-10-11 17:55:29 UTC (rev 5459)
@@ -173,6 +173,58 @@
tlb_flush(env, 1);
}
+static int vfp_gdb_get_reg(CPUState *env, uint8_t *buf, int reg)
+{
+ int nregs;
+
+ /* VFP data registers are always little-endian. */
+ nregs = arm_feature(env, ARM_FEATURE_VFP3) ? 32 : 16;
+ if (reg < nregs) {
+ stfq_le_p(buf, env->vfp.regs[reg]);
+ return 8;
+ }
+ if (arm_feature(env, ARM_FEATURE_NEON)) {
+ /* Aliases for Q regs. */
+ nregs += 16;
+ if (reg < nregs) {
+ stfq_le_p(buf, env->vfp.regs[(reg - 32) * 2]);
+ stfq_le_p(buf + 8, env->vfp.regs[(reg - 32) * 2 + 1]);
+ return 16;
+ }
+ }
+ switch (reg - nregs) {
+ case 0: stl_p(buf, env->vfp.xregs[ARM_VFP_FPSID]); return 4;
+ case 1: stl_p(buf, env->vfp.xregs[ARM_VFP_FPSCR]); return 4;
+ case 2: stl_p(buf, env->vfp.xregs[ARM_VFP_FPEXC]); return 4;
+ }
+ return 0;
+}
+
+static int vfp_gdb_set_reg(CPUState *env, uint8_t *buf, int reg)
+{
+ int nregs;
+
+ nregs = arm_feature(env, ARM_FEATURE_VFP3) ? 32 : 16;
+ if (reg < nregs) {
+ env->vfp.regs[reg] = ldfq_le_p(buf);
+ return 8;
+ }
+ if (arm_feature(env, ARM_FEATURE_NEON)) {
+ nregs += 16;
+ if (reg < nregs) {
+ env->vfp.regs[(reg - 32) * 2] = ldfq_le_p(buf);
+ env->vfp.regs[(reg - 32) * 2 + 1] = ldfq_le_p(buf + 8);
+ return 16;
+ }
+ }
+ switch (reg - nregs) {
+ case 0: env->vfp.xregs[ARM_VFP_FPSID] = ldl_p(buf); return 4;
+ case 1: env->vfp.xregs[ARM_VFP_FPSCR] = ldl_p(buf); return 4;
+ case 2: env->vfp.xregs[ARM_VFP_FPEXC] = ldl_p(buf); return 4;
+ }
+ return 0;
+}
+
CPUARMState *cpu_arm_init(const char *cpu_model)
{
CPUARMState *env;
@@ -194,6 +246,16 @@
env->cpu_model_str = cpu_model;
env->cp15.c0_cpuid = id;
cpu_reset(env);
+ if (arm_feature(env, ARM_FEATURE_NEON)) {
+ gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg,
+ 51, "arm-neon.xml", 0);
+ } else if (arm_feature(env, ARM_FEATURE_VFP3)) {
+ gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg,
+ 35, "arm-vfp3.xml", 0);
+ } else if (arm_feature(env, ARM_FEATURE_VFP)) {
+ gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg,
+ 19, "arm-vfp.xml", 0);
+ }
return env;
}
Modified: trunk/target-m68k/helper.c
===================================================================
--- trunk/target-m68k/helper.c 2008-10-11 17:37:25 UTC (rev 5458)
+++ trunk/target-m68k/helper.c 2008-10-11 17:55:29 UTC (rev 5459)
@@ -26,6 +26,7 @@
#include "cpu.h"
#include "exec-all.h"
#include "qemu-common.h"
+#include "gdbstub.h"
#include "helpers.h"
@@ -53,6 +54,33 @@
{NULL, 0},
};
+static int fpu_gdb_get_reg(CPUState *env, uint8_t *mem_buf, int n)
+{
+ if (n < 8) {
+ stfq_p(mem_buf, env->fregs[n]);
+ return 8;
+ }
+ if (n < 11) {
+ /* FP control registers (not implemented) */
+ memset(mem_buf, 0, 4);
+ return 4;
+ }
+ return 0;
+}
+
+static int fpu_gdb_set_reg(CPUState *env, uint8_t *mem_buf, int n)
+{
+ if (n < 8) {
+ env->fregs[n] = ldfq_p(mem_buf);
+ return 8;
+ }
+ if (n < 11) {
+ /* FP control registers (not implemented) */
+ return 4;
+ }
+ return 0;
+}
+
static void m68k_set_feature(CPUM68KState *env, int feature)
{
env->features |= (1u << feature);
@@ -105,6 +133,11 @@
}
register_m68k_insns(env);
+ if (m68k_feature (env, M68K_FEATURE_CF_FPU)) {
+ gdb_register_coprocessor(env, fpu_gdb_get_reg, fpu_gdb_set_reg,
+ 11, "cf-fp.xml", 18);
+ }
+ /* TODO: Add [E]MAC registers. */
return 0;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [5459] Add GDB XML register description support.
2008-10-11 17:55 [Qemu-devel] [5459] Add GDB XML register description support Paul Brook
@ 2008-10-11 18:16 ` Edgar E. Iglesias
2008-10-12 3:55 ` C.W. Betts
1 sibling, 0 replies; 3+ messages in thread
From: Edgar E. Iglesias @ 2008-10-11 18:16 UTC (permalink / raw)
To: Paul Brook; +Cc: qemu-devel
On Sat, Oct 11, 2008 at 05:55:30PM +0000, Paul Brook wrote:
> Revision: 5459
> http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5459
> Author: pbrook
> Date: 2008-10-11 17:55:29 +0000 (Sat, 11 Oct 2008)
Hello Paul,
I don't seem to get the feature_to_c.sh script when I update, did you forget to commit it?
Best regards
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [5459] Add GDB XML register description support.
@ 2008-10-12 3:55 ` C.W. Betts
0 siblings, 0 replies; 3+ messages in thread
From: C.W. Betts @ 2008-10-12 3:55 UTC (permalink / raw)
To: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 77004 bytes --]
On Mac OS X, it complains about missing symbols:
gcc -g -framework CoreFoundation -framework IOKit -framework OpenGL -
m32 -p -p -o qemu-system-arm vl.o osdep.o monitor.o pci.o loader.o
isa_mmio.o machine.o net-checksum.o fw_cfg.o aio.o block-raw-posix.o
lsi53c895a.o esp.o usb-ohci.o eeprom93xx.o eepro100.o ne2000.o pcnet.o
rtl8139.o e1000.o integratorcp.o versatilepb.o ps2.o smc91c111.o
arm_pic.o arm_timer.o arm_boot.o pl011.o pl031.o pl050.o pl080.o
pl110.o pl181.o pl190.o versatile_pci.o ptimer.o realview_gic.o
realview.o arm_sysctl.o mpcore.o armv7m.o armv7m_nvic.o stellaris.o
pl022.o stellaris_enet.o pl061.o arm-semi.o pxa2xx.o pxa2xx_pic.o
pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o pxa2xx_lcd.o pxa2xx_mmci.o
pxa2xx_pcmcia.o pxa2xx_keypad.o pflash_cfi01.o gumstix.o zaurus.o
ide.o serial.o nand.o ecc.o spitz.o tosa.o tc6393xb.o omap1.o
omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o omap2.o
omap_dss.o soc_dma.o palm.o tsc210x.o nseries.o blizzard.o onenand.o
vga.o cbus.o tusb6010.o usb-musb.o tsc2005.o bt-hci-csr.o mst_fpga.o
mainstone.o musicpal.o pflash_cfi02.o gdbstub.o gdbstub-xml.o ../
libqemu_common.a libqemu.a -lm -lz -framework Cocoa -framework
IOKit -framework OpenGL -framework CoreAudio -lcurses
Undefined symbols:
"_xml_builtin", referenced from:
_xml_builtin$non_lazy_ptr in gdbstub.o
ld: symbol(s) not found
On Oct 11, 2008, at 11:55 AM, Paul Brook wrote:
> Revision: 5459
> http://svn.sv.gnu.org/viewvc/?
> view=rev&root=qemu&revision=5459
> Author: pbrook
> Date: 2008-10-11 17:55:29 +0000 (Sat, 11 Oct 2008)
>
> Log Message:
> -----------
> Add GDB XML register description support.
>
> Signed-off-by: Paul Brook <paul@codesourcery.com>
>
> Modified Paths:
> --------------
> trunk/Makefile.target
> trunk/configure
> trunk/cpu-defs.h
> trunk/gdbstub.c
> trunk/gdbstub.h
> trunk/target-arm/helper.c
> trunk/target-m68k/helper.c
>
> Added Paths:
> -----------
> trunk/gdb-xml/
> trunk/gdb-xml/arm-core.xml
> trunk/gdb-xml/arm-neon.xml
> trunk/gdb-xml/arm-vfp.xml
> trunk/gdb-xml/arm-vfp3.xml
> trunk/gdb-xml/cf-core.xml
> trunk/gdb-xml/cf-fp.xml
>
> Modified: trunk/Makefile.target
> ===================================================================
> --- trunk/Makefile.target 2008-10-11 17:37:25 UTC (rev 5458)
> +++ trunk/Makefile.target 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -418,7 +418,7 @@
> endif
>
> ifdef CONFIG_GDBSTUB
> -OBJS+=gdbstub.o
> +OBJS+=gdbstub.o gdbstub-xml.o
> endif
>
> OBJS+= libqemu.a
> @@ -456,7 +456,7 @@
> OBJS+= libqemu.a
>
> ifdef CONFIG_GDBSTUB
> -OBJS+=gdbstub.o
> +OBJS+=gdbstub.o gdbstub-xml.o
> endif
>
> # Note: this is a workaround. The real fix is to avoid compiling
> @@ -626,7 +626,7 @@
> OBJS+= m68k-semi.o dummy_m68k.o
> endif
> ifdef CONFIG_GDBSTUB
> -OBJS+=gdbstub.o
> +OBJS+=gdbstub.o gdbstub-xml.o
> endif
> ifdef CONFIG_COCOA
> COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework
> IOKit
> @@ -674,6 +674,14 @@
>
> endif # !CONFIG_USER_ONLY
>
> +gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh
> + rm -f $@
> +ifeq ($(TARGET_XML_FILES),)
> + echo > $@
> +else
> + $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)
> +endif
> +
> %.o: %.c
> $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
>
>
> Modified: trunk/configure
> ===================================================================
> --- trunk/configure 2008-10-11 17:37:25 UTC (rev 5458)
> +++ trunk/configure 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -1386,6 +1386,7 @@
> target_nptl="no"
> interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
> echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
> +gdb_xml_files=""
>
> case "$target_cpu" in
> i386)
> @@ -1425,6 +1426,7 @@
> echo "#define TARGET_ARM 1" >> $config_h
> bflt="yes"
> target_nptl="yes"
> + gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-
> neon.xml"
> ;;
> cris)
> echo "TARGET_ARCH=cris" >> $config_mak
> @@ -1436,6 +1438,7 @@
> echo "#define TARGET_ARCH \"m68k\"" >> $config_h
> echo "#define TARGET_M68K 1" >> $config_h
> bflt="yes"
> + gdb_xml_files="cf-core.xml cf-fp.xml"
> ;;
> mips|mipsel)
> echo "TARGET_ARCH=mips" >> $config_mak
> @@ -1545,6 +1548,13 @@
> echo "CONFIG_DARWIN_USER=yes" >> $config_mak
> echo "#define CONFIG_DARWIN_USER 1" >> $config_h
> fi
> +list=""
> +if test ! -z "$gdb_xml_files" ; then
> + for x in $gdb_xml_files; do
> + list="$list $source_path/gdb-xml/$x"
> + done
> +fi
> +echo "TARGET_XML_FILES=$list" >> $config_mak
>
> if test "$target_cpu" = "arm" \
> -o "$target_cpu" = "armeb" \
>
> Modified: trunk/cpu-defs.h
> ===================================================================
> --- trunk/cpu-defs.h 2008-10-11 17:37:25 UTC (rev 5458)
> +++ trunk/cpu-defs.h 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -185,6 +185,8 @@
> int
> nb_watchpoints; \
> int
> watchpoint_hit; \
> \
> + struct GDBRegisterState
> *gdb_regs; \
> +
> \
> /* Core interrupt code
> */ \
> jmp_buf
> jmp_env; \
> int
> exception_index; \
>
> Added: trunk/gdb-xml/arm-core.xml
> ===================================================================
> --- trunk/gdb-xml/arm-core.xml (rev 0)
> +++ trunk/gdb-xml/arm-core.xml 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -0,0 +1,31 @@
> +<?xml version="1.0"?>
> +<!-- Copyright (C) 2008 Free Software Foundation, Inc.
> +
> + Copying and distribution of this file, with or without
> modification,
> + are permitted in any medium without royalty provided the
> copyright
> + notice and this notice are preserved. -->
> +
> +<!DOCTYPE feature SYSTEM "gdb-target.dtd">
> +<feature name="org.gnu.gdb.arm.core">
> + <reg name="r0" bitsize="32"/>
> + <reg name="r1" bitsize="32"/>
> + <reg name="r2" bitsize="32"/>
> + <reg name="r3" bitsize="32"/>
> + <reg name="r4" bitsize="32"/>
> + <reg name="r5" bitsize="32"/>
> + <reg name="r6" bitsize="32"/>
> + <reg name="r7" bitsize="32"/>
> + <reg name="r8" bitsize="32"/>
> + <reg name="r9" bitsize="32"/>
> + <reg name="r10" bitsize="32"/>
> + <reg name="r11" bitsize="32"/>
> + <reg name="r12" bitsize="32"/>
> + <reg name="sp" bitsize="32" type="data_ptr"/>
> + <reg name="lr" bitsize="32"/>
> + <reg name="pc" bitsize="32" type="code_ptr"/>
> +
> + <!-- The CPSR is register 25, rather than register 16, because
> + the FPA registers historically were placed between the PC
> + and the CPSR in the "g" packet. -->
> + <reg name="cpsr" bitsize="32" regnum="25"/>
> +</feature>
>
> Added: trunk/gdb-xml/arm-neon.xml
> ===================================================================
> --- trunk/gdb-xml/arm-neon.xml (rev 0)
> +++ trunk/gdb-xml/arm-neon.xml 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -0,0 +1,88 @@
> +<?xml version="1.0"?>
> +<!-- Copyright (C) 2008 Free Software Foundation, Inc.
> +
> + Copying and distribution of this file, with or without
> modification,
> + are permitted in any medium without royalty provided the
> copyright
> + notice and this notice are preserved. -->
> +<!DOCTYPE feature SYSTEM "gdb-target.dtd">
> +<feature name="org.gnu.gdb.arm.neon">
> + <vector id="neon_uint8x8" type="uint8" count="8"/>
> + <vector id="neon_uint16x4" type="uint16" count="4"/>
> + <vector id="neon_uint32x2" type="uint32" count="2"/>
> + <vector id="neon_float32x2" type="ieee_single" count="2"/>
> + <union id="neon_d">
> + <field name="u8" type="neon_uint8x8"/>
> + <field name="u16" type="neon_uint16x4"/>
> + <field name="u32" type="neon_uint32x2"/>
> + <field name="u64" type="uint64"/>
> + <field name="f32" type="neon_float32x2"/>
> + <field name="f64" type="ieee_double"/>
> + </union>
> + <vector id="neon_uint8x16" type="uint8" count="16"/>
> + <vector id="neon_uint16x8" type="uint16" count="8"/>
> + <vector id="neon_uint32x4" type="uint32" count="4"/>
> + <vector id="neon_uint64x2" type="uint64" count="2"/>
> + <vector id="neon_float32x4" type="ieee_single" count="4"/>
> + <vector id="neon_float64x2" type="ieee_double" count="2"/>
> + <union id="neon_q">
> + <field name="u8" type="neon_uint8x16"/>
> + <field name="u16" type="neon_uint16x8"/>
> + <field name="u32" type="neon_uint32x4"/>
> + <field name="u64" type="neon_uint64x2"/>
> + <field name="f32" type="neon_float32x4"/>
> + <field name="f64" type="neon_float64x2"/>
> + </union>
> + <reg name="d0" bitsize="64" type="neon_d"/>
> + <reg name="d1" bitsize="64" type="neon_d"/>
> + <reg name="d2" bitsize="64" type="neon_d"/>
> + <reg name="d3" bitsize="64" type="neon_d"/>
> + <reg name="d4" bitsize="64" type="neon_d"/>
> + <reg name="d5" bitsize="64" type="neon_d"/>
> + <reg name="d6" bitsize="64" type="neon_d"/>
> + <reg name="d7" bitsize="64" type="neon_d"/>
> + <reg name="d8" bitsize="64" type="neon_d"/>
> + <reg name="d9" bitsize="64" type="neon_d"/>
> + <reg name="d10" bitsize="64" type="neon_d"/>
> + <reg name="d11" bitsize="64" type="neon_d"/>
> + <reg name="d12" bitsize="64" type="neon_d"/>
> + <reg name="d13" bitsize="64" type="neon_d"/>
> + <reg name="d14" bitsize="64" type="neon_d"/>
> + <reg name="d15" bitsize="64" type="neon_d"/>
> + <reg name="d16" bitsize="64" type="neon_d"/>
> + <reg name="d17" bitsize="64" type="neon_d"/>
> + <reg name="d18" bitsize="64" type="neon_d"/>
> + <reg name="d19" bitsize="64" type="neon_d"/>
> + <reg name="d20" bitsize="64" type="neon_d"/>
> + <reg name="d21" bitsize="64" type="neon_d"/>
> + <reg name="d22" bitsize="64" type="neon_d"/>
> + <reg name="d23" bitsize="64" type="neon_d"/>
> + <reg name="d24" bitsize="64" type="neon_d"/>
> + <reg name="d25" bitsize="64" type="neon_d"/>
> + <reg name="d26" bitsize="64" type="neon_d"/>
> + <reg name="d27" bitsize="64" type="neon_d"/>
> + <reg name="d28" bitsize="64" type="neon_d"/>
> + <reg name="d29" bitsize="64" type="neon_d"/>
> + <reg name="d30" bitsize="64" type="neon_d"/>
> + <reg name="d31" bitsize="64" type="neon_d"/>
> +
> + <reg name="q0" bitsize="128" type="neon_q"/>
> + <reg name="q1" bitsize="128" type="neon_q"/>
> + <reg name="q2" bitsize="128" type="neon_q"/>
> + <reg name="q3" bitsize="128" type="neon_q"/>
> + <reg name="q4" bitsize="128" type="neon_q"/>
> + <reg name="q5" bitsize="128" type="neon_q"/>
> + <reg name="q6" bitsize="128" type="neon_q"/>
> + <reg name="q7" bitsize="128" type="neon_q"/>
> + <reg name="q8" bitsize="128" type="neon_q"/>
> + <reg name="q9" bitsize="128" type="neon_q"/>
> + <reg name="q10" bitsize="128" type="neon_q"/>
> + <reg name="q10" bitsize="128" type="neon_q"/>
> + <reg name="q12" bitsize="128" type="neon_q"/>
> + <reg name="q13" bitsize="128" type="neon_q"/>
> + <reg name="q14" bitsize="128" type="neon_q"/>
> + <reg name="q15" bitsize="128" type="neon_q"/>
> +
> + <reg name="fpsid" bitsize="32" type="int" group="float"/>
> + <reg name="fpscr" bitsize="32" type="int" group="float"/>
> + <reg name="fpexc" bitsize="32" type="int" group="float"/>
> +</feature>
>
> Added: trunk/gdb-xml/arm-vfp.xml
> ===================================================================
> --- trunk/gdb-xml/arm-vfp.xml (rev 0)
> +++ trunk/gdb-xml/arm-vfp.xml 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -0,0 +1,29 @@
> +<?xml version="1.0"?>
> +<!-- Copyright (C) 2008 Free Software Foundation, Inc.
> +
> + Copying and distribution of this file, with or without
> modification,
> + are permitted in any medium without royalty provided the
> copyright
> + notice and this notice are preserved. -->
> +<!DOCTYPE feature SYSTEM "gdb-target.dtd">
> +<feature name="org.gnu.gdb.arm.vfp">
> + <reg name="d0" bitsize="64" type="float"/>
> + <reg name="d1" bitsize="64" type="float"/>
> + <reg name="d2" bitsize="64" type="float"/>
> + <reg name="d3" bitsize="64" type="float"/>
> + <reg name="d4" bitsize="64" type="float"/>
> + <reg name="d5" bitsize="64" type="float"/>
> + <reg name="d6" bitsize="64" type="float"/>
> + <reg name="d7" bitsize="64" type="float"/>
> + <reg name="d8" bitsize="64" type="float"/>
> + <reg name="d9" bitsize="64" type="float"/>
> + <reg name="d10" bitsize="64" type="float"/>
> + <reg name="d11" bitsize="64" type="float"/>
> + <reg name="d12" bitsize="64" type="float"/>
> + <reg name="d13" bitsize="64" type="float"/>
> + <reg name="d14" bitsize="64" type="float"/>
> + <reg name="d15" bitsize="64" type="float"/>
> +
> + <reg name="fpsid" bitsize="32" type="int" group="float"/>
> + <reg name="fpscr" bitsize="32" type="int" group="float"/>
> + <reg name="fpexc" bitsize="32" type="int" group="float"/>
> +</feature>
>
> Added: trunk/gdb-xml/arm-vfp3.xml
> ===================================================================
> --- trunk/gdb-xml/arm-vfp3.xml (rev 0)
> +++ trunk/gdb-xml/arm-vfp3.xml 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -0,0 +1,45 @@
> +<?xml version="1.0"?>
> +<!-- Copyright (C) 2008 Free Software Foundation, Inc.
> +
> + Copying and distribution of this file, with or without
> modification,
> + are permitted in any medium without royalty provided the
> copyright
> + notice and this notice are preserved. -->
> +<!DOCTYPE feature SYSTEM "gdb-target.dtd">
> +<feature name="org.gnu.gdb.arm.vfpv3">
> + <reg name="d0" bitsize="64" type="float"/>
> + <reg name="d1" bitsize="64" type="float"/>
> + <reg name="d2" bitsize="64" type="float"/>
> + <reg name="d3" bitsize="64" type="float"/>
> + <reg name="d4" bitsize="64" type="float"/>
> + <reg name="d5" bitsize="64" type="float"/>
> + <reg name="d6" bitsize="64" type="float"/>
> + <reg name="d7" bitsize="64" type="float"/>
> + <reg name="d8" bitsize="64" type="float"/>
> + <reg name="d9" bitsize="64" type="float"/>
> + <reg name="d10" bitsize="64" type="float"/>
> + <reg name="d11" bitsize="64" type="float"/>
> + <reg name="d12" bitsize="64" type="float"/>
> + <reg name="d13" bitsize="64" type="float"/>
> + <reg name="d14" bitsize="64" type="float"/>
> + <reg name="d15" bitsize="64" type="float"/>
> + <reg name="d16" bitsize="64" type="float"/>
> + <reg name="d17" bitsize="64" type="float"/>
> + <reg name="d18" bitsize="64" type="float"/>
> + <reg name="d19" bitsize="64" type="float"/>
> + <reg name="d20" bitsize="64" type="float"/>
> + <reg name="d21" bitsize="64" type="float"/>
> + <reg name="d22" bitsize="64" type="float"/>
> + <reg name="d23" bitsize="64" type="float"/>
> + <reg name="d24" bitsize="64" type="float"/>
> + <reg name="d25" bitsize="64" type="float"/>
> + <reg name="d26" bitsize="64" type="float"/>
> + <reg name="d27" bitsize="64" type="float"/>
> + <reg name="d28" bitsize="64" type="float"/>
> + <reg name="d29" bitsize="64" type="float"/>
> + <reg name="d30" bitsize="64" type="float"/>
> + <reg name="d31" bitsize="64" type="float"/>
> +
> + <reg name="fpsid" bitsize="32" type="int" group="float"/>
> + <reg name="fpscr" bitsize="32" type="int" group="float"/>
> + <reg name="fpexc" bitsize="32" type="int" group="float"/>
> +</feature>
>
> Added: trunk/gdb-xml/cf-core.xml
> ===================================================================
> --- trunk/gdb-xml/cf-core.xml (rev 0)
> +++ trunk/gdb-xml/cf-core.xml 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -0,0 +1,29 @@
> +<?xml version="1.0"?>
> +<!-- Copyright (C) 2008 Free Software Foundation, Inc.
> +
> + Copying and distribution of this file, with or without
> modification,
> + are permitted in any medium without royalty provided the
> copyright
> + notice and this notice are preserved. -->
> +<!DOCTYPE feature SYSTEM "gdb-target.dtd">
> +<feature name="org.gnu.gdb.coldfire.core">
> + <reg name="d0" bitsize="32"/>
> + <reg name="d1" bitsize="32"/>
> + <reg name="d2" bitsize="32"/>
> + <reg name="d3" bitsize="32"/>
> + <reg name="d4" bitsize="32"/>
> + <reg name="d5" bitsize="32"/>
> + <reg name="d6" bitsize="32"/>
> + <reg name="d7" bitsize="32"/>
> + <reg name="a0" bitsize="32" type="data_ptr"/>
> + <reg name="a1" bitsize="32" type="data_ptr"/>
> + <reg name="a2" bitsize="32" type="data_ptr"/>
> + <reg name="a3" bitsize="32" type="data_ptr"/>
> + <reg name="a4" bitsize="32" type="data_ptr"/>
> + <reg name="a5" bitsize="32" type="data_ptr"/>
> + <reg name="fp" bitsize="32" type="data_ptr"/>
> + <reg name="sp" bitsize="32" type="data_ptr"/>
> +
> + <reg name="ps" bitsize="32"/>
> + <reg name="pc" bitsize="32" type="code_ptr"/>
> +
> +</feature>
>
> Added: trunk/gdb-xml/cf-fp.xml
> ===================================================================
> --- trunk/gdb-xml/cf-fp.xml (rev 0)
> +++ trunk/gdb-xml/cf-fp.xml 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -0,0 +1,22 @@
> +<?xml version="1.0"?>
> +<!-- Copyright (C) 2008 Free Software Foundation, Inc.
> +
> + Copying and distribution of this file, with or without
> modification,
> + are permitted in any medium without royalty provided the
> copyright
> + notice and this notice are preserved. -->
> +<!DOCTYPE feature SYSTEM "gdb-target.dtd">
> +<feature name="org.gnu.gdb.coldfire.fp">
> + <reg name="fp0" bitsize="64" type="float" group="float"/>
> + <reg name="fp1" bitsize="64" type="float" group="float"/>
> + <reg name="fp2" bitsize="64" type="float" group="float"/>
> + <reg name="fp3" bitsize="64" type="float" group="float"/>
> + <reg name="fp4" bitsize="64" type="float" group="float"/>
> + <reg name="fp5" bitsize="64" type="float" group="float"/>
> + <reg name="fp6" bitsize="64" type="float" group="float"/>
> + <reg name="fp7" bitsize="64" type="float" group="float"/>
> +
> +
> + <reg name="fpcontrol" bitsize="32" group="float"/>
> + <reg name="fpstatus" bitsize="32" group="float"/>,
> + <reg name="fpiaddr" bitsize="32" type="code_ptr" group="float"/>
> +</feature>
>
> Modified: trunk/gdbstub.c
> ===================================================================
> --- trunk/gdbstub.c 2008-10-11 17:37:25 UTC (rev 5458)
> +++ trunk/gdbstub.c 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -18,6 +18,7 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> 02111-1307 USA
> */
> #include "config.h"
> +#include "qemu-common.h"
> #ifdef CONFIG_USER_ONLY
> #include <stdlib.h>
> #include <stdio.h>
> @@ -29,12 +30,13 @@
>
> #include "qemu.h"
> #else
> -#include "qemu-common.h"
> #include "qemu-char.h"
> #include "sysemu.h"
> #include "gdbstub.h"
> #endif
>
> +#define MAX_PACKET_LENGTH 4096
> +
> #include "qemu_socket.h"
> #ifdef _WIN32
> /* XXX: these constants may be independent of the host ones even for
> Unix */
> @@ -50,6 +52,15 @@
>
> //#define DEBUG_GDB
>
> +typedef struct GDBRegisterState {
> + int base_reg;
> + int num_regs;
> + gdb_reg_cb get_reg;
> + gdb_reg_cb set_reg;
> + const char *xml;
> + struct GDBRegisterState *next;
> +} GDBRegisterState;
> +
> enum RSState {
> RS_IDLE,
> RS_GETLINE,
> @@ -60,10 +71,10 @@
> typedef struct GDBState {
> CPUState *env; /* current CPU */
> enum RSState state; /* parsing state */
> - char line_buf[4096];
> + char line_buf[MAX_PACKET_LENGTH];
> int line_buf_index;
> int line_csum;
> - uint8_t last_packet[4100];
> + uint8_t last_packet[MAX_PACKET_LENGTH + 4];
> int last_packet_len;
> int signal;
> #ifdef CONFIG_USER_ONLY
> @@ -79,6 +90,11 @@
> */
> static int sstep_flags = SSTEP_ENABLE|SSTEP_NOIRQ|SSTEP_NOTIMER;
>
> +/* This is an ugly hack to cope with both new and old gdb.
> + If gdb sends qXfer:features:read then assume we're talking to a
> newish
> + gdb that understands target descriptions. */
> +static int gdb_has_xml;
> +
> #ifdef CONFIG_USER_ONLY
> /* XXX: This is not thread safe. Do we care? */
> static int gdbserver_fd = -1;
> @@ -205,19 +221,14 @@
> }
>
> /* return -1 if error, 0 if OK */
> -static int put_packet(GDBState *s, const char *buf)
> +static int put_packet_binary(GDBState *s, const char *buf, int len)
> {
> - int len, csum, i;
> + int csum, i;
> uint8_t *p;
>
> -#ifdef DEBUG_GDB
> - printf("reply='%s'\n", buf);
> -#endif
> -
> for(;;) {
> p = s->last_packet;
> *(p++) = '$';
> - len = strlen(buf);
> memcpy(p, buf, len);
> p += len;
> csum = 0;
> @@ -244,522 +255,539 @@
> return 0;
> }
>
> +/* return -1 if error, 0 if OK */
> +static int put_packet(GDBState *s, const char *buf)
> +{
> +#ifdef DEBUG_GDB
> + printf("reply='%s'\n", buf);
> +#endif
> +
> + return put_packet_binary(s, buf, strlen(buf));
> +}
> +
> +/* The GDB remote protocol transfers values in target byte order.
> This means
> + we can use the raw memory access routines to access the value
> buffer.
> + Conveniently, these also handle the case where the buffer is mis-
> aligned.
> + */
> +#define GET_REG8(val) do { \
> + stb_p(mem_buf, val); \
> + return 1; \
> + } while(0)
> +#define GET_REG16(val) do { \
> + stw_p(mem_buf, val); \
> + return 2; \
> + } while(0)
> +#define GET_REG32(val) do { \
> + stl_p(mem_buf, val); \
> + return 4; \
> + } while(0)
> +#define GET_REG64(val) do { \
> + stq_p(mem_buf, val); \
> + return 8; \
> + } while(0)
> +
> +#if TARGET_LONG_BITS == 64
> +#define GET_REGL(val) GET_REG64(val)
> +#define ldtul_p(addr) ldq_p(addr)
> +#else
> +#define GET_REGL(val) GET_REG32(val)
> +#define ldtul_p(addr) ldl_p(addr)
> +#endif
> +
> #if defined(TARGET_I386)
>
> #ifdef TARGET_X86_64
> -static const uint8_t gdb_x86_64_regs[16] = {
> +static const int gpr_map[16] = {
> R_EAX, R_EBX, R_ECX, R_EDX, R_ESI, R_EDI, R_EBP, R_ESP,
> - 8, 9, 10, 11, 12, 13, 14, 15,
> + 8, 9, 10, 11, 12, 13, 14, 15
> };
> +#else
> +static const int gpr_map[8] = {0, 1, 2, 3, 4, 5, 6, 7};
> #endif
>
> -static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
> +#define NUM_CORE_REGS (CPU_NB_REGS * 2 + 25)
> +
> +static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf,
> int n)
> {
> - int i, fpus, nb_regs;
> - uint8_t *p;
> -
> - p = mem_buf;
> -#ifdef TARGET_X86_64
> - if (env->hflags & HF_CS64_MASK) {
> - nb_regs = 16;
> - for(i = 0; i < 16; i++) {
> - *(uint64_t *)p = tswap64(env->regs[gdb_x86_64_regs[i]]);
> - p += 8;
> - }
> - *(uint64_t *)p = tswap64(env->eip);
> - p += 8;
> - } else
> -#endif
> - {
> - nb_regs = 8;
> - for(i = 0; i < 8; i++) {
> - *(uint32_t *)p = tswap32(env->regs[i]);
> - p += 4;
> - }
> - *(uint32_t *)p = tswap32(env->eip);
> - p += 4;
> - }
> -
> - *(uint32_t *)p = tswap32(env->eflags);
> - p += 4;
> - *(uint32_t *)p = tswap32(env->segs[R_CS].selector);
> - p += 4;
> - *(uint32_t *)p = tswap32(env->segs[R_SS].selector);
> - p += 4;
> - *(uint32_t *)p = tswap32(env->segs[R_DS].selector);
> - p += 4;
> - *(uint32_t *)p = tswap32(env->segs[R_ES].selector);
> - p += 4;
> - *(uint32_t *)p = tswap32(env->segs[R_FS].selector);
> - p += 4;
> - *(uint32_t *)p = tswap32(env->segs[R_GS].selector);
> - p += 4;
> - for(i = 0; i < 8; i++) {
> - /* XXX: convert floats */
> + if (n < CPU_NB_REGS) {
> + GET_REGL(env->regs[gpr_map[n]]);
> + } else if (n >= CPU_NB_REGS + 8 && n < CPU_NB_REGS + 16) {
> + /* FIXME: byteswap float values. */
> #ifdef USE_X86LDOUBLE
> - memcpy(p, &env->fpregs[i], 10);
> + memcpy(mem_buf, &env->fpregs[n - (CPU_NB_REGS + 8)], 10);
> #else
> - memset(p, 0, 10);
> + memset(mem_buf, 0, 10);
> #endif
> - p += 10;
> + return 10;
> + } else if (n >= CPU_NB_REGS + 24) {
> + n -= CPU_NB_REGS + 24;
> + if (n < CPU_NB_REGS) {
> + stq_p(mem_buf, env->xmm_regs[n].XMM_Q(0));
> + stq_p(mem_buf + 8, env->xmm_regs[n].XMM_Q(1));
> + return 16;
> + } else if (n == CPU_NB_REGS) {
> + GET_REG32(env->mxcsr);
> + }
> + } else {
> + n -= CPU_NB_REGS;
> + switch (n) {
> + case 0: GET_REGL(env->eip);
> + case 1: GET_REG32(env->eflags);
> + case 2: GET_REG32(env->segs[R_CS].selector);
> + case 3: GET_REG32(env->segs[R_SS].selector);
> + case 4: GET_REG32(env->segs[R_DS].selector);
> + case 5: GET_REG32(env->segs[R_ES].selector);
> + case 6: GET_REG32(env->segs[R_FS].selector);
> + case 7: GET_REG32(env->segs[R_GS].selector);
> + /* 8...15 x87 regs. */
> + case 16: GET_REG32(env->fpuc);
> + case 17: GET_REG32((env->fpus & ~0x3800) | (env->fpstt &
> 0x7) << 11);
> + case 18: GET_REG32(0); /* ftag */
> + case 19: GET_REG32(0); /* fiseg */
> + case 20: GET_REG32(0); /* fioff */
> + case 21: GET_REG32(0); /* foseg */
> + case 22: GET_REG32(0); /* fooff */
> + case 23: GET_REG32(0); /* fop */
> + /* 24+ xmm regs. */
> + }
> }
> - *(uint32_t *)p = tswap32(env->fpuc); /* fctrl */
> - p += 4;
> - fpus = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11;
> - *(uint32_t *)p = tswap32(fpus); /* fstat */
> - p += 4;
> - *(uint32_t *)p = 0; /* ftag */
> - p += 4;
> - *(uint32_t *)p = 0; /* fiseg */
> - p += 4;
> - *(uint32_t *)p = 0; /* fioff */
> - p += 4;
> - *(uint32_t *)p = 0; /* foseg */
> - p += 4;
> - *(uint32_t *)p = 0; /* fooff */
> - p += 4;
> - *(uint32_t *)p = 0; /* fop */
> - p += 4;
> - for(i = 0; i < nb_regs; i++) {
> - *(uint64_t *)p = tswap64(env->xmm_regs[i].XMM_Q(0));
> - p += 8;
> - *(uint64_t *)p = tswap64(env->xmm_regs[i].XMM_Q(1));
> - p += 8;
> - }
> - *(uint32_t *)p = tswap32(env->mxcsr);
> - p += 4;
> - return p - mem_buf;
> + return 0;
> }
>
> -static inline void cpu_gdb_load_seg(CPUState *env, const uint8_t
> **pp,
> - int sreg)
> +static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf,
> int i)
> {
> - const uint8_t *p;
> - uint32_t sel;
> - p = *pp;
> - sel = tswap32(*(uint32_t *)p);
> - p += 4;
> - if (sel != env->segs[sreg].selector) {
> -#if defined(CONFIG_USER_ONLY)
> - cpu_x86_load_seg(env, sreg, sel);
> -#else
> - /* XXX: do it with a debug function which does not raise an
> - exception */
> -#endif
> - }
> - *pp = p;
> -}
> + uint32_t tmp;
>
> -static void cpu_gdb_write_registers(CPUState *env, uint8_t
> *mem_buf, int size)
> -{
> - const uint8_t *p = mem_buf;
> - int i, nb_regs;
> - uint16_t fpus;
> -
> -#ifdef TARGET_X86_64
> - if (env->hflags & HF_CS64_MASK) {
> - nb_regs = 16;
> - for(i = 0; i < 16; i++) {
> - env->regs[gdb_x86_64_regs[i]] = tswap64(*(uint64_t *)p);
> - p += 8;
> - }
> - env->eip = tswap64(*(uint64_t *)p);
> - p += 8;
> - } else
> + if (i < CPU_NB_REGS) {
> + env->regs[gpr_map[i]] = ldtul_p(mem_buf);
> + return sizeof(target_ulong);
> + } else if (i >= CPU_NB_REGS + 8 && i < CPU_NB_REGS + 16) {
> + i -= CPU_NB_REGS + 8;
> +#ifdef USE_X86LDOUBLE
> + memcpy(&env->fpregs[i], mem_buf, 10);
> #endif
> - {
> - nb_regs = 8;
> - for(i = 0; i < 8; i++) {
> - env->regs[i] = tswap32(*(uint32_t *)p);
> - p += 4;
> + return 10;
> + } else if (i >= CPU_NB_REGS + 24) {
> + i -= CPU_NB_REGS + 24;
> + if (i < CPU_NB_REGS) {
> + env->xmm_regs[i].XMM_Q(0) = ldq_p(mem_buf);
> + env->xmm_regs[i].XMM_Q(1) = ldq_p(mem_buf + 8);
> + return 16;
> + } else if (i == CPU_NB_REGS) {
> + env->mxcsr = ldl_p(mem_buf);
> + return 4;
> }
> - env->eip = tswap32(*(uint32_t *)p);
> - p += 4;
> - }
> - env->eflags = tswap32(*(uint32_t *)p);
> - p += 4;
> - cpu_gdb_load_seg(env, &p, R_CS);
> - cpu_gdb_load_seg(env, &p, R_SS);
> - cpu_gdb_load_seg(env, &p, R_DS);
> - cpu_gdb_load_seg(env, &p, R_ES);
> - cpu_gdb_load_seg(env, &p, R_FS);
> - cpu_gdb_load_seg(env, &p, R_GS);
> -
> - /* FPU state */
> - for(i = 0; i < 8; i++) {
> - /* XXX: convert floats */
> -#ifdef USE_X86LDOUBLE
> - memcpy(&env->fpregs[i], p, 10);
> + } else {
> + i -= CPU_NB_REGS;
> + switch (i) {
> + case 0: env->eip = ldtul_p(mem_buf); return
> sizeof(target_ulong);
> + case 1: env->eflags = ldl_p(mem_buf); return 4;
> +#if defined(CONFIG_USER_ONLY)
> +#define LOAD_SEG(index, sreg)\
> + tmp = ldl_p(mem_buf);\
> + if (tmp != env->segs[sreg].selector)\
> + cpu_x86_load_seg(env, sreg, tmp);
> +#else
> +/* FIXME: Honor segment registers. Needs to avoid raising an
> exception
> + when the selector is invalid. */
> +#define LOAD_SEG(index, sreg) do {} while(0)
> #endif
> - p += 10;
> - }
> - env->fpuc = tswap32(*(uint32_t *)p); /* fctrl */
> - p += 4;
> - fpus = tswap32(*(uint32_t *)p);
> - p += 4;
> - env->fpstt = (fpus >> 11) & 7;
> - env->fpus = fpus & ~0x3800;
> - p += 4 * 6;
> -
> - if (size >= ((p - mem_buf) + 16 * nb_regs + 4)) {
> - /* SSE state */
> - for(i = 0; i < nb_regs; i++) {
> - env->xmm_regs[i].XMM_Q(0) = tswap64(*(uint64_t *)p);
> - p += 8;
> - env->xmm_regs[i].XMM_Q(1) = tswap64(*(uint64_t *)p);
> - p += 8;
> + case 2: LOAD_SEG(10, R_CS); return 4;
> + case 3: LOAD_SEG(11, R_SS); return 4;
> + case 4: LOAD_SEG(12, R_DS); return 4;
> + case 5: LOAD_SEG(13, R_ES); return 4;
> + case 6: LOAD_SEG(14, R_FS); return 4;
> + case 7: LOAD_SEG(15, R_GS); return 4;
> + /* 8...15 x87 regs. */
> + case 16: env->fpuc = ldl_p(mem_buf); return 4;
> + case 17:
> + tmp = ldl_p(mem_buf);
> + env->fpstt = (tmp >> 11) & 7;
> + env->fpus = tmp & ~0x3800;
> + return 4;
> + case 18: /* ftag */ return 4;
> + case 19: /* fiseg */ return 4;
> + case 20: /* fioff */ return 4;
> + case 21: /* foseg */ return 4;
> + case 22: /* fooff */ return 4;
> + case 23: /* fop */ return 4;
> + /* 24+ xmm regs. */
> }
> - env->mxcsr = tswap32(*(uint32_t *)p);
> - p += 4;
> }
> + /* Unrecognised register. */
> + return 0;
> }
>
> #elif defined (TARGET_PPC)
> -static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
> +
> +#define NUM_CORE_REGS 71
> +
> +static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf,
> int n)
> {
> - uint32_t *registers = (uint32_t *)mem_buf, tmp;
> - int i;
> -
> - /* fill in gprs */
> - for(i = 0; i < 32; i++) {
> - registers[i] = tswapl(env->gpr[i]);
> + if (n < 32) {
> + /* gprs */
> + GET_REGL(env->gpr[n]);
> + } else if (n < 64) {
> + /* fprs */
> + stfq_p(mem_buf, env->fpr[n]);
> + return 8;
> + } else {
> + switch (n) {
> + case 64: GET_REGL(env->nip);
> + case 65: GET_REGL(env->msr);
> + case 66:
> + {
> + uint32_t cr = 0;
> + int i;
> + for (i = 0; i < 8; i++)
> + cr |= env->crf[i] << (32 - ((i + 1) * 4));
> + GET_REG32(cr);
> + }
> + case 67: GET_REGL(env->lr);
> + case 68: GET_REGL(env->ctr);
> + case 69: GET_REG32(ppc_load_xer(env));
> + case 70: GET_REG32(0); /* fpscr */
> + }
> }
> - /* fill in fprs */
> - for (i = 0; i < 32; i++) {
> - registers[(i * 2) + 32] = tswapl(*((uint32_t *)&env-
> >fpr[i]));
> - registers[(i * 2) + 33] = tswapl(*((uint32_t *)&env->fpr[i] + 1));
> - }
> - /* nip, msr, ccr, lnk, ctr, xer, mq */
> - registers[96] = tswapl(env->nip);
> - registers[97] = tswapl(env->msr);
> - tmp = 0;
> - for (i = 0; i < 8; i++)
> - tmp |= env->crf[i] << (32 - ((i + 1) * 4));
> - registers[98] = tswapl(tmp);
> - registers[99] = tswapl(env->lr);
> - registers[100] = tswapl(env->ctr);
> - registers[101] = tswapl(ppc_load_xer(env));
> - registers[102] = 0;
> -
> - return 103 * 4;
> + return 0;
> }
>
> -static void cpu_gdb_write_registers(CPUState *env, uint8_t
> *mem_buf, int size)
> +static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf,
> int n)
> {
> - uint32_t *registers = (uint32_t *)mem_buf;
> - int i;
> -
> - /* fill in gprs */
> - for (i = 0; i < 32; i++) {
> - env->gpr[i] = tswapl(registers[i]);
> + if (n < 32) {
> + /* gprs */
> + env->gpr[n] = ldtul_p(mem_buf);
> + return sizeof(target_ulong);
> + } else if (n < 64) {
> + /* fprs */
> + env->fpr[n] = ldfq_p(mem_buf);
> + return 8;
> + } else {
> + switch (n) {
> + case 64:
> + env->nip = ldtul_p(mem_buf);
> + return sizeof(target_ulong);
> + case 65:
> + ppc_store_msr(env, ldtul_p(mem_buf));
> + return sizeof(target_ulong);
> + case 66:
> + {
> + uint32_t cr = ldl_p(mem_buf);
> + int i;
> + for (i = 0; i < 8; i++)
> + env->crf[i] = (cr >> (32 - ((i + 1) * 4))) & 0xF;
> + return 4;
> + }
> + case 67:
> + env->lr = ldtul_p(mem_buf);
> + return sizeof(target_ulong);
> + case 68:
> + env->ctr = ldtul_p(mem_buf);
> + return sizeof(target_ulong);
> + case 69:
> + ppc_store_xer(env, ldl_p(mem_buf));
> + return 4;
> + case 70:
> + /* fpscr */
> + return 4;
> + }
> }
> - /* fill in fprs */
> - for (i = 0; i < 32; i++) {
> - *((uint32_t *)&env->fpr[i]) = tswapl(registers[(i * 2) +
> 32]);
> - *((uint32_t *)&env->fpr[i] + 1) = tswapl(registers[(i * 2) + 33]);
> - }
> - /* nip, msr, ccr, lnk, ctr, xer, mq */
> - env->nip = tswapl(registers[96]);
> - ppc_store_msr(env, tswapl(registers[97]));
> - registers[98] = tswapl(registers[98]);
> - for (i = 0; i < 8; i++)
> - env->crf[i] = (registers[98] >> (32 - ((i + 1) * 4))) & 0xF;
> - env->lr = tswapl(registers[99]);
> - env->ctr = tswapl(registers[100]);
> - ppc_store_xer(env, tswapl(registers[101]));
> + return 0;
> }
> +
> #elif defined (TARGET_SPARC)
> -#ifdef TARGET_ABI32
> -#define tswap_abi(val) tswap32(val &0xffffffff)
> +
> +#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
> +#define NUM_CORE_REGS 86
> #else
> -#define tswap_abi(val) tswapl(val)
> +#define NUM_CORE_REGS 73
> #endif
> -static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
> -{
> +
> #ifdef TARGET_ABI32
> - abi_ulong *registers = (abi_ulong *)mem_buf;
> +#define GET_REGA(val) GET_REG32(val)
> #else
> - target_ulong *registers = (target_ulong *)mem_buf;
> +#define GET_REGA(val) GET_REGL(val)
> #endif
> - int i;
>
> - /* fill in g0..g7 */
> - for(i = 0; i < 8; i++) {
> - registers[i] = tswap_abi(env->gregs[i]);
> +static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf,
> int n)
> +{
> + if (n < 8) {
> + /* g0..g7 */
> + GET_REGA(env->gregs[n]);
> }
> - /* fill in register window */
> - for(i = 0; i < 24; i++) {
> - registers[i + 8] = tswap_abi(env->regwptr[i]);
> + if (n < 32) {
> + /* register window */
> + GET_REGA(env->regwptr[n - 8]);
> }
> -#if !defined(TARGET_SPARC64) || defined(TARGET_ABI32)
> - /* fill in fprs */
> - for (i = 0; i < 32; i++) {
> - registers[i + 32] = tswap_abi(*((uint32_t *)&env->fpr[i]));
> +#if defined(TARGET_ABI32) || !defined(TARGET_SPARC64)
> + if (n < 64) {
> + /* fprs */
> + GET_REG32(*((uint32_t *)&env->fpr[n - 32]));
> }
> /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
> - registers[64] = tswap_abi(env->y);
> - {
> - uint32_t tmp;
> -
> - tmp = GET_PSR(env);
> - registers[65] = tswap32(tmp);
> + switch (n) {
> + case 64: GET_REGA(env->y);
> + case 65: GET_REGA(GET_PSR(env));
> + case 66: GET_REGA(env->wim);
> + case 67: GET_REGA(env->tbr);
> + case 68: GET_REGA(env->pc);
> + case 69: GET_REGA(env->npc);
> + case 70: GET_REGA(env->fsr);
> + case 71: GET_REGA(0); /* csr */
> + case 72: GET_REGA(0);
> }
> - registers[66] = tswap_abi(env->wim);
> - registers[67] = tswap_abi(env->tbr);
> - registers[68] = tswap_abi(env->pc);
> - registers[69] = tswap_abi(env->npc);
> - registers[70] = tswap_abi(env->fsr);
> - registers[71] = 0; /* csr */
> - registers[72] = 0;
> - return 73 * sizeof(uint32_t);
> #else
> - /* fill in fprs */
> - for (i = 0; i < 64; i += 2) {
> - uint64_t tmp;
> + if (n < 64) {
> + /* f0-f31 */
> + GET_REG32(*((uint32_t *)&env->fpr[n - 32]));
> + }
> + if (n < 80) {
> + /* f32-f62 (double width, even numbers only) */
> + uint64_t val;
>
> - tmp = ((uint64_t)*(uint32_t *)&env->fpr[i]) << 32;
> - tmp |= *(uint32_t *)&env->fpr[i + 1];
> - registers[i / 2 + 32] = tswap64(tmp);
> + val = (uint64_t)*((uint32_t *)&env->fpr[(n - 64) * 2 + 32])
> << 32;
> + val |= *((uint32_t *)&env->fpr[(n - 64) * 2 + 33]);
> + GET_REG64(val);
> }
> - registers[64] = tswapl(env->pc);
> - registers[65] = tswapl(env->npc);
> - registers[66] = tswapl(((uint64_t)GET_CCR(env) << 32) |
> + switch (n) {
> + case 80: GET_REGL(env->pc);
> + case 81: GET_REGL(env->npc);
> + case 82: GET_REGL(((uint64_t)GET_CCR(env) << 32) |
> ((env->asi & 0xff) << 24) |
> ((env->pstate & 0xfff) << 8) |
> GET_CWP64(env));
> - registers[67] = tswapl(env->fsr);
> - registers[68] = tswapl(env->fprs);
> - registers[69] = tswapl(env->y);
> - return 70 * sizeof(target_ulong);
> + case 83: GET_REGL(env->fsr);
> + case 84: GET_REGL(env->fprs);
> + case 85: GET_REGL(env->y);
> + }
> #endif
> + return 0;
> }
>
> -static void cpu_gdb_write_registers(CPUState *env, uint8_t
> *mem_buf, int size)
> +static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf,
> int n)
> {
> -#ifdef TARGET_ABI32
> - abi_ulong *registers = (abi_ulong *)mem_buf;
> +#if defined(TARGET_ABI32)
> + abi_ulong tmp;
> +
> + tmp = ldl_p(mem_buf);
> #else
> - target_ulong *registers = (target_ulong *)mem_buf;
> + target_ulong tmp;
> +
> + tmp = ldtul_p(mem_buf);
> #endif
> - int i;
>
> - /* fill in g0..g7 */
> - for(i = 0; i < 7; i++) {
> - env->gregs[i] = tswap_abi(registers[i]);
> + if (n < 8) {
> + /* g0..g7 */
> + env->gregs[n] = tmp;
> + } else if (n < 32) {
> + /* register window */
> + env->regwptr[n - 8] = tmp;
> }
> - /* fill in register window */
> - for(i = 0; i < 24; i++) {
> - env->regwptr[i] = tswap_abi(registers[i + 8]);
> +#if defined(TARGET_ABI32) || !defined(TARGET_SPARC64)
> + else if (n < 64) {
> + /* fprs */
> + *((uint32_t *)&env->fpr[n - 32]) = tmp;
> + } else {
> + /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
> + switch (n) {
> + case 64: env->y = tmp; break;
> + case 65: PUT_PSR(env, tmp); break;
> + case 66: env->wim = tmp; break;
> + case 67: env->tbr = tmp; break;
> + case 68: env->pc = tmp; break;
> + case 69: env->npc = tmp; break;
> + case 70: env->fsr = tmp; break;
> + default: return 0;
> + }
> }
> -#if !defined(TARGET_SPARC64) || defined(TARGET_ABI32)
> - /* fill in fprs */
> - for (i = 0; i < 32; i++) {
> - *((uint32_t *)&env->fpr[i]) = tswap_abi(registers[i + 32]);
> - }
> - /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
> - env->y = tswap_abi(registers[64]);
> - PUT_PSR(env, tswap_abi(registers[65]));
> - env->wim = tswap_abi(registers[66]);
> - env->tbr = tswap_abi(registers[67]);
> - env->pc = tswap_abi(registers[68]);
> - env->npc = tswap_abi(registers[69]);
> - env->fsr = tswap_abi(registers[70]);
> + return 4;
> #else
> - for (i = 0; i < 64; i += 2) {
> - uint64_t tmp;
> + else if (n < 64) {
> + /* f0-f31 */
> + uint32_t fpr;
>
> - tmp = tswap64(registers[i / 2 + 32]);
> - *((uint32_t *)&env->fpr[i]) = tmp >> 32;
> - *((uint32_t *)&env->fpr[i + 1]) = tmp & 0xffffffff;
> + env->fpr[n] = ldfl_p(mem_buf);
> + return 4;
> + } else if (n < 80) {
> + /* f32-f62 (double width, even numbers only) */
> + *((uint32_t *)&env->fpr[(n - 64) * 2 + 32]) = tmp >> 32;
> + *((uint32_t *)&env->fpr[(n - 64) * 2 + 33]) = tmp;
> + } else {
> + switch (n) {
> + case 80: env->pc = tmp; break;
> + case 81: env->npc = tmp; break;
> + case 82:
> + PUT_CCR(env, tmp >> 32);
> + env->asi = (tmp >> 24) & 0xff;
> + env->pstate = (tmp >> 8) & 0xfff;
> + PUT_CWP64(env, tmp & 0xff);
> + break;
> + case 83: env->fsr = tmp; break;
> + case 84: env->fprs = tmp; break;
> + case 85: env->y = tmp; break;
> + default: return 0;
> + }
> }
> - env->pc = tswapl(registers[64]);
> - env->npc = tswapl(registers[65]);
> - {
> - uint64_t tmp = tswapl(registers[66]);
> -
> - PUT_CCR(env, tmp >> 32);
> - env->asi = (tmp >> 24) & 0xff;
> - env->pstate = (tmp >> 8) & 0xfff;
> - PUT_CWP64(env, tmp & 0xff);
> - }
> - env->fsr = tswapl(registers[67]);
> - env->fprs = tswapl(registers[68]);
> - env->y = tswapl(registers[69]);
> + return 8;
> #endif
> }
> -#undef tswap_abi
> #elif defined (TARGET_ARM)
> -static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
> -{
> - int i;
> - uint8_t *ptr;
>
> - ptr = mem_buf;
> - /* 16 core integer registers (4 bytes each). */
> - for (i = 0; i < 16; i++)
> - {
> - *(uint32_t *)ptr = tswapl(env->regs[i]);
> - ptr += 4;
> - }
> - /* 8 FPA registers (12 bytes each), FPS (4 bytes).
> - Not yet implemented. */
> - memset (ptr, 0, 8 * 12 + 4);
> - ptr += 8 * 12 + 4;
> - /* CPSR (4 bytes). */
> - *(uint32_t *)ptr = tswapl (cpsr_read(env));
> - ptr += 4;
> +/* Old gdb always expect FPA registers. Newer (xml-aware) gdb only
> expect
> + whatever the target description contains. Due to a historical
> mishap
> + the FPA registers appear in between core integer regs and the
> CPSR.
> + We hack round this by giving the FPA regs zero size when talking
> to a
> + newer gdb. */
> +#define NUM_CORE_REGS 26
> +#define GDB_CORE_XML "arm-core.xml"
>
> - return ptr - mem_buf;
> -}
> -
> -static void cpu_gdb_write_registers(CPUState *env, uint8_t
> *mem_buf, int size)
> +static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf,
> int n)
> {
> - int i;
> - uint8_t *ptr;
> -
> - ptr = mem_buf;
> - /* Core integer registers. */
> - for (i = 0; i < 16; i++)
> - {
> - env->regs[i] = tswapl(*(uint32_t *)ptr);
> - ptr += 4;
> - }
> - /* Ignore FPA regs and scr. */
> - ptr += 8 * 12 + 4;
> - cpsr_write (env, tswapl(*(uint32_t *)ptr), 0xffffffff);
> -}
> -#elif defined (TARGET_M68K)
> -static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
> -{
> - int i;
> - uint8_t *ptr;
> - CPU_DoubleU u;
> -
> - ptr = mem_buf;
> - /* D0-D7 */
> - for (i = 0; i < 8; i++) {
> - *(uint32_t *)ptr = tswapl(env->dregs[i]);
> - ptr += 4;
> + if (n < 16) {
> + /* Core integer register. */
> + GET_REG32(env->regs[n]);
> }
> - /* A0-A7 */
> - for (i = 0; i < 8; i++) {
> - *(uint32_t *)ptr = tswapl(env->aregs[i]);
> - ptr += 4;
> + if (n < 24) {
> + /* FPA registers. */
> + if (gdb_has_xml)
> + return 0;
> + memset(mem_buf, 0, 12);
> + return 12;
> }
> - *(uint32_t *)ptr = tswapl(env->sr);
> - ptr += 4;
> - *(uint32_t *)ptr = tswapl(env->pc);
> - ptr += 4;
> - /* F0-F7. The 68881/68040 have 12-bit extended precision
> registers.
> - ColdFire has 8-bit double precision registers. */
> - for (i = 0; i < 8; i++) {
> - u.d = env->fregs[i];
> - *(uint32_t *)ptr = tswap32(u.l.upper);
> - *(uint32_t *)ptr = tswap32(u.l.lower);
> + switch (n) {
> + case 24:
> + /* FPA status register. */
> + if (gdb_has_xml)
> + return 0;
> + GET_REG32(0);
> + case 25:
> + /* CPSR */
> + GET_REG32(cpsr_read(env));
> }
> - /* FP control regs (not implemented). */
> - memset (ptr, 0, 3 * 4);
> - ptr += 3 * 4;
> -
> - return ptr - mem_buf;
> + /* Unknown register. */
> + return 0;
> }
>
> -static void cpu_gdb_write_registers(CPUState *env, uint8_t
> *mem_buf, int size)
> +static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf,
> int n)
> {
> - int i;
> - uint8_t *ptr;
> - CPU_DoubleU u;
> + uint32_t tmp;
>
> - ptr = mem_buf;
> - /* D0-D7 */
> - for (i = 0; i < 8; i++) {
> - env->dregs[i] = tswapl(*(uint32_t *)ptr);
> - ptr += 4;
> + tmp = ldl_p(mem_buf);
> +
> + /* Mask out low bit of PC to workaround gdb bugs. This will
> probably
> + cause problems if we ever implement the Jazelle DBX
> extensions. */
> + if (n == 15)
> + tmp &= ~1;
> +
> + if (n < 16) {
> + /* Core integer register. */
> + env->regs[n] = tmp;
> + return 4;
> }
> - /* A0-A7 */
> - for (i = 0; i < 8; i++) {
> - env->aregs[i] = tswapl(*(uint32_t *)ptr);
> - ptr += 4;
> + if (n < 24) { /* 16-23 */
> + /* FPA registers (ignored). */
> + if (gdb_has_xml)
> + return 0;
> + return 12;
> }
> - env->sr = tswapl(*(uint32_t *)ptr);
> - ptr += 4;
> - env->pc = tswapl(*(uint32_t *)ptr);
> - ptr += 4;
> - /* F0-F7. The 68881/68040 have 12-bit extended precision
> registers.
> - ColdFire has 8-bit double precision registers. */
> - for (i = 0; i < 8; i++) {
> - u.l.upper = tswap32(*(uint32_t *)ptr);
> - u.l.lower = tswap32(*(uint32_t *)ptr);
> - env->fregs[i] = u.d;
> + switch (n) {
> + case 24:
> + /* FPA status register (ignored). */
> + if (gdb_has_xml)
> + return 0;
> + return 4;
> + case 25:
> + /* CPSR */
> + cpsr_write (env, tmp, 0xffffffff);
> + return 4;
> }
> - /* FP control regs (not implemented). */
> - ptr += 3 * 4;
> + /* Unknown register. */
> + return 0;
> }
> -#elif defined (TARGET_MIPS)
> -static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
> -{
> - int i;
> - uint8_t *ptr;
>
> - ptr = mem_buf;
> - for (i = 0; i < 32; i++)
> - {
> - *(target_ulong *)ptr = tswapl(env->active_tc.gpr[i]);
> - ptr += sizeof(target_ulong);
> - }
> +#elif defined (TARGET_M68K)
>
> - *(target_ulong *)ptr = (int32_t)tswap32(env->CP0_Status);
> - ptr += sizeof(target_ulong);
> +#define NUM_CORE_REGS 18
>
> - *(target_ulong *)ptr = tswapl(env->active_tc.LO[0]);
> - ptr += sizeof(target_ulong);
> +#define GDB_CORE_XML "cf-core.xml"
>
> - *(target_ulong *)ptr = tswapl(env->active_tc.HI[0]);
> - ptr += sizeof(target_ulong);
> +static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf,
> int n)
> +{
> + if (n < 8) {
> + /* D0-D7 */
> + GET_REG32(env->dregs[n]);
> + } else if (n < 16) {
> + /* A0-A7 */
> + GET_REG32(env->aregs[n - 8]);
> + } else {
> + switch (n) {
> + case 16: GET_REG32(env->sr);
> + case 17: GET_REG32(env->pc);
> + }
> + }
> + /* FP registers not included here because they vary between
> + ColdFire and m68k. Use XML bits for these. */
> + return 0;
> +}
>
> - *(target_ulong *)ptr = tswapl(env->CP0_BadVAddr);
> - ptr += sizeof(target_ulong);
> +static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf,
> int n)
> +{
> + uint32_t tmp;
>
> - *(target_ulong *)ptr = (int32_t)tswap32(env->CP0_Cause);
> - ptr += sizeof(target_ulong);
> + tmp = ldl_p(mem_buf);
>
> - *(target_ulong *)ptr = tswapl(env->active_tc.PC);
> - ptr += sizeof(target_ulong);
> + if (n < 8) {
> + /* D0-D7 */
> + env->dregs[n] = tmp;
> + } else if (n < 8) {
> + /* A0-A7 */
> + env->aregs[n - 8] = tmp;
> + } else {
> + switch (n) {
> + case 16: env->sr = tmp; break;
> + case 17: env->pc = tmp; break;
> + default: return 0;
> + }
> + }
> + return 4;
> +}
> +#elif defined (TARGET_MIPS)
>
> - if (env->CP0_Config1 & (1 << CP0C1_FP))
> - {
> - for (i = 0; i < 32; i++)
> - {
> +#define NUM_CORE_REGS 73
> +
> +static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf,
> int n)
> +{
> + if (n < 32) {
> + GET_REGL(env->active_tc.gpr[n]);
> + }
> + if (env->CP0_Config1 & (1 << CP0C1_FP)) {
> + if (n >= 38 && n < 70) {
> if (env->CP0_Status & (1 << CP0St_FR))
> - *(target_ulong *)ptr = tswapl(env-
> >active_fpu.fpr[i].d);
> + GET_REGL(env->active_fpu.fpr[n - 38].d);
> else
> - *(target_ulong *)ptr = tswap32(env-
> >active_fpu.fpr[i].w[FP_ENDIAN_IDX]);
> - ptr += sizeof(target_ulong);
> - }
> + GET_REGL(env->active_fpu.fpr[n - 38].w[FP_ENDIAN_IDX]);
> + }
> + switch (n) {
> + case 70: GET_REGL((int32_t)env->active_fpu.fcr31);
> + case 71: GET_REGL((int32_t)env->active_fpu.fcr0);
> + }
> + }
> + switch (n) {
> + case 32: GET_REGL((int32_t)env->CP0_Status);
> + case 33: GET_REGL(env->active_tc.LO[0]);
> + case 34: GET_REGL(env->active_tc.HI[0]);
> + case 35: GET_REGL(env->CP0_BadVAddr);
> + case 36: GET_REGL((int32_t)env->CP0_Cause);
> + case 37: GET_REGL(env->active_tc.PC);
> + case 72: GET_REGL(0); /* fp */
> + case 89: GET_REGL((int32_t)env->CP0_PRid);
> + }
> + if (n >= 73 && n <= 88) {
> + /* 16 embedded regs. */
> + GET_REGL(0);
> + }
>
> - *(target_ulong *)ptr = (int32_t)tswap32(env-
> >active_fpu.fcr31);
> - ptr += sizeof(target_ulong);
> -
> - *(target_ulong *)ptr = (int32_t)tswap32(env-
> >active_fpu.fcr0);
> - ptr += sizeof(target_ulong);
> - }
> -
> - /* "fp", pseudo frame pointer. Not yet implemented in gdb. */
> - *(target_ulong *)ptr = 0;
> - ptr += sizeof(target_ulong);
> -
> - /* Registers for embedded use, we just pad them. */
> - for (i = 0; i < 16; i++)
> - {
> - *(target_ulong *)ptr = 0;
> - ptr += sizeof(target_ulong);
> - }
> -
> - /* Processor ID. */
> - *(target_ulong *)ptr = (int32_t)tswap32(env->CP0_PRid);
> - ptr += sizeof(target_ulong);
> -
> - return ptr - mem_buf;
> + return 0;
> }
>
> /* convert MIPS rounding mode in FCR31 to IEEE library */
> @@ -773,202 +801,355 @@
> #define RESTORE_ROUNDING_MODE \
> set_float_rounding_mode(ieee_rm[env->active_fpu.fcr31 & 3], &env-
> >active_fpu.fp_status)
>
> -static void cpu_gdb_write_registers(CPUState *env, uint8_t
> *mem_buf, int size)
> +static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf,
> int n)
> {
> - int i;
> - uint8_t *ptr;
> + target_ulong tmp;
>
> - ptr = mem_buf;
> - for (i = 0; i < 32; i++)
> - {
> - env->active_tc.gpr[i] = tswapl(*(target_ulong *)ptr);
> - ptr += sizeof(target_ulong);
> - }
> + tmp = ldtul_p(mem_buf);
>
> - env->CP0_Status = tswapl(*(target_ulong *)ptr);
> - ptr += sizeof(target_ulong);
> + if (n < 32) {
> + env->active_tc.gpr[n] = tmp;
> + return sizeof(target_ulong);
> + }
> + if (env->CP0_Config1 & (1 << CP0C1_FP)
> + && n >= 38 && n < 73) {
> + if (n < 70) {
> + if (env->CP0_Status & (1 << CP0St_FR))
> + env->active_fpu.fpr[n - 38].d = tmp;
> + else
> + env->active_fpu.fpr[n - 38].w[FP_ENDIAN_IDX] = tmp;
> + }
> + switch (n) {
> + case 70:
> + env->active_fpu.fcr31 = tmp & 0xFF83FFFF;
> + /* set rounding mode */
> + RESTORE_ROUNDING_MODE;
> +#ifndef CONFIG_SOFTFLOAT
> + /* no floating point exception for native float */
> + SET_FP_ENABLE(env->active_fpu.fcr31, 0);
> +#endif
> + break;
> + case 71: env->active_fpu.fcr0 = tmp; break;
> + }
> + return sizeof(target_ulong);
> + }
> + switch (n) {
> + case 32: env->CP0_Status = tmp; break;
> + case 33: env->active_tc.LO[0] = tmp; break;
> + case 34: env->active_tc.HI[0] = tmp; break;
> + case 35: env->CP0_BadVAddr = tmp; break;
> + case 36: env->CP0_Cause = tmp; break;
> + case 37: env->active_tc.PC = tmp; break;
> + case 72: /* fp, ignored */ break;
> + default:
> + if (n > 89)
> + return 0;
> + /* Other registers are readonly. Ignore writes. */
> + break;
> + }
>
> - env->active_tc.LO[0] = tswapl(*(target_ulong *)ptr);
> - ptr += sizeof(target_ulong);
> + return sizeof(target_ulong);
> +}
> +#elif defined (TARGET_SH4)
>
> - env->active_tc.HI[0] = tswapl(*(target_ulong *)ptr);
> - ptr += sizeof(target_ulong);
> +/* Hint: Use "set architecture sh4" in GDB to see fpu registers */
> +/* FIXME: We should use XML for this. */
>
> - env->CP0_BadVAddr = tswapl(*(target_ulong *)ptr);
> - ptr += sizeof(target_ulong);
> +#define NUM_CORE_REGS 59
>
> - env->CP0_Cause = tswapl(*(target_ulong *)ptr);
> - ptr += sizeof(target_ulong);
> +static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf,
> int n)
> +{
> + if (n < 8) {
> + if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
> + GET_REGL(env->gregs[n + 16]);
> + } else {
> + GET_REGL(env->gregs[n]);
> + }
> + } else if (n < 16) {
> + GET_REGL(env->gregs[n - 8]);
> + } else if (n >= 25 && n < 41) {
> + GET_REGL(env->fregs[(n - 25) + ((env->fpscr & FPSCR_FR) ? 16 : 0)]);
> + } else if (n >= 43 && n < 51) {
> + GET_REGL(env->gregs[n - 43]);
> + } else if (n >= 51 && n < 59) {
> + GET_REGL(env->gregs[n - (51 - 16)]);
> + }
> + switch (n) {
> + case 16: GET_REGL(env->pc);
> + case 17: GET_REGL(env->pr);
> + case 18: GET_REGL(env->gbr);
> + case 19: GET_REGL(env->vbr);
> + case 20: GET_REGL(env->mach);
> + case 21: GET_REGL(env->macl);
> + case 22: GET_REGL(env->sr);
> + case 23: GET_REGL(env->fpul);
> + case 24: GET_REGL(env->fpscr);
> + case 41: GET_REGL(env->ssr);
> + case 42: GET_REGL(env->spc);
> + }
>
> - env->active_tc.PC = tswapl(*(target_ulong *)ptr);
> - ptr += sizeof(target_ulong);
> + return 0;
> +}
>
> - if (env->CP0_Config1 & (1 << CP0C1_FP))
> - {
> - for (i = 0; i < 32; i++)
> - {
> - if (env->CP0_Status & (1 << CP0St_FR))
> - env->active_fpu.fpr[i].d = tswapl(*(target_ulong
> *)ptr);
> - else
> - env->active_fpu.fpr[i].w[FP_ENDIAN_IDX] =
> tswapl(*(target_ulong *)ptr);
> - ptr += sizeof(target_ulong);
> - }
> +static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf,
> int n)
> +{
> + uint32_t tmp;
>
> - env->active_fpu.fcr31 = tswapl(*(target_ulong *)ptr) &
> 0xFF83FFFF;
> - ptr += sizeof(target_ulong);
> + tmp = ldl_p(mem_buf);
>
> - /* The remaining registers are assumed to be read-only. */
> + if (n < 8) {
> + if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
> + env->gregs[n + 16] = tmp;
> + } else {
> + env->gregs[n] = tmp;
> + }
> + return 4;
> + } else if (n < 16) {
> + env->gregs[n - 8] = tmp;
> + return 4;
> + } else if (n >= 25 && n < 41) {
> + env->fregs[(n - 25) + ((env->fpscr & FPSCR_FR) ? 16 : 0)] = tmp;
> + } else if (n >= 43 && n < 51) {
> + env->gregs[n - 43] = tmp;
> + return 4;
> + } else if (n >= 51 && n < 59) {
> + env->gregs[n - (51 - 16)] = tmp;
> + return 4;
> + }
> + switch (n) {
> + case 16: env->pc = tmp;
> + case 17: env->pr = tmp;
> + case 18: env->gbr = tmp;
> + case 19: env->vbr = tmp;
> + case 20: env->mach = tmp;
> + case 21: env->macl = tmp;
> + case 22: env->sr = tmp;
> + case 23: env->fpul = tmp;
> + case 24: env->fpscr = tmp;
> + case 41: env->ssr = tmp;
> + case 42: env->spc = tmp;
> + default: return 0;
> + }
>
> - /* set rounding mode */
> - RESTORE_ROUNDING_MODE;
> -
> -#ifndef CONFIG_SOFTFLOAT
> - /* no floating point exception for native float */
> - SET_FP_ENABLE(env->fcr31, 0);
> -#endif
> - }
> + return 4;
> }
> -#elif defined (TARGET_SH4)
> +#elif defined (TARGET_CRIS)
>
> -/* Hint: Use "set architecture sh4" in GDB to see fpu registers */
> +#define NUM_CORE_REGS 49
>
> -static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
> +static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf,
> int n)
> {
> - uint32_t *ptr = (uint32_t *)mem_buf;
> - int i;
> + uint8_t srs;
>
> -#define SAVE(x) *ptr++=tswapl(x)
> - if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
> - for (i = 0; i < 8; i++) SAVE(env->gregs[i + 16]);
> - } else {
> - for (i = 0; i < 8; i++) SAVE(env->gregs[i]);
> - }
> - for (i = 8; i < 16; i++) SAVE(env->gregs[i]);
> - SAVE (env->pc);
> - SAVE (env->pr);
> - SAVE (env->gbr);
> - SAVE (env->vbr);
> - SAVE (env->mach);
> - SAVE (env->macl);
> - SAVE (env->sr);
> - SAVE (env->fpul);
> - SAVE (env->fpscr);
> - for (i = 0; i < 16; i++)
> - SAVE(env->fregs[i + ((env->fpscr & FPSCR_FR) ? 16 : 0)]);
> - SAVE (env->ssr);
> - SAVE (env->spc);
> - for (i = 0; i < 8; i++) SAVE(env->gregs[i]);
> - for (i = 0; i < 8; i++) SAVE(env->gregs[i + 16]);
> - return ((uint8_t *)ptr - mem_buf);
> + srs = env->pregs[PR_SRS];
> + if (n < 16) {
> + GET_REG32(env->regs[n]);
> + }
> +
> + if (n >= 21 && n < 32) {
> + GET_REG32(env->pregs[n - 16]);
> + }
> + if (n >= 33 && n < 49) {
> + GET_REG32(env->sregs[srs][n - 33]);
> + }
> + switch (n) {
> + case 16: GET_REG8(env->pregs[0]);
> + case 17: GET_REG8(env->pregs[1]);
> + case 18: GET_REG32(env->pregs[2]);
> + case 19: GET_REG8(srs);
> + case 20: GET_REG16(env->pregs[4]);
> + case 32: GET_REG32(env->pc);
> + }
> +
> + return 0;
> }
>
> -static void cpu_gdb_write_registers(CPUState *env, uint8_t
> *mem_buf, int size)
> +static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf,
> int n)
> {
> - uint32_t *ptr = (uint32_t *)mem_buf;
> - int i;
> + uint32_t tmp;
>
> -#define LOAD(x) (x)=*ptr++;
> - if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
> - for (i = 0; i < 8; i++) LOAD(env->gregs[i + 16]);
> - } else {
> - for (i = 0; i < 8; i++) LOAD(env->gregs[i]);
> - }
> - for (i = 8; i < 16; i++) LOAD(env->gregs[i]);
> - LOAD (env->pc);
> - LOAD (env->pr);
> - LOAD (env->gbr);
> - LOAD (env->vbr);
> - LOAD (env->mach);
> - LOAD (env->macl);
> - LOAD (env->sr);
> - LOAD (env->fpul);
> - LOAD (env->fpscr);
> - for (i = 0; i < 16; i++)
> - LOAD(env->fregs[i + ((env->fpscr & FPSCR_FR) ? 16 : 0)]);
> - LOAD (env->ssr);
> - LOAD (env->spc);
> - for (i = 0; i < 8; i++) LOAD(env->gregs[i]);
> - for (i = 0; i < 8; i++) LOAD(env->gregs[i + 16]);
> + if (n > 49)
> + return 0;
> +
> + tmp = ldl_p(mem_buf);
> +
> + if (n < 16) {
> + env->regs[n] = tmp;
> + }
> +
> + /* FIXME: Should other regs be writable? */
> + switch (n) {
> + case 16: return 1;
> + case 17: return 1;
> + case 18: return 4;
> + case 19: return 1;
> + case 20: return 2;
> + case 32: env->pc = tmp; break;
> + }
> +
> + return 4;
> }
> -#elif defined (TARGET_CRIS)
> +#else
>
> -static int cris_save_32 (unsigned char *d, uint32_t value)
> +#define NUM_CORE_REGS 0
> +
> +static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf,
> int n)
> {
> - *d++ = (value);
> - *d++ = (value >>= 8);
> - *d++ = (value >>= 8);
> - *d++ = (value >>= 8);
> - return 4;
> + return 0;
> }
> -static int cris_save_16 (unsigned char *d, uint32_t value)
> +
> +static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf,
> int n)
> {
> - *d++ = (value);
> - *d++ = (value >>= 8);
> - return 2;
> + return 0;
> }
> -static int cris_save_8 (unsigned char *d, uint32_t value)
> +
> +#endif
> +
> +static int num_g_regs = NUM_CORE_REGS;
> +
> +#ifdef GDB_CORE_XML
> +/* Encode data using the encoding for 'x' packets. */
> +static int memtox(char *buf, const char *mem, int len)
> {
> - *d++ = (value);
> - return 1;
> + char *p = buf;
> + char c;
> +
> + while (len--) {
> + c = *(mem++);
> + switch (c) {
> + case '#': case '$': case '*': case '}':
> + *(p++) = '}';
> + *(p++) = c ^ 0x20;
> + break;
> + default:
> + *(p++) = c;
> + break;
> + }
> + }
> + return p - buf;
> }
>
> -/* FIXME: this will bug on archs not supporting unaligned word
> accesses. */
> -static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
> +const char *get_feature_xml(CPUState *env, const char *p, const
> char **newp)
> {
> - uint8_t *ptr = mem_buf;
> - uint8_t srs;
> - int i;
> + extern const char *const xml_builtin[][2];
> + size_t len;
> + int i;
> + const char *name;
> + static char target_xml[1024];
>
> - for (i = 0; i < 16; i++)
> - ptr += cris_save_32 (ptr, env->regs[i]);
> + len = 0;
> + while (p[len] && p[len] != ':')
> + len++;
> + *newp = p + len;
>
> - srs = env->pregs[PR_SRS];
> + name = NULL;
> + if (strncmp(p, "target.xml", len) == 0) {
> + /* Generate the XML description for this CPU. */
> + if (!target_xml[0]) {
> + GDBRegisterState *r;
>
> - ptr += cris_save_8 (ptr, env->pregs[0]);
> - ptr += cris_save_8 (ptr, env->pregs[1]);
> - ptr += cris_save_32 (ptr, env->pregs[2]);
> - ptr += cris_save_8 (ptr, srs);
> - ptr += cris_save_16 (ptr, env->pregs[4]);
> + sprintf(target_xml,
> + "<?xml version=\"1.0\"?>"
> + "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">"
> + "<target>"
> + "<xi:include href=\"%s\"/>",
> + GDB_CORE_XML);
>
> - for (i = 5; i < 16; i++)
> - ptr += cris_save_32 (ptr, env->pregs[i]);
> + for (r = env->gdb_regs; r; r = r->next) {
> + strcat(target_xml, "<xi:include href=\"");
> + strcat(target_xml, r->xml);
> + strcat(target_xml, "\"/>");
> + }
> + strcat(target_xml, "</target>");
> + }
> + return target_xml;
> + }
> + for (i = 0; ; i++) {
> + name = xml_builtin[i][0];
> + if (!name || (strncmp(name, p, len) == 0 && strlen(name) ==
> len))
> + break;
> + }
> + return name ? xml_builtin[i][1] : NULL;
> +}
> +#endif
>
> - ptr += cris_save_32 (ptr, env->pc);
> +static int gdb_read_register(CPUState *env, uint8_t *mem_buf, int
> reg)
> +{
> + GDBRegisterState *r;
>
> - for (i = 0; i < 16; i++)
> - ptr += cris_save_32 (ptr, env->sregs[srs][i]);
> + if (reg < NUM_CORE_REGS)
> + return cpu_gdb_read_register(env, mem_buf, reg);
>
> - return ((uint8_t *)ptr - mem_buf);
> + for (r = env->gdb_regs; r; r = r->next) {
> + if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) {
> + return r->get_reg(env, mem_buf, reg - r->base_reg);
> + }
> + }
> + return 0;
> }
>
> -static void cpu_gdb_write_registers(CPUState *env, uint8_t
> *mem_buf, int size)
> +static int gdb_write_register(CPUState *env, uint8_t *mem_buf, int
> reg)
> {
> - uint32_t *ptr = (uint32_t *)mem_buf;
> - int i;
> + GDBRegisterState *r;
>
> -#define LOAD(x) (x)=*ptr++;
> - for (i = 0; i < 16; i++) LOAD(env->regs[i]);
> - LOAD (env->pc);
> -}
> -#else
> -static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
> -{
> + if (reg < NUM_CORE_REGS)
> + return cpu_gdb_write_register(env, mem_buf, reg);
> +
> + for (r = env->gdb_regs; r; r = r->next) {
> + if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) {
> + return r->set_reg(env, mem_buf, reg - r->base_reg);
> + }
> + }
> return 0;
> }
>
> -static void cpu_gdb_write_registers(CPUState *env, uint8_t
> *mem_buf, int size)
> +/* Register a supplemental set of CPU registers. If g_pos is
> nonzero it
> + specifies the first register number and these registers are
> included in
> + a standard "g" packet. Direction is relative to gdb, i.e.
> get_reg is
> + gdb reading a CPU register, and set_reg is gdb modifying a CPU
> register.
> + */
> +
> +void gdb_register_coprocessor(CPUState * env,
> + gdb_reg_cb get_reg, gdb_reg_cb set_reg,
> + int num_regs, const char *xml, int
> g_pos)
> {
> + GDBRegisterState *s;
> + GDBRegisterState **p;
> + static int last_reg = NUM_CORE_REGS;
> +
> + s = (GDBRegisterState *)qemu_mallocz(sizeof(GDBRegisterState));
> + s->base_reg = last_reg;
> + s->num_regs = num_regs;
> + s->get_reg = get_reg;
> + s->set_reg = set_reg;
> + s->xml = xml;
> + p = &env->gdb_regs;
> + while (*p) {
> + /* Check for duplicates. */
> + if (strcmp((*p)->xml, xml) == 0)
> + return;
> + p = &(*p)->next;
> + }
> + /* Add to end of list. */
> + last_reg += num_regs;
> + *p = s;
> + if (g_pos) {
> + if (g_pos != s->base_reg) {
> + fprintf(stderr, "Error: Bad gdb register numbering for
> '%s'\n"
> + "Expected %d got %d\n", xml, g_pos, s->base_reg);
> + } else {
> + num_g_regs = last_reg;
> + }
> + }
> }
>
> -#endif
> -
> static int gdb_handle_packet(GDBState *s, CPUState *env, const char
> *line_buf)
> {
> const char *p;
> int ch, reg_size, type;
> - char buf[4096];
> - uint8_t mem_buf[4096];
> - uint32_t *registers;
> + char buf[MAX_PACKET_LENGTH];
> + uint8_t mem_buf[MAX_PACKET_LENGTH];
> + uint8_t *registers;
> target_ulong addr, len;
>
> #ifdef DEBUG_GDB
> @@ -1073,15 +1254,23 @@
> }
> break;
> case 'g':
> - reg_size = cpu_gdb_read_registers(env, mem_buf);
> - memtohex(buf, mem_buf, reg_size);
> + len = 0;
> + for (addr = 0; addr < num_g_regs; addr++) {
> + reg_size = gdb_read_register(env, mem_buf + len, addr);
> + len += reg_size;
> + }
> + memtohex(buf, mem_buf, len);
> put_packet(s, buf);
> break;
> case 'G':
> - registers = (void *)mem_buf;
> + registers = mem_buf;
> len = strlen(p) / 2;
> hextomem((uint8_t *)registers, p, len);
> - cpu_gdb_write_registers(env, mem_buf, len);
> + for (addr = 0; addr < num_g_regs && len > 0; addr++) {
> + reg_size = gdb_write_register(env, registers, addr);
> + len -= reg_size;
> + registers += reg_size;
> + }
> put_packet(s, "OK");
> break;
> case 'm':
> @@ -1109,6 +1298,32 @@
> else
> put_packet(s, "OK");
> break;
> + case 'p':
> + /* Older gdb are really dumb, and don't use 'g' if 'p' is
> avaialable.
> + This works, but can be very slow. Anything new enough to
> + understand XML also knows how to use this properly. */
> + if (!gdb_has_xml)
> + goto unknown_command;
> + addr = strtoull(p, (char **)&p, 16);
> + reg_size = gdb_read_register(env, mem_buf, addr);
> + if (reg_size) {
> + memtohex(buf, mem_buf, reg_size);
> + put_packet(s, buf);
> + } else {
> + put_packet(s, "E14");
> + }
> + break;
> + case 'P':
> + if (!gdb_has_xml)
> + goto unknown_command;
> + addr = strtoull(p, (char **)&p, 16);
> + if (*p == '=')
> + p++;
> + reg_size = strlen(p) / 2;
> + hextomem(mem_buf, p, reg_size);
> + gdb_write_register(env, mem_buf, addr);
> + put_packet(s, "OK");
> + break;
> case 'Z':
> type = strtoul(p, (char **)&p, 16);
> if (*p == ',')
> @@ -1208,8 +1423,59 @@
> break;
> }
> #endif
> - /* Fall through. */
> + if (strncmp(p, "Supported", 9) == 0) {
> + sprintf(buf, "PacketSize=%x", MAX_PACKET_LENGTH);
> +#ifdef GDB_CORE_XML
> + strcat(buf, ";qXfer:features:read+");
> +#endif
> + put_packet(s, buf);
> + break;
> + }
> +#ifdef GDB_CORE_XML
> + if (strncmp(p, "Xfer:features:read:", 19) == 0) {
> + const char *xml;
> + target_ulong total_len;
> +
> + gdb_has_xml = 1;
> + p += 19;
> + xml = get_feature_xml(env, p, &p);
> + if (!xml) {
> + sprintf(buf, "E00");
> + put_packet(s, buf);
> + break;
> + }
> +
> + if (*p == ':')
> + p++;
> + addr = strtoul(p, (char **)&p, 16);
> + if (*p == ',')
> + p++;
> + len = strtoul(p, (char **)&p, 16);
> +
> + total_len = strlen(xml);
> + if (addr > total_len) {
> + sprintf(buf, "E00");
> + put_packet(s, buf);
> + break;
> + }
> + if (len > (MAX_PACKET_LENGTH - 5) / 2)
> + len = (MAX_PACKET_LENGTH - 5) / 2;
> + if (len < total_len - addr) {
> + buf[0] = 'm';
> + len = memtox(buf + 1, xml + addr, len);
> + } else {
> + buf[0] = 'l';
> + len = memtox(buf + 1, xml + addr, total_len - addr);
> + }
> + put_packet_binary(s, buf, len + 1);
> + break;
> + }
> +#endif
> + /* Unrecognised 'q' command. */
> + goto unknown_command;
> +
> default:
> + unknown_command:
> /* put empty packet */
> buf[0] = '\0';
> put_packet(s, buf);
> @@ -1487,6 +1753,7 @@
> memset (s, 0, sizeof (GDBState));
> s->env = first_cpu; /* XXX: allow to change CPU */
> s->fd = fd;
> + gdb_has_xml = 0;
>
> gdb_syscall_state = s;
>
> @@ -1536,7 +1803,9 @@
> #else
> static int gdb_chr_can_receive(void *opaque)
> {
> - return 1;
> + /* We can handle an arbitrarily large amount of data.
> + Pick the maximum packet size, which is as good as anything. */
> + return MAX_PACKET_LENGTH;
> }
>
> static void gdb_chr_receive(void *opaque, const uint8_t *buf, int
> size)
> @@ -1555,6 +1824,7 @@
> case CHR_EVENT_RESET:
> vm_stop(EXCP_INTERRUPT);
> gdb_syscall_state = opaque;
> + gdb_has_xml = 0;
> break;
> default:
> break;
>
> Modified: trunk/gdbstub.h
> ===================================================================
> --- trunk/gdbstub.h 2008-10-11 17:37:25 UTC (rev 5458)
> +++ trunk/gdbstub.h 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -15,5 +15,10 @@
> #else
> int gdbserver_start(const char *port);
> #endif
> +/* Get or set a register. Returns the size of the register. */
> +typedef int (*gdb_reg_cb)(CPUState *env, uint8_t *buf, int reg);
> +void gdb_register_coprocessor(CPUState *env,
> + gdb_reg_cb get_reg, gdb_reg_cb set_reg,
> + int num_regs, const char *xml, int
> g_pos);
>
> #endif
>
> Modified: trunk/target-arm/helper.c
> ===================================================================
> --- trunk/target-arm/helper.c 2008-10-11 17:37:25 UTC (rev 5458)
> +++ trunk/target-arm/helper.c 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -173,6 +173,58 @@
> tlb_flush(env, 1);
> }
>
> +static int vfp_gdb_get_reg(CPUState *env, uint8_t *buf, int reg)
> +{
> + int nregs;
> +
> + /* VFP data registers are always little-endian. */
> + nregs = arm_feature(env, ARM_FEATURE_VFP3) ? 32 : 16;
> + if (reg < nregs) {
> + stfq_le_p(buf, env->vfp.regs[reg]);
> + return 8;
> + }
> + if (arm_feature(env, ARM_FEATURE_NEON)) {
> + /* Aliases for Q regs. */
> + nregs += 16;
> + if (reg < nregs) {
> + stfq_le_p(buf, env->vfp.regs[(reg - 32) * 2]);
> + stfq_le_p(buf + 8, env->vfp.regs[(reg - 32) * 2 + 1]);
> + return 16;
> + }
> + }
> + switch (reg - nregs) {
> + case 0: stl_p(buf, env->vfp.xregs[ARM_VFP_FPSID]); return 4;
> + case 1: stl_p(buf, env->vfp.xregs[ARM_VFP_FPSCR]); return 4;
> + case 2: stl_p(buf, env->vfp.xregs[ARM_VFP_FPEXC]); return 4;
> + }
> + return 0;
> +}
> +
> +static int vfp_gdb_set_reg(CPUState *env, uint8_t *buf, int reg)
> +{
> + int nregs;
> +
> + nregs = arm_feature(env, ARM_FEATURE_VFP3) ? 32 : 16;
> + if (reg < nregs) {
> + env->vfp.regs[reg] = ldfq_le_p(buf);
> + return 8;
> + }
> + if (arm_feature(env, ARM_FEATURE_NEON)) {
> + nregs += 16;
> + if (reg < nregs) {
> + env->vfp.regs[(reg - 32) * 2] = ldfq_le_p(buf);
> + env->vfp.regs[(reg - 32) * 2 + 1] = ldfq_le_p(buf + 8);
> + return 16;
> + }
> + }
> + switch (reg - nregs) {
> + case 0: env->vfp.xregs[ARM_VFP_FPSID] = ldl_p(buf); return 4;
> + case 1: env->vfp.xregs[ARM_VFP_FPSCR] = ldl_p(buf); return 4;
> + case 2: env->vfp.xregs[ARM_VFP_FPEXC] = ldl_p(buf); return 4;
> + }
> + return 0;
> +}
> +
> CPUARMState *cpu_arm_init(const char *cpu_model)
> {
> CPUARMState *env;
> @@ -194,6 +246,16 @@
> env->cpu_model_str = cpu_model;
> env->cp15.c0_cpuid = id;
> cpu_reset(env);
> + if (arm_feature(env, ARM_FEATURE_NEON)) {
> + gdb_register_coprocessor(env, vfp_gdb_get_reg,
> vfp_gdb_set_reg,
> + 51, "arm-neon.xml", 0);
> + } else if (arm_feature(env, ARM_FEATURE_VFP3)) {
> + gdb_register_coprocessor(env, vfp_gdb_get_reg,
> vfp_gdb_set_reg,
> + 35, "arm-vfp3.xml", 0);
> + } else if (arm_feature(env, ARM_FEATURE_VFP)) {
> + gdb_register_coprocessor(env, vfp_gdb_get_reg,
> vfp_gdb_set_reg,
> + 19, "arm-vfp.xml", 0);
> + }
> return env;
> }
>
>
> Modified: trunk/target-m68k/helper.c
> ===================================================================
> --- trunk/target-m68k/helper.c 2008-10-11 17:37:25 UTC (rev 5458)
> +++ trunk/target-m68k/helper.c 2008-10-11 17:55:29 UTC (rev 5459)
> @@ -26,6 +26,7 @@
> #include "cpu.h"
> #include "exec-all.h"
> #include "qemu-common.h"
> +#include "gdbstub.h"
>
> #include "helpers.h"
>
> @@ -53,6 +54,33 @@
> {NULL, 0},
> };
>
> +static int fpu_gdb_get_reg(CPUState *env, uint8_t *mem_buf, int n)
> +{
> + if (n < 8) {
> + stfq_p(mem_buf, env->fregs[n]);
> + return 8;
> + }
> + if (n < 11) {
> + /* FP control registers (not implemented) */
> + memset(mem_buf, 0, 4);
> + return 4;
> + }
> + return 0;
> +}
> +
> +static int fpu_gdb_set_reg(CPUState *env, uint8_t *mem_buf, int n)
> +{
> + if (n < 8) {
> + env->fregs[n] = ldfq_p(mem_buf);
> + return 8;
> + }
> + if (n < 11) {
> + /* FP control registers (not implemented) */
> + return 4;
> + }
> + return 0;
> +}
> +
> static void m68k_set_feature(CPUM68KState *env, int feature)
> {
> env->features |= (1u << feature);
> @@ -105,6 +133,11 @@
> }
>
> register_m68k_insns(env);
> + if (m68k_feature (env, M68K_FEATURE_CF_FPU)) {
> + gdb_register_coprocessor(env, fpu_gdb_get_reg,
> fpu_gdb_set_reg,
> + 11, "cf-fp.xml", 18);
> + }
> + /* TODO: Add [E]MAC registers. */
> return 0;
> }
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 131025 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-10-12 3:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-11 17:55 [Qemu-devel] [5459] Add GDB XML register description support Paul Brook
2008-10-11 18:16 ` Edgar E. Iglesias
2008-10-12 3:55 ` C.W. Betts
2008-10-12 3:55 ` C.W. Betts
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.