ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/microscheme/scheme.c
(Generate patch)

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.37 by root, Sun Nov 29 05:09:24 2015 UTC vs.
Revision 1.60 by root, Wed Dec 2 02:59:36 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define EXPERIMENT 1
22
23#if 1
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 25#include "malloc.c"
26#endif
23 27
24#define SCHEME_SOURCE 28#define SCHEME_SOURCE
25#include "scheme-private.h" 29#include "scheme-private.h"
26#ifndef WIN32 30#ifndef WIN32
27# include <unistd.h> 31# include <unistd.h>
… …
74 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
75 TOK_VEC 79 TOK_VEC
76}; 80};
77 81
78#define BACKQUOTE '`' 82#define BACKQUOTE '`'
79#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
80 85
81#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
82#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
83#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
84#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
85#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
86 91
87#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
88static scheme sc; 93static scheme sc;
89#endif 94#endif
90 95
91static void 96ecb_cold static void
92xbase (char *s, long n, int base) 97xbase (char *s, long n, int base)
93{ 98{
94 if (n < 0) 99 if (n < 0)
95 { 100 {
96 *s++ = '-'; 101 *s++ = '-';
… …
98 } 103 }
99 104
100 char *p = s; 105 char *p = s;
101 106
102 do { 107 do {
103 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
104 n /= base; 109 n /= base;
105 } while (n); 110 } while (n);
106 111
107 *p-- = 0; 112 *p-- = 0;
108 113
… …
111 char x = *s; *s = *p; *p = x; 116 char x = *s; *s = *p; *p = x;
112 --p; ++s; 117 --p; ++s;
113 } 118 }
114} 119}
115 120
116static void 121ecb_cold static void
117xnum (char *s, long n) 122xnum (char *s, long n)
118{ 123{
119 xbase (s, n, 10); 124 xbase (s, n, 10);
120} 125}
121 126
122static void 127ecb_cold static void
123xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
124{
125 write (1, s, strlen (s));
126}
127
128static void
129xwrnum (long n)
130{ 129{
131 char buf[64]; 130 char buf[64];
132 131
133 xnum (buf, n); 132 xnum (buf, n);
134 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
135} 134}
136 135
137static char 136ecb_cold static char
138xtoupper (char c) 137xtoupper (char c)
139{ 138{
140 if (c >= 'a' && c <= 'z') 139 if (c >= 'a' && c <= 'z')
141 c -= 'a' - 'A'; 140 c -= 'a' - 'A';
142 141
143 return c; 142 return c;
144} 143}
145 144
146static char 145ecb_cold static char
147xtolower (char c) 146xtolower (char c)
148{ 147{
149 if (c >= 'A' && c <= 'Z') 148 if (c >= 'A' && c <= 'Z')
150 c += 'a' - 'A'; 149 c += 'a' - 'A';
151 150
152 return c; 151 return c;
153} 152}
154 153
155static int 154ecb_cold static int
156xisdigit (char c) 155xisdigit (char c)
157{ 156{
158 return c >= '0' && c <= '9'; 157 return c >= '0' && c <= '9';
159} 158}
160 159
161#define toupper(c) xtoupper (c) 160#define toupper(c) xtoupper (c)
162#define tolower(c) xtolower (c) 161#define tolower(c) xtolower (c)
163#define isdigit(c) xisdigit (c) 162#define isdigit(c) xisdigit (c)
164 163
165#if USE_IGNORECASE 164#if USE_IGNORECASE
166static const char * 165ecb_cold static const char *
167xstrlwr (char *s) 166xstrlwr (char *s)
168{ 167{
169 const char *p = s; 168 const char *p = s;
170 169
171 while (*s) 170 while (*s)
… …
191 190
192#ifndef InitFile 191#ifndef InitFile
193# define InitFile "init.scm" 192# define InitFile "init.scm"
194#endif 193#endif
195 194
196#ifndef FIRST_CELLSEGS
197# define FIRST_CELLSEGS 3
198#endif
199
200enum scheme_types 195enum scheme_types
201{ 196{
202 T_INTEGER, 197 T_INTEGER,
198 T_CHARACTER,
203 T_REAL, 199 T_REAL,
204 T_STRING, 200 T_STRING,
205 T_SYMBOL, 201 T_SYMBOL,
206 T_PROC, 202 T_PROC,
207 T_PAIR, /* also used for free cells */ 203 T_PAIR, /* also used for free cells */
208 T_CLOSURE, 204 T_CLOSURE,
205 T_MACRO,
209 T_CONTINUATION, 206 T_CONTINUATION,
210 T_FOREIGN, 207 T_FOREIGN,
211 T_CHARACTER,
212 T_PORT, 208 T_PORT,
213 T_VECTOR, 209 T_VECTOR,
214 T_MACRO,
215 T_PROMISE, 210 T_PROMISE,
216 T_ENVIRONMENT, 211 T_ENVIRONMENT,
217 /* one more... */ 212 /* one more... */
218 T_NUM_SYSTEM_TYPES 213 T_NUM_SYSTEM_TYPES
219}; 214};
… …
255static num num_op (enum num_op op, num a, num b); 250static num num_op (enum num_op op, num a, num b);
256static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
257static num num_rem (num a, num b); 252static num num_rem (num a, num b);
258static num num_mod (num a, num b); 253static num num_mod (num a, num b);
259 254
260#if USE_MATH
261static double round_per_R5RS (double x);
262#endif
263static int is_zero_rvalue (RVALUE x); 255static int is_zero_rvalue (RVALUE x);
264 256
265static num num_zero; 257static num num_zero;
266static num num_one; 258static num num_one;
267 259
260/* convert "pointer" to cell* / cell* to pointer */
261#define CELL(p) ((struct cell *)(p) + 0)
262#define POINTER(c) ((void *)((c) - 0))
263
268/* macros for cell operations */ 264/* macros for cell operations */
269#define typeflag(p) ((p)->flag + 0) 265#define typeflag(p) (CELL(p)->flag + 0)
270#define set_typeflag(p,v) ((p)->flag = (v)) 266#define set_typeflag(p,v) (CELL(p)->flag = (v))
271#define type(p) (typeflag (p) & T_MASKTYPE) 267#define type(p) (typeflag (p) & T_MASKTYPE)
272 268
273INTERFACE int 269INTERFACE int
274is_string (pointer p) 270is_string (pointer p)
275{ 271{
276 return type (p) == T_STRING; 272 return type (p) == T_STRING;
277} 273}
278 274
279#define strvalue(p) ((p)->object.string.svalue) 275#define strvalue(p) (CELL(p)->object.string.svalue)
280#define strlength(p) ((p)->object.string.length) 276#define strlength(p) (CELL(p)->object.string.length)
281 277
282INTERFACE int 278INTERFACE int
283is_vector (pointer p) 279is_vector (pointer p)
284{ 280{
285 return type (p) == T_VECTOR; 281 return type (p) == T_VECTOR;
286} 282}
287 283
288#define vecvalue(p) ((p)->object.vector.vvalue) 284#define vecvalue(p) (CELL(p)->object.vector.vvalue)
289#define veclength(p) ((p)->object.vector.length) 285#define veclength(p) (CELL(p)->object.vector.length)
290INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 286INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
291INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 287INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
292INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 288INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
293 289
294INTERFACE int 290INTERFACE int
… …
320string_value (pointer p) 316string_value (pointer p)
321{ 317{
322 return strvalue (p); 318 return strvalue (p);
323} 319}
324 320
325#define ivalue_unchecked(p) (p)->object.ivalue 321#define ivalue_unchecked(p) CELL(p)->object.ivalue
326#define set_ivalue(p,v) (p)->object.ivalue = (v) 322#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
327 323
328#if USE_REAL 324#if USE_REAL
329#define rvalue_unchecked(p) (p)->object.rvalue 325#define rvalue_unchecked(p) CELL(p)->object.rvalue
330#define set_rvalue(p,v) (p)->object.rvalue = (v) 326#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
331#else 327#else
332#define rvalue_unchecked(p) (p)->object.ivalue 328#define rvalue_unchecked(p) CELL(p)->object.ivalue
333#define set_rvalue(p,v) (p)->object.ivalue = (v) 329#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
334#endif 330#endif
335 331
336INTERFACE long 332INTERFACE long
337charvalue (pointer p) 333charvalue (pointer p)
338{ 334{
339 return ivalue_unchecked (p); 335 return ivalue_unchecked (p);
340} 336}
341 337
338#define port(p) CELL(p)->object.port
339#define set_port(p,v) port(p) = (v)
342INTERFACE int 340INTERFACE int
343is_port (pointer p) 341is_port (pointer p)
344{ 342{
345 return type (p) == T_PORT; 343 return type (p) == T_PORT;
346} 344}
347 345
348INTERFACE int 346INTERFACE int
349is_inport (pointer p) 347is_inport (pointer p)
350{ 348{
351 return is_port (p) && p->object.port->kind & port_input; 349 return is_port (p) && port (p)->kind & port_input;
352} 350}
353 351
354INTERFACE int 352INTERFACE int
355is_outport (pointer p) 353is_outport (pointer p)
356{ 354{
357 return is_port (p) && p->object.port->kind & port_output; 355 return is_port (p) && port (p)->kind & port_output;
358} 356}
359 357
360INTERFACE int 358INTERFACE int
361is_pair (pointer p) 359is_pair (pointer p)
362{ 360{
363 return type (p) == T_PAIR; 361 return type (p) == T_PAIR;
364} 362}
365 363
366#define car(p) ((p)->object.cons.car + 0) 364#define car(p) (POINTER (CELL(p)->object.cons.car))
367#define cdr(p) ((p)->object.cons.cdr + 0) 365#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
368 366
369static pointer caar (pointer p) { return car (car (p)); } 367static pointer caar (pointer p) { return car (car (p)); }
370static pointer cadr (pointer p) { return car (cdr (p)); } 368static pointer cadr (pointer p) { return car (cdr (p)); }
371static pointer cdar (pointer p) { return cdr (car (p)); } 369static pointer cdar (pointer p) { return cdr (car (p)); }
372static pointer cddr (pointer p) { return cdr (cdr (p)); } 370static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
376static pointer cdaar (pointer p) { return cdr (car (car (p))); } 374static pointer cdaar (pointer p) { return cdr (car (car (p))); }
377 375
378INTERFACE void 376INTERFACE void
379set_car (pointer p, pointer q) 377set_car (pointer p, pointer q)
380{ 378{
381 p->object.cons.car = q; 379 CELL(p)->object.cons.car = CELL (q);
382} 380}
383 381
384INTERFACE void 382INTERFACE void
385set_cdr (pointer p, pointer q) 383set_cdr (pointer p, pointer q)
386{ 384{
387 p->object.cons.cdr = q; 385 CELL(p)->object.cons.cdr = CELL (q);
388} 386}
389 387
390INTERFACE pointer 388INTERFACE pointer
391pair_car (pointer p) 389pair_car (pointer p)
392{ 390{
… …
406} 404}
407 405
408INTERFACE char * 406INTERFACE char *
409symname (pointer p) 407symname (pointer p)
410{ 408{
411 return strvalue (car (p)); 409 return strvalue (p);
412} 410}
413 411
414#if USE_PLIST 412#if USE_PLIST
413#error plists are broken because symbols are no longer pairs
414#define symprop(p) cdr(p)
415SCHEME_EXPORT int 415SCHEME_EXPORT int
416hasprop (pointer p) 416hasprop (pointer p)
417{ 417{
418 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
419} 419}
420
421# define symprop(p) cdr(p)
422#endif 420#endif
423 421
424INTERFACE int 422INTERFACE int
425is_syntax (pointer p) 423is_syntax (pointer p)
426{ 424{
… …
440} 438}
441 439
442INTERFACE char * 440INTERFACE char *
443syntaxname (pointer p) 441syntaxname (pointer p)
444{ 442{
445 return strvalue (car (p)); 443 return strvalue (p);
446} 444}
447 445
448#define procnum(p) ivalue_unchecked (p) 446#define procnum(p) ivalue_unchecked (p)
449static const char *procname (pointer x); 447static const char *procname (pointer x);
450 448
… …
522 proper list: length 520 proper list: length
523 circular list: -1 521 circular list: -1
524 not even a pair: -2 522 not even a pair: -2
525 dotted list: -2 minus length before dot 523 dotted list: -2 minus length before dot
526*/ 524*/
527INTERFACE int 525ecb_hot INTERFACE int
528list_length (SCHEME_P_ pointer a) 526list_length (SCHEME_P_ pointer a)
529{ 527{
530 int i = 0; 528 int i = 0;
531 pointer slow, fast; 529 pointer slow, fast;
532 530
… …
638 "gs", 636 "gs",
639 "rs", 637 "rs",
640 "us" 638 "us"
641}; 639};
642 640
643static int 641ecb_cold static int
644is_ascii_name (const char *name, int *pc) 642is_ascii_name (const char *name, int *pc)
645{ 643{
646 int i; 644 int i;
647 645
648 for (i = 0; i < 32; i++) 646 for (i = 0; i < 32; i++)
… …
667 665
668static int file_push (SCHEME_P_ const char *fname); 666static int file_push (SCHEME_P_ const char *fname);
669static void file_pop (SCHEME_P); 667static void file_pop (SCHEME_P);
670static int file_interactive (SCHEME_P); 668static int file_interactive (SCHEME_P);
671ecb_inline int is_one_of (const char *s, int c); 669ecb_inline int is_one_of (const char *s, int c);
672static int alloc_cellseg (SCHEME_P_ int n); 670static int alloc_cellseg (SCHEME_P);
673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
674static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
675static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
676static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 674static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
677static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
… …
871 } 869 }
872 870
873 return ret; 871 return ret;
874} 872}
875 873
876#if USE_MATH
877
878/* Round to nearest. Round to even if midway */
879static double
880round_per_R5RS (double x)
881{
882 double fl = floor (x);
883 double ce = ceil (x);
884 double dfl = x - fl;
885 double dce = ce - x;
886
887 if (dfl > dce)
888 return ce;
889 else if (dfl < dce)
890 return fl;
891 else
892 {
893 if (fmod (fl, 2) == 0) /* I imagine this holds */
894 return fl;
895 else
896 return ce;
897 }
898}
899#endif
900
901static int 874static int
902is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
903{ 876{
904 return x == 0; 877 return x == 0;
905#if 0 878#if 0
… …
910#endif 883#endif
911#endif 884#endif
912} 885}
913 886
914/* allocate new cell segment */ 887/* allocate new cell segment */
915static int 888ecb_cold static int
916alloc_cellseg (SCHEME_P_ int n) 889alloc_cellseg (SCHEME_P)
917{ 890{
918 pointer newp; 891 struct cell *newp;
919 pointer last; 892 struct cell *last;
920 pointer p; 893 struct cell *p;
921 char *cp; 894 char *cp;
922 long i; 895 long i;
923 int k; 896 int k;
924 897
925 static int segsize = CELL_SEGSIZE >> 1; 898 static int segsize = CELL_SEGSIZE >> 1;
926 segsize <<= 1; 899 segsize <<= 1;
927 900
928 for (k = 0; k < n; k++)
929 {
930 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
931 return k;
932
933 cp = malloc (segsize * sizeof (struct cell)); 901 cp = malloc (segsize * sizeof (struct cell));
934 902
935 if (!cp && USE_ERROR_CHECKING) 903 if (!cp && USE_ERROR_CHECKING)
936 return k; 904 return k;
937 905
938 i = ++SCHEME_V->last_cell_seg; 906 i = ++SCHEME_V->last_cell_seg;
939 SCHEME_V->alloc_seg[i] = cp; 907 SCHEME_V->alloc_seg[i] = cp;
940 908
941 newp = (pointer)cp; 909 newp = (struct cell *)cp;
942 SCHEME_V->cell_seg[i] = newp; 910 SCHEME_V->cell_seg[i] = newp;
943 SCHEME_V->cell_segsize[i] = segsize; 911 SCHEME_V->cell_segsize[i] = segsize;
944 SCHEME_V->fcells += segsize; 912 SCHEME_V->fcells += segsize;
945 last = newp + segsize - 1; 913 last = newp + segsize - 1;
946 914
947 for (p = newp; p <= last; p++) 915 for (p = newp; p <= last; p++)
948 { 916 {
917 pointer cp = POINTER (p);
949 set_typeflag (p, T_PAIR); 918 set_typeflag (cp, T_PAIR);
950 set_car (p, NIL); 919 set_car (cp, NIL);
951 set_cdr (p, p + 1); 920 set_cdr (cp, POINTER (p + 1));
952 } 921 }
953 922
954 set_cdr (last, SCHEME_V->free_cell); 923 set_cdr (POINTER (last), SCHEME_V->free_cell);
955 SCHEME_V->free_cell = newp; 924 SCHEME_V->free_cell = POINTER (newp);
956 }
957 925
958 return n; 926 return 1;
959} 927}
960 928
961/* get new cell. parameter a, b is marked by gc. */ 929/* get new cell. parameter a, b is marked by gc. */
962ecb_inline pointer 930ecb_inline pointer
963get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 935 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
968 return S_SINK; 936 return S_SINK;
969 937
970 if (SCHEME_V->free_cell == NIL) 938 if (SCHEME_V->free_cell == NIL)
971 { 939 {
972 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 940 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
973 941
974 gc (SCHEME_A_ a, b); 942 gc (SCHEME_A_ a, b);
975 943
976 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 944 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
977 { 945 {
978 /* if only a few recovered, get more to avoid fruitless gc's */ 946 /* if only a few recovered, get more to avoid fruitless gc's */
979 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 947 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
980 { 948 {
981#if USE_ERROR_CHECKING 949#if USE_ERROR_CHECKING
982 SCHEME_V->no_memory = 1; 950 SCHEME_V->no_memory = 1;
983 return S_SINK; 951 return S_SINK;
984#endif 952#endif
… …
996 } 964 }
997} 965}
998 966
999/* To retain recent allocs before interpreter knows about them - 967/* To retain recent allocs before interpreter knows about them -
1000 Tehom */ 968 Tehom */
1001 969ecb_hot static void
1002static void
1003push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1004{ 971{
1005 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 972 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1006 973
1007 set_typeflag (holder, T_PAIR); 974 set_typeflag (holder, T_PAIR);
… …
1009 set_car (holder, recent); 976 set_car (holder, recent);
1010 set_cdr (holder, car (S_SINK)); 977 set_cdr (holder, car (S_SINK));
1011 set_car (S_SINK, holder); 978 set_car (S_SINK, holder);
1012} 979}
1013 980
1014static pointer 981ecb_hot static pointer
1015get_cell (SCHEME_P_ pointer a, pointer b) 982get_cell (SCHEME_P_ pointer a, pointer b)
1016{ 983{
1017 pointer cell = get_cell_x (SCHEME_A_ a, b); 984 pointer cell = get_cell_x (SCHEME_A_ a, b);
1018 985
1019 /* For right now, include "a" and "b" in "cell" so that gc doesn't 986 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1028} 995}
1029 996
1030static pointer 997static pointer
1031get_vector_object (SCHEME_P_ uint32_t len, pointer init) 998get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1032{ 999{
1033 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1000 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1034 pointer *e = malloc (len * sizeof (pointer)); 1001 pointer *e = malloc (len * sizeof (pointer));
1035 1002
1036 if (!e && USE_ERROR_CHECKING) 1003 if (!e && USE_ERROR_CHECKING)
1037 return S_SINK; 1004 return S_SINK;
1038 1005
1039 /* Record it as a vector so that gc understands it. */ 1006 /* Record it as a vector so that gc understands it. */
1040 set_typeflag (v, T_VECTOR | T_ATOM); 1007 set_typeflag (v, T_VECTOR | T_ATOM);
1041 1008
1042 v->object.vector.vvalue = e; 1009 CELL(v)->object.vector.vvalue = e;
1043 v->object.vector.length = len; 1010 CELL(v)->object.vector.length = len;
1044 fill_vector (v, 0, init); 1011 fill_vector (v, 0, init);
1045 push_recent_alloc (SCHEME_A_ v, NIL); 1012 push_recent_alloc (SCHEME_A_ v, NIL);
1046 1013
1047 return v; 1014 return v;
1048} 1015}
… …
1057static void 1024static void
1058check_cell_alloced (pointer p, int expect_alloced) 1025check_cell_alloced (pointer p, int expect_alloced)
1059{ 1026{
1060 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1027 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1061 if (typeflag (p) & !expect_alloced) 1028 if (typeflag (p) & !expect_alloced)
1062 xwrstr ("Cell is already allocated!\n"); 1029 putstr (SCHEME_A_ "Cell is already allocated!\n");
1063 1030
1064 if (!(typeflag (p)) & expect_alloced) 1031 if (!(typeflag (p)) & expect_alloced)
1065 xwrstr ("Cell is not allocated!\n"); 1032 putstr (SCHEME_A_ "Cell is not allocated!\n");
1066} 1033}
1067 1034
1068static void 1035static void
1069check_range_alloced (pointer p, int n, int expect_alloced) 1036check_range_alloced (pointer p, int n, int expect_alloced)
1070{ 1037{
… …
1076#endif 1043#endif
1077 1044
1078/* Medium level cell allocation */ 1045/* Medium level cell allocation */
1079 1046
1080/* get new cons cell */ 1047/* get new cons cell */
1081pointer 1048ecb_hot pointer
1082xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1049xcons (SCHEME_P_ pointer a, pointer b, int immutable)
1083{ 1050{
1084 pointer x = get_cell (SCHEME_A_ a, b); 1051 pointer x = get_cell (SCHEME_A_ a, b);
1085 1052
1086 set_typeflag (x, T_PAIR); 1053 set_typeflag (x, T_PAIR);
… …
1092 set_cdr (x, b); 1059 set_cdr (x, b);
1093 1060
1094 return x; 1061 return x;
1095} 1062}
1096 1063
1097/* ========== oblist implementation ========== */
1098
1099static pointer 1064ecb_cold static pointer
1100generate_symbol (SCHEME_P_ const char *name) 1065generate_symbol (SCHEME_P_ const char *name)
1101{ 1066{
1102 pointer x = mk_string (SCHEME_A_ name); 1067 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x); 1068 setimmutable (x);
1104 x = immutable_cons (x, NIL);
1105 set_typeflag (x, T_SYMBOL); 1069 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x; 1070 return x;
1107} 1071}
1072
1073/* ========== oblist implementation ========== */
1108 1074
1109#ifndef USE_OBJECT_LIST 1075#ifndef USE_OBJECT_LIST
1110 1076
1111static int 1077static int
1112hash_fn (const char *key, int table_size) 1078hash_fn (const char *key, int table_size)
… …
1118 hash = (hash ^ *p++) * 16777619; 1084 hash = (hash ^ *p++) * 16777619;
1119 1085
1120 return hash % table_size; 1086 return hash % table_size;
1121} 1087}
1122 1088
1123static pointer 1089ecb_cold static pointer
1124oblist_initial_value (SCHEME_P) 1090oblist_initial_value (SCHEME_P)
1125{ 1091{
1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1092 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1127} 1093}
1128 1094
1129/* returns the new symbol */ 1095/* returns the new symbol */
1130static pointer 1096ecb_cold static pointer
1131oblist_add_by_name (SCHEME_P_ const char *name) 1097oblist_add_by_name (SCHEME_P_ const char *name)
1132{ 1098{
1133 pointer x = generate_symbol (SCHEME_A_ name); 1099 pointer x = generate_symbol (SCHEME_A_ name);
1134 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1100 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1135 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1101 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1136 return x; 1102 return x;
1137} 1103}
1138 1104
1139ecb_inline pointer 1105ecb_cold static pointer
1140oblist_find_by_name (SCHEME_P_ const char *name) 1106oblist_find_by_name (SCHEME_P_ const char *name)
1141{ 1107{
1142 int location; 1108 int location;
1143 pointer x; 1109 pointer x;
1144 char *s; 1110 char *s;
… …
1155 } 1121 }
1156 1122
1157 return NIL; 1123 return NIL;
1158} 1124}
1159 1125
1160static pointer 1126ecb_cold static pointer
1161oblist_all_symbols (SCHEME_P) 1127oblist_all_symbols (SCHEME_P)
1162{ 1128{
1163 int i; 1129 int i;
1164 pointer x; 1130 pointer x;
1165 pointer ob_list = NIL; 1131 pointer ob_list = NIL;
… …
1171 return ob_list; 1137 return ob_list;
1172} 1138}
1173 1139
1174#else 1140#else
1175 1141
1176static pointer 1142ecb_cold static pointer
1177oblist_initial_value (SCHEME_P) 1143oblist_initial_value (SCHEME_P)
1178{ 1144{
1179 return NIL; 1145 return NIL;
1180} 1146}
1181 1147
1182ecb_inline pointer 1148ecb_cold static pointer
1183oblist_find_by_name (SCHEME_P_ const char *name) 1149oblist_find_by_name (SCHEME_P_ const char *name)
1184{ 1150{
1185 pointer x; 1151 pointer x;
1186 char *s; 1152 char *s;
1187 1153
… …
1196 1162
1197 return NIL; 1163 return NIL;
1198} 1164}
1199 1165
1200/* returns the new symbol */ 1166/* returns the new symbol */
1201static pointer 1167ecb_cold static pointer
1202oblist_add_by_name (SCHEME_P_ const char *name) 1168oblist_add_by_name (SCHEME_P_ const char *name)
1203{ 1169{
1204 pointer x = mk_string (SCHEME_A_ name); 1170 pointer x = generate_symbol (SCHEME_A_ name);
1205 set_typeflag (x, T_SYMBOL);
1206 setimmutable (x);
1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208 return x; 1172 return x;
1209} 1173}
1210 1174
1211static pointer 1175ecb_cold static pointer
1212oblist_all_symbols (SCHEME_P) 1176oblist_all_symbols (SCHEME_P)
1213{ 1177{
1214 return SCHEME_V->oblist; 1178 return SCHEME_V->oblist;
1215} 1179}
1216 1180
1217#endif 1181#endif
1218 1182
1219#if USE_PORTS 1183#if USE_PORTS
1220static pointer 1184ecb_cold static pointer
1221mk_port (SCHEME_P_ port *p) 1185mk_port (SCHEME_P_ port *p)
1222{ 1186{
1223 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1187 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224 1188
1225 set_typeflag (x, T_PORT | T_ATOM); 1189 set_typeflag (x, T_PORT | T_ATOM);
1226 x->object.port = p; 1190 set_port (x, p);
1227 1191
1228 return x; 1192 return x;
1229} 1193}
1230#endif 1194#endif
1231 1195
1232pointer 1196ecb_cold pointer
1233mk_foreign_func (SCHEME_P_ foreign_func f) 1197mk_foreign_func (SCHEME_P_ foreign_func f)
1234{ 1198{
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1199 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1200
1237 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1201 set_typeflag (x, T_FOREIGN | T_ATOM);
1238 x->object.ff = f; 1202 CELL(x)->object.ff = f;
1239 1203
1240 return x; 1204 return x;
1241} 1205}
1242 1206
1243INTERFACE pointer 1207INTERFACE pointer
1244mk_character (SCHEME_P_ int c) 1208mk_character (SCHEME_P_ int c)
1245{ 1209{
1246 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247 1211
1248 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1212 set_typeflag (x, T_CHARACTER | T_ATOM);
1249 set_ivalue (x, c & 0xff); 1213 set_ivalue (x, c & 0xff);
1250 1214
1251 return x; 1215 return x;
1252} 1216}
1253 1217
1254/* get number atom (integer) */ 1218/* get number atom (integer) */
1255INTERFACE pointer 1219INTERFACE pointer
1256mk_integer (SCHEME_P_ long n) 1220mk_integer (SCHEME_P_ long n)
1257{ 1221{
1222 pointer p = 0;
1223 pointer *pp = &p;
1224
1225#if USE_INTCACHE
1226 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1227 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1228#endif
1229
1230 if (!*pp)
1231 {
1258 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1259 1233
1260 set_typeflag (x, (T_INTEGER | T_ATOM)); 1234 set_typeflag (x, T_INTEGER | T_ATOM);
1235 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1261 set_ivalue (x, n); 1236 set_ivalue (x, n);
1262 1237
1238 *pp = x;
1239 }
1240
1263 return x; 1241 return *pp;
1264} 1242}
1265 1243
1266INTERFACE pointer 1244INTERFACE pointer
1267mk_real (SCHEME_P_ RVALUE n) 1245mk_real (SCHEME_P_ RVALUE n)
1268{ 1246{
1269#if USE_REAL 1247#if USE_REAL
1270 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1248 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271 1249
1272 set_typeflag (x, (T_REAL | T_ATOM)); 1250 set_typeflag (x, T_REAL | T_ATOM);
1273 set_rvalue (x, n); 1251 set_rvalue (x, n);
1274 1252
1275 return x; 1253 return x;
1276#else 1254#else
1277 return mk_integer (SCHEME_A_ n); 1255 return mk_integer (SCHEME_A_ n);
… …
1388 x = oblist_add_by_name (SCHEME_A_ name); 1366 x = oblist_add_by_name (SCHEME_A_ name);
1389 1367
1390 return x; 1368 return x;
1391} 1369}
1392 1370
1393INTERFACE pointer 1371ecb_cold INTERFACE pointer
1394gensym (SCHEME_P) 1372gensym (SCHEME_P)
1395{ 1373{
1396 pointer x; 1374 pointer x;
1397 char name[40] = "gensym-"; 1375 char name[40] = "gensym-";
1398 xnum (name + 7, SCHEME_V->gensym_cnt); 1376 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1399 1377
1400 return generate_symbol (SCHEME_A_ name); 1378 return generate_symbol (SCHEME_A_ name);
1401} 1379}
1402 1380
1381static int
1382is_gensym (SCHEME_P_ pointer x)
1383{
1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1385}
1386
1403/* make symbol or number atom from string */ 1387/* make symbol or number atom from string */
1404static pointer 1388ecb_cold static pointer
1405mk_atom (SCHEME_P_ char *q) 1389mk_atom (SCHEME_P_ char *q)
1406{ 1390{
1407 char c, *p; 1391 char c, *p;
1408 int has_dec_point = 0; 1392 int has_dec_point = 0;
1409 int has_fp_exp = 0; 1393 int has_fp_exp = 0;
… …
1480 1464
1481 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1465 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1482} 1466}
1483 1467
1484/* make constant */ 1468/* make constant */
1485static pointer 1469ecb_cold static pointer
1486mk_sharp_const (SCHEME_P_ char *name) 1470mk_sharp_const (SCHEME_P_ char *name)
1487{ 1471{
1488 if (!strcmp (name, "t")) 1472 if (!strcmp (name, "t"))
1489 return S_T; 1473 return S_T;
1490 else if (!strcmp (name, "f")) 1474 else if (!strcmp (name, "f"))
1491 return S_F; 1475 return S_F;
1492 else if (*name == '\\') /* #\w (character) */ 1476 else if (*name == '\\') /* #\w (character) */
1493 { 1477 {
1494 int c; 1478 int c;
1495 1479
1480 // TODO: optimise
1496 if (stricmp (name + 1, "space") == 0) 1481 if (stricmp (name + 1, "space") == 0)
1497 c = ' '; 1482 c = ' ';
1498 else if (stricmp (name + 1, "newline") == 0) 1483 else if (stricmp (name + 1, "newline") == 0)
1499 c = '\n'; 1484 c = '\n';
1500 else if (stricmp (name + 1, "return") == 0) 1485 else if (stricmp (name + 1, "return") == 0)
1501 c = '\r'; 1486 c = '\r';
1502 else if (stricmp (name + 1, "tab") == 0) 1487 else if (stricmp (name + 1, "tab") == 0)
1503 c = '\t'; 1488 c = '\t';
1489 else if (stricmp (name + 1, "alarm") == 0)
1490 c = 0x07;
1491 else if (stricmp (name + 1, "backspace") == 0)
1492 c = 0x08;
1493 else if (stricmp (name + 1, "escape") == 0)
1494 c = 0x1b;
1495 else if (stricmp (name + 1, "delete") == 0)
1496 c = 0x7f;
1497 else if (stricmp (name + 1, "null") == 0)
1498 c = 0;
1504 else if (name[1] == 'x' && name[2] != 0) 1499 else if (name[1] == 'x' && name[2] != 0)
1505 { 1500 {
1506 long c1 = strtol (name + 2, 0, 16); 1501 long c1 = strtol (name + 2, 0, 16);
1507 1502
1508 if (0 <= c1 && c1 <= UCHAR_MAX) 1503 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1533 return NIL; 1528 return NIL;
1534 } 1529 }
1535} 1530}
1536 1531
1537/* ========== garbage collector ========== */ 1532/* ========== garbage collector ========== */
1533
1534static void
1535finalize_cell (SCHEME_P_ pointer a)
1536{
1537 /* TODO, fast bitmap check? */
1538 if (is_string (a) || is_symbol (a))
1539 free (strvalue (a));
1540 else if (is_vector (a))
1541 free (vecvalue (a));
1542#if USE_PORTS
1543 else if (is_port (a))
1544 {
1545 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1546 port_close (SCHEME_A_ a, port_input | port_output);
1547
1548 free (port (a));
1549 }
1550#endif
1551}
1538 1552
1539/*-- 1553/*--
1540 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1554 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1541 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1555 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1542 * for marking. 1556 * for marking.
1543 * 1557 *
1544 * The exception is vectors - vectors are currently marked recursively, 1558 * The exception is vectors - vectors are currently marked recursively,
1545 * which is inherited form tinyscheme and could be fixed by having another 1559 * which is inherited form tinyscheme and could be fixed by having another
1546 * word of context in the vector 1560 * word of context in the vector
1547 */ 1561 */
1548static void 1562ecb_hot static void
1549mark (pointer a) 1563mark (pointer a)
1550{ 1564{
1551 pointer t, q, p; 1565 pointer t, q, p;
1552 1566
1553 t = 0; 1567 t = 0;
… …
1610 p = q; 1624 p = q;
1611 goto E6; 1625 goto E6;
1612 } 1626 }
1613} 1627}
1614 1628
1629ecb_hot static void
1630gc_free (SCHEME_P)
1631{
1632 int i;
1633 uint32_t total = 0;
1634
1635 /* Here we scan the cells to build the free-list. */
1636 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1637 {
1638 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1639 struct cell *p;
1640 total += SCHEME_V->cell_segsize [i];
1641
1642 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1643 {
1644 pointer c = POINTER (p);
1645
1646 if (is_mark (c))
1647 clrmark (c);
1648 else
1649 {
1650 /* reclaim cell */
1651 if (typeflag (c) != T_PAIR)
1652 {
1653 finalize_cell (SCHEME_A_ c);
1654 set_typeflag (c, T_PAIR);
1655 set_car (c, NIL);
1656 }
1657
1658 ++SCHEME_V->fcells;
1659 set_cdr (c, SCHEME_V->free_cell);
1660 SCHEME_V->free_cell = c;
1661 }
1662 }
1663 }
1664
1665 if (SCHEME_V->gc_verbose)
1666 {
1667 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1668 }
1669}
1670
1615/* garbage collection. parameter a, b is marked. */ 1671/* garbage collection. parameter a, b is marked. */
1616static void 1672ecb_cold static void
1617gc (SCHEME_P_ pointer a, pointer b) 1673gc (SCHEME_P_ pointer a, pointer b)
1618{ 1674{
1619 pointer p;
1620 int i; 1675 int i;
1621 1676
1622 if (SCHEME_V->gc_verbose) 1677 if (SCHEME_V->gc_verbose)
1623 putstr (SCHEME_A_ "gc..."); 1678 putstr (SCHEME_A_ "gc...");
1624 1679
… …
1640 /* Mark recent objects the interpreter doesn't know about yet. */ 1695 /* Mark recent objects the interpreter doesn't know about yet. */
1641 mark (car (S_SINK)); 1696 mark (car (S_SINK));
1642 /* Mark any older stuff above nested C calls */ 1697 /* Mark any older stuff above nested C calls */
1643 mark (SCHEME_V->c_nest); 1698 mark (SCHEME_V->c_nest);
1644 1699
1700#if USE_INTCACHE
1701 /* mark intcache */
1702 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1703 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1704 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1705#endif
1706
1645 /* mark variables a, b */ 1707 /* mark variables a, b */
1646 mark (a); 1708 mark (a);
1647 mark (b); 1709 mark (b);
1648 1710
1649 /* garbage collect */ 1711 /* garbage collect */
1650 clrmark (NIL); 1712 clrmark (NIL);
1651 SCHEME_V->fcells = 0; 1713 SCHEME_V->fcells = 0;
1652 SCHEME_V->free_cell = NIL; 1714 SCHEME_V->free_cell = NIL;
1653 1715
1654 /* free-list is kept sorted by address so as to maintain consecutive
1655 ranges, if possible, for use with vectors. Here we scan the cells
1656 (which are also kept sorted by address) downwards to build the
1657 free-list in sorted order.
1658 */
1659 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1660 {
1661 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1662
1663 while (--p >= SCHEME_V->cell_seg[i])
1664 {
1665 if (is_mark (p))
1666 clrmark (p);
1667 else
1668 {
1669 /* reclaim cell */
1670 if (typeflag (p) != T_PAIR)
1671 {
1672 finalize_cell (SCHEME_A_ p);
1673 set_typeflag (p, T_PAIR);
1674 set_car (p, NIL);
1675 }
1676
1677 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell);
1679 SCHEME_V->free_cell = p;
1680 }
1681 }
1682 }
1683
1684 if (SCHEME_V->gc_verbose) 1716 if (SCHEME_V->gc_verbose)
1685 { 1717 putstr (SCHEME_A_ "freeing...");
1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1688}
1689 1718
1690static void 1719 gc_free (SCHEME_A);
1691finalize_cell (SCHEME_P_ pointer a)
1692{
1693 /* TODO, fast bitmap check? */
1694 if (is_string (a))
1695 free (strvalue (a));
1696 else if (is_vector (a))
1697 free (vecvalue (a));
1698#if USE_PORTS
1699 else if (is_port (a))
1700 {
1701 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1702 port_close (SCHEME_A_ a, port_input | port_output);
1703
1704 free (a->object.port);
1705 }
1706#endif
1707} 1720}
1708 1721
1709/* ========== Routines for Reading ========== */ 1722/* ========== Routines for Reading ========== */
1710 1723
1711static int 1724ecb_cold static int
1712file_push (SCHEME_P_ const char *fname) 1725file_push (SCHEME_P_ const char *fname)
1713{ 1726{
1714#if USE_PORTS 1727#if USE_PORTS
1715 int fin; 1728 int fin;
1716 1729
… …
1725 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1738 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1726 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1739 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1727 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1740 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1728 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1741 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1729 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1742 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1730 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1743 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1731 1744
1732#if SHOW_ERROR_LINE 1745#if SHOW_ERROR_LINE
1733 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1746 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1734 1747
1735 if (fname) 1748 if (fname)
… …
1742#else 1755#else
1743 return 1; 1756 return 1;
1744#endif 1757#endif
1745} 1758}
1746 1759
1747static void 1760ecb_cold static void
1748file_pop (SCHEME_P) 1761file_pop (SCHEME_P)
1749{ 1762{
1750 if (SCHEME_V->file_i != 0) 1763 if (SCHEME_V->file_i != 0)
1751 { 1764 {
1752 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1765 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1753#if USE_PORTS 1766#if USE_PORTS
1754 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1767 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1755#endif 1768#endif
1756 SCHEME_V->file_i--; 1769 SCHEME_V->file_i--;
1757 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1770 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1758 } 1771 }
1759} 1772}
1760 1773
1761static int 1774ecb_cold static int
1762file_interactive (SCHEME_P) 1775file_interactive (SCHEME_P)
1763{ 1776{
1764#if USE_PORTS 1777#if USE_PORTS
1765 return SCHEME_V->file_i == 0 1778 return SCHEME_V->file_i == 0
1766 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1779 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1767 && (SCHEME_V->inport->object.port->kind & port_file); 1780 && (port (SCHEME_V->inport)->kind & port_file);
1768#else 1781#else
1769 return 0; 1782 return 0;
1770#endif 1783#endif
1771} 1784}
1772 1785
1773#if USE_PORTS 1786#if USE_PORTS
1774static port * 1787ecb_cold static port *
1775port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1788port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1776{ 1789{
1777 int fd; 1790 int fd;
1778 int flags; 1791 int flags;
1779 char *rw; 1792 char *rw;
… …
1802# endif 1815# endif
1803 1816
1804 return pt; 1817 return pt;
1805} 1818}
1806 1819
1807static pointer 1820ecb_cold static pointer
1808port_from_filename (SCHEME_P_ const char *fn, int prop) 1821port_from_filename (SCHEME_P_ const char *fn, int prop)
1809{ 1822{
1810 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1823 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1811 1824
1812 if (!pt && USE_ERROR_CHECKING) 1825 if (!pt && USE_ERROR_CHECKING)
1813 return NIL; 1826 return NIL;
1814 1827
1815 return mk_port (SCHEME_A_ pt); 1828 return mk_port (SCHEME_A_ pt);
1816} 1829}
1817 1830
1818static port * 1831ecb_cold static port *
1819port_rep_from_file (SCHEME_P_ int f, int prop) 1832port_rep_from_file (SCHEME_P_ int f, int prop)
1820{ 1833{
1821 port *pt = malloc (sizeof *pt); 1834 port *pt = malloc (sizeof *pt);
1822 1835
1823 if (!pt && USE_ERROR_CHECKING) 1836 if (!pt && USE_ERROR_CHECKING)
… …
1828 pt->rep.stdio.file = f; 1841 pt->rep.stdio.file = f;
1829 pt->rep.stdio.closeit = 0; 1842 pt->rep.stdio.closeit = 0;
1830 return pt; 1843 return pt;
1831} 1844}
1832 1845
1833static pointer 1846ecb_cold static pointer
1834port_from_file (SCHEME_P_ int f, int prop) 1847port_from_file (SCHEME_P_ int f, int prop)
1835{ 1848{
1836 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1849 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1837 1850
1838 if (!pt && USE_ERROR_CHECKING) 1851 if (!pt && USE_ERROR_CHECKING)
1839 return NIL; 1852 return NIL;
1840 1853
1841 return mk_port (SCHEME_A_ pt); 1854 return mk_port (SCHEME_A_ pt);
1842} 1855}
1843 1856
1844static port * 1857ecb_cold static port *
1845port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1858port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1846{ 1859{
1847 port *pt = malloc (sizeof (port)); 1860 port *pt = malloc (sizeof (port));
1848 1861
1849 if (!pt && USE_ERROR_CHECKING) 1862 if (!pt && USE_ERROR_CHECKING)
… …
1855 pt->rep.string.curr = start; 1868 pt->rep.string.curr = start;
1856 pt->rep.string.past_the_end = past_the_end; 1869 pt->rep.string.past_the_end = past_the_end;
1857 return pt; 1870 return pt;
1858} 1871}
1859 1872
1860static pointer 1873ecb_cold static pointer
1861port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1874port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1862{ 1875{
1863 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1876 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1864 1877
1865 if (!pt && USE_ERROR_CHECKING) 1878 if (!pt && USE_ERROR_CHECKING)
… …
1868 return mk_port (SCHEME_A_ pt); 1881 return mk_port (SCHEME_A_ pt);
1869} 1882}
1870 1883
1871# define BLOCK_SIZE 256 1884# define BLOCK_SIZE 256
1872 1885
1873static port * 1886ecb_cold static port *
1874port_rep_from_scratch (SCHEME_P) 1887port_rep_from_scratch (SCHEME_P)
1875{ 1888{
1876 char *start; 1889 char *start;
1877 port *pt = malloc (sizeof (port)); 1890 port *pt = malloc (sizeof (port));
1878 1891
… …
1892 pt->rep.string.curr = start; 1905 pt->rep.string.curr = start;
1893 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1906 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1894 return pt; 1907 return pt;
1895} 1908}
1896 1909
1897static pointer 1910ecb_cold static pointer
1898port_from_scratch (SCHEME_P) 1911port_from_scratch (SCHEME_P)
1899{ 1912{
1900 port *pt = port_rep_from_scratch (SCHEME_A); 1913 port *pt = port_rep_from_scratch (SCHEME_A);
1901 1914
1902 if (!pt && USE_ERROR_CHECKING) 1915 if (!pt && USE_ERROR_CHECKING)
1903 return NIL; 1916 return NIL;
1904 1917
1905 return mk_port (SCHEME_A_ pt); 1918 return mk_port (SCHEME_A_ pt);
1906} 1919}
1907 1920
1908static void 1921ecb_cold static void
1909port_close (SCHEME_P_ pointer p, int flag) 1922port_close (SCHEME_P_ pointer p, int flag)
1910{ 1923{
1911 port *pt = p->object.port; 1924 port *pt = port (p);
1912 1925
1913 pt->kind &= ~flag; 1926 pt->kind &= ~flag;
1914 1927
1915 if ((pt->kind & (port_input | port_output)) == 0) 1928 if ((pt->kind & (port_input | port_output)) == 0)
1916 { 1929 {
… …
1937/* get new character from input file */ 1950/* get new character from input file */
1938static int 1951static int
1939inchar (SCHEME_P) 1952inchar (SCHEME_P)
1940{ 1953{
1941 int c; 1954 int c;
1942 port *pt; 1955 port *pt = port (SCHEME_V->inport);
1943
1944 pt = SCHEME_V->inport->object.port;
1945 1956
1946 if (pt->kind & port_saw_EOF) 1957 if (pt->kind & port_saw_EOF)
1947 return EOF; 1958 return EOF;
1948 1959
1949 c = basic_inchar (pt); 1960 c = basic_inchar (pt);
… …
2016 port *pt; 2027 port *pt;
2017 2028
2018 if (c == EOF) 2029 if (c == EOF)
2019 return; 2030 return;
2020 2031
2021 pt = SCHEME_V->inport->object.port; 2032 pt = port (SCHEME_V->inport);
2022 pt->unget = c; 2033 pt->unget = c;
2023#else 2034#else
2024 if (c == EOF) 2035 if (c == EOF)
2025 return; 2036 return;
2026 2037
2027 ungot = c; 2038 ungot = c;
2028#endif 2039#endif
2029} 2040}
2030 2041
2031#if USE_PORTS 2042#if USE_PORTS
2032static int 2043ecb_cold static int
2033realloc_port_string (SCHEME_P_ port *p) 2044realloc_port_string (SCHEME_P_ port *p)
2034{ 2045{
2035 char *start = p->rep.string.start; 2046 char *start = p->rep.string.start;
2036 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2047 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2037 char *str = malloc (new_size); 2048 char *str = malloc (new_size);
… …
2050 else 2061 else
2051 return 0; 2062 return 0;
2052} 2063}
2053#endif 2064#endif
2054 2065
2055INTERFACE void 2066ecb_cold INTERFACE void
2056putstr (SCHEME_P_ const char *s) 2067putstr (SCHEME_P_ const char *s)
2057{ 2068{
2058#if USE_PORTS 2069#if USE_PORTS
2059 port *pt = SCHEME_V->outport->object.port; 2070 port *pt = port (SCHEME_V->outport);
2060 2071
2061 if (pt->kind & port_file) 2072 if (pt->kind & port_file)
2062 write (pt->rep.stdio.file, s, strlen (s)); 2073 write (pt->rep.stdio.file, s, strlen (s));
2063 else 2074 else
2064 for (; *s; s++) 2075 for (; *s; s++)
… …
2066 *pt->rep.string.curr++ = *s; 2077 *pt->rep.string.curr++ = *s;
2067 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt)) 2078 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2068 *pt->rep.string.curr++ = *s; 2079 *pt->rep.string.curr++ = *s;
2069 2080
2070#else 2081#else
2071 xwrstr (s); 2082 write (pt->rep.stdio.file, s, strlen (s));
2072#endif 2083#endif
2073} 2084}
2074 2085
2075static void 2086ecb_cold static void
2076putchars (SCHEME_P_ const char *s, int len) 2087putchars (SCHEME_P_ const char *s, int len)
2077{ 2088{
2078#if USE_PORTS 2089#if USE_PORTS
2079 port *pt = SCHEME_V->outport->object.port; 2090 port *pt = port (SCHEME_V->outport);
2080 2091
2081 if (pt->kind & port_file) 2092 if (pt->kind & port_file)
2082 write (pt->rep.stdio.file, s, len); 2093 write (pt->rep.stdio.file, s, len);
2083 else 2094 else
2084 { 2095 {
… …
2094#else 2105#else
2095 write (1, s, len); 2106 write (1, s, len);
2096#endif 2107#endif
2097} 2108}
2098 2109
2099INTERFACE void 2110ecb_cold INTERFACE void
2100putcharacter (SCHEME_P_ int c) 2111putcharacter (SCHEME_P_ int c)
2101{ 2112{
2102#if USE_PORTS 2113#if USE_PORTS
2103 port *pt = SCHEME_V->outport->object.port; 2114 port *pt = port (SCHEME_V->outport);
2104 2115
2105 if (pt->kind & port_file) 2116 if (pt->kind & port_file)
2106 { 2117 {
2107 char cc = c; 2118 char cc = c;
2108 write (pt->rep.stdio.file, &cc, 1); 2119 write (pt->rep.stdio.file, &cc, 1);
… …
2120 write (1, &c, 1); 2131 write (1, &c, 1);
2121#endif 2132#endif
2122} 2133}
2123 2134
2124/* read characters up to delimiter, but cater to character constants */ 2135/* read characters up to delimiter, but cater to character constants */
2125static char * 2136ecb_cold static char *
2126readstr_upto (SCHEME_P_ int skip, const char *delim) 2137readstr_upto (SCHEME_P_ int skip, const char *delim)
2127{ 2138{
2128 char *p = SCHEME_V->strbuff + skip; 2139 char *p = SCHEME_V->strbuff + skip;
2129 2140
2130 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2141 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
… …
2139 2150
2140 return SCHEME_V->strbuff; 2151 return SCHEME_V->strbuff;
2141} 2152}
2142 2153
2143/* read string expression "xxx...xxx" */ 2154/* read string expression "xxx...xxx" */
2144static pointer 2155ecb_cold static pointer
2145readstrexp (SCHEME_P_ char delim) 2156readstrexp (SCHEME_P_ char delim)
2146{ 2157{
2147 char *p = SCHEME_V->strbuff; 2158 char *p = SCHEME_V->strbuff;
2148 int c; 2159 int c;
2149 int c1 = 0; 2160 int c1 = 0;
… …
2182 case '7': 2193 case '7':
2183 state = st_oct1; 2194 state = st_oct1;
2184 c1 = c - '0'; 2195 c1 = c - '0';
2185 break; 2196 break;
2186 2197
2198 case 'a': *p++ = '\a'; state = st_ok; break;
2199 case 'n': *p++ = '\n'; state = st_ok; break;
2200 case 'r': *p++ = '\r'; state = st_ok; break;
2201 case 't': *p++ = '\t'; state = st_ok; break;
2202
2203 //TODO: \whitespace eol whitespace
2204
2205 //TODO: x should end in ;, not two-digit hex
2187 case 'x': 2206 case 'x':
2188 case 'X': 2207 case 'X':
2189 state = st_x1; 2208 state = st_x1;
2190 c1 = 0; 2209 c1 = 0;
2191 break;
2192
2193 case 'n':
2194 *p++ = '\n';
2195 state = st_ok;
2196 break;
2197
2198 case 't':
2199 *p++ = '\t';
2200 state = st_ok;
2201 break;
2202
2203 case 'r':
2204 *p++ = '\r';
2205 state = st_ok;
2206 break; 2210 break;
2207 2211
2208 default: 2212 default:
2209 *p++ = c; 2213 *p++ = c;
2210 state = st_ok; 2214 state = st_ok;
… …
2262 } 2266 }
2263 } 2267 }
2264} 2268}
2265 2269
2266/* check c is in chars */ 2270/* check c is in chars */
2267ecb_inline int 2271ecb_cold int
2268is_one_of (const char *s, int c) 2272is_one_of (const char *s, int c)
2269{ 2273{
2270 if (c == EOF)
2271 return 1;
2272
2273 return !!strchr (s, c); 2274 return c == EOF || !!strchr (s, c);
2274} 2275}
2275 2276
2276/* skip white characters */ 2277/* skip white characters */
2277ecb_inline int 2278ecb_cold int
2278skipspace (SCHEME_P) 2279skipspace (SCHEME_P)
2279{ 2280{
2280 int c, curr_line = 0; 2281 int c, curr_line = 0;
2281 2282
2282 do 2283 do
2283 { 2284 {
2284 c = inchar (SCHEME_A); 2285 c = inchar (SCHEME_A);
2286
2285#if SHOW_ERROR_LINE 2287#if SHOW_ERROR_LINE
2286 if (c == '\n') 2288 if (ecb_expect_false (c == '\n'))
2287 curr_line++; 2289 curr_line++;
2288#endif 2290#endif
2291
2292 if (ecb_expect_false (c == EOF))
2293 return c;
2289 } 2294 }
2290 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2295 while (is_one_of (WHITESPACE, c));
2291 2296
2292 /* record it */ 2297 /* record it */
2293#if SHOW_ERROR_LINE 2298#if SHOW_ERROR_LINE
2294 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2299 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2295 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2300 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2296#endif 2301#endif
2297 2302
2298 if (c != EOF)
2299 {
2300 backchar (SCHEME_A_ c); 2303 backchar (SCHEME_A_ c);
2301 return 1; 2304 return 1;
2302 }
2303 else
2304 return EOF;
2305} 2305}
2306 2306
2307/* get token */ 2307/* get token */
2308static int 2308ecb_cold static int
2309token (SCHEME_P) 2309token (SCHEME_P)
2310{ 2310{
2311 int c = skipspace (SCHEME_A); 2311 int c = skipspace (SCHEME_A);
2312 2312
2313 if (c == EOF) 2313 if (c == EOF)
… …
2325 return TOK_RPAREN; 2325 return TOK_RPAREN;
2326 2326
2327 case '.': 2327 case '.':
2328 c = inchar (SCHEME_A); 2328 c = inchar (SCHEME_A);
2329 2329
2330 if (is_one_of (" \n\t", c)) 2330 if (is_one_of (WHITESPACE, c))
2331 return TOK_DOT; 2331 return TOK_DOT;
2332 else 2332 else
2333 { 2333 {
2334 backchar (SCHEME_A_ c); 2334 backchar (SCHEME_A_ c);
2335 return TOK_DOTATOM; 2335 return TOK_DOTATOM;
… …
2411} 2411}
2412 2412
2413/* ========== Routines for Printing ========== */ 2413/* ========== Routines for Printing ========== */
2414#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2414#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2415 2415
2416static void 2416ecb_cold static void
2417printslashstring (SCHEME_P_ char *p, int len) 2417printslashstring (SCHEME_P_ char *p, int len)
2418{ 2418{
2419 int i; 2419 int i;
2420 unsigned char *s = (unsigned char *) p; 2420 unsigned char *s = (unsigned char *) p;
2421 2421
… …
2476 } 2476 }
2477 2477
2478 putcharacter (SCHEME_A_ '"'); 2478 putcharacter (SCHEME_A_ '"');
2479} 2479}
2480 2480
2481
2482/* print atoms */ 2481/* print atoms */
2483static void 2482ecb_cold static void
2484printatom (SCHEME_P_ pointer l, int f) 2483printatom (SCHEME_P_ pointer l, int f)
2485{ 2484{
2486 char *p; 2485 char *p;
2487 int len; 2486 int len;
2488 2487
2489 atom2str (SCHEME_A_ l, f, &p, &len); 2488 atom2str (SCHEME_A_ l, f, &p, &len);
2490 putchars (SCHEME_A_ p, len); 2489 putchars (SCHEME_A_ p, len);
2491} 2490}
2492 2491
2493
2494/* Uses internal buffer unless string pointer is already available */ 2492/* Uses internal buffer unless string pointer is already available */
2495static void 2493ecb_cold static void
2496atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2494atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2497{ 2495{
2498 char *p; 2496 char *p;
2499 2497
2500 if (l == NIL) 2498 if (l == NIL)
… …
2658#endif 2656#endif
2659 } 2657 }
2660 else if (is_continuation (l)) 2658 else if (is_continuation (l))
2661 p = "#<CONTINUATION>"; 2659 p = "#<CONTINUATION>";
2662 else 2660 else
2661 {
2662#if USE_PRINTF
2663 p = SCHEME_V->strbuff;
2664 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2665#else
2663 p = "#<ERROR>"; 2666 p = "#<ERROR>";
2667#endif
2668 }
2664 2669
2665 *pp = p; 2670 *pp = p;
2666 *plen = strlen (p); 2671 *plen = strlen (p);
2667} 2672}
2668 2673
… …
2700 return car (d); 2705 return car (d);
2701 2706
2702 p = cons (car (d), cdr (d)); 2707 p = cons (car (d), cdr (d));
2703 q = p; 2708 q = p;
2704 2709
2705 while (cdr (cdr (p)) != NIL) 2710 while (cddr (p) != NIL)
2706 { 2711 {
2707 d = cons (car (p), cdr (p)); 2712 d = cons (car (p), cdr (p));
2708 2713
2709 if (cdr (cdr (p)) != NIL) 2714 if (cddr (p) != NIL)
2710 p = cdr (d); 2715 p = cdr (d);
2711 } 2716 }
2712 2717
2713 set_cdr (p, car (cdr (p))); 2718 set_cdr (p, cadr (p));
2714 return q; 2719 return q;
2715} 2720}
2716 2721
2717/* reverse list -- produce new list */ 2722/* reverse list -- produce new list */
2718static pointer 2723ecb_hot static pointer
2719reverse (SCHEME_P_ pointer a) 2724reverse (SCHEME_P_ pointer a)
2720{ 2725{
2721 /* a must be checked by gc */ 2726 /* a must be checked by gc */
2722 pointer p = NIL; 2727 pointer p = NIL;
2723 2728
… …
2726 2731
2727 return p; 2732 return p;
2728} 2733}
2729 2734
2730/* reverse list --- in-place */ 2735/* reverse list --- in-place */
2731static pointer 2736ecb_hot static pointer
2732reverse_in_place (SCHEME_P_ pointer term, pointer list) 2737reverse_in_place (SCHEME_P_ pointer term, pointer list)
2733{ 2738{
2734 pointer result = term; 2739 pointer result = term;
2735 pointer p = list; 2740 pointer p = list;
2736 2741
… …
2744 2749
2745 return result; 2750 return result;
2746} 2751}
2747 2752
2748/* append list -- produce new list (in reverse order) */ 2753/* append list -- produce new list (in reverse order) */
2749static pointer 2754ecb_hot static pointer
2750revappend (SCHEME_P_ pointer a, pointer b) 2755revappend (SCHEME_P_ pointer a, pointer b)
2751{ 2756{
2752 pointer result = a; 2757 pointer result = a;
2753 pointer p = b; 2758 pointer p = b;
2754 2759
… …
2763 2768
2764 return S_F; /* signal an error */ 2769 return S_F; /* signal an error */
2765} 2770}
2766 2771
2767/* equivalence of atoms */ 2772/* equivalence of atoms */
2768int 2773ecb_hot int
2769eqv (pointer a, pointer b) 2774eqv (pointer a, pointer b)
2770{ 2775{
2771 if (is_string (a)) 2776 if (is_string (a))
2772 { 2777 {
2773 if (is_string (b)) 2778 if (is_string (b))
… …
2867 } 2872 }
2868 else 2873 else
2869 set_car (env, immutable_cons (slot, car (env))); 2874 set_car (env, immutable_cons (slot, car (env)));
2870} 2875}
2871 2876
2872static pointer 2877ecb_hot static pointer
2873find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2878find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2874{ 2879{
2875 pointer x, y; 2880 pointer x, y;
2876 2881
2877 for (x = env; x != NIL; x = cdr (x)) 2882 for (x = env; x != NIL; x = cdr (x))
… …
2898 return NIL; 2903 return NIL;
2899} 2904}
2900 2905
2901#else /* USE_ALIST_ENV */ 2906#else /* USE_ALIST_ENV */
2902 2907
2903ecb_inline void 2908static void
2904new_frame_in_env (SCHEME_P_ pointer old_env) 2909new_frame_in_env (SCHEME_P_ pointer old_env)
2905{ 2910{
2906 SCHEME_V->envir = immutable_cons (NIL, old_env); 2911 SCHEME_V->envir = immutable_cons (NIL, old_env);
2907 setenvironment (SCHEME_V->envir); 2912 setenvironment (SCHEME_V->envir);
2908} 2913}
2909 2914
2910ecb_inline void 2915static void
2911new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2916new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2912{ 2917{
2913 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2918 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2914} 2919}
2915 2920
2916static pointer 2921ecb_hot static pointer
2917find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2922find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2918{ 2923{
2919 pointer x, y; 2924 pointer x, y;
2920 2925
2921 for (x = env; x != NIL; x = cdr (x)) 2926 for (x = env; x != NIL; x = cdr (x))
… …
2935 return NIL; 2940 return NIL;
2936} 2941}
2937 2942
2938#endif /* USE_ALIST_ENV else */ 2943#endif /* USE_ALIST_ENV else */
2939 2944
2940ecb_inline void 2945static void
2941new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2946new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2942{ 2947{
2948 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2943 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2949 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2944} 2950}
2945 2951
2946ecb_inline void 2952static void
2947set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2953set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2948{ 2954{
2949 set_cdr (slot, value); 2955 set_cdr (slot, value);
2950} 2956}
2951 2957
2952ecb_inline pointer 2958static pointer
2953slot_value_in_env (pointer slot) 2959slot_value_in_env (pointer slot)
2954{ 2960{
2955 return cdr (slot); 2961 return cdr (slot);
2956} 2962}
2957 2963
2958/* ========== Evaluation Cycle ========== */ 2964/* ========== Evaluation Cycle ========== */
2959 2965
2960static int 2966ecb_cold static int
2961xError_1 (SCHEME_P_ const char *s, pointer a) 2967xError_1 (SCHEME_P_ const char *s, pointer a)
2962{ 2968{
2963#if USE_ERROR_HOOK 2969#if USE_ERROR_HOOK
2964 pointer x; 2970 pointer x;
2965 pointer hdl = SCHEME_V->ERROR_HOOK; 2971 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3041 pointer code; 3047 pointer code;
3042}; 3048};
3043 3049
3044# define STACK_GROWTH 3 3050# define STACK_GROWTH 3
3045 3051
3046static void 3052ecb_hot static void
3047s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3053s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3048{ 3054{
3049 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3050 struct dump_stack_frame *next_frame; 3056 struct dump_stack_frame *next_frame;
3051 3057
3052 /* enough room for the next frame? */ 3058 /* enough room for the next frame? */
3053 if (nframes >= SCHEME_V->dump_size) 3059 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3054 { 3060 {
3055 SCHEME_V->dump_size += STACK_GROWTH; 3061 SCHEME_V->dump_size += STACK_GROWTH;
3056 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3062 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3057 } 3063 }
3058 3064
… …
3064 next_frame->code = code; 3070 next_frame->code = code;
3065 3071
3066 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3072 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3067} 3073}
3068 3074
3069static int 3075static ecb_hot int
3070xs_return (SCHEME_P_ pointer a) 3076xs_return (SCHEME_P_ pointer a)
3071{ 3077{
3072 int nframes = (uintptr_t)SCHEME_V->dump; 3078 int nframes = (uintptr_t)SCHEME_V->dump;
3073 struct dump_stack_frame *frame; 3079 struct dump_stack_frame *frame;
3074 3080
… …
3085 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3091 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3086 3092
3087 return 0; 3093 return 0;
3088} 3094}
3089 3095
3090ecb_inline void 3096ecb_cold void
3091dump_stack_reset (SCHEME_P) 3097dump_stack_reset (SCHEME_P)
3092{ 3098{
3093 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3099 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3094 SCHEME_V->dump = (pointer)+0; 3100 SCHEME_V->dump = (pointer)+0;
3095} 3101}
3096 3102
3097ecb_inline void 3103ecb_cold void
3098dump_stack_initialize (SCHEME_P) 3104dump_stack_initialize (SCHEME_P)
3099{ 3105{
3100 SCHEME_V->dump_size = 0; 3106 SCHEME_V->dump_size = 0;
3101 SCHEME_V->dump_base = 0; 3107 SCHEME_V->dump_base = 0;
3102 dump_stack_reset (SCHEME_A); 3108 dump_stack_reset (SCHEME_A);
3103} 3109}
3104 3110
3105static void 3111ecb_cold static void
3106dump_stack_free (SCHEME_P) 3112dump_stack_free (SCHEME_P)
3107{ 3113{
3108 free (SCHEME_V->dump_base); 3114 free (SCHEME_V->dump_base);
3109 SCHEME_V->dump_base = 0; 3115 SCHEME_V->dump_base = 0;
3110 SCHEME_V->dump = (pointer)0; 3116 SCHEME_V->dump = (pointer)0;
3111 SCHEME_V->dump_size = 0; 3117 SCHEME_V->dump_size = 0;
3112} 3118}
3113 3119
3114static void 3120ecb_cold static void
3115dump_stack_mark (SCHEME_P) 3121dump_stack_mark (SCHEME_P)
3116{ 3122{
3117 int nframes = (uintptr_t)SCHEME_V->dump; 3123 int nframes = (uintptr_t)SCHEME_V->dump;
3118 int i; 3124 int i;
3119 3125
… …
3125 mark (frame->envir); 3131 mark (frame->envir);
3126 mark (frame->code); 3132 mark (frame->code);
3127 } 3133 }
3128} 3134}
3129 3135
3130static pointer 3136ecb_cold static pointer
3131ss_get_cont (SCHEME_P) 3137ss_get_cont (SCHEME_P)
3132{ 3138{
3133 int nframes = (uintptr_t)SCHEME_V->dump; 3139 int nframes = (uintptr_t)SCHEME_V->dump;
3134 int i; 3140 int i;
3135 3141
… …
3147 } 3153 }
3148 3154
3149 return cont; 3155 return cont;
3150} 3156}
3151 3157
3152static void 3158ecb_cold static void
3153ss_set_cont (SCHEME_P_ pointer cont) 3159ss_set_cont (SCHEME_P_ pointer cont)
3154{ 3160{
3155 int i = 0; 3161 int i = 0;
3156 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3162 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3157 3163
… …
3169 SCHEME_V->dump = (pointer)(uintptr_t)i; 3175 SCHEME_V->dump = (pointer)(uintptr_t)i;
3170} 3176}
3171 3177
3172#else 3178#else
3173 3179
3174ecb_inline void 3180ecb_cold void
3175dump_stack_reset (SCHEME_P) 3181dump_stack_reset (SCHEME_P)
3176{ 3182{
3177 SCHEME_V->dump = NIL; 3183 SCHEME_V->dump = NIL;
3178} 3184}
3179 3185
3180ecb_inline void 3186ecb_cold void
3181dump_stack_initialize (SCHEME_P) 3187dump_stack_initialize (SCHEME_P)
3182{ 3188{
3183 dump_stack_reset (SCHEME_A); 3189 dump_stack_reset (SCHEME_A);
3184} 3190}
3185 3191
3186static void 3192ecb_cold static void
3187dump_stack_free (SCHEME_P) 3193dump_stack_free (SCHEME_P)
3188{ 3194{
3189 SCHEME_V->dump = NIL; 3195 SCHEME_V->dump = NIL;
3190} 3196}
3191 3197
3192static int 3198ecb_hot static int
3193xs_return (SCHEME_P_ pointer a) 3199xs_return (SCHEME_P_ pointer a)
3194{ 3200{
3195 pointer dump = SCHEME_V->dump; 3201 pointer dump = SCHEME_V->dump;
3196 3202
3197 SCHEME_V->value = a; 3203 SCHEME_V->value = a;
… …
3207 SCHEME_V->dump = dump; 3213 SCHEME_V->dump = dump;
3208 3214
3209 return 0; 3215 return 0;
3210} 3216}
3211 3217
3212static void 3218ecb_hot static void
3213s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3219s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3214{ 3220{
3215 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3221 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3216 cons (args, 3222 cons (args,
3217 cons (SCHEME_V->envir, 3223 cons (SCHEME_V->envir,
3218 cons (code, 3224 cons (code,
3219 SCHEME_V->dump)))); 3225 SCHEME_V->dump))));
3220} 3226}
3221 3227
3222static void 3228ecb_cold static void
3223dump_stack_mark (SCHEME_P) 3229dump_stack_mark (SCHEME_P)
3224{ 3230{
3225 mark (SCHEME_V->dump); 3231 mark (SCHEME_V->dump);
3226} 3232}
3227 3233
3228static pointer 3234ecb_cold static pointer
3229ss_get_cont (SCHEME_P) 3235ss_get_cont (SCHEME_P)
3230{ 3236{
3231 return SCHEME_V->dump; 3237 return SCHEME_V->dump;
3232} 3238}
3233 3239
3234static void 3240ecb_cold static void
3235ss_set_cont (SCHEME_P_ pointer cont) 3241ss_set_cont (SCHEME_P_ pointer cont)
3236{ 3242{
3237 SCHEME_V->dump = cont; 3243 SCHEME_V->dump = cont;
3238} 3244}
3239 3245
3240#endif 3246#endif
3241 3247
3242#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3248#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3243 3249
3250#if EXPERIMENT
3244static int 3251static int
3252debug (SCHEME_P_ int indent, pointer x)
3253{
3254 int c;
3255
3256 if (is_syntax (x))
3257 {
3258 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3259 return 8 + 8;
3260 }
3261
3262 if (x == NIL)
3263 {
3264 printf ("%*sNIL\n", indent, "");
3265 return 3;
3266 }
3267
3268 switch (type (x))
3269 {
3270 case T_INTEGER:
3271 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3272 return 32+8;
3273
3274 case T_SYMBOL:
3275 printf ("%*sS<%s>\n", indent, "", symname (x));
3276 return 24+8;
3277
3278 case T_CLOSURE:
3279 printf ("%*sS<%s>\n", indent, "", "closure");
3280 debug (SCHEME_A_ indent + 3, cdr(x));
3281 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3282
3283 case T_PAIR:
3284 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3285 c = debug (SCHEME_A_ indent + 3, car (x));
3286 c += debug (SCHEME_A_ indent + 3, cdr (x));
3287 return c + 1;
3288
3289 case T_PORT:
3290 printf ("%*sS<%s>\n", indent, "", "port");
3291 return 24+8;
3292
3293 case T_VECTOR:
3294 printf ("%*sS<%s>\n", indent, "", "vector");
3295 return 24+8;
3296
3297 case T_ENVIRONMENT:
3298 printf ("%*sS<%s>\n", indent, "", "environment");
3299 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3300
3301 default:
3302 printf ("unhandled type %d\n", type (x));
3303 break;
3304 }
3305}
3306#endif
3307
3308/* syntax, eval, core, ... */
3309ecb_hot static int
3245opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3310opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3246{ 3311{
3247 pointer args = SCHEME_V->args; 3312 pointer args = SCHEME_V->args;
3248 pointer x, y; 3313 pointer x, y;
3249 3314
3250 switch (op) 3315 switch (op)
3251 { 3316 {
3317#if EXPERIMENT //D
3318 case OP_DEBUG:
3319 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3320 printf ("\n");
3321 s_return (S_T);
3322#endif
3252 case OP_LOAD: /* load */ 3323 case OP_LOAD: /* load */
3253 if (file_interactive (SCHEME_A)) 3324 if (file_interactive (SCHEME_A))
3254 { 3325 {
3255 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3326 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3256 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3327 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3257 } 3328 }
3258 3329
3259 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3330 if (!file_push (SCHEME_A_ strvalue (car (args))))
3260 Error_1 ("unable to open", car (args)); 3331 Error_1 ("unable to open", car (args));
3261 else 3332 else
… …
3265 } 3336 }
3266 3337
3267 case OP_T0LVL: /* top level */ 3338 case OP_T0LVL: /* top level */
3268 3339
3269 /* If we reached the end of file, this loop is done. */ 3340 /* If we reached the end of file, this loop is done. */
3270 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3341 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3271 { 3342 {
3272 if (SCHEME_V->file_i == 0) 3343 if (SCHEME_V->file_i == 0)
3273 { 3344 {
3274 SCHEME_V->args = NIL; 3345 SCHEME_V->args = NIL;
3275 s_goto (OP_QUIT); 3346 s_goto (OP_QUIT);
… …
3353#endif 3424#endif
3354 if (is_symbol (SCHEME_V->code)) /* symbol */ 3425 if (is_symbol (SCHEME_V->code)) /* symbol */
3355 { 3426 {
3356 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3427 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3357 3428
3358 if (x != NIL) 3429 if (x == NIL)
3359 s_return (slot_value_in_env (x));
3360 else
3361 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3430 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3431
3432 s_return (slot_value_in_env (x));
3362 } 3433 }
3363 else if (is_pair (SCHEME_V->code)) 3434 else if (is_pair (SCHEME_V->code))
3364 { 3435 {
3365 x = car (SCHEME_V->code); 3436 x = car (SCHEME_V->code);
3366 3437
… …
3379 } 3450 }
3380 else 3451 else
3381 s_return (SCHEME_V->code); 3452 s_return (SCHEME_V->code);
3382 3453
3383 case OP_E0ARGS: /* eval arguments */ 3454 case OP_E0ARGS: /* eval arguments */
3384 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3455 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3385 { 3456 {
3386 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3457 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3387 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3458 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3388 SCHEME_V->code = SCHEME_V->value; 3459 SCHEME_V->code = SCHEME_V->value;
3389 s_goto (OP_APPLY); 3460 s_goto (OP_APPLY);
… …
3443 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3514 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3444 else if (is_foreign (SCHEME_V->code)) 3515 else if (is_foreign (SCHEME_V->code))
3445 { 3516 {
3446 /* Keep nested calls from GC'ing the arglist */ 3517 /* Keep nested calls from GC'ing the arglist */
3447 push_recent_alloc (SCHEME_A_ args, NIL); 3518 push_recent_alloc (SCHEME_A_ args, NIL);
3448 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3519 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3449 3520
3450 s_return (x); 3521 s_return (x);
3451 } 3522 }
3452 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3523 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3453 { 3524 {
… …
3490 3561
3491 case OP_DOMACRO: /* do macro */ 3562 case OP_DOMACRO: /* do macro */
3492 SCHEME_V->code = SCHEME_V->value; 3563 SCHEME_V->code = SCHEME_V->value;
3493 s_goto (OP_EVAL); 3564 s_goto (OP_EVAL);
3494 3565
3495#if 1
3496
3497 case OP_LAMBDA: /* lambda */ 3566 case OP_LAMBDA: /* lambda */
3498 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3567 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3499 set SCHEME_V->value fall thru */ 3568 set SCHEME_V->value fall thru */
3500 { 3569 {
3501 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3570 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
… …
3507 SCHEME_V->code = slot_value_in_env (f); 3576 SCHEME_V->code = slot_value_in_env (f);
3508 s_goto (OP_APPLY); 3577 s_goto (OP_APPLY);
3509 } 3578 }
3510 3579
3511 SCHEME_V->value = SCHEME_V->code; 3580 SCHEME_V->value = SCHEME_V->code;
3512 /* Fallthru */
3513 } 3581 }
3582 /* Fallthru */
3514 3583
3515 case OP_LAMBDA1: 3584 case OP_LAMBDA1:
3516 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3585 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3517
3518#else
3519
3520 case OP_LAMBDA: /* lambda */
3521 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3522
3523#endif
3524 3586
3525 case OP_MKCLOSURE: /* make-closure */ 3587 case OP_MKCLOSURE: /* make-closure */
3526 x = car (args); 3588 x = car (args);
3527 3589
3528 if (car (x) == SCHEME_V->LAMBDA) 3590 if (car (x) == SCHEME_V->LAMBDA)
… …
3938 } 4000 }
3939 4001
3940 if (USE_ERROR_CHECKING) abort (); 4002 if (USE_ERROR_CHECKING) abort ();
3941} 4003}
3942 4004
3943static int 4005/* math, cxr */
4006ecb_hot static int
3944opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4007opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3945{ 4008{
3946 pointer args = SCHEME_V->args; 4009 pointer args = SCHEME_V->args;
3947 pointer x = car (args); 4010 pointer x = car (args);
3948 num v; 4011 num v;
3949 4012
3950 switch (op) 4013 switch (op)
3951 { 4014 {
3952#if USE_MATH 4015#if USE_MATH
3953 case OP_INEX2EX: /* inexact->exact */ 4016 case OP_INEX2EX: /* inexact->exact */
3954 {
3955 if (is_integer (x)) 4017 if (!is_integer (x))
3956 s_return (x); 4018 {
3957
3958 RVALUE r = rvalue_unchecked (x); 4019 RVALUE r = rvalue_unchecked (x);
3959 4020
3960 if (r == (RVALUE)(IVALUE)r) 4021 if (r == (RVALUE)(IVALUE)r)
3961 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4022 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3962 else 4023 else
3963 Error_1 ("inexact->exact: not integral:", x); 4024 Error_1 ("inexact->exact: not integral:", x);
3964 } 4025 }
3965 4026
4027 s_return (x);
4028
4029 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4030 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4031 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4032 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4033
4034 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3966 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4035 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3967 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4036 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4037 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3968 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4038 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3969 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4039 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3970 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4040 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3971 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4041 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3972 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4042 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3973 4043
3974 case OP_ATAN: 4044 case OP_ATAN:
4045 s_return (mk_real (SCHEME_A_
3975 if (cdr (args) == NIL) 4046 cdr (args) == NIL
3976 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4047 ? atan (rvalue (x))
3977 else 4048 : atan2 (rvalue (x), rvalue (cadr (args)))));
3978 {
3979 pointer y = cadr (args);
3980 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3981 }
3982
3983 case OP_SQRT:
3984 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3985 4049
3986 case OP_EXPT: 4050 case OP_EXPT:
3987 { 4051 {
3988 RVALUE result; 4052 RVALUE result;
3989 int real_result = 1; 4053 int real_result = 1;
… …
4012 if (real_result) 4076 if (real_result)
4013 s_return (mk_real (SCHEME_A_ result)); 4077 s_return (mk_real (SCHEME_A_ result));
4014 else 4078 else
4015 s_return (mk_integer (SCHEME_A_ result)); 4079 s_return (mk_integer (SCHEME_A_ result));
4016 } 4080 }
4017
4018 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4019 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4020
4021 case OP_TRUNCATE:
4022 {
4023 RVALUE n = rvalue (x);
4024 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4025 }
4026
4027 case OP_ROUND:
4028 if (is_integer (x))
4029 s_return (x);
4030
4031 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4032#endif 4081#endif
4033 4082
4034 case OP_ADD: /* + */ 4083 case OP_ADD: /* + */
4035 v = num_zero; 4084 v = num_zero;
4036 4085
… …
4124 else 4173 else
4125 Error_0 ("modulo: division by zero"); 4174 Error_0 ("modulo: division by zero");
4126 4175
4127 s_return (mk_number (SCHEME_A_ v)); 4176 s_return (mk_number (SCHEME_A_ v));
4128 4177
4129 case OP_CAR: /* car */ 4178 /* the compiler will optimize this mess... */
4130 s_return (caar (args)); 4179 case OP_CAR: op_car: s_return (car (x));
4131 4180 case OP_CDR: op_cdr: s_return (cdr (x));
4132 case OP_CDR: /* cdr */ 4181 case OP_CAAR: op_caar: x = car (x); goto op_car;
4133 s_return (cdar (args)); 4182 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4183 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4184 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4185 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4186 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4187 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4188 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4189 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4190 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4191 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4192 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4193 case OP_CAAAAR: x = car (x); goto op_caaar;
4194 case OP_CAAADR: x = cdr (x); goto op_caaar;
4195 case OP_CAADAR: x = car (x); goto op_caadr;
4196 case OP_CAADDR: x = cdr (x); goto op_caadr;
4197 case OP_CADAAR: x = car (x); goto op_cadar;
4198 case OP_CADADR: x = cdr (x); goto op_cadar;
4199 case OP_CADDAR: x = car (x); goto op_caddr;
4200 case OP_CADDDR: x = cdr (x); goto op_caddr;
4201 case OP_CDAAAR: x = car (x); goto op_cdaar;
4202 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4203 case OP_CDADAR: x = car (x); goto op_cdadr;
4204 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4205 case OP_CDDAAR: x = car (x); goto op_cddar;
4206 case OP_CDDADR: x = cdr (x); goto op_cddar;
4207 case OP_CDDDAR: x = car (x); goto op_cdddr;
4208 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4134 4209
4135 case OP_CONS: /* cons */ 4210 case OP_CONS: /* cons */
4136 set_cdr (args, cadr (args)); 4211 set_cdr (args, cadr (args));
4137 s_return (args); 4212 s_return (args);
4138 4213
… …
4312 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4387 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4313 4388
4314 s_return (newstr); 4389 s_return (newstr);
4315 } 4390 }
4316 4391
4317 case OP_SUBSTR: /* substring */ 4392 case OP_STRING_COPY: /* substring/string-copy */
4318 { 4393 {
4319 char *str = strvalue (x); 4394 char *str = strvalue (x);
4320 int index0 = ivalue_unchecked (cadr (args)); 4395 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4321 int index1; 4396 int index1;
4322 int len; 4397 int len;
4323 4398
4324 if (index0 > strlength (x)) 4399 if (index0 > strlength (x))
4325 Error_1 ("substring: start out of bounds:", cadr (args)); 4400 Error_1 ("string->copy: start out of bounds:", cadr (args));
4326 4401
4327 if (cddr (args) != NIL) 4402 if (cddr (args) != NIL)
4328 { 4403 {
4329 index1 = ivalue_unchecked (caddr (args)); 4404 index1 = ivalue_unchecked (caddr (args));
4330 4405
4331 if (index1 > strlength (x) || index1 < index0) 4406 if (index1 > strlength (x) || index1 < index0)
4332 Error_1 ("substring: end out of bounds:", caddr (args)); 4407 Error_1 ("string->copy: end out of bounds:", caddr (args));
4333 } 4408 }
4334 else 4409 else
4335 index1 = strlength (x); 4410 index1 = strlength (x);
4336 4411
4337 len = index1 - index0; 4412 len = index1 - index0;
4338 x = mk_empty_string (SCHEME_A_ len, ' '); 4413 x = mk_counted_string (SCHEME_A_ str + index0, len);
4339 memcpy (strvalue (x), str + index0, len);
4340 strvalue (x)[len] = 0;
4341 4414
4342 s_return (x); 4415 s_return (x);
4343 } 4416 }
4344 4417
4345 case OP_VECTOR: /* vector */ 4418 case OP_VECTOR: /* vector */
… …
4419 } 4492 }
4420 4493
4421 if (USE_ERROR_CHECKING) abort (); 4494 if (USE_ERROR_CHECKING) abort ();
4422} 4495}
4423 4496
4424static int 4497/* relational ops */
4498ecb_hot static int
4425opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4499opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4426{ 4500{
4427 pointer x = SCHEME_V->args; 4501 pointer x = SCHEME_V->args;
4428 4502
4429 for (;;) 4503 for (;;)
… …
4450 } 4524 }
4451 4525
4452 s_return (S_T); 4526 s_return (S_T);
4453} 4527}
4454 4528
4455static int 4529/* predicates */
4530ecb_hot static int
4456opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4531opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4457{ 4532{
4458 pointer args = SCHEME_V->args; 4533 pointer args = SCHEME_V->args;
4459 pointer a = car (args); 4534 pointer a = car (args);
4460 pointer d = cdr (args); 4535 pointer d = cdr (args);
4461 int r; 4536 int r;
4462 4537
4463 switch (op) 4538 switch (op)
4464 { 4539 {
4465 case OP_NOT: /* not */ r = is_false (a) ; break; 4540 case OP_NOT: /* not */ r = is_false (a) ; break;
4466 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4541 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4467 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4542 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468 case OP_NULLP: /* null? */ r = a == NIL ; break; 4543 case OP_NULLP: /* null? */ r = a == NIL ; break;
4469 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4544 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4545 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4470 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4546 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4547 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4548 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4549 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4474 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4550 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4475 4551
4476#if USE_CHAR_CLASSIFIERS 4552#if USE_CHAR_CLASSIFIERS
4477 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4553 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4478 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4554 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4479 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4555 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4506 } 4582 }
4507 4583
4508 s_retbool (r); 4584 s_retbool (r);
4509} 4585}
4510 4586
4511static int 4587/* promises, list ops, ports */
4588ecb_hot static int
4512opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4589opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4513{ 4590{
4514 pointer args = SCHEME_V->args; 4591 pointer args = SCHEME_V->args;
4515 pointer a = car (args); 4592 pointer a = car (args);
4516 pointer x, y; 4593 pointer x, y;
… …
4529 } 4606 }
4530 else 4607 else
4531 s_return (SCHEME_V->code); 4608 s_return (SCHEME_V->code);
4532 4609
4533 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4610 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4534 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4611 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4535 s_return (SCHEME_V->value); 4612 s_return (SCHEME_V->value);
4536 4613
4537#if USE_PORTS 4614#if USE_PORTS
4615
4616 case OP_EOF_OBJECT: /* eof-object */
4617 s_return (S_EOF);
4538 4618
4539 case OP_WRITE: /* write */ 4619 case OP_WRITE: /* write */
4540 case OP_DISPLAY: /* display */ 4620 case OP_DISPLAY: /* display */
4541 case OP_WRITE_CHAR: /* write-char */ 4621 case OP_WRITE_CHAR: /* write-char */
4542 if (is_pair (cdr (SCHEME_V->args))) 4622 if (is_pair (cdr (SCHEME_V->args)))
… …
4684 SCHEME_V->gc_verbose = (a != S_F); 4764 SCHEME_V->gc_verbose = (a != S_F);
4685 s_retbool (was); 4765 s_retbool (was);
4686 } 4766 }
4687 4767
4688 case OP_NEWSEGMENT: /* new-segment */ 4768 case OP_NEWSEGMENT: /* new-segment */
4769#if 0
4689 if (!is_pair (args) || !is_number (a)) 4770 if (!is_pair (args) || !is_number (a))
4690 Error_0 ("new-segment: argument must be a number"); 4771 Error_0 ("new-segment: argument must be a number");
4691 4772#endif
4692 alloc_cellseg (SCHEME_A_ ivalue (a)); 4773 s_retbool (alloc_cellseg (SCHEME_A));
4693
4694 s_return (S_T);
4695 4774
4696 case OP_OBLIST: /* oblist */ 4775 case OP_OBLIST: /* oblist */
4697 s_return (oblist_all_symbols (SCHEME_A)); 4776 s_return (oblist_all_symbols (SCHEME_A));
4698 4777
4699#if USE_PORTS 4778#if USE_PORTS
… …
4769 s_return (p == NIL ? S_F : p); 4848 s_return (p == NIL ? S_F : p);
4770 } 4849 }
4771 4850
4772 case OP_GET_OUTSTRING: /* get-output-string */ 4851 case OP_GET_OUTSTRING: /* get-output-string */
4773 { 4852 {
4774 port *p; 4853 port *p = port (a);
4775 4854
4776 if ((p = a->object.port)->kind & port_string) 4855 if (p->kind & port_string)
4777 { 4856 {
4778 off_t size; 4857 off_t size;
4779 char *str; 4858 char *str;
4780 4859
4781 size = p->rep.string.curr - p->rep.string.start + 1; 4860 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4816 } 4895 }
4817 4896
4818 if (USE_ERROR_CHECKING) abort (); 4897 if (USE_ERROR_CHECKING) abort ();
4819} 4898}
4820 4899
4821static int 4900/* reading */
4901ecb_cold static int
4822opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4902opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4823{ 4903{
4824 pointer args = SCHEME_V->args; 4904 pointer args = SCHEME_V->args;
4825 pointer x; 4905 pointer x;
4826 4906
… …
4886 int res; 4966 int res;
4887 4967
4888 if (is_pair (args)) 4968 if (is_pair (args))
4889 p = car (args); 4969 p = car (args);
4890 4970
4891 res = p->object.port->kind & port_string; 4971 res = port (p)->kind & port_string;
4892 4972
4893 s_retbool (res); 4973 s_retbool (res);
4894 } 4974 }
4895 4975
4896 case OP_SET_INPORT: /* set-input-port */ 4976 case OP_SET_INPORT: /* set-input-port */
… …
5168 } 5248 }
5169 5249
5170 if (USE_ERROR_CHECKING) abort (); 5250 if (USE_ERROR_CHECKING) abort ();
5171} 5251}
5172 5252
5173static int 5253/* list ops */
5254ecb_hot static int
5174opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5255opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5175{ 5256{
5176 pointer args = SCHEME_V->args; 5257 pointer args = SCHEME_V->args;
5177 pointer a = car (args); 5258 pointer a = car (args);
5178 pointer x, y; 5259 pointer x, y;
… …
5221 5302
5222 case OP_CLOSUREP: /* closure? */ 5303 case OP_CLOSUREP: /* closure? */
5223 /* 5304 /*
5224 * Note, macro object is also a closure. 5305 * Note, macro object is also a closure.
5225 * Therefore, (closure? <#MACRO>) ==> #t 5306 * Therefore, (closure? <#MACRO>) ==> #t
5307 * (schmorp) well, obviously not, fix? TODO
5226 */ 5308 */
5227 s_retbool (is_closure (a)); 5309 s_retbool (is_closure (a));
5228 5310
5229 case OP_MACROP: /* macro? */ 5311 case OP_MACROP: /* macro? */
5230 s_retbool (is_macro (a)); 5312 s_retbool (is_macro (a));
… …
5235 5317
5236/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5318/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5237typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5319typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5238 5320
5239typedef int (*test_predicate)(pointer); 5321typedef int (*test_predicate)(pointer);
5240static int 5322
5323ecb_hot static int
5241tst_any (pointer p) 5324tst_any (pointer p)
5242{ 5325{
5243 return 1; 5326 return 1;
5244} 5327}
5245 5328
5246static int 5329ecb_hot static int
5247tst_inonneg (pointer p) 5330tst_inonneg (pointer p)
5248{ 5331{
5249 return is_integer (p) && ivalue_unchecked (p) >= 0; 5332 return is_integer (p) && ivalue_unchecked (p) >= 0;
5250} 5333}
5251 5334
5252static int 5335ecb_hot static int
5253tst_is_list (SCHEME_P_ pointer p) 5336tst_is_list (SCHEME_P_ pointer p)
5254{ 5337{
5255 return p == NIL || is_pair (p); 5338 return p == NIL || is_pair (p);
5256} 5339}
5257 5340
… …
5300#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5383#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5301#include "opdefines.h" 5384#include "opdefines.h"
5302#undef OP_DEF 5385#undef OP_DEF
5303; 5386;
5304 5387
5305static const char * 5388ecb_cold static const char *
5306opname (int idx) 5389opname (int idx)
5307{ 5390{
5308 const char *name = opnames; 5391 const char *name = opnames;
5309 5392
5310 /* should do this at compile time, but would require external program, right? */ 5393 /* should do this at compile time, but would require external program, right? */
… …
5312 name += strlen (name) + 1; 5395 name += strlen (name) + 1;
5313 5396
5314 return *name ? name : "ILLEGAL"; 5397 return *name ? name : "ILLEGAL";
5315} 5398}
5316 5399
5317static const char * 5400ecb_cold static const char *
5318procname (pointer x) 5401procname (pointer x)
5319{ 5402{
5320 return opname (procnum (x)); 5403 return opname (procnum (x));
5321} 5404}
5322 5405
… …
5342#undef OP_DEF 5425#undef OP_DEF
5343 {0} 5426 {0}
5344}; 5427};
5345 5428
5346/* kernel of this interpreter */ 5429/* kernel of this interpreter */
5347static void ecb_hot 5430ecb_hot static void
5348Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5431Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5349{ 5432{
5350 SCHEME_V->op = op; 5433 SCHEME_V->op = op;
5351 5434
5352 for (;;) 5435 for (;;)
… …
5435 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5518 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5436 return; 5519 return;
5437 5520
5438 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5521 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5439 { 5522 {
5440 xwrstr ("No memory!\n"); 5523 putstr (SCHEME_A_ "No memory!\n");
5441 return; 5524 return;
5442 } 5525 }
5443 } 5526 }
5444} 5527}
5445 5528
5446/* ========== Initialization of internal keywords ========== */ 5529/* ========== Initialization of internal keywords ========== */
5447 5530
5448static void 5531ecb_cold static void
5449assign_syntax (SCHEME_P_ const char *name) 5532assign_syntax (SCHEME_P_ const char *name)
5450{ 5533{
5451 pointer x = oblist_add_by_name (SCHEME_A_ name); 5534 pointer x = oblist_add_by_name (SCHEME_A_ name);
5452 set_typeflag (x, typeflag (x) | T_SYNTAX); 5535 set_typeflag (x, typeflag (x) | T_SYNTAX);
5453} 5536}
5454 5537
5455static void 5538ecb_cold static void
5456assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5539assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5457{ 5540{
5458 pointer x = mk_symbol (SCHEME_A_ name); 5541 pointer x = mk_symbol (SCHEME_A_ name);
5459 pointer y = mk_proc (SCHEME_A_ op); 5542 pointer y = mk_proc (SCHEME_A_ op);
5460 new_slot_in_env (SCHEME_A_ x, y); 5543 new_slot_in_env (SCHEME_A_ x, y);
… …
5468 ivalue_unchecked (y) = op; 5551 ivalue_unchecked (y) = op;
5469 return y; 5552 return y;
5470} 5553}
5471 5554
5472/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5555/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5473static int 5556ecb_hot static int
5474syntaxnum (pointer p) 5557syntaxnum (pointer p)
5475{ 5558{
5476 const char *s = strvalue (car (p)); 5559 const char *s = strvalue (p);
5477 5560
5478 switch (strlength (car (p))) 5561 switch (strlength (p))
5479 { 5562 {
5480 case 2: 5563 case 2:
5481 if (s[0] == 'i') 5564 if (s[0] == 'i')
5482 return OP_IF0; /* if */ 5565 return OP_IF0; /* if */
5483 else 5566 else
… …
5558ecb_cold int 5641ecb_cold int
5559scheme_init (SCHEME_P) 5642scheme_init (SCHEME_P)
5560{ 5643{
5561 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5644 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5562 pointer x; 5645 pointer x;
5646
5647 /* this memset is not strictly correct, as we assume (intcache)
5648 * that memset 0 will also set pointers to 0, but memset does
5649 * of course not guarantee that. screw such systems.
5650 */
5651 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5563 5652
5564 num_set_fixnum (num_zero, 1); 5653 num_set_fixnum (num_zero, 1);
5565 num_set_ivalue (num_zero, 0); 5654 num_set_ivalue (num_zero, 0);
5566 num_set_fixnum (num_one, 1); 5655 num_set_fixnum (num_one, 1);
5567 num_set_ivalue (num_one, 1); 5656 num_set_ivalue (num_one, 1);
… …
5579 SCHEME_V->save_inport = NIL; 5668 SCHEME_V->save_inport = NIL;
5580 SCHEME_V->loadport = NIL; 5669 SCHEME_V->loadport = NIL;
5581 SCHEME_V->nesting = 0; 5670 SCHEME_V->nesting = 0;
5582 SCHEME_V->interactive_repl = 0; 5671 SCHEME_V->interactive_repl = 0;
5583 5672
5584 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5673 if (!alloc_cellseg (SCHEME_A))
5585 { 5674 {
5586#if USE_ERROR_CHECKING 5675#if USE_ERROR_CHECKING
5587 SCHEME_V->no_memory = 1; 5676 SCHEME_V->no_memory = 1;
5588 return 0; 5677 return 0;
5589#endif 5678#endif
… …
5657 5746
5658 return !SCHEME_V->no_memory; 5747 return !SCHEME_V->no_memory;
5659} 5748}
5660 5749
5661#if USE_PORTS 5750#if USE_PORTS
5662void 5751ecb_cold void
5663scheme_set_input_port_file (SCHEME_P_ int fin) 5752scheme_set_input_port_file (SCHEME_P_ int fin)
5664{ 5753{
5665 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 5754 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5666} 5755}
5667 5756
5668void 5757ecb_cold void
5669scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 5758scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5670{ 5759{
5671 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 5760 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5672} 5761}
5673 5762
5674void 5763ecb_cold void
5675scheme_set_output_port_file (SCHEME_P_ int fout) 5764scheme_set_output_port_file (SCHEME_P_ int fout)
5676{ 5765{
5677 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 5766 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5678} 5767}
5679 5768
5680void 5769ecb_cold void
5681scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 5770scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5682{ 5771{
5683 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 5772 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5684} 5773}
5685#endif 5774#endif
5686 5775
5687void 5776ecb_cold void
5688scheme_set_external_data (SCHEME_P_ void *p) 5777scheme_set_external_data (SCHEME_P_ void *p)
5689{ 5778{
5690 SCHEME_V->ext_data = p; 5779 SCHEME_V->ext_data = p;
5691} 5780}
5692 5781
… …
5740 } 5829 }
5741 } 5830 }
5742#endif 5831#endif
5743} 5832}
5744 5833
5745void 5834ecb_cold void
5746scheme_load_file (SCHEME_P_ int fin) 5835scheme_load_file (SCHEME_P_ int fin)
5747{ 5836{
5748 scheme_load_named_file (SCHEME_A_ fin, 0); 5837 scheme_load_named_file (SCHEME_A_ fin, 0);
5749} 5838}
5750 5839
5751void 5840ecb_cold void
5752scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 5841scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5753{ 5842{
5754 dump_stack_reset (SCHEME_A); 5843 dump_stack_reset (SCHEME_A);
5755 SCHEME_V->envir = SCHEME_V->global_env; 5844 SCHEME_V->envir = SCHEME_V->global_env;
5756 SCHEME_V->file_i = 0; 5845 SCHEME_V->file_i = 0;
… …
5783 5872
5784 if (SCHEME_V->retcode == 0) 5873 if (SCHEME_V->retcode == 0)
5785 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5874 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5786} 5875}
5787 5876
5788void 5877ecb_cold void
5789scheme_load_string (SCHEME_P_ const char *cmd) 5878scheme_load_string (SCHEME_P_ const char *cmd)
5790{ 5879{
5791 dump_stack_reset (SCHEME_A); 5880 dump_stack_reset (SCHEME_A);
5792 SCHEME_V->envir = SCHEME_V->global_env; 5881 SCHEME_V->envir = SCHEME_V->global_env;
5793 SCHEME_V->file_i = 0; 5882 SCHEME_V->file_i = 0;
… …
5807 5896
5808 if (SCHEME_V->retcode == 0) 5897 if (SCHEME_V->retcode == 0)
5809 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5898 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5810} 5899}
5811 5900
5812void 5901ecb_cold void
5813scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 5902scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5814{ 5903{
5815 pointer x; 5904 pointer x;
5816 5905
5817 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 5906 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5822 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 5911 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5823} 5912}
5824 5913
5825#if !STANDALONE 5914#if !STANDALONE
5826 5915
5827void 5916ecb_cold void
5828scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 5917scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5829{ 5918{
5830 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 5919 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5831} 5920}
5832 5921
5833void 5922ecb_cold void
5834scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 5923scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5835{ 5924{
5836 int i; 5925 int i;
5837 5926
5838 for (i = 0; i < count; i++) 5927 for (i = 0; i < count; i++)
5839 scheme_register_foreign_func (SCHEME_A_ list + i); 5928 scheme_register_foreign_func (SCHEME_A_ list + i);
5840} 5929}
5841 5930
5842pointer 5931ecb_cold pointer
5843scheme_apply0 (SCHEME_P_ const char *procname) 5932scheme_apply0 (SCHEME_P_ const char *procname)
5844{ 5933{
5845 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 5934 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5846} 5935}
5847 5936
5848void 5937ecb_cold void
5849save_from_C_call (SCHEME_P) 5938save_from_C_call (SCHEME_P)
5850{ 5939{
5851 pointer saved_data = cons (car (S_SINK), 5940 pointer saved_data = cons (car (S_SINK),
5852 cons (SCHEME_V->envir, 5941 cons (SCHEME_V->envir,
5853 SCHEME_V->dump)); 5942 SCHEME_V->dump));
… …
5857 /* Truncate the dump stack so TS will return here when done, not 5946 /* Truncate the dump stack so TS will return here when done, not
5858 directly resume pre-C-call operations. */ 5947 directly resume pre-C-call operations. */
5859 dump_stack_reset (SCHEME_A); 5948 dump_stack_reset (SCHEME_A);
5860} 5949}
5861 5950
5862void 5951ecb_cold void
5863restore_from_C_call (SCHEME_P) 5952restore_from_C_call (SCHEME_P)
5864{ 5953{
5865 set_car (S_SINK, caar (SCHEME_V->c_nest)); 5954 set_car (S_SINK, caar (SCHEME_V->c_nest));
5866 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 5955 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5867 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 5956 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5868 /* Pop */ 5957 /* Pop */
5869 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 5958 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5870} 5959}
5871 5960
5872/* "func" and "args" are assumed to be already eval'ed. */ 5961/* "func" and "args" are assumed to be already eval'ed. */
5873pointer 5962ecb_cold pointer
5874scheme_call (SCHEME_P_ pointer func, pointer args) 5963scheme_call (SCHEME_P_ pointer func, pointer args)
5875{ 5964{
5876 int old_repl = SCHEME_V->interactive_repl; 5965 int old_repl = SCHEME_V->interactive_repl;
5877 5966
5878 SCHEME_V->interactive_repl = 0; 5967 SCHEME_V->interactive_repl = 0;
… …
5885 SCHEME_V->interactive_repl = old_repl; 5974 SCHEME_V->interactive_repl = old_repl;
5886 restore_from_C_call (SCHEME_A); 5975 restore_from_C_call (SCHEME_A);
5887 return SCHEME_V->value; 5976 return SCHEME_V->value;
5888} 5977}
5889 5978
5890pointer 5979ecb_cold pointer
5891scheme_eval (SCHEME_P_ pointer obj) 5980scheme_eval (SCHEME_P_ pointer obj)
5892{ 5981{
5893 int old_repl = SCHEME_V->interactive_repl; 5982 int old_repl = SCHEME_V->interactive_repl;
5894 5983
5895 SCHEME_V->interactive_repl = 0; 5984 SCHEME_V->interactive_repl = 0;
… …
5907 5996
5908/* ========== Main ========== */ 5997/* ========== Main ========== */
5909 5998
5910#if STANDALONE 5999#if STANDALONE
5911 6000
5912int 6001ecb_cold int
5913main (int argc, char **argv) 6002main (int argc, char **argv)
5914{ 6003{
5915# if USE_MULTIPLICITY 6004# if USE_MULTIPLICITY
5916 scheme ssc; 6005 scheme ssc;
5917 scheme *const SCHEME_V = &ssc; 6006 scheme *const SCHEME_V = &ssc;
… …
5919# endif 6008# endif
5920 int fin; 6009 int fin;
5921 char *file_name = InitFile; 6010 char *file_name = InitFile;
5922 int retcode; 6011 int retcode;
5923 int isfile = 1; 6012 int isfile = 1;
6013 system ("ps v $PPID");//D
5924 6014
5925 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6015 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5926 { 6016 {
5927 xwrstr ("Usage: tinyscheme -?\n"); 6017 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5928 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6018 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5929 xwrstr ("followed by\n"); 6019 putstr (SCHEME_A_ "followed by\n");
5930 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6020 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5931 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6021 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5932 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6022 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5933 xwrstr ("Use - as filename for stdin.\n"); 6023 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5934 return 1; 6024 return 1;
5935 } 6025 }
5936 6026
5937 if (!scheme_init (SCHEME_A)) 6027 if (!scheme_init (SCHEME_A))
5938 { 6028 {
5939 xwrstr ("Could not initialize!\n"); 6029 putstr (SCHEME_A_ "Could not initialize!\n");
5940 return 2; 6030 return 2;
5941 } 6031 }
5942 6032
5943# if USE_PORTS 6033# if USE_PORTS
5944 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6034 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5989 fin = open (file_name, O_RDONLY); 6079 fin = open (file_name, O_RDONLY);
5990#endif 6080#endif
5991 6081
5992 if (isfile && fin < 0) 6082 if (isfile && fin < 0)
5993 { 6083 {
5994 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6084 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
5995 } 6085 }
5996 else 6086 else
5997 { 6087 {
5998 if (isfile) 6088 if (isfile)
5999 scheme_load_named_file (SCHEME_A_ fin, file_name); 6089 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6003#if USE_PORTS 6093#if USE_PORTS
6004 if (!isfile || fin != STDIN_FILENO) 6094 if (!isfile || fin != STDIN_FILENO)
6005 { 6095 {
6006 if (SCHEME_V->retcode != 0) 6096 if (SCHEME_V->retcode != 0)
6007 { 6097 {
6008 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6098 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6009 } 6099 }
6010 6100
6011 if (isfile) 6101 if (isfile)
6012 close (fin); 6102 close (fin);
6013 } 6103 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines