From patchwork Thu Jun 18 19:33:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 7245 Received: (qmail 127925 invoked by alias); 18 Jun 2015 19:33:57 -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 127888 invoked by uid 89); 18 Jun 2015 19:33:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-oi0-f73.google.com Received: from mail-oi0-f73.google.com (HELO mail-oi0-f73.google.com) (209.85.218.73) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 18 Jun 2015 19:33:55 +0000 Received: by oiax69 with SMTP id x69so5485086oia.0 for ; Thu, 18 Jun 2015 12:33:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:message-id:date:subject:from:to :content-type; bh=tBq6BDBSLbC3W6M6/B95GcseerSn+PGtaWIi33CX+E0=; b=l1tS+Isa6q0oqTUvwJeLoNa+l/Q6ZefrR3cPZ405e5LUA3SE+92jaojT9Lh3kRHZD+ L/qWv/+bopsFwitBHAhiJVN+IBRdQSnCHJX0SKxB5Fb6wXCcD3r2J2nBSevOVQIg9rl2 kK5HlZoN5lTDS25BDAmfmSYKyvyu3Irvd4z/bBnSwUanf+dgaZRj9XqHP5hLSoJpYEze MVsNsyuoIkCstqRdQ4pEBB9Ucc1As9cGcfKcZGrOGZopRY5KKD9tW4AM+eOo24NAXUpI NuYLpfXIoiWtqnt9QlAXZPgfJCfvmXAY//dCWSU+xO4elGwmbrRdgb3eMXiMFR3gMQPy XLQg== X-Gm-Message-State: ALoCoQnX14DHRSCai2WtdGm+bUlS6xt3MwFaU7y/GlohgPtJ8gVprQxRnAeJm+pL5e/vNsWwU1vp MIME-Version: 1.0 X-Received: by 10.42.110.5 with SMTP id n5mr8467196icp.22.1434656033498; Thu, 18 Jun 2015 12:33:53 -0700 (PDT) Message-ID: <20cf303dda3c40d2610518cfe377@google.com> Date: Thu, 18 Jun 2015 19:33:53 +0000 Subject: [CGEN PATCH] Rename TRACE_{EXTRACT, RESULT} to CGEN_TRACE_{EXTRACT, RESULT} From: Doug Evans To: cgen@sourceware.org, gdb-patches@sourceware.org X-IsSubscribed: yes [sorry for the repost, typo in email address] Hi. This patch updates the generator so that the next time the files are generated we don't lose the TRACE_{EXTRACT,RESULT} renaming change. ref: https://sourceware.org/ml/gdb-patches/2015-06/msg00280.html Tested with: 1) put guile 1.8.8 in $PATH 2) apply this patch: https://sourceware.org/ml/gdb-patches/2015-06/msg00395.html 3) bash$ $src/configure --prefix=$(pwd)/rel \ --enable-cgen-maint \ --enable-targets=all \ --enable-sim bash$ make all-sim I had to disable building of sim/m68hc11, and make a minor tweak to sim/moxie, so that their builds would complete. 2015-06-18 Doug Evans * rtl-c.scm (rtl-c-set-trace): Update comment. * sim-cpu.scm (cgen-semantics.c): Rename TRACE_RESULT to CGEN_TRACE_RESULT. (cgen-sem-switch.c): Ditto. * sim-decode.scm ( 'gen-trace-extract): Update comment. ( 'gen-trace-extract): Ditto. ( 'gen-trace-extract): Ditto. (/gen-op-trace-extract): Ditto. (/gen-record-args): Rename TRACE_EXTRACT to CGEN_TRACE_EXTRACT. * sim.scm (/op-gen-set-trace): Rename TRACE_RESULT to CGEN_TRACE_RESULT. (/op-gen-set-trace-parallel): Ditto. ( 'gen-set-trace): Ditto. ; This special handling of #f for INDEX is *only* supported for operands Index: rtl-c.scm =================================================================== RCS file: /cvs/src/src/cgen/rtl-c.scm,v retrieving revision 1.33 diff -u -p -u -p -r1.33 rtl-c.scm --- rtl-c.scm 19 May 2014 01:24:00 -0000 1.33 +++ rtl-c.scm 18 Jun 2015 18:12:49 -0000 @@ -544,7 +544,7 @@ (rtl-c-get estate mode src)))) ) -; Same as rtl-c-set-quiet except also print TRACE_RESULT message. +; Same as rtl-c-set-quiet except also print CGEN_TRACE_RESULT message. ; MODE is either a object or the mode name. ; ??? One possible change is to defer the (rtl-c-get src) call to dest's ; set handler. Such sources would be marked accordingly and rtl-c-get Index: sim-cpu.scm =================================================================== RCS file: /cvs/src/src/cgen/sim-cpu.scm,v retrieving revision 1.19 diff -u -p -u -p -r1.19 sim-cpu.scm --- sim-cpu.scm 23 Nov 2009 04:18:05 -0000 1.19 +++ sim-cpu.scm 18 Jun 2015 18:12:49 -0000 @@ -1090,8 +1090,8 @@ CGEN_ATTR_VALUE (NULL, abuf->idesc->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 @@ -1183,13 +1183,13 @@ CGEN_ATTR_VALUE (NULL, abuf->idesc->attr /* If hyper-fast [well not unnecessarily slow] execution is selected, turn off frills like tracing and profiling. */ -/* FIXME: A better way would be to have TRACE_RESULT check for something +/* FIXME: A better way would be to have CGEN_TRACE_RESULT check for something that can cause it to be optimized out. Another way would be to emit 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 Index: sim-decode.scm =================================================================== RCS file: /cvs/src/src/cgen/sim-decode.scm,v retrieving revision 1.17 diff -u -p -u -p -r1.17 sim-decode.scm --- sim-decode.scm 13 Feb 2010 03:39:15 -0000 1.17 +++ sim-decode.scm 18 Jun 2015 18:12:49 -0000 @@ -241,7 +241,7 @@ void ) ; gen-trace-extract method. -; Return appropriate arguments for TRACE_EXTRACT. +; Return appropriate arguments for CGEN_TRACE_EXTRACT. (method-make! 'gen-trace-extract @@ -266,7 +266,7 @@ void "")) ) -; Return appropriate arguments for TRACE_EXTRACT. +; Return appropriate arguments for CGEN_TRACE_EXTRACT. (method-make! 'gen-trace-extract @@ -294,7 +294,7 @@ void ";\n")) ) -; Return appropriate arguments for TRACE_EXTRACT. +; Return appropriate arguments for CGEN_TRACE_EXTRACT. (method-make! 'gen-trace-extract @@ -320,7 +320,7 @@ void (send (op:type op) 'gen-extract op sfmt local?) ) -; Return three of arguments to TRACE_EXTRACT: +; Return three of arguments to CGEN_TRACE_EXTRACT: ; string argument to fprintf, character indicating type of third arg, value. ; The type is one of: x. @@ -374,7 +374,7 @@ void iflds) (string-list-map (lambda (op) (/gen-op-extract op sfmt #f)) operands) - " TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, " + " CGEN_TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc, " "\"" (gen-sym sfmt) "\"" (string-list-map (lambda (f) (/gen-trace-argbuf-ifld f sfmt)) iflds) Index: sim.scm =================================================================== RCS file: /cvs/src/src/cgen/sim.scm,v retrieving revision 1.32 diff -u -p -u -p -r1.32 sim.scm --- sim.scm 25 Jan 2010 00:40:29 -0000 1.32 +++ sim.scm 18 Jun 2015 18:12:49 -0000 @@ -1260,12 +1260,12 @@ (send (op:type op) 'gen-set-quiet estate mode index selector (cx:make-with-atlist mode "opval" (cx:atlist newval)))) (/op-gen-written-update op) -; TRACE_RESULT_ (cpu, abuf, hwnum, opnum, value); +; CGEN_TRACE_RESULT_ (cpu, abuf, hwnum, opnum, value); ; For each insn record array of operand numbers [or indices into ; 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" @@ -1287,12 +1287,12 @@ " " /par-operand-macro " (" (gen-sym op) ")" " = opval;\n")) (/op-gen-written-update op) -; TRACE_RESULT_ (cpu, abuf, hwnum, opnum, value); +; CGEN_TRACE_RESULT_ (cpu, abuf, hwnum, opnum, value); ; For each insn record array of operand numbers [or indices into ; 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" @@ -1323,7 +1323,8 @@ (/op-gen-set-quiet self estate mode index selector newval))))) ) -; Return C code to set the value of an operand and print TRACE_RESULT message. +; Return C code to set the value of an operand and print CGEN_TRACE_RESULT +; message. ; NEWVAL is a object of the value to store. ; If INDEX is non-#f use it, otherwise use (op:index self).