From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 79777 invoked by alias); 1 May 2016 02:19:34 -0000 Mailing-List: contact cgen-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cgen-owner@sourceware.org Received: (qmail 79617 invoked by uid 89); 1 May 2016 02:19:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 spammy=2016-05-01, stafford, Stafford, Horne X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-pa0-f66.google.com Received: from mail-pa0-f66.google.com (HELO mail-pa0-f66.google.com) (209.85.220.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Sun, 01 May 2016 02:19:18 +0000 Received: by mail-pa0-f66.google.com with SMTP id vv3so18276511pab.0; Sat, 30 Apr 2016 19:19:18 -0700 (PDT) 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; bh=uPU57ZQ/q8XncNpFRPqSorPnQR7GD5keh9VGVY7fxfs=; b=if3Guv1UKQF8TtL9ZA+eIe1RCGqc9bnfQ7OUd01AG9etpWFYkKoLEenF2eyJvE4Ua7 z+L6GB3cDM7+w5zosL37RxxVbuCHeV3kYP/Nae96OBCnqOUpj4itwu5edpmQFBLSWaC3 peSDsG4K8LrHvi6zfKCHiemEufRB1OE9H+60fd4sGK1T+fGAIARyuvSCPGq4HpqO/UYO 5L5BI0fBle11lKPzi3sp9Hghub2XF/dU+poDOCnnqS4d//lbRpOAXZluzg5O4GS/bGp/ 4zVV0p4+fwCXWj+VhevFRJ/Z5aEPwh6Xmd0vw/wC3UROAkNpXueusZ280gkz2Rn3XfT1 CPCg== X-Gm-Message-State: AOPr4FW7aGKuX9HadLdeIht6sz2QkNR4WMDbpbKCPRVuzXs0ADFtU60XbmIRBQBGBS0dZQ== X-Received: by 10.66.249.228 with SMTP id yx4mr40926585pac.29.1462069157015; Sat, 30 Apr 2016 19:19:17 -0700 (PDT) Received: from lianli.shorne-pla.net (z76.220-213-34.ppp.wakwak.ne.jp. [220.213.34.76]) by smtp.gmail.com with ESMTPSA id t62sm34496211pfa.38.2016.04.30.19.19.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Apr 2016 19:19:16 -0700 (PDT) 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 u412JDf8008925 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 1 May 2016 11:19:13 +0900 Received: (from shorne@localhost) by lianli.shorne-pla.net (8.15.2/8.15.2/Submit) id u412IPQp008795; Sun, 1 May 2016 11:18:25 +0900 From: Stafford Horne To: cgen@sourceware.org Cc: gdb-patches@sourceware.org, openrisc@lists.librecores.org, Stafford Horne Subject: [PATCH] cgen: sim: Updates to sim files to match gdb types Date: Sun, 01 May 2016 02:19:00 -0000 Message-Id: <1462069082-8756-1-git-send-email-shorne@gmail.com> X-SW-Source: 2016-q2/txt/msg00004.txt.bz2 The types like MACH and MODEL have changes to SIM_MACH and SIM_MODEL make updates to match these changes. This way people dont have to manually update the generated files in GDB. I am from openrisc and working on getting the openrisc sim and gdb patches ready for submitting to upstream. This was required to get the sim build to work. 2016-05-01 Stafford Horne * cgen/sim-cpu.scm (cgen-semantics.c, cgen-sem-switch.c): Rename TRACE_RESULT to CGEN_TRACE_RESULT. * cgen/sim-model.scm (gen-cpu-imp-properties): Rename SIM_MACH_IMP_PROPERTIES to SIM_MACH_IMP_PROPERTIES. (gen-mach-model-table): Rename MODEL to SIM_MODEL. (gen-mach-defns): Rename MACH to SIM_MACH. * cgen/sim.scm (op-gen-set-trace, op-gen-set-trace-parallel): Rename TRACE_RESULT to CGEN_TRACE_RESULT. (gen-mach-decls, gen-mach-data): Rename MACH to SIM_MACH. cgen/sim-cpu.scm | 8 ++++---- cgen/sim-model.scm | 6 +++--- cgen/sim.scm | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cgen/sim-cpu.scm b/cgen/sim-cpu.scm index b3e5c40..454d734 100644 --- a/cgen/sim-cpu.scm +++ b/cgen/sim-cpu.scm @@ -1090,8 +1090,8 @@ CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_" "attr)") FAST_P, when desired, is defined on the command line, -DFAST_P=1. */ #if FAST_P #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_semf_,fn) -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #else #define SEM_FN_NAME(cpu,fn) XCONCAT3 (cpu,_sem_,fn) #endif @@ -1188,8 +1188,8 @@ CGEN_ATTR_VALUE (NULL, abuf->idesc->attrs, CGEN_INSN_" "attr)") special handlers into the instruction \"stream\". */ #if FAST_P -#undef TRACE_RESULT -#define TRACE_RESULT(cpu, abuf, name, type, val) +#undef CGEN_TRACE_RESULT +#define CGEN_TRACE_RESULT(cpu, abuf, name, type, val) #endif #undef GET_ATTR diff --git a/cgen/sim-model.scm b/cgen/sim-model.scm index dbc67da..8c05188 100644 --- a/cgen/sim-model.scm +++ b/cgen/sim-model.scm @@ -16,7 +16,7 @@ "\ /* The properties of this cpu's implementation. */ -static const MACH_IMP_PROPERTIES @cpu@_imp_properties = +static const SIM_MACH_IMP_PROPERTIES @cpu@_imp_properties = { sizeof (SIM_CPU), #if WITH_SCACHE @@ -249,7 +249,7 @@ static const MACH_IMP_PROPERTIES @cpu@_imp_properties = (define (/gen-mach-model-table mach) (string-list "\ -static const MODEL " (gen-sym mach) "_models[] =\n{\n" +static const SIM_MODEL " (gen-sym mach) "_models[] =\n{\n" (string-list-map (lambda (model) (string-list " { " "\"" (obj:str-name model) "\", " @@ -343,7 +343,7 @@ static void\n" #endif } -const MACH " (gen-sym mach) "_mach = +const SIM_MACH " (gen-sym mach) "_mach = { \"" (obj:str-name mach) "\", " "\"" (mach-bfd-name mach) "\", " diff --git a/cgen/sim.scm b/cgen/sim.scm index 77c2169..f965ef1 100644 --- a/cgen/sim.scm +++ b/cgen/sim.scm @@ -1265,7 +1265,7 @@ ; operand instance table]. ; Could just scan the operand table for the operand or hardware number, ; assuming the operand number is stored in `op'. - " TRACE_RESULT (current_cpu, abuf" + " CGEN_TRACE_RESULT (current_cpu, abuf" ", " (send op 'gen-pretty-name mode) ", " (mode:printf-type mode) ", opval);\n" @@ -1292,7 +1292,7 @@ ; operand instance table]. ; Could just scan the operand table for the operand or hardware number, ; assuming the operand number is stored in `op'. - " TRACE_RESULT (current_cpu, abuf" + " CGEN_TRACE_RESULT (current_cpu, abuf" ", " (send op 'gen-pretty-name mode) ", " (mode:printf-type mode) ", opval);\n" @@ -1464,7 +1464,7 @@ (string-append (string-map (lambda (mach) (gen-obj-sanitize mach - (string-append "extern const MACH " + (string-append "extern const SIM_MACH " (gen-sym mach) "_mach;\n"))) (current-mach-list)) @@ -1475,7 +1475,7 @@ (define (/gen-mach-data) (string-append - "const MACH *sim_machs[] =\n{\n" + "const SIM_MACH *sim_machs[] =\n{\n" (string-map (lambda (mach) (gen-obj-sanitize mach -- 2.5.5