Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-24 04:25:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Justin Ethier 2015-03-17 22:52:15 -04:00
parent 6a27bd44ad
commit 35dd277080
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cgen.scm
View file

@ -435,6 +435,7 @@
((eq? p '%halt) "__halt") ((eq? p '%halt) "__halt")
((eq? p 'exit) "__halt") ((eq? p 'exit) "__halt")
((eq? p 'raise) "Cyc_raise") ((eq? p 'raise) "Cyc_raise")
((eq? p 'Cyc-add-exception-handler) "Cyc_add_exception_handler")
((eq? p 'error) "Cyc_error") ((eq? p 'error) "Cyc_error")
((eq? p 'current-input-port) "Cyc_io_current_input_port") ((eq? p 'current-input-port) "Cyc_io_current_input_port")
((eq? p 'open-input-file) "Cyc_io_open_input_file") ((eq? p 'open-input-file) "Cyc_io_open_input_file")

17
runtime.h
View file

@ -466,24 +466,24 @@ static void default_exception_handler(int argc, closure _, object k, object err)
exit(1); exit(1);
} }
static void add_exception_handler(function_type handler) { static object Cyc_add_exception_handler(object handler) {
// TODO: error checking on handler? // TODO: error checking on handler?
exception_handler_stack = mcons(handler, exception_handler_stack); exception_handler_stack = mcons(handler, exception_handler_stack);
return handler;
} }
// TODO: remove ex handler, err if all are removed? // TODO: remove ex handler, err if all are removed?
// TODO: raise - call current exception handler // TODO: raise - call current exception handler
//static void Cyc_raise(/*object cont,*/ object err) { //static void Cyc_raise(/*object cont,*/ object err) {
static object Cyc_raise(object err) { static object Cyc_raise(object err) {
function_type fnc = (function_type) car(exception_handler_stack); //function_type fnc = (function_type) car(exception_handler_stack);
mclosure0(clo, fnc); //mclosure0(clo, fnc);
(fnc)(2, &clo, &clo, err); //(fnc)(2, &clo, &clo, err);
object clo = car(exception_handler_stack);
((closure)clo)->fn(2, clo, clo, err);
return nil; return nil;
} }
static void init_exception_handler(){
add_exception_handler(default_exception_handler);
}
/* END exception handler */ /* END exception handler */
/* Global variables. */ /* Global variables. */
@ -1957,9 +1957,10 @@ static void main_main (stack_size,heap_size,stack_base)
/* Create closure for the test function. */ /* Create closure for the test function. */
mclosure0(run_test,&c_entry_pt); mclosure0(run_test,&c_entry_pt);
mclosure0(default_ex, &default_exception_handler);
gc_cont = &run_test; gc_cont = &run_test;
/* Initialize constant expressions for the test runs. */ /* Initialize constant expressions for the test runs. */
init_exception_handler(); Cyc_add_exception_handler(&default_ex);
/* Allocate heap area for second generation. */ /* Allocate heap area for second generation. */
/* Use calloc instead of malloc to assure pages are in main memory. */ /* Use calloc instead of malloc to assure pages are in main memory. */

1
test.scm
View file

@ -23,6 +23,7 @@
;(eval '(a 1)) ;(eval '(a 1))
;(eval '(begin (define (a z) z) (a 1) (a 1))) ;(eval '(begin (define (a z) z) (a 1) (a 1)))
(Cyc-add-exception-handler (lambda (err) (write 'new-ex-handler)))
(define test '(a b)) (define test '(a b))
(set-car! test '(1 2 3)) (set-car! test '(1 2 3))
(write test) (write test)

1
trans.scm
View file

@ -519,6 +519,7 @@
error error
exit exit
raise raise
Cyc-add-exception-handler
cons cons
cell-get cell-get
set-global! set-global!