From patchwork Wed Aug 17 20:53:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryce Lanham X-Patchwork-Id: 110355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 59632B6F8C for ; Thu, 18 Aug 2011 06:53:52 +1000 (EST) Received: from localhost ([::1]:41835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn7V-0002ma-OS for incoming@patchwork.ozlabs.org; Wed, 17 Aug 2011 16:53:49 -0400 Received: from eggs.gnu.org ([140.186.70.92]:51384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn7M-0002Zl-6T for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:53:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qtn7L-0007l8-Dg for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:53:40 -0400 Received: from mail-iy0-f171.google.com ([209.85.210.171]:44139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn7L-0007ku-AY for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:53:39 -0400 Received: by iyf13 with SMTP id 13so2653863iyf.30 for ; Wed, 17 Aug 2011 13:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=yJqTRCJ6GAtPv7nMAMom0utlbk3AE80rTIIOEO9QDvE=; b=uhLOV9W/rDBkAXmZf5U9h7gjO68ag0WFnpidgtpkuueaHDuc67XhUaa3HcQzmIfdS7 wOuPc1dYnHaK5sKGWv512XYjsfUm7D3W/N6EpYNDv4mjlVxvw1tJf/6h52ef/1E91ftf m2dK3JcuJ/pF3ymR5Q1s8ixOCRWMYMGBeTdII= Received: by 10.231.55.2 with SMTP id s2mr3027394ibg.37.1313614417981; Wed, 17 Aug 2011 13:53:37 -0700 (PDT) Received: from localhost.localdomain (betelgeuse.cs.uchicago.edu [128.135.24.226]) by mx.google.com with ESMTPS id a11sm601909ibg.21.2011.08.17.13.53.36 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Aug 2011 13:53:37 -0700 (PDT) From: Bryce Lanham To: qemu-devel@nongnu.org Date: Wed, 17 Aug 2011 15:53:22 -0500 Message-Id: <1313614410-29359-2-git-send-email-blanham@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1313614410-29359-1-git-send-email-blanham@gmail.com> References: <1313614410-29359-1-git-send-email-blanham@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.171 Cc: Laurent Vivier Subject: [Qemu-devel] [PATCH 091/111] m68k: don't call gdb_register_coprocessor() twice. 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 From: Laurent Vivier On a clone(), cpu_copy() calls cpu_int() which tries to register again gdb_register_coprocessor(). Signed-off-by: Laurent Vivier --- target-m68k/helper.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 4edbc90..e1a73b8 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -246,11 +246,6 @@ static int cpu_m68k_set_model(CPUM68KState *env, const char *name) } register_m68k_insns(env); - if (m68k_feature (env, M68K_FEATURE_CF_FPU) || - m68k_feature (env, M68K_FEATURE_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; } @@ -292,7 +287,6 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model) env = qemu_mallocz(sizeof(CPUM68KState)); cpu_exec_init(env); if (!inited) { - inited = 1; m68k_tcg_init(); } @@ -304,7 +298,13 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model) } cpu_reset(env); + if (!inited && (m68k_feature (env, M68K_FEATURE_CF_FPU) || + m68k_feature (env, M68K_FEATURE_FPU))) { + gdb_register_coprocessor(env, fpu_gdb_get_reg, fpu_gdb_set_reg, + 11, "cf-fp.xml", 18); + } qemu_init_vcpu(env); + inited = 1; return env; }