Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-14 00:07:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Justin Ethier 2017-05-25 17:46:41 -04:00
parent 85a74f3a1e
commit 7cdabc02b6
3 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cyclone/runtime.h
View file

@ -369,7 +369,7 @@ object Cyc_sub(void *data, object cont, int argc, object n, ...);
object Cyc_mul(void *data, object cont, int argc, object n, ...);
object Cyc_div(void *data, object cont, int argc, object n, ...);
// Future idea, there may be uses for this in addition to if statements:
// #define Cyc_if(c,t,e) ((boolean_f != c) ? t : e)
#define Cyc_if(c,t,e) ((boolean_f != c) ? t : e)
object Cyc_fast_sum(void *data, object ptr, object x, object y);
object Cyc_fast_sub(void *data, object ptr, object x, object y);
object Cyc_fast_mul(void *data, object ptr, object x, object y);

33
scheme/cyclone/cps-optimizations.sld
View file

@ -843,17 +843,28 @@
(= 1 (length (ast:lambda-formals->list (car exp))))
(= 1 (length (ast:lambda-formals->list (cadr exp))))
(if? (car (ast:lambda-body (car exp))))
;; Simplification, for now only allow then/else that call a cont
;; immediately, to prevent having to scan/rewrite those expressions
(let ((if-exp (car (ast:lambda-body (car exp))))
(kont (car (ast:lambda-formals->list (car exp)))))
(and
(app? (if->then if-exp))
(app? (if->else if-exp))
(equal? kont (car (if->then if-exp)))
(equal? kont (car (if->else if-exp)))))
;;
(not
(with-fnc (ast:lambda-id (car exp)) (lambda (fnc)
(adbf:side-effects fnc))))
)
;(trace:error `(DEBUG2 ,(car (ast:lambda-body (car exp)))))
(trace:error `(DEBUG2 ,exp))
(let* ((new-exp (car (ast:lambda-body (cadr exp))))
(new-if (car (ast:lambda-body (car exp))))
; TODO: No, just replace K with values
;(new-if `(if ,(if->condition old-if)
; ,(cadr (if->then old-if))
; ,(cadr (if->else old-if))))
(old-if (car (ast:lambda-body (car exp))))
; TODO: what about nested if's? may need another pass above to make sure
;; the if is simple enough to inline
(new-if `(Cyc-if ,(if->condition old-if)
,(cadr (if->then old-if))
,(cadr (if->else old-if))))
(old-k (car (ast:lambda-formals->list (car exp))))
(old-arg (car (ast:lambda-formals->list (cadr exp))))
)
@ -867,17 +878,19 @@
,new-if
new-exp:
,new-exp
)))
))
(hash-table-set! refs old-k 'values) ;; TODO: only a temporary solution, requires (scheme base) which is not guaranteed to be imported
(hash-table-set! refs old-arg new-if)
;; TODO: behavior would be:
;; - simplify calling lambda's if to remove cont
;; - replace arg to other lambda with simplified expression
;; - replace exp with body of other lambda,
;; - and call opt:inline-prims on it
(opt:inline-prims new-exp refs)
;; Same behavior for now, just seeing if this is possible first
(map (lambda (e) (opt:inline-prims e refs)) exp))
;;
;(map (lambda (e) (opt:inline-prims e refs)) exp)
)) ;;
(else
(map (lambda (e) (opt:inline-prims e refs)) exp))))
(else

3
scheme/cyclone/primitives.sld
View file

@ -80,6 +80,7 @@
Cyc-stdin
Cyc-stderr
Cyc-list
Cyc-if
Cyc-fast-plus
Cyc-fast-sub
Cyc-fast-mul
@ -216,6 +217,7 @@
(Cyc-stdout 0 0)
(Cyc-stdin 0 0)
(Cyc-stderr 0 0)
(Cyc-if 3 3)
(Cyc-fast-plus 2 2)
(Cyc-fast-sub 2 2)
(Cyc-fast-mul 2 2)
@ -459,6 +461,7 @@
((eq? p 'Cyc-stdin) "Cyc_stdin")
((eq? p 'Cyc-stderr) "Cyc_stderr")
((eq? p 'Cyc-list) "Cyc_list")
((eq? p 'Cyc-if) "Cyc_if")
((eq? p 'Cyc-fast-plus) "Cyc_fast_sum")
((eq? p 'Cyc-fast-sub) "Cyc_fast_sub")
((eq? p 'Cyc-fast-mul) "Cyc_fast_mul")