From patchwork Tue Jan 5 04:01:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 10223 Received: (qmail 76665 invoked by alias); 5 Jan 2016 04:01:41 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 76641 invoked by uid 89); 5 Jan 2016 04:01:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=1017, 101, 7 X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 05 Jan 2016 04:01:39 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 7F84134074E for ; Tue, 5 Jan 2016 04:01:36 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: use STATE_MAGIC helper [committed] Date: Mon, 4 Jan 2016 23:01:35 -0500 Message-Id: <1451966495-32544-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes --- sim/common/ChangeLog | 4 ++++ sim/common/sim-utils.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index f8cdbf4..8ad6a41 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,9 @@ 2016-01-04 Mike Frysinger + * sim-utils.c (sim_state_free): Change to STATE_MAGIC. + +2016-01-04 Mike Frysinger + * cgen-scache.c (MAX): Delete. (scache_init): Change MAX to max. * cgen-trace.c (min): Delete. diff --git a/sim/common/sim-utils.c b/sim/common/sim-utils.c index d2b5f7c..d11d3b4 100644 --- a/sim/common/sim-utils.c +++ b/sim/common/sim-utils.c @@ -101,7 +101,7 @@ sim_state_alloc (SIM_OPEN_KIND kind, void sim_state_free (SIM_DESC sd) { - ASSERT (sd->base.magic == SIM_MAGIC_NUMBER); + ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER); #ifdef SIM_STATE_FREE SIM_STATE_FREE (sd);