Index: cgen/sid.scm
===================================================================
RCS file: /cvs/src/src/cgen/sid.scm,v
retrieving revision 1.11
diff -c -p -r1.11 sid.scm
*** cgen/sid.scm	16 Jul 2003 05:35:47 -0000	1.11
--- cgen/sid.scm	22 Mar 2004 18:48:25 -0000
***************
*** 1,5 ****
  ; Simulator generator support routines.
! ; Copyright (C) 2000, 2002, 2003 Red Hat, Inc.
  ; This file is part of CGEN.
  
  ; One goal of this file is to provide cover functions for all methods.
--- 1,5 ----
  ; Simulator generator support routines.
! ; 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,1084 ****
    (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 << "
--- 1064,1069 ----
***************
*** 1119,1124 ****
--- 1104,1124 ----
  		"(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,1137 ****
    (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))
--- 1126,1131 ----
***************
*** 1168,1173 ****
--- 1162,1173 ----
  	   "(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")
  )
  
Index: cgen/utils.scm
===================================================================
RCS file: /cvs/src/src/cgen/utils.scm,v
retrieving revision 1.11
diff -c -p -r1.11 utils.scm
*** cgen/utils.scm	16 Jul 2003 05:35:48 -0000	1.11
--- cgen/utils.scm	22 Mar 2004 18:48:26 -0000
***************
*** 1,5 ****
  ; Generic Utilities.
! ; Copyright (C) 2000, 2002, 2003 Red Hat, Inc.
  ; This file is part of CGEN.
  ; See file COPYING.CGEN for details.
  
--- 1,5 ----
  ; Generic Utilities.
! ; Copyright (C) 2000-2004 Red Hat, Inc.
  ; This file is part of CGEN.
  ; See file COPYING.CGEN for details.
  
***************
*** 1216,1222 ****
    (cons "\
  THIS FILE IS MACHINE GENERATED WITH CGEN.
  
! Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  "
  	"\
  This program is free software; you can redistribute it and/or modify
--- 1216,1222 ----
    (cons "\
  THIS FILE IS MACHINE GENERATED WITH CGEN.
  
! Copyright 1996-2004 Free Software Foundation, Inc.
  "
  	"\
  This program is free software; you can redistribute it and/or modify
*************** with this program; if not, write to the 
*** 1241,1247 ****
    (cons "\
  THIS FILE IS MACHINE GENERATED WITH CGEN.
  
! Copyright (C) 2000, 2001, 2002, 2003 Red Hat, Inc.
  "
  	"\
  "))
--- 1241,1247 ----
    (cons "\
  THIS FILE IS MACHINE GENERATED WITH CGEN.
  
! Copyright (C) 2000-2004 Red Hat, Inc.
  "
  	"\
  "))
Index: sid/component/cgen-cpu/xstormy16/xstormy16-sem.cxx
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/xstormy16/xstormy16-sem.cxx,v
retrieving revision 1.7
diff -c -p -r1.7 xstormy16-sem.cxx
*** sid/component/cgen-cpu/xstormy16/xstormy16-sem.cxx	5 Jul 2003 17:07:21 -0000	1.7
--- sid/component/cgen-cpu/xstormy16/xstormy16-sem.cxx	22 Mar 2004 18:48:32 -0000
***************
*** 2,8 ****
  
  THIS FILE IS MACHINE GENERATED WITH CGEN.
  
! Copyright (C) 2000, 2001, 2002, 2003 Red Hat, Inc.
  
  This file is part of the Red Hat simulators.
  
--- 2,8 ----
  
  THIS FILE IS MACHINE GENERATED WITH CGEN.
  
! Copyright (C) 2000-2004 Red Hat, Inc.
  
  This file is part of the Red Hat simulators.
  
*************** if (FLD (f_op2m)) {
*** 59,73 ****
    tmp_nvalue = FLD (f_imm16);
    {
      SI opval = ORSI (ANDSI (current_cpu->h_gr_get (((UINT) 14)), 65436), ORBI (ORBI (EQHI (ANDHI (tmp_nvalue, 255), 0), SLLHI (EQHI (tmp_nvalue, 0), 1)), ORHI (SLLHI (current_cpu->parity (tmp_nvalue), 5), SLLHI (LTQI (SRLHI (tmp_nvalue, MULSI (FLD (f_op2m), 8)), 0), 6))));
-     current_cpu->h_gr_set (((UINT) 14), opval);
      if (UNLIKELY(current_cpu->trace_result_p))
        current_cpu->trace_stream << "gr" << '[' << ((UINT) 14) << ']' << ":=0x" << hex << opval << dec << "  ";
    }
    {
      HI opval = tmp_nvalue;
-     current_cpu->SETMEMHI (pc, ANDSI (FLD (f_lmem8), 65534), opval);
      if (UNLIKELY(current_cpu->trace_result_p))
        current_cpu->trace_stream << "memory" << '[' <<  "0x" << hex << (UDI) ANDSI (FLD (f_lmem8), 65534) << dec << ']' << ":=0x" << hex << opval << dec << "  ";
    }
  }
  } else {
--- 59,73 ----
    tmp_nvalue = FLD (f_imm16);
    {
      SI opval = ORSI (ANDSI (current_cpu->h_gr_get (((UINT) 14)), 65436), ORBI (ORBI (EQHI (ANDHI (tmp_nvalue, 255), 0), SLLHI (EQHI (tmp_nvalue, 0), 1)), ORHI (SLLHI (current_cpu->parity (tmp_nvalue), 5), SLLHI (LTQI (SRLHI (tmp_nvalue, MULSI (FLD (f_op2m), 8)), 0), 6))));
      if (UNLIKELY(current_cpu->trace_result_p))
        current_cpu->trace_stream << "gr" << '[' << ((UINT) 14) << ']' << ":=0x" << hex << opval << dec << "  ";
+     current_cpu->h_gr_set (((UINT) 14), opval);
    }
    {
      HI opval = tmp_nvalue;
      if (UNLIKELY(current_cpu->trace_result_p))
        current_cpu->trace_stream << "memory" << '[' <<  "0x" << hex << (UDI) ANDSI (FLD (f_lmem8), 65534) << dec << ']' << ":=0x" << hex << opval << dec << "  ";
+     current_cpu->SETMEMHI (pc, ANDSI (FLD (f_lmem8), 65534), opval);
    }
  }
  } else {

[ ... ]