[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/25] target-m68k: Move cpu_gdb_{read, write}_regist
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 12/25] target-m68k: Move cpu_gdb_{read, write}_register() |
Date: |
Sat, 27 Jul 2013 00:05:37 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
gdbstub.c | 47 +-----------------------------------
target-m68k/gdbstub.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 46 deletions(-)
create mode 100644 target-m68k/gdbstub.c
diff --git a/gdbstub.c b/gdbstub.c
index 73e6411..3ed2bfe 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -546,53 +546,8 @@ static int put_packet(GDBState *s, const char *buf)
#define GDB_CORE_XML "cf-core.xml"
-static int cpu_gdb_read_register(CPUM68KState *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;
-}
-
-static int cpu_gdb_write_register(CPUM68KState *env, uint8_t *mem_buf, int n)
-{
- uint32_t tmp;
-
- tmp = ldl_p(mem_buf);
+#include "target-m68k/gdbstub.c"
- if (n < 8) {
- /* D0-D7 */
- env->dregs[n] = tmp;
- } else if (n < 16) {
- /* 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)
static int cpu_gdb_read_register(CPUMIPSState *env, uint8_t *mem_buf, int n)
diff --git a/target-m68k/gdbstub.c b/target-m68k/gdbstub.c
new file mode 100644
index 0000000..2eb4b98
--- /dev/null
+++ b/target-m68k/gdbstub.c
@@ -0,0 +1,67 @@
+/*
+ * m68k gdb server stub
+ *
+ * Copyright (c) 2003-2005 Fabrice Bellard
+ * Copyright (c) 2013 SUSE LINUX Products GmbH
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+static int cpu_gdb_read_register(CPUM68KState *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;
+}
+
+static int cpu_gdb_write_register(CPUM68KState *env, uint8_t *mem_buf, int n)
+{
+ uint32_t tmp;
+
+ tmp = ldl_p(mem_buf);
+
+ if (n < 8) {
+ /* D0-D7 */
+ env->dregs[n] = tmp;
+ } else if (n < 16) {
+ /* 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;
+}
--
1.8.1.4
- [Qemu-devel] [PULL 00/25] QOM CPUState patch queue 2013-07-26, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 01/25] linux-user: Avoid redundant ENV_GET_CPU(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 03/25] target-s390x: Fix CPUState rework fallout, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 02/25] kvm: Change prototype of kvm_update_guest_debug(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 04/25] target-xtensa: Introduce XtensaCPU subclasses, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 06/25] gdbstub: Drop dead code in cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 09/25] target-ppc: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 05/25] gdbstub: Fix cpu_gdb_{read, write}_register() Coding Style, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 12/25] target-m68k: Move cpu_gdb_{read, write}_register(),
Andreas Färber <=
- [Qemu-devel] [PULL 08/25] target-i386: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 11/25] target-arm: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 07/25] cpu: Introduce CPUState::gdb_num_regs and CPUClass::gdb_num_core_regs, Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 14/25] target-openrisc: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 10/25] target-sparc: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 16/25] target-microblaze: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 15/25] target-sh4: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 17/25] target-cris: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 18/25] target-alpha: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26
- [Qemu-devel] [PULL 13/25] target-mips: Move cpu_gdb_{read, write}_register(), Andreas Färber, 2013/07/26