mirror of
https://gitlab.com/qemu-project/qemu.git
synced 2024-11-11 19:21:34 +03:00
target/microblaze: Add gdbstub xml
Mirroring the upstream gdb xml files, the two stack boundary registers are separated out. Reviewed-by: Edgar E. Iglesias <edgar@zeroasic.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
d7d5601c78
commit
c3bef3b4de
@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=common
|
||||
TARGET_SYSTBL=syscall.tbl
|
||||
TARGET_BIG_ENDIAN=y
|
||||
TARGET_HAS_BFLT=y
|
||||
TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml
|
||||
|
@ -2,3 +2,4 @@ TARGET_ARCH=microblaze
|
||||
TARGET_BIG_ENDIAN=y
|
||||
TARGET_SUPPORTS_MTTCG=y
|
||||
TARGET_NEED_FDT=y
|
||||
TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml
|
||||
|
@ -2,3 +2,4 @@ TARGET_ARCH=microblaze
|
||||
TARGET_SYSTBL_ABI=common
|
||||
TARGET_SYSTBL=syscall.tbl
|
||||
TARGET_HAS_BFLT=y
|
||||
TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml
|
||||
|
@ -1,3 +1,4 @@
|
||||
TARGET_ARCH=microblaze
|
||||
TARGET_SUPPORTS_MTTCG=y
|
||||
TARGET_NEED_FDT=y
|
||||
TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml
|
||||
|
67
gdb-xml/microblaze-core.xml
Normal file
67
gdb-xml/microblaze-core.xml
Normal file
@ -0,0 +1,67 @@
|
||||
<?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.microblaze.core">
|
||||
<reg name="r0" bitsize="32" regnum="0"/>
|
||||
<reg name="r1" bitsize="32" type="data_ptr"/>
|
||||
<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="r13" bitsize="32"/>
|
||||
<reg name="r14" bitsize="32"/>
|
||||
<reg name="r15" bitsize="32"/>
|
||||
<reg name="r16" bitsize="32"/>
|
||||
<reg name="r17" bitsize="32"/>
|
||||
<reg name="r18" bitsize="32"/>
|
||||
<reg name="r19" bitsize="32"/>
|
||||
<reg name="r20" bitsize="32"/>
|
||||
<reg name="r21" bitsize="32"/>
|
||||
<reg name="r22" bitsize="32"/>
|
||||
<reg name="r23" bitsize="32"/>
|
||||
<reg name="r24" bitsize="32"/>
|
||||
<reg name="r25" bitsize="32"/>
|
||||
<reg name="r26" bitsize="32"/>
|
||||
<reg name="r27" bitsize="32"/>
|
||||
<reg name="r28" bitsize="32"/>
|
||||
<reg name="r29" bitsize="32"/>
|
||||
<reg name="r30" bitsize="32"/>
|
||||
<reg name="r31" bitsize="32"/>
|
||||
<reg name="rpc" bitsize="32" type="code_ptr"/>
|
||||
<reg name="rmsr" bitsize="32"/>
|
||||
<reg name="rear" bitsize="32"/>
|
||||
<reg name="resr" bitsize="32"/>
|
||||
<reg name="rfsr" bitsize="32"/>
|
||||
<reg name="rbtr" bitsize="32"/>
|
||||
<reg name="rpvr0" bitsize="32"/>
|
||||
<reg name="rpvr1" bitsize="32"/>
|
||||
<reg name="rpvr2" bitsize="32"/>
|
||||
<reg name="rpvr3" bitsize="32"/>
|
||||
<reg name="rpvr4" bitsize="32"/>
|
||||
<reg name="rpvr5" bitsize="32"/>
|
||||
<reg name="rpvr6" bitsize="32"/>
|
||||
<reg name="rpvr7" bitsize="32"/>
|
||||
<reg name="rpvr8" bitsize="32"/>
|
||||
<reg name="rpvr9" bitsize="32"/>
|
||||
<reg name="rpvr10" bitsize="32"/>
|
||||
<reg name="rpvr11" bitsize="32"/>
|
||||
<reg name="redr" bitsize="32"/>
|
||||
<reg name="rpid" bitsize="32"/>
|
||||
<reg name="rzpr" bitsize="32"/>
|
||||
<reg name="rtlbx" bitsize="32"/>
|
||||
<reg name="rtlbsx" bitsize="32"/>
|
||||
<reg name="rtlblo" bitsize="32"/>
|
||||
<reg name="rtlbhi" bitsize="32"/>
|
||||
</feature>
|
12
gdb-xml/microblaze-stack-protect.xml
Normal file
12
gdb-xml/microblaze-stack-protect.xml
Normal file
@ -0,0 +1,12 @@
|
||||
<?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.microblaze.stack-protect">
|
||||
<reg name="rslr" bitsize="32"/>
|
||||
<reg name="rshr" bitsize="32"/>
|
||||
</feature>
|
@ -28,6 +28,7 @@
|
||||
#include "qemu/module.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "exec/exec-all.h"
|
||||
#include "exec/gdbstub.h"
|
||||
#include "fpu/softfloat-helpers.h"
|
||||
|
||||
static const struct {
|
||||
@ -294,6 +295,9 @@ static void mb_cpu_initfn(Object *obj)
|
||||
CPUMBState *env = &cpu->env;
|
||||
|
||||
cpu_set_cpustate_pointers(cpu);
|
||||
gdb_register_coprocessor(CPU(cpu), mb_cpu_gdb_read_stack_protect,
|
||||
mb_cpu_gdb_write_stack_protect, 2,
|
||||
"microblaze-stack-protect.xml", 0);
|
||||
|
||||
set_float_rounding_mode(float_round_nearest_even, &env->fp_status);
|
||||
|
||||
@ -422,7 +426,8 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)
|
||||
cc->sysemu_ops = &mb_sysemu_ops;
|
||||
#endif
|
||||
device_class_set_props(dc, mb_properties);
|
||||
cc->gdb_num_core_regs = 32 + 27;
|
||||
cc->gdb_num_core_regs = 32 + 25;
|
||||
cc->gdb_core_xml_file = "microblaze-core.xml";
|
||||
|
||||
cc->disas_set_info = mb_disas_set_info;
|
||||
cc->tcg_ops = &mb_tcg_ops;
|
||||
|
@ -367,6 +367,8 @@ hwaddr mb_cpu_get_phys_page_attrs_debug(CPUState *cpu, vaddr addr,
|
||||
MemTxAttrs *attrs);
|
||||
int mb_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
|
||||
int mb_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
|
||||
int mb_cpu_gdb_read_stack_protect(CPUArchState *cpu, GByteArray *buf, int reg);
|
||||
int mb_cpu_gdb_write_stack_protect(CPUArchState *cpu, uint8_t *buf, int reg);
|
||||
|
||||
static inline uint32_t mb_cpu_read_msr(const CPUMBState *env)
|
||||
{
|
||||
|
@ -39,8 +39,11 @@ enum {
|
||||
GDB_PVR0 = 32 + 6,
|
||||
GDB_PVR11 = 32 + 17,
|
||||
GDB_EDR = 32 + 18,
|
||||
GDB_SLR = 32 + 25,
|
||||
GDB_SHR = 32 + 26,
|
||||
};
|
||||
|
||||
enum {
|
||||
GDB_SP_SHL,
|
||||
GDB_SP_SHR,
|
||||
};
|
||||
|
||||
int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
|
||||
@ -83,12 +86,6 @@ int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
|
||||
case GDB_EDR:
|
||||
val = env->edr;
|
||||
break;
|
||||
case GDB_SLR:
|
||||
val = env->slr;
|
||||
break;
|
||||
case GDB_SHR:
|
||||
val = env->shr;
|
||||
break;
|
||||
default:
|
||||
/* Other SRegs aren't modeled, so report a value of 0 */
|
||||
val = 0;
|
||||
@ -97,6 +94,23 @@ int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
|
||||
return gdb_get_reg32(mem_buf, val);
|
||||
}
|
||||
|
||||
int mb_cpu_gdb_read_stack_protect(CPUMBState *env, GByteArray *mem_buf, int n)
|
||||
{
|
||||
uint32_t val;
|
||||
|
||||
switch (n) {
|
||||
case GDB_SP_SHL:
|
||||
val = env->slr;
|
||||
break;
|
||||
case GDB_SP_SHR:
|
||||
val = env->shr;
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
return gdb_get_reg32(mem_buf, val);
|
||||
}
|
||||
|
||||
int mb_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
|
||||
{
|
||||
MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs);
|
||||
@ -135,12 +149,21 @@ int mb_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
|
||||
case GDB_EDR:
|
||||
env->edr = tmp;
|
||||
break;
|
||||
case GDB_SLR:
|
||||
env->slr = tmp;
|
||||
break;
|
||||
case GDB_SHR:
|
||||
env->shr = tmp;
|
||||
break;
|
||||
}
|
||||
return 4;
|
||||
}
|
||||
|
||||
int mb_cpu_gdb_write_stack_protect(CPUMBState *env, uint8_t *mem_buf, int n)
|
||||
{
|
||||
switch (n) {
|
||||
case GDB_SP_SHL:
|
||||
env->slr = ldl_p(mem_buf);
|
||||
break;
|
||||
case GDB_SP_SHR:
|
||||
env->shr = ldl_p(mem_buf);
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
return 4;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user