From patchwork Sun Jul 7 18:26:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 257392 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E1E8F2C009D for ; Mon, 8 Jul 2013 05:42:26 +1000 (EST) Received: from localhost ([::1]:55229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvtmK-0005Qy-VK for incoming@patchwork.ozlabs.org; Sun, 07 Jul 2013 14:33:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uvtj8-0002IY-DF for qemu-devel@nongnu.org; Sun, 07 Jul 2013 14:30:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uvtj5-00061E-N8 for qemu-devel@nongnu.org; Sun, 07 Jul 2013 14:30:26 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58172 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uvtg6-0004yj-Mb for qemu-devel@nongnu.org; Sun, 07 Jul 2013 14:27:18 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 28BFFA5359; Sun, 7 Jul 2013 20:27:18 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 7 Jul 2013 20:26:26 +0200 Message-Id: <1373221591-17091-38-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1373221591-17091-1-git-send-email-afaerber@suse.de> References: <1373221591-17091-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Michael Walle , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH qom-cpu v2 37/42] target-lm32: Move cpu_gdb_{read, write}_register() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Acked-by: Michael Walle Signed-off-by: Andreas Färber --- gdbstub.c | 66 +-------------------------------------- target-lm32/gdbstub.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 65 deletions(-) create mode 100644 target-lm32/gdbstub.c diff --git a/gdbstub.c b/gdbstub.c index 333f1a6..853f09d 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -578,72 +578,8 @@ static int put_packet(GDBState *s, const char *buf) #elif defined (TARGET_LM32) -#include "hw/lm32/lm32_pic.h" +#include "target-lm32/gdbstub.c" -static int cpu_gdb_read_register(CPULM32State *env, uint8_t *mem_buf, int n) -{ - if (n < 32) { - GET_REG32(env->regs[n]); - } else { - switch (n) { - case 32: - GET_REG32(env->pc); - /* FIXME: put in right exception ID */ - case 33: - GET_REG32(0); - case 34: - GET_REG32(env->eba); - case 35: - GET_REG32(env->deba); - case 36: - GET_REG32(env->ie); - case 37: - GET_REG32(lm32_pic_get_im(env->pic_state)); - case 38: - GET_REG32(lm32_pic_get_ip(env->pic_state)); - } - } - return 0; -} - -static int cpu_gdb_write_register(CPULM32State *env, uint8_t *mem_buf, int n) -{ - LM32CPU *cpu = lm32_env_get_cpu(env); - CPUClass *cc = CPU_GET_CLASS(cpu); - uint32_t tmp; - - if (n > cc->gdb_num_core_regs) { - return 0; - } - - tmp = ldl_p(mem_buf); - - if (n < 32) { - env->regs[n] = tmp; - } else { - switch (n) { - case 32: - env->pc = tmp; - break; - case 34: - env->eba = tmp; - break; - case 35: - env->deba = tmp; - break; - case 36: - env->ie = tmp; - break; - case 37: - lm32_pic_set_im(env->pic_state, tmp); - break; - case 38: - lm32_pic_set_ip(env->pic_state, tmp); - break; - } - } - return 4; -} #elif defined(TARGET_XTENSA) static int cpu_gdb_read_register(CPUXtensaState *env, uint8_t *mem_buf, int n) diff --git a/target-lm32/gdbstub.c b/target-lm32/gdbstub.c new file mode 100644 index 0000000..732a633 --- /dev/null +++ b/target-lm32/gdbstub.c @@ -0,0 +1,85 @@ +/* + * LM32 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 . + */ +#include "hw/lm32/lm32_pic.h" + +static int cpu_gdb_read_register(CPULM32State *env, uint8_t *mem_buf, int n) +{ + if (n < 32) { + GET_REG32(env->regs[n]); + } else { + switch (n) { + case 32: + GET_REG32(env->pc); + /* FIXME: put in right exception ID */ + case 33: + GET_REG32(0); + case 34: + GET_REG32(env->eba); + case 35: + GET_REG32(env->deba); + case 36: + GET_REG32(env->ie); + case 37: + GET_REG32(lm32_pic_get_im(env->pic_state)); + case 38: + GET_REG32(lm32_pic_get_ip(env->pic_state)); + } + } + return 0; +} + +static int cpu_gdb_write_register(CPULM32State *env, uint8_t *mem_buf, int n) +{ + LM32CPU *cpu = lm32_env_get_cpu(env); + CPUClass *cc = CPU_GET_CLASS(cpu); + uint32_t tmp; + + if (n > cc->gdb_num_core_regs) { + return 0; + } + + tmp = ldl_p(mem_buf); + + if (n < 32) { + env->regs[n] = tmp; + } else { + switch (n) { + case 32: + env->pc = tmp; + break; + case 34: + env->eba = tmp; + break; + case 35: + env->deba = tmp; + break; + case 36: + env->ie = tmp; + break; + case 37: + lm32_pic_set_im(env->pic_state, tmp); + break; + case 38: + lm32_pic_set_ip(env->pic_state, tmp); + break; + } + } + return 4; +}