From 29b5e03231e14157ecbb8c0de8ec7c9f6491f68a Mon Sep 17 00:00:00 2001
From: brolley <brolley>
Date: Mon, 22 Mar 2004 20:44:15 +0000
Subject: [PATCH] 2004-03-22  Dave Brolley  <brolley@redhat.com>

        * utils.scm (copyright-fsf): Update copyright years.
        (copyright-red-hat): Ditto.
        * sid.scm (-op-gen-set-trace): Generate trace code before semantic
        code.
        (-op-gen-set-trace-parallel): Ditto.
---
 cgen/ChangeLog |  8 ++++++++
 cgen/sid.scm   | 44 ++++++++++++++++++++++----------------------
 cgen/utils.scm |  6 +++---
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index 9f8cb7fbeb..6bbb34d231 100644
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-22  Dave Brolley  <brolley@redhat.com>
+
+	* utils.scm (copyright-fsf): Update copyright years.
+	(copyright-red-hat): Ditto.
+	* sid.scm (-op-gen-set-trace): Generate trace code before semantic
+	code.
+	(-op-gen-set-trace-parallel): Ditto.
+
 2004-02-10  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.dot.com>
 
 	* cpu/m32r.opc (my_print_insn): Fixed incorrect output when
diff --git a/cgen/sid.scm b/cgen/sid.scm
index 590d059348..c0ecef3e0c 100644
--- a/cgen/sid.scm
+++ b/cgen/sid.scm
@@ -1,5 +1,5 @@
 ; Simulator generator support routines.
-; Copyright (C) 2000, 2002, 2003 Red Hat, Inc.
+; Copyright (C) 2000-2004 Red Hat, Inc.
 ; This file is part of CGEN.
 
 ; One goal of this file is to provide cover functions for all methods.
@@ -1064,21 +1064,6 @@
   (string-append
    "  {\n"
    "    " (mode:c-type mode) " opval = " (cx:c newval) ";\n"
-   ; Dispatch to setter code if appropriate
-   "    "
-   (if (op:setter op)
-       (let ((args (car (op:setter op)))
-	     (expr (cadr (op:setter op))))
-	 (rtl-c 'VOID expr
-		(if (= (length args) 0)
-		    (list (list 'newval mode "opval"))
-		    (list (list (car args) 'UINT index)
-			  (list 'newval mode "opval")))
-		#:rtl-cover-fns? #t
-		#:output-language (estate-output-language estate)))
-       ;else
-       (send (op:type op) 'gen-set-quiet estate mode index selector
-		(cx:make-with-atlist mode "opval" (cx:atlist newval))))
    (if (and (with-profile?)
 	    (op:cond? op))
        (string-append "    written |= (1ULL << "
@@ -1119,6 +1104,21 @@
 		"(USI) "
 		""))
 	"opval << dec << \"  \";\n"))
+   ; Dispatch to setter code if appropriate
+   "    "
+   (if (op:setter op)
+       (let ((args (car (op:setter op)))
+	     (expr (cadr (op:setter op))))
+	 (rtl-c 'VOID expr
+		(if (= (length args) 0)
+		    (list (list 'newval mode "opval"))
+		    (list (list (car args) 'UINT index)
+			  (list 'newval mode "opval")))
+		#:rtl-cover-fns? #t
+		#:output-language (estate-output-language estate)))
+       ;else
+       (send (op:type op) 'gen-set-quiet estate mode index selector
+		(cx:make-with-atlist mode "opval" (cx:atlist newval))))
    "  }\n")
 )
 
@@ -1126,12 +1126,6 @@
   (string-append
    "  {\n"
    "    " (mode:c-type mode) " opval = " (cx:c newval) ";\n"
-   (if (op-save-index? op)
-       (string-append "    " -par-operand-macro " (" (-op-index-name op) ")"
-		      " = " (-gen-hw-index index estate) ";\n")
-       "")
-   "    " -par-operand-macro " (" (gen-sym op) ")"
-   " = opval;\n"
    (if (op:cond? op)
        (string-append "    written |= (1ULL << "
 		      (number->string (op:num op))
@@ -1168,6 +1162,12 @@
 	   "(USI) "
 	   ""))
    "opval << dec << \"  \";\n"
+   (if (op-save-index? op)
+       (string-append "    " -par-operand-macro " (" (-op-index-name op) ")"
+		      " = " (-gen-hw-index index estate) ";\n")
+       "")
+   "    " -par-operand-macro " (" (gen-sym op) ")"
+   " = opval;\n"
    "  }\n")
 )
 
diff --git a/cgen/utils.scm b/cgen/utils.scm
index 1c7dcd595e..0859e3f477 100644
--- a/cgen/utils.scm
+++ b/cgen/utils.scm
@@ -1,5 +1,5 @@
 ; Generic Utilities.
-; Copyright (C) 2000, 2002, 2003 Red Hat, Inc.
+; Copyright (C) 2000-2004 Red Hat, Inc.
 ; This file is part of CGEN.
 ; See file COPYING.CGEN for details.
 
@@ -1216,7 +1216,7 @@
   (cons "\
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright 1996-2004 Free Software Foundation, Inc.
 "
 	"\
 This program is free software; you can redistribute it and/or modify
@@ -1241,7 +1241,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   (cons "\
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright (C) 2000, 2001, 2002, 2003 Red Hat, Inc.
+Copyright (C) 2000-2004 Red Hat, Inc.
 "
 	"\
 "))
-- 
2.11.0