OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix tricore gdbstub. 

Fix superh_cpu_synchronize_from_tb.
 -----BEGIN PGP SIGNATURE-----
 
 iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmOfUoYdHHJpY2hhcmQu
 aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV/K6Qf/cjHB3F0lBZ9m2tSe
 8abYuil9Bn8tJ+cOFMjpPTjxs+zPEhOYr628jcXAjH7xXOiOAkQHwFp09JJpCJor
 BIYaB0z5SR3Ooaq9+FsdtNnHnF8jjAVdAcdxur/NFU5ci02v+ezz353opsA0IY1D
 LrNyrNALuwRcpsqMcf4X0X3jzKXjYJHuIRiYnmqSF6X7cGD2NeIgVo7wjuOvGQuQ
 uiLTArTsjqGosi2rVkZ0ukHtmjpcvhsZRmq23i1FryR9RXLcc8KKyoiT16q1rNhD
 xRdEPGKmnKo7J5UOBsH0JUyn+LoN/EAuaZ+cqYsIHF+P4VgXblUXBHwNhopYFZAd
 KP9CFg==
 =Q1d4
 -----END PGP SIGNATURE-----

Merge tag 'pull-misc-20221218' of https://gitlab.com/rth7680/qemu into staging

Fix tricore gdbstub.
Fix superh_cpu_synchronize_from_tb.

# gpg: Signature made Sun 18 Dec 2022 17:48:54 GMT
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* tag 'pull-misc-20221218' of https://gitlab.com/rth7680/qemu:
  target/tricore: Fix gdbstub write to address registers
  target/sh4: Mask restore of env->flags from tb->flags

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2022-12-19 10:28:57 +00:00
parent 4f9a4cd37e 3b1371159c
commit c15dc499cc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/sh4/cpu.c
View File

@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs,
SuperHCPU *cpu = SUPERH_CPU(cs);
cpu->env.pc = tb_pc(tb);
cpu->env.flags = tb->flags;
cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK;
}
static void superh_restore_state_to_opc(CPUState *cs,

2
target/tricore/gdbstub.c
View File

@ -130,7 +130,7 @@ int tricore_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
if (n < 16) { /* data registers */
env->gpr_d[n] = tmp;
} else if (n < 32) { /* address registers */
env->gpr_d[n - 16] = tmp;
env->gpr_a[n - 16] = tmp;
} else {
tricore_cpu_gdb_write_csfr(env, n, tmp);
}