* Altcogen works. Need to rethink how to code the conflict graphs.

src/libaltcogen.ss

@@ -913,6 +913,7 @@
 
   (define (make-empty-set) (make-set '()))
   (define (set-member? x s) 
+    ;(unless (fixnum? x) (error 'set-member? "~s is not a fixnum" x))
     (unless (set? s) (error 'set-member? "~s is not a set" s))
     (memq x (set-v s)))
 
@@ -925,6 +926,7 @@
     (set-v s))
     
   (define (set-add x s)
+    ;(unless (fixnum? x) (error 'set-add "~s is not a fixnum" x))
     (unless (set? s) (error 'set-add "~s is not a set" s))
     (cond
       [(memq x (set-v s)) s]
@@ -937,6 +939,7 @@
       [else (cons (car s) (rem x (cdr s)))])) 
 
   (define (set-rem x s)
+    ;(unless (fixnum? x) (error 'set-rem "~s is not a fixnum" x))
     (unless (set? s) (error 'set-rem "~s is not a set" s))
     (make-set (rem x (set-v s))))
   
@@ -956,6 +959,7 @@
     (make-set (union (set-v s1) (set-v s2))))
 
   (define (list->set ls)
+    ;(unless (andmap fixnum? ls) (error 'set-rem "~s is not a list of fixnum" ls))
     (make-set ls))
 
   (define (union s1 s2)
@@ -992,6 +996,7 @@
   (define (empty-set? s) (eqv? s 0))
   
   (define (set-member? n s) 
+    (unless (fixnum? n) (error 'set-member? "~s is not a fixnum" n))
     (let f ([s s] [i (index-of n)] [j (mask-of n)])
       (cond
         [(pair? s)
@@ -1002,6 +1007,7 @@
         [else #f])))
 
   (define (set-add n s)
+    (unless (fixnum? n) (error 'set-add "~s is not a fixnum" n))
     (let f ([s s] [i (index-of n)] [j (mask-of n)])
       (cond
         [(pair? s)
@@ -1024,6 +1030,7 @@
         (cons a d)))
 
   (define (set-rem n s)
+    (unless (fixnum? n) (error 'set-rem "~s is not a fixnum" n))
     (let f ([s s] [i (index-of n)] [j (mask-of n)])
       (cond
         [(pair? s)
@@ -1087,6 +1094,7 @@
             (fxlogand s1 (fxlognot s2)))))
 
   (define (list->set ls)
+    (unless (andmap fixnum? ls) (error 'list->set "~s is not a list of fixnum" ls))
     (let f ([ls ls] [s 0])
       (cond
         [(null? ls) s]
@@ -2567,6 +2575,8 @@
 
 
 
+
+
 (define (flatten-codes x)
   (define who 'flatten-codes)
   ;;;
@@ -2589,7 +2599,7 @@
   (define (BYTE x)
     (record-case x
       [(constant x)
-       (unless (and (integer? x) (fx<= x 255) (fx<= 0 x))
+       (unless (and (integer? x) (fx<= x 255) (fx<= -128 x))
          (error who "invalid byte ~s" x))
        x]
       [else (error who "invalid byte ~s" x)]))

src/makefile.ss

@@ -853,16 +853,10 @@
               [(assq x locs) => cdr]
               [else 
                (error 'bootstrap "no location for ~s" x)])))
-        (let ([p (open-output-file "ikarus.boot.new" 'replace)]
+        (let ([p (open-output-file "ikarus.boot" 'replace)])
-              [idx 0])
           (for-each 
             (lambda (x) 
-              (set! idx (+ idx 1))
+              (alt-compile-core-expr-to-port x p))
-              (cond
-                [(memv idx '(1))
-                 (alt-compile-core-expr-to-port x p)]
-                [else
-                 (compile-core-expr-to-port x p)]))
             core*)
           (close-output-port p)))))
 

src/pass-specify-rep-primops.ss

@@ -439,7 +439,8 @@
 (section ;;; symbols
 
 (define-primop symbol? safe
-  [(P x) (tag-test (T x) ptag-mask symbol-ptag)]
+  [(P x) 
+   (sec-tag-test (T x) vector-mask vector-tag #f symbol-record-tag)]
   [(E x) (nop)])
 
 (define-primop $make-symbol unsafe
@@ -1195,7 +1196,10 @@
          (unless (fixnum? c) (interrupt))
          (prm 'bset/c (T x)
               (K (+ i (- disp-bytevector-data bytevector-tag)))
-              (K c))]
+              (K (cond
+                   [(<= -128 c 127) c]
+                   [(<= 128 c 255) (- c 256)]
+                   [else (interrupt)])))]
         [else
          (prm 'bset/h (T x)
                (K (+ i (- disp-bytevector-data bytevector-tag)))
@@ -1208,7 +1212,10 @@
               (prm 'int+ 
                    (prm 'sra (T i) (K fixnum-shift))
                    (K (- disp-bytevector-data bytevector-tag)))
-              (K c))]
+              (K (cond
+                   [(<= -128 c 127) c]
+                   [(<= 128 c 255) (- c 256)]
+                   [else (interrupt)])))]
         [else
          (prm 'bset/h (T x)
                (prm 'int+