From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 98272 invoked by alias); 23 Nov 2016 22:16:10 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 73603 invoked by uid 89); 23 Nov 2016 22:14:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=HX-Received:10.99.189.1, 2411 X-HELO: mail-pg0-f66.google.com Received: from mail-pg0-f66.google.com (HELO mail-pg0-f66.google.com) (74.125.83.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 23 Nov 2016 22:14:44 +0000 Received: by mail-pg0-f66.google.com with SMTP id e9so1925929pgc.1 for ; Wed, 23 Nov 2016 14:14:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PojKHvyZUZtNnBC4K6y8m1wqiWhPIDZ6QZQyjoIdc28=; b=fy5WGKRvbglVGcIdcAcZWlqrGIkpcJniSFVExbav8CVz93BaVJag3wbtr5re72OlnC GiLpzIRSmP0Y5i2zrxBX7vlajVT6PL9hwkPN9VmwcIT9lnii03dvo0gcstbhMwJHTOOK w861NxivMkX2cC5bVvzjp6F1RWOf0nHpIW656XT5vdYUb/TWqOahZAc9ZHxmrrOkoFk3 KRmSQJMDgxutuVaeW0em96AAvb96+koP3HN2JYhfKm8Pv9XByyLoE3OExpKv1Lxhg7ga LvKyAStmstItB/8ZWAvsm+VBbQXBAnQeCcQTKEsb0MjAULqRV1JD640l0kHDj0/y7B41 mc5w== X-Gm-Message-State: AKaTC02G63VeV3n5djkSI+Oyeb/vJcpa4PVDbBuu9vTT1apPzsiKn3R17etVs+eZNRCWTw== X-Received: by 10.99.189.1 with SMTP id a1mr9019271pgf.142.1479939283050; Wed, 23 Nov 2016 14:14:43 -0800 (PST) Received: from lianli.shorne-pla.net (z14.124-44-185.ppp.wakwak.ne.jp. [124.44.185.14]) by smtp.gmail.com with ESMTPSA id y89sm54945278pfk.83.2016.11.23.14.14.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Nov 2016 14:14:41 -0800 (PST) Received: from lianli.shorne-pla.net (localhost [127.0.0.1]) by lianli.shorne-pla.net (8.15.2/8.15.2) with ESMTPS id uANMEclp001964 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 24 Nov 2016 07:14:38 +0900 Received: (from shorne@localhost) by lianli.shorne-pla.net (8.15.2/8.15.2/Submit) id uANMEcwV001963; Thu, 24 Nov 2016 07:14:38 +0900 From: Stafford Horne To: gdb-patches@sourceware.org Cc: openrisc@lists.librecores.org, Stafford Horne Subject: [PATCH 12/18] sim: or1k: Get or1k sim building with latest sim common Date: Wed, 23 Nov 2016 22:16:00 -0000 Message-Id: <1479939272-1754-13-git-send-email-shorne@gmail.com> In-Reply-To: <1479939272-1754-1-git-send-email-shorne@gmail.com> References: <1479939272-1754-1-git-send-email-shorne@gmail.com> X-IsSubscribed: yes X-SW-Source: 2016-11/txt/msg00716.txt.bz2 There have been a few type name changes. * Update configure.ac to use new ENDIAN config tpes * Update mloop to use new CGEN_TRACE.. instead of TRACE.. * Change singnature of sim_create_inferior to have const param * Remove sim_close as its covered by sim_close in common now * Move WITH_SCACHE_PBB into sim-main.h from tconfig.in * Remove SIM_HANDLES_LMA as it seems its not needed anymore from tcofig.in * Remove tconfig.in --- sim/or1k/configure.ac | 5 ++--- sim/or1k/mloop.in | 6 +++--- sim/or1k/sim-if.c | 14 +++----------- sim/or1k/sim-main.h | 2 ++ sim/or1k/tconfig.in | 8 -------- 5 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 sim/or1k/tconfig.in diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac index d5dca70..c248d0a 100644 --- a/sim/or1k/configure.ac +++ b/sim/or1k/configure.ac @@ -24,11 +24,10 @@ sinclude(../common/acinclude.m4) SIM_AC_COMMON -SIM_AC_OPTION_ENDIAN(BIG_ENDIAN) +SIM_AC_OPTION_ENDIAN(BIG) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) -SIM_AC_OPTION_HOSTENDIAN SIM_AC_OPTION_BITSIZE([32], [31], [32]) -SIM_AC_OPTION_SCACHE([16384]) +SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL([$default_model]) SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_INLINE() diff --git a/sim/or1k/mloop.in b/sim/or1k/mloop.in index 6f19c50..092ce7d 100644 --- a/sim/or1k/mloop.in +++ b/sim/or1k/mloop.in @@ -97,8 +97,8 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) if (PROFILE_MODEL_P (current_cpu) && ARGBUF_PROFILE_P (abuf)) @cpu@_model_insn_before (current_cpu, 1 /*first_p*/); - TRACE_INSN_INIT (current_cpu, abuf, 1); - TRACE_INSN (current_cpu, idata, + CGEN_TRACE_INSN_INIT (current_cpu, abuf, 1); + CGEN_TRACE_INSN (current_cpu, idata, (const struct argbuf *) abuf, abuf->addr); } #if WITH_SCACHE @@ -117,7 +117,7 @@ execute (SIM_CPU *current_cpu, SCACHE *sc, int fast_p) cycles = (*idesc->timing->model_fn) (current_cpu, sc); @cpu@_model_insn_after (current_cpu, 1 /*last_p*/, cycles); } - TRACE_INSN_FINI (current_cpu, abuf, 1); + CGEN_TRACE_INSN_FINI (current_cpu, abuf, 1); } #else abort (); diff --git a/sim/or1k/sim-if.c b/sim/or1k/sim-if.c index 23a8a9e..e643fa1 100644 --- a/sim/or1k/sim-if.c +++ b/sim/or1k/sim-if.c @@ -174,7 +174,7 @@ sim_open (kind, callback, abfd, argv) SIM_OPEN_KIND kind; host_callback *callback; struct bfd *abfd; - char **argv; + char * const *argv; { SIM_DESC sd = sim_state_alloc (kind, callback); char c; @@ -297,21 +297,13 @@ sim_open (kind, callback, abfd, argv) return sd; } -void -sim_close (sd, quitting) - SIM_DESC sd; - int quitting; -{ - or1k_cgen_cpu_close (CPU_CPU_DESC (STATE_CPU (sd, 0))); - sim_module_uninstall (sd); -} SIM_RC sim_create_inferior (sd, abfd, argv, envp) SIM_DESC sd; struct bfd *abfd; - char **argv; - char **envp; + char * const *argv; + char * const *envp; { SIM_CPU *current_cpu = STATE_CPU (sd, 0); SIM_ADDR addr; diff --git a/sim/or1k/sim-main.h b/sim/or1k/sim-main.h index d26d616..f0b4e07 100644 --- a/sim/or1k/sim-main.h +++ b/sim/or1k/sim-main.h @@ -1,6 +1,8 @@ #ifndef SIM_MAIN_H #define SIM_MAIN_H +#define WITH_SCACHE_PBB 1 + #include "ansidecl.h" #include "or1k-desc.h" #include "sim-basics.h" diff --git a/sim/or1k/tconfig.in b/sim/or1k/tconfig.in deleted file mode 100644 index a1b463f..0000000 --- a/sim/or1k/tconfig.in +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef OR1K_TCONFIG_H -#define OR1K_TCONFIG_H - -#define SIM_HANDLES_LMA 1 - -#define WITH_SCACHE_PBB 1 - -#endif \ No newline at end of file -- 2.7.4