2003-10-21 Dave Brolley <brolley@redhat.com>

        * sid-model.scm (-gen-model-class-decls): Generate MAX_UNITS as
        a static const int.
        * decode.scm (-opcode-slots): Correct typo in logit call.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index 8891ace..564db70 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-21  Dave Brolley  <brolley@redhat.com>
+
+       * sid-model.scm (-gen-model-class-decls): Generate MAX_UNITS as
+       a static const int.
+       * decode.scm (-opcode-slots): Correct typo in logit call.
+
 2003-10-09  Jim Blandy  <jimb@redhat.com>
 
        * desc-cpu.scm (gen-hw-table-decls): Emit an 'extern' declaration

diff --git a/cgen/decode.scm b/cgen/decode.scm
index 9b504b0..70dd5c6 100644 (file)
--- a/cgen/decode.scm
+++ b/cgen/decode.scm
@@ -451,7 +451,7 @@
           (opcode-mask (compute (insn-base-mask insn) insn-len decode-len bitnums))
           (indices (missing-bit-indices opcode-mask (- (integer-expt 2 decode-len) 1))))
       (logit 3 "insn =" (obj:name insn)
-            " insn-base-value=" (insn-base-value insn)
+            " insn-value=" (insn-value insn)
             " insn-base-mask=" (insn-base-mask insn)
             " insn-len=" insn-len
             " decode-len=" decode-len

diff --git a/cgen/sid-model.scm b/cgen/sid-model.scm
index 5a98ff4..985dc27 100644 (file)
--- a/cgen/sid-model.scm
+++ b/cgen/sid-model.scm
@@ -249,7 +249,7 @@ static const MACH_IMP_PROPERTIES @cpu@_imp_properties =
    "  };\n\n"
 
    ; FIXME: revisit MAX_UNITS
-  "  #define MAX_UNITS ("
+  "  static const int MAX_UNITS = "
   (number->string
    (let ((insn-list (non-multi-insns (real-insns (current-insn-list)))))
      (if (null? insn-list)
@@ -264,7 +264,7 @@ static const MACH_IMP_PROPERTIES @cpu@_imp_properties =
                                         (length (timing:units (cdr insn-timing))))
                                       timing))))
                          insn-list))))))
-   ")\n"
+   ";\n"
   )
 )