* Added nucleic benchmark.

benchmarks/new/r6rs-benchmarks.ss

@@ -30,6 +30,7 @@
      mbrot-iters
      nboyer-iters
      nqueens-iters
+     nucleic-iters
      takl-iters
      paraffins-iters
      parsing-iters

benchmarks/new/r6rs-benchmarks/BUGS

@@ -15,3 +15,4 @@
 * pnpoly kinda slow
 * sumfp/fpsum too slow
 * string too slow
+* nbody does not work

benchmarks/new/r6rs-benchmarks/cat.ss

@@ -16,7 +16,7 @@
             (catport port)))))
   
   (define (go)
-    (set! inport (open-input-file "r6rs-benchmarks/bib"))
+    (set! inport (open-input-file "bib"))
     (set! outport (open-output-file "foo"))
     (catport inport)
     (close-input-port inport))

benchmarks/new/r6rs-benchmarks/parsing.ss

@@ -951,4 +951,4 @@
            y))))
   
   (define (main . args)
-    (parsing-benchmark parsing-iters "r6rs-benchmarks/parsing-test.sch")))
+    (parsing-benchmark parsing-iters "parsing-data.ss")))

benchmarks/new/r6rs-benchmarks/tail.ss

@@ -28,7 +28,7 @@
     (tail-r-aux port '()))
   
   (define (go)
-    (set! inport (open-input-file "r6rs-benchmarks/bib"))
+    (set! inport (open-input-file "bib"))
     (set! outport (open-output-file "foo"))
     (tail-r inport)
     (close-input-port inport))

benchmarks/new/r6rs-benchmarks/wc.ss

@@ -30,7 +30,7 @@
             (wcport port)))))
   
   (define (go)
-    (set! inport (open-input-file "r6rs-benchmarks/bib"))
+    (set! inport (open-input-file "bib"))
     (set! nl 0)
     (set! nw 0)
     (set! nc 0)

benchmarks/results.Larceny-r6rs

@@ -6322,3 +6322,43 @@ Words allocated: 0
 Words reclaimed: 0
 Elapsed time...: 1264 ms (User: 1253 ms; System: 4 ms)
 Elapsed GC time: 0 ms (CPU: 0 in 0 collections.)
+
+****************************
+Benchmarking Larceny-r6rs on Wed Jun 13 18:13:04 AST 2007 under Darwin Vesuvius.local 8.9.1 Darwin Kernel Version 8.9.1: Thu Feb 22 20:55:00 PST 2007; root:xnu-792.18.15~1/RELEASE_I386 i386 i386
+
+Testing nucleic under Larceny-r6rs
+Compiling...
+Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified)
+
+
+> 
+> 
+Running...
+Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified)
+
+
+> 
+Words allocated: 151779700
+Words reclaimed: 0
+Elapsed time...: 4589 ms (User: 3119 ms; System: 1444 ms)
+Elapsed GC time: 267 ms (CPU: 257 in 579 collections.)
+
+****************************
+Benchmarking Larceny-r6rs on Wed Jun 13 18:15:48 AST 2007 under Darwin Vesuvius.local 8.9.1 Darwin Kernel Version 8.9.1: Thu Feb 22 20:55:00 PST 2007; root:xnu-792.18.15~1/RELEASE_I386 i386 i386
+
+Testing nucleic under Larceny-r6rs
+Compiling...
+Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified)
+
+
+> 
+> 
+Running...
+Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified)
+
+
+> 
+Words allocated: 151779700
+Words reclaimed: 0
+Elapsed time...: 4619 ms (User: 3127 ms; System: 1452 ms)
+Elapsed GC time: 276 ms (CPU: 252 in 579 collections.)

src/ikarus.numerics.ss

@@ -120,7 +120,8 @@
           quotient+remainder number->string string->number min max
           abs
           exact->inexact floor ceiling round log fl=? fl<? fl<=? fl>?
-          fl>=? fl+ fl- fl* fl/ flsqrt flmin flzero? flnegative?)
+          fl>=? fl+ fl- fl* fl/ flsqrt flmin flzero? flnegative?
+          sin cos atan sqrt)
   (import 
     (ikarus system $fx)
     (ikarus system $flonums)
@@ -135,7 +136,8 @@
             exact->inexact floor ceiling round log
             exact-integer-sqrt min max abs
             fl=? fl<? fl<=? fl>? fl>=? fl+ fl- fl* fl/ flsqrt flmin
-            flzero? flnegative?))
+            flzero? flnegative?
+            sin cos atan sqrt))
 
   (define (fixnum->flonum x)
     (foreign-call "ikrt_fixnum_to_flonum" x))

src/makefile.ss

@@ -396,6 +396,10 @@
     [add1                    i]
     [sub1                    i]
     [expt                    i r]
+    [sin                     i r]
+    [cos                     i r]
+    [sqrt                    i r]
+    [atan                    i r]
     [number?                 i r]
     [bignum?                 i]
     [ratnum?                 i]