diff --git a/include/cyclone/runtime.h b/include/cyclone/runtime.h index 5a678842..61469bfe 100644 --- a/include/cyclone/runtime.h +++ b/include/cyclone/runtime.h @@ -109,9 +109,9 @@ object cell_get(object cell); #define global_set_id(id,glo,value) Cyc_global_set(data, id, (object *)&glo, value) object Cyc_global_set(void *thd, object sym, object * glo, object value); -#define global_set2(thd,k,glo,value) Cyc_global_set2(thd, k, NULL, (object *)&glo, value) -#define global_set2_id(thd,k,id,glo,value) Cyc_global_set2(thd, k, id, (object *)&glo, value) -object Cyc_global_set2(void *thd, object cont, object sym, object * glo, object value); +#define global_set_cps(thd,k,glo,value) Cyc_global_set_cps(thd, k, NULL, (object *)&glo, value) +#define global_set_cps_id(thd,k,id,glo,value) Cyc_global_set_cps(thd, k, id, (object *)&glo, value) +object Cyc_global_set_cps(void *thd, object cont, object sym, object * glo, object value); /* Variable argument count support diff --git a/runtime.c b/runtime.c index 3d5b8dec..6e5610df 100644 --- a/runtime.c +++ b/runtime.c @@ -415,7 +415,7 @@ object Cyc_global_set(void *thd, object identifier, object * glo, object value) return value; } -object Cyc_global_set2(void *thd, object cont, object identifier, object * glo, object value) +object Cyc_global_set_cps(void *thd, object cont, object identifier, object * glo, object value) { int do_gc = 0; value = share_object(thd, NULL, value, &do_gc); // glo cannot be thread-local! diff --git a/scheme/cyclone/primitives.sld b/scheme/cyclone/primitives.sld index 47cc03bf..bbaf2bfb 100644 --- a/scheme/cyclone/primitives.sld +++ b/scheme/cyclone/primitives.sld @@ -691,7 +691,7 @@ ((eq? p 'cell) "set_cell_as_expr") ((eq? p 'cell-get) "car") ;; Unsafe as cell gets added by compiler ((eq? p 'set-cell!) "Cyc_set_cell") - ((eq? p 'set-global!) "global_set2_id") + ((eq? p 'set-global!) "global_set_cps_id") ((eq? p 'set-global-unsafe!) "global_set_id") (else (error "unhandled primitive: " p))))