Update microcode generator

atgreen · Sep 23, 2012 · 4701d7c · 4701d7c
1 parent de2823f
commit 4701d7c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/scripts/microcoder.lisp b/scripts/microcoder.lisp
@@ -36,7 +36,7 @@
     (loop for filepos = (file-position in)
 	  for line = (read-line in nil)
  	  until (let ((s (cl-ppcre:split "\\|" line)))
-		  (equal (length s) 9)))
+		  (equal (length s) 10)))
     (read-line in nil)
 
     ;; We're at the table contents now.  Parse it and write our new
@@ -48,11 +48,11 @@
 	   for line = (read-line in nil)
 	   while line do 
 	   (let ((s (cl-ppcre:split "\\|" line)))
-	     (if (equal 9 (length s))
-		 (destructuring-bind (junk1 name code wr? rA? rB? rm? wm? &rest junk2) 
+	     (if (equal 10 (length s))
+		 (destructuring-bind (junk1 name code wA? wB? rA? rB? rm? wm? &rest junk2) 
 				     (mapcar (lambda (v) (string-trim " " v)) s)
 				     (setf (aref opcode-array (parse-integer code :radix 2))
-					   (list name wr? rA? rB? rm? wm?))))))
+					   (list name wA? wB? rA? rB? rm? wm?))))))
      (loop for i from 0 to 63
 	   do (let ((o (aref opcode-array i)))
 		(if o
@@ -63,7 +63,7 @@
 			       ((equal n 1) (format out "1"))
 			       (t (error "bad table entry")))))
 			  (cdr o))
-		  (format out "00000"))
+		  (format out "000000"))
 		(format out "~%"))))
   (close in)))